Hello community, here is the log from the commit of package xfce4-mixer for openSUSE:Factory checked in at 2012-10-03 10:17:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xfce4-mixer (Old) and /work/SRC/openSUSE:Factory/.xfce4-mixer.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xfce4-mixer", Maintainer is "xfce-maintainers@suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/xfce4-mixer/xfce4-mixer.changes 2012-04-19 10:41:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xfce4-mixer.new/xfce4-mixer.changes 2012-10-03 10:17:29.000000000 +0200 @@ -1,0 +2,36 @@ +Thu Sep 27 16:14:52 UTC 2012 - gber@opensuse.org + +- added xfce4-mixer-do-not-use-glib-2.30-symbols.patch in order to + not use symbols that are only available in glib > 2.30.0 + (backported from upstream git) +- added compatibility symlink for the panel plugin to ease the + migration + +------------------------------------------------------------------- +Thu Sep 27 15:00:44 UTC 2012 - gber@opensuse.org + +- update to version 4.9.0 + - use standard icons where possible + - support xfce4-panel 4.10 with its deskbar mode + - handle unconfigured state more gracefully + - mute a track when the volume is set to 0% and unmute when set + to a higher value + - add global keyboard shortcuts for raising and lowering the + volume as well as muting + - store settings in xfconf and keep them in sync + - populate the mixer with whitelisted controls in the absence of + an existing configuration + - add a popup with a scale for setting the volume to the panel + plugin which is opened on left click, allow running the + user-defined command previously bound to left click from the + panel plugin context menu instead + - make xfce4-mixer a singleton application + - add runtime debugging mode to both the mixer and the panel + plugin + - add man page for xfce4-mixer + - handle identically named tracks and tracks which are read-only + or have no mute or record functionality +- added xfce4-mixer-fix-typo to correct a typo causing build + failures with glib < 2.32.0 (backported from upstream git) + +------------------------------------------------------------------- Old: ---- xfce4-mixer-4.8.0.tar.bz2 New: ---- xfce4-mixer-4.9.0.tar.bz2 xfce4-mixer-do-not-use-glib-2.30-symbols.patch xfce4-mixer-fix-typo.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xfce4-mixer.spec ++++++ --- /var/tmp/diff_new_pack.pobtmF/_old 2012-10-03 10:17:31.000000000 +0200 +++ /var/tmp/diff_new_pack.pobtmF/_new 2012-10-03 10:17:31.000000000 +0200 @@ -16,10 +16,10 @@ # -%define panel_version 4.7.0 +%define panel_version 4.10.0 Name: xfce4-mixer -Version: 4.8.0 +Version: 4.9.0 Release: 0 Summary: Volume Control Application for the Xfce Desktop Environment License: GPL-2.0+ @@ -27,17 +27,23 @@ Url: http://www.xfce.org/ Source: http://archive.xfce.org/src/apps/xfce4-mixer/4.8/xfce4-mixer-%{version}.tar.bz2 Source100: %{name}-rpmlintrc +# PATCH-FIX-UPSTREAM xfce4-mixer-fix-typo.patch gber@opensuse.org -- Fix a small typo causing build failures with glib < 2.32.0 (backported from upstream git) +Patch0: xfce4-mixer-fix-typo.patch +# PATCH-FIX-UPSTREAM xfce4-mixer-do-not-use-glib-2.30-symbols.patch gber@opensuse.org -- Do not use symbols that are only available in glib > 2.30.0 (backported from upstream git) +Patch1: xfce4-mixer-do-not-use-glib-2.30-symbols.patch BuildRequires: intltool BuildRequires: update-desktop-files BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gstreamer-plugins-base-0.10) BuildRequires: pkgconfig(gthread-2.0) BuildRequires: pkgconfig(gtk+-2.0) +BuildRequires: pkgconfig(keybinder) BuildRequires: pkgconfig(libnotify) BuildRequires: pkgconfig(libxfce4panel-1.0) BuildRequires: pkgconfig(libxfce4ui-1) BuildRequires: pkgconfig(libxfce4util-1.0) BuildRequires: pkgconfig(libxfconf-0) +BuildRequires: pkgconfig(unique-1.0) BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: gstreamer-0_10-plugins-base Recommends: %{name}-lang = %{version} @@ -60,6 +66,8 @@ %prep %setup -q +%patch0 -p1 +%patch1 -p1 %build %configure --disable-static @@ -68,8 +76,14 @@ %install %make_install +# ease the migration due to the name change +ln -s %{_datadir}/xfce4/panel/plugins/mixer.desktop \ + %{buildroot}%{_datadir}/xfce4/panel/plugins/xfce4-mixer-plugin.desktop + rm -rf %{buildroot}%{_datadir}/locale/{ast,kk,tl_PH,ur_PK} +rm -f %{buildroot}%{_libdir}/xfce4/panel/plugins/libmixer.la + %find_lang %{name} %{?no_lang_C} %suse_update_desktop_file -i xfce4-mixer Settings DesktopSettings @@ -85,17 +99,19 @@ %files %defattr(-,root,root) -%doc AUTHORS COPYING ChangeLog NEWS README TODO +%doc AUTHORS COPYING ChangeLog NEWS README %{_bindir}/xfce4-mixer %{_datadir}/applications/*.desktop %dir %{_datadir}/xfce4-mixer %{_datadir}/xfce4-mixer/icons %{_datadir}/pixmaps/xfce4-mixer/ +%{_mandir}/man1/xfce4-mixer.1* %files -n xfce4-panel-plugin-mixer %defattr(-,root,root) -%{_libexecdir}/xfce4/panel-plugins/xfce4-mixer-plugin -%{_datadir}/xfce4/panel-plugins/xfce4-mixer-plugin.desktop +%{_libdir}/xfce4/panel/plugins/libmixer.so +%{_datadir}/xfce4/panel/plugins/mixer.desktop +%{_datadir}/xfce4/panel/plugins/xfce4-mixer-plugin.desktop %files lang -f %{name}.lang ++++++ xfce4-mixer-4.8.0.tar.bz2 -> xfce4-mixer-4.9.0.tar.bz2 ++++++ ++++ 38523 lines of diff (skipped) ++++++ xfce4-mixer-do-not-use-glib-2.30-symbols.patch ++++++
From 91598f7c345e4e66d5dcead7615e29b92affc584 Mon Sep 17 00:00:00 2001 From: Guido Berhoerster
Date: Thu, 27 Sep 2012 16:25:55 +0000 Subject: Do not use G_VALUE_INIT which is only available in glib >= 2.30
--- diff --git a/panel-plugin/xfce-volume-button.c b/panel-plugin/xfce-volume-button.c index 4a25fb3..223701b 100644 --- a/panel-plugin/xfce-volume-button.c +++ b/panel-plugin/xfce-volume-button.c @@ -983,7 +983,7 @@ void xfce_volume_button_set_no_mute (XfceVolumeButton *button, gboolean no_mute) { - GValue value = G_VALUE_INIT; + GValue value = { 0 }; g_return_if_fail (IS_XFCE_VOLUME_BUTTON (button)); @@ -997,7 +997,7 @@ xfce_volume_button_set_no_mute (XfceVolumeButton *button, gboolean xfce_volume_button_get_no_mute (XfceVolumeButton *button) { - GValue value = G_VALUE_INIT; + GValue value = { 0 }; g_return_val_if_fail (IS_XFCE_VOLUME_BUTTON (button), FALSE); @@ -1013,7 +1013,7 @@ void xfce_volume_button_set_muted (XfceVolumeButton *button, gboolean is_muted) { - GValue value = G_VALUE_INIT; + GValue value = { 0 }; g_return_if_fail (IS_XFCE_VOLUME_BUTTON (button)); @@ -1027,7 +1027,7 @@ xfce_volume_button_set_muted (XfceVolumeButton *button, gboolean xfce_volume_button_get_muted (XfceVolumeButton *button) { - GValue value = G_VALUE_INIT; + GValue value = { 0 }; g_return_val_if_fail (IS_XFCE_VOLUME_BUTTON (button), FALSE); @@ -1073,7 +1073,7 @@ void xfce_volume_button_set_track_label (XfceVolumeButton *button, const gchar *track_label) { - GValue value = G_VALUE_INIT; + GValue value = { 0 }; g_return_if_fail (IS_XFCE_VOLUME_BUTTON (button)); @@ -1087,7 +1087,7 @@ xfce_volume_button_set_track_label (XfceVolumeButton *button, gchar* xfce_volume_button_get_track_label (XfceVolumeButton *button) { - GValue value = G_VALUE_INIT; + GValue value = { 0 }; g_return_val_if_fail (IS_XFCE_VOLUME_BUTTON (button), NULL); @@ -1103,7 +1103,7 @@ void xfce_volume_button_set_is_configured (XfceVolumeButton *button, gboolean is_configured) { - GValue value = G_VALUE_INIT; + GValue value = { 0 }; g_return_if_fail (IS_XFCE_VOLUME_BUTTON (button)); @@ -1117,7 +1117,7 @@ xfce_volume_button_set_is_configured (XfceVolumeButton *button, gboolean xfce_volume_button_get_is_configured (XfceVolumeButton *button) { - GValue value = G_VALUE_INIT; + GValue value = { 0 }; g_return_val_if_fail (IS_XFCE_VOLUME_BUTTON (button), FALSE); @@ -1133,7 +1133,7 @@ void xfce_volume_button_set_screen_position (XfceVolumeButton *button, XfceScreenPosition screen_position) { - GValue value = G_VALUE_INIT; + GValue value = { 0 }; g_return_if_fail (IS_XFCE_VOLUME_BUTTON (button)); @@ -1147,7 +1147,7 @@ xfce_volume_button_set_screen_position (XfceVolumeButton *button, XfceScreenPosition xfce_volume_button_get_screen_position (XfceVolumeButton *button) { - GValue value = G_VALUE_INIT; + GValue value = { 0 }; g_return_val_if_fail (IS_XFCE_VOLUME_BUTTON (button), FALSE); -- cgit v0.9.0.3 ++++++ xfce4-mixer-fix-typo.patch ++++++
From 5c0458cb0fda7ea5258d6f253ff8d662230d5e59 Mon Sep 17 00:00:00 2001 From: Guido Berhoerster
Date: Thu, 27 Sep 2012 15:41:30 +0000 Subject: Fix a typo
--- diff --git a/libxfce4mixer/xfce-mixer-debug.c b/libxfce4mixer/xfce-mixer-debug.c index d45b92d..54449b3 100644 --- a/libxfce4mixer/xfce-mixer-debug.c +++ b/libxfce4mixer/xfce-mixer-debug.c @@ -82,10 +82,7 @@ xfce_mixer_debug_init (const gchar *log_domain, } #else if (!debug_mode) - { - g_log_set_handler (log_domain, G_LOG_LEVEL_DEBUG, xfce4_mixer_dummy_log_handler, NULL); - g_log_set_handler (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, xfce4_mixer_dummy_log_handler, NULL); - } + g_log_set_handler (log_domain, G_LOG_LEVEL_DEBUG, xfce_mixer_dummy_log_handler, NULL); #endif /* GLIB_CHECK_VERSION (2,32,0) */ } -- cgit v0.9.0.3 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org