[Pkg-xfce-commits] r6381 - in goodies/trunk/xfce4-power-manager/debian: . patches
Lionel Le Folgoc
mrpouit-guest at alioth.debian.org
Mon Feb 6 07:59:42 UTC 2012
Author: mrpouit-guest
Date: 2012-02-06 19:59:42 +0000 (Mon, 06 Feb 2012)
New Revision: 6381
Added:
goodies/trunk/xfce4-power-manager/debian/patches/03_trap-x-errors.patch
goodies/trunk/xfce4-power-manager/debian/patches/04_clear-idles-for-removed-batteries.patch
goodies/trunk/xfce4-power-manager/debian/patches/05_fix-brightness-key-modifiers.patch
Modified:
goodies/trunk/xfce4-power-manager/debian/changelog
goodies/trunk/xfce4-power-manager/debian/compat
goodies/trunk/xfce4-power-manager/debian/control
goodies/trunk/xfce4-power-manager/debian/patches/series
goodies/trunk/xfce4-power-manager/debian/rules
Log:
* debian/patches:
- 03_trap-x-errors.patch: added, fix crash when all outputs don't support
the backlight property. Closes: #658916
- 04_clear-idles-for-removed-batteries.patch: added, fix crash when xfpm
tries to refresh the status icon of a removed battery.
- 05_fix-brightness-key-modifiers.patch: added, let the brightness keys
work even when numlock is on.
* debian/rules:
- use debhelper 9 hardening support.
* debian/compat bumped to 9.
* debian/control:
- drop hardening-includes build-dep.
- update debhelper build-dep to 9 for hardening support.
- add dpkg-dev 1.16.1 build-dep for hardening support.
Modified: goodies/trunk/xfce4-power-manager/debian/changelog
===================================================================
--- goodies/trunk/xfce4-power-manager/debian/changelog 2012-02-05 20:14:28 UTC (rev 6380)
+++ goodies/trunk/xfce4-power-manager/debian/changelog 2012-02-06 19:59:42 UTC (rev 6381)
@@ -1,3 +1,22 @@
+xfce4-power-manager (1.0.10-5) UNRELEASED; urgency=low
+
+ * debian/patches:
+ - 03_trap-x-errors.patch: added, fix crash when all outputs don't support
+ the backlight property. Closes: #658916
+ - 04_clear-idles-for-removed-batteries.patch: added, fix crash when xfpm
+ tries to refresh the status icon of a removed battery.
+ - 05_fix-brightness-key-modifiers.patch: added, let the brightness keys
+ work even when numlock is on.
+ * debian/rules:
+ - use debhelper 9 hardening support.
+ * debian/compat bumped to 9.
+ * debian/control:
+ - drop hardening-includes build-dep.
+ - update debhelper build-dep to 9 for hardening support.
+ - add dpkg-dev 1.16.1 build-dep for hardening support.
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com> Mon, 06 Feb 2012 20:43:46 +0100
+
xfce4-power-manager (1.0.10-4) unstable; urgency=low
* debian/patches:
Modified: goodies/trunk/xfce4-power-manager/debian/compat
===================================================================
--- goodies/trunk/xfce4-power-manager/debian/compat 2012-02-05 20:14:28 UTC (rev 6380)
+++ goodies/trunk/xfce4-power-manager/debian/compat 2012-02-06 19:59:42 UTC (rev 6381)
@@ -1 +1 @@
-7
+9
Modified: goodies/trunk/xfce4-power-manager/debian/control
===================================================================
--- goodies/trunk/xfce4-power-manager/debian/control 2012-02-05 20:14:28 UTC (rev 6380)
+++ goodies/trunk/xfce4-power-manager/debian/control 2012-02-06 19:59:42 UTC (rev 6381)
@@ -3,10 +3,10 @@
Priority: optional
Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
Uploaders: Yves-Alexis Perez <corsac at debian.org>, Lionel Le Folgoc <mrpouit at gmail.com>
-Build-Depends: debhelper (>= 7.0.50), intltool, pkg-config, libgtk2.0-dev,
+Build-Depends: debhelper (>= 9), intltool, pkg-config, libgtk2.0-dev,
libdbus-1-dev, libdbus-glib-1-dev, libxfconf-0-dev (>= 4.8.0),
libxfce4ui-1-dev (>= 4.7.0), libnotify-dev, xfce4-panel-dev (>= 4.8.0),
- libpolkit-gobject-1-dev, libxext-dev, libx11-dev, hardening-includes
+ libpolkit-gobject-1-dev, libxext-dev, libx11-dev, dpkg-dev (>= 1.16.1)
Standards-Version: 3.9.2
Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-power-manager/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfce4-power-manager/
Added: goodies/trunk/xfce4-power-manager/debian/patches/03_trap-x-errors.patch
===================================================================
--- goodies/trunk/xfce4-power-manager/debian/patches/03_trap-x-errors.patch (rev 0)
+++ goodies/trunk/xfce4-power-manager/debian/patches/03_trap-x-errors.patch 2012-02-06 19:59:42 UTC (rev 6381)
@@ -0,0 +1,25 @@
+Subject: Trap X errors when initializing brightness management
+Origin: other, https://bugzilla.xfce.org/attachment.cgi?id=3911
+Bug: https://bugzilla.xfce.org/show_bug.cgi?id=7999
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/xfce4-power-manager/+bug/821170
+---
+ common/xfpm-brightness.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+--- a/common/xfpm-brightness.c
++++ b/common/xfpm-brightness.c
+@@ -65,10 +65,13 @@
+ {
+ XRRPropertyInfo *info;
+ gboolean ret = TRUE;
++ gint rc;
+
++ gdk_error_trap_push ();
+ info = XRRQueryOutputProperty (GDK_DISPLAY (), output, brightness->priv->backlight);
++ rc = gdk_error_trap_pop ();
+
+- if (info == NULL)
++ if (info == NULL || rc != Success)
+ {
+ g_warning ("could not get output property");
+ return FALSE;
Added: goodies/trunk/xfce4-power-manager/debian/patches/04_clear-idles-for-removed-batteries.patch
===================================================================
--- goodies/trunk/xfce4-power-manager/debian/patches/04_clear-idles-for-removed-batteries.patch (rev 0)
+++ goodies/trunk/xfce4-power-manager/debian/patches/04_clear-idles-for-removed-batteries.patch 2012-02-06 19:59:42 UTC (rev 6381)
@@ -0,0 +1,18 @@
+Description: prevent xfpm_battery_notify_idle() being called on a battery that has been removed
+Origin: other, https://bugzilla.xfce.org/attachment.cgi?id=3912
+Bug: https://bugzilla.xfce.org/show_bug.cgi?id=7851
+---
+ src/xfpm-battery.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/src/xfpm-battery.c
++++ b/src/xfpm-battery.c
+@@ -763,6 +763,8 @@
+
+ battery = XFPM_BATTERY (object);
+
++ g_idle_remove_by_data (battery);
++
+ g_free (battery->priv->icon_prefix);
+
+ dbus_g_proxy_disconnect_signal (battery->priv->proxy, "Changed",
Added: goodies/trunk/xfce4-power-manager/debian/patches/05_fix-brightness-key-modifiers.patch
===================================================================
--- goodies/trunk/xfce4-power-manager/debian/patches/05_fix-brightness-key-modifiers.patch (rev 0)
+++ goodies/trunk/xfce4-power-manager/debian/patches/05_fix-brightness-key-modifiers.patch 2012-02-06 19:59:42 UTC (rev 6381)
@@ -0,0 +1,17 @@
+Description: grab the key with any modifier set
+Origin: other, https://bugzilla.xfce.org/attachment.cgi?id=3762
+Bug: https://bugzilla.xfce.org/show_bug.cgi?id=6549
+
+diff --git a/src/xfpm-button.c b/src/xfpm-button.c
+index d2a92e0..70c07a1 100644
+--- a/src/xfpm-button.c
++++ b/src/xfpm-button.c
+@@ -125,7 +125,7 @@ xfpm_button_grab_keystring (XfpmButton *button, guint keycode)
+ {
+ Display *display;
+ guint ret;
+- guint modmask = 0;
++ guint modmask = AnyModifier;
+
+ display = GDK_DISPLAY ();
+
Modified: goodies/trunk/xfce4-power-manager/debian/patches/series
===================================================================
--- goodies/trunk/xfce4-power-manager/debian/patches/series 2012-02-05 20:14:28 UTC (rev 6380)
+++ goodies/trunk/xfce4-power-manager/debian/patches/series 2012-02-06 19:59:42 UTC (rev 6381)
@@ -1,2 +1,5 @@
0001-Solaris-specific-code-for-determining-the-start-time.patch
02_fix-notify-detect.patch
+03_trap-x-errors.patch
+04_clear-idles-for-removed-batteries.patch
+05_fix-brightness-key-modifiers.patch
Modified: goodies/trunk/xfce4-power-manager/debian/rules
===================================================================
--- goodies/trunk/xfce4-power-manager/debian/rules 2012-02-05 20:14:28 UTC (rev 6380)
+++ goodies/trunk/xfce4-power-manager/debian/rules 2012-02-06 19:59:42 UTC (rev 6381)
@@ -1,14 +1,8 @@
#!/usr/bin/make -f
-include /usr/share/hardening-includes/hardening.make
+export DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs -Wl,--as-needed -Wl,-O1
+export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,+bindnow
-CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
-LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
-LDFLAGS+=$(HARDENING_LDFLAGS) -Wl,-z,defs -Wl,--as-needed -Wl,-O1
-CFLAGS+=$(HARDENING_CFLAGS)
-
-export CFLAGS LDFLAGS
-
override_dh_install:
dh_install --fail-missing
More information about the Pkg-xfce-commits
mailing list