Merge branch 'org.openembedded.dev' of ssh://git@git.openembedded.net/openembedded into org.openembedded.dev

4 files changed, 80 insertions, 1 deletions

diff --git a/recipes/gimp/gimp_2.6.3.bb b/recipes/gimp/gimp_2.6.3.bb
index 8470b6d5a8..6bfbd1b5d1 100644
--- a/recipes/gimp/gimp_2.6.3.bb
+++ b/recipes/gimp/gimp_2.6.3.bb
@@ -1,6 +1,8 @@
 require gimp.inc
 
-DEPENDS += "lcms gegl hal"
+PR = "r1"
+
+DEPENDS += "webkit-gtk lcms gegl hal"
 
 SRC_URI = "ftp://ftp.gimp.org/pub/gimp/v2.6/gimp-${PV}.tar.bz2 \
           "
diff --git a/recipes/gnome/gnome-panel_2.26.0.bb b/recipes/gnome/gnome-panel_2.26.0.bb
new file mode 100644
index 0000000000..b2d615a750
--- /dev/null
+++ b/recipes/gnome/gnome-panel_2.26.0.bb
@@ -0,0 +1,24 @@
+LICENSE = "GPL"
+DEPENDS = "librsvg libgweather startup-notification libwnck orbit2 gtk+ libgnome libgnomeui gnome-desktop libglade gnome-menus orbit2-native"
+
+inherit gnome pkgconfig
+
+do_configure_prepend() {
+        sed -i -e s:help:: ${S}/Makefile.am
+}
+
+
+PACKAGES =+ "libpanel-applet"
+FILES_libpanel-applet = "${libdir}/libpanel-applet-2.so.*"
+
+FILES_${PN} =+ "${datadir}/gnome* \
+                ${datadir}/icons"
+
+EXTRA_OEMAKE = "ORBIT_IDL=${STAGING_BINDIR_NATIVE}/orbit-idl-2"
+EXTRA_OECONF = "--disable-scrollkeeper \
+                --disable-eds \
+               "
+
+do_stage() {
+        autotools_stage_all
+}
diff --git a/recipes/gnome/gnome-python-desktop_2.26.0.bb b/recipes/gnome/gnome-python-desktop_2.26.0.bb
new file mode 100644
index 0000000000..0ddc05e8e0
--- /dev/null
+++ b/recipes/gnome/gnome-python-desktop_2.26.0.bb
@@ -0,0 +1,28 @@
+LICENSE = "GPL/LGPL"
+DEPENDS = "librsvg libwnck totem-pl-parser libgtop gnome-panel gnome-desktop eds-dbus python-pygtk gnome-python libgnomeprint libgnomeprintui"
+
+PR = "r4"
+
+inherit gnome distutils-base
+
+SRC_URI += "file://acinclude.m4"
+
+EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../"
+
+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 \
+	       -e s:'`$PKG_CONFIG --variable=defsdir gnome-python-2.0`':\"${STAGING_DATADIR}/pygtk/2.0/defs\":g \
+	       -e s:'`$PKG_CONFIG --variable=argtypesdir gnome-python-2.0`':\"${STAGING_DATADIR}/pygtk/2.0/argtypes\":g \	
+	${S}/configure.ac
+}	
+
+AUTOTOOLS_STAGE_PKGCONFIG = "1"
+do_stage() {
+	autotools_stage_all
+}	
+
+FILES_${PN}-dev += "${datadir}/pygtk"
diff --git a/recipes/gnome/libgweather_2.26.0.bb b/recipes/gnome/libgweather_2.26.0.bb
new file mode 100644
index 0000000000..f36dbbdec7
--- /dev/null
+++ b/recipes/gnome/libgweather_2.26.0.bb
@@ -0,0 +1,25 @@
+LICENSE = "LGPL"
+DEPENDS = "libgnome libsoup-2.4 gtk+"
+
+inherit gnome
+
+do_configure_prepend() {
+        sed -i -e s:help:: ${S}/Makefile.am
+}
+
+
+PACKAGES =+ "libpanel-applet"
+FILES_libpanel-applet = "${libdir}/libpanel-applet-2.so.*"
+
+FILES_${PN} =+ "${datadir}/gnome* \
+                ${datadir}/icons"
+
+do_configure_prepend() {
+	sed -i -e 's: doc : :g' ${S}/Makefile.am
+}
+
+EXTRA_OEMAKE = "ORBIT_IDL=${STAGING_BINDIR_NATIVE}/orbit-idl-2"
+
+do_stage() {
+        autotools_stage_all
+}