Rebuild for new libwacom

not needed anymore, gnome-calculator.desktop got renamed.

.gitignore

@@ -34,3 +34,9 @@ gnome-settings-daemon-2.31.6.tar.bz2
 /gnome-settings-daemon-3.3.3.1.tar.xz
 /gnome-settings-daemon-3.3.4.tar.xz
 /gnome-settings-daemon-3.3.5.tar.xz
+/gnome-settings-daemon-3.3.90.1.tar.xz
+/gnome-settings-daemon-3.3.91.tar.xz
+/gnome-settings-daemon-3.3.92.tar.xz
+/gnome-settings-daemon-3.4.0.tar.xz
+/gnome-settings-daemon-3.4.1.tar.xz
+/gnome-settings-daemon-3.4.2.tar.xz

0001-Media-keys-Even-more-careful-when-shutting-down.patch

@@ -1,31 +0,0 @@
-From ae303fb2b05265888f8b65ba2236782693369da7 Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Fri, 20 Jan 2012 09:11:14 -0500
-Subject: [PATCH] Media keys: Be more careful when shutting down
-
-The gtksettings instance is also initialized in an idle, so
-we must handle it still being NULL when we shut down.
----
- plugins/media-keys/gsd-media-keys-manager.c |    6 ++++--
- 1 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c
-index e4052f3..51053ea 100644
---- a/plugins/media-keys/gsd-media-keys-manager.c
-+++ b/plugins/media-keys/gsd-media-keys-manager.c
-@@ -2147,8 +2147,10 @@ gsd_media_keys_manager_stop (GsdMediaKeysManager *manager)
-                                           manager);
-         }
- 
--        g_signal_handlers_disconnect_by_func (manager->priv->gtksettings, sound_theme_changed, manager);
--        manager->priv->gtksettings = NULL;
-+        if (manager->priv->gtksettings != NULL) {
-+                g_signal_handlers_disconnect_by_func (manager->priv->gtksettings, sound_theme_changed, manager);
-+                manager->priv->gtksettings = NULL;
-+        }
- 
-         if (manager->priv->ca) {
-                 ca_context_destroy (manager->priv->ca);
--- 
-1.7.8.4
-

0001-Updates-Don-t-call-g_object_unref-on-a-GPtrArray.patch

@@ -1,26 +0,0 @@
-From f84c73599aa7c7c6bba94471dc445dbbea521f72 Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Fri, 20 Jan 2012 00:40:41 -0500
-Subject: [PATCH] Updates: Don't call g_object_unref on a GPtrArray
-
-It doesn't work.
----
- plugins/updates/gsd-updates-firmware.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/plugins/updates/gsd-updates-firmware.c b/plugins/updates/gsd-updates-firmware.c
-index 17ca804..a04ad27 100644
---- a/plugins/updates/gsd-updates-firmware.c
-+++ b/plugins/updates/gsd-updates-firmware.c
-@@ -493,7 +493,7 @@ out:
-         if (error_code != NULL)
-                 g_object_unref (error_code);
-         if (array != NULL)
--                g_object_unref (array);
-+                g_ptr_array_unref (array);
-         if (results != NULL)
-                 g_object_unref (results);
-         return item;
--- 
-1.7.8.4
-

0001-XSettings-be-more-careful-when-shutting-down.patch

@@ -1,28 +0,0 @@
-From c16d6d46dfdeff509b888140d4fa1a04888ca355 Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Fri, 20 Jan 2012 09:06:08 -0500
-Subject: [PATCH] XSettings: be more careful when shutting down
-
-The shell name watch_id may still be 0 when we shut down right
-away, because another instance is already running.
----
- plugins/xsettings/gsd-xsettings-manager.c |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/plugins/xsettings/gsd-xsettings-manager.c b/plugins/xsettings/gsd-xsettings-manager.c
-index 075cb37..fa49a3e 100644
---- a/plugins/xsettings/gsd-xsettings-manager.c
-+++ b/plugins/xsettings/gsd-xsettings-manager.c
-@@ -929,7 +929,8 @@ gnome_xsettings_manager_stop (GnomeXSettingsManager *manager)
- 
-         stop_fontconfig_monitor (manager);
- 
--        g_bus_unwatch_name (manager->priv->shell_name_watch_id);
-+        if (manager->priv->shell_name_watch_id > 0)
-+                g_bus_unwatch_name (manager->priv->shell_name_watch_id);
- 
-         if (p->settings != NULL) {
-                 g_hash_table_destroy (p->settings);
--- 
-1.7.8.4
-

0001-media-keys-Be-more-careful-when-finalizing.patch

@@ -1,45 +0,0 @@
-From 42f9427729d763e7fd62aec9e15b036531489682 Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Fri, 20 Jan 2012 09:00:54 -0500
-Subject: [PATCH] media-keys: Be more careful when finalizing
-
-The keys array is initalized in an idle, so if we go right back down
-because another instance of gsd is already running, we crash in
-finalize, trying to clear a nonexisting array.
----
- plugins/media-keys/gsd-media-keys-manager.c |   16 +++++++++-------
- 1 files changed, 9 insertions(+), 7 deletions(-)
-
-diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c
-index 14ff09f..61e3a56 100644
---- a/plugins/media-keys/gsd-media-keys-manager.c
-+++ b/plugins/media-keys/gsd-media-keys-manager.c
-@@ -2209,16 +2209,18 @@ gsd_media_keys_manager_stop (GsdMediaKeysManager *manager)
- 
-         gdk_error_trap_push ();
- 
--        for (i = 0; i < priv->keys->len; ++i) {
--                MediaKey *key;
-+        if (priv->keys != NULL) {
-+                for (i = 0; i < priv->keys->len; ++i) {
-+                        MediaKey *key;
- 
--                key = g_ptr_array_index (manager->priv->keys, i);
-+                        key = g_ptr_array_index (manager->priv->keys, i);
- 
--                if (key->key)
--                        grab_key_unsafe (key->key, FALSE, priv->screens);
-+                        if (key->key)
-+                                grab_key_unsafe (key->key, FALSE, priv->screens);
-+                }
-+                g_ptr_array_free (priv->keys, TRUE);
-+                priv->keys = NULL;
-         }
--        g_ptr_array_free (priv->keys, TRUE);
--        priv->keys = NULL;
- 
-         gdk_flush ();
-         gdk_error_trap_pop_ignored ();
--- 
-1.7.8.4
-

gnome-settings-daemon.spec

@@ -1,16 +1,24 @@
 Name:           gnome-settings-daemon
-Version:        3.3.5
-Release:        1%{?dist}
+Version:        3.4.2
+Release:        4%{?dist}
 Summary:        The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:          System Environment/Daemons
 License:        GPLv2+
 URL:            http://download.gnome.org/sources/%{name}
 #VCS: git:git://git.gnome.org/gnome-settings-daemon
-Source:         http://download.gnome.org/sources/%{name}/3.3/%{name}-%{version}.tar.xz
+Source:         http://download.gnome.org/sources/%{name}/3.4/%{name}-%{version}.tar.xz
 
-# Fedora specific patch
-Patch0: gsd-calculator.patch
+# http://git.gnome.org/browse/gnome-settings-daemon/commit/?id=fedb2be311b69c9dd12ada94047c82a28e73df47
+Patch1: gsd-wacom.patch
+
+# Fedora specific, don't automatically install security updates
+# as the user can still restart and make the rpmdb crazy.
+#
+# Fixing this properly involves some new functionality in systemd,
+# which won't be showing up until F18.
+Patch2: gsd-auto-update-type-is-none.patch
+Patch3: gsd-fallback-icon.patch
 
 Requires: control-center-filesystem
 
@@ -39,7 +47,12 @@ BuildRequires:  nss-devel
 BuildRequires:  colord-devel >= 0.1.12
 BuildRequires:  lcms2-devel >= 2.2
 BuildRequires:  libXi-devel libXfixes-devel
+%ifnarch s390 s390x %{?rhel:ppc ppc64}
 BuildRequires:  libwacom-devel
+BuildRequires:  xorg-x11-drv-wacom-devel
+%endif
+BuildRequires:  systemd-devel
+BuildRequires:  libXtst-devel
 
 %description
 A daemon to share settings from GNOME to other applications. It also
@@ -57,14 +70,17 @@ developing applications that use %{name}.
 
 %prep
 %setup -q
-%patch0 -p1 -b .calc
+%patch1 -p1 -b .wacom
+%patch2 -p1 -b .update-none
+%patch3 -p1 -b .fallback-icon
 
 autoreconf -i -f
 
 %build
 %configure --disable-static \
            --enable-profiling \
-           --enable-packagekit
+           --enable-packagekit \
+           --enable-systemd
 make %{?_smp_mflags}
 
 
@@ -147,10 +163,15 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_libdir}/gnome-settings-daemon-3.0/libupdates.so
 %{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.updates.gschema.xml
 
+%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.peripherals.gschema.xml
+
+%ifnarch s390 s390x %{?rhel:ppc ppc64}
 %{_libdir}/gnome-settings-daemon-3.0/wacom.gnome-settings-plugin
 %{_libdir}/gnome-settings-daemon-3.0/libgsdwacom.so
-%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.peripherals.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.peripherals.wacom.gschema.xml
+%{_libexecdir}/gsd-wacom-led-helper
+%{_datadir}/polkit-1/actions/org.gnome.settings-daemon.plugins.wacom.policy
+%endif
 
 %{_libdir}/gnome-settings-daemon-3.0/xrandr.gnome-settings-plugin
 %{_libdir}/gnome-settings-daemon-3.0/libxrandr.so
@@ -174,6 +195,8 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_libdir}/gnome-settings-daemon-3.0/libcursor.so
 %{_libdir}/gnome-settings-daemon-3.0/cursor.gnome-settings-plugin
 
+%{_libdir}/gnome-settings-daemon-3.0/libgsd.so
+
 %{_libexecdir}/gnome-settings-daemon
 %{_libexecdir}/gsd-locate-pointer
 %{_libexecdir}/gsd-printer
@@ -189,7 +212,6 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
 %{_datadir}/dbus-1/interfaces/org.gnome.SettingsDaemonUpdates.xml
 
-
 %{_datadir}/man/man1/gnome-settings-daemon.1.gz
 
 
@@ -200,6 +222,46 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_datadir}/gnome-settings-daemon-3.0/input-device-example.sh
 
 %changelog
+* Fri Nov 30 2012 Bastien Nocera <bnocera@redhat.com> 3.4.2-4
+- Rebuild for new libwacom
+
+* Thu Jun 14 2012 Matthias Clasen <mclasen@redhat.com> - 3.4.2-3
+- Drop calculator patch (#742992)
+
+* Thu Jun  7 2012 Peter Robinson <pbrobinson@fedoraproject.org> - 3.4.2-2
+- Add patch to fix charging status icon fall back
+
+* Tue May 15 2012 Richard Hughes <hughsient@gmail.com> - 3.4.2-1
+- Update to 3.4.2
+
+* Tue May 08 2012 Richard Hughes <rhughes@redhat.com> - 3.4.1-4
+- Do not install security updates automatically
+- Resolves #755335
+
+* Tue Apr 24 2012 Dan Horák <dan[at]danny.cz> - 3.4.1-3
+- add upstream patch that disables wacom support on s390(x)
+
+* Thu Apr 19 2012 Matthias Clasen <mclasen@redhat.com> - 3.4.1-2
+- Fix build on s390 (patch by Bill Nottingham)
+
+* Mon Apr 16 2012 Richard Hughes <hughsient@gmail.com> - 3.4.1-1
+- Update to 3.4.1
+
+* Mon Mar 26 2012 Richard Hughes <rhughes@redhat.com> - 3.4.0-1
+- New upstream version.
+
+* Tue Mar 20 2012 Richard Hughes <rhughes@redhat.com> 3.3.92-1
+- Update to 3.3.92
+
+* Mon Mar 05 2012 Bastien Nocera <bnocera@redhat.com> 3.3.91-1
+- Update to 3.3.91
+
+* Wed Feb 22 2012 Bastien Nocera <bnocera@redhat.com> 3.3.90.1-1
+- Update to 3.3.90.1
+
+* Thu Feb  9 2012 Matthias Clasen <mclasen@redhat.com> 3.3.5-2
+- Use systemd for session tracking
+
 * Tue Feb  7 2012 Matthias Clasen <mclasen@redhat.com> 3.3.5-1
 - Update to 3.3.5
 

gsd-auto-update-type-is-none.patch

@@ -0,0 +1,13 @@
+diff --git a/data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in.in b/data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in.in
+index c09096a..ef53b1c 100644
+--- a/data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in.in
++++ b/data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in.in
+@@ -31,7 +31,7 @@
+       <_description>Automatically download updates in the background without confirmation. Updates will be auto-downloaded when using wired network connnections, and also WiFi if 'connection-use-wifi' is enabled and mobile broadband if 'connection-use-mobile' is enabled.</_description>
+     </key>
+     <key name="auto-update-type" enum="org.gnome.settings-daemon.GsdUpdateType">
+-      <default>'security'</default>
++      <default>'none'</default>
+       <_summary>Automatically install these types of updates</_summary>
+       <_description>Automatically install these types of updates.</_description>
+     </key>

gsd-fallback-icon.patch

@@ -0,0 +1,35 @@
+From fa834c27d783c290856d9d24fbc4a29acb8e4456 Mon Sep 17 00:00:00 2001
+From: Daniel Drake <dsd@laptop.org>
+Date: Fri, 01 Jun 2012 21:45:04 +0000
+Subject: power: update fallback status icon on icon state change
+
+When the icon was being changed from one icon to another, the fallback
+icon was not being updated.
+
+This meant that unplugging or re-plugging AC power on OLPC laptops
+was not updating the icon (even though the tooltip updated just fine).
+
+Add a missing call to update the GtkStatusIcon when the internal GIcon
+changes.
+
+Fixes http://dev.laptop.org/ticket/11878
+
+https://bugzilla.gnome.org/show_bug.cgi?id=677313
+---
+diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c
+index 1d60723..abec33f 100644
+--- a/plugins/power/gsd-power-manager.c
++++ b/plugins/power/gsd-power-manager.c
+@@ -711,6 +711,10 @@ engine_recalculate_state_icon (GsdPowerManager *manager)
+ 
+         /* icon before, now different */
+         if (!g_icon_equal (manager->priv->previous_icon, icon)) {
++
++                /* set fallback icon */
++                gtk_status_icon_set_from_gicon (manager->priv->status_icon, icon);
++
+                 g_object_unref (manager->priv->previous_icon);
+                 manager->priv->previous_icon = icon;
+                 return TRUE;
+--
+cgit v0.9.0.2

gsd-wacom.patch

@@ -0,0 +1,89 @@
+commit fedb2be311b69c9dd12ada94047c82a28e73df47
+Author: Dan Horák <dan@danny.cz>
+Date:   Wed Mar 21 18:40:06 2012 +0100
+
+    disable wacom support on s390/s390x
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=672576
+
+diff --git a/configure.ac b/configure.ac
+index d6d1cb8..f73583e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -197,10 +197,16 @@ dnl ---------------------------------------------------------------------------
+ PKG_CHECK_MODULES(COLOR, [colord >= 0.1.9 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
+ 
+ dnl ---------------------------------------------------------------------------
+-dnl - wacom
++dnl - wacom (disabled for s390/s390x)
+ dnl ---------------------------------------------------------------------------
+ 
+-PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst $GUDEV_PKG gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom])
++if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then
++    have_wacom=no
++else
++    PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst $GUDEV_PKG gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom])
++    have_wacom=yes
++fi
++AM_CONDITIONAL(HAVE_WACOM, test x$have_wacom = xyes)
+ 
+ dnl ==============================================
+ dnl PackageKit section
+@@ -508,6 +514,7 @@ echo "
+         PackageKit support:       ${have_packagekit}
+         Smartcard support:        ${have_smartcard_support}
+         Cups support:             ${have_cups}
++        Wacom support:            ${have_wacom}
+ ${NSS_DATABASE:+\
+         System nssdb:             ${NSS_DATABASE}
+ }\
+diff --git a/data/Makefile.am b/data/Makefile.am
+index 19decc2..5af5170 100644
+--- a/data/Makefile.am
++++ b/data/Makefile.am
+@@ -16,7 +16,6 @@ gsettings_SCHEMAS =							\
+ 	org.gnome.settings-daemon.plugins.xsettings.gschema.xml		\
+ 	org.gnome.settings-daemon.plugins.housekeeping.gschema.xml	\
+ 	org.gnome.settings-daemon.plugins.print-notifications.gschema.xml	\
+-	org.gnome.settings-daemon.peripherals.wacom.gschema.xml		\
+ 	org.gnome.settings-daemon.plugins.xrandr.gschema.xml
+ 
+ all_schemas = $(gsettings_SCHEMAS)
+@@ -33,6 +32,12 @@ else
+ all_schemas += org.gnome.settings-daemon.plugins.orientation.gschema.xml
+ endif
+ 
++if HAVE_WACOM
++gsettings_SCHEMAS += org.gnome.settings-daemon.peripherals.wacom.gschema.xml
++else
++all_schemas += org.gnome.settings-daemon.peripherals.wacom.gschema.xml
++endif
++
+ @INTLTOOL_XML_NOMERGE_RULE@
+ 
+ @GSETTINGS_RULES@
+diff --git a/plugins/Makefile.am b/plugins/Makefile.am
+index 2b7566a..a4aa666 100644
+--- a/plugins/Makefile.am
++++ b/plugins/Makefile.am
+@@ -15,7 +15,6 @@ enabled_plugins =	\
+ 	media-keys	\
+ 	mouse		\
+ 	sound		\
+-	wacom		\
+ 	xrandr		\
+ 	xsettings	\
+ 	$(NULL)
+@@ -40,6 +39,12 @@ else
+ disabled_plugins += orientation
+ endif
+ 
++if HAVE_WACOM
++enabled_plugins += wacom
++else
++disabled_plugins += wacom
++endif
++
+ if BUILD_PRINT_NOTIFICATIONS
+ enabled_plugins += print-notifications
+ else

sources

@@ -1 +1 @@
-1e9f2fb455e2edd07d400a5b78999e64  gnome-settings-daemon-3.3.5.tar.xz
+f8c985ce46c720cff28208ccb799c6b7  gnome-settings-daemon-3.4.2.tar.xz