summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/gnash/gnash-minimal.inc4
-rw-r--r--packages/gnome/gnome-panel_2.22.2.bb2
-rw-r--r--packages/gnome/gnome-python-extras_2.19.1.bb21
3 files changed, 23 insertions, 4 deletions
diff --git a/packages/gnash/gnash-minimal.inc b/packages/gnash/gnash-minimal.inc
index 86c4a4278e..597f22bd70 100644
--- a/packages/gnash/gnash-minimal.inc
+++ b/packages/gnash/gnash-minimal.inc
@@ -3,7 +3,6 @@ HOMEPAGE = "http://www.gnu.org/software/gnash"
LICENSE = "GPL-2"
DEPENDS = "virtual/libiconv virtual/libintl ffmpeg libtool agg libxml2 libmad zlib boost jpeg pango curl freetype"
-RDEPENDS = "libltdl"
SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gnash/${PV}/gnash-${PV}.tar.bz2"
S = ${WORKDIR}/gnash-${PV}
@@ -48,11 +47,10 @@ EXTRA_OECONF="--enable-gui=gtk \
# detection because uclibc does not have argz.h which enables error_t
CFLAGS += " -D_GNU_SOURCE -I${S}/libltdl -I${STAGING_INCDIR}/libltdl"
-PACKAGES =+ "libgnashnet libgnashamf libgnashbase libgnashserver libgnashmedia libltdl"
+PACKAGES =+ "libgnashnet libgnashamf libgnashbase libgnashserver libgnashmedia"
FILES_${PN}-dbg += "${libdir}/gnash/.debug"
FILES_${PN}-dev += "${libdir}/gnash/*a"
-FILES_libltdl = "${libdir}/gnash/libltdl*.so*"
FILES_libgnashamf = "${libdir}/gnash/libgnashamf-${PV}.so"
FILES_libgnashbase = "${libdir}/gnash/libgnashbase-${PV}.so"
FILES_libgnashmedia = "${libdir}/gnash/libgnashmedia-${PV}.so"
diff --git a/packages/gnome/gnome-panel_2.22.2.bb b/packages/gnome/gnome-panel_2.22.2.bb
index b5f207a632..b96d985387 100644
--- a/packages/gnome/gnome-panel_2.22.2.bb
+++ b/packages/gnome/gnome-panel_2.22.2.bb
@@ -1,5 +1,5 @@
LICENSE = "GPL"
-DEPENDS = "libgweather startup-notification libwnck orbit2 gtk+ libgnome libgnomeui gnome-desktop libglade gnome-menus orbit2-native"
+DEPENDS = "librsvg libgweather startup-notification libwnck orbit2 gtk+ libgnome libgnomeui gnome-desktop libglade gnome-menus orbit2-native"
inherit gnome pkgconfig
diff --git a/packages/gnome/gnome-python-extras_2.19.1.bb b/packages/gnome/gnome-python-extras_2.19.1.bb
new file mode 100644
index 0000000000..9d8e786241
--- /dev/null
+++ b/packages/gnome/gnome-python-extras_2.19.1.bb
@@ -0,0 +1,21 @@
+LICENSE = "GPL/LGPL"
+DEPENDS = "python-pygtk libwnck"
+
+inherit gnome distutils-base
+
+SRC_URI += "file://acinclude.m4"
+
+do_configure_prepend() {
+ install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/
+}
+
+do_configure_prepend() {
+ sed -i -e s:'`$PKG_CONFIG --variable=defsdir pygtk-2.0`':\"${STAGING_DATADIR}/pygtk/2.0/defs\":g ${S}/configure.ac
+}
+
+AUTOTOOLS_STAGE_PKGCONFIG = "1"
+do_stage() {
+ autotools_stage_all
+}
+
+FILES_${PN}-dev += "${datadir}/pygtk"