diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2007-09-14 13:17:47 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2007-09-14 13:17:47 +0000 |
| commit | 3132dda632526f8e2b224e3485a3cc8a64df3be7 (patch) | |
| tree | 00e04f1ff0e8f1d8250697a9014c15579505c31d /packages | |
| parent | 270f600e7bfb078e0d568ae8c2c0727f9e140af3 (diff) | |
| parent | 11708d352d0844ceb309221b5660d8c7c7ec790e (diff) | |
merge of '838a60f4684a5fe71ade31d05fb35609808420d1'
and 'caed6636e646bb9b999bfe3a3234c92da9e20252'
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/gnome/gconf-dbus_svn.bb | 30 | ||||
| -rw-r--r-- | packages/gtk+/gdk-pixbuf-csource-native_2.10.14.bb | 5 |
2 files changed, 18 insertions, 17 deletions
diff --git a/packages/gnome/gconf-dbus_svn.bb b/packages/gnome/gconf-dbus_svn.bb index 3647059de1..5a5e78a207 100644 --- a/packages/gnome/gconf-dbus_svn.bb +++ b/packages/gnome/gconf-dbus_svn.bb @@ -1,44 +1,40 @@ SECTION = "x11/utils" -DEPENDS = "gtk+ glib-2.0 dbus dbus-glib libxml2 popt intltool-native" +DEPENDS = "intltool-native glib-2.0 dbus dbus-glib libxml2 popt gtk-doc-native" DESCRIPTION = "Settings daemon using DBUS for communication." LICENSE = "GPL" PROVIDES = "gconf" RPROVIDES_${PN} = "gconf" RPROVIDES_${PN}-dev = "gconf-dev" -PV = "2.16.0+svn${SRCDATE}" -PR = "r0" +PV = "2.16.0+svnr${SRCREV}" +PR = "r3" SRC_URI = "svn://developer.imendio.com/svn/gconf-dbus;module=trunk;proto=http \ file://69gconfd-dbus" -inherit pkgconfig autotools +inherit pkgconfig autotools S = "${WORKDIR}/trunk" PARALLEL_MAKE = "" -FILES_${PN} += " ${libdir}/gconf-dbus/2/*.so \ - ${libdir}/GConf-dbus/2/*.so \ - ${libdir}/dbus-1.0 \ - ${sysconfdir} \ - ${datadir}/dbus*" -FILES_${PN}-dbg += "${libdir}/gconf-dbus/2/.debug \ - ${libdir}/GConf-dbus/2/.debug "" +FILES_${PN} = "${libdir}/GConf-dbus/2/*.so ${libdir}/dbus-1.0 ${sysconfdir} ${datadir}/dbus* ${libdir}/*.so.* ${bindir}/* ${libexecdir}/*" +FILES_${PN}-dbg += " ${libdir}/GConf-dbus/2/.debug" + +EXTRA_OECONF = " --with-ipc=dbus --disable-gtk-doc --disable-gtk --enable-shared --disable-static" -EXTRA_OECONF = " --with-ipc=dbus --disable-gtk-doc --enable-gtk --host=${HOST_SYS} --enable-shared --disable-static" do_configure_prepend() { - touch ${S}/gtk-doc.make + touch gtk-doc.make } do_stage() { - autotools_stage_all + autotools_stage_all + install -m 0644 gconf-2.m4 ${STAGING_DATADIR}/aclocal/gconf-2.m4 } do_install_append () { install -d ${D}/${sysconfdir}/X11/Xsession.d install -m 755 ${WORKDIR}/69gconfd-dbus ${D}/${sysconfdir}/X11/Xsession.d/ - install -d ${D}/${datadir}/dbus-1.0/services/ - install -m 644 gconf/gconf.service ${D}${datadir}/dbus-1.0/services/ + install -d ${D}/${datadir}/dbus-1.0/services/ + install -m 644 gconf/gconf.service ${D}${datadir}/dbus-1.0/services/ } - diff --git a/packages/gtk+/gdk-pixbuf-csource-native_2.10.14.bb b/packages/gtk+/gdk-pixbuf-csource-native_2.10.14.bb index f3b7b0e6c8..51fb846ce9 100644 --- a/packages/gtk+/gdk-pixbuf-csource-native_2.10.14.bb +++ b/packages/gtk+/gdk-pixbuf-csource-native_2.10.14.bb @@ -5,6 +5,11 @@ S = "${WORKDIR}/gtk+-${PV}" FILESPATH = "${FILE_DIRNAME}/gdk-pixbuf-csource:${FILE_DIRNAME}/gtk+-${PV}:${FILE_DIRNAME}/files" SRC_URI += "file://reduce-dependencies.patch;patch=1" +#clear recommends for uclibc builds +RRECOMMENDS = " " +RRECOMMENDS_${PN}_linux = " " +RRECOMMENDS_${PN}_linux-gnueabi = " " + EXTRA_OECONF = "\ --without-x \ --with-gdktarget=linux-fb \ |