Skip to contentSkip to conversation

alsa-utils: disable tools using GTK+2

RFC PATCH In review Ross Burton 4 participants 7 messages Jul 5, 2019 – Jul 10, 2019

lore
Share & tools
lore

Ross Burton

author
#0 lore raw

RFC PATCH 1/4 alsa-utils: disable tools using GTK+2

Change the default configuration so that it doesn't need GTK+ 2 to build, as GTK+ 2 is obsolete.

Signed-off-by Ross Burton <[email protected]>
---
 meta/recipes-multimedia/alsa/alsa-tools_1.1.7.bb | 1 -
 1 file changed, 1 deletion(-)
meta/recipes-multimedia/alsa/alsa-tools_1.1.7.bb +0 -1
index e1b50fac523..c1f4acdb038 100644
@@ -22,7 +22,6 @@ CLEANBROKEN = "1"
 # Remember on upgrades to check that no new tools have been added.
 PACKAGECONFIG ??= "as10k1 hdajacksensetest hda-verb hdsploader ld10k1 mixartloader pcxhrloader \
                    sb16_csp seq--sbiload sscape_ctl us428control usx2yloader vxloader \
-                   ${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK2DISTROFEATURES}', 'echomixer envy24control rmedigicontrol', '', d)} \
                    ${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', 'hdajackretask', '', d)} \
                    "
Signature · 1 line
2.11.0
author
#1 lore raw

RFC PATCH 2/4 packagegroup-core-lsb: remove GTK+

GTK+ 2 is being removed from oe-core, so remove it from the oe-core LSB packagegroup.

Also document the fact that GTK+ 2 is no longer part of the LSB packagegroup, and point to meta-oe for the recipe if required.

Signed-off-by Ross Burton <[email protected]>
---
 README.LSB                                                   | 3 +++
 meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb | 2 --
 2 files changed, 3 insertions(+), 2 deletions(-)
