Hello community, here is the log from the commit of package xfce4-power-manager for openSUSE:Factory checked in at 2011-10-25 17:20:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xfce4-power-manager (Old) and /work/SRC/openSUSE:Factory/.xfce4-power-manager.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xfce4-power-manager", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/xfce4-power-manager/xfce4-power-manager.changes 2011-10-21 16:47:01.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xfce4-power-manager.new/xfce4-power-manager.changes 2011-10-28 15:29:33.000000000 +0200 @@ -1,0 +2,18 @@ +Mon Oct 24 07:16:03 UTC 2011 - [email protected] + +- added xfce4-power-manager-workaround-xrandr-error.patch which + handles X errors when setting brightness via XRANDR gracefully + rather than crashing (bnc#718980) +- added xfce4-power-manager-fix-battery-removal.patch in order to + prevent crashes due to xfpm_battery_notify_idle() being called on + a battery that has been removed (bnc#707127) + +------------------------------------------------------------------- +Thu Oct 20 21:09:49 UTC 2011 - [email protected] + +- added xfce4-power-manager-use-docdir.patch in order to use docdir + correctly +- install HTML documentation + into /usr/share/xfce4/xfce4-power-manager/html + +------------------------------------------------------------------- New: ---- xfce4-power-manager-1.0.10-use-docdir.patch xfce4-power-manager-fix-battery-removal.patch xfce4-power-manager-workaround-xrandr-error.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xfce4-power-manager.spec ++++++ --- /var/tmp/diff_new_pack.mEl6D8/_old 2011-10-28 15:29:46.000000000 +0200 +++ /var/tmp/diff_new_pack.mEl6D8/_new 2011-10-28 15:29:46.000000000 +0200 @@ -36,6 +36,12 @@ Patch3: xfce4-power-manager-1.0.10-fix-broken-icon.patch # PATCH-FIX-UPSTREAM xfce4-power-manager-1.0.10-fix-saving-brightness-levels.patch bxo#7791 [email protected] -- Fix the type of saved brightness levels so they can be correctly loaded again Patch4: xfce4-power-manager-1.0.10-fix-saving-brightness-levels.patch +# PATCH-FIX-UPSTREAM xfce4-power-manager-use-docdir.patch [email protected] -- Use docdir correctly +Patch5: xfce4-power-manager-1.0.10-use-docdir.patch +# PATCH-FIX-UPSTREAM xfce4-power-manager-workaround-xrandr-error.patch bnc#718980 bxo#7999 [email protected] -- Handles X errors when setting brightness via XRANDR gracefully rather than crashing +Patch6: xfce4-power-manager-workaround-xrandr-error.patch +# PATCH-FIX-UPSTREAM xfce4-power-manager-fix-battery-removal.patch bnc#707127 bxo#7851 [email protected] -- Prevents crashes due to xfpm_battery_notify_idle() being called on a battery that has been removed +Patch7: xfce4-power-manager-fix-battery-removal.patch BuildRequires: fdupes BuildRequires: intltool BuildRequires: pkgconfig(dbus-glib-1) @@ -47,6 +53,9 @@ BuildRequires: pkgconfig(libxfce4util-1.0) BuildRequires: update-desktop-files BuildRequires: xfconf +BuildRequires: xfce4-dev-tools +BuildRequires: libxslt +BuildRequires: docbook-xsl-stylesheets Suggests: xfce4-panel-plugin-brightness BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -78,9 +87,15 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 %build -%configure --disable-hal +xdt-autogen +%configure \ + --docdir=%{_datadir}/xfce4/xfce4-power-manager \ + --disable-hal make %{?_smp_mflags} V=1 %install @@ -122,7 +137,9 @@ %{_datadir}/icons/hicolor/*/*/xfpm-*.png %{_datadir}/icons/hicolor/scalable/actions/*.svg %{_datadir}/icons/hicolor/scalable/status/*.svg -%doc %{_datadir}/xfce4/doc +%dir %{_datadir}/xfce4 +%dir %{_datadir}/xfce4/xfce4-power-manager +%doc %{_datadir}/xfce4/xfce4-power-manager/html/ %files -n xfce4-panel-plugin-brightness %defattr(-,root,root) ++++++ xfce4-power-manager-1.0.10-use-docdir.patch ++++++ Index: xfce4-power-manager-1.0.10/doc/C/Makefile.am =================================================================== --- xfce4-power-manager-1.0.10.orig/doc/C/Makefile.am +++ xfce4-power-manager-1.0.10/doc/C/Makefile.am @@ -4,12 +4,12 @@ SUBDIRS = \ noinst_DATA = \ xfce4-power-manager.xml -docdir=$(datadir)/xfce4/doc/C +cdocdir=$(docdir)/html/C -doc_DATA= \ +cdoc_DATA= \ xfce4-power-manager.html -EXTRA_DIST = $(noinst_DATA) $(doc_DATA) +EXTRA_DIST = $(noinst_DATA) $(cdoc_DATA) if MAINTAINER_MODE if HAVE_XSLTPROC Index: xfce4-power-manager-1.0.10/doc/C/images/Makefile.am =================================================================== --- xfce4-power-manager-1.0.10.orig/doc/C/images/Makefile.am +++ xfce4-power-manager-1.0.10/doc/C/images/Makefile.am @@ -1,10 +1,10 @@ -imagesdir = $(datadir)/xfce4/doc/C/images +cimagesdir = $(docdir)/html/C/images -images_DATA = xfpm-general-settings.png \ +cimages_DATA = xfpm-general-settings.png \ xfpm-extended-settings.png \ xfpm-context-menu.png \ xfpm-brightness-plugin.png -EXTRA_DIST = $(images_DATA) +EXTRA_DIST = $(cimages_DATA) ++++++ xfce4-power-manager-fix-battery-removal.patch ++++++ --- 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", ++++++ xfce4-power-manager-workaround-xrandr-error.patch ++++++ --- 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; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
