commit xfce4-power-manager for openSUSE:Factory
![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
Hello community, here is the log from the commit of package xfce4-power-manager for openSUSE:Factory checked in at 2014-09-08 21:28:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xfce4-power-manager (Old) and /work/SRC/openSUSE:Factory/.xfce4-power-manager.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xfce4-power-manager" Changes: -------- --- /work/SRC/openSUSE:Factory/xfce4-power-manager/xfce4-power-manager.changes 2014-08-27 16:53:30.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xfce4-power-manager.new/xfce4-power-manager.changes 2014-09-08 21:30:06.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Sep 8 07:08:19 UTC 2014 - gber@opensuse.org + +- add xfce4-power-manager-lxpanel-0.7-support.patch which adds + support for lxpanel >= 0.7 (bxo#11108) + +------------------------------------------------------------------- New: ---- xfce4-power-manager-lxpanel-0.7-support.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xfce4-power-manager.spec ++++++ --- /var/tmp/diff_new_pack.tlmpJk/_old 2014-09-08 21:30:08.000000000 +0200 +++ /var/tmp/diff_new_pack.tlmpJk/_new 2014-09-08 21:30:08.000000000 +0200 @@ -27,10 +27,13 @@ Url: http://goodies.xfce.org/projects/applications/xfce4-power-manager Source0: %{name}-%{version}.tar.bz2 Source1: xfce4-power-manager.xml +# PATCH-FIX-UPSTREAM xfce4-power-manager-lxpanel-0.7-support.patch bxo#11108 gber@opensuse.org -- Add support for lxpanel >= 0.7 +Patch0: xfce4-power-manager-lxpanel-0.7-support.patch BuildRequires: fdupes BuildRequires: intltool BuildRequires: libxslt-tools BuildRequires: update-desktop-files +BuildRequires: xfce4-dev-tools BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(glib-2.0) @@ -43,9 +46,7 @@ BuildRequires: pkgconfig(libxfce4ui-1) BuildRequires: pkgconfig(libxfce4util-1.0) BuildRequires: pkgconfig(libxfconf-0) -%if 0 BuildRequires: pkgconfig(lxpanel) -%endif BuildRequires: pkgconfig(polkit-gobject-1) >= 0.100 BuildRequires: pkgconfig(upower-glib) BuildRequires: pkgconfig(x11) @@ -84,7 +85,6 @@ This package provides a plugin for the Xfce panel for monitoring battery and device charge levels and to regulate display brightness. -%if 0 %package -n lxpanel-plugin-power-manager Summary: LXPanel Plugin for Monitoring Batteries and Changing the Display Brightness Group: System/GUI/LXDE @@ -96,7 +96,6 @@ %description -n lxpanel-plugin-power-manager This package provides a plugin for the LXDE panel for monitoring battery and device charge levels and to regulate display brightness. -%endif %package branding-upstream Summary: Upstream Branding of xfce4-power-manager @@ -115,6 +114,7 @@ %prep %setup -q +%patch0 -p1 # xfce4-pm-helper is only needed on non-systemd systems xsltproc --nonet - ./src/org.xfce.power.policy.in2 <<'EOF' \ @@ -137,6 +137,7 @@ EOF %build +xdt-autogen %configure make %{?_smp_mflags} V=1 @@ -150,9 +151,7 @@ %suse_update_desktop_file xfce4-power-manager rm %{buildroot}%{_libdir}/xfce4/panel/plugins/libxfce4powermanager.la -%if 0 rm %{buildroot}%{_libdir}/lxpanel/plugins/lxde_power_manager.la -%endif # xfce4-pm-helper is only needed on non-systemd systems rm %{buildroot}%{_sbindir}/xfce4-pm-helper @@ -192,11 +191,9 @@ %{_libdir}/xfce4/panel/plugins/libxfce4powermanager.so %{_datadir}/xfce4/panel-plugins/power-manager-plugin.desktop -%if 0 %files -n lxpanel-plugin-power-manager %defattr(-,root,root) %{_libdir}/lxpanel/plugins/lxde_power_manager.so -%endif %files branding-upstream %defattr(-,root,root) ++++++ xfce4-power-manager-lxpanel-0.7-support.patch ++++++
From 06e525f797cc8104c77a59d5d9c62e27d7de9efc Mon Sep 17 00:00:00 2001 From: Eric Koegel
Date: Sun, 7 Sep 2014 17:46:59 +0300 Subject: [PATCH] Add support for lxpanel 0.7+ (Bug 11108)
The LXPanel plugin API was completely changed in version 0.7.0
without any module versioning or backwards compatibility. This
patch make the plugin work with the new version while retaining
the ability to still build for the old version (based on checking
the package version at compile time).
---
configure.ac | 10 ++-
panel-plugins/power-manager-plugin/Makefile.am | 17 ++--
.../power-manager-plugin/lxde-0.7/Makefile.am | 56 +++++++++++++
.../lxde-0.7/lxde-power-manager-plugin.c | 93 ++++++++++++++++++++++
.../lxde/lxde-power-manager-plugin.c | 2 +-
.../power-manager-plugin/power-manager-button.c | 13 ++-
.../power-manager-plugin/power-manager-button.h | 2 +-
po/POTFILES.in | 1 +
8 files changed, 177 insertions(+), 17 deletions(-)
create mode 100644 panel-plugins/power-manager-plugin/lxde-0.7/Makefile.am
create mode 100644 panel-plugins/power-manager-plugin/lxde-0.7/lxde-power-manager-plugin.c
Index: xfce4-power-manager-1.3.2/configure.ac
===================================================================
--- xfce4-power-manager-1.3.2.orig/configure.ac
+++ xfce4-power-manager-1.3.2/configure.ac
@@ -72,6 +72,7 @@ m4_define([xfconf_minimum_version], [4.1
m4_define([libxfce4ui_minimum_version],[4.10.0])
m4_define([libxfce4util_minimum_version],[4.10.0])
m4_define([libxfce4panel_minimum_version],[4.10.0])
+m4_define([lxdepanel_new_minimum_version],[0.7.0])
m4_define([lxdepanel_minimum_version],[0.5.6])
m4_define([libnotify_minimum_version], [0.4.1])
@@ -158,12 +159,16 @@ fi
XDT_CHECK_OPTIONAL_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [libxfce4panel_minimum_version],
[xfce4panel], [To build plugin support for Xfce's panel])
+XDT_CHECK_OPTIONAL_PACKAGE([LXDEPANEL_NEW], [lxpanel], [lxdepanel_new_minimum_version],
+[lxdepanel],[To build plugin support for LXDE's panel])
+
XDT_CHECK_OPTIONAL_PACKAGE([LXDEPANEL], [lxpanel], [lxdepanel_minimum_version],
[lxdepanel],[To build plugin support for LXDE's panel])
AM_CONDITIONAL([BUILD_PANEL_PLUGINS], [test "x$build_panel_plugins" = "xyes"])
-AM_CONDITIONAL([BUILD_XFCE_PLUGINS], [test "x$LIBXFCE4PANEL_FOUND" = "xyes" && test "x$build_panel_plugins" = "xyes"])
-AM_CONDITIONAL([BUILD_LXDE_PLUGINS], [test "x$LXDEPANEL_FOUND" = "xyes" && test "x$build_panel_plugins" = "xyes"])
+AM_CONDITIONAL([BUILD_XFCE_PLUGIN], [test "x$LIBXFCE4PANEL_FOUND" = "xyes" && test "x$build_panel_plugins" = "xyes"])
+AM_CONDITIONAL([BUILD_LXDE_NEW_PLUGIN], [test "x$LXDEPANEL_NEW_FOUND" = "xyes" && test "x$build_panel_plugins" = "xyes"])
+AM_CONDITIONAL([BUILD_LXDE_OLD_PLUGIN], [test "x$LXDEPANEL_NEW_FOUND" != "xyes" && test "x$LXDEPANEL_FOUND" = "xyes" && test "x$build_panel_plugins" = "xyes"])
#=======================================================#
@@ -219,6 +224,7 @@ src/Makefile
settings/Makefile
panel-plugins/Makefile
panel-plugins/power-manager-plugin/Makefile
+panel-plugins/power-manager-plugin/lxde-0.7/Makefile
panel-plugins/power-manager-plugin/lxde/Makefile
panel-plugins/power-manager-plugin/xfce/Makefile
data/Makefile
Index: xfce4-power-manager-1.3.2/panel-plugins/power-manager-plugin/Makefile.am
===================================================================
--- xfce4-power-manager-1.3.2.orig/panel-plugins/power-manager-plugin/Makefile.am
+++ xfce4-power-manager-1.3.2/panel-plugins/power-manager-plugin/Makefile.am
@@ -1,12 +1,17 @@
-if BUILD_XFCE_PLUGINS
+if BUILD_XFCE_PLUGIN
xfce_dir = xfce
endif
-if BUILD_LXDE_PLUGINS
-lxde_dir = lxde
+if BUILD_LXDE_OLD_PLUGIN
+lxde_old_dir = lxde
endif
-SUBDIRS = \
- $(xfce_dir) \
- $(lxde_dir)
+if BUILD_LXDE_NEW_PLUGIN
+lxde_new_dir = lxde-0.7
+endif
+
+SUBDIRS = \
+ $(xfce_dir) \
+ $(lxde_old_dir) \
+ $(lxde_new_dir)
Index: xfce4-power-manager-1.3.2/panel-plugins/power-manager-plugin/lxde-0.7/Makefile.am
===================================================================
--- /dev/null
+++ xfce4-power-manager-1.3.2/panel-plugins/power-manager-plugin/lxde-0.7/Makefile.am
@@ -0,0 +1,56 @@
+AM_CPPFLAGS = \
+ -I$(top_srcdir) \
+ -DG_LOG_DOMAIN=\"lxde-power-manager-plugin\" \
+ -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
+ $(PLATFORM_CPPFLAGS)
+
+
+#
+# lxde power manager plugin
+#
+
+plugin_LTLIBRARIES = \
+ lxde_power_manager.la
+
+plugindir = \
+ $(libdir)/lxpanel/plugins
+
+lxde_power_manager_la_SOURCES = \
+ lxde-power-manager-plugin.c \
+ ../power-manager-button.c \
+ ../power-manager-button.h \
+ ../scalemenuitem.c \
+ ../scalemenuitem.h
+
+lxde_power_manager_la_CFLAGS = \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/src \
+ -DLOCALEDIR=\"$(localedir)\" \
+ -DLXDE_PLUGIN \
+ $(LXDEPANEL_CFLAGS) \
+ $(LIBXFCE4UTIL_CFLAGS) \
+ $(LIBXFCE4UI_CFLAGS) \
+ $(XFCONF_CFLAGS) \
+ $(GTK_CFLAGS) \
+ $(GLIB_CFLAGS) \
+ $(PLATFORM_CPPFLAGS) \
+ $(PLATFORM_CFLAGS) \
+ $(DBUS_GLIB_CFLAGS) \
+ $(UPOWER_CFLAGS)
+
+lxde_power_manager_la_LDFLAGS = \
+ -avoid-version \
+ -module \
+ -no-undefined \
+ $(PLATFORM_LDFLAGS)
+
+lxde_power_manager_la_LIBADD = \
+ $(top_builddir)/common/libxfpmcommon.la \
+ $(LXDEPANEL_LIBS) \
+ $(LIBXFCE4UI_LIBS) \
+ $(LIBXFCE4UTIL_LIBS) \
+ $(XFCONF_LIBS) \
+ $(GTK_LIBS) \
+ $(GLIB_LIBS) \
+ $(DBUS_GLIB_LIBS) \
+ $(UPOWER_LIBS)
Index: xfce4-power-manager-1.3.2/panel-plugins/power-manager-plugin/lxde-0.7/lxde-power-manager-plugin.c
===================================================================
--- /dev/null
+++ xfce4-power-manager-1.3.2/panel-plugins/power-manager-plugin/lxde-0.7/lxde-power-manager-plugin.c
@@ -0,0 +1,93 @@
+/*
+ * * Copyright (C) 2014 Eric Koegel
participants (1)
-
root@hilbert.suse.de