README.LSB +3 -0
index f68d07c9e03..922c9dd5aca 100644
@@ -12,6 +12,9 @@ therefore provides compatibility with the following caveats:
   tests any longer. Users are recommended to group together to support
   maintenance of that layer. [http://git.yoctoproject.org/cgit/cgit.cgi/meta-qt4/]
 
+* GTK+ 2 is provided by meta-oe.  It is lnoted that GTK+ 2 is end of life
+  and use of GTK+ 2 isn't recommended.
+
 * mailx has been dropped since its no longer being developed upstream 
   and there are better, more modern replacements such as s-nail 
   (http://sdaoden.eu/code.html) or mailutils (http://mailutils.org/).
meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb +0 -2
index e8dc4215927..a821fd8bf33 100644
@@ -218,8 +218,6 @@ RDEPENDS_packagegroup-core-lsb-desktop = "\
     gdk-pixbuf-loader-ani \
     gdk-pixbuf-xlib \
     liberation-fonts \
-    gtk+ \
-    atk \
     alsa-lib \
 "
Signature · 1 line
2.11.0
author
#2 lore raw

RFC PATCH 3/4 gtk+: remove GTK+ 2

In reply to Ross Burton

GTK+ 2 is ancient, and shouldn't be used. It will be moved to meta-oe for people who do need it, but it shouldn't in oe-core.

[ YOCTO #12673 ]

Signed-off-by Ross Burton <[email protected]>
---
 meta/recipes-gnome/gtk+/gtk+.inc                   | 107 ---------------------
 ...ok-into-HOME-when-looking-for-gtk-modules.patch |  29 ------
 meta/recipes-gnome/gtk+/gtk+/doc-fixes.patch       |  22 -----
 .../gtk+/gtk+/hardcoded_libtool.patch              |  36 -------
 .../gtk+/gtk+/strict-prototypes.patch              |  24 -----
 meta/recipes-gnome/gtk+/gtk+/toggle-font.diff      | 102 --------------------
 meta/recipes-gnome/gtk+/gtk+/xsettings.patch       |  20 ----
 meta/recipes-gnome/gtk+/gtk+_2.24.32.bb            |  35 -------
 8 files changed, 375 deletions(-)
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+.inc
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+/0001-Do-not-look-into-HOME-when-looking-for-gtk-modules.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+/doc-fixes.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+/hardcoded_libtool.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+/strict-prototypes.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+/toggle-font.diff
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+/xsettings.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+_2.24.32.bb
meta/recipes-gnome/gtk+/gtk+.inc deleted +0 -107
deleted file mode 100644
index d6d14a79d5a..00000000000
@@ -1,107 +0,0 @@
-SUMMARY = "Multi-platform toolkit for creating GUIs"
-DESCRIPTION = "GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete \
-set of widgets, GTK+ is suitable for projects ranging from small one-off projects to complete application suites."
-HOMEPAGE = "http://www.gtk.org"
-BUGTRACKER = "https://bugzilla.gnome.org/"
-
-LICENSE = "LGPLv2 & LGPLv2+ & LGPLv2.1+"
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
-
-SECTION = "libs"
-
-inherit distro_features_check
-ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}"
-
-# This picks stable releases in the 2.x series (but not 2.90 onwards,
-# which were GNOME 3 betas).
-UPSTREAM_CHECK_REGEX = "(?P<pver>2\.([0-8]*[02468])+(\.\d+)+)"
-
-X11DEPENDS = "virtual/libx11 libxext libxcursor libxrandr libxdamage libxrender libxcomposite"
-DEPENDS = "glib-2.0 pango atk jpeg libpng gdk-pixbuf-native \
- cairo gdk-pixbuf"
-
-PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'directfb x11', d)}"
-
-PACKAGECONFIG[x11] = "--with-x=yes --with-gdktarget=x11,--with-x=no,${X11DEPENDS}"
-# without --with-gdktarget=directfb it will check for cairo-xlib which isn't available without X11 DISTRO_FEATURE
-PACKAGECONFIG[directfb] = "--with-gdktarget=directfb,,directfb"
-PACKAGECONFIG[manpages] = "--enable-man --with-xml-catalog=${STAGING_ETCDIR_NATIVE}/xml/catalog, --disable-man, libxslt-native xmlto-native"
-
-inherit autotools gtk-doc pkgconfig update-alternatives gtk-immodules-cache gobject-introspection manpages
-
-PACKAGES += "libgail gtk-demo"
-
-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 += " \
-        ${datadir}/gtk-2.0/include \
-	${libdir}/gtk-2.0/include \
-	${libdir}/gtk-2.0/modules/*.la \
-	${libdir}/gtk-2.0/${LIBV}/loaders/*.la \
-	${libdir}/gtk-2.0/${LIBV}/immodules/*.la \
-	${libdir}/gtk-2.0/${LIBV}/printbackends/*.la \
-	${libdir}/gtk-2.0/${LIBV}/engines/*.la \
-	${bindir}/gtk-builder-convert"
-
-FILES_gtk-demo = " \
- ${datadir}/gtk-2.0/demo/* \
- ${bindir}/gtk-demo \
- "
-
-FILES_libgail = " \
-	${libdir}/gtk-2.0/modules/libgail.so \
-	${libdir}/gtk-2.0/modules/libferret.so \
-	"
-
-GTKBASE_RRECOMMENDS ?= "liberation-fonts \
-                        gdk-pixbuf-loader-png \
-                        gdk-pixbuf-loader-jpeg \
-                        gdk-pixbuf-loader-gif \
-                        gdk-pixbuf-loader-xpm \
-                        shared-mime-info \
-                        gnome-theme-adwaita \
-                        "
-GTKGLIBC_RRECOMMENDS ?= "${GTKBASE_RRECOMMENDS} glibc-gconv-iso8859-1"
-
-RRECOMMENDS_${PN} = "${GTKBASE_RRECOMMENDS}"
-RRECOMMENDS_${PN}_libc-glibc = "${GTKGLIBC_RRECOMMENDS}"
-
-ALTERNATIVE_${PN} = "gtk-update-icon-cache"
-ALTERNATIVE_TARGET[gtk-update-icon-cache] = "${bindir}/gtk-update-icon-cache-2.0"
-
-do_compile_prepend() {
-        export GIR_EXTRA_LIBS_PATH="${B}/gdk/.libs"
-}
-
-do_install () {
-	autotools_do_install
-
-	install -d ${D}${sysconfdir}/gtk-2.0
-
-	mkdir -p ${D}${libdir}/gtk-2.0/include
-	install -m 0644 gdk/gdkconfig.h ${D}${libdir}/gtk-2.0/include/gdkconfig.h
-
-	install -m 0644 ${S}/gtk/gtkfilechooserprivate.h ${D}${includedir}/gtk-2.0/gtk/
-	install -m 0644 ${S}/gtk/gtkfilechooserutils.h   ${D}${includedir}/gtk-2.0/gtk/
-	install -m 0644 ${S}/gtk/gtkfilesystemmodel.h    ${D}${includedir}/gtk-2.0/gtk/
-
-	mv ${D}${bindir}/gtk-update-icon-cache ${D}${bindir}/gtk-update-icon-cache-2.0
-
-    # duplicate gtk-query-immodules for post install script update_gtk_immodules_cache
-    mkdir -p ${D}${libexecdir}
-    ln ${D}${bindir}/gtk-query-immodules-2.0 ${D}${libexecdir}/${MLPREFIX}gtk-query-immodules-2.0
-}
-
-SYSROOT_PREPROCESS_FUNCS += "gtk_sysroot_preprocess"
-
-gtk_sysroot_preprocess () {
-	if [ -e ${D}${bindir}/gtk-builder-convert ]; then
-		install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/
-		install -m 755 ${D}${bindir}/gtk-builder-convert ${SYSROOT_DESTDIR}${bindir_crossscripts}/
-	fi
-}
-
meta/recipes-gnome/gtk+/gtk+/0001-Do-not-look-into-HOME-when-looking-for-gtk-modules.patch deleted +0 -29
deleted file mode 100644
index 83be39c3bf2..00000000000
@@ -1,29 +0,0 @@
-From 34ce93e1c50bfb88f92a687d4f82de55584f3f6a Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <[email protected]>
-Date: Wed, 11 Apr 2018 14:20:39 +0300
-Subject: [PATCH] Do not look into $HOME when looking for gtk modules
-
-On the host it causes host contamination, on the target it's a
-potential security issue. Gtk+3 has already removed this.
-
-Upstream-Status: Inappropriate [gtk2 is in maintenance mode]
-Signed-off-by: Alexander Kanavin <[email protected]>
----
- gtk/gtkmodules.c | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/gtk/gtkmodules.c b/gtk/gtkmodules.c
-index 50729b6..e09b583 100644
---- a/gtk/gtkmodules.c
-+++ b/gtk/gtkmodules.c
-@@ -65,10 +65,6 @@ get_module_path (void)
-   if (result)
-     return result;
- 
--  home_dir = g_get_home_dir();
--  if (home_dir)
--    home_gtk_dir = g_build_filename (home_dir, ".gtk-2.0", NULL);
--
-   module_path_env = g_getenv ("GTK_PATH");
-   exe_prefix = g_getenv ("GTK_EXE_PREFIX");
-
meta/recipes-gnome/gtk+/gtk+/doc-fixes.patch deleted +0 -22
deleted file mode 100644
index 74e479fd1bf..00000000000
@@ -1,22 +0,0 @@
-There are issues building the gtk+ tutorial and faq documentation.
-Since they were removed in gtk+ upstream and are superfluous in
-embedded applications, just don't build them.
-
-Thanks to Joshua Lock for suggesting this approach.
-
-Signed-off-by: Scott Garman <[email protected]>
-
-Upstream-Status: Inappropriate [embedded specific]
-
-diff -urN gtk+-2.22.1.orig/docs/Makefile.am gtk+-2.22.1/docs/Makefile.am
---- gtk+-2.22.1.orig/docs/Makefile.am	2010-11-15 04:13:09.000000000 -0800
-+++ gtk+-2.22.1/docs/Makefile.am	2011-02-23 19:25:16.914815097 -0800
-@@ -1,7 +1,7 @@
- ## Process this file with automake to produce Makefile.in
- include $(top_srcdir)/Makefile.decl
- 
--SUBDIRS = tutorial faq reference tools
-+SUBDIRS = reference tools
- 
- EXTRA_DIST += \
- 	defsformat.txt			\
meta/recipes-gnome/gtk+/gtk+/hardcoded_libtool.patch deleted +0 -36
deleted file mode 100644
index 9eb7f6bf5c7..00000000000
@@ -1,36 +0,0 @@
-Upstream-Status: Inappropriate [embedded specific]
-
-Updated to apply to gtk+-2.24.15
-
-Signed-off-by: Marko Lindqvist <[email protected]>
-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//"`
meta/recipes-gnome/gtk+/gtk+/strict-prototypes.patch deleted +0 -24
deleted file mode 100644
index 96e1f5feacb..00000000000
@@ -1,24 +0,0 @@
-Fixes
-
-include/gtk-2.0/gtk/gtkitemfactory.h:47:1: warning: function declaration isn't a prototype [-Wstrict-prototypes]
- typedef void (*GtkItemFactoryCallback)  ();
-
-gcc5 has -Wstrict-prototypes on by default for -Werror so this becomes a build failure for consumers
-of this header e.g. matchbox-panel-2
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj <[email protected]>
-Index: gtk+-2.24.27/gtk/gtkitemfactory.h
-===================================================================
---- gtk+-2.24.27.orig/gtk/gtkitemfactory.h
-+++ gtk+-2.24.27/gtk/gtkitemfactory.h
-@@ -44,7 +44,7 @@ typedef void	(*GtkPrintFunc)		   (gpoint
-  * (Note that if we are included from a C++ program () will mean
-  * (void) so an explicit cast will be needed.)
-  */
--typedef	void	(*GtkItemFactoryCallback)  ();
-+typedef	void	(*GtkItemFactoryCallback)  (void);
- typedef	void	(*GtkItemFactoryCallback1) (gpointer		 callback_data,
- 					    guint		 callback_action,
- 					    GtkWidget		*widget);
meta/recipes-gnome/gtk+/gtk+/toggle-font.diff deleted +0 -102

102 lines not on this page · raw message

meta/recipes-gnome/gtk+/gtk+/xsettings.patch deleted +0 -20
deleted file mode 100644
index d0a970ad4d4..00000000000
@@ -1,20 +0,0 @@
-Upstream-Status: Pending
-
-Index: gtk+-2.21.2/gdk/x11/gdkevents-x11.c
-===================================================================
---- gtk+-2.21.2.orig/gdk/x11/gdkevents-x11.c	2010-06-22 17:28:04.000000000 +0800
-+++ gtk+-2.21.2/gdk/x11/gdkevents-x11.c	2010-06-22 17:28:06.000000000 +0800
-@@ -3062,10 +3062,9 @@
- {
-   GdkScreenX11 *screen = data;
-   
--  if (xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent))
--    return GDK_FILTER_REMOVE;
--  else
--    return GDK_FILTER_CONTINUE;
-+  xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent);
-+
-+  return GDK_FILTER_CONTINUE;
- }
- 
- static Bool
meta/recipes-gnome/gtk+/gtk+_2.24.32.bb deleted +0 -35
deleted file mode 100644
index 682d31e49e2..00000000000
@@ -1,35 +0,0 @@
-require gtk+.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
-                    file://gtk/gtk.h;endline=27;md5=c59e0b4490dd135a5726ebf851f9b17f \
-                    file://gdk/gdk.h;endline=27;md5=07db285ec208fb3e0bf7d861b0614202 \
-                    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 \
-           "
-
-SRC_URI[md5sum] = "d5742aa42275203a499b59b4c382a784"
-SRC_URI[sha256sum] = "b6c8a93ddda5eabe3bfee1eb39636c9a03d2a56c7b62828b359bf197943c582e"
-
-EXTRA_OECONF = "--enable-xkb --disable-glibtest --disable-cups --disable-xinerama"
-
-LIBV = "2.10.0"
-
-PACKAGES_DYNAMIC += "^gtk-immodule-.* ^gtk-printbackend-.*"
-
-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');
-
-    d.setVar('GTKIMMODULES_PACKAGES', ' '.join(do_split_packages(d, immodules_root, r'^im-(.*)\.so$', 'gtk-immodule-%s', 'GTK input module for %s')))
-    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')
-}
Signature · 1 line
2.11.0
#3 lore raw

