[Pkg-xfce-commits] r4960 - in goodies/branches/experimental: . xfce4-timer-plugin/debian xfce4-timer-plugin/debian/patches
Lionel Le Folgoc
mrpouit-guest at alioth.debian.org
Sat Feb 12 03:25:09 UTC 2011
Author: mrpouit-guest
Date: 2011-02-12 15:25:07 +0000 (Sat, 12 Feb 2011)
New Revision: 4960
Added:
goodies/branches/experimental/xfce4-timer-plugin/
goodies/branches/experimental/xfce4-timer-plugin/debian/patches/02_Fix-segfault-when-creating-plugin-in-4.8-panel.patch
Modified:
goodies/branches/experimental/xfce4-timer-plugin/debian/changelog
goodies/branches/experimental/xfce4-timer-plugin/debian/control
goodies/branches/experimental/xfce4-timer-plugin/debian/patches/series
goodies/branches/experimental/xfce4-timer-plugin/debian/rules
Log:
* debian/rules:
- pick {C,LD}FLAGS from dpkg-buildflags.
- add -O1, -z,defs and --as-needed to LDFLAGS.
- add hardening flags to {C,LD}FLAGS.
* debian/patches:
- 02_Fix-segfault-when-creating-plugin-in-4.8-panel.patch: make the
plugin work with Xfce 4.8.
- series: refreshed.
* debian/control:
- update standards version to 3.9.1.
- add build-dep on hardening-includes.
Modified: goodies/branches/experimental/xfce4-timer-plugin/debian/changelog
===================================================================
--- goodies/trunk/xfce4-timer-plugin/debian/changelog 2011-02-11 08:00:28 UTC (rev 4959)
+++ goodies/branches/experimental/xfce4-timer-plugin/debian/changelog 2011-02-12 15:25:07 UTC (rev 4960)
@@ -1,6 +1,17 @@
xfce4-timer-plugin (0.6.1-4) UNRELEASED; urgency=low
* debian/control: change Section to 'xfce'.
+ * debian/rules:
+ - pick {C,LD}FLAGS from dpkg-buildflags.
+ - add -O1, -z,defs and --as-needed to LDFLAGS.
+ - add hardening flags to {C,LD}FLAGS.
+ * debian/patches:
+ - 02_Fix-segfault-when-creating-plugin-in-4.8-panel.patch: make the
+ plugin work with Xfce 4.8.
+ - series: refreshed.
+ * debian/control:
+ - update standards version to 3.9.1.
+ - add build-dep on hardening-includes.
-- Lionel Le Folgoc <mrpouit at gmail.com> Sun, 11 Apr 2010 20:05:11 +0200
Modified: goodies/branches/experimental/xfce4-timer-plugin/debian/control
===================================================================
--- goodies/trunk/xfce4-timer-plugin/debian/control 2011-02-11 08:00:28 UTC (rev 4959)
+++ goodies/branches/experimental/xfce4-timer-plugin/debian/control 2011-02-12 15:25:07 UTC (rev 4960)
@@ -6,8 +6,8 @@
Simon Huggins <huggie at earth.li>, Lionel Le Folgoc <mrpouit at gmail.com>
Build-Depends: debhelper (>= 7), cdbs, libxml-parser-perl,
xfce4-panel-dev (>= 4.4.0), intltool, pkg-config, libglib2.0-dev,
- libgtk2.0-dev, libxfcegui4-dev, autotools-dev
-Standards-Version: 3.8.3
+ libgtk2.0-dev, libxfcegui4-dev, autotools-dev, hardening-includes
+Standards-Version: 3.9.1
Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-timer-plugin/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfce4-timer-plugin/
Added: goodies/branches/experimental/xfce4-timer-plugin/debian/patches/02_Fix-segfault-when-creating-plugin-in-4.8-panel.patch
===================================================================
--- goodies/branches/experimental/xfce4-timer-plugin/debian/patches/02_Fix-segfault-when-creating-plugin-in-4.8-panel.patch (rev 0)
+++ goodies/branches/experimental/xfce4-timer-plugin/debian/patches/02_Fix-segfault-when-creating-plugin-in-4.8-panel.patch 2011-02-12 15:25:07 UTC (rev 4960)
@@ -0,0 +1,43 @@
+From 03ff202f818fe3f075a6c864ab688b57b1bb1cb4 Mon Sep 17 00:00:00 2001
+From: Nick Schermer <nick at xfce.org>
+Date: Thu, 27 Jan 2011 22:18:45 +0100
+Subject: Fix segfault when creating plugin in 4.8 panel.
+
+Used invalid function type to construct the plugin.
+---
+ src/xfcetimer.c | 5 ++---
+ 1 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/src/xfcetimer.c b/src/xfcetimer.c
+index c27d37a..de7bd2b 100644
+--- a/src/xfcetimer.c
++++ b/src/xfcetimer.c
+@@ -42,7 +42,7 @@
+
+ #include "xfcetimer.h"
+
+-static gboolean create_plugin_control (XfcePanelPlugin *plugin);
++static void create_plugin_control (XfcePanelPlugin *plugin);
+ XFCE_PANEL_PLUGIN_REGISTER_EXTERNAL(create_plugin_control);
+
+ void make_menu(plugin_data *pd);
+@@ -1366,7 +1366,7 @@ static void plugin_create_options (XfcePanelPlugin *plugin,plugin_data *pd) {
+ *
+ * Returns %TRUE on success, %FALSE on failure.
+ **/
+-static gboolean
++static void
+ create_plugin_control (XfcePanelPlugin *plugin)
+ {
+
+@@ -1461,7 +1461,6 @@ create_plugin_control (XfcePanelPlugin *plugin)
+ xfce_panel_plugin_menu_show_configure (plugin);
+ g_signal_connect (plugin, "configure-plugin",
+ G_CALLBACK (plugin_create_options), pd);
+- return(TRUE);
+ }
+
+
+--
+1.7.2.3
+
Modified: goodies/branches/experimental/xfce4-timer-plugin/debian/patches/series
===================================================================
--- goodies/trunk/xfce4-timer-plugin/debian/patches/series 2011-02-11 08:00:28 UTC (rev 4959)
+++ goodies/branches/experimental/xfce4-timer-plugin/debian/patches/series 2011-02-12 15:25:07 UTC (rev 4960)
@@ -1 +1,2 @@
01_improve-timer-stop.patch
+02_Fix-segfault-when-creating-plugin-in-4.8-panel.patch
Modified: goodies/branches/experimental/xfce4-timer-plugin/debian/rules
===================================================================
--- goodies/trunk/xfce4-timer-plugin/debian/rules 2011-02-11 08:00:28 UTC (rev 4959)
+++ goodies/branches/experimental/xfce4-timer-plugin/debian/rules 2011-02-12 15:25:07 UTC (rev 4960)
@@ -1,5 +1,12 @@
#!/usr/bin/make -f
-LDFLAGS += -Wl,-z,defs -Wl,--as-needed
+include /usr/share/hardening-includes/hardening.make
+LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
+CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
+LDFLAGS+=$(HARDENING_LDFLAGS) -Wl,-z,defs -Wl,--as-needed -Wl,-O1
+CFLAGS+=$(HARDENING_CFLAGS)
+
+export CFLAGS LDFLAGS
+
%:
dh $@
More information about the Pkg-xfce-commits
mailing list