summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip Balister <philip@balister.org>2007-01-06 21:15:10 +0000
committerPhilip Balister <philip@balister.org>2007-01-06 21:15:10 +0000
commit7297a182f627caa9023220f2130e362387132f26 (patch)
tree7d2fb5365d1ab4bb5e7742c235c6844326ff4c92
parent38b2c2aa28ef81dc543421a25b47b808ce60fdc1 (diff)
parent271c9e5762efadf4865dd5813ddaefc3bf55ec1e (diff)
merge of '21538320b9bfd701fe44c49c42b440022e9f4002'
and 'd3e46612b65a41e045e2e9743893d7fa7d8b23c2'
-rw-r--r--packages/matchbox-panel/matchbox-panel.inc14
-rw-r--r--packages/matchbox-panel/matchbox-panel_0.9.3.bb2
2 files changed, 6 insertions, 10 deletions
diff --git a/packages/matchbox-panel/matchbox-panel.inc b/packages/matchbox-panel/matchbox-panel.inc
index 44bbae6870..b2148a91bd 100644
--- a/packages/matchbox-panel/matchbox-panel.inc
+++ b/packages/matchbox-panel/matchbox-panel.inc
@@ -3,21 +3,17 @@ LICENSE = "GPL"
DEPENDS = "libmatchbox virtual/libx11 libxext libxpm apmd startup-notification virtual/kernel wireless-tools"
SECTION = "x11/wm"
-PR = "r1"
+PR = "r2"
inherit autotools pkgconfig gettext
CFLAGS += "-D_GNU_SOURCE"
+CONF_bigscreen = ""
+CONF_smallscreen = " --enable-small-icons "
+
EXTRA_OECONF = " --enable-startup-notification --enable-dnotify "
-EXTRA_OECONF_append_h3600 = " --enable-small-icons "
-EXTRA_OECONF_append_h3900 = " --enable-small-icons "
-EXTRA_OECONF_append_h2200 = " --enable-small-icons "
-EXTRA_OECONF_append_h4000 = " --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_integral13 = " --enable-small-icons "
+EXTRA_OECONF_append = ${CONF_${GUI_MACHINE_CLASS}}
PACKAGE_ARCH = "${MACHINE}"
FILES_${PN} = "${bindir}/* \
diff --git a/packages/matchbox-panel/matchbox-panel_0.9.3.bb b/packages/matchbox-panel/matchbox-panel_0.9.3.bb
index 7eb3a1be42..2add352c6b 100644
--- a/packages/matchbox-panel/matchbox-panel_0.9.3.bb
+++ b/packages/matchbox-panel/matchbox-panel_0.9.3.bb
@@ -1,4 +1,4 @@
require matchbox-panel.inc
-PR="r0"
+PR="r1"
SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/0.9/${PN}-${PV}.tar.gz \
file://mb-applet-battery-repaint-093.patch;patch=1"