Re: [RFC PATCH 3/4] gtk+: remove GTK+ 2

This resulted in a oe-selftest failure for recipetool.RecipetoolTests.test_recipetool_create_cmake:

https://autobuilder.yoctoproject.org/typhoon/#/builders/87/builds/280/steps/7/logs/step2d

Thanks,

Anuj

Quoted 531 lines · Ross Burton

GTK+ 2 is ancient, and shouldn't be used. It will be moved to meta- oe for
people who do need it, but it shouldn't in oe-core.

[ YOCTO #12673 ]

Signed-off-by Ross Burton <[email protected]>
---
 meta/recipes-gnome/gtk+/gtk+.inc                   | 107 ---------
------------
 ...ok-into-HOME-when-looking-for-gtk-modules.patch |  29 ------
 meta/recipes-gnome/gtk+/gtk+/doc-fixes.patch       |  22 -----
 .../gtk+/gtk+/hardcoded_libtool.patch              |  36 -------
 .../gtk+/gtk+/strict-prototypes.patch              |  24 -----
 meta/recipes-gnome/gtk+/gtk+/toggle-font.diff      | 102 ---------
-----------
 meta/recipes-gnome/gtk+/gtk+/xsettings.patch       |  20 ----
 meta/recipes-gnome/gtk+/gtk+_2.24.32.bb            |  35 -------
 8 files changed, 375 deletions(-)
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+.inc
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+/0001-Do-not-look-
into-HOME-when-looking-for-gtk-modules.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+/doc-fixes.patch
 delete mode 100644 meta/recipes-
gnome/gtk+/gtk+/hardcoded_libtool.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+/strict-
prototypes.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+/toggle-font.diff
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+/xsettings.patch
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+_2.24.32.bb
meta/recipes- renamed from meta/recipes-gnome/gtk+/gtk+.inc +0 -0

gnome/gtk+/gtk+.inc
deleted file mode 100644
index d6d14a79d5a..00000000000

meta/recipes-gnome/gtk+/gtk+.inc deleted +0 -2
@@ -1,107 +0,0 @@
-SUMMARY = "Multi-platform toolkit for creating GUIs"
-DESCRIPTION = "GTK+ is a multi-platform toolkit for creating

graphical user interfaces. Offering a complete \
-set of widgets, GTK+ is suitable for projects ranging from small one-off projects to complete application suites."

meta/recipes-gnome/gtk+/gtk+.inc deleted +0 -6
-HOMEPAGE = "http://www.gtk.org"
-BUGTRACKER = "https://bugzilla.gnome.org/"
-
-LICENSE = "LGPLv2 & LGPLv2+ & LGPLv2.1+"
-
-LIC_FILES_CHKSUM =

"file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"

meta/recipes-gnome/gtk+/gtk+.inc deleted +0 -7
-
-SECTION = "libs"
-
-inherit distro_features_check
-ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}"
-
-# This picks stable releases in the 2.x series (but not 2.90

