summaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato/matchbox-panel-2
diff options
context:
space:
mode:
authorDongxiao Xu <dongxiao.xu@intel.com>2010-11-18 00:49:05 +0800
committerSaul Wold <Saul.Wold@intel.com>2010-11-18 13:30:28 -0800
commita79165c616a3e60a0e8e127394fda53f467455b0 (patch)
treec12f0b20120299bc1f7c7b0e77e460058a1a32fb /meta/recipes-sato/matchbox-panel-2
parent0a751b7dc273140968f7a1784382fe1f0932be62 (diff)
downloadpoky-a79165c616a3e60a0e8e127394fda53f467455b0.tar.gz
matchbox-panel: Change function name "sync" to avoid conflict
/usr/includes/unistd.h also has a function named sync(). Change sync() in matchbox-panel-2 to sync_applet(). Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> Signed-off-by: Saul Wold <sgw@linux.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, 37 insertions, 2 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
new file mode 100644
index 0000000000..25d08eda8b
--- /dev/null
+++ b/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2/fix_sync_funcname.patch
@@ -0,0 +1,34 @@
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 45998633f4..f4ebcfb5e5 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,14 +13,15 @@ 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 = "r5" 16PR = "r6"
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"
24 25
25EXTRA_OECONF = "--enable-startup-notification --enable-dbus" 26EXTRA_OECONF = "--enable-startup-notification --enable-dbus"
26EXTRA_OECONF += " ${@base_contains("MACHINE_FEATURES", "acpi", "--with-battery=acpi", "",d)}" 27EXTRA_OECONF += " ${@base_contains("MACHINE_FEATURES", "acpi", "--with-battery=acpi", "",d)}"