]> git.openpandora.org Git - openembedded.git/commitdiff
Merge oe-devel@oe-devel.bkbits.net:openembedded
authorChris Larson <clarson@kergoth.com>
Sat, 2 Apr 2005 23:18:59 +0000 (23:18 +0000)
committerChris Larson <clarson@kergoth.com>
Sat, 2 Apr 2005 23:18:59 +0000 (23:18 +0000)
into handhelds.org:/home/kergoth/code/openembedded

2005/04/02 17:30:09-05:00 handhelds.org!kergoth
Apply a patch to dbus to make it use the gettext autoconf macros, so that its nls support can be disabled (note that atm it links against libintl anyway, through glib's use of it, since -lintl is in the glib .pc files).

BKrev: 424f2863eUcoABD12GDxqIWbMLwsFQ

packages/dbus/dbus/gettext.patch [new file with mode: 0644]
packages/dbus/dbus_0.20.bb
packages/dbus/dbus_0.21.bb
packages/dbus/dbus_0.22.bb
packages/dbus/dbus_0.23.bb

diff --git a/packages/dbus/dbus/gettext.patch b/packages/dbus/dbus/gettext.patch
new file mode 100644 (file)
index 0000000..e69de29
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0a08862f1097d8f4025903476141dda705476a5f 100644 (file)
@@ -0,0 +1,31 @@
+SECTION = "base"
+HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
+DESCRIPTION = "message bus system for applications to talk to one another"
+DEPENDS = "expat glib-2.0 virtual/libintl"
+LICENSE = "GPL"
+
+SRC_URI = "http://freedesktop.org/Software/dbus/releases/dbus-${PV}.tar.gz \
+          file://cross.patch;patch=1"
+
+inherit autotools pkgconfig gettext
+
+EXTRA_OECONF = "--disable-qt --disable-gtk --disable-tests \
+               --disable-checks --disable-xml-docs --disable-doxygen-docs \
+               --with-xml=expat --without-x"
+
+headers = "dbus-address.h dbus-bus.h dbus-connection.h dbus-errors.h dbus-macros.h dbus-memory.h dbus-message.h dbus-pending-call.h dbus-protocol.h dbus-server.h dbus-threads.h dbus-types.h dbus.h"
+
+do_stage () {
+       oe_libinstall -so -C dbus libdbus-1 ${STAGING_LIBDIR}
+       oe_libinstall -so -C glib libdbus-glib-1 ${STAGING_LIBDIR}
+
+       mkdir -p ${STAGING_INCDIR}/dbus-1.0/dbus
+       for i in ${headers}; do
+               install -m 0644 dbus/$i ${STAGING_INCDIR}/dbus-1.0/dbus/$i
+       done
+
+       install -m 0644 glib/dbus-glib.h ${STAGING_INCDIR}/dbus-1.0/dbus/
+
+       mkdir -p ${STAGING_LIBDIR}/dbus-1.0/include/dbus/
+       install -m 0644 dbus/dbus-arch-deps.h ${STAGING_LIBDIR}/dbus-1.0/include/dbus/
+}
index fa45aac7609e6b59facee442fa8ef98019d498c8..abd234712fc3ce2c2f9261fa56fb46aed8420f66 100644 (file)
@@ -2,14 +2,14 @@ SECTION = "base"
 PR = "r4"
 HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
 DESCRIPTION = "message bus system for applications to talk to one another"
-DEPENDS = "expat glib-2.0"
+DEPENDS = "expat glib-2.0 virtual/libintl"
 LICENSE = "GPL"
 
 SRC_URI = "http://freedesktop.org/Software/dbus/releases/dbus-${PV}.tar.gz \
           file://cross.patch;patch=1 \
           file://dbus-1.init"
 
-inherit autotools pkgconfig update-rc.d
+inherit autotools pkgconfig update-rc.d gettext
 
 INITSCRIPT_NAME = "dbus-1"
 INITSCRIPT_PARAMS = "defaults"
index e490a550c28c7354071989aacdc0f104fdb986bc..424c27908b689d716bd0b3a324ab0b8bc7b135ff 100644 (file)
@@ -1,16 +1,17 @@
 SECTION = "base"
-PR = "r5"
+PR = "r6"
 HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
 DESCRIPTION = "message bus system for applications to talk to one another"
 LICENSE = "GPL"
-DEPENDS = "expat glib-2.0"
+DEPENDS = "expat glib-2.0 virtual/libintl"
 
 SRC_URI = "http://freedesktop.org/software/dbus/releases/dbus-${PV}.tar.gz \
           file://cross.patch;patch=1 \
           file://tmpdir.patch;patch=1 \
+          file://gettext.patch;patch=1 \
           file://dbus-1.init"
 
-inherit autotools pkgconfig update-rc.d
+inherit autotools pkgconfig update-rc.d gettext
 
 INITSCRIPT_NAME = "dbus-1"
 INITSCRIPT_PARAMS = "defaults"
index f03dd6a0ceec314fcd1bfad5b24b5168d9d75e13..c0faeec1a619bbdcd7ce6ab68110860edafc4a4d 100644 (file)
@@ -1,16 +1,17 @@
 SECTION = "base"
-PR = "r1"
+PR = "r2"
 HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
 DESCRIPTION = "message bus system for applications to talk to one another"
 LICENSE = "GPL"
-DEPENDS = "expat glib-2.0"
+DEPENDS = "expat glib-2.0 virtual/libintl"
 
 SRC_URI = "http://freedesktop.org/software/dbus/releases/dbus-${PV}.tar.gz \
           file://cross.patch;patch=1 \
           file://tmpdir.patch;patch=1 \
+          file://gettext.patch;patch=1 \
           file://dbus-1.init"
 
-inherit autotools pkgconfig update-rc.d
+inherit autotools pkgconfig update-rc.d gettext
 
 INITSCRIPT_NAME = "dbus-1"
 INITSCRIPT_PARAMS = "defaults"