2023. 12. 06. 12:09 keltezéssel, Ross Burton írta:
Why are you upgrading to a release candidate?
Treat it as an RFC.
I wanted to build a GTK4-only image.
See my other patch against update_gtk_icon_cache to fix the do_rootfs fallout.
Ross
On 6 Dec 2023, at 06:39, Zoltan Boszormenyi via lists.openembedded.org
<[email protected]> wrote:
zenity 4.0 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 <[email protected]>
---
v2: Fix GTKIC_VERSION so gtk+3-native is not built and pulled
...to-avoid-pointing-to-build-system-s-.patch | 28 -------------------
.../{zenity_3.44.2.bb => zenity_3.99.91.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_3.99.91.bb}
(62%)
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?= <[email protected]>
-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 <[email protected]>
----
- 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_3.99.91.bb
similarity index 62%
rename from meta-gnome/recipes-gnome/zenity/zenity_3.44.2.bb
rename to meta-gnome/recipes-gnome/zenity/zenity_3.99.91.bb
index 92b9f6655..34d335d28 100644
--- a/meta-gnome/recipes-gnome/zenity/zenity_3.44.2.bb
+++ b/meta-gnome/recipes-gnome/zenity/zenity_3.99.91.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] =
"e8c80ae1e2a4d7b2eb39c4fb8c4b14814530f37997b49f4c184bf2f7124d84d2"
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"
--
2.43.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#107239):
https://lists.openembedded.org/g/openembedded-devel/message/107239
Mute This Topic: https://lists.openembedded.org/mt/103008696/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