onwards,

meta/recipes-gnome/gtk+/gtk+.inc deleted +0 -4
-# which were GNOME 3 betas).
-UPSTREAM_CHECK_REGEX = "(?P<pver>2\.([0-8]*[02468])+(\.\d+)+)"
-
-X11DEPENDS = "virtual/libx11 libxext libxcursor libxrandr libxdamage

libxrender libxcomposite"

meta/recipes-gnome/gtk+/gtk+.inc deleted +0 -4
-DEPENDS = "glib-2.0 pango atk jpeg libpng gdk-pixbuf-native \
- cairo gdk-pixbuf"
-
-PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'directfb

x11', d)}"

meta/recipes-gnome/gtk+/gtk+.inc deleted +0 -2
-
-PACKAGECONFIG[x11] = "--with-x=yes --with-gdktarget=x11,--with-

x=no,${X11DEPENDS}"
-# without --with-gdktarget=directfb it will check for cairo-xlib which isn't available without X11 DISTRO_FEATURE

meta/recipes-gnome/gtk+/gtk+.inc deleted +0 -2
-PACKAGECONFIG[directfb] = "--with-gdktarget=directfb,,directfb"
-PACKAGECONFIG[manpages] = "--enable-man --with-xml-

catalog=${STAGING_ETCDIR_NATIVE}/xml/catalog, --disable-man, libxslt- native xmlto-native"

meta/recipes-gnome/gtk+/gtk+.inc deleted +0 -2
-
-inherit autotools gtk-doc pkgconfig update-alternatives gtk-

immodules-cache gobject-introspection manpages

