mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 00:20:08 +00:00
Code Issues Projects Releases Wiki Activity

matchbox-panel-2: Update to svn r2111

Browse Source 
Also removed fix_sync_funcname.patch as we have it after update.

Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
This commit is contained in:
Zhai Edwin
2010-11-19 19:24:20 +08:00
committed by Richard Purdie
parent e0a2dfd36e
commit ea8a7e7704
3 changed files with 3 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/conf/distro/include/poky-default-revisions.inc
+1 -1
View File
@@ -98,7 +98,7 @@ SRCREV_pn-matchbox-config-gtk ??= "2081"
SRCREV_pn-matchbox-desktop-sato ??= "76" SRCREV_pn-matchbox-desktop-sato ??= "76"
SRCREV_pn-matchbox-desktop ??= "2096" SRCREV_pn-matchbox-desktop ??= "2096"
SRCREV_pn-matchbox-keyboard ??= "2075" 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-panel ??= "1364"
SRCREV_pn-matchbox-stroke ??= "1820" SRCREV_pn-matchbox-stroke ??= "1820"
SRCREV_pn-matchbox-terminal ??= "1816" SRCREV_pn-matchbox-terminal ??= "1816"
meta/recipes-sato/matchbox-panel-2/matchbox-panel-2/fix_sync_funcname.patch
-34
View File
@@ -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 */
meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_svn.bb
+2 -3
View File
@@ -13,15 +13,14 @@ DEPENDS += " ${@base_contains("MACHINE_FEATURES", "acpi", "libacpi", "",d)}"
DEPENDS += " ${@base_contains("MACHINE_FEATURES", "apm", "apmd", "",d)}" DEPENDS += " ${@base_contains("MACHINE_FEATURES", "apm", "apmd", "",d)}"
PV = "0.0+svnr${SRCREV}" PV = "0.0+svnr${SRCREV}"
PR = "r6" PR = "r7"
RPROVIDES_${PN} = "matchbox-panel" RPROVIDES_${PN} = "matchbox-panel"
RREPLACES_${PN} = "matchbox-panel" RREPLACES_${PN} = "matchbox-panel"
RCONFLICTS_${PN} = "matchbox-panel" RCONFLICTS_${PN} = "matchbox-panel"
SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \ SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \
file://startup_fix.diff;patch=1 \ file://startup_fix.diff;patch=1"
file://fix_sync_funcname.patch"
EXTRA_OECONF = "--enable-startup-notification --enable-dbus" EXTRA_OECONF = "--enable-startup-notification --enable-dbus"
EXTRA_OECONF += " ${@base_contains("MACHINE_FEATURES", "acpi", "--with-battery=acpi", "",d)}" EXTRA_OECONF += " ${@base_contains("MACHINE_FEATURES", "acpi", "--with-battery=acpi", "",d)}"