- Remove the mixer applet

3 files changed, 213 insertions, 24 deletions

diff --git a/gnome-applets-libgnomeui.patch b/gnome-applets-libgnomeui.patch
index ccc0f96..9adedd2 100644
--- a/gnome-applets-libgnomeui.patch
+++ b/gnome-applets-libgnomeui.patch
@@ -170,25 +170,6 @@ diff -up gnome-applets-2.25.1/mini-commander/src/Makefile.am.libgnomeui gnome-ap
  	$(GNOME_APPLETS_LIBS)
  
  mc_install_default_macros_SOURCES =	\
-diff -up gnome-applets-2.25.1/mixer/Makefile.am.libgnomeui gnome-applets-2.25.1/mixer/Makefile.am
---- gnome-applets-2.25.1/mixer/Makefile.am.libgnomeui	2008-06-11 02:30:36.000000000 -0400
-+++ gnome-applets-2.25.1/mixer/Makefile.am	2008-12-19 01:07:09.000000000 -0500
-@@ -3,6 +3,7 @@ SUBDIRS = docs
- INCLUDES = -I. -I$(srcdir) 		\
- 	$(MIXER_CFLAGS)			\
- 	$(GNOME_APPLETS_CFLAGS)		\
-+	$(GNOME_LIBS2_CFLAGS)		\
- 	$(GNOMEDESKTOP_CFLAGS)
- 
- libexec_PROGRAMS = mixer_applet2
-@@ -22,6 +23,7 @@ noinst_HEADERS = \
- mixer_applet2_LDADD = 					\
- 	$(MIXER_LIBS) 					\
- 	$(GNOME_APPLETS_LIBS)				\
-+	$(GNOME_LIBS2_LIBS)				\
- 	$(GNOMEDESKTOP_LIBS)
- 
- serverdir       = $(libdir)/bonobo/servers
 diff -up gnome-applets-2.25.1/modemlights/Makefile.am.libgnomeui gnome-applets-2.25.1/modemlights/Makefile.am
 --- gnome-applets-2.25.1/modemlights/Makefile.am.libgnomeui	2004-11-04 06:44:55.000000000 -0500
 +++ gnome-applets-2.25.1/modemlights/Makefile.am	2008-12-19 01:07:09.000000000 -0500
