3 files changed, 51 insertions, 10 deletions

diff --git a/meta-xfce/recipes-apps/ristretto/ristretto_0.3.5.bb b/meta-xfce/recipes-apps/ristretto/ristretto_0.6.3.bb
index fec5c46b6..959dcadf7 100644
--- a/meta-xfce/recipes-apps/ristretto/ristretto_0.3.5.bb
+++ b/meta-xfce/recipes-apps/ristretto/ristretto_0.6.3.bb
@@ -2,13 +2,12 @@ DESCRIPTION = "Tiny image-viewer"
 HOMEPAGE = "http://goodies.xfce.org/projects/applications/ristretto"
 SECTION = "x11/application"
 LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-PR = "r1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=35d145429ad3cbf5308d1dc93f66376b"
 DEPENDS = "exo libexif gtk+ dbus-glib libxfce4ui libxfce4util xfconf cairo"
 
 inherit xfce-app
 
 RRECOMMENDS_${PN} += "tumbler"
 
-SRC_URI[md5sum] = "3bfdf129926236a45c58d7afdbb703b7"
-SRC_URI[sha256sum] = "96dc519c2e930955f97027d7b9bb7542b01a6ad0ca53a16f9af58f7c851eb8f2"
+SRC_URI[md5sum] = "6b8c9a5d7ed319e4c84a9fefaa18792c"
+SRC_URI[sha256sum] = "2b6816de298e9a0d9b95662664690713c4123a9ac813a27bdde4727a03472d79"
diff --git a/meta-xfce/recipes-apps/xfce4-screenshooter/files/0001-Fix-panel-plugin-build.patch b/meta-xfce/recipes-apps/xfce4-screenshooter/files/0001-Fix-panel-plugin-build.patch
new file mode 100644
index 000000000..c30f9cb18
--- /dev/null
+++ b/meta-xfce/recipes-apps/xfce4-screenshooter/files/0001-Fix-panel-plugin-build.patch
@@ -0,0 +1,43 @@
+From 08053be7adc6d4a83191efed735c3f565bcbcf1f Mon Sep 17 00:00:00 2001
+From: Samuli Suominen <ssuominen@gentoo.org>
+Date: Sat, 5 May 2012 17:13:45 +0200
+Subject: [PATCH] Fix panel plugin build.
+
+- Don't use a versioned library.
+- Build as a module.
+- Only export needed symbols.
+---
+Upstream-status: applied
+ Makefile.am |   12 +++++++++---
+ 1 files changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 45100fd..d0c0adb 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -132,13 +132,19 @@ panel_plugin_libscreenshooterplugin_la_CFLAGS =   \
+        @SOUP_CFLAGS@
+ 
+ panel_plugin_libscreenshooterplugin_la_LDFLAGS = \
++       -avoid-version \
++       -module \
++       -no-undefined \
++       -export-symbols-regex '^xfce_panel_module_(preinit|init|construct)' \
++       $(PLATFORM_LDFLAGS)
++
++panel_plugin_libscreenshooterplugin_la_LIBADD = \
+        @EXO_LIBS@ \
+        @LIBXFCE4PANEL_LIBS@ \
+        @GTHREAD_LIBS@ \
+        @SOUP_LIBS@ \
+-       @LIBXFCE4UI_LIBS@
+-
+-panel_plugin_libscreenshooterplugin_la_LIBADD = lib/libscreenshooter.la
++       @LIBXFCE4UI_LIBS@ \
++       lib/libscreenshooter.la
+ 
+ panel_plugin_libscreenshooterplugin_la_SOURCES = \
+        panel-plugin/screenshooter-plugin.c
+-- 
+1.7.4.4
+
diff --git a/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.8.0.bb b/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.8.1.bb
index 2362b8abf..b05c29873 100644
--- a/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.8.0.bb
+++ b/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.8.1.bb
@@ -5,12 +5,11 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d791728a073bc009b4ffaf00b7599855"
 DEPENDS = "xfce4-panel libxfce4util libxfce4ui gdk-pixbuf gtk+ glib-2.0 libsoup-2.4 exo libxfixes xext virtual/libx11"
 
-PR = "r0"
-
 inherit xfce-app
 
-FILES_${PN} += "${datadir}/xfce4/panel-plugins/*"
-FILES_${PN}-dbg += "${libexecdir}/xfce4/panel-plugins/.debug"
+SRC_URI += "file://0001-Fix-panel-plugin-build.patch"
+SRC_URI[md5sum] = "d0ffea2052a8e70154cf13789070711f"
+SRC_URI[sha256sum] = "40419892bd28989315eed053c159bba0f4264ed8c6c6738806024e481eab9492"
 
-SRC_URI[md5sum] = "b51ab5725418e7258273c4a6402adb02"
-SRC_URI[sha256sum] = "68748a42ae68c5a8e9ed1c14ec5c741a344ab30b5b325b8812220539548ad83e"
+FILES_${PN} += "${datadir}/xfce4/panel/plugins \
+                ${libdir}/xfce4/panel/plugins"