leadpad/pcmanfm/puzzles: Make libowl optional

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

diff --git a/meta/packages/leafpad/leafpad_0.8.9.bb b/meta/packages/leafpad/leafpad_0.8.9.bb
index 49a8af1fe71f0ebaed1f714bc41d05bf81522f3a..fdf9948d3644e9994cbb19ca5b69cc4e13ca3a7c 100644 (file)
--- a/meta/packages/leafpad/leafpad_0.8.9.bb
+++ b/meta/packages/leafpad/leafpad_0.8.9.bb
@@ -1,8 +1,9 @@
 LICENSE = "GPLv2"
-DEPENDS = "gtk+ intltool-native libowl"
+DEPENDS = "gtk+ intltool-native"
+DEPENDS_append_poky = " libowl"
 SRC_URI = "http://savannah.nongnu.org/download/${PN}/${PN}-${PV}.tar.gz \
           file://leafpad.desktop"
-PR = "r9"
+PR = "r10"
 
 SRC_URI_append_poky += " file://owl-menu.patch;patch=1 "
 

diff --git a/meta/packages/pcmanfm/pcmanfm_0.3.2.2.bb b/meta/packages/pcmanfm/pcmanfm_0.3.2.2.bb
index 424e96416ddcc13857af300de71cadb4b2ae4a65..b51f2a2f68cc290752f80b18e9337319f058c863 100644 (file)
--- a/meta/packages/pcmanfm/pcmanfm_0.3.2.2.bb
+++ b/meta/packages/pcmanfm/pcmanfm_0.3.2.2.bb
@@ -2,9 +2,10 @@ LICENSE = "GPL"
 DESCRIPTION = "procfs tools"
 SECTION = "x11"
 PRIORITY = "optional"
-DEPENDS = "gtk+ libowl startup-notification"
+DEPENDS = "gtk+ startup-notification"
+DEPENDS_append_poky = " libowl"
 
-PR="r3"
+PR = "r4"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/pcmanfm-${PV}.tar.gz \
           file://gnome-fs-directory.png \
@@ -12,8 +13,9 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/pcmanfm-${PV}.tar.gz \
           file://gnome-mime-text-plain.png \
           file://emblem-symbolic-link.png \
           file://desktop.patch;patch=1 \
-          file://no-warnings.patch;patch=1 \
-          file://owl-window-menu.patch;patch=1"
+          file://no-warnings.patch;patch=1"
+
+SRC_URI_append_poky = " file://owl-window-menu.patch;patch=1"
 
 EXTRA_OECONF = "--enable-inotify --disable-hal"
 
@@ -27,4 +29,3 @@ do_install_append () {
 }
 
 FILES_${PN} += "${datadir}/pixmaps/*.png"
-

diff --git a/meta/packages/puzzles/oh-puzzles_svn.bb b/meta/packages/puzzles/oh-puzzles_svn.bb
index eb66137552a0129cf6c1c008ea3245e3a5fd7232..81be59729e3b7bf9a6651d221c0e054f4934f713 100644 (file)
--- a/meta/packages/puzzles/oh-puzzles_svn.bb
+++ b/meta/packages/puzzles/oh-puzzles_svn.bb
@@ -1,18 +1,19 @@
 DESCRIPTION = "Portable Puzzle Collection"
 LICENSE = "MIT"
 SECTION = "x11"
-DEPENDS = "gtk+ gconf intltool-native librsvg libowl"
+DEPENDS = "gtk+ gconf intltool-native librsvg"
+DEPENDS_append_poky = " libowl"
 
 PV = "0.1+svnr${SRCREV}"
-PR = "r9"
+PR = "r10"
 
 bindir = "/usr/games"
 
 inherit autotools pkgconfig
 
 SRC_URI = "svn://svn.o-hand.com/repos/;module=oh-puzzles;proto=http"
-
 SRC_URI_append_poky = " file://oh-puzzles-owl-menu.patch;patch=1;pnum=0 "
+
 S = "${WORKDIR}/${PN}"
 
 EXTRA_OEMAKE += "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1"