summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-12-07 17:21:56 +0000
committerJoshua Lock <josh@linux.intel.com>2009-12-08 21:09:40 +0000
commit76f6ab09ca5fed2e29ae28eca3e2696ce997bffc (patch)
tree65ef32546f580a6e64fc97f6154881e57d7aa18f
parenta68bc3912ad7cdab9ef4334afc393cebf96f6d46 (diff)
downloadpoky-76f6ab09ca5fed2e29ae28eca3e2696ce997bffc.tar.gz
poky-76f6ab09ca5fed2e29ae28eca3e2696ce997bffc.tar.bz2
poky-76f6ab09ca5fed2e29ae28eca3e2696ce997bffc.zip
leadpad/pcmanfm/puzzles: Make libowl optional
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r--meta/packages/leafpad/leafpad_0.8.9.bb5
-rw-r--r--meta/packages/pcmanfm/pcmanfm_0.3.2.2.bb11
-rw-r--r--meta/packages/puzzles/oh-puzzles_svn.bb7
3 files changed, 13 insertions, 10 deletions
diff --git a/meta/packages/leafpad/leafpad_0.8.9.bb b/meta/packages/leafpad/leafpad_0.8.9.bb
index 49a8af1fe7..fdf9948d36 100644
--- 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 424e96416d..b51f2a2f68 100644
--- 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 eb66137552..81be59729e 100644
--- 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"