aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-gnome
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@gmail.com>2021-06-09 08:38:16 +0200
committerKhem Raj <raj.khem@gmail.com>2021-06-09 08:49:21 -0700
commit2a4a7cf0a9c2f38a7d835f263e4b23edb87e7752 (patch)
treec6a989af39b47a66255886dd42563284ecb8d382 /meta-oe/recipes-gnome
parent832e270c867bca0b7b72a126ad695569fed9ff3f (diff)
downloadmeta-openembedded-contrib-2a4a7cf0a9c2f38a7d835f263e4b23edb87e7752.tar.gz
gtkmm3: upgrade 3.24.3 -> 3.24.5
Submitted patch was applied 3.24.5 (stable): Gtk: * TreeValueProxy: Mark the copy assignment operator as deleted (Daniel Boles) Issue #94, merge request !63 Build: * Meson build: Use relative paths to untracked/ (Mingli Yu) Merge request !61 * [gdk|gtk]mmconfig.h.*: Don't dllimport on MinGW (Chun-wei Fan) Issue #90 (Lukas K.) * Meson build: Make it possible to use gtkmm as a subproject (Kjell Ahlstedt) Merge request !62 (BogDan Vatra) * Meson build: No implicit_include_directories (Kjell Ahlstedt) * MSVC build: Gtk::TreeModelColumnRecord: Export class selectively (Chun-wei Fan) 3.24.4 (stable): The tarball for 3.24.4 has been created with 'meson dist'. If you build with Autotools from the tarball, please read the relevant part of the README file. Build on Windows: * Gtk::TreePath: Export comparison operators (Chun-wei Fan) Issue #88 (Patrick Storz) (Chun-wei Fan) Merge request !58 Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-gnome')
-rw-r--r--meta-oe/recipes-gnome/gtk+/gtkmm/0001-meson.build-use-relative-path.patch52
-rw-r--r--meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.5.bb (renamed from meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.3.bb)5
2 files changed, 1 insertions, 56 deletions
diff --git a/meta-oe/recipes-gnome/gtk+/gtkmm/0001-meson.build-use-relative-path.patch b/meta-oe/recipes-gnome/gtk+/gtkmm/0001-meson.build-use-relative-path.patch
deleted file mode 100644
index 46a6916434..0000000000
--- a/meta-oe/recipes-gnome/gtk+/gtkmm/0001-meson.build-use-relative-path.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 152d295a28567ac87b0e6db2e62c0d914b1d7ef9 Mon Sep 17 00:00:00 2001
-From: Mingli Yu <mingli.yu@windriver.com>
-Date: Tue, 23 Feb 2021 08:47:54 +0000
-Subject: [PATCH] meson.build: use relative path
-
-Fixes:
-Fatal error: can't create
-gdk/gdkmm/libgdkmm-3.0.so.1.1.0.p/_buildarea1_master-wr_build_Userspace_auto-usrmerge_standalone_usrmerge_next_210222_lxbuilds_Har12345_platform_up_intel-x86-64-standard-glibc-std_wrlinux_build_tmp-glibc_work_corei7-64-wrs-linux_gtkmm3_3.24.3-r0_gtkmm-3.24.3_untracked_gdk_gdkmm_timecoord.cc.o: File name too long
-
-Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gtkmm/-/merge_requests/61]
-
-Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
----
- gdk/gdkmm/meson.build | 4 ++--
- gtk/gtkmm/meson.build | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/gdk/gdkmm/meson.build b/gdk/gdkmm/meson.build
-index afccaea..240ce4d 100644
---- a/gdk/gdkmm/meson.build
-+++ b/gdk/gdkmm/meson.build
-@@ -200,9 +200,9 @@ else # not maintainer_mode
- gdkmm_hg_ccg_basenames,
- )
-
-- built_cc_files = [ src_untracked_gdkmm / 'wrap_init.cc' ]
-+ built_cc_files = [ '../..' / untracked_gdkmm / 'wrap_init.cc' ]
- foreach file : gdkmm_used_hg_ccg_basenames
-- built_cc_files += src_untracked_gdkmm / file + '.cc'
-+ built_cc_files += '../..' / untracked_gdkmm / file + '.cc'
- endforeach
-
- gdk_gen_sources = built_cc_files
-diff --git a/gtk/gtkmm/meson.build b/gtk/gtkmm/meson.build
-index ab96a22..cc0c050 100644
---- a/gtk/gtkmm/meson.build
-+++ b/gtk/gtkmm/meson.build
-@@ -464,9 +464,9 @@ else # not maintainer_mode
- gtkmm_hg_ccg_basenames,
- )
-
-- built_cc_files = [ src_untracked_gtkmm / 'wrap_init.cc' ]
-+ built_cc_files = [ '../..' / untracked_gtkmm / 'wrap_init.cc' ]
- foreach file : gtkmm_used_hg_ccg_basenames
-- built_cc_files += src_untracked_gtkmm / file + '.cc'
-+ built_cc_files += '../..' / untracked_gtkmm / file + '.cc'
- endforeach
-
- gtk_gen_sources = built_cc_files
---
-2.29.2
-
diff --git a/meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.3.bb b/meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.5.bb
index 1648e37fa8..2c5012cb2e 100644
--- a/meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.3.bb
+++ b/meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.5.bb
@@ -16,10 +16,7 @@ inherit gnomebase features_check
REQUIRED_DISTRO_FEATURES = "x11"
-SRC_URI += "file://0001-meson.build-use-relative-path.patch \
-"
-
-SRC_URI[archive.sha256sum] = "60497c4f7f354c3bd2557485f0254f8b7b4cf4bebc9fee0be26a77744eacd435"
+SRC_URI[archive.sha256sum] = "856333de86689f6a81c123f2db15d85db9addc438bc3574c36f15736aeae22e6"
EXTRA_OEMESON = "-Dbuild-demos=false"