diff --git a/gnome-applets-remove-mixer.patch b/gnome-applets-remove-mixer.patch
new file mode 100644
index 0000000..33bd0c1
--- /dev/null
+++ b/gnome-applets-remove-mixer.patch
@@ -0,0 +1,200 @@
+Index: null_applet/null_applet.c
+===================================================================
+--- null_applet/null_applet.c	(revision 11160)
++++ null_applet/null_applet.c	(working copy)
+@@ -40,6 +40,8 @@
+ 			"OAFIID:GNOME_MailcheckApplet", "Inbox Monitor");
+ 	g_hash_table_insert (hash_table,
+ 			"OAFIID:GNOME_CDPlayerApplet", "CD Player");
++	g_hash_table_insert (hash_table,
++			     "OAFIID:GNOME_MixerApplet_Factory", "Volume Control");
+ }
+ 
+ static gboolean already_running;
+Index: null_applet/GNOME_MixerApplet.server.in
+===================================================================
+--- null_applet/GNOME_MixerApplet.server.in	(revision 11160)
++++ null_applet/GNOME_MixerApplet.server.in	(working copy)
+@@ -1,28 +1,15 @@
+ <oaf_info>
+ 
+-<oaf_server iid="OAFIID:GNOME_MixerApplet_Factory"
+-	    type="exe"
+-	    location="@LIBEXECDIR@/mixer_applet2">
+-
+-	<oaf_attribute name="repo_ids" type="stringv">
+-		<item value="IDL:Bonobo/GenericFactory:1.0"/>
+-		<item value="IDL:Bonobo/Unknown:1.0"/>
+-	</oaf_attribute>
+-	<oaf_attribute name="name" type="string" value="Volume Control Applet Factory"/>
+-	<oaf_attribute name="description" type="string" value="Factory for volume control applet"/>
+-
+-</oaf_server>
+-
+ <oaf_server iid="OAFIID:GNOME_MixerApplet"
+ 	    type="factory" 
+-	    location="OAFIID:GNOME_MixerApplet_Factory">
++	    location="OAFIID:GNOME_NullApplet_Factory">
+ 
+ 	<oaf_attribute name="repo_ids" type="stringv">
+ 		<item value="IDL:GNOME/Vertigo/PanelAppletShell:1.0"/>
+ 		<item value="IDL:Bonobo/Control:1.0"/>
+ 		<item value="IDL:Bonobo/Unknown:1.0"/>
+ 	</oaf_attribute>
+-	<oaf_attribute name="name" type="string" _value="Volume Control"/>
++	<oaf_attribute name="name" type="string" _value="Volume Control (Deprecated)"/>
+ 	<oaf_attribute name="description" type="string" _value="Adjust the sound volume"/>
+ 	<oaf_attribute name="panel:icon" type="string" value="multimedia-volume-control"/>
+ 	<oaf_attribute name="bugzilla:bugzilla" type="string" value="GNOME"/>
+
+Property changes on: null_applet/GNOME_MixerApplet.server.in
+___________________________________________________________________
+Added: svn:mergeinfo
+
+Index: Makefile.am
+===================================================================
+--- Makefile.am	(revision 11160)
++++ Makefile.am	(working copy)
+@@ -11,12 +11,6 @@
+ libgweather_SUBDIRS = $(libgweather_applets)
+ endif
+ 
+-mixer_applets = \
+-	mixer
+-if APPLET_MIXER
+-mixer_SUBDIRS = $(mixer_applets)
+-endif
+-
+ modemlights_applets = \
+ 	modemlights
+ if APPLET_MODEMLIGHTS
+@@ -56,7 +50,6 @@
+ SUBDIRS = \
+ 	po			\
+ 	$(always_built_SUBDIRS)	\
+-	$(mixer_SUBDIRS)	\
+ 	$(modemlights_SUBDIRS)	\
+ 	$(gtop_SUBDIRS)		\
+ 	$(libgweather_SUBDIRS)	\
+@@ -69,7 +62,6 @@
+ 
+ DIST_SUBDIRS = \
+ 	po		\
+-	mixer		\
+ 	modemlights	\
+ 	drivemount	\
+ 	charpick	\
+--- configure.in.old	2008-12-19 14:49:53.000000000 +0000
++++ configure.in	2008-12-19 14:50:13.000000000 +0000
+@@ -471,69 +471,6 @@ enable_stickynotes="yes"
+ AM_CONDITIONAL(BUILD_STICKYNOTES_APPLET, test "x$enable_stickynotes" = "xyes")
+ 
+ dnl ***************************************************************************
+-dnl *** mixer applet specific checks                                        ***
+-dnl ***************************************************************************
+-
+-GST_MAJORMINOR=auto
+-AC_ARG_WITH(gstreamer,
+-            AC_HELP_STRING([--with-gstreamer],[use gstreamer version for mixer if available]),
+-            [case "${withval}" in
+-               0.8) GST_MAJORMINOR=0.8 ;;
+-               0.10) GST_MAJORMINOR=0.10 ;;
+-               *) AC_MSG_ERROR([
+-                                *** Bad value ${withval} for --with-gstreamer
+-                                *** Please use one of the following:
+-                                ***    --with-gstreamer=0.8
+-                                ***    --with-gstreamer=0.10
+-                              ]);;
+-             esac])
+-
+-GST10_REQS=0.10.2
+-GST10_PKGS="gstreamer-0.10 >= $GST10_REQS gstreamer-plugins-base-0.10 >= $GST10_REQS"
+-GST8_REQS=0.8.0
+-GST8_PKGS="gstreamer-0.8 >= $GST8_REQS gstreamer-interfaces-0.8 >= $GST8_REQS"
+-
+-if test "x$GST_MAJORMINOR" = "xauto" -o "x$GST_MAJORMINOR=x0.10"; then
+-   # try for GStreamer 0.10
+-   MIXER_CFLAGS=
+-   MIXER_LIBS=
+-   PKG_CHECK_MODULES(MIXER, $GST10_PKGS, HAVE_GST_VER=0.10, HAVE_GST_VER=none)
+-fi
+-
+-if test "x$GST_MAJORMINOR x$HAVE_GST_VER" = "xauto xnone" -o "x$GST_MAJORMINOR" = "x0.8" ; then
+-   # try for GStreamer 0.8
+-   MIXER_CFLAGS=
+-   MIXER_LIBS=
+-   PKG_CHECK_MODULES(MIXER, $GST8_PKGS, HAVE_GST_VER=0.8, HAVE_GST_VER=none)
+-fi
+-
+-case $HAVE_GST_VER in
+-	0.8|0.10)
+-		HAVE_GST="yes"
+-		AC_MSG_RESULT([    using GStreamer $HAVE_GST_VER backend])
+-		;;
+-	none)
+-		HAVE_GST="no"
+-		AC_MSG_RESULT([GStreamer not found])
+-		AC_MSG_WARN([GStreamer unavailable, mixer applet will not be build])
+-		;;
+-	*)
+-		AC_MSG_ERROR([Something bad happened when determining GStreamer version, aborting!])
+-		;;
+-esac
+-
+-AM_CONDITIONAL(APPLET_MIXER, test "x$HAVE_GST" = "xyes")
+-AM_CONDITIONAL(HAVE_GST10, test "x$HAVE_GST_VER" = "x0.10")
+-if test "x$HAVE_GST_VER" = "x0.10" ; then
+-	AC_DEFINE(HAVE_GST10, 1, [Using Gstreamer 0.10])
+-	# these don't seem to come from any pkg-config file
+-	MIXER_LIBS="$MIXER_LIBS -lgstinterfaces-0.10 -lgstaudio-0.10"
+-fi
+-
+-AC_SUBST(MIXER_CFLAGS)
+-AC_SUBST(MIXER_LIBS)
+-
+-dnl ***************************************************************************
+ dnl *** keyboard accessibility status applet check                          ***
+ dnl ***************************************************************************
+ 
+@@ -758,8 +695,6 @@ accessx-status/pixmaps/Makefile
+ mini-commander/Makefile
+ mini-commander/src/Makefile
+ mini-commander/help/Makefile
+-mixer/Makefile
+-mixer/docs/Makefile
+ drivemount/Makefile
+ drivemount/help/Makefile
+ modemlights/Makefile
+@@ -833,7 +768,6 @@ gnome-applets-$VERSION configure summary
+ 	 - gweather			$build_libgweather_applets
+ 	 - invest-applet		$BUILD_INVEST_APPLET
+ 	 - mini-commander		$enable_mini_commander
+-	 - mixer			$HAVE_GST
+ 	 - modemlights			$BUILD_MODEM_LIGHTS
+ 	 - multiload			$build_gtop_applets
+ 	 - stickynotes			$enable_stickynotes
+@@ -841,6 +775,5 @@ gnome-applets-$VERSION configure summary
+ 	
+ 	Using DBUS:			$HAVE_DBUS
+ 	Using HAL:			$HAVE_HAL
+-	Using GStreamer version:	$HAVE_GST_VER
+ 	Enabling IPv6:			$have_ipv6
+ " >&2
+--- null_applet/Makefile.am.old	2008-12-19 14:49:20.000000000 +0000
++++ null_applet/Makefile.am	2008-12-19 14:50:13.000000000 +0000
+@@ -19,6 +19,7 @@ server_in_files =				\
+ 	GNOME_CDPlayerApplet.server.in		\
+ 	GNOME_MailcheckApplet_Factory.server.in	\
+ 	GNOME_Panel_WirelessApplet.server.in	\
++	GNOME_MixerApplet.server.in		\
+ 	$(battstat_applet)
+ server_DATA = $(server_in_files:.server.in=.server)
+ 
+@@ -34,4 +35,6 @@ EXTRA_DIST =					\
+ 	GNOME_CDPlayerApplet.server.in		\
+ 	GNOME_MailcheckApplet_Factory.server.in	\
+ 	GNOME_Panel_WirelessApplet.server.in	\
+-	GNOME_BattstatApplet.server.in
++	GNOME_BattstatApplet.server.in		\
++	GNOME_MixerApplet.server.in
++
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 17bd72c..58c2721 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -35,7 +35,7 @@
 Summary:        Small applications for the GNOME panel
 Name:		gnome-applets
 Version:	2.25.1
