From ec9e5ed06256ad92c818474cdb490dc0d3a0d0a3 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 27 Apr 2017 11:04:51 +0200 Subject: recipes: remove blacklisted recipes * as PNBLACKLIST message says, these recipes are blacklisted for long time and nobody showed any interest to fix them * remove all unused .patch and .inc files as well Signed-off-by: Martin Jansa --- .../florence/files/0001-Fix-glib-includes.patch | 33 ------ ...igure.ac-fix-paths-to-introspection-tools.patch | 41 ------- .../recipes-support/goffice/goffice_0.10.1.bb | 51 --------- .../enable-sqlite-crosscompile.patch | 13 --- .../fix-removable-media-detection.patch | 30 ----- .../tracker/tracker-0.14.2/giflib5-support.patch | 126 --------------------- .../recipes-support/tracker/tracker_0.14.2.bb | 88 -------------- 7 files changed, 382 deletions(-) delete mode 100644 meta-gnome/recipes-support/florence/files/0001-Fix-glib-includes.patch delete mode 100644 meta-gnome/recipes-support/goffice/goffice/0001-configure.ac-fix-paths-to-introspection-tools.patch delete mode 100644 meta-gnome/recipes-support/goffice/goffice_0.10.1.bb delete mode 100644 meta-gnome/recipes-support/tracker/tracker-0.14.2/enable-sqlite-crosscompile.patch delete mode 100644 meta-gnome/recipes-support/tracker/tracker-0.14.2/fix-removable-media-detection.patch delete mode 100644 meta-gnome/recipes-support/tracker/tracker-0.14.2/giflib5-support.patch delete mode 100644 meta-gnome/recipes-support/tracker/tracker_0.14.2.bb (limited to 'meta-gnome/recipes-support') diff --git a/meta-gnome/recipes-support/florence/files/0001-Fix-glib-includes.patch b/meta-gnome/recipes-support/florence/files/0001-Fix-glib-includes.patch deleted file mode 100644 index 83e598e6a6..0000000000 --- a/meta-gnome/recipes-support/florence/files/0001-Fix-glib-includes.patch +++ /dev/null @@ -1,33 +0,0 @@ -From c8419ef05ff92ffa3de2e626eb6acd5d2df3baa1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Tue, 15 May 2012 13:40:05 +0200 -Subject: [PATCH] Fix glib includes -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit -Upstream-Status: unknown - -Signed-off-by: Andreas Müller ---- - src/trace.c | 5 +---- - 1 files changed, 1 insertions(+), 4 deletions(-) - -diff --git a/src/trace.c b/src/trace.c -index 5ea5c13..774c56d 100644 ---- a/src/trace.c -+++ b/src/trace.c -@@ -21,10 +21,7 @@ - - #include "trace.h" - #include "system.h" --#include --#include --#include --#include -+#include - #include - #include - --- -1.7.6.5 - diff --git a/meta-gnome/recipes-support/goffice/goffice/0001-configure.ac-fix-paths-to-introspection-tools.patch b/meta-gnome/recipes-support/goffice/goffice/0001-configure.ac-fix-paths-to-introspection-tools.patch deleted file mode 100644 index a645978d92..0000000000 --- a/meta-gnome/recipes-support/goffice/goffice/0001-configure.ac-fix-paths-to-introspection-tools.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 8e158c16cd15fff08b42ed86edc55816d3387837 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Fri, 19 Feb 2016 16:04:24 +0200 -Subject: [PATCH] configure.ac: fix paths to introspection tools - -They need to be prefixed with $PKG_CONFIG_SYSROOT_DIR - -Signed-off-by: Alexander Kanavin ---- - configure.ac | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 6d2b747..3b28463 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -706,9 +706,9 @@ if test "x$found_introspection" = "xyes"; then - dnl python where to find libgoffice, so you might also need to set - dnl LD_LIBRARY_PATH. - -- INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` -- INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` -- INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` -+ INTROSPECTION_SCANNER=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` -+ INTROSPECTION_COMPILER=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` -+ INTROSPECTION_GENERATE=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` - if test "x$INTROSPECTION_GIRDIR" = x; then - INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` - fi -@@ -717,7 +717,7 @@ if test "x$found_introspection" = "xyes"; then - fi - INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` - INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` -- INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection -+ INTROSPECTION_MAKEFILE=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection - else - INTROSPECTION_SCANNER= - INTROSPECTION_COMPILER= --- -2.7.0 - diff --git a/meta-gnome/recipes-support/goffice/goffice_0.10.1.bb b/meta-gnome/recipes-support/goffice/goffice_0.10.1.bb deleted file mode 100644 index 6a2080d4cc..0000000000 --- a/meta-gnome/recipes-support/goffice/goffice_0.10.1.bb +++ /dev/null @@ -1,51 +0,0 @@ -DESCRIPTION="Gnome Office Library" - -LICENSE="GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=6dc33ff21e1ba1ac1a2a1069d361e29e" - -DEPENDS = "libxml-parser-perl-native glib-2.0 gtk+3 pango cairo libgsf libpcre libxml2 libart-lgpl librsvg intltool" - -inherit gnomebase pkgconfig perlnative gobject-introspection - -GNOME_COMPRESS_TYPE = "xz" - -SRC_URI += "file://0001-configure.ac-fix-paths-to-introspection-tools.patch" - -SRC_URI[archive.md5sum] = "90fd17c6fe205b779571e00d9b0b4727" -SRC_URI[archive.sha256sum] = "5c38f4e81e874cc8e89481b080f77c47c72bfd6fe2526f4fc2ef87c17f96cad0" - -FILES_${PN}-dbg += "${libdir}/goffice/${PV}/plugins/*/.debug" - -RRECOMMENDS_${PN} = " \ - goffice-plugin-plot-barcol \ - goffice-plugin-plot-distrib \ - goffice-plugin-plot-pie \ - goffice-plugin-plot-radar \ - goffice-plugin-plot-surface \ - goffice-plugin-plot-xy \ - goffice-plugin-reg-linear \ - goffice-plugin-reg-logfit \ - goffice-plugin-smoothing \ -" - -FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*${SOLIBS} \ - ${sysconfdir} ${sharedstatedir} ${localstatedir} \ - ${base_bindir}/* ${base_sbindir}/* \ - ${base_libdir}/*${SOLIBS} \ - ${datadir}/${PN} \ - ${datadir}/pixmaps ${datadir}/applications \ - ${datadir}/idl ${datadir}/omf ${datadir}/sounds \ - ${libdir}/bonobo/servers" - -FILES_${PN}-locale = "${libdir}/locale" - -PACKAGES_DYNAMIC += "^goffice-plugin-.*" - -python populate_packages_prepend () { - goffice_libdir = d.expand('${libdir}/goffice/${PV}/plugins/') - - do_split_packages(d, goffice_libdir, '(.*)', 'goffice-plugin-%s', 'Goffice plugin for %s', allow_dirs=True) -} - -# | ../../goffice-0.10.1/goffice/math/go-complex.c:75:3: error: format not a string literal, argument types not checked [-Werror=format-nonliteral] -PNBLACKLIST[goffice] ?= "BROKEN: fails to build with gcc-6 - the recipe will be removed on 2017-09-01 unless the issue is fixed" diff --git a/meta-gnome/recipes-support/tracker/tracker-0.14.2/enable-sqlite-crosscompile.patch b/meta-gnome/recipes-support/tracker/tracker-0.14.2/enable-sqlite-crosscompile.patch deleted file mode 100644 index 5dadda2a29..0000000000 --- a/meta-gnome/recipes-support/tracker/tracker-0.14.2/enable-sqlite-crosscompile.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: tracker-0.10.17/m4/sqlite-threadsafe.m4 -=================================================================== ---- tracker-0.10.17.orig/m4/sqlite-threadsafe.m4 -+++ tracker-0.10.17/m4/sqlite-threadsafe.m4 -@@ -45,7 +45,7 @@ int main () - ]])], - [ax_cv_sqlite_threadsafe=yes], - [ax_cv_sqlite_threadsafe=no], -- [ax_cv_sqlite_threadsafe=no])]) -+ [ax_cv_sqlite_threadsafe=yes])]) - - LIBS="$save_LIBS" - ]) diff --git a/meta-gnome/recipes-support/tracker/tracker-0.14.2/fix-removable-media-detection.patch b/meta-gnome/recipes-support/tracker/tracker-0.14.2/fix-removable-media-detection.patch deleted file mode 100644 index 6c3d9de107..0000000000 --- a/meta-gnome/recipes-support/tracker/tracker-0.14.2/fix-removable-media-detection.patch +++ /dev/null @@ -1,30 +0,0 @@ -Index: tracker-0.14.2/src/libtracker-miner/tracker-storage.c -=================================================================== ---- tracker-0.14.2.orig/src/libtracker-miner/tracker-storage.c 2011-08-03 13:53:16.000000000 +0100 -+++ tracker-0.14.2/src/libtracker-miner/tracker-storage.c 2012-09-10 08:25:18.322215126 +0100 -@@ -20,6 +20,7 @@ - #include "config.h" - - #include -+#include - - #include - #include -@@ -646,6 +647,17 @@ - gchar *content_type; - gboolean is_multimedia; - gboolean is_blank; -+ struct stat st; -+ -+ /* -+ * Consider all files under /media to be -+ * removable unless the file .this-is-root is -+ * present. -+ */ -+ if (!strncmp (mount_path, "/media/", -+ strlen ("/media/")) && -+ stat ("/media/.this-is-root", &st)) -+ is_removable = TRUE; - - content_type = mount_guess_content_type (mount, &is_optical, &is_multimedia, &is_blank); - diff --git a/meta-gnome/recipes-support/tracker/tracker-0.14.2/giflib5-support.patch b/meta-gnome/recipes-support/tracker/tracker-0.14.2/giflib5-support.patch deleted file mode 100644 index fab3371f0f..0000000000 --- a/meta-gnome/recipes-support/tracker/tracker-0.14.2/giflib5-support.patch +++ /dev/null @@ -1,126 +0,0 @@ - src/tracker-extract/tracker-extract-gif.c | 36 +++++++++++++++++++++++++++++ - 1 file changed, 36 insertions(+) ---- a/src/tracker-extract/tracker-extract-gif.c -+++ a/src/tracker-extract/tracker-extract-gif.c -@@ -75,6 +75,39 @@ - return (GIF_OK); - } - -+#if GIFLIB_MAJOR >= 5 -+static inline void -+gif_error (const gchar *action, int err) -+{ -+ const char *str = GifErrorString (err); -+ if (str != NULL) { -+ g_message ("%s, error: '%s'", action, str); -+ } else { -+ g_message ("%s, undefined error %d", action, err); -+ } -+} -+#else /* GIFLIB_MAJOR >= 5 */ -+static inline void print_gif_error() -+{ -+#if defined(GIFLIB_MAJOR) && defined(GIFLIB_MINOR) && ((GIFLIB_MAJOR == 4 && GIFLIB_MINOR >= 2) || GIFLIB_MAJOR > 4) -+ const char *str = GifErrorString (); -+ if (str != NULL) { -+ g_message ("GIF, error: '%s'", str); -+ } else { -+ g_message ("GIF, undefined error"); -+ } -+#else -+ PrintGifError(); -+#endif -+} -+#endif /* GIFLIB_MAJOR >= 5 */ -+ -+/* giflib 5.1 changed the API of DGifCloseFile to take two arguments */ -+#if !defined(GIFLIB_MAJOR) || \ -+ !(GIFLIB_MAJOR > 5 || (GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1)) -+#define DGifCloseFile(a, b) DGifCloseFile(a) -+#endif -+ - static void - read_metadata (TrackerSparqlBuilder *preupdate, - TrackerSparqlBuilder *metadata, -@@ -100,14 +133,22 @@ - ExtBlock extBlock; - - if (DGifGetRecordType(gifFile, &RecordType) == GIF_ERROR) { -- PrintGifError(); -+#if GIFLIB_MAJOR < 5 -+ print_gif_error (); -+#else /* GIFLIB_MAJOR < 5 */ -+ gif_error ("Could not read next GIF record type", gifFile->Error); -+#endif /* GIFLIB_MAJOR < 5 */ - return; - } - - switch (RecordType) { - case IMAGE_DESC_RECORD_TYPE: - if (DGifGetImageDesc(gifFile) == GIF_ERROR) { -- PrintGifError(); -+#if GIFLIB_MAJOR < 5 -+ print_gif_error(); -+#else /* GIFLIB_MAJOR < 5 */ -+ gif_error ("Could not get GIF record information", gifFile->Error); -+#endif /* GIFLIB_MAJOR < 5 */ - return; - } - -@@ -117,7 +158,11 @@ - framedata = g_malloc (framewidth*frameheight); - - if (DGifGetLine(gifFile, framedata, framewidth*frameheight)==GIF_ERROR) { -- PrintGifError(); -+#if GIFLIB_MAJOR < 5 -+ print_gif_error(); -+#else /* GIFLIB_MAJOR < 5 */ -+ gif_error ("Could not load a block of GIF pixes", gifFile->Error); -+#endif /* GIFLIB_MAJOR < 5 */ - return; - } - -@@ -593,6 +638,9 @@ - gchar *filename, *uri; - GFile *file; - int fd; -+#if GIFLIB_MAJOR >= 5 -+ int err; -+#endif - - preupdate = tracker_extract_info_get_preupdate_builder (info); - metadata = tracker_extract_info_get_metadata_builder (info); -@@ -617,8 +665,14 @@ - return FALSE; - } - -+#if GIFLIB_MAJOR < 5 - if ((gifFile = DGifOpenFileHandle (fd)) == NULL) { -- PrintGifError (); -+ print_gif_error (); -+#else /* GIFLIB_MAJOR < 5 */ -+ if ((gifFile = DGifOpenFileHandle (fd, &err)) == NULL) { -+ gif_error ("Could not open GIF file with handle", err); -+#endif /* GIFLIB_MAJOR < 5 */ -+ g_free (filename); - close (fd); - return FALSE; - } -@@ -637,10 +691,15 @@ - g_string_free (where, TRUE); - - g_free (uri); -- -+#if GIFLIB_MAJOR < 5 - if (DGifCloseFile (gifFile) != GIF_OK) { -- PrintGifError (); -+ print_gif_error (); -+ } -+#else /* GIFLIB_MAJOR < 5 */ -+ if (DGifCloseFile (gifFile, NULL) != GIF_OK) { -+ gif_error ("Could not close GIF file", gifFile->Error); - } -+#endif /* GIFLIB_MAJOR < 5 */ - - return TRUE; - } diff --git a/meta-gnome/recipes-support/tracker/tracker_0.14.2.bb b/meta-gnome/recipes-support/tracker/tracker_0.14.2.bb deleted file mode 100644 index eb36a120fe..0000000000 --- a/meta-gnome/recipes-support/tracker/tracker_0.14.2.bb +++ /dev/null @@ -1,88 +0,0 @@ -DESCRIPTION = "Tracker is a tool designed to extract information and metadata about your personal data so that it can be searched easily and quickly." -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=ee31012bf90e7b8c108c69f197f3e3a4" -DEPENDS = "file gstreamer dbus libexif gettext sqlite3 icu gst-plugins-base libgnome-keyring poppler tiff enca libgsf libunistring giflib taglib bzip2 upower gtk+3 libgee networkmanager intltool-native" - -RDEPENDS_${PN} += " gvfs gsettings-desktop-schemas" - -RDEPENDS_${PN}-nautilus-extension += "nautilus" -HOMEPAGE = "http://projects.gnome.org/tracker/" - -PR = "r7" - -inherit autotools pkgconfig gnomebase gettext gsettings systemd gobject-introspection - -VER_DIR = "${@gnome_verdir("${PV}")}" -SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/tracker/${VER_DIR}/tracker-${PV}.tar.xz \ - file://enable-sqlite-crosscompile.patch \ - file://fix-removable-media-detection.patch \ - file://giflib5-support.patch \ - file://90tracker \ - file://tracker-store.service \ - file://tracker-miner-fs.service \ - file://tracker-dbus.service \ - " - -SYSTEMD_SERVICE_${PN} = " tracker-store.service tracker-miner-fs.service tracker-dbus.service " -SYSTEMD_AUTO_ENABLE = "disable" - -EXTRA_OECONF += " tracker_cv_have_ioprio=yes" - -PACKAGECONFIG ?= "nautilus" -PACKAGECONFIG[nautilus] = "--enable-nautilus-extension,--disable-nautilus-extension,nautilus" - -# Disable the desktop-centric miners -EXTRA_OECONF += "--disable-miner-thunderbird --disable-miner-firefox \ - --disable-miner-evolution --disable-miner-flickr" - -LEAD_SONAME = "libtrackerclient.so.0" - -do_compile_prepend() { - export GIR_EXTRA_LIBS_PATH="${B}/src/libtracker-sparql-backend/.libs:${B}/src/libtracker-data/.libs:${B}/src/libtracker-common/.libs" -} - -do_install_append() { - cp -PpR ${D}${STAGING_DATADIR}/* ${D}${datadir}/ || true -# install -d ${D}/${sysconfdir}/X11/Xsession.d/ -# install -m 0755 ${WORKDIR}/90tracker ${D}/${sysconfdir}/X11/Xsession.d/ - - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/tracker-store.service ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/tracker-miner-fs.service ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/tracker-dbus.service ${D}${systemd_unitdir}/system - sed -i -e 's,@LIBEXECDIR@,${libexecdir},g' \ - -e 's,@BASE_BINDIR@,${base_bindir},g' \ - ${D}${systemd_unitdir}/system/*.service -} - -PACKAGES =+ "${PN}-tests ${PN}-vala ${PN}-nautilus-extension" - -FILES_${PN} += "${datadir}/dbus-1/ \ - ${libdir}/tracker-${VER_DIR}/*.so.* \ - ${libdir}/tracker-${VER_DIR}/extract-modules/*.so \ - ${libdir}/tracker-${VER_DIR}/writeback-modules/*.so \ - ${datadir}/icons/hicolor/*/apps/tracker.* \ - ${libdir}/nautilus/extensions-2.0/*.la \ - ${datadir}/glib-2.0/schemas/* \ - ${systemd_unitdir}/system/tracker-store.service \ - ${systemd_unitdir}/system/tracker-miner-fs.service \ - ${systemd_unitdir}/system/tracker-dbus.service \ -" - -FILES_${PN}-dev += "${libdir}/tracker-${VER_DIR}/*.la \ - ${libdir}/tracker-${VER_DIR}/*.so \ - ${libdir}/tracker-${VER_DIR}/*/*.la \ - ${libdir}/tracker-${VER_DIR}/extract-modules/*.la" - -FILES_${PN}-staticdev += "${libdir}/nautilus/extensions-2.0/*.a" -FILES_${PN}-dbg += "${libdir}/*/*/.debug \ - ${libdir}/*/.debug" -FILES_${PN}-tests = "${datadir}/tracker-tests/" -FILES_${PN}-vala = "${datadir}/vala/" -FILES_${PN}-nautilus-extension += "${libdir}/nautilus/extensions-2.0/*.so" - -SRC_URI[md5sum] = "f3a871beeebf86fd752863ebd22af9ac" -SRC_URI[sha256sum] = "9b59330aa2e9e09feee587ded895e9247f71fc25f46b023d616d9969314bc7f1" - -# http://errors.yoctoproject.org/Errors/Details/81007/ -PNBLACKLIST[tracker] ?= "BROKEN: fails to build with new binutils-2.27 - the recipe will be removed on 2017-09-01 unless the issue is fixed" -- cgit 1.2.3-korg