From dd6371bbb24af205d9fb1a995a9dc28951c13637 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20M=C3=BCller?= Date: Mon, 17 Sep 2012 00:41:32 +0200 Subject: [PATCH] xfce4-screenshooter: update to 1.8.1 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit (From meta-openembedded rev: 343f63335438edde126df540a274b939d38dcfc5) Signed-off-by: Andreas Müller Signed-off-by: Patrick Ohly --- .../files/0001-Fix-panel-plugin-build.patch | 43 ++++++++++++++++++++++ ...ooter_1.8.0.bb => xfce4-screenshooter_1.8.1.bb} | 11 +++--- 2 files changed, 48 insertions(+), 6 deletions(-) create mode 100644 meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/files/0001-Fix-panel-plugin-build.patch rename meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/{xfce4-screenshooter_1.8.0.bb => xfce4-screenshooter_1.8.1.bb} (58%) diff --git a/meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/files/0001-Fix-panel-plugin-build.patch b/meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/files/0001-Fix-panel-plugin-build.patch new file mode 100644 index 0000000..c30f9cb --- /dev/null +++ b/meta-openembedded/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 +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-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.8.0.bb b/meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.8.1.bb similarity index 58% rename from meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.8.0.bb rename to meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.8.1.bb index 2362b8a..b05c298 100644 --- a/meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.8.0.bb +++ b/meta-openembedded/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" -- 2.7.4