meta/recipes-gnome/gtk+/gtk+.inc deleted +0 -37
-
-PACKAGES += "libgail gtk-demo"
-
-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 += " \
-        ${datadir}/gtk-2.0/include \
-	${libdir}/gtk-2.0/include \
-	${libdir}/gtk-2.0/modules/*.la \
-	${libdir}/gtk-2.0/${LIBV}/loaders/*.la \
-	${libdir}/gtk-2.0/${LIBV}/immodules/*.la \
-	${libdir}/gtk-2.0/${LIBV}/printbackends/*.la \
-	${libdir}/gtk-2.0/${LIBV}/engines/*.la \
-	${bindir}/gtk-builder-convert"
-
-FILES_gtk-demo = " \
- ${datadir}/gtk-2.0/demo/* \
- ${bindir}/gtk-demo \
- "
-
-FILES_libgail = " \
-	${libdir}/gtk-2.0/modules/libgail.so \
-	${libdir}/gtk-2.0/modules/libferret.so \
-	"
-
-GTKBASE_RRECOMMENDS ?= "liberation-fonts \
-                        gdk-pixbuf-loader-png \
-                        gdk-pixbuf-loader-jpeg \
-                        gdk-pixbuf-loader-gif \
-                        gdk-pixbuf-loader-xpm \
-                        shared-mime-info \
-                        gnome-theme-adwaita \
-                        "
-GTKGLIBC_RRECOMMENDS ?= "${GTKBASE_RRECOMMENDS} glibc-gconv-iso8859-

1"

meta/recipes-gnome/gtk+/gtk+.inc deleted +0 -6
-
-RRECOMMENDS_${PN} = "${GTKBASE_RRECOMMENDS}"
-RRECOMMENDS_${PN}_libc-glibc = "${GTKGLIBC_RRECOMMENDS}"
-
-ALTERNATIVE_${PN} = "gtk-update-icon-cache"
-ALTERNATIVE_TARGET[gtk-update-icon-cache] = "${bindir}/gtk-update-

icon-cache-2.0"

meta/recipes-gnome/gtk+/gtk+.inc deleted +0 -12
-
-do_compile_prepend() {
-        export GIR_EXTRA_LIBS_PATH="${B}/gdk/.libs"
-}
-
-do_install () {
-	autotools_do_install
-
-	install -d ${D}${sysconfdir}/gtk-2.0
-
-	mkdir -p ${D}${libdir}/gtk-2.0/include
-	install -m 0644 gdk/gdkconfig.h ${D}${libdir}/gtk-

2.0/include/gdkconfig.h

meta/recipes-gnome/gtk+/gtk+.inc deleted +0 -2
-
-	install -m 0644 ${S}/gtk/gtkfilechooserprivate.h

${D}${includedir}/gtk-2.0/gtk/

meta/recipes-gnome/gtk+/gtk+.inc deleted +0 -1
-	install -m 0644

${S}/gtk/gtkfilechooserutils.h ${D}${includedir}/gtk-2.0/gtk/

meta/recipes-gnome/gtk+/gtk+.inc deleted +0 -1
-	install -m 0644

${S}/gtk/gtkfilesystemmodel.h ${D}${includedir}/gtk-2.0/gtk/

meta/recipes-gnome/gtk+/gtk+.inc deleted +0 -2
-
-	mv ${D}${bindir}/gtk-update-icon-cache ${D}${bindir}/gtk-

update-icon-cache-2.0

meta/recipes-gnome/gtk+/gtk+.inc deleted +0 -2
-
-    # duplicate gtk-query-immodules for post install script

update_gtk_immodules_cache

meta/recipes-gnome/gtk+/gtk+.inc deleted +0 -2
-    mkdir -p ${D}${libexecdir}
-    ln ${D}${bindir}/gtk-query-immodules-2.0

${D}${libexecdir}/${MLPREFIX}gtk-query-immodules-2.0

meta/recipes-gnome/gtk+/gtk+.inc deleted +0 -8
-}
-
-SYSROOT_PREPROCESS_FUNCS += "gtk_sysroot_preprocess"
-
-gtk_sysroot_preprocess () {
-	if [ -e ${D}${bindir}/gtk-builder-convert ]; then
-		install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/
-		install -m 755 ${D}${bindir}/gtk-builder-convert

${SYSROOT_DESTDIR}${bindir_crossscripts}/

meta/recipes-gnome/gtk+/gtk+.inc deleted +0 -3
-	fi
-}
-
(quoted diff) +0 -0

when-looking-for-gtk-modules.patch b/meta/recipes- gnome/gtk+/gtk+/0001-Do-not-look-into-HOME-when-looking-for-gtk- modules.patch
deleted file mode 100644
index 83be39c3bf2..00000000000
--- a/meta/recipes-gnome/gtk+/gtk+/0001-Do-not-look-into-HOME-when- looking-for-gtk-modules.patch
+++ /dev/null

(quoted diff) +0 -1
@@ -1,29 +0,0 @@
-From 34ce93e1c50bfb88f92a687d4f82de55584f3f6a Mon Sep 17 00:00:00

2001

