diff options
Diffstat (limited to 'meta-oe/recipes-gnome/gtk+')
-rw-r--r-- | meta-oe/recipes-gnome/gtk+/files/0001-do-not-build-demos.patch | 51 | ||||
-rw-r--r-- | meta-oe/recipes-gnome/gtk+/gtk+.inc | 18 | ||||
-rw-r--r-- | meta-oe/recipes-gnome/gtk+/gtk+/0001-Fix-signature-of-create_menu-function.patch | 50 | ||||
-rw-r--r-- | meta-oe/recipes-gnome/gtk+/gtk+/hardcoded_libtool.patch | 36 | ||||
-rw-r--r-- | meta-oe/recipes-gnome/gtk+/gtk+_2.24.33.bb (renamed from meta-oe/recipes-gnome/gtk+/gtk+_2.24.32.bb) | 11 | ||||
-rw-r--r-- | meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.2.bb | 23 | ||||
-rw-r--r-- | meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.7.bb | 22 | ||||
-rw-r--r-- | meta-oe/recipes-gnome/gtk+/gtkmm4_4.14.0.bb | 21 | ||||
-rw-r--r-- | meta-oe/recipes-gnome/gtk+/gtkmm_2.24.5.bb | 5 |
9 files changed, 111 insertions, 126 deletions
diff --git a/meta-oe/recipes-gnome/gtk+/files/0001-do-not-build-demos.patch b/meta-oe/recipes-gnome/gtk+/files/0001-do-not-build-demos.patch deleted file mode 100644 index 176e979982..0000000000 --- a/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-oe/recipes-gnome/gtk+/gtk+.inc b/meta-oe/recipes-gnome/gtk+/gtk+.inc index ccbcfc8da4..f2af7c920e 100644 --- a/meta-oe/recipes-gnome/gtk+/gtk+.inc +++ b/meta-oe/recipes-gnome/gtk+/gtk+.inc @@ -4,7 +4,7 @@ set of widgets, GTK+ is suitable for projects ranging from small one-off project HOMEPAGE = "http://www.gtk.org" BUGTRACKER = "https://bugzilla.gnome.org/" -LICENSE = "LGPLv2 & LGPLv2+ & LGPLv2.1+" +LICENSE = "LGPL-2.0-only & LGPL-2.0-or-later & LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" @@ -32,12 +32,12 @@ inherit autotools gtk-doc pkgconfig update-alternatives gtk-immodules-cache gobj PACKAGES += "libgail gtk-demo" -FILES_${PN} += "${bindir}/gtk-update-icon-cache-2.0 \ +FILES:${PN} += "${bindir}/gtk-update-icon-cache-2.0 \ ${bindir}/gtk-query-immodules-2.0 \ ${datadir}/themes ${sysconfdir} \ ${libdir}/gtk-2.0/${LIBV}/engines/libpixmap.so" -FILES_${PN}-dev += " \ +FILES:${PN}-dev += " \ ${datadir}/gtk-2.0/include \ ${libdir}/gtk-2.0/include \ ${libdir}/gtk-2.0/modules/*.la \ @@ -47,12 +47,12 @@ FILES_${PN}-dev += " \ ${libdir}/gtk-2.0/${LIBV}/engines/*.la \ ${bindir}/gtk-builder-convert" -FILES_gtk-demo = " \ +FILES:gtk-demo = " \ ${datadir}/gtk-2.0/demo/* \ ${bindir}/gtk-demo \ " -FILES_libgail = " \ +FILES:libgail = " \ ${libdir}/gtk-2.0/modules/libgail.so \ ${libdir}/gtk-2.0/modules/libferret.so \ " @@ -67,13 +67,13 @@ GTKBASE_RRECOMMENDS ?= "liberation-fonts \ " GTKGLIBC_RRECOMMENDS ?= "${GTKBASE_RRECOMMENDS} glibc-gconv-iso8859-1" -RRECOMMENDS_${PN} = "${GTKBASE_RRECOMMENDS}" -RRECOMMENDS_${PN}_libc-glibc = "${GTKGLIBC_RRECOMMENDS}" +RRECOMMENDS:${PN} = "${GTKBASE_RRECOMMENDS}" +RRECOMMENDS:${PN}:libc-glibc = "${GTKGLIBC_RRECOMMENDS}" -ALTERNATIVE_${PN} = "gtk-update-icon-cache" +ALTERNATIVE:${PN} = "gtk-update-icon-cache" ALTERNATIVE_TARGET[gtk-update-icon-cache] = "${bindir}/gtk-update-icon-cache-2.0" -do_compile_prepend() { +do_compile:prepend() { export GIR_EXTRA_LIBS_PATH="${B}/gdk/.libs" } diff --git a/meta-oe/recipes-gnome/gtk+/gtk+/0001-Fix-signature-of-create_menu-function.patch b/meta-oe/recipes-gnome/gtk+/gtk+/0001-Fix-signature-of-create_menu-function.patch new file mode 100644 index 0000000000..6b5f928391 --- /dev/null +++ b/meta-oe/recipes-gnome/gtk+/gtk+/0001-Fix-signature-of-create_menu-function.patch @@ -0,0 +1,50 @@ +From a703e2406fda3dc150574ae2f90cb5f4810d0601 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 29 Aug 2022 00:25:19 -0700 +Subject: [PATCH] Fix signature of create_menu() function + +Upstream-Status: Inappropriate [EOL] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + tests/testmenubars.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/tests/testmenubars.c b/tests/testmenubars.c +index 416a939..7f247f8 100644 +--- a/tests/testmenubars.c ++++ b/tests/testmenubars.c +@@ -21,7 +21,7 @@ + #include <gtk/gtk.h> + + static GtkWidget * +-create_menu (depth) ++create_menu (int depth) + { + GtkWidget *menu; + GtkWidget *menuitem; +@@ -70,19 +70,19 @@ create_menubar (GtkPackDirection pack_dir, + menuitem = gtk_image_menu_item_new_from_stock (GTK_STOCK_HOME, NULL); + gtk_menu_shell_append (GTK_MENU_SHELL (menubar), menuitem); + gtk_label_set_angle (GTK_LABEL (GTK_BIN (menuitem)->child), angle); +- menu = create_menu (2, TRUE); ++ menu = create_menu (2); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), menu); + + menuitem = gtk_menu_item_new_with_label ("foo"); + gtk_menu_shell_append (GTK_MENU_SHELL (menubar), menuitem); + gtk_label_set_angle (GTK_LABEL (GTK_BIN (menuitem)->child), angle); +- menu = create_menu (2, TRUE); ++ menu = create_menu (2); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), menu); + + menuitem = gtk_menu_item_new_with_label ("bar"); + gtk_menu_shell_append (GTK_MENU_SHELL (menubar), menuitem); + gtk_label_set_angle (GTK_LABEL (GTK_BIN (menuitem)->child), angle); +- menu = create_menu (2, TRUE); ++ menu = create_menu (2); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), menu); + + return menubar; +-- +2.37.2 + diff --git a/meta-oe/recipes-gnome/gtk+/gtk+/hardcoded_libtool.patch b/meta-oe/recipes-gnome/gtk+/gtk+/hardcoded_libtool.patch deleted file mode 100644 index 9eb7f6bf5c..0000000000 --- a/meta-oe/recipes-gnome/gtk+/gtk+/hardcoded_libtool.patch +++ /dev/null @@ -1,36 +0,0 @@ -Upstream-Status: Inappropriate [embedded specific] - -Updated to apply to gtk+-2.24.15 - -Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> -Index: gtk+-2.24.31/configure.ac -=================================================================== ---- gtk+-2.24.31.orig/configure.ac -+++ gtk+-2.24.31/configure.ac -@@ -415,7 +415,7 @@ AC_MSG_CHECKING([Whether to write depend - case $enable_explicit_deps in - auto) - export SED -- deplibs_check_method=`(./libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh` -+ deplibs_check_method=`(./$host_alias-libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh` - if test "x$deplibs_check_method" '!=' xpass_all || test "x$enable_static" = xyes ; then - enable_explicit_deps=yes - else -@@ -772,7 +772,7 @@ else - dnl Now we check to see if our libtool supports shared lib deps - dnl (in a rather ugly way even) - if $dynworks; then -- module_libtool_config="${CONFIG_SHELL-/bin/sh} ./libtool --config" -+ module_libtool_config="${CONFIG_SHELL-/bin/sh} $host_alias-libtool --config" - module_deplibs_check=`$module_libtool_config | \ - grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \ - sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'` -@@ -1579,7 +1579,7 @@ fi - # We are using gmodule-no-export now, but I'm leaving the stripping - # code in place for now, since pango and atk still require gmodule. - export SED --export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` -+export_dynamic=`($host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` - if test -n "$export_dynamic"; then - GDK_DEP_LIBS=`echo $GDK_DEP_LIBS | sed -e "s/$export_dynamic//"` - GTK_DEP_LIBS=`echo $GTK_DEP_LIBS | sed -e "s/$export_dynamic//"` diff --git a/meta-oe/recipes-gnome/gtk+/gtk+_2.24.32.bb b/meta-oe/recipes-gnome/gtk+/gtk+_2.24.33.bb index 682d31e49e..74b0531414 100644 --- a/meta-oe/recipes-gnome/gtk+/gtk+_2.24.32.bb +++ b/meta-oe/recipes-gnome/gtk+/gtk+_2.24.33.bb @@ -6,15 +6,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ file://tests/testgtk.c;endline=27;md5=262db5db5f776f9863e56df31423e24c" SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${PV}.tar.xz \ file://xsettings.patch \ - file://hardcoded_libtool.patch \ file://toggle-font.diff;striplevel=0 \ file://doc-fixes.patch \ file://strict-prototypes.patch \ file://0001-Do-not-look-into-HOME-when-looking-for-gtk-modules.patch \ + file://0001-Fix-signature-of-create_menu-function.patch \ " -SRC_URI[md5sum] = "d5742aa42275203a499b59b4c382a784" -SRC_URI[sha256sum] = "b6c8a93ddda5eabe3bfee1eb39636c9a03d2a56c7b62828b359bf197943c582e" +SRC_URI[sha256sum] = "ac2ac757f5942d318a311a54b0c80b5ef295f299c2a73c632f6bfb1ff49cc6da" EXTRA_OECONF = "--enable-xkb --disable-glibtest --disable-cups --disable-xinerama" @@ -22,7 +21,7 @@ LIBV = "2.10.0" PACKAGES_DYNAMIC += "^gtk-immodule-.* ^gtk-printbackend-.*" -python populate_packages_prepend () { +python populate_packages:prepend () { gtk_libdir = d.expand('${libdir}/gtk-2.0/${LIBV}') immodules_root = os.path.join(gtk_libdir, 'immodules') printmodules_root = os.path.join(gtk_libdir, 'printbackends'); @@ -31,5 +30,7 @@ python populate_packages_prepend () { do_split_packages(d, printmodules_root, r'^libprintbackend-(.*)\.so$', 'gtk-printbackend-%s', 'GTK printbackend module for %s') if (d.getVar('DEBIAN_NAMES')): - d.setVar(d.expand('PKG_${PN}'), '${MLPREFIX}libgtk-2.0') + d.setVar(d.expand('PKG:${PN}'), '${MLPREFIX}libgtk-2.0') } + +CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.2.bb b/meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.2.bb deleted file mode 100644 index adc38d8cff..0000000000 --- a/meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.2.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "C++ bindings for the GTK+ toolkit V3" -HOMEPAGE = "http://www.gtkmm.org/" -SECTION = "libs" - -LICENSE = "LGPLv2.1 & GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ - file://COPYING.tools;md5=751419260aa954499f7abaabaa882bbe" - -DEPENDS = "atkmm pangomm glibmm gtk+3 cairomm" - -BPN = "gtkmm" - -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" - -EXTRA_OECONF = " --disable-documentation " - -FILES_${PN}-dev += "${libdir}/*/include ${libdir}/*/proc/m4" diff --git a/meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.7.bb b/meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.7.bb new file mode 100644 index 0000000000..cac6474e73 --- /dev/null +++ b/meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.7.bb @@ -0,0 +1,22 @@ +SUMMARY = "C++ bindings for the GTK+ toolkit V3" +HOMEPAGE = "http://www.gtkmm.org/" +SECTION = "libs" + +LICENSE = "LGPL-2.1-only & GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ + file://COPYING.tools;md5=751419260aa954499f7abaabaa882bbe" + +DEPENDS = "glib-2.0-native atkmm pangomm glibmm gtk+3 cairomm gdk-pixbuf-native" + +BPN = "gtkmm" + + +inherit gnomebase features_check + +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" + +SRC_URI[archive.sha256sum] = "1d7a35af9c5ceccacb244ee3c2deb9b245720d8510ac5c7e6f4b6f9947e6789c" + +EXTRA_OEMESON = "-Dbuild-demos=false" + +FILES:${PN}-dev += "${libdir}/*/include ${libdir}/*/proc/m4" diff --git a/meta-oe/recipes-gnome/gtk+/gtkmm4_4.14.0.bb b/meta-oe/recipes-gnome/gtk+/gtkmm4_4.14.0.bb new file mode 100644 index 0000000000..d3a01e444c --- /dev/null +++ b/meta-oe/recipes-gnome/gtk+/gtkmm4_4.14.0.bb @@ -0,0 +1,21 @@ +SUMMARY = "C++ bindings for the GTK+ toolkit V4" +HOMEPAGE = "http://www.gtkmm.org/" +SECTION = "libs" + +LICENSE = "LGPL-2.1-only & GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ + file://COPYING.tools;md5=751419260aa954499f7abaabaa882bbe" + +DEPENDS = "glib-2.0-native atkmm pangomm-2.48 glibmm gtk4 cairomm-1.16 gdk-pixbuf-native" + +BPN = "gtkmm" + +inherit gnomebase features_check + +REQUIRED_DISTRO_FEATURES = "opengl x11" + +SRC_URI[archive.sha256sum] = "9350a0444b744ca3dc69586ebd1b6707520922b6d9f4f232103ce603a271ecda" + +EXTRA_OEMESON = "-Dbuild-demos=false" + +FILES:${PN}-dev += "${libdir}/*/include ${libdir}/*/proc/m4" diff --git a/meta-oe/recipes-gnome/gtk+/gtkmm_2.24.5.bb b/meta-oe/recipes-gnome/gtk+/gtkmm_2.24.5.bb index bb179447b8..87b0f5e65d 100644 --- a/meta-oe/recipes-gnome/gtk+/gtkmm_2.24.5.bb +++ b/meta-oe/recipes-gnome/gtk+/gtkmm_2.24.5.bb @@ -2,12 +2,13 @@ SUMMARY = "C++ bindings for the GTK+ toolkit" HOMEPAGE = "http://www.gtkmm.org/" SECTION = "libs" -LICENSE = "LGPLv2.1 & GPLv2" +LICENSE = "LGPL-2.1-only & GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499 \ file://COPYING.tools;md5=751419260aa954499f7abaabaa882bbe" DEPENDS = "atkmm pangomm glibmm gtk+ cairomm" +GNOMEBASEBUILDCLASS = "autotools" inherit gnomebase features_check REQUIRED_DISTRO_FEATURES = "x11" @@ -17,4 +18,4 @@ SRC_URI[archive.sha256sum] = "0680a53b7bf90b4e4bf444d1d89e6df41c777e0bacc96e9c09 EXTRA_OECONF = " --disable-documentation " -FILES_${PN}-dev += "${libdir}/*/include ${libdir}/*/proc/m4" +FILES:${PN}-dev += "${libdir}/*/include ${libdir}/*/proc/m4" |