diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-gnome/gtk+')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-gnome/gtk+/files/0001-do-not-build-demos.patch | 51 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-gnome/gtk+/gtk+_2.24.33.bb (renamed from meta-openembedded/meta-oe/recipes-gnome/gtk+/gtk+_2.24.32.bb) | 3 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-gnome/gtk+/gtkmm/0001-meson.build-use-relative-path.patch | 52 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.3.bb (renamed from meta-openembedded/meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.2.bb) | 13 |
4 files changed, 61 insertions, 58 deletions
diff --git a/meta-openembedded/meta-oe/recipes-gnome/gtk+/files/0001-do-not-build-demos.patch b/meta-openembedded/meta-oe/recipes-gnome/gtk+/files/0001-do-not-build-demos.patch deleted file mode 100644 index 176e97998..000000000 --- a/meta-openembedded/meta-oe/recipes-gnome/gtk+/files/0001-do-not-build-demos.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 6914eccee34376f9067b0ee9f17039fe182125e8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> -Date: Sat, 31 Mar 2018 22:29:16 +0200 -Subject: [PATCH] do not build demos -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -They are not installed anyway and add libepoxy dependency - -Upstream-Status: Pending - -Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> ---- - Makefile.am | 3 ++- - configure.ac | 3 --- - 2 files changed, 2 insertions(+), 4 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 984b6a7..6c754a6 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -28,7 +28,8 @@ doc_subdirs = docs - else - doc_subdirs = - endif --SUBDIRS = tools $(src_subdirs) gdk/gdkmm gtk/gtkmm tests demos $(doc_subdirs) -+ -+SUBDIRS = tools $(src_subdirs) gdk/gdkmm gtk/gtkmm tests $(doc_subdirs) - - gdkmm_includedir = $(includedir)/$(GDKMM_MODULE_NAME) - gdkmm_include_HEADERS = gdk/gdkmm.h -diff --git a/configure.ac b/configure.ac -index e5e82dc..c1c7658 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -109,11 +109,8 @@ AS_IF([test "x$gtkmm_enable_api_atkmm" != xno], - [GTKMM_MODULES="atkmm-1.6 >= 2.24.2 $GTKMM_MODULES"]) - AC_SUBST([GTKMM_MODULES]) - --AC_SUBST([GTKMM_DEMOS_EXTRA_MODULES], ['epoxy >= 1.2']) -- - PKG_CHECK_MODULES([GDKMM], [$GDKMM_MODULES]) - PKG_CHECK_MODULES([GTKMM], [$GTKMM_MODULES]) --PKG_CHECK_MODULES([GTKMM_DEMOS_EXTRA], [$GTKMM_DEMOS_EXTRA_MODULES]) - - MM_PKG_CONFIG_SUBST([GTHREAD_CFLAGS], [--cflags-only-other gthread-2.0]) - MM_PKG_CONFIG_SUBST([GTHREAD_LIBS], [--libs gthread-2.0]) --- -2.14.3 - diff --git a/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtk+_2.24.32.bb b/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtk+_2.24.33.bb index 682d31e49..0c2e353a9 100644 --- a/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtk+_2.24.32.bb +++ b/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtk+_2.24.33.bb @@ -13,8 +13,7 @@ SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${PV}.tar.xz \ file://0001-Do-not-look-into-HOME-when-looking-for-gtk-modules.patch \ " -SRC_URI[md5sum] = "d5742aa42275203a499b59b4c382a784" -SRC_URI[sha256sum] = "b6c8a93ddda5eabe3bfee1eb39636c9a03d2a56c7b62828b359bf197943c582e" +SRC_URI[sha256sum] = "ac2ac757f5942d318a311a54b0c80b5ef295f299c2a73c632f6bfb1ff49cc6da" EXTRA_OECONF = "--enable-xkb --disable-glibtest --disable-cups --disable-xinerama" diff --git a/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtkmm/0001-meson.build-use-relative-path.patch b/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtkmm/0001-meson.build-use-relative-path.patch new file mode 100644 index 000000000..46a691643 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtkmm/0001-meson.build-use-relative-path.patch @@ -0,0 +1,52 @@ +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-openembedded/meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.2.bb b/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.3.bb index adc38d8cf..1648e37fa 100644 --- a/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.2.bb +++ b/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.3.bb @@ -6,18 +6,21 @@ LICENSE = "LGPLv2.1 & GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ file://COPYING.tools;md5=751419260aa954499f7abaabaa882bbe" -DEPENDS = "atkmm pangomm glibmm gtk+3 cairomm" +DEPENDS = "glib-2.0-native atkmm pangomm glibmm gtk+3 cairomm" BPN = "gtkmm" +GNOMEBASEBUILDCLASS = "meson" + inherit gnomebase features_check REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[archive.md5sum] = "e311db484ca9c53f1689d35f5f58a06b" -SRC_URI[archive.sha256sum] = "6d71091bcd1863133460d4188d04102810e9123de19706fb656b7bb915b4adc3" -SRC_URI += "file://0001-do-not-build-demos.patch" +SRC_URI += "file://0001-meson.build-use-relative-path.patch \ +" + +SRC_URI[archive.sha256sum] = "60497c4f7f354c3bd2557485f0254f8b7b4cf4bebc9fee0be26a77744eacd435" -EXTRA_OECONF = " --disable-documentation " +EXTRA_OEMESON = "-Dbuild-demos=false" FILES_${PN}-dev += "${libdir}/*/include ${libdir}/*/proc/m4" |