[oe-commits] org.oe.dev gconf-osso: Unb0rk configure on systems w/o PKG_CONFIG set

[coredump2 commit]

gconf-osso: Unb0rk configure on systems w/o PKG_CONFIG set

Author: coredump2 at openembedded.org
Branch: org.openembedded.dev
Revision: 19d6e36401459c394e778e2c97b17aece67b9345
ViewMTN: http://monotone.openembedded.org/revision.psp?id=19d6e36401459c394e778e2c97b17aece67b9345
Files:
1
packages/maemo/gconf-osso/configure-dbus.patch
packages/maemo/gconf-osso_2.6.4-3.1osso13.bb
Diffs:

#
# mt diff -r971174e342501a80fdc5cf688cfa532573959a90 -r19d6e36401459c394e778e2c97b17aece67b9345
#
# 
# 
# add_file "packages/maemo/gconf-osso/configure-dbus.patch"
#  content [9180b40454701f65ad0dc924b138a356ba791c77]
# 
# patch "packages/maemo/gconf-osso_2.6.4-3.1osso13.bb"
#  from [41beb618807bdad07231390c6496318076a9a2cb]
#    to [fc33b6412ee3fbcb4dde2a489d7cdd83fd20ed2f]
# 
============================================================
--- packages/maemo/gconf-osso/configure-dbus.patch	9180b40454701f65ad0dc924b138a356ba791c77
+++ packages/maemo/gconf-osso/configure-dbus.patch	9180b40454701f65ad0dc924b138a356ba791c77
@@ -0,0 +1,11 @@
+--- GConf-2.6.4/configure.in.orig	2007-03-03 18:30:35.000000000 +0000
++++ GConf-2.6.4/configure.in	2007-03-03 18:30:50.000000000 +0000
+@@ -186,7 +186,7 @@
+ 
+ AC_ARG_WITH(ipc, [  --with-ipc=[orbit/dbus/both]   choose ipc mechanism to use in the daemon, [default=dbus]], with_ipc="$withval", with_ipc=dbus)
+ 
+-if test x$with_ipc = xorbit -o x$with_ipc = xboth; then
++if test x$with_ipc = xorbit -o x$with_ipc = xboth -o x$with_ipc = xdbus; then
+   PKG_CHECK_MODULES(GCONF_ORBIT, ORBit-2.0 >= 2.4.0 linc >= 0.5.0, have_orbit=yes, have_orbit=no)
+   if test x$have_orbit = xno ; then
+     AC_MSG_WARN([ORBit development libraries not found])
============================================================
--- packages/maemo/gconf-osso_2.6.4-3.1osso13.bb	41beb618807bdad07231390c6496318076a9a2cb
+++ packages/maemo/gconf-osso_2.6.4-3.1osso13.bb	fc33b6412ee3fbcb4dde2a489d7cdd83fd20ed2f
@@ -5,7 +5,7 @@ RPROVIDES = "gconf"
 PROVIDES = "gconf"
 RPROVIDES = "gconf"
 
-PR = "r3"
+PR = "r4"
 
 DEFAULT_PREFERENCE = "-1"
 
@@ -14,6 +14,7 @@ SRC_URI = "http://repository.maemo.org/p
            file://free-entry-fix.diff;patch=1 \
            file://no-po-no-examples.diff;patch=1 \
            file://service-file.diff;patch=1 \
+	   file://configure-dbus.patch;patch=1 \
            file://gconf-daemon-dbus-oe.sh \
            file://gconf-daemon-oe.sh"