-Release: 	6%{?dist}
+Release: 	7%{?dist}
 Epoch:          1
 License:	GPLv2+ and GFDL
 Group:          User Interface/Desktops
@@ -63,6 +63,8 @@ Patch39:	gweather-network.patch
 
 # do the nullapplet dance for battstat
 Patch40:	gnome-applets-null-battstat.patch
+# and for the mixer applet
+Patch42:	gnome-applets-remove-mixer.patch
 
 # from upstream
 Patch41: 	gnome-applets-libgnomeui.patch
@@ -152,6 +154,9 @@ and more.
 %patch33 -p1 -b .node-leak
 %patch39 -p1 -b .gweather-network
 %patch40 -p1 -b .battstat-null
+mv mixer/GNOME_MixerApplet.server.in.in null_applet/GNOME_MixerApplet.server.in
+rm -rf mixer/
+%patch42 -p0 -b .mixer-null
 
 # We don't ship gnome-system-tools
 rm -rf modemlights
@@ -245,7 +250,6 @@ gconftool-2 --makefile-install-rule                                        \
 	    %{_sysconfdir}/gconf/schemas/gweather.schemas                  \
 	    %{_sysconfdir}/gconf/schemas/mini-commander-global.schemas     \
 	    %{_sysconfdir}/gconf/schemas/mini-commander.schemas            \
