diff options
Diffstat (limited to 'meta-gnome/recipes-gnome')
-rw-r--r-- | meta-gnome/recipes-gnome/gobject-introspection/gobject-introspection/use-usr-bin-env-for-python.patch | 20 | ||||
-rw-r--r-- | meta-gnome/recipes-gnome/gobject-introspection/gobject-introspection_0.9.10.bb | 32 | ||||
-rw-r--r-- | meta-gnome/recipes-gnome/gobject-introspection/gobject-introspection_git.bb | 34 | ||||
-rw-r--r-- | meta-gnome/recipes-gnome/orbit2/orbit2-2.14.17/gtk-doc.m4 (renamed from meta-gnome/recipes-gnome/orbit2/orbit2/gtk-doc.m4) | 0 | ||||
-rw-r--r-- | meta-gnome/recipes-gnome/orbit2/orbit2-2.14.17/gtk-doc.make (renamed from meta-gnome/recipes-gnome/orbit2/orbit2/gtk-doc.make) | 0 | ||||
-rw-r--r-- | meta-gnome/recipes-gnome/orbit2/orbit2-2.14.17/pkgconfig-fix.patch (renamed from meta-gnome/recipes-gnome/orbit2/orbit2/pkgconfig-fix.patch) | 0 | ||||
-rw-r--r-- | meta-gnome/recipes-gnome/orbit2/orbit2-native_2.14.12.bb | 27 | ||||
-rw-r--r-- | meta-gnome/recipes-gnome/orbit2/orbit2.inc | 32 | ||||
-rw-r--r-- | meta-gnome/recipes-gnome/orbit2/orbit2/configure-lossage.patch | 35 | ||||
-rw-r--r-- | meta-gnome/recipes-gnome/orbit2/orbit2_2.14.17.bb | 48 |
10 files changed, 44 insertions, 184 deletions
diff --git a/meta-gnome/recipes-gnome/gobject-introspection/gobject-introspection/use-usr-bin-env-for-python.patch b/meta-gnome/recipes-gnome/gobject-introspection/gobject-introspection/use-usr-bin-env-for-python.patch deleted file mode 100644 index 67b85470d3e..00000000000 --- a/meta-gnome/recipes-gnome/gobject-introspection/gobject-introspection/use-usr-bin-env-for-python.patch +++ /dev/null @@ -1,20 +0,0 @@ -Index: gobject-introspection-0.9.10/tools/g-ir-annotation-tool.in -=================================================================== ---- gobject-introspection-0.9.10.orig/tools/g-ir-annotation-tool.in -+++ gobject-introspection-0.9.10/tools/g-ir-annotation-tool.in -@@ -1,4 +1,4 @@ --#!@PYTHON@ -+#!/usr/bin/env python - # -*- Mode: Python -*- - # GObject-Introspection - a framework for introspecting GObject libraries - # Copyright (C) 2008 Johan Dahlin -Index: gobject-introspection-0.9.10/tools/g-ir-scanner.in -=================================================================== ---- gobject-introspection-0.9.10.orig/tools/g-ir-scanner.in -+++ gobject-introspection-0.9.10/tools/g-ir-scanner.in -@@ -1,4 +1,4 @@ --#!@PYTHON@ -+#!/usr/bin/env python - # -*- Mode: Python -*- - # GObject-Introspection - a framework for introspecting GObject libraries - # Copyright (C) 2008 Johan Dahlin diff --git a/meta-gnome/recipes-gnome/gobject-introspection/gobject-introspection_0.9.10.bb b/meta-gnome/recipes-gnome/gobject-introspection/gobject-introspection_0.9.10.bb deleted file mode 100644 index f1a46a10b2a..00000000000 --- a/meta-gnome/recipes-gnome/gobject-introspection/gobject-introspection_0.9.10.bb +++ /dev/null @@ -1,32 +0,0 @@ -# NOTE: WIP! This recipe does not cross-compile atm., only -native -SECTION = "libs" -DEPENDS = "glib-2.0 libffi bison-native" -BBCLASSEXTEND = "native" -PR = "r1" - -LICENSE = "GPLv2+ & LGPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=90d577535a3898e1ae5dbf0ae3509a8c \ - file://COPYING.GPL;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://COPYING.LGPL;md5=3bf50002aefd002f49e7bb854063f7e7" - -SRC_URI[md5sum] = "e5cd63d6bcc5c105e898e7c33cf42175" -SRC_URI[sha256sum] = "4bf244db75df04499dea704e7734376c0fc5a3a17fb59be2123c8d76111e6fb8" - -SRC_URI = "\ - ${GNOME_MIRROR}/gobject-introspection/0.9/${BPN}-${PV}.tar.bz2 \ - file://use-usr-bin-env-for-python.patch \ -" -S = "${WORKDIR}/${BPN}-${PV}" - -inherit autotools - -do_configure_prepend() { - touch -f gtk-doc.make -} - -EXTRA_OECONF = "\ - --disable-gtk-doc \ - --disable-gtk-doc-html \ - --disable-gtk-doc-pdf \ - --disable-tests \ -" diff --git a/meta-gnome/recipes-gnome/gobject-introspection/gobject-introspection_git.bb b/meta-gnome/recipes-gnome/gobject-introspection/gobject-introspection_git.bb deleted file mode 100644 index f7e89074713..00000000000 --- a/meta-gnome/recipes-gnome/gobject-introspection/gobject-introspection_git.bb +++ /dev/null @@ -1,34 +0,0 @@ -# NOTE: WIP! This recipe does not cross-compile atm., only -native -DEPENDS = "glib-2.0 libffi python-native gobject-introspection-native" -DEPENDS_virtclass-native = "glib-2.0-native libffi-native python-native bison-native flex-native" -BBCLASSEXTEND = "native" - -SRC_URI = "git://git.gnome.org/gobject-introspection;protocol=git \ - file://use-usr-bin-env-for-python.patch \ -" - -LICENSE = "GPLv2+ & LGPLv2+" -LIC_FILES_CHKSUM = "file://COPYING.tools;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://COPYING.lib;md5=3bf50002aefd002f49e7bb854063f7e7" - -SRCREV = "8d64bc23d2b837421ecf9c7b0e4b8d5d95ca0d21" -PV = "1.29.0+gitr${SRCPV}" -PR = "r1" -DEFAULT_PREFERENCE = "-1" - -S = "${WORKDIR}/git" - -inherit autotools - -BBCLASSEXTEND = "native" - -do_configure_prepend () { - echo "EXTRA_DIST = " > ${S}/gtk-doc.make -} - -EXTRA_OECONF = "\ - --disable-gtk-doc \ - --disable-gtk-doc-html \ - --disable-gtk-doc-pdf \ - --disable-tests \ -" diff --git a/meta-gnome/recipes-gnome/orbit2/orbit2/gtk-doc.m4 b/meta-gnome/recipes-gnome/orbit2/orbit2-2.14.17/gtk-doc.m4 index 3ec41666b2f..3ec41666b2f 100644 --- a/meta-gnome/recipes-gnome/orbit2/orbit2/gtk-doc.m4 +++ b/meta-gnome/recipes-gnome/orbit2/orbit2-2.14.17/gtk-doc.m4 diff --git a/meta-gnome/recipes-gnome/orbit2/orbit2/gtk-doc.make b/meta-gnome/recipes-gnome/orbit2/orbit2-2.14.17/gtk-doc.make index 354ffb7c66c..354ffb7c66c 100644 --- a/meta-gnome/recipes-gnome/orbit2/orbit2/gtk-doc.make +++ b/meta-gnome/recipes-gnome/orbit2/orbit2-2.14.17/gtk-doc.make diff --git a/meta-gnome/recipes-gnome/orbit2/orbit2/pkgconfig-fix.patch b/meta-gnome/recipes-gnome/orbit2/orbit2-2.14.17/pkgconfig-fix.patch index f629e506ddd..f629e506ddd 100644 --- a/meta-gnome/recipes-gnome/orbit2/orbit2/pkgconfig-fix.patch +++ b/meta-gnome/recipes-gnome/orbit2/orbit2-2.14.17/pkgconfig-fix.patch diff --git a/meta-gnome/recipes-gnome/orbit2/orbit2-native_2.14.12.bb b/meta-gnome/recipes-gnome/orbit2/orbit2-native_2.14.12.bb deleted file mode 100644 index 1db2496c356..00000000000 --- a/meta-gnome/recipes-gnome/orbit2/orbit2-native_2.14.12.bb +++ /dev/null @@ -1,27 +0,0 @@ -DESCRIPTION = "CORBA ORB" -PR = "r0" -LICENSE = "LGPL GPL" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -SECTION = "x11/gnome/libs" -SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/ORBit2/2.14/ORBit2-${PV}.tar.bz2 \ - file://configure-lossage.patch \ - file://gtk-doc.m4 \ - file://gtk-doc.make" -DEPENDS = "libidl-native popt-native gtk-doc" - -S = "${WORKDIR}/ORBit2-${PV}" -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/orbit2" - -PARALLEL_MAKE = "" -inherit autotools native pkgconfig - -EXTRA_OECONF = "--disable-gtk-doc" - -do_configure_prepend() { - mkdir -p m4 - install ${WORKDIR}/gtk-doc.m4 ./m4/ - install ${WORKDIR}/gtk-doc.make ./ -} - -SRC_URI[md5sum] = "6f4bf7d803d442e9d093a0daa203d506" -SRC_URI[sha256sum] = "d60027a4a36e64d02723d00b76c08e8d92850cab6269b2edcda4a1bb30cc7723" diff --git a/meta-gnome/recipes-gnome/orbit2/orbit2.inc b/meta-gnome/recipes-gnome/orbit2/orbit2.inc deleted file mode 100644 index 51978909bef..00000000000 --- a/meta-gnome/recipes-gnome/orbit2/orbit2.inc +++ /dev/null @@ -1,32 +0,0 @@ -LICENSE = "GPL" -DESCRIPTION = "CORBA ORB" -SECTION = "x11/gnome/libs" -SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/ORBit2/2.14/ORBit2-${PV}.tar.bz2 \ - file://configure-lossage.patch \ - file://pkgconfig-fix.patch \ - file://gtk-doc.m4 \ - file://gtk-doc.make" -DEPENDS = "libidl popt orbit2-native gtk-doc" -PARALLEL_MAKE = "" - -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -FILES_${PN} += "${libdir}/orbit-2.0/*.so" -FILES_${PN}-dev += "${libdir}/orbit-2.0/*.a ${libdir}/orbit-2.0/*.la" -FILES_${PN}-dbg += "${libdir}/orbit-2.0/.debug" - -S = "${WORKDIR}/ORBit2-${PV}" - -LEAD_SONAME = "libORBit-2.so" - -inherit autotools pkgconfig - -EXTRA_OECONF = "--disable-gtk-doc" -EXTRA_OEMAKE = "IDL_COMPILER='${STAGING_BINDIR_NATIVE}/orbit-idl-2'" - -do_configure_prepend() { - mkdir -p m4 - install ${WORKDIR}/gtk-doc.m4 ./m4/ - install ${WORKDIR}/gtk-doc.make ./ -} - 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 7485a0ce0c8..00000000000 --- a/meta-gnome/recipes-gnome/orbit2/orbit2/configure-lossage.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- orbit/configure.in~ 2004-05-07 09:31:32.000000000 +0100 -+++ orbit/configure.in 2004-05-08 19:27:35.000000000 +0100 -@@ -193,19 +193,19 @@ - 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 <stdio.h> -- 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}' ])) --LIBS="$dofus_save_libs" -+dnl dofus_save_libs="$LIBS" -+dnl LIBS="$ORBIT_LIBS $LIBS" -+dnl AC_TRY_RUN([ #include <stdio.h> -+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 LIBS="$dofus_save_libs" - - orig_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS $ORBIT_CFLAGS" diff --git a/meta-gnome/recipes-gnome/orbit2/orbit2_2.14.17.bb b/meta-gnome/recipes-gnome/orbit2/orbit2_2.14.17.bb index 8709cc02643..fb7e93eebd4 100644 --- a/meta-gnome/recipes-gnome/orbit2/orbit2_2.14.17.bb +++ b/meta-gnome/recipes-gnome/orbit2/orbit2_2.14.17.bb @@ -1,6 +1,46 @@ -require orbit2.inc - -PR = "r1" - +DESCRIPTION = "CORBA ORB" +SECTION = "x11/gnome/libs" +LICENSE = "GPL-2.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +SRC_NAME = "ORBit2" +SHRT_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}" +SRC_URI = "${GNOME_MIRROR}/${SRC_NAME}/${SHRT_VER}/${SRC_NAME}-${PV}.tar.bz2 \ + file://configure-lossage.patch \ + file://pkgconfig-fix.patch \ + file://gtk-doc.m4 \ + file://gtk-doc.make" SRC_URI[md5sum] = "10bfb957fa4a8935a0b4afaee7d71df7" SRC_URI[sha256sum] = "62bfce3f678f9347a19c766944e8aef7b89bc32b25ac23eb3e4c25929ce8974c" + +PR = "r2" +BBCLASSEXTEND = "native" + +IDL_COMPILER_DEPENDS = "orbit2-native" +IDL_COMPILER_DEPENDS_virtclass-native = " " +DEPENDS = "libidl popt gtk-doc ${IDL_COMPILER_DEPENDS}" + +# IDL_COMPILER_DEPENDS_virtclass-native for some reason didn't work and orbit2-native +# was still in orbit2-native DEPENDS causing circular dependency +DEPENDS_virtclass-native = "libidl-native popt-native gtk-doc-native" +PARALLEL_MAKE = "" + + +FILES_${PN} += "${libdir}/orbit-2.0/*.so" +FILES_${PN}-dev += "${libdir}/orbit-2.0/*.a ${libdir}/orbit-2.0/*.la" +FILES_${PN}-dbg += "${libdir}/orbit-2.0/.debug" + +S = "${WORKDIR}/${SRC_NAME}-${PV}" + +LEAD_SONAME = "libORBit-2.so" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--disable-gtk-doc" +EXTRA_OEMAKE = "IDL_COMPILER='${STAGING_BINDIR_NATIVE}/orbit-idl-2'" +EXTRA_OEMAKE_virtclass-native = " " + +do_configure_prepend() { + mkdir -p m4 + install ${WORKDIR}/gtk-doc.m4 ./m4/ + install ${WORKDIR}/gtk-doc.make ./ +} |