[oe-commits] org.oe.dev merge of '4303b4d9cd0d95a437c5f351f6c879d2ea8bcd19'
oe commit
oe at amethyst.openembedded.net
Fri Sep 5 11:57:37 UTC 2008
merge of '4303b4d9cd0d95a437c5f351f6c879d2ea8bcd19'
and 'ac2e88d3491f6e0cbf4f4435316ab9c6eba69fe7'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 78e920edfcc452a246ac6107c6733947f37cf081
ViewMTN: http://monotone.openembedded.org/revision/info/78e920edfcc452a246ac6107c6733947f37cf081
Files:
1
packages/gnome/gnome-desktop_2.22.2.bb
packages/gnome/gnome-menus_2.22.2.bb
packages/dbus/dbus.inc
packages/dbus/dbus_1.2.1.bb
Diffs:
#
# mt diff -r4303b4d9cd0d95a437c5f351f6c879d2ea8bcd19 -r78e920edfcc452a246ac6107c6733947f37cf081
#
#
#
# add_file "packages/gnome/gnome-desktop_2.22.2.bb"
# content [b717afd54a87d3d8817c6afce786e9aa671d5e9b]
#
# add_file "packages/gnome/gnome-menus_2.22.2.bb"
# content [e18ffc4064e76277a577bfea8d6583fb75491baa]
#
============================================================
--- packages/gnome/gnome-desktop_2.22.2.bb b717afd54a87d3d8817c6afce786e9aa671d5e9b
+++ packages/gnome/gnome-desktop_2.22.2.bb b717afd54a87d3d8817c6afce786e9aa671d5e9b
@@ -0,0 +1,8 @@
+require gnome-desktop.inc
+
+inherit gnome pkgconfig
+
+DEPENDS += "gnome-doc-utils gnome-vfs"
+
+SRC_URI += "file://scrollkeeper.patch;patch=1 \
+ file://no-desktop-docs.patch;patch=1;pnum=0"
============================================================
--- packages/gnome/gnome-menus_2.22.2.bb e18ffc4064e76277a577bfea8d6583fb75491baa
+++ packages/gnome/gnome-menus_2.22.2.bb e18ffc4064e76277a577bfea8d6583fb75491baa
@@ -0,0 +1,15 @@
+DEPENDS = "python gnome-vfs libxml2 gconf popt gtk+"
+LICENSE = "GPL"
+
+inherit gnome pkgconfig
+
+do_stage() {
+autotools_stage_all
+}
+
+PACKAGES += "${PN}-python"
+FILES_${PN} += "${datadir}/desktop-directories/"
+FILES_${PN}-python = "${libdir}/python*"
+FILES_${PN}-dbg += "${libdir}/python*/site-packages/*/.debug \
+ ${libdir}/python*/site-packages/.debug"
+
#
# mt diff -rac2e88d3491f6e0cbf4f4435316ab9c6eba69fe7 -r78e920edfcc452a246ac6107c6733947f37cf081
#
#
#
# patch "packages/dbus/dbus.inc"
# from [b01cdc6e69b0846ec8a0346f25dca70299d15f60]
# to [95cd2e76b62c341b6b33ec4fd6b3c741140b9dd2]
#
# patch "packages/dbus/dbus_1.2.1.bb"
# from [95a7ca9b517803cf375392312757e72368b8771a]
# to [e7adaabb1f288924957a3e26f32c63ac79cad7a4]
#
============================================================
--- packages/dbus/dbus.inc b01cdc6e69b0846ec8a0346f25dca70299d15f60
+++ packages/dbus/dbus.inc 95cd2e76b62c341b6b33ec4fd6b3c741140b9dd2
@@ -2,7 +2,12 @@ LICENSE = "GPL"
HOMEPAGE = "http://dbus.freedesktop.org"
SECTION = "base"
LICENSE = "GPL"
-DEPENDS = "expat glib-2.0 virtual/libintl"
+DEPENDS = "expat glib-2.0 virtual/libintl libsm libice libx11"
+RDEPENDS_${PN}-x11 = "${PN}"
+RRECOMMENDS_${PN}-lib = "${PN}"
+RRECOMMENDS_${PN} = "${PN}-x11"
+RCONFLICTS_${PN} = "dbus-1"
+RREPLACES_${PN} = "dbus-1"
SRC_URI = "\
http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
@@ -11,23 +16,43 @@ SRC_URI = "\
file://fix-install-daemon.patch;patch=1 \
file://dbus-1.init \
"
+
S = "${WORKDIR}/dbus-${PV}"
inherit autotools pkgconfig update-rc.d gettext
-INITSCRIPT_NAME = "dbus-1"
-INITSCRIPT_PARAMS = "defaults"
+EXTRA_OECONF = "\
+ --disable-qt \
+ --disable-qt3 \
+ --disable-gtk \
+ --disable-tests \
+ --disable-checks \
+ --disable-xml-docs \
+ --disable-doxygen-docs \
+ --with-xml=expat \
+ --with-x \
+"
-CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.conf ${sysconfdir}/dbus-1/session.conf"
+do_install_append() {
+ install -d ${D}${sysconfdir}/init.d
+ install -m 0755 ${WORKDIR}/dbus-1.init ${D}${sysconfdir}/init.d/dbus-1
+ # the stock install seems to install the libtool wrapper script, so we have to copy this manually :M:
+ if [ -e bus/.libs/dbus-daemon-launch-helper ]; then
+ install -m 0755 bus/.libs/dbus-daemon-launch-helper ${D}${libexecdir}/
+ fi
+}
+do_stage() {
+ oe_libinstall -so -C dbus libdbus-1 ${STAGING_LIBDIR}
+ autotools_stage_includes
+ mkdir -p ${STAGING_LIBDIR}/dbus-1.0/include/dbus/
+ install -m 0644 dbus/dbus-arch-deps.h ${STAGING_LIBDIR}/dbus-1.0/include/dbus/
+}
-DEBIANNAME_${PN} = "dbus-1"
+PACKAGES =+ "${PN}-lib ${PN}-x11"
-PACKAGES =+ "${PN}-lib"
-
FILES_${PN} = "\
${bindir}/dbus-daemon* \
${bindir}/dbus-uuidgen \
-${bindir}/dbus-launch \
${bindir}/dbus-cleanup-sockets \
${bindir}/dbus-send \
${bindir}/dbus-monitor \
@@ -37,54 +62,27 @@ FILES_${PN}-lib = "${libdir}/lib*.so.*"
${datadir}/dbus-1/system-services \
"
FILES_${PN}-lib = "${libdir}/lib*.so.*"
-RRECOMMENDS_${PN}-lib = "${PN}"
+FILES_${PN}-x11 = "\
+${bindir}/dbus-launch \
+"
FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool ${libdir}/"
-pkg_postinst_dbus() {
+pkg_postinst_${PN}() {
#!/bin/sh
-
# can't do adduser stuff offline
if [ "x$D" != "x" ]; then
exit 1
fi
-
MESSAGEUSER=messagebus
MESSAGEHOME=/var/run/dbus
-
mkdir -p $MESSAGEHOME || true
chgrp "$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || addgroup "$MESSAGEUSER"
chown "$MESSAGEUSER"."$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || adduser --system --home "$MESSAGEHOME" --no-create-home --disabled-password --ingroup "$MESSAGEUSER" "$MESSAGEUSER"
-
grep -q netdev: /etc/group || addgroup netdev
chmod u+s /usr/libexec/dbus-daemon-launch-helper
}
-EXTRA_OECONF = "\
- --disable-qt \
- --disable-qt3 \
- --disable-gtk \
- --disable-tests \
- --disable-checks \
- --disable-xml-docs \
- --disable-doxygen-docs \
- --with-xml=expat \
- --without-x \
-"
+CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.conf ${sysconfdir}/dbus-1/session.conf"
+INITSCRIPT_NAME = "dbus-1"
+INITSCRIPT_PARAMS = "defaults"
-do_stage() {
- oe_libinstall -so -C dbus libdbus-1 ${STAGING_LIBDIR}
-
- autotools_stage_includes
-
- mkdir -p ${STAGING_LIBDIR}/dbus-1.0/include/dbus/
- install -m 0644 dbus/dbus-arch-deps.h ${STAGING_LIBDIR}/dbus-1.0/include/dbus/
-}
-
-do_install_append() {
- install -d ${D}${sysconfdir}/init.d
- install -m 0755 ${WORKDIR}/dbus-1.init ${D}${sysconfdir}/init.d/dbus-1
- # the stock install seems to install the libtool wrapper script, so we have to copy this manually :M:
- if [ -e bus/.libs/dbus-daemon-launch-helper ]; then
- install -m 0755 bus/.libs/dbus-daemon-launch-helper ${D}${libexecdir}/
- fi
-}
============================================================
--- packages/dbus/dbus_1.2.1.bb 95a7ca9b517803cf375392312757e72368b8771a
+++ packages/dbus/dbus_1.2.1.bb e7adaabb1f288924957a3e26f32c63ac79cad7a4
@@ -1,3 +1,3 @@ include dbus.inc
include dbus.inc
+PR = "r4"
-PR = "r3"
More information about the Openembedded-commits
mailing list