meta/recipes-gnome/gtk+/gtk+/0001-Do-not-look-into-HOME-when-looking-for-gtk-modules.patch deleted +0 -28
-From: Alexander Kanavin <[email protected]>
-Date: Wed, 11 Apr 2018 14:20:39 +0300
-Subject: [PATCH] Do not look into $HOME when looking for gtk modules
-
-On the host it causes host contamination, on the target it's a
-potential security issue. Gtk+3 has already removed this.
-
-Upstream-Status: Inappropriate [gtk2 is in maintenance mode]
-Signed-off-by: Alexander Kanavin <[email protected]>
----
- gtk/gtkmodules.c | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/gtk/gtkmodules.c b/gtk/gtkmodules.c
-index 50729b6..e09b583 100644
---- a/gtk/gtkmodules.c
-+++ b/gtk/gtkmodules.c
-@@ -65,10 +65,6 @@ get_module_path (void)
-   if (result)
-     return result;
- 
--  home_dir = g_get_home_dir();
--  if (home_dir)
--    home_gtk_dir = g_build_filename (home_dir, ".gtk-2.0", NULL);
--
-   module_path_env = g_getenv ("GTK_PATH");
-   exe_prefix = g_getenv ("GTK_EXE_PREFIX");
-
meta/recipes-gnome/gtk+/gtk+/doc-fixes.patch deleted +0 -11
deleted file mode 100644
index 74e479fd1bf..00000000000
@@ -1,22 +0,0 @@
-There are issues building the gtk+ tutorial and faq documentation.
-Since they were removed in gtk+ upstream and are superfluous in
-embedded applications, just don't build them.
-
-Thanks to Joshua Lock for suggesting this approach.
-
-Signed-off-by: Scott Garman <[email protected]>
-
-Upstream-Status: Inappropriate [embedded specific]
-
-diff -urN gtk+-2.22.1.orig/docs/Makefile.am gtk+-

2.22.1/docs/Makefile.am
---- gtk+-2.22.1.orig/docs/Makefile.am 2010-11-15
04:13:09.000000000 -0800
-+++ gtk+-2.22.1/docs/Makefile.am 2011-02-23 19:25:16.914815097
-0800
-@@ -1,7 +1,7 @@
- ## Process this file with automake to produce Makefile.in
- include $(top_srcdir)/Makefile.decl
-
--SUBDIRS = tutorial faq reference tools
-+SUBDIRS = reference tools
-
- EXTRA_DIST += \

meta/recipes-gnome/gtk+/gtk+/doc-fixes.patch deleted +0 -1
- 	defsformat.txt			\
meta/recipes-gnome/gtk+/gtk+/hardcoded_libtool.patch deleted +0 -14
deleted file mode 100644
index 9eb7f6bf5c7..00000000000
@@ -1,36 +0,0 @@
-Upstream-Status: Inappropriate [embedded specific]
-
-Updated to apply to gtk+-2.24.15
-
-Signed-off-by: Marko Lindqvist <[email protected]>
-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

meta/recipes-gnome/gtk+/gtk+/hardcoded_libtool.patch deleted +0 -7
-       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"

meta/recipes-gnome/gtk+/gtk+/hardcoded_libtool.patch deleted +0 -8
-         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

meta/recipes-gnome/gtk+/gtk+/hardcoded_libtool.patch deleted +0 -2
-   GDK_DEP_LIBS=`echo $GDK_DEP_LIBS | sed -e "s/$export_dynamic//"`
-   GTK_DEP_LIBS=`echo $GTK_DEP_LIBS | sed -e "s/$export_dynamic//"`
meta/recipes-gnome/gtk+/gtk+/strict-prototypes.patch deleted +0 -3
deleted file mode 100644
index 96e1f5feacb..00000000000
@@ -1,24 +0,0 @@
-Fixes
-
-include/gtk-2.0/gtk/gtkitemfactory.h:47:1: warning: function

declaration isn't a prototype [-Wstrict-prototypes]
- typedef void (*GtkItemFactoryCallback) ();

meta/recipes-gnome/gtk+/gtk+/strict-prototypes.patch deleted +0 -2
-
-gcc5 has -Wstrict-prototypes on by default for -Werror so this

becomes a build failure for consumers

meta/recipes-gnome/gtk+/gtk+/strict-prototypes.patch deleted +0 -10
-of this header e.g. matchbox-panel-2
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj <[email protected]>
-Index: gtk+-2.24.27/gtk/gtkitemfactory.h
-===================================================================
---- gtk+-2.24.27.orig/gtk/gtkitemfactory.h
-+++ gtk+-2.24.27/gtk/gtkitemfactory.h
-@@ -44,7 +44,7 @@ typedef void	(*GtkPrintFunc)		   (g

point

meta/recipes-gnome/gtk+/gtk+/strict-prototypes.patch deleted +0 -7
-  * (Note that if we are included from a C++ program () will mean
-  * (void) so an explicit cast will be needed.)
-  */
--typedef	void	(*GtkItemFactoryCallback)  ();
-+typedef	void	(*GtkItemFactoryCallback)  (void);
- typedef	void	(*GtkItemFactoryCallback1) (gpointer		
 callback_data,
- 					    guint		 callback_act

ion,

meta/recipes-gnome/gtk+/gtk+/strict-prototypes.patch deleted +0 -1
- 					    GtkWidget		*widg

et);

meta/recipes-gnome/gtk+/gtk+/toggle-font.diff deleted +2 -11
deleted file mode 100644
index 340d12008be..00000000000
@@ -1,102 +0,0 @@
-Upstream-Status: Pending
-
-Index: gtk/gtkcellrenderertoggle.c
-===================================================================
---- gtk/gtkcellrenderertoggle.c.orig	2010-06-22 18:11:33.000000000
+0800
-+++ gtk/gtkcellrenderertoggle.c	2010-06-22 18:11:43.000000000
+0800
-@@ -71,6 +71,8 @@
-   PROP_INDICATOR_SIZE
- };
- 
-+/* This is a hard-coded default which promptly gets overridden by a

size
-+ calculated from the font size. */
- #define TOGGLE_WIDTH 13
-
- static guint toggle_cell_signals[LAST_SIGNAL] = { 0 }; -@@ -80,8 +82,9 @@
- typedef struct _GtkCellRendererTogglePrivate GtkCellRendererTogglePrivate;
- struct _GtkCellRendererTogglePrivate
- {
-- gint indicator_size;
--
-+ gint indicator_size; /* This is the real size */
-+ gint override_size; /* This is the size set from the indicator- size property */
-+ GtkWidget *cached_widget;

meta/recipes-gnome/gtk+/gtk+/toggle-font.diff deleted +0 -17
-   guint inconsistent : 1;
- };
- 
-@@ -104,6 +107,7 @@
-   GTK_CELL_RENDERER (celltoggle)->ypad = 2;
- 
-   priv->indicator_size = TOGGLE_WIDTH;
-+  priv->override_size = 0;
-   priv->inconsistent = FALSE;
- }
- 
-@@ -210,7 +214,7 @@
-       g_value_set_boolean (value, celltoggle->radio);
-       break;
-     case PROP_INDICATOR_SIZE:
--      g_value_set_int (value, priv->indicator_size);
-+      g_value_set_int (value, priv->override_size ? priv-
Quoted 1 line

override_size : priv->indicator_size);

