Merge remote-tracking branch 'meta-oe-contrib/jansa/pull2'

This commit is contained in:
Koen Kooi
2012-05-08 10:33:44 +02:00
21 changed files with 136 additions and 238 deletions
@@ -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
@@ -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
@@ -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 \
"
@@ -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 \
"
@@ -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"
@@ -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 ./
}
@@ -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"
@@ -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 ./
}
@@ -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);
@@ -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"
+4 -5
View File
@@ -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"
@@ -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*"
@@ -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 = {}
@@ -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 <config.h>
-#include <glib/gerror.h>
#include "lm-error.h"
/**
@@ -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"
@@ -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 <glibmm/varianttype.h>
#include <glibmm/utility.h>
-#include <glib/gvarianttype.h>
namespace Glib
{
@@ -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"
@@ -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"
@@ -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"
@@ -2,13 +2,12 @@ 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"
LIC_FILES_CHKSUM = "file://COPYING;md5=1c65719d42900bb81b83e8293c20a364"
PE = "1"
PR = "r12"
SRC_URI[md5sum] = "ccc57478c41b7a75b9702241b889b1d4"
SRC_URI[sha256sum] = "a83977546b78e24ac5dca86affc10b6404a87c16272405b05386feca1a2db037"
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 "