[Pkg-xfce-commits] r7016 - in goodies/trunk/xfce4-screenshooter/debian: . patches
Lionel Le Folgoc
mrpouit-guest at alioth.debian.org
Fri May 18 09:01:42 UTC 2012
Author: mrpouit-guest
Date: 2012-05-18 09:01:41 +0000 (Fri, 18 May 2012)
New Revision: 7016
Added:
goodies/trunk/xfce4-screenshooter/debian/patches/01_fix-plugin-build.patch
Removed:
goodies/trunk/xfce4-screenshooter/debian/patches/01_fix-crash-with-some-wms.patch
Modified:
goodies/trunk/xfce4-screenshooter/debian/changelog
goodies/trunk/xfce4-screenshooter/debian/control
goodies/trunk/xfce4-screenshooter/debian/patches/series
goodies/trunk/xfce4-screenshooter/debian/rules
Log:
* New upstream release.
* debian/patches:
- 01_fix-crash-with-some-wms.patch: dropped, included upstream.
- 01_fix-plugin-build.patch: added, don't build the plugin as a versioned
shared lib, and don't export all symbols.
* debian/rules:
- run xdt-autogen, needed by the patch.
- don't install .la files.
- fix path to the panel plugin.
* debian/control:
- add xfce4-dev-tools, autoconf, automake, libtool to b-deps, needed by
xdt-autogen.
- bumped Standards-Version to 3.9.3.
Modified: goodies/trunk/xfce4-screenshooter/debian/changelog
===================================================================
--- goodies/trunk/xfce4-screenshooter/debian/changelog 2012-05-18 08:27:03 UTC (rev 7015)
+++ goodies/trunk/xfce4-screenshooter/debian/changelog 2012-05-18 09:01:41 UTC (rev 7016)
@@ -1,6 +1,18 @@
-xfce4-screenshooter (1.8.0-3) UNRELEASED; urgency=low
+xfce4-screenshooter (1.8.1-1) UNRELEASED; urgency=low
- * debian/patches: add missing DEP3 headers.
+ * New upstream release.
+ * debian/patches:
+ - 01_fix-crash-with-some-wms.patch: dropped, included upstream.
+ - 01_fix-plugin-build.patch: added, don't build the plugin as a versioned
+ shared lib, and don't export all symbols.
+ * debian/rules:
+ - run xdt-autogen, needed by the patch.
+ - don't install .la files.
+ - fix path to the panel plugin.
+ * debian/control:
+ - add xfce4-dev-tools, autoconf, automake, libtool to b-deps, needed by
+ xdt-autogen.
+ - bumped Standards-Version to 3.9.3.
-- Lionel Le Folgoc <mrpouit at gmail.com> Mon, 20 Feb 2012 22:32:30 +0100
Modified: goodies/trunk/xfce4-screenshooter/debian/control
===================================================================
--- goodies/trunk/xfce4-screenshooter/debian/control 2012-05-18 08:27:03 UTC (rev 7015)
+++ goodies/trunk/xfce4-screenshooter/debian/control 2012-05-18 09:01:41 UTC (rev 7016)
@@ -5,9 +5,9 @@
Uploaders: Yves-Alexis Perez <corsac at debian.org>, Lionel Le Folgoc <mrpouit at gmail.com>
Build-Depends: debhelper (>= 9), autotools-dev, libxml-parser-perl,
xfce4-panel-dev (>= 4.8.0), libgtk2.0-dev, intltool, libcurl4-gnutls-dev,
- libxmlrpc-c3-dev, libsoup2.4-dev, libxfce4ui-1-dev, hardening-includes,
- libexo-1-dev, dpkg-dev (>= 1.16.1)
-Standards-Version: 3.9.2
+ libxmlrpc-c3-dev, libsoup2.4-dev, libxfce4ui-1-dev, libexo-1-dev,
+ dpkg-dev (>= 1.16.1), xfce4-dev-tools, autoconf, automake, libtool
+Standards-Version: 3.9.3
Homepage: http://goodies.xfce.org/projects/applications/xfce4-screenshooter
Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-screenshooter/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfce4-screenshooter/
Deleted: goodies/trunk/xfce4-screenshooter/debian/patches/01_fix-crash-with-some-wms.patch
===================================================================
--- goodies/trunk/xfce4-screenshooter/debian/patches/01_fix-crash-with-some-wms.patch 2012-05-18 08:27:03 UTC (rev 7015)
+++ goodies/trunk/xfce4-screenshooter/debian/patches/01_fix-crash-with-some-wms.patch 2012-05-18 09:01:41 UTC (rev 7016)
@@ -1,33 +0,0 @@
-From d99765f43d36af5edf60277f5043eb7ae9c97088 Mon Sep 17 00:00:00 2001
-From: Bruno Ramos <brunoramos.lu at gmail.com>
-Date: Mon, 02 Jan 2012 22:20:09 +0000
-Subject: Fix crash with some WM (bug #8080).
-
-Origin: upstream, http://git.xfce.org/apps/xfce4-screenshooter/commit/?id=d99765f43d36af5edf60277f5043eb7ae9c97088
-Bug: https://bugzilla.xfce.org/show_bug.cgi?id=8080
----
-diff --git a/lib/screenshooter-capture.c b/lib/screenshooter-capture.c
-index 830d460..52f7b5c 100644
---- a/lib/screenshooter-capture.c
-+++ b/lib/screenshooter-capture.c
-@@ -381,6 +381,18 @@ static GdkPixbuf
- rec_height += rectangle.y;
- }
-
-+ if (rec_x < 0)
-+ {
-+ rec_width = rec_width + rec_x;
-+ rec_x = 0;
-+ }
-+
-+ if (rec_y < 0)
-+ {
-+ rec_height = rec_height + rec_y;
-+ rec_y = 0;
-+ }
-+
- if (x_orig + rec_x + rec_width > gdk_screen_width ())
- rec_width = gdk_screen_width () - x_orig - rec_x;
-
---
-cgit v0.9.0.2
Added: goodies/trunk/xfce4-screenshooter/debian/patches/01_fix-plugin-build.patch
===================================================================
--- goodies/trunk/xfce4-screenshooter/debian/patches/01_fix-plugin-build.patch (rev 0)
+++ goodies/trunk/xfce4-screenshooter/debian/patches/01_fix-plugin-build.patch 2012-05-18 09:01:41 UTC (rev 7016)
@@ -0,0 +1,40 @@
+From 08053be7adc6d4a83191efed735c3f565bcbcf1f Mon Sep 17 00:00:00 2001
+From: Samuli Suominen <ssuominen at gentoo.org>
+Date: Sat, 05 May 2012 15:13:45 +0000
+Subject: Fix panel plugin build.
+
+- Don't use a versioned library.
+- Build as a module.
+- Only export needed symbols.
+
+Origin: upstream, http://git.xfce.org/apps/xfce4-screenshooter/commit/?id=08053be7adc6d4a83191efed735c3f565bcbcf1f
+---
+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
+--
+cgit v0.9.0.3
Modified: goodies/trunk/xfce4-screenshooter/debian/patches/series
===================================================================
--- goodies/trunk/xfce4-screenshooter/debian/patches/series 2012-05-18 08:27:03 UTC (rev 7015)
+++ goodies/trunk/xfce4-screenshooter/debian/patches/series 2012-05-18 09:01:41 UTC (rev 7016)
@@ -1 +1 @@
-01_fix-crash-with-some-wms.patch
+01_fix-plugin-build.patch
Modified: goodies/trunk/xfce4-screenshooter/debian/rules
===================================================================
--- goodies/trunk/xfce4-screenshooter/debian/rules 2012-05-18 08:27:03 UTC (rev 7015)
+++ goodies/trunk/xfce4-screenshooter/debian/rules 2012-05-18 09:01:41 UTC (rev 7016)
@@ -1,9 +1,23 @@
#!/usr/bin/make -f
+
export DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs -Wl,--as-needed -Wl,-O1
export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,+bindnow
+override_dh_auto_configure:
+ NOCONFIGURE=1 xdt-autogen
+ dh_auto_configure
+
+override_dh_auto_clean:
+ dh_auto_clean
+ rm -f $$(find -name 'Makefile.in*')
+ rm -f INSTALL aclocal.m4 config.guess config.sub configure
+ rm -f depcomp install-sh missing mkinstalldirs
+
+override_dh_install:
+ dh_install --fail-missing -X .la
+
override_dh_shlibdeps:
- dh_shlibdeps -X debian/xfce4-screenshooter/usr/lib/$(DEB_HOST_MULTIARCH)/xfce4/panel-plugins/xfce4-screenshooter-plugin -- -dRecommends debian/xfce4-screenshooter/usr/lib/$(DEB_HOST_MULTIARCH)/xfce4/panel-plugins/xfce4-screenshooter-plugin -dDepends
+ dh_shlibdeps -X debian/xfce4-screenshooter/usr/lib/$(DEB_HOST_MULTIARCH)/xfce4/panel/plugins/libscreenshooterplugin.so -- -dRecommends debian/xfce4-screenshooter/usr/lib/$(DEB_HOST_MULTIARCH)/xfce4/panel/plugins/libscreenshooterplugin.so -dDepends
%:
dh $@
More information about the Pkg-xfce-commits
mailing list