diff options
Diffstat (limited to 'openembedded/packages')
6 files changed, 13 insertions, 43 deletions
diff --git a/openembedded/packages/dbus/dbus-native_0.50.bb b/openembedded/packages/dbus/dbus-native_0.50.bb index 43962aa80..9e661dbcc 100644 --- a/openembedded/packages/dbus/dbus-native_0.50.bb +++ b/openembedded/packages/dbus/dbus-native_0.50.bb @@ -8,7 +8,7 @@ S = "${WORKDIR}/dbus-${PV}" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus" DEPENDS = "glib-2.0-native" -PR = "r2" +PR = "r1" do_stage() { oe_runmake install diff --git a/openembedded/packages/matchbox-panel/matchbox-panel_0.9.2.bb b/openembedded/packages/matchbox-panel/matchbox-panel_0.9.2.bb index 555992914..2477cd8b2 100644 --- a/openembedded/packages/matchbox-panel/matchbox-panel_0.9.2.bb +++ b/openembedded/packages/matchbox-panel/matchbox-panel_0.9.2.bb @@ -1,24 +1,6 @@ -DESCRIPTION = "Matchbox Window Manager Panel" -LICENSE = "GPL" -DEPENDS = "libmatchbox x11 xext xpm apmd startup-notification virtual/kernel wireless-tools" -SECTION = "x11/wm" -PR="r2" +include matchbox-panel.inc +PR="r2" SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/0.9/${PN}-${PV}.tar.gz" -inherit autotools pkgconfig gettext - -CFLAGS += "-D_GNU_SOURCE" - -EXTRA_OECONF = "--enable-startup-notification --enable-dnotify" -EXTRA_OECONF_append_h3600 = " --enable-small-icons " -EXTRA_OECONF_append_h3900 = " --enable-small-icons " -EXTRA_OECONF_append_collie = " --enable-small-icons " -EXTRA_OECONF_append_poodle = " --enable-small-icons " -EXTRA_OECONF_append_mnci = " --enable-small-icons " -EXTRA_OECONF_append_integral = " --enable-small-icons " - -FILES_${PN} = "${bindir} \ - ${datadir}/applications \ - ${datadir}/pixmaps" diff --git a/openembedded/packages/matchbox-panel/matchbox-panel_svn.bb b/openembedded/packages/matchbox-panel/matchbox-panel_svn.bb index dab3452ef..f0e80d3d2 100644 --- a/openembedded/packages/matchbox-panel/matchbox-panel_svn.bb +++ b/openembedded/packages/matchbox-panel/matchbox-panel_svn.bb @@ -1,20 +1,11 @@ -DESCRIPTION = "Matchbox Window Manager Panel" -LICENSE = "GPL" -DEPENDS = "libmatchbox x11 xext xpm apmd startup-notification virtual/kernel" -SECTION = "x11/wm" +include matchbox-panel.inc PV = "0.9.2+cvs-${CVSDATE}" DEFAULT_PREFERENCE = "-1" SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http" -S = ${WORKDIR}/${PN} - -inherit autotools pkgconfig gettext - EXTRA_OECONF = "--enable-startup-notification --enable-dnotify" -CFLAGS += " -D_GNU_SOURCE" -FILES_${PN} = "${bindir} \ - ${datadir}/applications \ - ${datadir}/pixmaps" +S = ${WORKDIR}/${PN} + diff --git a/openembedded/packages/pcmcia-cs/pcmcia-cs-3.2.8/pcic-extra.patch b/openembedded/packages/pcmcia-cs/pcmcia-cs-3.2.8/pcic-extra.patch index e78d0c5c6..541c4edf7 100644 --- a/openembedded/packages/pcmcia-cs/pcmcia-cs-3.2.8/pcic-extra.patch +++ b/openembedded/packages/pcmcia-cs/pcmcia-cs-3.2.8/pcic-extra.patch @@ -1,14 +1,11 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - --- pcmcia-cs-3.2.8/etc/rc.pcmcia~pcic-extra +++ pcmcia-cs-3.2.8/etc/rc.pcmcia -@@ -105,10 +105,16 @@ +@@ -104,11 +104,17 @@ for x in "1" ; do + (/sbin/modprobe yenta_socket >/dev/null 2>&1 && echo "using yenta_socket instead of $PCIC") || /sbin/modprobe $PCIC $PCIC_OPTS || break - /sbin/modprobe ds || break +- /sbin/modprobe ds || break ++ /sbin/modprobe $DS || break + if [ "x$PCIC_EXTRA" != "x" ]; then + /sbin/modprobe $PCIC_EXTRA + fi @@ -22,7 +19,7 @@ else echo "module directory $PC not found." break -@@ -154,7 +160,7 @@ +@@ -154,7 +160,7 @@ for x in "1" ; do ;; status) diff --git a/openembedded/packages/rxvt-unicode/rxvt-unicode_5.6.bb b/openembedded/packages/rxvt-unicode/rxvt-unicode_5.6.bb index d3baaf62d..2f3f56c2c 100644 --- a/openembedded/packages/rxvt-unicode/rxvt-unicode_5.6.bb +++ b/openembedded/packages/rxvt-unicode/rxvt-unicode_5.6.bb @@ -11,7 +11,7 @@ SRC_URI = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2 file://signedchar.patch;patch=1 \ file://rxvt.desktop \ file://rxvt.png" -PR = "r5" +PR = "r3" inherit autotools update-alternatives diff --git a/openembedded/packages/settings-daemon/settings-daemon_svn.bb b/openembedded/packages/settings-daemon/settings-daemon_svn.bb index 738ebd235..097f6abb5 100644 --- a/openembedded/packages/settings-daemon/settings-daemon_svn.bb +++ b/openembedded/packages/settings-daemon/settings-daemon_svn.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Settings-daemon is a bridge between xst/gpe-confd and gconf" LICENSE = "GPL" -DEPENDS = "gconf xst glib-2.0" +DEPENDS = "gconf glib-2.0" SECTION = "gpe" SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \ |