From a4a20446a693a74f3c7b116f7ba14ea90a818f69 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 12 Dec 2024 12:20:22 +0800 Subject: [PATCH] bump gi-gtk stack to gtk4 (#7540) --- build-constraints.yaml | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 54483bc7..05c9fe45 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3570,26 +3570,26 @@ packages: - gi-cairo - gi-dbusmenu - gi-dbusmenugtk3 - - gi-gdk == 3.* # https://github.com/commercialhaskell/stackage/issues/6317 + - gi-gdk - gi-gdkpixbuf - - gi-gdkx11 == 3.* # https://github.com/commercialhaskell/stackage/issues/6317 + - gi-gdkx11 - gi-gio - gi-glib - gi-gobject - gi-graphene - gi-gsk - - gi-gtk == 3.* # https://github.com/commercialhaskell/stackage/issues/6317 + - gi-gtk - gi-gtk-hs - gi-gmodule - gi-pango - gi-xlib - gi-harfbuzz - - gi-gtksource < 5.0.0 # https://github.com/commercialhaskell/stackage/issues/7013 - - gi-javascriptcore < 0 # 4.0.28 compile fail - Typelib file for namespace 'JavaScriptCore', version '4.0' not found (0) + - gi-gtksource + - gi-javascriptcore - gi-vte - gi-webkit2 - gi-freetype2 - - gi-soup < 3.0.2 # https://github.com/commercialhaskell/stackage/issues/6929 + - gi-soup "Brandon Simmons @jberryman": - directory-tree @@ -6971,8 +6971,16 @@ packages: - ghc-prof < 0 # tried ghc-prof-1.4.1.12, but its *library* requires base >=4.6 && < 4.18 and the snapshot contains base-4.20.0.0 - ghc-prof < 0 # tried ghc-prof-1.4.1.12, but its *library* requires containers >=0.5 && < 0.7 and the snapshot contains containers-0.7 - ghc-syb-utils < 0 # tried ghc-syb-utils-0.3.0.0, but its *library* requires ghc >=7.10 && < 8.6 and the snapshot contains ghc-9.10.1 - - gi-gsk < 0 # tried gi-gsk-4.0.8, but its *library* requires gi-gdk >=4.0 && < 4.1 and the snapshot contains gi-gdk-3.0.29 - - gi-webkit2 < 0 # tried gi-webkit2-4.0.31, but its *library* requires the disabled package: gi-javascriptcore + - gi-dbusmenugtk3 < 0 # tried gi-dbusmenugtk3-0.4.15, but its *library* requires gi-gdk >=3.0 && < 3.1 and the snapshot contains gi-gdk-4.0.9 + - gi-dbusmenugtk3 < 0 # tried gi-dbusmenugtk3-0.4.15, but its *library* requires gi-gtk >=3.0 && < 3.1 and the snapshot contains gi-gtk-4.0.9 + - gi-gtk-hs < 0 # tried gi-gtk-hs-0.3.17, but its *library* requires gi-gdk >=3.0.6 && < 3.1 and the snapshot contains gi-gdk-4.0.9 + - gi-gtk-hs < 0 # tried gi-gtk-hs-0.3.17, but its *library* requires gi-gtk >=3.0.26 && < 3.1 and the snapshot contains gi-gtk-4.0.9 + - gi-vte < 0 # tried gi-vte-2.91.33, but its *library* requires gi-gdk >=3.0 && < 3.1 and the snapshot contains gi-gdk-4.0.9 + - gi-vte < 0 # tried gi-vte-2.91.33, but its *library* requires gi-gtk >=3.0 && < 3.1 and the snapshot contains gi-gtk-4.0.9 + - gi-webkit2 < 0 # tried gi-webkit2-4.0.31, but its *library* requires gi-gdk >=3.0 && < 3.1 and the snapshot contains gi-gdk-4.0.9 + - gi-webkit2 < 0 # tried gi-webkit2-4.0.31, but its *library* requires gi-gtk >=3.0 && < 3.1 and the snapshot contains gi-gtk-4.0.9 + - gi-webkit2 < 0 # tried gi-webkit2-4.0.31, but its *library* requires gi-javascriptcore >=4.0 && < 4.1 and the snapshot contains gi-javascriptcore-6.0.4 + - gi-webkit2 < 0 # tried gi-webkit2-4.0.31, but its *library* requires gi-soup >=2.4 && < 2.5 and the snapshot contains gi-soup-3.0.3 - git < 0 # tried git-0.3.0, but its *library* requires bytestring >=0.9 && < 0.11 and the snapshot contains bytestring-0.12.1.0 - git-annex < 0 # tried git-annex-10.20241202, but its *executable* requires the disabled package: aws - git-annex < 0 # tried git-annex-10.20241202, but its *executable* requires the disabled package: feed @@ -7112,6 +7120,10 @@ packages: - groundhog-th < 0 # tried groundhog-th-0.12, but its *library* requires aeson >=0.7 && < 2 and the snapshot contains aeson-2.2.3.0 - groundhog-th < 0 # tried groundhog-th-0.12, but its *library* requires the disabled package: groundhog - grouped-list < 0 # tried grouped-list-0.2.3.0, but its *library* requires base >=4.8 && < 4.17 and the snapshot contains base-4.20.0.0 + - gtk-sni-tray < 0 # tried gtk-sni-tray-0.1.8.1, but its *library* requires gi-gdk >=3.0.25 && < 4 and the snapshot contains gi-gdk-4.0.9 + - gtk-sni-tray < 0 # tried gtk-sni-tray-0.1.8.1, but its *library* requires gi-gtk >=3.0.38 && < 4 and the snapshot contains gi-gtk-4.0.9 + - gtk-strut < 0 # tried gtk-strut-0.1.3.2, but its *library* requires gi-gdk >=3.0.25 && < 4 and the snapshot contains gi-gdk-4.0.9 + - gtk-strut < 0 # tried gtk-strut-0.1.3.2, but its *library* requires gi-gtk >=3.0.38 && < 4 and the snapshot contains gi-gtk-4.0.9 - hOpenPGP < 0 # tried hOpenPGP-2.10.0, but its *library* requires the disabled package: ixset-typed - hackernews < 0 # tried hackernews-1.4.0.0, but its *library* requires http-client >=0.5 && < 0.6 and the snapshot contains http-client-0.7.17 - hackernews < 0 # tried hackernews-1.4.0.0, but its *library* requires servant >=0.9 && < 0.13 and the snapshot contains servant-0.20.2 @@ -8289,8 +8301,8 @@ packages: - systemd-socket-activation < 0 # tried systemd-socket-activation-1.1.0.1, but its *library* requires containers ^>=0.6.4 and the snapshot contains containers-0.7 - systemd-socket-activation < 0 # tried systemd-socket-activation-1.1.0.1, but its *library* requires network ^>=3.1.2 and the snapshot contains network-3.2.7.0 - systemd-socket-activation < 0 # tried systemd-socket-activation-1.1.0.1, but its *library* requires text ^>=1.2.4 || ^>=2.0 and the snapshot contains text-2.1.1 - - taffybar < 0 # tried taffybar-4.0.3, but its *library* requires the disabled package: X11 - - taffybar < 0 # tried taffybar-4.0.3, but its *library* requires the disabled package: broadcast-chan + - taffybar < 0 # tried taffybar-4.0.3, but its *library* requires gi-gdk >=3.0.6 && < 3.1 and the snapshot contains gi-gdk-4.0.9 + - taffybar < 0 # tried taffybar-4.0.3, but its *library* requires gi-gtk >=3.0.26 && < 4 and the snapshot contains gi-gtk-4.0.9 - tasty-bench-fit < 0 # tried tasty-bench-fit-0.1.1, but its *library* requires the disabled package: regression-simple - tasty-dejafu < 0 # tried tasty-dejafu-2.1.0.1, but its *library* requires the disabled package: dejafu - tasty-hunit-compat < 0 # tried tasty-hunit-compat-0.2.0.1, but its *library* requires tasty < 1.5 and the snapshot contains tasty-1.5.2 @@ -8312,6 +8324,7 @@ packages: - tensors < 0 # tried tensors-0.1.5, but its *library* requires deepseq >=1.4.4.0 && < 1.5 and the snapshot contains deepseq-1.5.0.0 - termbox-banana < 0 # tried termbox-banana-2.0.0, but its *library* requires the disabled package: reactive-banana - termcolor < 0 # tried termcolor-0.2.0.0, but its *executable* requires the disabled package: cli + - termonad < 0 # tried termonad-4.6.0.0, but its *library* requires the disabled package: gi-vte - test-fixture < 0 # tried test-fixture-0.5.1.0, but its *library* requires template-haskell >=2.10 && < 2.13 and the snapshot contains template-haskell-2.22.0.0 - test-framework-th < 0 # tried test-framework-th-0.2.4, but its *library* requires the disabled package: language-haskell-extract - text-all < 0 # tried text-all-0.4.2, but its *library* requires text >=1.2.3 && < 1.2.4 and the snapshot contains text-2.1.1