matchbox-panel: Update from using specific machine overrides to using machine

features (GUI_MACHINE_CLASS).

diff --git a/packages/matchbox-panel/matchbox-panel.inc b/packages/matchbox-panel/matchbox-panel.inc
index 44bbae6..b2148a9 100644 (file)
--- 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 7eb3a1b..2add352 100644 (file)
--- 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"