diff mbox series

[meta-gnome] zenity: Upgrade to 4.0.0

Message ID 20231208095009.319210-1-zboszor@gmail.com
State Accepted
Headers show
Series [meta-gnome] zenity: Upgrade to 4.0.0 | expand

Commit Message

Böszörményi Zoltán Dec. 8, 2023, 9:50 a.m. UTC 
zenity 4.x now uses GTK4 and GTK4-based webkitgtk.

The perl based gdialog is no more, its subpackage would be empty.
Don't try to generate this subpackage.

Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com>
---
 ...to-avoid-pointing-to-build-system-s-.patch | 28 -------------------
 .../{zenity_3.44.2.bb => zenity_4.0.0.bb}     | 16 +++++------
 2 files changed, 7 insertions(+), 37 deletions(-)
 delete mode 100644 meta-gnome/recipes-gnome/zenity/zenity/0001-Harcode-shebang-to-avoid-pointing-to-build-system-s-.patch
 rename meta-gnome/recipes-gnome/zenity/{zenity_3.44.2.bb => zenity_4.0.0.bb} (62%)

Comments

Khem Raj Dec. 13, 2023, 7:07 a.m. UTC | #1 
On Fri, 08 Dec 2023 10:50:09 +0100, Zoltán Böszörményi wrote:
> zenity 4.x now uses GTK4 and GTK4-based webkitgtk.
> 
> The perl based gdialog is no more, its subpackage would be empty.
> Don't try to generate this subpackage.
> 
> 

Applied, thanks!

[1/1] zenity: Upgrade to 4.0.0
      commit: 0f9e5d1f9b62af785a65c1d5e6ab3b5d11befbff

Best regards,
diff mbox series

Patch

diff --git a/meta-gnome/recipes-gnome/zenity/zenity/0001-Harcode-shebang-to-avoid-pointing-to-build-system-s-.patch b/meta-gnome/recipes-gnome/zenity/zenity/0001-Harcode-shebang-to-avoid-pointing-to-build-system-s-.patch
deleted file mode 100644
index e054ff744..000000000
--- a/meta-gnome/recipes-gnome/zenity/zenity/0001-Harcode-shebang-to-avoid-pointing-to-build-system-s-.patch
+++ /dev/null
@@ -1,28 +0,0 @@ 
-From c8be0d5e7d17930d819635df6570fa5331a5dedd Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Mon, 10 Jan 2022 20:18:00 +0100
-Subject: [PATCH] Harcode shebang to avoid pointing to build system's perl
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream-Status: Pending
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
----
- src/gdialog.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/gdialog.in b/src/gdialog.in
-index 2fc4633..f891861 100755
---- a/src/gdialog.in
-+++ b/src/gdialog.in
-@@ -1,4 +1,4 @@
--#!@PERL@
-+#!/usr/bin/env perl
- 
- # gdialog -> zenity conversion wrapper
- #
--- 
-2.31.1
-
diff --git a/meta-gnome/recipes-gnome/zenity/zenity_3.44.2.bb b/meta-gnome/recipes-gnome/zenity/zenity_4.0.0.bb
similarity index 62%
rename from meta-gnome/recipes-gnome/zenity/zenity_3.44.2.bb
rename to meta-gnome/recipes-gnome/zenity/zenity_4.0.0.bb
index 92b9f6655..a151f3ca4 100644
--- a/meta-gnome/recipes-gnome/zenity/zenity_3.44.2.bb
+++ b/meta-gnome/recipes-gnome/zenity/zenity_4.0.0.bb
@@ -3,25 +3,23 @@  SECTION = "x11/gnome"
 LICENSE = "LGPL-2.1-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
 
-
 inherit gnomebase pkgconfig itstool gtk-icon-cache features_check gettext
 
 DEPENDS = " \
     desktop-file-utils-native \
+    help2man-native \
     hicolor-icon-theme \
-    gtk+3 \
-    gtk+3-native \
+    gtk4 \
+    gtk4-native \
+    libadwaita \
 "
 
 ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
+GTKIC_VERSION = "4"
 
-SRC_URI[archive.sha256sum] = "3fb5b8b1044d3d129262d3c54cf220eb7f76bc21bd5ac6d96ec115cd3518300e"
-SRC_URI += "file://0001-Harcode-shebang-to-avoid-pointing-to-build-system-s-.patch"
+SRC_URI[archive.sha256sum] = "0b8c8def18dab05cc49bd464b90ca7f945ae52ff5e09242da702a15d94d3e8dd"
 
 PACKAGECONFIG ?= "webkitgtk"
-PACKAGECONFIG[webkitgtk] = "-Dwebkitgtk=true,-Dwebkitgtk=false,webkitgtk3"
+PACKAGECONFIG[webkitgtk] = "-Dwebkitgtk=true,-Dwebkitgtk=false,webkitgtk"
 
-PACKAGES =+ "${PN}-gdialog"
-FILES:${PN}-gdialog = "${bindir}/gdialog"
 FILES:${PN}-doc = "${datadir}/man ${datadir}/help"
-RDEPENDS:${PN}-gdialog += "perl"