Skip to contentSkip to conversation

vala: fix for gtk4 prior to 4.14

PATCH [email protected] 1 participant 1 message Mar 11, 2024 1 message not in the archive

lore
Share & tools
lore
#1 lore raw
In reply to a message not in the archive

I simply dropped the part that patched gtk-4.0.metadata. The problem is fixed without it and I dont really have an idea what this file is used for. So I dislike adding it

Quoted 271 lines · Markus Volk

- add a backport patch to fix compatibility with older gtk4 versions
- merge .bb and .inc

Signed-off-by Markus Volk <[email protected] <mailto:[email protected]>>
---
 meta/recipes-devtools/vala/vala.inc           | 71 -----------------
 ...tk4-Preserve-compatibility-with-4.14.patch | 37 +++++++++
 meta/recipes-devtools/vala/vala_0.56.15.bb    | 76 
++++++++++++++++++-
 3 files changed, 112 insertions(+), 72 deletions(-)
 delete mode 100644 meta/recipes-devtools/vala/vala.inc
 create mode 100644 

meta/recipes-devtools/vala/vala/0001-gtk4-Preserve-compatibility-with-4.14.patch

meta/recipes-devtools/vala/vala.inc deleted +0 -1
deleted file mode 100644
index 0177e86240..0000000000
@@ -1,71 +0,0 @@
-SUMMARY = "C#-like programming language for easing GObject 

programming"

meta/recipes-devtools/vala/vala.inc deleted +0 -2
-HOMEPAGE = "http://vala-project.org <http://vala-project.org/>"
-DESCRIPTION = "Vala is a C#-like language dedicated to ease GObject 

programming. \
-Vala compiles to plain C and has no runtime environment nor penalities whatsoever."

meta/recipes-devtools/vala/vala.inc deleted +0 -7
-SECTION = "devel"
-DEPENDS = "bison-native flex-native glib-2.0 gobject-introspection"
-
-# Appending libxslt-native to dependencies has an effect
-# of rebuilding the manual, which is very slow. Let's do this
-# only when api-documentation distro feature is enabled.
-DEPENDS:append:class-target = " ${@bb.utils.contains 

<mailto:${@bb.utils.contains>('DISTRO_FEATURES', 'api-documentation', 'libxslt-native', '', d)}"

meta/recipes-devtools/vala/vala.inc deleted +0 -2
-
-# vala-native contains a native version of vapigen, which we use 

instead of the target one

meta/recipes-devtools/vala/vala.inc deleted +0 -4
-DEPENDS:append:class-target = " vala-native"
-BBCLASSEXTEND = "native"
-LICENSE = "LGPL-2.1-only"
-LIC_FILES_CHKSUM = 

"file://COPYING;md5=fbc093901857fcd118f065f900982c24" <file://copying;md5=fbc093901857fcd118f065f900982c24/>

meta/recipes-devtools/vala/vala.inc deleted +0 -2
-
-SHRT_VER = "${@d.getVar 

<mailto:${@d.getVar>('PV').split('.')[0]}.${@d.getVar <mailto:}.${@d.getVar>('PV').split('.')[1]}"

meta/recipes-devtools/vala/vala.inc deleted +0 -2
-
-SRC_URI = 

"http://ftp.gnome.org/pub/GNOME/sources/${BPN}/${SHRT_VER}/${BP}.tar.xz <http://ftp.gnome.org/pub/GNOME/sources/$%7BBPN%7D/$%7BSHRT_VER%7D/$%7BBP%7D.tar.xz>"

meta/recipes-devtools/vala/vala.inc deleted +0 -3
-inherit autotools pkgconfig upstream-version-is-even
-
-FILES:${PN} += "${datadir}/${BPN}-${SHRT_VER}/vapi 

${libdir}/${BPN}-${SHRT_VER}/"

meta/recipes-devtools/vala/vala.inc deleted +0 -3
-FILES:${PN}-doc += "${datadir}/devhelp"
-
-# .gir files from gobject-introspection are installed to ${libdir} 

when multilib is enabled
-GIRDIR_OPT = "${@'--girdir=${STAGING_LIBDIR}/gir-1.0' if d.getVar('MULTILIBS') else ''}"

meta/recipes-devtools/vala/vala.inc deleted +0 -3
-
-do_configure:prepend:class-target() {
-        # Write out a vapigen wrapper that will be provided by 

pkg-config file installed in target sysroot

meta/recipes-devtools/vala/vala.inc deleted +0 -11
-        # The wrapper will call a native vapigen
-        cat > ${B}/vapigen-wrapper << EOF
-#!/bin/sh
-vapigen-${SHRT_VER} ${GIRDIR_OPT} "\$@"
-EOF
-        chmod +x ${B}/vapigen-wrapper
-}
-
-EXTRA_OECONF += " --disable-valadoc"
-
-# Vapigen wrapper needs to be available system-wide, because it will 

be used

