3 files changed, 3 insertions, 38 deletions

diff --git a/meta/conf/distro/include/poky-default-revisions.inc b/meta/conf/distro/include/poky-default-revisions.inc
index 23840f47ac..c5a0c7f284 100644
--- a/meta/conf/distro/include/poky-default-revisions.inc
+++ b/meta/conf/distro/include/poky-default-revisions.inc
@@ -98,7 +98,7 @@ SRCREV_pn-matchbox-config-gtk ??= "2081"
 SRCREV_pn-matchbox-desktop-sato ??= "76"
 SRCREV_pn-matchbox-desktop ??= "2096"
 SRCREV_pn-matchbox-keyboard ??= "2075"
-SRCREV_pn-matchbox-panel-2 ??= "2109"
+SRCREV_pn-matchbox-panel-2 ??= "2111"
 SRCREV_pn-matchbox-panel ??= "1364"
 SRCREV_pn-matchbox-stroke ??= "1820"
 SRCREV_pn-matchbox-terminal ??= "1816"
diff --git a/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2/fix_sync_funcname.patch b/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2/fix_sync_funcname.patch
deleted file mode 100644
index 25d08eda8b..0000000000
--- a/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2/fix_sync_funcname.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Rename function sync to sync_applet to avoid conflict.
-
-Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
-
-diff -ruN matchbox-panel-2-orig/applets/showdesktop/showdesktop.c matchbox-panel-2/applets/showdesktop/showdesktop.c
---- matchbox-panel-2-orig/applets/showdesktop/showdesktop.c     2010-11-17 20:59:46.000000000 +0800
-+++ matchbox-panel-2/applets/showdesktop/showdesktop.c  2010-11-17 21:00:11.000000000 +0800
-@@ -57,7 +57,7 @@
- 
- /* Sync @applet with the _NET_SHOWING_DESKTOP root window property */
- static void
--sync (ShowDesktopApplet *applet)
-+sync_applet (ShowDesktopApplet *applet)
- {
-         GdkDisplay *display;
-         Atom type;
-@@ -103,7 +103,7 @@
-         if (xev->type == PropertyNotify) {
-                 if (xev->xproperty.atom == applet->atom) {
-                         /* _NET_SHOWING_DESKTOP changed */
--                        sync (applet);
-+                        sync_applet (applet);
-                 }
-         }
- 
-@@ -145,7 +145,7 @@
-                                applet);
- 
-         /* Sync */
--        sync (applet);
-+        sync_applet (applet);
- }
- 
- /* Button clicked */
diff --git a/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_svn.bb b/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_svn.bb
index f4ebcfb5e5..8f5ccc84f7 100644
--- a/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_svn.bb
+++ b/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_svn.bb
@@ -13,15 +13,14 @@ DEPENDS += " ${@base_contains("MACHINE_FEATURES", "acpi", "libacpi", "",d)}"
 DEPENDS += " ${@base_contains("MACHINE_FEATURES", "apm", "apmd", "",d)}"
 
 PV = "0.0+svnr${SRCREV}"
-PR = "r6"
+PR = "r7"
 
 RPROVIDES_${PN} = "matchbox-panel"
 RREPLACES_${PN} = "matchbox-panel"
 RCONFLICTS_${PN} = "matchbox-panel"
 
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \
-           file://startup_fix.diff;patch=1 \
-           file://fix_sync_funcname.patch"
+           file://startup_fix.diff;patch=1"
 
 EXTRA_OECONF = "--enable-startup-notification --enable-dbus"
 EXTRA_OECONF += " ${@base_contains("MACHINE_FEATURES", "acpi", "--with-battery=acpi", "",d)}"