summaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato/matchbox-panel-2
diff options
context:
space:
mode:
authorZhai Edwin <edwin.zhai@intel.com>2010-11-19 11:24:20 (GMT)
committerRichard Purdie <rpurdie@linux.intel.com>2010-11-22 10:25:35 (GMT)
commitea8a7e770482ceadd9ae88a5ee4ed4f9578ff26f (patch)
tree140b88b7f99c0d37662d25bd52974c001fc0823d /meta/recipes-sato/matchbox-panel-2
parente0a2dfd36e4a092575dd3688b99b2536572de645 (diff)
downloadpoky-ea8a7e770482ceadd9ae88a5ee4ed4f9578ff26f.tar.gz
matchbox-panel-2: Update to svn r2111
Also removed fix_sync_funcname.patch as we have it after update. Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Diffstat (limited to 'meta/recipes-sato/matchbox-panel-2')
-rw-r--r--meta/recipes-sato/matchbox-panel-2/matchbox-panel-2/fix_sync_funcname.patch34
-rw-r--r--meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_svn.bb5
2 files changed, 2 insertions, 37 deletions
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 25d08ed..0000000
--- a/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2/fix_sync_funcname.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1Rename function sync to sync_applet to avoid conflict.
2
3Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
4
5diff -ruN matchbox-panel-2-orig/applets/showdesktop/showdesktop.c matchbox-panel-2/applets/showdesktop/showdesktop.c
6--- matchbox-panel-2-orig/applets/showdesktop/showdesktop.c 2010-11-17 20:59:46.000000000 +0800
7+++ matchbox-panel-2/applets/showdesktop/showdesktop.c 2010-11-17 21:00:11.000000000 +0800
8@@ -57,7 +57,7 @@
9
10 /* Sync @applet with the _NET_SHOWING_DESKTOP root window property */
11 static void
12-sync (ShowDesktopApplet *applet)
13+sync_applet (ShowDesktopApplet *applet)
14 {
15 GdkDisplay *display;
16 Atom type;
17@@ -103,7 +103,7 @@
18 if (xev->type == PropertyNotify) {
19 if (xev->xproperty.atom == applet->atom) {
20 /* _NET_SHOWING_DESKTOP changed */
21- sync (applet);
22+ sync_applet (applet);
23 }
24 }
25
26@@ -145,7 +145,7 @@
27 applet);
28
29 /* Sync */
30- sync (applet);
31+ sync_applet (applet);
32 }
33
34 /* 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 f4ebcfb..8f5ccc8 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)}"
13DEPENDS += " ${@base_contains("MACHINE_FEATURES", "apm", "apmd", "",d)}" 13DEPENDS += " ${@base_contains("MACHINE_FEATURES", "apm", "apmd", "",d)}"
14 14
15PV = "0.0+svnr${SRCREV}" 15PV = "0.0+svnr${SRCREV}"
16PR = "r6" 16PR = "r7"
17 17
18RPROVIDES_${PN} = "matchbox-panel" 18RPROVIDES_${PN} = "matchbox-panel"
19RREPLACES_${PN} = "matchbox-panel" 19RREPLACES_${PN} = "matchbox-panel"
20RCONFLICTS_${PN} = "matchbox-panel" 20RCONFLICTS_${PN} = "matchbox-panel"
21 21
22SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \ 22SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \
23 file://startup_fix.diff;patch=1 \ 23 file://startup_fix.diff;patch=1"
24 file://fix_sync_funcname.patch"
25 24
26EXTRA_OECONF = "--enable-startup-notification --enable-dbus" 25EXTRA_OECONF = "--enable-startup-notification --enable-dbus"
27EXTRA_OECONF += " ${@base_contains("MACHINE_FEATURES", "acpi", "--with-battery=acpi", "",d)}" 26EXTRA_OECONF += " ${@base_contains("MACHINE_FEATURES", "acpi", "--with-battery=acpi", "",d)}"