Re: [OE-core] [RFC PATCH 3/4] gtk+: remove GTK+ 2
On Fri, 2019-07-05 at 17:20 +0100, Ross Burton wrote: > 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 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [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
On Fri, 2019-07-05 at 17:20 +0100, Ross Burton wrote:
> 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
> ---
> 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
>
> diff --git a/meta/recipes-gnome/gtk+/gtk+.inc b/meta/recipes-
> gnome/gtk+/gtk+.inc
> deleted file mode 100644
> index d6d14a79d5a..000
> --- a/meta/recipes-gnome/gtk+/gtk+.inc
> +++ /dev/null
> @@ -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 = "(?P2\.([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"
>
[OE-core] [RFC PATCH 3/4] gtk+: remove GTK+ 2
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
---
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
diff --git a/meta/recipes-gnome/gtk+/gtk+.inc b/meta/recipes-gnome/gtk+/gtk+.inc
deleted file mode 100644
index d6d14a79d5a..000
--- a/meta/recipes-gnome/gtk+/gtk+.inc
+++ /dev/null
@@ -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 = "(?P2\.([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
