From d822bb304a6a8c06f67b1e917d6268a290f868fc Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 28 Apr 2012 18:07:41 +0200 Subject: libsoup-2.4, gobject-introspection: upgraded in oe-core Signed-off-by: Martin Jansa --- .../recipes-support/libsoup/libsoup-2.4_2.37.2.bb | 25 ---------------- .../use-usr-bin-env-for-python.patch | 20 ------------- .../gobject-introspection_0.9.10.bb | 32 -------------------- .../gobject-introspection_git.bb | 34 ---------------------- 4 files changed, 111 deletions(-) delete mode 100644 meta-efl/recipes-support/libsoup/libsoup-2.4_2.37.2.bb delete mode 100644 meta-gnome/recipes-gnome/gobject-introspection/gobject-introspection/use-usr-bin-env-for-python.patch delete mode 100644 meta-gnome/recipes-gnome/gobject-introspection/gobject-introspection_0.9.10.bb delete mode 100644 meta-gnome/recipes-gnome/gobject-introspection/gobject-introspection_git.bb diff --git a/meta-efl/recipes-support/libsoup/libsoup-2.4_2.37.2.bb b/meta-efl/recipes-support/libsoup/libsoup-2.4_2.37.2.bb deleted file mode 100644 index 4810b3a1eb..0000000000 --- a/meta-efl/recipes-support/libsoup/libsoup-2.4_2.37.2.bb +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION = "An HTTP library implementation in C" -HOMEPAGE = "http://www.gnome.org/" -BUGTRACKER = "https://bugzilla.gnome.org/" - -LICENSE = "LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" - -PR = "r1" - -# unstable version -DEFAULT_PREFERENCE = "-1" - -SECTION = "x11/gnome/libs" - -DEPENDS = "glib-2.0 gnutls libxml2 libproxy sqlite3 libgnome-keyring" - -SRC_URI = "${GNOME_MIRROR}/libsoup/2.37/libsoup-${PV}.tar.xz" - -SRC_URI[md5sum] = "7737dd5238efd593452ba3c365e63e8c" -SRC_URI[sha256sum] = "df82c51b67f67c3128979d1f3bf20a8ceeea369b6e43aceb16d576d8fc4e8423" - -S = "${WORKDIR}/libsoup-${PV}" - -inherit autotools pkgconfig - 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 67b85470d3..0000000000 --- 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 f1a46a10b2..0000000000 --- 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 f7e8907471..0000000000 --- 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 \ -" -- cgit 1.2.3-korg From 43bbae5f510e0ab19cf3d799047207242ae0fa23 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 2 May 2012 09:18:40 +0200 Subject: libgee: upgrade to 0.6.4 Signed-off-by: Martin Jansa --- meta-oe/recipes-devtools/libgee/libgee_0.6.0.bb | 12 ------------ meta-oe/recipes-devtools/libgee/libgee_0.6.4.bb | 11 +++++++++++ 2 files changed, 11 insertions(+), 12 deletions(-) delete mode 100644 meta-oe/recipes-devtools/libgee/libgee_0.6.0.bb create mode 100644 meta-oe/recipes-devtools/libgee/libgee_0.6.4.bb diff --git a/meta-oe/recipes-devtools/libgee/libgee_0.6.0.bb b/meta-oe/recipes-devtools/libgee/libgee_0.6.0.bb deleted file mode 100644 index 4e305b6049..0000000000 --- a/meta-oe/recipes-devtools/libgee/libgee_0.6.0.bb +++ /dev/null @@ -1,12 +0,0 @@ -require libgee.inc -PE = "1" -PR = "${INC_PR}.1" -#autoreconf needs introspection.m4 (staged by gobject-introspection-native) after http://git.gnome.org/browse/libgee/commit/?id=d026a29b38ca1a3388981c6e75a92602212373d8 -DEPENDS += "gobject-introspection-native" -DEPENDS_virtclass-native += "gobject-introspection-native" - -SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libgee/0.6/${BPN}-${PV}.tar.bz2" -S = "${WORKDIR}/${BPN}-${PV}" - -SRC_URI[md5sum] = "4eb513b23ab6ea78884989518a4acf6f" -SRC_URI[sha256sum] = "e586678d0a88637abeaaf850b62231000772e79ea6d9c4b45dc3cea99f778a7a" diff --git a/meta-oe/recipes-devtools/libgee/libgee_0.6.4.bb b/meta-oe/recipes-devtools/libgee/libgee_0.6.4.bb new file mode 100644 index 0000000000..4e2c6438e9 --- /dev/null +++ b/meta-oe/recipes-devtools/libgee/libgee_0.6.4.bb @@ -0,0 +1,11 @@ +require libgee.inc +PE = "1" +PR = "${INC_PR}.0" +#autoreconf needs introspection.m4 (staged by gobject-introspection-native) after http://git.gnome.org/browse/libgee/commit/?id=d026a29b38ca1a3388981c6e75a92602212373d8 +DEPENDS += "gobject-introspection-native" +DEPENDS_virtclass-native += "gobject-introspection-native" + +SHRT_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}" +SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libgee/${SHRT_VER}/${BP}.tar.xz" +SRC_URI[md5sum] = "a32bf498cf33d5e3417823a7b252ad22" +SRC_URI[sha256sum] = "55f39f3b28e676f6cbd9377d83edd031084436a4da41280a9503c94faffb1665" -- cgit 1.2.3-korg From a1a9409931cc180e3ff61597d133be71e97a8467 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 6 May 2012 08:54:38 +0200 Subject: glibmm: fix build with glib-2.32 Signed-off-by: Martin Jansa --- meta-oe/recipes-core/glib-2.0/glibmm/glib-2.32.patch | 10 ++++++++++ meta-oe/recipes-core/glib-2.0/glibmm_2.28.2.bb | 7 +++---- 2 files changed, 13 insertions(+), 4 deletions(-) create mode 100644 meta-oe/recipes-core/glib-2.0/glibmm/glib-2.32.patch diff --git a/meta-oe/recipes-core/glib-2.0/glibmm/glib-2.32.patch b/meta-oe/recipes-core/glib-2.0/glibmm/glib-2.32.patch new file mode 100644 index 0000000000..50b7367c5a --- /dev/null +++ b/meta-oe/recipes-core/glib-2.0/glibmm/glib-2.32.patch @@ -0,0 +1,10 @@ +--- glibmm-2.28.2.orig/glib/glibmm/varianttype.cc 2011-06-09 20:29:48.000000000 +0200 ++++ glibmm-2.28.2/glib/glibmm/varianttype.cc 2012-05-06 08:15:32.760680295 +0200 +@@ -23,7 +23,6 @@ + + #include + #include +-#include + + namespace Glib + { diff --git a/meta-oe/recipes-core/glib-2.0/glibmm_2.28.2.bb b/meta-oe/recipes-core/glib-2.0/glibmm_2.28.2.bb index 7e77a1c9cf..6604091fe3 100644 --- a/meta-oe/recipes-core/glib-2.0/glibmm_2.28.2.bb +++ b/meta-oe/recipes-core/glib-2.0/glibmm_2.28.2.bb @@ -1,10 +1,9 @@ require glibmm.inc -PR = "r1" +PR = "r2" SRC_URI[archive.md5sum] = "cf33d1861d09fb2952a6a1d69e0502e3" SRC_URI[archive.sha256sum] = "7b67178363f8494c94f8b3dd704a4c8db7ad75a253fc84a4ad229e5e179ec192" -SRC_URI += " file://remove-examples.patch" - - +SRC_URI += " file://remove-examples.patch \ + file://glib-2.32.patch" -- cgit 1.2.3-korg From fd0343f3b67ae3c4917b18a394bc4361a5599735 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 6 May 2012 08:55:32 +0200 Subject: loudmouth: fix build with glib-2.32 Signed-off-by: Martin Jansa --- .../loudmouth/loudmouth-1.4.3/glib-2.32.patch | 10 ++++++++++ meta-oe/recipes-connectivity/loudmouth/loudmouth_1.4.3.bb | 5 ++++- 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-connectivity/loudmouth/loudmouth-1.4.3/glib-2.32.patch diff --git a/meta-oe/recipes-connectivity/loudmouth/loudmouth-1.4.3/glib-2.32.patch b/meta-oe/recipes-connectivity/loudmouth/loudmouth-1.4.3/glib-2.32.patch new file mode 100644 index 0000000000..b6c9422e8c --- /dev/null +++ b/meta-oe/recipes-connectivity/loudmouth/loudmouth-1.4.3/glib-2.32.patch @@ -0,0 +1,10 @@ +--- loudmouth-1.4.3.orig/loudmouth/lm-error.c 2008-10-29 21:48:15.000000000 +0100 ++++ loudmouth-1.4.3/loudmouth/lm-error.c 2012-05-06 08:27:07.455739440 +0200 +@@ -19,7 +19,6 @@ + */ + + #include +-#include + #include "lm-error.h" + + /** diff --git a/meta-oe/recipes-connectivity/loudmouth/loudmouth_1.4.3.bb b/meta-oe/recipes-connectivity/loudmouth/loudmouth_1.4.3.bb index f91fdff07e..87852ee746 100644 --- a/meta-oe/recipes-connectivity/loudmouth/loudmouth_1.4.3.bb +++ b/meta-oe/recipes-connectivity/loudmouth/loudmouth_1.4.3.bb @@ -8,7 +8,10 @@ DEPENDS = "glib-2.0 check openssl" inherit gnomebase -SRC_URI += "file://04-use-pkg-config-for-gnutls.patch" +PR = "r1" + +SRC_URI += "file://04-use-pkg-config-for-gnutls.patch \ + file://glib-2.32.patch" SRC_URI[archive.md5sum] = "55339ca42494690c3942ee1465a96937" SRC_URI[archive.sha256sum] = "95a93f5d009b71ea8193d994aa11f311bc330a3efe1b7cd74dc48f11c7f929e3" -- cgit 1.2.3-korg From ac3f69755e0e6a0d9c1ebd49594cca2140e02c5b Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 6 May 2012 10:33:46 +0200 Subject: gpe-scap: migrate to use libsoup-2.4 instead of libsoup-2.2 API Signed-off-by: Martin Jansa --- .../gpe-scap/gpe-scap/use.libsoup-2.4.patch | 42 ++++++++++++++++++++++ meta-gpe/recipes-graphics/gpe-scap/gpe-scap_1.4.bb | 8 +++-- 2 files changed, 47 insertions(+), 3 deletions(-) create mode 100644 meta-gpe/recipes-graphics/gpe-scap/gpe-scap/use.libsoup-2.4.patch diff --git a/meta-gpe/recipes-graphics/gpe-scap/gpe-scap/use.libsoup-2.4.patch b/meta-gpe/recipes-graphics/gpe-scap/gpe-scap/use.libsoup-2.4.patch new file mode 100644 index 0000000000..3cfe5d7240 --- /dev/null +++ b/meta-gpe/recipes-graphics/gpe-scap/gpe-scap/use.libsoup-2.4.patch @@ -0,0 +1,42 @@ +diff -uNr gpe-scap-1.4.orig/configure.ac gpe-scap-1.4/configure.ac +--- gpe-scap-1.4.orig/configure.ac 2009-03-05 18:53:53.000000000 +0100 ++++ gpe-scap-1.4/configure.ac 2012-05-06 10:18:29.348308322 +0200 +@@ -24,7 +24,7 @@ + AC_SUBST(LDFLAGS) + + dnl libraries +-GTK_MODULES="gtk+-2.0 >= 2.6.0 gthread-2.0 libsoup-2.2" ++GTK_MODULES="gtk+-2.0 >= 2.6.0 gthread-2.0 libsoup-2.4" + PKG_CHECK_MODULES(GTK, $GTK_MODULES) + AC_SUBST(GTK_CFLAGS) + AC_SUBST(GTK_LIBS) +diff -uNr gpe-scap-1.4.orig/src/scr-shot-common.c gpe-scap-1.4/src/scr-shot-common.c +--- gpe-scap-1.4.orig/src/scr-shot-common.c 2009-03-05 12:13:20.000000000 +0100 ++++ gpe-scap-1.4/src/scr-shot-common.c 2012-05-06 10:30:52.299371576 +0200 +@@ -182,12 +182,12 @@ + /* create session and message */ + session = soup_session_sync_new (); + message = soup_message_new ("POST", url); +- soup_message_add_header (message->request_headers, "User-Agent", "gpe-scap/" VERSION); +- soup_message_add_header (message->request_headers, "Accept", ++ soup_message_headers_append (message->request_headers, "User-Agent", "gpe-scap/" VERSION); ++ soup_message_headers_append (message->request_headers, "Accept", + "text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5"); +-/* soup_message_add_header (message->request_headers, "Accept-Charset", "Accept-Charset=ISO-8859-1,utf-8;q=0.7,*;q=0.7"); +- soup_message_add_header (message->request_headers, "Keep-Alive", "100"); +- soup_message_add_header (message->request_headers, "Connection", "keep-alive"); ++/* soup_message_headers_append (message->request_headers, "Accept-Charset", "Accept-Charset=ISO-8859-1,utf-8;q=0.7,*;q=0.7"); ++ soup_message_headers_append (message->request_headers, "Keep-Alive", "100"); ++ soup_message_headers_append (message->request_headers, "Connection", "keep-alive"); + soup_message_wire add_header (message->request_headers, "Accept-Encoding", "gzip,deflate"); + */ + /* build message body */ +@@ -207,7 +207,7 @@ + memcpy (body + strlen (cmd) + len, tail, strlen (tail)); + + soup_message_set_request (message, "multipart/form-data; boundary="SEP, +- SOUP_BUFFER_SYSTEM_OWNED, body, content_len); ++ SOUP_MEMORY_TAKE, body, content_len); + + soup_session_send_message (session, message); + diff --git a/meta-gpe/recipes-graphics/gpe-scap/gpe-scap_1.4.bb b/meta-gpe/recipes-graphics/gpe-scap/gpe-scap_1.4.bb index 9577f2f195..c416ff5ddb 100644 --- a/meta-gpe/recipes-graphics/gpe-scap/gpe-scap_1.4.bb +++ b/meta-gpe/recipes-graphics/gpe-scap/gpe-scap_1.4.bb @@ -4,9 +4,9 @@ SECTION = "gpe" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" -DEPENDS = "glib-2.0 gtk+ libgpewidget libglade libsoup" +DEPENDS = "glib-2.0 gtk+ libgpewidget libglade libsoup-2.4" -PR = "r2" +PR = "r3" SRC_URI[md5sum] = "eaf545561b0ad981c9d01833f30fcf95" SRC_URI[sha256sum] = "762778421fae7c62d5ec6a9d27986166c0dbbe2ff51fc10bb9b8baff5c367534" @@ -15,7 +15,9 @@ GPE_TARBALL_SUFFIX = "bz2" inherit gpe autotools -SRC_URI += "file://0001-Fix-the-ordering-of-LDADD-options-to-fix-a-compilati.patch" +SRC_URI += "file://0001-Fix-the-ordering-of-LDADD-options-to-fix-a-compilati.patch \ + file://use.libsoup-2.4.patch \ +" RREPLACES_${PN} = "gpe-screenshot" -- cgit 1.2.3-korg From 675fd0d4926f10fb8409a05d802f3d6908bd559e Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Wed, 2 May 2012 20:28:34 -0500 Subject: kernel.bbclass: move kernel-vmlinux up in PACKAGES If KERNEL_IMAGETYPE is vmlinux, the expectation is most likely that there will be no kernel image package, but we still want a vmlinux package for debugging, so move kernel-vmlinux in front of kernel-image in PACKAGES. Signed-off-by: Christopher Larson Signed-off-by: Richard Purdie Signed-off-by: Martin Jansa --- meta-oe/classes/kernel.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/classes/kernel.bbclass b/meta-oe/classes/kernel.bbclass index 98320feeda..66398ef39a 100644 --- a/meta-oe/classes/kernel.bbclass +++ b/meta-oe/classes/kernel.bbclass @@ -252,7 +252,7 @@ EXPORT_FUNCTIONS do_compile do_install do_configure # kernel-base becomes kernel-${KERNEL_VERSION} # kernel-image becomes kernel-image-${KERNEL_VERISON} -PACKAGES = "kernel kernel-base kernel-image kernel-dev kernel-vmlinux kernel-misc" +PACKAGES = "kernel kernel-base kernel-vmlinux kernel-image kernel-dev kernel-misc" FILES = "" FILES_kernel-image = "/boot/${KERNEL_IMAGETYPE}*" FILES_kernel-dev = "/boot/System.map* /boot/Module.symvers* /boot/config*" -- cgit 1.2.3-korg From 5c22d88fe27592f4ef279e562cba063676f8d1fe Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 31 Jan 2012 00:35:02 -0800 Subject: kernel.bbclass: Use kmod-native instead of module-init-tools-cross Signed-off-by: Khem Raj Signed-off-by: Martin Jansa --- meta-oe/classes/kernel.bbclass | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/meta-oe/classes/kernel.bbclass b/meta-oe/classes/kernel.bbclass index 66398ef39a..b431f8e1d5 100644 --- a/meta-oe/classes/kernel.bbclass +++ b/meta-oe/classes/kernel.bbclass @@ -1,7 +1,7 @@ inherit linux-kernel-base module_strip PROVIDES += "virtual/kernel" -DEPENDS += "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}depmod virtual/${TARGET_PREFIX}gcc${KERNEL_CCSUFFIX} update-modules" +DEPENDS += "virtual/${TARGET_PREFIX}gcc kmod-native virtual/${TARGET_PREFIX}gcc${KERNEL_CCSUFFIX} update-modules" # we include gcc above, we dont need virtual/libc INHIBIT_DEFAULT_DEPS = "1" @@ -274,7 +274,7 @@ if [ ! -e "$D/lib/modules/${KERNEL_VERSION}" ]; then mkdir -p $D/lib/modules/${KERNEL_VERSION} fi if [ -n "$D" ]; then - ${HOST_PREFIX}depmod -A -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION} + depmod -a -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION} else depmod -a fi @@ -352,9 +352,8 @@ python populate_packages_prepend () { if m: kernelver_stripped = m.group(1) path = d.getVar("PATH", True) - host_prefix = d.getVar("HOST_PREFIX", True) or "" - cmd = "PATH=\"%s\" %sdepmod -n -a -r -b %s -F %s/boot/System.map-%s %s" % (path, host_prefix, dvar, dvar, kernelver, kernelver_stripped) + cmd = "PATH=\"%s\" depmod -n -a -b %s -F %s/boot/System.map-%s %s" % (path, dvar, dvar, kernelver, kernelver_stripped) f = os.popen(cmd, 'r') deps = {} -- cgit 1.2.3-korg From eaafb0b441e9645cad3e1a7a6730be4b19c65d54 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 7 May 2012 23:54:30 +0200 Subject: libxaw: upgrade to 1.0.10 to fix -Werror=pointer-to-int-cast when building for x86-64 * 1.0.9 fails with: | XawIm.c:1410:23: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast] | XawIm.c:1415:23: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast] * fixed upstream: http://cgit.freedesktop.org/xorg/lib/libXaw/commit/?id=49c0a2441946f0d70fbd2612f193c95b84dde102 * COPYING changed only formally, stripping trailing spaces in http://cgit.freedesktop.org/xorg/lib/libXaw/commit/COPYING?id=37ffe69b10ae29e8f91de6ef647d06804b9d159b Signed-off-by: Martin Jansa --- meta-oe/recipes-graphics/xorg-lib/libxaw_1.0.10.bb | 27 +++++++++++++++++++++ meta-oe/recipes-graphics/xorg-lib/libxaw_1.0.9.bb | 28 ---------------------- 2 files changed, 27 insertions(+), 28 deletions(-) create mode 100644 meta-oe/recipes-graphics/xorg-lib/libxaw_1.0.10.bb delete mode 100644 meta-oe/recipes-graphics/xorg-lib/libxaw_1.0.9.bb diff --git a/meta-oe/recipes-graphics/xorg-lib/libxaw_1.0.10.bb b/meta-oe/recipes-graphics/xorg-lib/libxaw_1.0.10.bb new file mode 100644 index 0000000000..89338d9c30 --- /dev/null +++ b/meta-oe/recipes-graphics/xorg-lib/libxaw_1.0.10.bb @@ -0,0 +1,27 @@ +require recipes-graphics/xorg-lib/xorg-lib-common.inc +DESCRIPTION = "X Athena Widget Set" +DEPENDS += "xproto virtual/libx11 libxext xextproto libxt libxmu libxpm libxp printproto libxau xmlto-native" + +LIC_FILES_CHKSUM = "file://COPYING;md5=1c65719d42900bb81b83e8293c20a364" + +PE = "1" + +SRC_URI[md5sum] = "f1ea52debce7a18cc26b21647a00ad8b" +SRC_URI[sha256sum] = "2d96bcf92638b8ec5c91d379f5ec2e7b15133adeb2ba22066d48bf3239ee1bdd" + +# disable docs as groff detection doesn't work on some hosts while cross compilling +EXTRA_OECONF += " --disable-docs " + +do_install_append () { + ln -sf libXaw6.so.6 ${D}${libdir}/libXaw.so.6 + ln -sf libXaw7.so.7 ${D}${libdir}/libXaw.so.7 + ln -sf libXaw7.so.7 ${D}${libdir}/libXaw.so +} + +PACKAGES =+ "libxaw6 libxaw7 libxaw8" + +FILES_libxaw6 = "${libdir}/libXaw*.so.6*" +FILES_libxaw7 = "${libdir}/libXaw*.so.7*" +FILES_libxaw8 = "${libdir}/libXaw8.so.8*" + +XORG_PN = "libXaw" diff --git a/meta-oe/recipes-graphics/xorg-lib/libxaw_1.0.9.bb b/meta-oe/recipes-graphics/xorg-lib/libxaw_1.0.9.bb deleted file mode 100644 index ea4f38b675..0000000000 --- a/meta-oe/recipes-graphics/xorg-lib/libxaw_1.0.9.bb +++ /dev/null @@ -1,28 +0,0 @@ -require recipes-graphics/xorg-lib/xorg-lib-common.inc -DESCRIPTION = "X Athena Widget Set" -DEPENDS += "xproto virtual/libx11 libxext xextproto libxt libxmu libxpm libxp printproto libxau xmlto-native" - -LIC_FILES_CHKSUM = "file://COPYING;md5=f1beacbc336a5a256bb28dbfcf01c2be" - -PE = "1" -PR = "r12" - -SRC_URI[md5sum] = "ccc57478c41b7a75b9702241b889b1d4" -SRC_URI[sha256sum] = "a83977546b78e24ac5dca86affc10b6404a87c16272405b05386feca1a2db037" - -# disable docs as groff detection doesn't work on some hosts while cross compilling -EXTRA_OECONF += " --disable-docs " - -do_install_append () { - ln -sf libXaw6.so.6 ${D}${libdir}/libXaw.so.6 - ln -sf libXaw7.so.7 ${D}${libdir}/libXaw.so.7 - ln -sf libXaw7.so.7 ${D}${libdir}/libXaw.so -} - -PACKAGES =+ "libxaw6 libxaw7 libxaw8" - -FILES_libxaw6 = "${libdir}/libXaw*.so.6*" -FILES_libxaw7 = "${libdir}/libXaw*.so.7*" -FILES_libxaw8 = "${libdir}/libXaw8.so.8*" - -XORG_PN = "libXaw" -- cgit 1.2.3-korg From 7e5b1e477a25c3dc661a2c155a22022a07903d0a Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 8 May 2012 09:57:16 +0200 Subject: orbit2: cleanup recipe, merge .inc and -native * fix LICENSE field * this also upgrades -native from 2.14.12 to 2.14.17, because 2.14.12 is failing to configure:13143: checking alignment of CORBA_octet configure:13170: gcc -o conftest -isystem/OE/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include -O2 -pipe -isystem/OE/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include -pthread -I/OE/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/glib-2.0 -I/OE/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/lib/glib-2.0/include -L/OE/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/lib -L/OE/shr-core/tmp-eglibc/sysroots/x86_64-linux/lib -Wl,-rpath-link,/OE/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/lib -Wl,-rpath-link,/OE/shr-core/tmp-eglibc/sysroots/x86_64-linux/lib -Wl,-rpath,/OE/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/lib -Wl,-rpath,/OE/shr-core/tmp-eglibc/sysroots/x86_64-linux/lib -Wl,-O1 conftest.c -pthread -Wl,--export-dynamic -L/OE/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/lib -lgobject-2.0 -lgthread-2.0 -lgmodule-2.0 -lrt -lglib-2.0 >&5 In file included from ./include/orbit/util/basic_types.h:5:0, from conftest.c:45: /OE/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/glib-2.0/glib/gunicode.h:23:2: error: #error 'Only can be included directly.' * use GNOME_MIRROR and SHRT_VER in SRC_URI Signed-off-by: Martin Jansa --- .../recipes-gnome/orbit2/orbit2-2.14.17/gtk-doc.m4 | 53 +++++++ .../orbit2/orbit2-2.14.17/gtk-doc.make | 173 +++++++++++++++++++++ .../orbit2/orbit2-2.14.17/pkgconfig-fix.patch | 12 ++ .../recipes-gnome/orbit2/orbit2-native_2.14.12.bb | 27 ---- meta-gnome/recipes-gnome/orbit2/orbit2.inc | 32 ---- .../orbit2/orbit2/configure-lossage.patch | 35 ----- meta-gnome/recipes-gnome/orbit2/orbit2/gtk-doc.m4 | 53 ------- .../recipes-gnome/orbit2/orbit2/gtk-doc.make | 173 --------------------- .../orbit2/orbit2/pkgconfig-fix.patch | 12 -- meta-gnome/recipes-gnome/orbit2/orbit2_2.14.17.bb | 48 +++++- 10 files changed, 282 insertions(+), 336 deletions(-) create mode 100644 meta-gnome/recipes-gnome/orbit2/orbit2-2.14.17/gtk-doc.m4 create mode 100644 meta-gnome/recipes-gnome/orbit2/orbit2-2.14.17/gtk-doc.make create mode 100644 meta-gnome/recipes-gnome/orbit2/orbit2-2.14.17/pkgconfig-fix.patch delete mode 100644 meta-gnome/recipes-gnome/orbit2/orbit2-native_2.14.12.bb delete mode 100644 meta-gnome/recipes-gnome/orbit2/orbit2.inc delete mode 100644 meta-gnome/recipes-gnome/orbit2/orbit2/configure-lossage.patch delete mode 100644 meta-gnome/recipes-gnome/orbit2/orbit2/gtk-doc.m4 delete mode 100644 meta-gnome/recipes-gnome/orbit2/orbit2/gtk-doc.make delete mode 100644 meta-gnome/recipes-gnome/orbit2/orbit2/pkgconfig-fix.patch diff --git a/meta-gnome/recipes-gnome/orbit2/orbit2-2.14.17/gtk-doc.m4 b/meta-gnome/recipes-gnome/orbit2/orbit2-2.14.17/gtk-doc.m4 new file mode 100644 index 0000000000..3ec41666b2 --- /dev/null +++ b/meta-gnome/recipes-gnome/orbit2/orbit2-2.14.17/gtk-doc.m4 @@ -0,0 +1,53 @@ +dnl -*- mode: autoconf -*- + +# serial 1 + +dnl Usage: +dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) +AC_DEFUN([GTK_DOC_CHECK], +[ + AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first + AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first + dnl for overriding the documentation installation directory + AC_ARG_WITH(html-dir, + AC_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),, + [with_html_dir='${datadir}/gtk-doc/html']) + HTML_DIR="$with_html_dir" + AC_SUBST(HTML_DIR) + + dnl enable/disable documentation building + AC_ARG_ENABLE(gtk-doc, + AC_HELP_STRING([--enable-gtk-doc], + [use gtk-doc to build documentation [default=no]]),, + enable_gtk_doc=no) + + have_gtk_doc=no + if test -z "$PKG_CONFIG"; then + AC_PATH_PROG(PKG_CONFIG, pkg-config, no) + fi + if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then + have_gtk_doc=yes + fi + + dnl do we want to do a version check? +ifelse([$1],[],, + [gtk_doc_min_version=$1 + if test "$have_gtk_doc" = yes; then + AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version]) + if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then + AC_MSG_RESULT(yes) + else + AC_MSG_RESULT(no) + have_gtk_doc=no + fi + fi +]) + if test x$enable_gtk_doc = xyes; then + if test "$have_gtk_doc" != yes; then + enable_gtk_doc=no + fi + fi + + AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes) + AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL") +]) diff --git a/meta-gnome/recipes-gnome/orbit2/orbit2-2.14.17/gtk-doc.make b/meta-gnome/recipes-gnome/orbit2/orbit2-2.14.17/gtk-doc.make new file mode 100644 index 0000000000..354ffb7c66 --- /dev/null +++ b/meta-gnome/recipes-gnome/orbit2/orbit2-2.14.17/gtk-doc.make @@ -0,0 +1,173 @@ +# -*- mode: makefile -*- + +#################################### +# Everything below here is generic # +#################################### + +if GTK_DOC_USE_LIBTOOL +GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +else +GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +endif + +# We set GPATH here; this gives us semantics for GNU make +# which are more like other make's VPATH, when it comes to +# whether a source that is a target of one rule is then +# searched for in VPATH/GPATH. +# +GPATH = $(srcdir) + +TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE) + +EXTRA_DIST = \ + $(content_files) \ + $(HTML_IMAGES) \ + $(DOC_MAIN_SGML_FILE) \ + $(DOC_MODULE)-sections.txt \ + $(DOC_MODULE)-overrides.txt + +DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \ + $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp + +SCANOBJ_FILES = \ + $(DOC_MODULE).args \ + $(DOC_MODULE).hierarchy \ + $(DOC_MODULE).interfaces \ + $(DOC_MODULE).prerequisites \ + $(DOC_MODULE).signals + +REPORT_FILES = \ + $(DOC_MODULE)-undocumented.txt \ + $(DOC_MODULE)-undeclared.txt \ + $(DOC_MODULE)-unused.txt + +CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) + +if ENABLE_GTK_DOC +all-local: html-build.stamp +else +all-local: +endif + +docs: html-build.stamp + +#### scan #### + +scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) + @echo 'gtk-doc: Scanning header files' + @-chmod -R u+w $(srcdir) + cd $(srcdir) && \ + gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES) + if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ + CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ + else \ + cd $(srcdir) ; \ + for i in $(SCANOBJ_FILES) ; do \ + test -f $$i || touch $$i ; \ + done \ + fi + touch scan-build.stamp + +$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp + @true + +#### templates #### + +tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt + @echo 'gtk-doc: Rebuilding template files' + @-chmod -R u+w $(srcdir) + cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) + touch tmpl-build.stamp + +tmpl.stamp: tmpl-build.stamp + @true + +tmpl/*.sgml: + @true + + +#### xml #### + +sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) + @echo 'gtk-doc: Building XML' + @-chmod -R u+w $(srcdir) + cd $(srcdir) && \ + gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS) + touch sgml-build.stamp + +sgml.stamp: sgml-build.stamp + @true + +#### html #### + +html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) + @echo 'gtk-doc: Building HTML' + @-chmod -R u+w $(srcdir) + rm -rf $(srcdir)/html + mkdir $(srcdir)/html + cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) + test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) + @echo 'gtk-doc: Fixing cross-references' + cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) + touch html-build.stamp + +############## + +clean-local: + rm -f *~ *.bak + rm -rf .libs + +distclean-local: + cd $(srcdir) && \ + rm -rf xml $(REPORT_FILES) \ + $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt + +maintainer-clean-local: clean + cd $(srcdir) && rm -rf xml html + +install-data-local: + -installfiles=`echo $(srcdir)/html/*`; \ + if test "$$installfiles" = '$(srcdir)/html/*'; \ + then echo '-- Nothing to install' ; \ + else \ + $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR); \ + for i in $$installfiles; do \ + echo '-- Installing '$$i ; \ + $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \ + done; \ + echo '-- Installing $(srcdir)/html/index.sgml' ; \ + $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \ + which gtkdoc-rebase >/dev/null && \ + gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \ + fi + + +uninstall-local: + rm -f $(DESTDIR)$(TARGET_DIR)/* + +# +# Require gtk-doc when making dist +# +if ENABLE_GTK_DOC +dist-check-gtkdoc: +else +dist-check-gtkdoc: + @echo "*** gtk-doc must be installed and enabled in order to make dist" + @false +endif + +dist-hook: dist-check-gtkdoc dist-hook-local + mkdir $(distdir)/tmpl + mkdir $(distdir)/xml + mkdir $(distdir)/html + -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl + -cp $(srcdir)/xml/*.xml $(distdir)/xml + cp $(srcdir)/html/* $(distdir)/html + -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/ + -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/ + cd $(distdir) && rm -f $(DISTCLEANFILES) + -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html + +.PHONY : dist-hook-local docs diff --git a/meta-gnome/recipes-gnome/orbit2/orbit2-2.14.17/pkgconfig-fix.patch b/meta-gnome/recipes-gnome/orbit2/orbit2-2.14.17/pkgconfig-fix.patch new file mode 100644 index 0000000000..f629e506dd --- /dev/null +++ b/meta-gnome/recipes-gnome/orbit2/orbit2-2.14.17/pkgconfig-fix.patch @@ -0,0 +1,12 @@ +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-native_2.14.12.bb b/meta-gnome/recipes-gnome/orbit2/orbit2-native_2.14.12.bb deleted file mode 100644 index 1db2496c35..0000000000 --- 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 51978909be..0000000000 --- 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 7485a0ce0c..0000000000 --- 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 -- 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 -+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/gtk-doc.m4 b/meta-gnome/recipes-gnome/orbit2/orbit2/gtk-doc.m4 deleted file mode 100644 index 3ec41666b2..0000000000 --- a/meta-gnome/recipes-gnome/orbit2/orbit2/gtk-doc.m4 +++ /dev/null @@ -1,53 +0,0 @@ -dnl -*- mode: autoconf -*- - -# serial 1 - -dnl Usage: -dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) -AC_DEFUN([GTK_DOC_CHECK], -[ - AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first - AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first - dnl for overriding the documentation installation directory - AC_ARG_WITH(html-dir, - AC_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),, - [with_html_dir='${datadir}/gtk-doc/html']) - HTML_DIR="$with_html_dir" - AC_SUBST(HTML_DIR) - - dnl enable/disable documentation building - AC_ARG_ENABLE(gtk-doc, - AC_HELP_STRING([--enable-gtk-doc], - [use gtk-doc to build documentation [default=no]]),, - enable_gtk_doc=no) - - have_gtk_doc=no - if test -z "$PKG_CONFIG"; then - AC_PATH_PROG(PKG_CONFIG, pkg-config, no) - fi - if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then - have_gtk_doc=yes - fi - - dnl do we want to do a version check? -ifelse([$1],[],, - [gtk_doc_min_version=$1 - if test "$have_gtk_doc" = yes; then - AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version]) - if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) - have_gtk_doc=no - fi - fi -]) - if test x$enable_gtk_doc = xyes; then - if test "$have_gtk_doc" != yes; then - enable_gtk_doc=no - fi - fi - - AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes) - AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL") -]) diff --git a/meta-gnome/recipes-gnome/orbit2/orbit2/gtk-doc.make b/meta-gnome/recipes-gnome/orbit2/orbit2/gtk-doc.make deleted file mode 100644 index 354ffb7c66..0000000000 --- a/meta-gnome/recipes-gnome/orbit2/orbit2/gtk-doc.make +++ /dev/null @@ -1,173 +0,0 @@ -# -*- mode: makefile -*- - -#################################### -# Everything below here is generic # -#################################### - -if GTK_DOC_USE_LIBTOOL -GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -else -GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -endif - -# We set GPATH here; this gives us semantics for GNU make -# which are more like other make's VPATH, when it comes to -# whether a source that is a target of one rule is then -# searched for in VPATH/GPATH. -# -GPATH = $(srcdir) - -TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE) - -EXTRA_DIST = \ - $(content_files) \ - $(HTML_IMAGES) \ - $(DOC_MAIN_SGML_FILE) \ - $(DOC_MODULE)-sections.txt \ - $(DOC_MODULE)-overrides.txt - -DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \ - $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp - -SCANOBJ_FILES = \ - $(DOC_MODULE).args \ - $(DOC_MODULE).hierarchy \ - $(DOC_MODULE).interfaces \ - $(DOC_MODULE).prerequisites \ - $(DOC_MODULE).signals - -REPORT_FILES = \ - $(DOC_MODULE)-undocumented.txt \ - $(DOC_MODULE)-undeclared.txt \ - $(DOC_MODULE)-unused.txt - -CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) - -if ENABLE_GTK_DOC -all-local: html-build.stamp -else -all-local: -endif - -docs: html-build.stamp - -#### scan #### - -scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) - @echo 'gtk-doc: Scanning header files' - @-chmod -R u+w $(srcdir) - cd $(srcdir) && \ - gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES) - if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ - CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ - else \ - cd $(srcdir) ; \ - for i in $(SCANOBJ_FILES) ; do \ - test -f $$i || touch $$i ; \ - done \ - fi - touch scan-build.stamp - -$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp - @true - -#### templates #### - -tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt - @echo 'gtk-doc: Rebuilding template files' - @-chmod -R u+w $(srcdir) - cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) - touch tmpl-build.stamp - -tmpl.stamp: tmpl-build.stamp - @true - -tmpl/*.sgml: - @true - - -#### xml #### - -sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) - @echo 'gtk-doc: Building XML' - @-chmod -R u+w $(srcdir) - cd $(srcdir) && \ - gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS) - touch sgml-build.stamp - -sgml.stamp: sgml-build.stamp - @true - -#### html #### - -html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) - @echo 'gtk-doc: Building HTML' - @-chmod -R u+w $(srcdir) - rm -rf $(srcdir)/html - mkdir $(srcdir)/html - cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) - test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) - @echo 'gtk-doc: Fixing cross-references' - cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) - touch html-build.stamp - -############## - -clean-local: - rm -f *~ *.bak - rm -rf .libs - -distclean-local: - cd $(srcdir) && \ - rm -rf xml $(REPORT_FILES) \ - $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt - -maintainer-clean-local: clean - cd $(srcdir) && rm -rf xml html - -install-data-local: - -installfiles=`echo $(srcdir)/html/*`; \ - if test "$$installfiles" = '$(srcdir)/html/*'; \ - then echo '-- Nothing to install' ; \ - else \ - $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR); \ - for i in $$installfiles; do \ - echo '-- Installing '$$i ; \ - $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \ - done; \ - echo '-- Installing $(srcdir)/html/index.sgml' ; \ - $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \ - which gtkdoc-rebase >/dev/null && \ - gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \ - fi - - -uninstall-local: - rm -f $(DESTDIR)$(TARGET_DIR)/* - -# -# Require gtk-doc when making dist -# -if ENABLE_GTK_DOC -dist-check-gtkdoc: -else -dist-check-gtkdoc: - @echo "*** gtk-doc must be installed and enabled in order to make dist" - @false -endif - -dist-hook: dist-check-gtkdoc dist-hook-local - mkdir $(distdir)/tmpl - mkdir $(distdir)/xml - mkdir $(distdir)/html - -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl - -cp $(srcdir)/xml/*.xml $(distdir)/xml - cp $(srcdir)/html/* $(distdir)/html - -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/ - -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/ - cd $(distdir) && rm -f $(DISTCLEANFILES) - -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html - -.PHONY : dist-hook-local docs 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.17.bb b/meta-gnome/recipes-gnome/orbit2/orbit2_2.14.17.bb index 8709cc0264..fb7e93eebd 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 ./ +} -- cgit 1.2.3-korg