diff options
| -rw-r--r-- | meta/recipes-devtools/vala/vala/0001-gtk4-Preserve-compatibility-with-4.14.patch | 39 | ||||
| -rw-r--r-- | meta/recipes-devtools/vala/vala_0.56.16.bb (renamed from meta/recipes-devtools/vala/vala_0.56.15.bb) | 7 |
2 files changed, 2 insertions, 44 deletions
diff --git a/meta/recipes-devtools/vala/vala/0001-gtk4-Preserve-compatibility-with-4.14.patch b/meta/recipes-devtools/vala/vala/0001-gtk4-Preserve-compatibility-with-4.14.patch deleted file mode 100644 index 161474086e..0000000000 --- a/meta/recipes-devtools/vala/vala/0001-gtk4-Preserve-compatibility-with-4.14.patch +++ /dev/null | |||
| @@ -1,39 +0,0 @@ | |||
| 1 | From 17349020fb95454d06f827fd555b05248f10a370 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Rico Tzschichholz <ricotz@ubuntu.com> | ||
| 3 | Date: Thu, 7 Mar 2024 17:56:05 +0100 | ||
| 4 | Subject: [PATCH] gtk4: Preserve compatibility with < 4.14 | ||
| 5 | |||
| 6 | Don't prefer new accessor methods for Calendar.day/month/year | ||
| 7 | |||
| 8 | Fixes https://gitlab.gnome.org/GNOME/vala/issues/1531 | ||
| 9 | |||
| 10 | Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/vala/-/commit/e0c4ea8c4a0bbf859b5341a7465b395892789d9e] | ||
| 11 | |||
| 12 | Signed-off-by: Markus Volk <f_l_k@t-online.de> | ||
| 13 | --- | ||
| 14 | vapi/gtk4.vapi | 3 +++ | ||
| 15 | vapi/metadata/Gtk-4.0.metadata | 5 +++++ | ||
| 16 | 2 files changed, 8 insertions(+) | ||
| 17 | |||
| 18 | diff --git a/vapi/gtk4.vapi b/vapi/gtk4.vapi | ||
| 19 | index 49f8b2078..51ecea27d 100644 | ||
| 20 | --- a/vapi/gtk4.vapi | ||
| 21 | +++ b/vapi/gtk4.vapi | ||
| 22 | @@ -7350,11 +7350,14 @@ namespace Gtk { | ||
| 23 | [Version (since = "4.14")] | ||
| 24 | public void set_year (int year); | ||
| 25 | public void unmark_day (uint day); | ||
| 26 | + [NoAccessorMethod] | ||
| 27 | public int day { get; set; } | ||
| 28 | + [NoAccessorMethod] | ||
| 29 | public int month { get; set; } | ||
| 30 | public bool show_day_names { get; set; } | ||
| 31 | public bool show_heading { get; set; } | ||
| 32 | public bool show_week_numbers { get; set; } | ||
| 33 | + [NoAccessorMethod] | ||
| 34 | public int year { get; set; } | ||
| 35 | public signal void day_selected (); | ||
| 36 | public signal void next_month (); | ||
| 37 | -- | ||
| 38 | 2.44.0 | ||
| 39 | |||
diff --git a/meta/recipes-devtools/vala/vala_0.56.15.bb b/meta/recipes-devtools/vala/vala_0.56.16.bb index 915ddd8e4d..1c8e4fc673 100644 --- a/meta/recipes-devtools/vala/vala_0.56.15.bb +++ b/meta/recipes-devtools/vala/vala_0.56.16.bb | |||
| @@ -18,11 +18,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" | |||
| 18 | 18 | ||
| 19 | SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" | 19 | SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" |
| 20 | 20 | ||
| 21 | SRC_URI = " \ | 21 | SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${BPN}/${SHRT_VER}/${BP}.tar.xz" |
| 22 | http://ftp.gnome.org/pub/GNOME/sources/${BPN}/${SHRT_VER}/${BP}.tar.xz \ | 22 | SRC_URI[sha256sum] = "05487b5600f5d2f09e66a753cccd8f39c1bff9f148aea1b7774d505b9c8bca9b" |
| 23 | file://0001-gtk4-Preserve-compatibility-with-4.14.patch \ | ||
| 24 | " | ||
| 25 | SRC_URI[sha256sum] = "535b6452ed310fd5fb5c7dd6794b6213dac3b48e645e5bff3173741ec2cb3f2b" | ||
| 26 | 23 | ||
| 27 | inherit autotools pkgconfig upstream-version-is-even | 24 | inherit autotools pkgconfig upstream-version-is-even |
| 28 | 25 | ||
