diff options
author | Ross Burton <ross.burton@intel.com> | 2017-07-10 20:28:48 +0100 |
---|---|---|
committer | Ross Burton <ross.burton@intel.com> | 2017-07-20 16:34:41 +0100 |
commit | 48df9888152b9a2ac51f8974da8d6a0602e64316 (patch) | |
tree | ca3bd3385c389029014ca5f24aa75c2f26b33bac | |
parent | a9203ed7c99d5de6b4f4411b1a92f6731bbaae75 (diff) | |
download | meta-openembedded-contrib-48df9888152b9a2ac51f8974da8d6a0602e64316.tar.gz |
nautilus: remove
Signed-off-by: Ross Burton <ross.burton@intel.com>
4 files changed, 0 insertions, 122 deletions
diff --git a/meta-gnome/recipes-gnome/nautilus/nautilus/idl-sysroot.patch b/meta-gnome/recipes-gnome/nautilus/nautilus/idl-sysroot.patch deleted file mode 100644 index 0062cfb11a..0000000000 --- a/meta-gnome/recipes-gnome/nautilus/nautilus/idl-sysroot.patch +++ /dev/null @@ -1,7 +0,0 @@ -Index: nautilus-2.24.2/add-include-prefix -=================================================================== ---- nautilus-2.24.2.orig/add-include-prefix 2008-10-06 17:22:21.000000000 +0000 -+++ nautilus-2.24.2/add-include-prefix 2009-04-09 16:00:05.000000000 +0000 -@@ -1 +1 @@ --sed -e 's/^/ /' -e 's/ */ /g' -e 's/ / -I /g' -e 's/ -I $//' -+sed -e 's:^: :' -e 's: *: :g' -e 's: : -I '"$SYSROOT"':g' -e 's: -I '"$SYSROOT"'$::' diff --git a/meta-gnome/recipes-gnome/nautilus/nautilus/no-G_DISABLE_DEPRECATED.patch b/meta-gnome/recipes-gnome/nautilus/nautilus/no-G_DISABLE_DEPRECATED.patch deleted file mode 100644 index 43a6152d83..0000000000 --- a/meta-gnome/recipes-gnome/nautilus/nautilus/no-G_DISABLE_DEPRECATED.patch +++ /dev/null @@ -1,44 +0,0 @@ -From e7233d98c114b03c7c8b96d1f41770452da14aa7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmx.de> -Date: Mon, 17 Oct 2011 00:59:01 +0200 -Subject: [PATCH] nautilus build fails for newer glib versions -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -build with glib-2.0 v2.30.0 run into errors for at least G_CONST_RETURN missing - -Signed-off-by: Andreas Müller <schnitzeltony@gmx.de> ---- - configure.in | 2 +- - eel/Makefile.am | 1 - - 2 files changed, 1 insertions(+), 2 deletions(-) - -diff --git a/configure.in b/configure.in -index 97e171e..859a097 100644 ---- a/configure.in -+++ b/configure.in -@@ -342,7 +342,7 @@ AC_SUBST(CORE_CFLAGS) - CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $x_libs" - AC_SUBST(CORE_LIBS) - --DISABLE_DEPRECATED_CFLAGS="-DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED" -+DISABLE_DEPRECATED_CFLAGS="-DGDK_PIXBUF_DISABLE_DEPRECATED" - AC_SUBST(DISABLE_DEPRECATED_CFLAGS) - - dnl Multimedia keys -diff --git a/eel/Makefile.am b/eel/Makefile.am -index b1fe356..c1d56cd 100644 ---- a/eel/Makefile.am -+++ b/eel/Makefile.am -@@ -10,7 +10,6 @@ INCLUDES = \ - -DDATADIR=\""$(datadir)"\" \ - -DSOURCE_DATADIR=\""$(top_srcdir)/data"\" \ - -DGNOMELOCALEDIR=\""$(prefix)/${DATADIRNAME}/locale"\" \ -- -DG_DISABLE_DEPRECATED \ - -DGDK_PIXBUF_DISABLE_DEPRECATED \ - -DGMENU_I_KNOW_THIS_IS_UNSTABLE \ - $(NULL) --- -1.7.4.4 - diff --git a/meta-gnome/recipes-gnome/nautilus/nautilus/no-try-run-strftime.diff b/meta-gnome/recipes-gnome/nautilus/nautilus/no-try-run-strftime.diff deleted file mode 100644 index ccd2934b3a..0000000000 --- a/meta-gnome/recipes-gnome/nautilus/nautilus/no-try-run-strftime.diff +++ /dev/null @@ -1,28 +0,0 @@ ---- /tmp/configure.in 2009-04-13 11:26:43.000000000 +0200 -+++ nautilus-2.26.1/configure.in 2009-04-13 11:28:37.000000000 +0200 -@@ -375,25 +375,6 @@ - - dnl =========================================================================== - --dnl strftime checks -- --AC_TRY_RUN([#include <time.h> -- int main () -- { -- char buf[100]; -- struct tm tm = {0}; -- tm.tm_year = 99; -- if (strftime(buf, 100, "%EY", &tm) == 4 && -- strcmp (buf, "1999")==0) -- return 0; -- return 1; -- } -- ], -- AC_DEFINE(HAVE_STRFTIME_EXTENSION, 1, [Define if strftime supports %E and %O modifiers.]) -- ) -- --dnl =========================================================================== -- - # - # Checks for Xft/XRender - # diff --git a/meta-gnome/recipes-gnome/nautilus/nautilus_2.32.2.bb b/meta-gnome/recipes-gnome/nautilus/nautilus_2.32.2.bb deleted file mode 100644 index caf7f57b18..0000000000 --- a/meta-gnome/recipes-gnome/nautilus/nautilus_2.32.2.bb +++ /dev/null @@ -1,43 +0,0 @@ -# nautilus OE build file -# Copyright (C) 2005, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) - -LICENSE="GPLv2 & LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=7c0048536e43642a1f3a724c2909872b \ - file://COPYING.LIB;md5=f30a9716ef3762e3467a2f62bf790f0a" - -PR = "r6" - -DEPENDS = "gdk-pixbuf gtk+ libunique gvfs librsvg libexif esound gnome-desktop orbit2-native" -# optional: tracker - -inherit gnome gobject-introspection - -SRC_URI[archive.md5sum] = "51565aa10d1625dff56e381228346911" -SRC_URI[archive.sha256sum] = "2d4ff28c7a7aa5d40eb2468149954a564c257a305183773057584d22d15347a2" -GNOME_COMPRESS_TYPE="bz2" - -SRC_URI += "file://idl-sysroot.patch \ - file://no-try-run-strftime.diff \ - file://no-G_DISABLE_DEPRECATED.patch \ -" - - -EXTRA_OECONF = " --disable-gtk-doc --disable-update-mimedb " -export SYSROOT = "${STAGING_DIR_HOST}" - -do_configure() { - sed -i -e /docs/d ${S}/Makefile.am - autotools_do_configure - # We need native orbit-idl with target idl files. No way to say it in a clean way: - find ${B} -name Makefile -exec sed -i '/\/usr\/bin\/orbit-idl-2/{s:/usr/bin:${STAGING_BINDIR_NATIVE}:;s:/usr/share:${STAGING_DATADIR}:g}' {} \; -} - -RDEPENDS_${PN} = "gvfs gvfsd-ftp gvfsd-sftp gvfsd-trash glib-networking" -FILES_${PN} += "${datadir}/icons" - -# Don't make nautils3 drag us in -PRIVATE_LIBS = "libnautilus-extension.so.1" - - -PNBLACKLIST[nautilus] ?= "Depends on blacklisted gnome-desktop - the recipe will be removed on 2017-09-01 unless the issue is fixed" |