Skip to content

Commit 1a7a6be

Browse files
authored
Merge pull request #1603 from sdroege/0.20-backports
0.20 backports
2 parents 8061fca + a9f9468 commit 1a7a6be

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+4006
-292
lines changed

.github/workflows/CI.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- { name: "gio", features: "v2_84", nightly: "--all-features", test_sys: true }
2626
- { name: "glib", features: "v2_84,log", nightly: "--all-features", test_sys: true }
2727
- { name: "graphene", features: "", nightly: "", test_sys: true }
28-
- { name: "pango", features: "v1_54", nightly: "--all-features", test_sys: true }
28+
- { name: "pango", features: "v1_56", nightly: "--all-features", test_sys: true }
2929
- { name: "pangocairo", features: "", nightly: "--all-features", test_sys: true }
3030
steps:
3131
- uses: actions/checkout@v4

.github/workflows/windows.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414

1515
env:
1616
# git revision of gvsbuild we use for to build GLib and the other dependencies
17-
gvsbuildref: bb1d2691d25c7bb1239118a907c8e21b1aa24e03
17+
gvsbuildref: 230e1074047b9654b76217c5d48b10c726fbe0f6
1818

1919
# bump this number if you want to force a rebuild of gvsbuild with the same revision
2020
gvsbuildupdate: 1

Cargo.lock

+65-65
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)