summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Bicha <jeremy.bicha@canonical.com>2022-05-18 16:01:03 -0400
committerJeremy Bicha <jeremy.bicha@canonical.com>2022-06-01 15:40:48 -0400
commit4244808381c7a240888c6ea8888aba0707f0274d (patch)
treeaac8221b4f5f37ec034e326c4fe0eea69dd41813
parentreleasing package zenity version 3.42.1-1 (diff)
downloadzenity-4244808381c7a240888c6ea8888aba0707f0274d.tar.gz
zenity-4244808381c7a240888c6ea8888aba0707f0274d.tar.bz2
zenity-4244808381c7a240888c6ea8888aba0707f0274d.zip
Build against webkit2gtk 4.1
-rw-r--r--debian/control2
-rw-r--r--debian/control.in2
-rw-r--r--debian/patches/Build-with-webkit2gtk-4.1.patch24
-rw-r--r--debian/patches/series1
4 files changed, 27 insertions, 2 deletions
diff --git a/debian/control b/debian/control
index cb92defb..fd442448 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends: debhelper-compat (= 13),
libglib2.0-dev,
libgtk-3-dev (>= 3.16.0),
libnotify-dev (>= 0.6.1),
- libwebkit2gtk-4.0-dev (>= 2.8.1) [!ia64 !kfreebsd-any !sh4],
+ libwebkit2gtk-4.1-dev (>= 2.8.1) [!ia64 !kfreebsd-any !sh4],
meson (>= 0.53.0)
Rules-Requires-Root: no
Standards-Version: 4.6.0
diff --git a/debian/control.in b/debian/control.in
index af261d0c..7a2a8947 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -9,7 +9,7 @@ Build-Depends: debhelper-compat (= 13),
libglib2.0-dev,
libgtk-3-dev (>= 3.16.0),
libnotify-dev (>= 0.6.1),
- libwebkit2gtk-4.0-dev (>= 2.8.1) [!ia64 !kfreebsd-any !sh4],
+ libwebkit2gtk-4.1-dev (>= 2.8.1) [!ia64 !kfreebsd-any !sh4],
meson (>= 0.53.0)
Rules-Requires-Root: no
Standards-Version: 4.6.0
diff --git a/debian/patches/Build-with-webkit2gtk-4.1.patch b/debian/patches/Build-with-webkit2gtk-4.1.patch
new file mode 100644
index 00000000..4f3d78be
--- /dev/null
+++ b/debian/patches/Build-with-webkit2gtk-4.1.patch
@@ -0,0 +1,24 @@
+From: Jeremy Bicha <jeremy.bicha@canonical.com>
+Date: Wed, 18 May 2022 16:00:02 -0400
+Subject: Build with webkit2gtk 4.1
+
+webkit2gtk 4.1 is gtk3 + libsoup3
+
+https://gitlab.gnome.org/GNOME/zenity/-/issues/46
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 6f28790..032031b 100644
+--- a/meson.build
++++ b/meson.build
+@@ -70,7 +70,7 @@ if get_option('libnotify')
+ endif
+ endif
+
+-webkitgtk = dependency('webkit2gtk-4.0', version: '>= 2.8.1', required: false)
++webkitgtk = dependency('webkit2gtk-4.1', version: '>= 2.8.1', required: false)
+ if get_option('webkitgtk')
+ if webkitgtk.found()
+ zenity_conf.set('HAVE_WEBKITGTK', true)
diff --git a/debian/patches/series b/debian/patches/series
index e69de29b..49e4979a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+Build-with-webkit2gtk-4.1.patch
bgstack15