From 31452b570d1f1bfcf4959fd22bfce4f1efb49cfc Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 10 Jul 2017 20:39:57 +0100 Subject: orbit2: remove Signed-off-by: Ross Burton --- ...-src-Makefile.am-fix-build-with-glib-2.36.patch | 34 ------------------ ...LAGS-instead-of-INCLUDES-and-fix-problem-.patch | 42 ---------------------- .../orbit2/orbit2/configure-lossage.patch | 37 ------------------- .../orbit2/orbit2/pkgconfig-fix.patch | 12 ------- meta-gnome/recipes-gnome/orbit2/orbit2_2.14.19.bb | 41 --------------------- 5 files changed, 166 deletions(-) delete mode 100644 meta-gnome/recipes-gnome/orbit2/orbit2/0001-linc2-src-Makefile.am-fix-build-with-glib-2.36.patch delete mode 100644 meta-gnome/recipes-gnome/orbit2/orbit2/0002-Use-AM_CPPFLAGS-instead-of-INCLUDES-and-fix-problem-.patch delete mode 100644 meta-gnome/recipes-gnome/orbit2/orbit2/configure-lossage.patch delete mode 100644 meta-gnome/recipes-gnome/orbit2/orbit2/pkgconfig-fix.patch delete mode 100644 meta-gnome/recipes-gnome/orbit2/orbit2_2.14.19.bb diff --git a/meta-gnome/recipes-gnome/orbit2/orbit2/0001-linc2-src-Makefile.am-fix-build-with-glib-2.36.patch b/meta-gnome/recipes-gnome/orbit2/orbit2/0001-linc2-src-Makefile.am-fix-build-with-glib-2.36.patch deleted file mode 100644 index daf7464c3c..0000000000 --- a/meta-gnome/recipes-gnome/orbit2/orbit2/0001-linc2-src-Makefile.am-fix-build-with-glib-2.36.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 10bd8094e1d94e5c737791c7f4b6b844f535c120 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Fri, 3 May 2013 10:00:16 +0200 -Subject: [PATCH] linc2/src/Makefile.am: fix build with glib 2.36 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Submitted [1] - -[1] https://bugzilla.gnome.org/show_bug.cgi?id=696900 - -Signed-off-by: Andreas Müller ---- - linc2/src/Makefile.am | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) - -diff --git a/linc2/src/Makefile.am b/linc2/src/Makefile.am -index 357a2dd..ba0e347 100644 ---- a/linc2/src/Makefile.am -+++ b/linc2/src/Makefile.am -@@ -12,8 +12,7 @@ INCLUDES = \ - -I$(top_builddir)/linc2/include \ - -I$(top_srcdir)/linc2/include \ - $(LINC_CFLAGS) \ -- $(WARN_CFLAGS) \ -- -DG_DISABLE_DEPRECATED -+ $(WARN_CFLAGS) - - if OS_WIN32 - else --- -1.7.6.5 - diff --git a/meta-gnome/recipes-gnome/orbit2/orbit2/0002-Use-AM_CPPFLAGS-instead-of-INCLUDES-and-fix-problem-.patch b/meta-gnome/recipes-gnome/orbit2/orbit2/0002-Use-AM_CPPFLAGS-instead-of-INCLUDES-and-fix-problem-.patch deleted file mode 100644 index 7993abb92c..0000000000 --- a/meta-gnome/recipes-gnome/orbit2/orbit2/0002-Use-AM_CPPFLAGS-instead-of-INCLUDES-and-fix-problem-.patch +++ /dev/null @@ -1,42 +0,0 @@ -From d91dbb42dc3b6073720027f68827acd0abee6d75 Mon Sep 17 00:00:00 2001 -From: Kjartan Maraas -Date: Tue, 14 May 2013 13:29:53 +0200 -Subject: [PATCH] Use AM_CPPFLAGS instead of INCLUDES and fix problem using -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Backport [1] - -[1] https://git.gnome.org/browse/ORBit2/commit/test/everything/Makefile.am?id=d91dbb42dc3b6073720027f68827acd0abee6d75 - -Signed-off-by: Andreas Müller ---- - test/everything/Makefile.am | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/test/everything/Makefile.am b/test/everything/Makefile.am -index 32beb36..cb4b1d6 100644 ---- a/test/everything/Makefile.am -+++ b/test/everything/Makefile.am -@@ -10,7 +10,7 @@ EVERYTHING_IDLOUT = \ - $(EVERYTHING_BUILT) \ - everything-imodule.c - --INCLUDES = \ -+AM_CPPFLAGS = \ - -I$(top_srcdir)/include \ - -I$(top_builddir)/include \ - -I$(top_builddir)/src \ -@@ -78,7 +78,7 @@ include $(top_srcdir)/Makefile.shared - BUILT_SOURCES = ${EVERYTHING_BUILT} everything-imodule.c - CLEANFILES = ${BUILT_SOURCES} iorfile - --TESTS = $(srcdir)/test.sh -+TESTS = $(top_builddir)/test/everything/test.sh - - EXTRA_DIST = $(IDL_FILES) test.sh $(included_src) - --- -1.8.3.1 - diff --git a/meta-gnome/recipes-gnome/orbit2/orbit2/configure-lossage.patch b/meta-gnome/recipes-gnome/orbit2/orbit2/configure-lossage.patch deleted file mode 100644 index 5fc1de5610..0000000000 --- a/meta-gnome/recipes-gnome/orbit2/orbit2/configure-lossage.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- ORBit2-2.14.17/configure.in-orig 2009-01-10 09:36:18.000000000 -0800 -+++ ORBit2-2.14.17/configure.in 2009-06-17 15:10:59.000000000 -0700 -@@ -217,20 +217,20 @@ dnl - dnl So many people with broken linking setups asked about this - dnl it turned out to be necessary to check for this. - dnl --dofus_save_libs="$LIBS" --LIBS="$ORBIT_LIBS $LIBS" --AC_TRY_RUN([ #include -- main () -- { -- return 0; -- } ],, -- AC_MSG_ERROR([ --Linking is badly borked on your system. Please ensure your library path is correct --Check config.log for details - check near the end of the log above 'failed program was' --Alternatively ensure that your /etc/ld.so.conf (and/or LD_LIBRARY_PATH) includes the --prefix you're compiling on: '${prefix}' ]), --AC_MSG_WARN([Could not check for borked linking while cross-compiling])) --LIBS="$dofus_save_libs" -+dnl dofus_save_libs="$LIBS" -+dnl LIBS="$ORBIT_LIBS $LIBS" -+dnl AC_TRY_RUN([ #include -+dnl main () -+dnl { -+dnl return 0; -+dnl } ],, -+dnl AC_MSG_ERROR([ -+dnl Linking is badly borked on your system. Please ensure your library path is correct -+dnl Check config.log for details - check near the end of the log above 'failed program was' -+dnl Alternatively ensure that your /etc/ld.so.conf (and/or LD_LIBRARY_PATH) includes the -+dnl prefix you're compiling on: '${prefix}' ]), -+dnl AC_MSG_WARN([Could not check for borked linking while cross-compiling])) -+dnl LIBS="$dofus_save_libs" - - orig_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS $ORBIT_CFLAGS" diff --git a/meta-gnome/recipes-gnome/orbit2/orbit2/pkgconfig-fix.patch b/meta-gnome/recipes-gnome/orbit2/orbit2/pkgconfig-fix.patch deleted file mode 100644 index f629e506dd..0000000000 --- a/meta-gnome/recipes-gnome/orbit2/orbit2/pkgconfig-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN ORBit2-2.14.12.orig/ORBit-2.0.pc.in ORBit2-2.14.12/ORBit-2.0.pc.in ---- ORBit2-2.14.12.orig/ORBit-2.0.pc.in 2008-01-29 13:45:22.000000000 +0100 -+++ ORBit2-2.14.12/ORBit-2.0.pc.in 2008-09-23 20:13:07.000000000 +0200 -@@ -2,7 +2,7 @@ - exec_prefix=@exec_prefix@ - libdir=@libdir@ - includedir=@includedir@ --orbit_idl=@bindir@/orbit-idl-2@EXEEXT@ -+orbit_idl=@exec_prefix@/bin/orbit-idl-2@EXEEXT@ - - - Name: ORBit-2.0 diff --git a/meta-gnome/recipes-gnome/orbit2/orbit2_2.14.19.bb b/meta-gnome/recipes-gnome/orbit2/orbit2_2.14.19.bb deleted file mode 100644 index f9af2ee644..0000000000 --- a/meta-gnome/recipes-gnome/orbit2/orbit2_2.14.19.bb +++ /dev/null @@ -1,41 +0,0 @@ -SUMMARY = "CORBA ORB" -SECTION = "x11/gnome/libs" -LICENSE = "GPL-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" -SRC_NAME = "ORBit2" -SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" -SRC_URI = " \ - ${GNOME_MIRROR}/${SRC_NAME}/${SHRT_VER}/${SRC_NAME}-${PV}.tar.bz2 \ - file://configure-lossage.patch \ - file://pkgconfig-fix.patch \ - file://0001-linc2-src-Makefile.am-fix-build-with-glib-2.36.patch \ - file://0002-Use-AM_CPPFLAGS-instead-of-INCLUDES-and-fix-problem-.patch \ -" -SRC_URI[md5sum] = "7082d317a9573ab338302243082d10d1" -SRC_URI[sha256sum] = "55c900a905482992730f575f3eef34d50bda717c197c97c08fa5a6eafd857550" - -BBCLASSEXTEND = "native" - -IDL_COMPILER_DEPENDS = "orbit2-native" -IDL_COMPILER_DEPENDS_class-native = " " -DEPENDS = "libidl popt ${IDL_COMPILER_DEPENDS}" - -# IDL_COMPILER_DEPENDS_class-native for some reason didn't work and orbit2-native -# was still in orbit2-native DEPENDS causing circular dependency -DEPENDS_class-native = "libidl-native popt-native" -PARALLEL_MAKE = "" - - -FILES_${PN} += "${libdir}/orbit-2.0/*.so" -FILES_${PN}-dev += "${libdir}/orbit-2.0/*.la" -FILES_${PN}-staticdev += "${libdir}/orbit-2.0/*.a" -FILES_${PN}-dbg += "${libdir}/orbit-2.0/.debug" - -S = "${WORKDIR}/${SRC_NAME}-${PV}" - -LEAD_SONAME = "libORBit-2.so" - -inherit autotools pkgconfig gtk-doc - -EXTRA_OEMAKE = "IDL_COMPILER='${STAGING_BINDIR_NATIVE}/orbit-idl-2'" -EXTRA_OEMAKE_class-native = " " -- cgit 1.2.3-korg