diff options
| author |   Dongxiao Xu <dongxiao.xu@intel.com> | 2010-11-18 00:49:05 +0800 |
|---|---|---|
| committer |   Saul Wold <Saul.Wold@intel.com> | 2010-11-18 13:30:28 -0800 |
| commit | a79165c616a3e60a0e8e127394fda53f467455b0 (patch) | |
| tree | c12f0b20120299bc1f7c7b0e77e460058a1a32fb /meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_svn.bb | |
| parent | 0a751b7dc273140968f7a1784382fe1f0932be62 (diff) | |
| download | openembedded-core-contrib-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/matchbox-panel-2_svn.bb')
| -rw-r--r-- | meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_svn.bb | 5 |
1 files changed, 3 insertions, 2 deletions
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)}" DEPENDS += " ${@base_contains("MACHINE_FEATURES", "apm", "apmd", "",d)}" PV = "0.0+svnr${SRCREV}" -PR = "r5" +PR = "r6" 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://startup_fix.diff;patch=1 \ + file://fix_sync_funcname.patch" EXTRA_OECONF = "--enable-startup-notification --enable-dbus" EXTRA_OECONF += " ${@base_contains("MACHINE_FEATURES", "acpi", "--with-battery=acpi", "",d)}" |