diff --git a/enable-shift-modifier-in-shortcut-dialog.patch b/enable-shift-modifier-in-shortcut-dialog.patch deleted file mode 100644 index a05646d..0000000 --- a/enable-shift-modifier-in-shortcut-dialog.patch +++ /dev/null @@ -1,28 +0,0 @@ -commit 7324dea66d754ff863fea3362c90acc9689670c6 -Author: Harald Judt -Date: Fri May 4 22:15:16 2012 +0200 - - Enable as modifier key in shortcut dialog. - - This restores the functionality of as a modifier key. - Using and as a single key is still possible. - - It seems gtk_accelerator_name is not designed to distinguish between - upper-/lowercase, so we just store the key in the accelerator - name. This might not be the recommended way to store accelerators - as specified by the GTK docs, but at least it fixes the regression - and seems to not cause any troubles. - -diff --git a/libxfce4kbd-private/xfce-shortcut-dialog.c b/libxfce4kbd-private/xfce-shortcut-dialog.c -index 5f1b058..b1ce159 100644 ---- a/libxfce4kbd-private/xfce-shortcut-dialog.c -+++ b/libxfce4kbd-private/xfce-shortcut-dialog.c -@@ -327,6 +327,8 @@ xfce_shortcut_dialog_key_pressed (XfceShortcutDialog *dialog, - &keyval, NULL, NULL, &consumed); - - /* Get the modifiers */ -+ if ((modifiers & GDK_SHIFT_MASK) && (consumed & GDK_SHIFT_MASK)) -+ consumed &= ~GDK_SHIFT_MASK; - modifiers &= ~consumed; - modifiers &= mod_mask; - diff --git a/enable-shift-modifier-in-shortcut-grabber.patch b/enable-shift-modifier-in-shortcut-grabber.patch deleted file mode 100644 index 1a97bcc..0000000 --- a/enable-shift-modifier-in-shortcut-grabber.patch +++ /dev/null @@ -1,43 +0,0 @@ -commit fe4aff6a20024d9480199e19c13614dd118be725 -Author: Harald Judt -Date: Fri May 4 22:24:12 2012 +0200 - - Enable as modifier key in shortcuts grabber. - - This restores the functionality of as a modifier key. - Using and as a single key is still possible. - - It seems gtk_accelerator_name is not designed to distinguish between - upper-/lowercase, so we just store the key in the accelerator - name. This might not be the recommended way to store accelerators - as specified by the GTK docs, but at least it fixes the regression - and seems to not cause any troubles. - - Additionally, we need to gtk_accelerator_parse the value returned by - gtk_accelerator_name, because the key values of both functions are - not consistent. - -diff --git a/libxfce4kbd-private/xfce-shortcuts-grabber.c b/libxfce4kbd-private/xfce-shortcuts-grabber.c -index 9faec07..01b85c3 100644 ---- a/libxfce4kbd-private/xfce-shortcuts-grabber.c -+++ b/libxfce4kbd-private/xfce-shortcuts-grabber.c -@@ -512,8 +512,10 @@ xfce_shortcuts_grabber_event_filter (GdkXEvent *gdk_xevent, - &keyval, NULL, NULL, &consumed); - - /* Get the modifiers */ -- modifiers &= ~consumed; -+ if ((modifiers & GDK_SHIFT_MASK) && (consumed & GDK_SHIFT_MASK)) -+ consumed &= ~GDK_SHIFT_MASK; - gdk_keymap_add_virtual_modifiers (keymap, &modifiers); -+ modifiers &= ~consumed; - modifiers &= mod_mask; - - context.keyval = keyval; -@@ -521,6 +523,7 @@ xfce_shortcuts_grabber_event_filter (GdkXEvent *gdk_xevent, - - raw_shortcut_name = gtk_accelerator_name (keyval, modifiers); - TRACE ("Looking for %s", raw_shortcut_name); -+ gtk_accelerator_parse (raw_shortcut_name, &context.keyval, &context.modifiers); - g_free (raw_shortcut_name); - - g_hash_table_foreach (grabber->priv->keys, (GHFunc) find_event_key, &context); diff --git a/enable-shortcut.patch b/enable-shortcut.patch deleted file mode 100644 index 5ff92be..0000000 --- a/enable-shortcut.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- libxfce4kbd-private/xfce-shortcuts-grabber.c.orig 2012-04-28 14:46:52.000000000 -0500 -+++ libxfce4kbd-private/xfce-shortcuts-grabber.c 2014-05-13 11:15:33.195020180 -0500 -@@ -313,7 +313,7 @@ - TRACE ("Ungrabbing %s", shortcut_name); - - TRACE ("Keyval: %d", key->keyval); -- TRACE ("Modifiers: 0x%x", key->modifiers); -+ TRACE ("Modifiers: 0x%x", modifiers); - - g_free (shortcut_name); - diff --git a/libxfce4ui-4.10.0-avoid-double-fork.patch b/libxfce4ui-4.10.0-avoid-double-fork.patch deleted file mode 100644 index e14614e..0000000 --- a/libxfce4ui-4.10.0-avoid-double-fork.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- libxfce4ui-4.11.0/libxfce4ui/xfce-spawn.c.0000 2013-09-23 18:25:56.000000000 +0100 -+++ libxfce4ui-4.11.0/libxfce4ui/xfce-spawn.c 2013-10-14 17:45:14.915030567 +0100 -@@ -389,17 +389,13 @@ - startup_id = sn_launcher_context_get_startup_id (sn_launcher); - if (G_LIKELY (startup_id != NULL)) - cenvp[n_cenvp++] = g_strconcat ("DESKTOP_STARTUP_ID=", startup_id, NULL); -- -- /* we want to watch the child process */ -- flags |= G_SPAWN_DO_NOT_REAP_CHILD; - } - } - } - #endif - -- /* watch the child when the user supplied a closure too */ -- if (child_watch_closure != NULL) -- flags |= G_SPAWN_DO_NOT_REAP_CHILD; -+ /* We always want to not reap the child to prevent double forking */ -+ flags |= G_SPAWN_DO_NOT_REAP_CHILD; - - /* test if the working directory exists */ - if (working_directory == NULL || *working_directory == '\0') -@@ -423,8 +419,6 @@ - - if (G_LIKELY (succeed)) - { -- if ((flags & G_SPAWN_DO_NOT_REAP_CHILD) != 0) -- { - /* setup data to watch the child */ - spawn_data = g_slice_new0 (XfceSpawnData); - spawn_data->pid = pid; -@@ -453,7 +447,6 @@ - xfce_spawn_startup_timeout_destroy); - } - #endif -- } - } - else - { diff --git a/libxfce4ui-4.10.0-keyboard-shortcuts.patch b/libxfce4ui-4.10.0-keyboard-shortcuts.patch deleted file mode 100644 index 7acfbb6..0000000 --- a/libxfce4ui-4.10.0-keyboard-shortcuts.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- libxfce4ui-4.10.0.orig/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml 2012-04-28 21:46:52.000000000 +0200 -+++ libxfce4ui-4.10.0/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml 2012-10-13 15:53:57.749846107 +0200 -@@ -11,11 +11,28 @@ - - - -+ - - - -+ -+ -+ -+ - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - - diff --git a/libxfce4ui-4.12.0-keyboard-shortcuts.patch b/libxfce4ui-4.12.0-keyboard-shortcuts.patch deleted file mode 100644 index dc0c3cc..0000000 --- a/libxfce4ui-4.12.0-keyboard-shortcuts.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- libxfce4kbd-private/xfce4-keyboard-shortcuts-orig.xml 2015-03-01 21:27:22.817590600 -0600 -+++ libxfce4kbd-private/xfce4-keyboard-shortcuts.xml 2015-03-01 21:29:40.291807055 -0600 -@@ -11,12 +11,29 @@ - - - -+ - - - - -+ -+ -+ -+ - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - - diff --git a/libxfce4ui.spec b/libxfce4ui.spec index 4ca6d2a..74b3f14 100644 --- a/libxfce4ui.spec +++ b/libxfce4ui.spec @@ -4,7 +4,7 @@ Name: libxfce4ui Version: 4.12.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Commonly used Xfce widgets Group: System Environment/Libraries @@ -18,7 +18,7 @@ Source0: http://archive.xfce.org/src/xfce/%{name}/%{xfceversion}/%{name}- ## Downstream patches # add more keyboard shortcuts to make multimedia keyboards work out of the box # Terminal changed to xfce4-terminal in the patch -Patch10: libxfce4ui-4.12.0-keyboard-shortcuts.patch +Patch10: libxfce4ui-4.12.1-keyboard-shortcuts.patch BuildRequires: pkgconfig(gobject-2.0) >= 2.24.0 BuildRequires: pkgconfig(gtk+-2.0) >= 2.20.0 @@ -34,9 +34,12 @@ BuildRequires: glade3-libgladeui-devel >= 3.5.0 %endif BuildRequires: gettext BuildRequires: intltool -# FIXME: obsolete libxfcegui4 one day -#Provides: libxfcegui4 = %{version} -#Obsoletes: libxfcegui4 < %{version} + +# +# libxfcegui4 was depreciated in the Xfce 4.8 days. +# Finally obsolete it now in 4.12 +# +Obsoletes: libxfcegui4 < 4.10.0-9 %description Libxfce4ui is used to share commonly used Xfce widgets among the Xfce @@ -62,9 +65,7 @@ Requires: libxfce4util-devel Requires: glade3-libgladeui-devel %endif Requires: pkgconfig -# FIXME: obsolete libxfcegui4 one day -#Provides: libxfcegui4-devel = %{version} -#Obsoletes: libxfcegui4-devel < %{version} +Obsoletes: libxfcegui4-devel < 4.10.0-9 %description devel The %{name}-devel package contains libraries and header files for @@ -73,7 +74,7 @@ developing applications that use %{name}. %prep %setup -q -%patch10 +%patch10 -p1 %build %configure --enable-gtk-doc --enable-gtk3\ @@ -146,6 +147,11 @@ rm -rf %{buildroot} %endif %changelog +* Wed Apr 22 2015 Kevin Fenzi 4.12.1-2 +- Obsolete libxfcegui4. +- Drop amixer for volume buttons should be handled by xfce4-pulseaudio-plugin now. +- Fixes bug #1211313 + * Sun Mar 15 2015 Kevin Fenzi 4.12.1-1 - Update to 4.12.1 with various bugfixes.