meta/recipes-devtools/vala/vala.inc deleted +0 -7
-# to build vapi files from all other packages with vala support
-do_install:append:class-target() {
-        install -d ${D}${bindir_crossscripts}/
-        install ${B}/vapigen-wrapper ${D}${bindir_crossscripts}/
-}
-
-# Put vapigen wrapper into target sysroot so that it can be used 

when building

meta/recipes-devtools/vala/vala.inc deleted +0 -7
-# vapi files.
-SYSROOT_DIRS += "${bindir_crossscripts}"
-
-inherit multilib_script
-MULTILIB_SCRIPTS = "${PN}:${bindir}/vala-gen-introspect-0.56"
-
-SYSROOT_PREPROCESS_FUNCS:append:class-target = " 

vapigen_sysroot_preprocess"

meta/recipes-devtools/vala/vala.inc deleted +0 -2
-vapigen_sysroot_preprocess() {
-        # Tweak the vapigen name in the vapigen pkgconfig file, so 

that it picks

meta/recipes-devtools/vala/vala.inc deleted +0 -3
-        # up our wrapper.
-        sed -i \
-           -e 

"s|vapigen=.*|vapigen=${bindir_crossscripts}/vapigen-wrapper|" \
- ${SYSROOT_DESTDIR}${libdir}/pkgconfig/vapigen-${SHRT_VER}.pc

meta/recipes-devtools/vala/vala.inc deleted +0 -9
-}
-
-SSTATE_SCAN_FILES += "vapigen-wrapper"
-
-PACKAGE_PREPROCESS_FUNCS += "vala_package_preprocess"
-
-vala_package_preprocess () {
-	rm -rf ${PKGD}${bindir_crossscripts}
-}
(quoted diff) +0 -0
new file mode 100644
index 0000000000..e33b0bb36b

b/meta/recipes-devtools/vala/vala/0001-gtk4-Preserve-compatibility-with-4.14.patch

(quoted diff) +1 -0
@@ -0,0 +1,37 @@
+From 17349020fb95454d06f827fd555b05248f10a370 Mon Sep 17 00:00:00 

2001
+From: Rico Tzschichholz <[email protected]
<mailto:[email protected]>>

(quoted diff) +8 -0
+Date: Thu, 7 Mar 2024 17:56:05 +0100
+Subject: [PATCH] gtk4: Preserve compatibility with < 4.14
+
+Don't prefer new accessor methods for Calendar.day/month/year
+
+Fixes <https://gitlab.gnome.org/GNOME/vala/issues/1531>
+
+Upstream-Status: Backport 