meta/recipes-gnome/gtk+/gtk+/toggle-font.diff deleted +0 -17
-       break;
-     default:
-       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
-@@ -245,7 +249,7 @@
-       celltoggle->radio = g_value_get_boolean (value);
-       break;
-     case PROP_INDICATOR_SIZE:
--      priv->indicator_size = g_value_get_int (value);
-+      priv->override_size = g_value_get_int (value);
-       break;
-     default:
-       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
-@@ -273,6 +277,27 @@
- }
- 
- static void
-+on_widget_style_set (GtkWidget *widget, GtkStyle *previous,

gpointer user_data)
-+{

-+  GtkCellRendererTogglePrivate *priv = user_data;
-+  PangoContext *context;
-+  PangoFontMetrics *metrics;
-+  int height;

-+
-+ context = gtk_widget_get_pango_context (widget); -+ metrics = pango_context_get_metrics (context,
-+ widget->style->font_desc,
-+ pango_context_get_language
(context));
-+
-+ height = pango_font_metrics_get_ascent (metrics) +
-+ pango_font_metrics_get_descent (metrics);
-+
-+ pango_font_metrics_unref (metrics);
-+
-+ priv->indicator_size = PANGO_PIXELS (height * 0.85); -+}
-+
-+static void
- gtk_cell_renderer_toggle_get_size (GtkCellRenderer *cell,

meta/recipes-gnome/gtk+/gtk+/toggle-font.diff deleted +0 -12
- 				   GtkWidget       *widget,
- 				   GdkRectangle    *cell_area,
-@@ -287,6 +312,20 @@
- 
-   priv = GTK_CELL_RENDERER_TOGGLE_GET_PRIVATE (cell);
- 
-+  if (priv->override_size) {
-+    priv->indicator_size = priv->override_size;
-+  } else if (priv->cached_widget != widget) {
-+    if (priv->cached_widget) {
-+      g_object_remove_weak_pointer (widget, &priv->cached_widget);
-+      g_signal_handlers_disconnect_by_func (priv->cached_widget,

on_widget_style_set, priv);

-+    }
-+    priv->cached_widget = widget;
-+    g_object_add_weak_pointer (widget, &priv->cached_widget);
-+    g_signal_connect (widget, "style-set", on_widget_style_set,

priv);
-+
-+ on_widget_style_set (widget, NULL, priv);
-+ }
-+

meta/recipes-gnome/gtk+/gtk+/toggle-font.diff deleted +0 -3
-   calc_width = (gint) cell->xpad * 2 + priv->indicator_size;
-   calc_height = (gint) cell->ypad * 2 + priv->indicator_size;
-
meta/recipes-gnome/gtk+/gtk+/xsettings.patch deleted +0 -5
deleted file mode 100644
index d0a970ad4d4..00000000000
@@ -1,20 +0,0 @@
-Upstream-Status: Pending
-
-Index: gtk+-2.21.2/gdk/x11/gdkevents-x11.c
-===================================================================
---- gtk+-2.21.2.orig/gdk/x11/gdkevents-x11.c	2010-06-22

17:28:04.000000000 +0800
-+++ gtk+-2.21.2/gdk/x11/gdkevents-x11.c 2010-06-22
17:28:06.000000000 +0800
-@@ -3062,10 +3062,9 @@
- {

meta/recipes-gnome/gtk+/gtk+/xsettings.patch deleted +0 -3
-   GdkScreenX11 *screen = data;
-   
--  if (xsettings_client_process_event (screen->xsettings_client,

(XEvent *)xevent))
-- return GDK_FILTER_REMOVE;
-- else
-- return GDK_FILTER_CONTINUE;
-+ xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent);
-+
-+ return GDK_FILTER_CONTINUE;
- }
-
- static Bool

meta/recipes- renamed from meta/recipes-gnome/gtk+/gtk+_2.24.32.bb +0 -0

gnome/gtk+/gtk+_2.24.32.bb
deleted file mode 100644
index 682d31e49e2..00000000000

meta/recipes-gnome/gtk+/gtk+_2.24.32.bb deleted +0 -3
@@ -1,35 +0,0 @@
-require gtk+.inc
-
-LIC_FILES_CHKSUM =