-	    %{_sysconfdir}/gconf/schemas/mixer.schemas                     \
 	    %{_sysconfdir}/gconf/schemas/modemlights.schemas               \
 %if %{build_stickynotes}
 	    %{_sysconfdir}/gconf/schemas/stickynotes.schemas               \
@@ -266,7 +270,6 @@ if [ "$1" -gt 1 ]; then
 	    %{_sysconfdir}/gconf/schemas/gweather.schemas                  \
 	    %{_sysconfdir}/gconf/schemas/mini-commander-global.schemas     \
 	    %{_sysconfdir}/gconf/schemas/mini-commander.schemas            \
-	    %{_sysconfdir}/gconf/schemas/mixer.schemas                     \
 	    %{_sysconfdir}/gconf/schemas/modemlights.schemas               \
 %if %{build_stickynotes}
 	    %{_sysconfdir}/gconf/schemas/stickynotes.schemas               \
@@ -276,6 +279,10 @@ if [ "$1" -gt 1 ]; then
     gconftool-2 --makefile-uninstall-rule 				\
 	    %{_sysconfdir}/gconf/schemas/battstat.schemas >& /dev/null || :
   fi
+  if [ -f %{_sysconfdir}/gconf/schemas/mixer.schemas ]; then
+     gconftool-2 --makefile-uninstall-rule 				\
+     	     %{_sysconfdir}/gconf/schemas/mixer.schemas >& /dev/null || :
+  fi
 fi
 
 %preun
@@ -289,7 +296,6 @@ if [ "$1" -eq 0 ]; then
 	    %{_sysconfdir}/gconf/schemas/gweather.schemas                  \
 	    %{_sysconfdir}/gconf/schemas/mini-commander-global.schemas     \
 	    %{_sysconfdir}/gconf/schemas/mini-commander.schemas            \
-	    %{_sysconfdir}/gconf/schemas/mixer.schemas                     \
 	    %{_sysconfdir}/gconf/schemas/modemlights.schemas               \
 %if %{build_stickynotes}
 	    %{_sysconfdir}/gconf/schemas/stickynotes.schemas               \
@@ -329,7 +335,6 @@ fi
 %{_libexecdir}/gnome-keyboard-applet
 %{_libexecdir}/gweather-applet-2
 %{_libexecdir}/mini_commander_applet
-%{_libexecdir}/mixer_applet2
 %{_libexecdir}/modemlights_applet2
 %{_libexecdir}/multiload-applet-2
 %{_libexecdir}/null_applet
@@ -346,6 +351,9 @@ fi
 %{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
 
 %changelog
+* Fri Dec 19 2008 - Bastien Nocera <bnocera@redhat.com> - 1:2.25.1-7
+- Remove the mixer applet
+
 * Fri Dec 19 2008 Matthias Clasen <mclasen@redhat.com> - 1:2.25.1-5
 - Fix the build