[<https://gitlab.gnome.org/GNOME/vala/-/commit/e0c4ea8c4a0bbf859b5341a7465b395892789d9e>]

+---
+ vapi/gtk4.vapi                 | 3 +++
+ vapi/metadata/Gtk-4.0.metadata | 5 +++++

+ 2 files changed, 8 insertions(+)

(quoted diff) +23 -0
+
+diff --git a/vapi/gtk4.vapi b/vapi/gtk4.vapi
+index 49f8b2078..51ecea27d 100644
+--- a/vapi/gtk4.vapi
++++ b/vapi/gtk4.vapi
+@@ -7350,11 +7350,14 @@ namespace Gtk {
+ 		[Version (since = "4.14")]
+ 		public void set_year (int year);
+ 		public void unmark_day (uint day);
++		[NoAccessorMethod]
+ 		public int day { get; set; }
++		[NoAccessorMethod]
+ 		public int month { get; set; }
+ 		public bool show_day_names { get; set; }
+ 		public bool show_heading { get; set; }
+ 		public bool show_week_numbers { get; set; }
++		[NoAccessorMethod]
+ 		public int year { get; set; }
+ 		public signal void day_selected ();
+ 		public signal void next_month ();
+--
+2.44.0
+
meta/recipes-devtools/vala/vala_0.56.15.bb +1 -1
index dc483b12ba..1f55689c45 100644
@@ -1,3 +1,77 @@
-require ${BPN}.inc
+SUMMARY = "C#-like programming language for easing GObject 

programming"

meta/recipes-devtools/vala/vala_0.56.15.bb +2 -0
+HOMEPAGE = "http://vala-project.org <http://vala-project.org/>"
+DESCRIPTION = "Vala is a C#-like language dedicated to ease GObject 

programming. \
+Vala compiles to plain C and has no runtime environment nor penalities whatsoever."

meta/recipes-devtools/vala/vala_0.56.15.bb +6 -0
+SECTION = "devel"
+DEPENDS = "bison-native flex-native glib-2.0 gobject-introspection"
 
+# Appending libxslt-native to dependencies has an effect
+# of rebuilding the manual, which is very slow. Let's do this
+# only when api-documentation distro feature is enabled.
+DEPENDS:append:class-target = " ${@bb.utils.contains 

<mailto:${@bb.utils.contains>('DISTRO_FEATURES', 'api-documentation', 'libxslt-native', '', d)}"

meta/recipes-devtools/vala/vala_0.56.15.bb +2 -0
+
+# vala-native contains a native version of vapigen, which we use 

instead of the target one

meta/recipes-devtools/vala/vala_0.56.15.bb +4 -0
+DEPENDS:append:class-target = " vala-native"
+BBCLASSEXTEND = "native"
+LICENSE = "LGPL-2.1-only"
+LIC_FILES_CHKSUM = 

"file://COPYING;md5=fbc093901857fcd118f065f900982c24" <file://copying;md5=fbc093901857fcd118f065f900982c24/>

meta/recipes-devtools/vala/vala_0.56.15.bb +2 -0
+
+SHRT_VER = "${@d.getVar 

<mailto:${@d.getVar>('PV').split('.')[0]}.${@d.getVar <mailto:}.${@d.getVar>('PV').split('.')[1]}"

meta/recipes-devtools/vala/vala_0.56.15.bb +3 -0
+
+SRC_URI = " \
+	http://ftp.gnome.org/pub/GNOME/sources/${BPN}/${SHRT_VER}/${BP}.tar.xz 

<http://ftp.gnome.org/pub/GNOME/sources/$%7BBPN%7D/$%7BSHRT_VER%7D/$%7BBP%7D.tar.xz> \

meta/recipes-devtools/vala/vala_0.56.15.bb +1 -0
+	file://0001-gtk4-Preserve-compatibility-with-4.14.patch 

<file://0001-gtk4-preserve-compatibility-with-4.14.patch/> \
+"
SRC_URI[sha256sum] =
"535b6452ed310fd5fb5c7dd6794b6213dac3b48e645e5bff3173741ec2cb3f2b"

meta/recipes-devtools/vala/vala_0.56.15.bb +4 -0
+
+inherit autotools pkgconfig upstream-version-is-even
+
+FILES:${PN} += "${datadir}/${BPN}-${SHRT_VER}/vapi 

${libdir}/${BPN}-${SHRT_VER}/"

meta/recipes-devtools/vala/vala_0.56.15.bb +3 -0
+FILES:${PN}-doc += "${datadir}/devhelp"
+
+# .gir files from gobject-introspection are installed to ${libdir} 

when multilib is enabled
+GIRDIR_OPT = "${@'--girdir=${STAGING_LIBDIR}/gir-1.0' if d.getVar('MULTILIBS') else ''}"

meta/recipes-devtools/vala/vala_0.56.15.bb +3 -0
+
+do_configure:prepend:class-target() {
+        # Write out a vapigen wrapper that will be provided by 

pkg-config file installed in target sysroot

meta/recipes-devtools/vala/vala_0.56.15.bb +11 -0
+        # The wrapper will call a native vapigen
+        cat > ${B}/vapigen-wrapper << EOF
+#!/bin/sh
+vapigen-${SHRT_VER} ${GIRDIR_OPT} "\$@"
+EOF
+        chmod +x ${B}/vapigen-wrapper
+}
+
+EXTRA_OECONF += " --disable-valadoc"
+
+# Vapigen wrapper needs to be available system-wide, because it will 

be used

meta/recipes-devtools/vala/vala_0.56.15.bb +7 -0
+# to build vapi files from all other packages with vala support
+do_install:append:class-target() {
+        install -d ${D}${bindir_crossscripts}/
+        install ${B}/vapigen-wrapper ${D}${bindir_crossscripts}/
+}
+
+# Put vapigen wrapper into target sysroot so that it can be used 

when building

meta/recipes-devtools/vala/vala_0.56.15.bb +7 -0
+# vapi files.
+SYSROOT_DIRS += "${bindir_crossscripts}"
+
+inherit multilib_script
+MULTILIB_SCRIPTS = "${PN}:${bindir}/vala-gen-introspect-0.56"
+
+SYSROOT_PREPROCESS_FUNCS:append:class-target = " 

vapigen_sysroot_preprocess"

meta/recipes-devtools/vala/vala_0.56.15.bb +2 -0
+vapigen_sysroot_preprocess() {
+        # Tweak the vapigen name in the vapigen pkgconfig file, so 

that it picks

meta/recipes-devtools/vala/vala_0.56.15.bb +3 -0
+        # up our wrapper.
+        sed -i \
+           -e 

"s|vapigen=.*|vapigen=${bindir_crossscripts}/vapigen-wrapper|" \
+ ${SYSROOT_DESTDIR}${libdir}/pkgconfig/vapigen-${SHRT_VER}.pc

meta/recipes-devtools/vala/vala_0.56.15.bb +10 -1
+}
+
+SSTATE_SCAN_FILES += "vapigen-wrapper"
+
+PACKAGE_PREPROCESS_FUNCS += "vala_package_preprocess"
+
+vala_package_preprocess () {
+	rm -rf ${PKGD}${bindir_crossscripts}
+}
+
--

2.44.0

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#196915): <https://lists.openembedded.org/g/openembedded-core/message/196915>
Mute This Topic: <https://lists.openembedded.org/mt/104858822/3618223>
Group Owner: [email protected] <mailto:[email protected]>
Unsubscribe: <https://lists.openembedded.org/g/openembedded-core/unsub> [[email protected] <mailto:[email protected]>]
-=-=-=-=-=-=-=-=-=-=-=-