Hello community,
here is the log from the commit of package xfce4-power-manager for
openSUSE:13.1 checked in at 2013-10-18 13:28:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:13.1/xfce4-power-manager (Old)
and /work/SRC/openSUSE:13.1/.xfce4-power-manager.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xfce4-power-manager"
Changes:
--------
--- /work/SRC/openSUSE:13.1/xfce4-power-manager/xfce4-power-manager.changes
2013-09-23 11:15:31.000000000 +0200
+++
/work/SRC/openSUSE:13.1/.xfce4-power-manager.new/xfce4-power-manager.changes
2013-10-19 16:50:57.000000000 +0200
@@ -1,0 +2,6 @@
+Fri Oct 18 08:35:16 UTC 2013 - g...@opensuse.org
+
+- add xfce4-power-manager-fix-battery-icon-typo.patch in order to
+ fix a typo in battery icon name (bxo#8188, bnc#846485)
+
+-------------------------------------------------------------------
New:
----
xfce4-power-manager-fix-battery-icon-typo.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xfce4-power-manager.spec ++++++
--- /var/tmp/diff_new_pack.9OQtU7/_old 2013-10-19 16:50:58.000000000 +0200
+++ /var/tmp/diff_new_pack.9OQtU7/_new 2013-10-19 16:50:58.000000000 +0200
@@ -40,6 +40,8 @@
Patch5: xfce4-power-manager-systemd-shutdown-reboot-support.patch
# PATCH-FIX-UPSTREAM
xfce4-power-manager-systemd-suspend-hibernate-suport.patch bxo#9963 -- Add
systemd suspend/hibernate support
Patch6: xfce4-power-manager-systemd-suspend-hibernate-suport.patch
+# PATCH-FIX-UPSTREAM xfce4-power-manager-fix-battery-icon-typo.patch bxo#8188
bnc#846485 g...@opensuse.org -- Fix typo in battery icon name
+Patch7: xfce4-power-manager-fix-battery-icon-typo.patch
BuildRequires: ed
BuildRequires: fdupes
BuildRequires: intltool
@@ -108,6 +110,7 @@
%patch4 -p1
%patch5 -p1
%patch6 -p1
+%patch7 -p1
# show in LXDE as well
ed -s src/xfce4-power-manager.desktop.in 2>/dev/null <<'EOF'
,s/^OnlyShowIn=XFCE;/OnlyShowIn=XFCE;LXDE;/
++++++ xfce4-power-manager-fix-battery-icon-typo.patch ++++++
Index: xfce4-power-manager-1.2.0/src/xfpm-battery.c
===================================================================
--- xfce4-power-manager-1.2.0.orig/src/xfpm-battery.c
+++ xfce4-power-manager-1.2.0/src/xfpm-battery.c
@@ -320,16 +320,16 @@ xfpm_battery_refresh_icon (XfpmBattery *
{
if ( !battery->priv->present || battery->priv->state ==
XFPM_DEVICE_STATE_EMPTY )
{
- g_snprintf (icon_name, 128, "%s-000", battery->priv->icon_prefix);
+ g_snprintf (icon_name, 128, "%s000", battery->priv->icon_prefix);
}
else if ( battery->priv->state == XFPM_DEVICE_STATE_FULLY_CHARGED )
{
- g_snprintf (icon_name, 128, "%s-100", battery->priv->icon_prefix);
+ g_snprintf (icon_name, 128, "%s100", battery->priv->icon_prefix);
}
else if ( battery->priv->state == XFPM_DEVICE_STATE_DISCHARGING )
{
- g_snprintf (icon_name, 128, "%s-%s",
- battery->priv->icon_prefix,
+ g_snprintf (icon_name, 128, "%s%s",
+ battery->priv->icon_prefix,
xfpm_battery_get_icon_index (battery->priv->type,
battery->priv->percentage));
}
}
++++++ xfce4-power-manager-fix-brightness-type.patch ++++++
--- /var/tmp/diff_new_pack.9OQtU7/_old 2013-10-19 16:50:58.000000000 +0200
+++ /var/tmp/diff_new_pack.9OQtU7/_new 2013-10-19 16:50:58.000000000 +0200
@@ -5,10 +5,10 @@
The "Backlight" RandR property is a 32-bit integer. This means that the int32
(gint32) type should be used to represent brightness levels. The attached patch
does nothing else than changing the brightness level representation from glong
to gint32. This fixes the screen auto-dimming issue and brightness panel plugin
issue.
---
-diff --git a/common/xfpm-brightness.c b/common/xfpm-brightness.c
-index aa1ef33..f1524cb 100644
---- a/common/xfpm-brightness.c
-+++ b/common/xfpm-brightness.c
+Index: xfce4-power-manager-1.2.0/common/xfpm-brightness.c
+===================================================================
+--- xfce4-power-manager-1.2.0.orig/common/xfpm-brightness.c
++++ xfce4-power-manager-1.2.0/common/xfpm-brightness.c
@@ -92,11 +92,11 @@ out:
}
@@ -23,7 +23,7 @@
Atom actual_type;
int actual_format;
gboolean ret = FALSE;
-@@ -124,7 +124,7 @@ xfpm_brightness_xrandr_get_level (XfpmBrightness
*brightness, RROutput output, l
+@@ -124,7 +124,7 @@ xfpm_brightness_xrandr_get_level (XfpmBr
}
static gboolean
@@ -32,7 +32,7 @@
{
gboolean ret = TRUE;
-@@ -137,7 +137,7 @@ xfpm_brightness_xrandr_set_level (XfpmBrightness
*brightness, RROutput output, l
+@@ -137,7 +137,7 @@ xfpm_brightness_xrandr_set_level (XfpmBr
if ( gdk_error_trap_pop () )
{
@@ -41,7 +41,7 @@
ret = FALSE;
}
-@@ -225,11 +225,11 @@ xfpm_brightness_setup_xrandr (XfpmBrightness *brightness)
+@@ -225,11 +225,11 @@ xfpm_brightness_setup_xrandr (XfpmBright
}
static gboolean
@@ -56,7 +56,7 @@
ret = xfpm_brightness_xrandr_get_level (brightness,
brightness->priv->output, &hw_level);
-@@ -250,14 +250,14 @@ xfpm_brightness_xrand_up (XfpmBrightness *brightness,
glong *new_level)
+@@ -250,14 +250,14 @@ xfpm_brightness_xrand_up (XfpmBrightness
if ( !ret )
{
@@ -73,7 +73,7 @@
return FALSE;
}
-@@ -265,11 +265,11 @@ xfpm_brightness_xrand_up (XfpmBrightness *brightness,
glong *new_level)
+@@ -265,11 +265,11 @@ xfpm_brightness_xrand_up (XfpmBrightness
}
static gboolean
@@ -88,7 +88,7 @@
ret = xfpm_brightness_xrandr_get_level (brightness,
brightness->priv->output, &hw_level);
-@@ -290,14 +290,14 @@ xfpm_brightness_xrand_down (XfpmBrightness *brightness,
long *new_level)
+@@ -290,14 +290,14 @@ xfpm_brightness_xrand_down (XfpmBrightne
if ( !ret )
{
@@ -105,7 +105,7 @@
return FALSE;
}
-@@ -361,7 +361,7 @@ xfpm_brightness_setup_helper (XfpmBrightness *brightness)
+@@ -361,7 +361,7 @@ xfpm_brightness_setup_helper (XfpmBright
}
static gboolean
@@ -129,7 +129,7 @@
ret = xfpm_brightness_helper_get_level (brightness, &hw_level);
-@@ -446,11 +446,11 @@ xfpm_brightness_helper_up (XfpmBrightness *brightness,
glong *new_level)
+@@ -446,11 +446,11 @@ xfpm_brightness_helper_up (XfpmBrightnes
}
static gboolean
@@ -144,7 +144,7 @@
ret = xfpm_brightness_helper_get_level (brightness, &hw_level);
-@@ -572,7 +572,7 @@ xfpm_brightness_setup (XfpmBrightness *brightness)
+@@ -572,7 +572,7 @@ xfpm_brightness_setup (XfpmBrightness *b
return FALSE;
}
@@ -153,7 +153,7 @@
{
gboolean ret = FALSE;
-@@ -589,7 +589,7 @@ gboolean xfpm_brightness_up (XfpmBrightness *brightness,
glong *new_level)
+@@ -589,7 +589,7 @@ gboolean xfpm_brightness_up (XfpmBrightn
return ret;
}
@@ -162,7 +162,7 @@
{
gboolean ret = FALSE;
-@@ -618,7 +618,7 @@ gint xfpm_brightness_get_max_level (XfpmBrightness
*brightness)
+@@ -618,7 +618,7 @@ gint xfpm_brightness_get_max_level (Xfpm
return brightness->priv->max_level;
}
@@ -171,7 +171,7 @@
{
gboolean ret = FALSE;
-@@ -632,7 +632,7 @@ gboolean xfpm_brightness_get_level (XfpmBrightness
*brightness, glong *level)
+@@ -632,7 +632,7 @@ gboolean xfpm_brightness_get_level (Xfpm
return ret;
}
@@ -180,11 +180,11 @@
{
gboolean ret = FALSE;
-diff --git a/common/xfpm-brightness.h b/common/xfpm-brightness.h
-index 0c4e3ed..26b3dbe 100644
---- a/common/xfpm-brightness.h
-+++ b/common/xfpm-brightness.h
-@@ -51,20 +51,20 @@ XfpmBrightness *xfpm_brightness_new
(void);
+Index: xfce4-power-manager-1.2.0/common/xfpm-brightness.h
+===================================================================
+--- xfce4-power-manager-1.2.0.orig/common/xfpm-brightness.h
++++ xfce4-power-manager-1.2.0/common/xfpm-brightness.h
+@@ -51,20 +51,20 @@ XfpmBrightness *xfpm_brigh
gboolean xfpm_brightness_setup (XfpmBrightness
*brightness);
gboolean xfpm_brightness_up (XfpmBrightness
*brightness,
@@ -209,10 +209,10 @@
gboolean xfpm_brightness_dim_down (XfpmBrightness
*brightness);
-diff --git a/panel-plugins/brightness/brightness-button.c
b/panel-plugins/brightness/brightness-button.c
-index 6e60c29..bd466c9 100644
---- a/panel-plugins/brightness/brightness-button.c
-+++ b/panel-plugins/brightness/brightness-button.c
+Index: xfce4-power-manager-1.2.0/panel-plugins/brightness/brightness-button.c
+===================================================================
+--- xfce4-power-manager-1.2.0.orig/panel-plugins/brightness/brightness-button.c
++++ xfce4-power-manager-1.2.0/panel-plugins/brightness/brightness-button.c
@@ -186,7 +186,7 @@ static gboolean
brightness_button_popup_win (GtkWidget *widget, GdkEvent *ev, guint32 ev_time)
{
@@ -222,7 +222,7 @@
GdkDisplay *display;
GdkScreen *screen;
BrightnessButton *button;
-@@ -342,7 +342,7 @@ plus_clicked (GtkWidget *widget, BrightnessButton *button)
+@@ -342,7 +342,7 @@ plus_clicked (GtkWidget *widget, Brightn
static void
range_value_changed (GtkWidget *widget, BrightnessButton *button)
{
@@ -231,7 +231,7 @@
range_level = (gint) gtk_range_get_value (GTK_RANGE
(button->priv->range));
-@@ -428,8 +428,8 @@ brightness_button_create_popup (BrightnessButton *button)
+@@ -428,8 +428,8 @@ brightness_button_create_popup (Brightne
static void
brightness_button_up (BrightnessButton *button)
{
@@ -242,7 +242,7 @@
xfpm_brightness_get_level (button->priv->brightness, &level);
max_level = xfpm_brightness_get_max_level (button->priv->brightness);
-@@ -443,7 +443,7 @@ brightness_button_up (BrightnessButton *button)
+@@ -443,7 +443,7 @@ brightness_button_up (BrightnessButton *
static void
brightness_button_down (BrightnessButton *button)
{
@@ -251,11 +251,11 @@
xfpm_brightness_get_level (button->priv->brightness, &level);
if ( level != 0 )
-diff --git a/src/xfpm-backlight.c b/src/xfpm-backlight.c
-index baeeb43..45c990f 100644
---- a/src/xfpm-backlight.c
-+++ b/src/xfpm-backlight.c
-@@ -63,8 +63,8 @@ struct XfpmBacklightPrivate
+Index: xfce4-power-manager-1.2.0/src/xfpm-backlight.c
+===================================================================
+--- xfce4-power-manager-1.2.0.orig/src/xfpm-backlight.c
++++ xfce4-power-manager-1.2.0/src/xfpm-backlight.c
+@@ -72,8 +72,8 @@ struct XfpmBacklightPrivate
gboolean has_hw;
gboolean on_battery;
@@ -266,7 +266,7 @@
gboolean dimmed;
gboolean block;
-@@ -79,7 +79,7 @@ xfpm_backlight_dim_brightness (XfpmBacklight *backlight)
+@@ -88,7 +88,7 @@ xfpm_backlight_dim_brightness (XfpmBackl
if (xfpm_power_get_mode (backlight->priv->power) ==
XFPM_POWER_MODE_NORMAL )
{
@@ -275,7 +275,7 @@
g_object_get (G_OBJECT (backlight->priv->conf),
backlight->priv->on_battery ? BRIGHTNESS_LEVEL_ON_BATTERY
: BRIGHTNESS_LEVEL_ON_AC, &dim_level,
-@@ -101,7 +101,7 @@ xfpm_backlight_dim_brightness (XfpmBacklight *backlight)
+@@ -110,7 +110,7 @@ xfpm_backlight_dim_brightness (XfpmBackl
**/
if (backlight->priv->last_level > dim_level)
{
@@ -284,7 +284,7 @@
backlight->priv->dimmed = xfpm_brightness_set_level
(backlight->priv->brightness, dim_level);
}
}
-@@ -182,7 +182,7 @@ xfpm_backlight_reset_cb (EggIdletime *idle, XfpmBacklight
*backlight)
+@@ -274,7 +274,7 @@ xfpm_backlight_reset_cb (EggIdletime *id
{
if ( !backlight->priv->block)
{
@@ -293,7 +293,7 @@
xfpm_brightness_set_level (backlight->priv->brightness,
backlight->priv->last_level);
}
backlight->priv->dimmed = FALSE;
-@@ -192,7 +192,7 @@ xfpm_backlight_reset_cb (EggIdletime *idle, XfpmBacklight
*backlight)
+@@ -284,7 +284,7 @@ xfpm_backlight_reset_cb (EggIdletime *id
static void
xfpm_backlight_button_pressed_cb (XfpmButton *button, XfpmButtonKey type,
XfpmBacklight *backlight)
{
@@ -302,5 +302,3 @@
gboolean ret = TRUE;
gboolean enable_brightness, show_popup;
---
-cgit v0.9.2
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
