diff options
| -rw-r--r-- | packages/blackbox/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/blackbox/blackbox_0.70.1.bb | 14 | ||||
| -rw-r--r-- | packages/blackbox/files/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/blackbox/files/remove-host-includes.patch | 19 | ||||
| -rw-r--r-- | packages/dbus/dbus.inc | 22 | ||||
| -rw-r--r-- | packages/dbus/dbus_1.1.4.bb | 2 | ||||
| -rw-r--r-- | packages/freesmartphone/gsm0710muxd_svn.bb | 7 |
7 files changed, 56 insertions, 8 deletions
diff --git a/packages/blackbox/.mtn2git_empty b/packages/blackbox/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/blackbox/.mtn2git_empty diff --git a/packages/blackbox/blackbox_0.70.1.bb b/packages/blackbox/blackbox_0.70.1.bb new file mode 100644 index 0000000000..50dc5a69c6 --- /dev/null +++ b/packages/blackbox/blackbox_0.70.1.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "Blackbox Window Manager" +SECTION = "x11/wm" +LICENSE = "GPL" +DEPENDS = "libx11 libxext libxcomposite libxfixes libxdamage libxrender libxinerama libxpm xrandr xft" +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/blackboxwm/blackbox-0.70.1.tar.gz \ + file://remove-host-includes.patch;patch=1" +S = "${WORKDIR}/blackbox-${PV}" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--disable-i18n --without-imlib --with-xpm --with-gnome-menus" + diff --git a/packages/blackbox/files/.mtn2git_empty b/packages/blackbox/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/blackbox/files/.mtn2git_empty diff --git a/packages/blackbox/files/remove-host-includes.patch b/packages/blackbox/files/remove-host-includes.patch new file mode 100644 index 0000000000..bf557b51da --- /dev/null +++ b/packages/blackbox/files/remove-host-includes.patch @@ -0,0 +1,19 @@ +Index: blackbox-0.70.1/configure.ac +=================================================================== +--- blackbox-0.70.1.orig/configure.ac ++++ blackbox-0.70.1/configure.ac +@@ -8,14 +8,6 @@ AC_CONFIG_SRCDIR([src/blackbox.cc]) + dnl Determine default prefix + test "x$prefix" = "xNONE" && prefix="$ac_default_prefix" + +-dnl Look in the most logical places for external libraries +-CPPFLAGS="$CPPFLAGS -I$prefix/include" +-LDFLAGS="$LDFLAGS -L$prefix/lib" +-if test "x$prefix" != "x/usr/local"; then +- CPPFLAGS="$CPPFLAGS -I/usr/local/include" +- LDFLAGS="$LDFLAGS -L/usr/local/lib" +-fi +- + dnl Locate required external software + AC_PROG_CC + diff --git a/packages/dbus/dbus.inc b/packages/dbus/dbus.inc index b2ced23d99..ed0a0b3cf2 100644 --- a/packages/dbus/dbus.inc +++ b/packages/dbus/dbus.inc @@ -1,5 +1,6 @@ +DESCRIPTION = "A message bus system for inter-process communication" HOMEPAGE = "http://dbus.freedesktop.org" -DESCRIPTION = "Message bus system for applications to talk to one another" +SECTION = "base" LICENSE = "GPL" DEPENDS = "expat glib-2.0 virtual/libintl" @@ -56,13 +57,20 @@ 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" - +EXTRA_OECONF = "\ + --disable-qt \ + --disable-qt3 \ + --disable-gtk \ + --disable-tests \ + --disable-checks \ + --disable-xml-docs \ + --disable-doxygen-docs \ + --with-xml=expat \ + --without-x \ +" do_stage() { oe_libinstall -so -C dbus libdbus-1 ${STAGING_LIBDIR} @@ -76,4 +84,6 @@ do_stage() { 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: + install -m 0755 bus/.libs/dbus-daemon-launch-helper ${D}${libexecdir}/ } diff --git a/packages/dbus/dbus_1.1.4.bb b/packages/dbus/dbus_1.1.4.bb index 8e3e329fde..7838e55ca1 100644 --- a/packages/dbus/dbus_1.1.4.bb +++ b/packages/dbus/dbus_1.1.4.bb @@ -1,3 +1,3 @@ include dbus.inc -PR = "r1" +PR = "r2" diff --git a/packages/freesmartphone/gsm0710muxd_svn.bb b/packages/freesmartphone/gsm0710muxd_svn.bb index 4a4dc3b7d4..98b9360c00 100644 --- a/packages/freesmartphone/gsm0710muxd_svn.bb +++ b/packages/freesmartphone/gsm0710muxd_svn.bb @@ -5,13 +5,18 @@ SECTION = "console/network" DEPENDS = "intltool-native dbus" LICENSE = "GPL" PV = "0.0+svnr${SRCREV}" -PR = "r0" +PR = "r2" SRC_URI = "svn://projects.linuxtogo.org/svn/smartphones/trunk/software;module=gsm0710muxd" S = "${WORKDIR}/gsm0710muxd" inherit autotools +do_install_append() { + # temp hack + mv -f ${D}${datadir}/dbus-1/system-services/org.freesmartphone.GSM.MUX.service ${D}${datadir}/dbus-1/system-services/org.mobile.mux.service +} + pkg_postinst_${PN}() { # can't do this offline if [ "x$D" != "x" ]; then |