rpms/gnome-settings-daemon/F-9 gnome-settings-daemon-legacy-sound.patch, NONE, 1.1 gnome-settings-daemon.spec, 1.29, 1.30

[Colin Walters (walters)]

Author: walters

Update of /cvs/pkgs/rpms/gnome-settings-daemon/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6908

Modified Files:
	gnome-settings-daemon.spec 
Added Files:
	gnome-settings-daemon-legacy-sound.patch 
Log Message:
* Tue Jun 17 2008 Colin Walters <walters at redhat.com> - 2.22.2.1-2
- Add (now upstreamed) patch to legacy ESD preference; see
  http://bugzilla.gnome.org/show_bug.cgi?id=533198
  https://bugzilla.redhat.com/show_bug.cgi?id=430624


gnome-settings-daemon-legacy-sound.patch:

--- NEW FILE gnome-settings-daemon-legacy-sound.patch ---
Index: plugins/sound/gsd-sound-manager.c
===================================================================
--- plugins/sound/gsd-sound-manager.c	(revision 340)
+++ plugins/sound/gsd-sound-manager.c	(working copy)
@@ -296,7 +296,18 @@
 
         client = gconf_client_get_default ();
 
+	/* The "preference" here was just around because ESD introduced tradeoffs and was generally
+           poor software.  Pulseaudio is better and notably releases the sound device when not in
+           use, so should have no impact for legacy applications.  The reason we don't actually want
+           to even read from the preference is because someone may have set it to false intending
+           to disable ESD, but they will then disable Pulseaudio later.  
+           https://bugzilla.redhat.com/show_bug.cgi?id=430624
+        */
+#ifdef ENABLE_LEGACY_SOUND_PREF
         enable_sound = gconf_client_get_bool (client, "/desktop/gnome/sound/enable_esd", NULL);
+#else
+	enable_sound = TRUE;
+#endif
         event_sounds = gconf_client_get_bool (client, "/desktop/gnome/sound/event_sounds", NULL);
         /* FIXME this is completely bogus, the entry doesn't exist */
         event_changed_new = gconf_client_get_int  (client, "/desktop/gnome/sound/event_changed", NULL);
Index: configure.ac
===================================================================
--- configure.ac	(revision 340)
+++ configure.ac	(working copy)
@@ -317,6 +317,23 @@
 
 
 # ---------------------------------------------------------------------------
+# Enable Legacy Sound Preference
+# ---------------------------------------------------------------------------
+PKG_CHECK_MODULES(PULSEAUDIO, libpulse, have_pulseaudio=yes, AC_MSG_RESULT([no]))
+if test x$have_pulseaudio = xyes; then
+	default_enable_legacy_sound_pref=no
+else
+	default_enable_legacy_sound_pref=yes
+fi
+AC_ARG_ENABLE(legacy-sound-pref,
+	[AC_HELP_STRING([--enable-legacy-sound-pref],
+	[check for preference to start ESD])],
+	,enable_legacy_sound_pref=$default_enable_legacy_sound_pref)
+if test "x$enable_legacy_sound_pref" = "xyes"; then
+    AC_DEFINE(ENABLE_LEGACY_SOUND_PREF,1,[enable preference for ESD startup])
+fi
+
+# ---------------------------------------------------------------------------
 # Enable Profiling
 # ---------------------------------------------------------------------------
 AC_ARG_ENABLE(profiling,


Index: gnome-settings-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/F-9/gnome-settings-daemon.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- gnome-settings-daemon.spec	29 May 2008 01:50:27 -0000	1.29
+++ gnome-settings-daemon.spec	17 Jun 2008 19:05:42 -0000	1.30
@@ -1,6 +1,6 @@
 Name:		gnome-settings-daemon
 Version:	2.22.2.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:		System Environment/Daemons
@@ -23,6 +23,7 @@
 BuildRequires:	libgnome-devel
 BuildRequires:	xorg-x11-proto-devel
 BuildRequires:	gstreamer-devel
+BuildRequires:  pulseaudio-libs-devel
 BuildRequires:	gstreamer-plugins-base-devel
 BuildRequires:	libgnomekbd-devel
 BuildRequires:	gettext
@@ -37,6 +38,7 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=530356
 # https://bugzilla.redhat.com/show_bug.cgi?id=346201
 Patch5:         gsd-handle-different-keysyms.patch
+Patch6:         gnome-settings-daemon-legacy-sound.patch
 
 %description
 A daemon to share settings from GNOME to other applications. It also
@@ -63,6 +65,7 @@
 popd
 %patch4 -p1 -b .hide-white-screen
 %patch5 -p0 -b .multi-keysyms
+%patch6 -p0 -b .legacy-sound
 
 %build
 %configure --enable-static=no --enable-profiling
@@ -144,6 +147,11 @@
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Tue Jun 17 2008 Colin Walters <walters at redhat.com> - 2.22.2.1-2
+- Add (now upstreamed) patch to legacy ESD preference; see
+  http://bugzilla.gnome.org/show_bug.cgi?id=533198
+  https://bugzilla.redhat.com/show_bug.cgi?id=430624
+
 * Wed May 28 2008 Matthias Clasen <mclasen at redhat.com> - 2.22.2.1-1
 - Update to 2.22.2.1