"file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
- file://gtk/gtk.h;endline=27;md5=c59e0b4490dd135a
5726ebf851f9b17f \
- file://gdk/gdk.h;endline=27;md5=07db285ec208fb3e
0bf7d861b0614202 \
- file://tests/testgtk.c;endline=27;md5=262db5db5f
776f9863e56df31423e24c"
-SRC_URI = "
http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${PV}.tar.xz \

meta/recipes-gnome/gtk+/gtk+_2.24.32.bb deleted +0 -6
-           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 \

meta/recipes-gnome/gtk+/gtk+_2.24.32.bb deleted +0 -4
-           "
-
-SRC_URI[md5sum] = "d5742aa42275203a499b59b4c382a784"
-SRC_URI[sha256sum] =

"b6c8a93ddda5eabe3bfee1eb39636c9a03d2a56c7b62828b359bf197943c582e"

meta/recipes-gnome/gtk+/gtk+_2.24.32.bb deleted +0 -2
-
-EXTRA_OECONF = "--enable-xkb --disable-glibtest --disable-cups --

disable-xinerama"

meta/recipes-gnome/gtk+/gtk+_2.24.32.bb deleted +0 -11
-
-LIBV = "2.10.0"
-
-PACKAGES_DYNAMIC += "^gtk-immodule-.* ^gtk-printbackend-.*"
-
-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');
-
-    d.setVar('GTKIMMODULES_PACKAGES', ' '.join(do_split_packages(d,

immodules_root, r'^im-(.*)\.so$', 'gtk-immodule-%s', 'GTK input module for %s')))
- do_split_packages(d, printmodules_root, r'^libprintbackend-
(.*)\.so$', 'gtk-printbackend-%s', 'GTK printbackend module for %s')

meta/recipes-gnome/gtk+/gtk+_2.24.32.bb deleted +0 -4
-
-    if (d.getVar('DEBIAN_NAMES')):
-        d.setVar(d.expand('PKG_${PN}'), '${MLPREFIX}libgtk-2.0')
-}
Signature · 1 line
2.11.0
#4 lore raw

Re: [RFC PATCH 3/4] gtk+: remove GTK+ 2

In reply to Ross Burton
Quoted 5 lines · Ross Burton

GTK+ 2 is ancient, and shouldn't be used. It will be moved to meta- oe for
people who do need it, but it shouldn't in oe-core.

[ YOCTO #12673 ]

I agree its time to do this, its in keeping with various other old software we've been cleaning up. Builds with this included didn't work as its referenced by a selftest:

test_recipetool_create_cmake

Also the maintainers entry remains...

Cheers,

Richard

author
#5 lore raw

RFC PATCH 4/4 gnome-themes-standard: remove

In reply to Ross Burton

This is the Adwaita theme for GTK+ 2, which we don't include in oe-core anymore.

Signed-off-by Ross Burton <[email protected]>
---
 .../gnome/gnome-themes-standard_3.22.3.bb          | 46 ----------------------
 1 file changed, 46 deletions(-)
 delete mode 100644 meta/recipes-gnome/gnome/gnome-themes-standard_3.22.3.bb
meta/recipes-gnome/gnome/gnome-themes-standard_3.22.3.bb deleted +0 -46
deleted file mode 100644
index 55ee277606a..00000000000
@@ -1,46 +0,0 @@
-SUMMARY = "GTK+2 standard themes"
-HOMEPAGE = "http://ftp.gnome.org/pub/GNOME/sources/gnome-themes-standard/"
-BUGTRACKER = "https://bugzilla.gnome.org/"
-SECTION = "x11/gnome"
-
-LICENSE = "LGPL-2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1"
-
-inherit autotools pkgconfig gettext gtk-icon-cache upstream-version-is-even distro_features_check
-
-ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}"
-
-DEPENDS += "intltool-native gtk+"
-
-MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"
-SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \
-          "
-
-SRC_URI[md5sum] = "b51c362b157b6407303d44f93c31ee11"
-SRC_URI[sha256sum] = "61dc87c52261cfd5b94d65e8ffd923ddeb5d3944562f84942eeeb197ab8ab56a"
-
-EXTRA_OECONF = "--disable-gtk3-engine"
-
-do_install_append() {
-        # Only building Adwaita, remove highcontrast files
-        rm -rf ${D}${prefix}/share/themes/HighContrast \
-               ${D}${prefix}/share/icons
-
-	# The libtool archive file is unneeded with shared libs on modern Linux
-	rm -rf ${D}${libdir}/gtk-2.0/2.10.0/engines/libadwaita.la
-}
-
-# There could be gnome-theme-highcontrast as well but that requires
-# gtk+3 and includes lots of icons (is also broken with B != S).
-PACKAGES += "gnome-theme-adwaita \
-             gnome-theme-adwaita-dark \
-             "
-
-FILES_gnome-theme-adwaita = "${prefix}/share/themes/Adwaita \
-                              ${libdir}/gtk-2.0/2.10.0/engines/libadwaita.so"
-
-FILES_gnome-theme-adwaita-dark = "${prefix}/share/themes/Adwaita-dark"
-RDEPENDS_gnome-theme-adwaita-dark = "gnome-theme-adwaita"
-
-# gnome-themes-standard is empty and doesn't exist
-RDEPENDS_${PN}-dev = ""
Signature · 1 line
2.11.0
#6 lore raw
In reply to Ross Burton

I was independently looking at GTK+2 removal recently, and had the same changes in my list.

cu
Adrian

BTW: There is a typo in the README.LSB change.

Signature · 4 lines
       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed