[oe-commits] org.oe.dev merge of '78e920edfcc452a246ac6107c6733947f37cf081'
koen commit
oe at amethyst.openembedded.net
Fri Sep 5 12:09:06 UTC 2008
merge of '78e920edfcc452a246ac6107c6733947f37cf081'
and '7f3c3e5a83f5d237147a155da9148a52402e6937'
Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 35edad3d157478afca47f679251d3538e28aa764
ViewMTN: http://monotone.openembedded.org/revision/info/35edad3d157478afca47f679251d3538e28aa764
Files:
1
packages/gnome-themes
packages/gnome-themes/gnome-themes_2.6.2.bb
packages/gnome/gnome-themes_2.6.2.bb
packages/eel/eel/eel-no-strftime.patch
packages/eel/eel_2.22.2.bb
packages/gnome/gnome-themes_2.22.2.bb
packages/gtk-engines/gtk-engines_2.15.4.bb
packages/dbus/dbus.inc
packages/dbus/dbus_1.2.1.bb
Diffs:
#
# mt diff -r78e920edfcc452a246ac6107c6733947f37cf081 -r35edad3d157478afca47f679251d3538e28aa764
#
#
#
# delete "packages/gnome-themes"
#
# rename "packages/gnome-themes/gnome-themes_2.6.2.bb"
# to "packages/gnome/gnome-themes_2.6.2.bb"
#
# add_file "packages/eel/eel/eel-no-strftime.patch"
# content [7e140198469eacd05dddf132466af441c449c66a]
#
# add_file "packages/eel/eel_2.22.2.bb"
# content [338ba50686402f8c7336925c3261aecf1f9a511e]
#
# add_file "packages/gnome/gnome-themes_2.22.2.bb"
# content [0d8e0e602b7feeecc062e1b89ddc7870c61b3f02]
#
# add_file "packages/gtk-engines/gtk-engines_2.15.4.bb"
# content [43bac85e4653d6060f6c56c9cbb3e8fa7fa80723]
#
============================================================
--- packages/eel/eel/eel-no-strftime.patch 7e140198469eacd05dddf132466af441c449c66a
+++ packages/eel/eel/eel-no-strftime.patch 7e140198469eacd05dddf132466af441c449c66a
@@ -0,0 +1,29 @@
+--- /tmp/configure.in 2008-09-05 14:01:25.000000000 +0200
++++ eel-2.22.2/configure.in 2008-09-05 14:01:58.693198000 +0200
+@@ -98,26 +98,6 @@
+
+
+
+-dnl ===========================================================================
+-
+-dnl strftime checks
+-
+-AC_TRY_RUN([#include <time.h>
+- int main ()
+- {
+- char buf[100];
+- struct tm tm = {0};
+- tm.tm_year = 99;
+- if (strftime(buf, 100, "%EY", &tm) == 4 &&
+- strcmp (buf, "1999")==0)
+- return 0;
+- return 1;
+- }
+- ],
+- AC_DEFINE(HAVE_STRFTIME_EXTENSION, 1, [Define if strftime supports %E and %O modifiers.])
+- )
+-
+-dnl ===========================================================================
+
+ dnl X development libraries check
+
============================================================
--- packages/eel/eel_2.22.2.bb 338ba50686402f8c7336925c3261aecf1f9a511e
+++ packages/eel/eel_2.22.2.bb 338ba50686402f8c7336925c3261aecf1f9a511e
@@ -0,0 +1,16 @@
+# eel OE build file
+# Copyright (C) 2005, Advanced Micro Devices, Inc. All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+inherit gnome
+
+LICENSE="GPL"
+
+SRC_URI += "file://eel-no-strftime.patch;patch=1"
+
+DEPENDS = "gnome-vfs gnome-desktop gnome-menus libgnomeui gail"
+EXTRA_OECONF = "--disable-gtk-doc"
+
+do_stage() {
+ autotools_stage_all
+}
============================================================
--- packages/gnome/gnome-themes_2.22.2.bb 0d8e0e602b7feeecc062e1b89ddc7870c61b3f02
+++ packages/gnome/gnome-themes_2.22.2.bb 0d8e0e602b7feeecc062e1b89ddc7870c61b3f02
@@ -0,0 +1,31 @@
+LICENSE = "GPL"
+SECTION = "x11/gnome"
+DEPENDS = "gtk-engines icon-naming-utils-native glib-2.0 intltool-native"
+RDEPENDS = "gnome-icon-theme"
+
+EXTRA_OECONF = "--enable-all-themes --disable-hicolor-check"
+
+inherit gnome
+
+PACKAGE_ARCH = "all"
+
+PACKAGES =+ " gtk-engine-crux gtk-engine-hc gtk-engine-lighthouseblue gtk-engine-mist gtk-engine-thinice"
+FILES_gtk-engine-crux = "${libdir}/gtk-2.0/*/engines/libcrux-engine.so"
+FILES_gtk-engine-hc = "${libdir}/gtk-2.0/*/engines/libhcengine.so"
+FILES_gtk-engine-lighthouseblue = "${libdir}/gtk-2.0/*/engines/liblighthouseblue.so"
+FILES_gtk-engine-mist = "${libdir}/gtk-2.0/*/engines/libmist.so"
+FILES_gtk-engine-thinice = "${libdir}/gtk-2.0/*/engines/libthinice.so"
+
+PACKAGES =+ " gnome-theme-crux gnome-theme-grand-canyon gnome-theme-highcontrast gnome-theme-highcontrastinverse gnome-theme-highcontrastlargeprint gnome-theme-highcontrastlargeprintinverse gnome-theme-largeprint gnome-theme-lighthouseblue gnome-theme-mist gnome-theme-traditional"
+FILES_gnome-theme-crux = "${datadir}/themes/Crux ${datadir}/icons/Crux"
+FILES_gnome-theme-grand-canyon = "${datadir}/themes/Grand-Canyon ${datadir}/icons/Grand-Canyon"
+FILES_gnome-theme-highcontrast = "${datadir}/themes/HighContrast ${datadir}/icons/HighContrast"
+FILES_gnome-theme-highcontrastinverse = "${datadir}/themes/HighContrastInverse ${datadir}/icons/HighContrastInverse"
+FILES_gnome-theme-highcontrastlargeprint = "${datadir}/themes/HighContrastLargePrint ${datadir}/icons/HighContrastLargePrint"
+FILES_gnome-theme-highcontrastlargeprintinverse = "${datadir}/themes/HighContrastLargePrintInverse ${datadir}/icons/HighContrastLargePrintInverse"
+FILES_gnome-theme-largeprint = "${datadir}/themes/LargePrint ${datadir}/icons/LargePrint"
+FILES_gnome-theme-lighthouseblue = "${datadir}/themes/LighthouseBlue ${datadir}/icons/LighthouseBlue"
+FILES_gnome-theme-mist = "${datadir}/themes/Mist ${datadir}/icons/Mist"
+FILES_gnome-theme-traditional = "${datadir}/themes/Traditional ${datadir}/icons/Traditional"
+
+FILES_${PN} += "${datadir}/themes ${datadir}/icons"
============================================================
--- packages/gtk-engines/gtk-engines_2.15.4.bb 43bac85e4653d6060f6c56c9cbb3e8fa7fa80723
+++ packages/gtk-engines/gtk-engines_2.15.4.bb 43bac85e4653d6060f6c56c9cbb3e8fa7fa80723
@@ -0,0 +1,30 @@
+LICENSE = "GPL"
+SECTION = "x11/base"
+DESCRIPTION = "GTK theme engines"
+DEPENDS = "gtk+ cairo"
+
+RDEPENDS_gtk-theme-redmond = "gtk-engine-redmond95"
+RDEPENDS_gtk-theme-metal = "gtk-engine-metal"
+RDEPENDS_gtk-theme-mist = "gtk-engine-mist"
+RDEPENDS_gtk-theme-crux = "gtk-engine-crux-engine"
+RDEPENDS_gtk-theme-lighthouseblue = "gtk-engine-lighthouseblue"
+RDEPENDS_gtk-theme-thinice = "gtk-engine-thinice"
+RDEPENDS_gtk-theme-industrial = "gtk-engine-industrial"
+RDEPENDS_gtk-theme-clearlooks = "gtk-engine-clearlooks"
+
+inherit gnome gtk-binver
+
+PACKAGES_DYNAMIC = "gtk-engine-* gtk-theme-*"
+
+python populate_packages_prepend() {
+ import os.path
+
+ engines_ver = ['gtk-2.0/', gtkbinver_find(d), '/engines']
+
+ engines_root = os.path.join(bb.data.getVar('libdir', d, 1), ''.join(engines_ver))
+ themes_root = os.path.join(bb.data.getVar('datadir', d, 1), "themes")
+
+ do_split_packages(d, engines_root, '^lib(.*)\.so$', 'gtk-engine-%s', 'GTK %s theme engine', extra_depends='')
+ do_split_packages(d, themes_root, '(.*)', 'gtk-theme-%s', 'GTK theme %s', allow_dirs=True, extra_depends='')
+}
+
#
# mt diff -r7f3c3e5a83f5d237147a155da9148a52402e6937 -r35edad3d157478afca47f679251d3538e28aa764
#
#
#
# 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