sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

gnome-settings-daemon: Fix problems with bad paths creeping into the configure paths 

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
This commit is contained in:
Richard Purdie 2009-09-16 23:15:21 +01:00
parent 2161f50859
commit c5fb62ba32
2 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
meta/packages/gnome/gnome-settings-daemon/configurefix.patch Normal file
View File

@ -0,0 +1,30 @@
Index: gnome-settings-daemon-2.26.1/configure.ac
===================================================================
--- gnome-settings-daemon-2.26.1.orig/configure.ac 2009-09-16 22:57:31.000000000 +0100
+++ gnome-settings-daemon-2.26.1/configure.ac 2009-09-16 22:58:45.000000000 +0100
@@ -133,9 +133,6 @@
#
AC_DEFUN([AC_CHECK_X_HEADERS], [
ac_save_CPPFLAGS="$CPPFLAGS"
- if test \! -z "$includedir" ; then
- CPPFLAGS="$CPPFLAGS -I$includedir"
- fi
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
AC_CHECK_HEADERS([$1],[$2],[$3],[$4])
CPPFLAGS="$ac_save_CPPFLAGS"])
@@ -148,15 +145,9 @@
ac_save_LDFLAGS="$LDFLAGS"
# ac_save_LIBS="$LIBS"
- if test \! -z "$includedir" ; then
- CPPFLAGS="$CPPFLAGS -I$includedir"
- fi
# note: $X_CFLAGS includes $x_includes
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
- if test \! -z "$libdir" ; then
- LDFLAGS="$LDFLAGS -L$libdir"
- fi
# note: $X_LIBS includes $x_libraries
LDFLAGS="$LDFLAGS $ALL_X_LIBS"

5
meta/packages/gnome/gnome-settings-daemon_2.26.1.bb
View File

@ -2,7 +2,7 @@ DESCRIPTION = "GNOME settings daemon"
LICENSE = "GPL"
DEPENDS = "libxklavier gnome-doc-utils gtk+ libglade libgnomekbd gnome-desktop librsvg libxml2 libart-lgpl"
PR = "r2"
PR = "r3"
inherit gnome
@ -10,9 +10,10 @@ SRC_URI += "file://desktop-moblin.patch;patch=1 \
file://gnome-settings-daemon-fix-gthread.patch;patch=1 \
file://mount-plugin.patch;patch=1 \
file://gnome-settings-daemon-2.24.0-catch-deviceadded.patch;patch=1 \
file://configurefix.patch;patch=1 \
file://mojito-cleanup.patch;patch=1"
EXTRA_OECONF = "--disable-esd"
EXTRA_OECONF = "--disable-esd --x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR}"
ASNEEDED = ""
FILES_${PN} += "${libdir}/gnome-settings-daemon-2.0/*.so ${libdir}/gnome-settings-daemon-2.0/*plugin \