aboutsummaryrefslogtreecommitdiffstats
path: root/meta-xfce/recipes-apps
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@googlemail.com>2015-01-26 10:32:12 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2015-02-19 10:09:58 +0100
commitf26d42cd3469cdea025f00502d2de8f98d6a2b02 (patch)
treedf0e465c0864d2e705143c916abec0b4affe7711 /meta-xfce/recipes-apps
parentb9bd88849773601ba34e904dd23eb60296b3ee11 (diff)
downloadmeta-openembedded-contrib-f26d42cd3469cdea025f00502d2de8f98d6a2b02.tar.gz
meta-openembedded-contrib-f26d42cd3469cdea025f00502d2de8f98d6a2b02.tar.bz2
meta-openembedded-contrib-f26d42cd3469cdea025f00502d2de8f98d6a2b02.zip
xfce4-screenshooter: update to 1.8.2
0001-Fix-panel-plugin-build.patch was applied mainline Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Diffstat (limited to 'meta-xfce/recipes-apps')
-rw-r--r--meta-xfce/recipes-apps/xfce4-screenshooter/files/0001-Fix-panel-plugin-build.patch43
-rw-r--r--meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.8.2.bb (renamed from meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.8.1.bb)12
2 files changed, 7 insertions, 48 deletions
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
deleted file mode 100644
index 98ce875b78..0000000000
--- a/meta-xfce/recipes-apps/xfce4-screenshooter/files/0001-Fix-panel-plugin-build.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-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.1.bb b/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.8.2.bb
index 0e2e327f03..ae19492f3c 100644
--- a/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.8.1.bb
+++ b/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.8.2.bb
@@ -7,13 +7,15 @@ DEPENDS = "xfce4-panel libxfce4util libxfce4ui gdk-pixbuf gtk+ glib-2.0 libsoup-
inherit xfce-app
-SRC_URI += "file://0001-Fix-panel-plugin-build.patch"
-SRC_URI[md5sum] = "d0ffea2052a8e70154cf13789070711f"
-SRC_URI[sha256sum] = "40419892bd28989315eed053c159bba0f4264ed8c6c6738806024e481eab9492"
+SRC_URI[md5sum] = "3a32ecc5566453a58f6a4ddd70649444"
+SRC_URI[sha256sum] = "9dce2ddfaa87f703e870e29bae13f3fc82a1b3f06b44f8386640e45a135f5f69"
do_compile_prepend() {
mkdir -p lib
}
-FILES_${PN} += "${datadir}/xfce4/panel/plugins \
- ${libdir}/xfce4/panel/plugins"
+FILES_${PN} += " \
+ ${datadir}/appdata \
+ ${datadir}/xfce4/panel/plugins \
+ ${libdir}/xfce4/panel/plugins \
+"