Skip to content

Commit eecbd5b

Browse files
authored
Merge branch 'master' into master
2 parents 79ccf84 + 7e4d3c1 commit eecbd5b

File tree

17 files changed

+1619
-272
lines changed

17 files changed

+1619
-272
lines changed

Cargo.lock

Lines changed: 73 additions & 120 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "geopard"
3-
version = "1.5.0"
3+
version = "1.6.0"
44
authors = ["ranfdev <[email protected]>"]
55
edition = "2021"
66

@@ -10,8 +10,8 @@ edition = "2021"
1010

1111
[dependencies.gtk]
1212
package = "gtk4"
13-
version = "0.8"
14-
features = ["v4_8"]
13+
version = "0.9"
14+
features = ["v4_12"]
1515

1616
[dependencies]
1717
gemini = { path = "gemini" }
@@ -26,4 +26,4 @@ toml = "0.5.6"
2626
serde = { version = "1.0.116", features = ["derive"] }
2727
env_logger = "0.8.1"
2828
log = "0.4.0"
29-
adw = { package = "libadwaita", version = "0.6", features = ["v1_5"]}
29+
adw = { package = "libadwaita", version = "0.7", features = ["v1_5"]}

build-aux/com.ranfdev.Geopard.Devel.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"app-id" : "com.ranfdev.Geopard.Devel",
33
"runtime" : "org.gnome.Platform",
4-
"runtime-version" : "46",
4+
"runtime-version" : "48",
55
"sdk" : "org.gnome.Sdk",
66
"sdk-extensions" : [
77
"org.freedesktop.Sdk.Extension.rust-stable",
8-
"org.freedesktop.Sdk.Extension.llvm16"
8+
"org.freedesktop.Sdk.Extension.llvm19"
99
],
1010
"command" : "geopard",
1111
"tags" : [
@@ -20,7 +20,7 @@
2020
"--filesystem=xdg-download"
2121
],
2222
"build-options" : {
23-
"append-path" : "/usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/llvm16/bin",
23+
"append-path" : "/usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/llvm19/bin",
2424
"build-args" : [
2525
"--share=network"
2626
],

data/com.ranfdev.Geopard.metainfo.xml.in.in

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,11 @@
8484
</custom>
8585

8686
<releases>
87+
<release version="1.6.0" date="2024-07-03">
88+
<description>
89+
<p>Various small fixes</p>
90+
</description>
91+
</release>
8792
<release version="1.5.0" date="2024-04-10">
8893
<description>
8994
<p>Updated to latest libadwaita and GTK to improve performance and compatibility,

data/resources/ui/tab.blp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ template $Tab: Adw.Bin {
77
vexpand: true;
88

99
Adw.ClampScrollable clamp {
10-
halign: center;
1110
maximum-size: 768;
1211
tightening-threshold: 720;
1312
}

gemini/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ futures = "0.3.5"
1212
log = "0.4.0"
1313
url = "2.1.1"
1414
thiserror = "1.0.20"
15-
glib = "0.19"
15+
glib = "0.20"
1616

1717
[dependencies.gio]
1818
package = "gio"
19-
version = "0.19"
19+
version = "0.20"
2020
features = ["v2_70"]

meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
project(
22
'geopard',
33
'rust',
4-
version: '1.5.0',
4+
version: '1.6.0',
55
meson_version: '>= 0.59',
66
# license: MIT,
77
)

nix/geopard.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
stdenv.mkDerivation {
2424
pname = "geopard";
25-
version = "1.5.0";
25+
version = "1.6.0";
2626

2727
cargoDeps = rustPlatform.importCargoLock {
2828
lockFile = ../Cargo.lock;

po/LINGUAS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
bg
12
fr
23
ru
34
uk
5+
pt_BR
6+
it

0 commit comments

Comments
 (0)