2008-12-11 Brian Cameron <[email protected]> gnome-2-24
authoryippi
Thu, 11 Dec 2008 09:08:54 +0000
branchgnome-2-24
changeset 14088 c2fa9f48a10f
parent 14087 e7661aa47897
child 14089 2791513b88d1
2008-12-11 Brian Cameron <[email protected]> * base-specs/gdm.spec: Bump to 2.20.9. Remove upstream patches. * patches/gdm-11-disable-vt.diff: Renumber to 05. * base-specs/dbus.spec: Bump to 1.2.8. * SUNWdbus-bindings.spec: Update packaging. * base-specs/dbus-glib.spec: Bump to 0.78. * SUNWgst-python.spec: Bump to 0.10.13 * patches/gst-python-01-pipelinetester.diff: Remove upstream patch. * base-specs/gst-plugins-good.spec: Bump to 0.10.11. * patches/gst-plugins-good-02-cdda.diff: Refactor so it applies to new version.
ChangeLog
SUNWdbus-bindings.spec
SUNWgst-python.spec
base-specs/dbus-glib.spec
base-specs/dbus.spec
base-specs/gdm.spec
base-specs/gst-plugins-good.spec
patches/gdm-05-disable-vt.diff
patches/gdm-05-multilabel-sessions.diff
patches/gdm-06-xsession.diff
patches/gdm-07-fbconsole.diff
patches/gdm-08-no-recreate-sockets.diff
patches/gdm-09-disable-vt.diff
patches/gst-plugins-good-02-cdda.diff
patches/gst-python-01-pipelinetester.diff
--- a/ChangeLog	Thu Dec 11 05:19:07 2008 +0000
+++ b/ChangeLog	Thu Dec 11 09:08:54 2008 +0000
@@ -1,3 +1,17 @@
+2008-12-11  Brian Cameron  <[email protected]>
+
+	* base-specs/gdm.spec: Bump to 2.20.9.  Remove upstream patches.
+	* patches/gdm-11-disable-vt.diff: Renumber to 05.
+	* base-specs/dbus.spec: Bump to 1.2.8.
+	* SUNWdbus-bindings.spec: Update packaging.
+	* base-specs/dbus-glib.spec: Bump to 0.78.
+	* SUNWgst-python.spec: Bump to 0.10.13
+	* patches/gst-python-01-pipelinetester.diff: Remove upstream
+	  patch.
+	* base-specs/gst-plugins-good.spec: Bump to 0.10.11.
+	* patches/gst-plugins-good-02-cdda.diff: Refactor so it applies to
+	  new version.
+
 2008-12-11  Halton Huo  <[email protected]>
 
 	* base-specs/gtk-vnc.spec: Bump to 0.3.8
@@ -7,8 +21,8 @@
 2008-12-11  Dave Lin  <[email protected]>
 
 	* SUNWgnome-common-devel.spec: update %files
-	* base-specs/gtk-doc.spec: Bump to 1.11. Fix build by properly disabling
-	  scrollkeeper installation.
+	* base-specs/gtk-doc.spec: Bump to 1.11. Fix build by properly
+	  disabling scrollkeeper installation.
 
 2008-12-10  Takao Fujiwara  <[email protected]>
 
@@ -20,11 +34,11 @@
 
 2008-12-10  Jerry Tan <[email protected]>
 
-        * SUNWlibtheora.spec
-        * base-specs/libtheora.spec
-        * patches/libtheora-01-fixtestlink.diff
-        * patches/libtheora-02-signed-short.diff
-        bump to 1.0
+	* SUNWlibtheora.spec
+	* base-specs/libtheora.spec
+	* patches/libtheora-01-fixtestlink.diff
+	* patches/libtheora-02-signed-short.diff
+	  bump to 1.0
 
 2008-12-10  Jeff Cai <[email protected]>
 
@@ -38,8 +52,7 @@
 	* po-sun/gnome-keyring-manager/po-sun/de.po:
 	* po-sun/gnome-keyring-manager/po-sun/es.po:
 	* po-sun/gnome-keyring-manager/po-sun/fr.po:
-	* po-sun/gnome-keyring-manager/po-sun/gnome-keyring-manager-sun.pot
-	:
+	* po-sun/gnome-keyring-manager/po-sun/gnome-keyring-manager-sun.pot:
 	* po-sun/gnome-keyring-manager/po-sun/hu.po:
 	* po-sun/gnome-keyring-manager/po-sun/it.po:
 	* po-sun/gnome-keyring-manager/po-sun/ja.po:
@@ -51,8 +64,8 @@
 	* po-sun/gnome-keyring-manager/po-sun/zh_CN.po:
 	* po-sun/gnome-keyring-manager/po-sun/zh_HK.po:
 	* po-sun/gnome-keyring-manager/po-sun/zh_TW.po:
-	Remove gnome-keyring-manager since Seahorse replaces it and
-	it is obsolete in the community.
+	  Remove gnome-keyring-manager since Seahorse replaces it and
+	  it is obsolete in the community.
 
 2008-12-09  Takao Fujiwara  <[email protected]>
 
@@ -67,7 +80,7 @@
 
 2008-12-09  Dave Lin  <[email protected]>
 
-        * base-specs/libexif.spec: Bump to 0.6.17 for security fixes.
+	* base-specs/libexif.spec: Bump to 0.6.17 for security fixes.
 
 2008-12-08  Brian Cameron  <[email protected]>
 
--- a/SUNWdbus-bindings.spec	Thu Dec 11 05:19:07 2008 +0000
+++ b/SUNWdbus-bindings.spec	Thu Dec 11 09:08:54 2008 +0000
@@ -103,6 +103,19 @@
 %dbus_glib.install -d %name-%version/%{base_arch}
 %dbus_python.install -d %name-%version/%{base_arch}
 
+# Remove dbus-bash-completion.sh, a bash autocompletion script in the
+# %{_sysconfdir}/profile.d dir. We don't ship such files. It is the only file
+# under %{_sysconfdir} so remove the entire structure.
+# rm/rmdir used instead of 'rm -r' so that files added under %{_sysconfdir} are
+# found, via build failure.
+rm $RPM_BUILD_ROOT%{_libexecdir}/dbus-bash-completion-helper
+%ifarch amd64 sparcv9
+rm $RPM_BUILD_ROOT%{_libexecdir}/%{_arch64}/dbus-bash-completion-helper
+%endif
+rm $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/dbus-bash-completion.sh
+rmdir $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
+rmdir $RPM_BUILD_ROOT%{_sysconfdir}
+
 rm -rf $RPM_BUILD_ROOT%{_mandir}
 cd %{_builddir}/%name-%version/sun-manpages
 make install DESTDIR=$RPM_BUILD_ROOT
--- a/SUNWgst-python.spec	Thu Dec 11 05:19:07 2008 +0000
+++ b/SUNWgst-python.spec	Thu Dec 11 09:08:54 2008 +0000
@@ -12,10 +12,8 @@
 Name:                    SUNWgst-python
 Summary:                 Python bindings for the GStreamer streaming media framework
 URL:                     http://gstreamer.freedesktop.org/src/gst-python/
-Version:                 0.10.12
+Version:                 0.10.13
 Source:                  http://gstreamer.freedesktop.org/src/gst-python/gst-python-%{version}.tar.bz2
-#owner:yippi date:2008-02-21 type:bug bugzilla:517993
-Patch1:                  gst-python-01-pipelinetester.diff
 SUNW_BaseDir:            %{_basedir}
 SUNW_Copyright:          %{name}.copyright
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
@@ -31,7 +29,6 @@
 
 %prep
 %setup -q -n gst-python-%version
-%patch1 -p1
 
 %build
 ./configure --prefix=%{_prefix}
@@ -70,6 +67,9 @@
 %dir %attr (0755, root, other) %{_datadir}/doc
 
 %changelog
+* Thu Dec 11 2008 - [email protected]
+- Bump to 0.10.13.
+
 * Fri Sep 12 2008 - [email protected]
 - Update copyright
 
--- a/base-specs/dbus-glib.spec	Thu Dec 11 05:19:07 2008 +0000
+++ b/base-specs/dbus-glib.spec	Thu Dec 11 09:08:54 2008 +0000
@@ -11,7 +11,7 @@
 Name:         dbus-glib
 License:      GPL/AFL
 Group:        System/Libraries
-Version:      0.76
+Version:      0.78
 Release:      1
 Distribution: Java Desktop System
 Vendor:       Sun Microsystems, Inc.
@@ -67,6 +67,7 @@
             --sysconfdir=%{_sysconfdir}		\
             --libdir=%{_libdir}			\
             --bindir=%{_bindir}			\
+            --libexecdir=%{_libexecdir}		\
             --localstatedir=%{_localstatedir}	\
             --with-dbus-user=root		\
             --with-dbus-daemondir=%{_basedir}/lib	\
@@ -111,6 +112,8 @@
 %{_libdir}/python?.?/vendor-packages/*
 
 %changelog
+* Wed Dec 10 2008 - [email protected]
+- Bump to 0.78.
 * Thu Jul 24 2008 - [email protected]
 - Bump to 0.76.  Remove upstream patch dbus-glib-01-findlaunch.diff.
 * Wed Nov 07 2007 - [email protected]
--- a/base-specs/dbus.spec	Thu Dec 11 05:19:07 2008 +0000
+++ b/base-specs/dbus.spec	Thu Dec 11 09:08:54 2008 +0000
@@ -11,7 +11,7 @@
 Name:         dbus
 License:      GPL/AFL
 Group:        System/Libraries
-Version:      1.2.6
+Version:      1.2.8
 Release:      1
 Distribution: Java Desktop System
 Vendor:       Sun Microsystems, Inc.
@@ -135,8 +135,10 @@
 %{_libdir}/python?.?/vendor-packages/*
 
 %changelog
+* Wed Dec 10 2008 - [email protected]
+- Bump to 1.2.8
 * Mon Dec 08 2008 - [email protected]
-- Bumtp to 1.2.6.
+- Bump to 1.2.6.
 * Thu Oct 09 2008 - [email protected]
 - Bump to 1.2.4. 
   D-Bus if it fails to connect the first time.
--- a/base-specs/gdm.spec	Thu Dec 11 05:19:07 2008 +0000
+++ b/base-specs/gdm.spec	Thu Dec 11 09:08:54 2008 +0000
@@ -13,7 +13,7 @@
 Group:        System/GUI/GNOME
 #### DO NOT BUMP MODULE TO 2.21.x to 2.24.x AS IT IS BEING REWRITTEN AND IS
 #### NOT YET READY FOR SOLARIS
-Version:      2.20.8
+Version:      2.20.9
 Release:      1
 Distribution: Java Desktop System
 Vendor:       Sun Microsystems, Inc.
@@ -37,17 +37,8 @@
 Patch3:       gdm-03-disable-cde.diff
 #owner:fujiwara date:2008-04-10 type:feature bugster:5052540,6733528 bugzilla:547549
 Patch4:       gdm-04-im-config.diff
-#owner:stephen date:2008-07-23  type:feature bugster:6622109
-Patch5:       gdm-05-multilabel-sessions.diff
-#owner:yippi date:2008-09-16 type:bug bugster:6760749
-Patch6:       gdm-06-xsession.diff
-#owner:yippi date:2008-09-29 type:bug bugster:6753089 state:upstream
-Patch7:       gdm-07-fbconsole.diff
-#owner:yippi date:2008-11-12 type:branding doo:4719
-Patch8:       gdm-08-no-recreate-sockets.diff
-# This patch is to disable VT checking, remove it after bugster #6480003 fixed. 
 #owner:halton date:2008-12-04 type:branding
-Patch9:       gdm-09-disable-vt.diff
+Patch5:       gdm-05-disable-vt.diff
 URL:          www.gnome.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Docdir:       %{_defaultdocdir}
@@ -124,10 +115,6 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
-%patch7 -p0
-%patch8 -p1
-%patch9 -p1
 
 %build
 %ifos linux
@@ -257,6 +244,8 @@
 %config /etc/security/*
 
 %changelog
+* Wed Dec 10 2008 - [email protected]
+- Bump to 2.20.9.  Remove upstream patches.
 * Thu Dec 04 2008 - [email protected]
 - Add disable-vt.diff to disable VT, remove it after bugster #6480003 is fixed
 * Mon Nov 24 2008 - [email protected]
--- a/base-specs/gst-plugins-good.spec	Thu Dec 11 05:19:07 2008 +0000
+++ b/base-specs/gst-plugins-good.spec	Thu Dec 11 09:08:54 2008 +0000
@@ -9,7 +9,7 @@
 #
 Name:           gst-plugins-good
 License:        LGPL
-Version:        0.10.10
+Version:        0.10.11
 Release:        1
 Distribution:   Java Desktop System
 Vendor:         Sun Microsystems, Inc.
@@ -162,6 +162,8 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Thu Dec 11 2008 - [email protected]
+- Bump to 0.10.11.
 * Mon Dec 08 2008 - [email protected]
 - Add gst-plugins-good-05-fixmixer.diff so that the AUDIO_MIXER_MULTIPLE_OPEN
   ioctl is called after we set the mixer file descriptor.  Otherwise the ioctl
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gdm-05-disable-vt.diff	Thu Dec 11 09:08:54 2008 +0000
@@ -0,0 +1,13 @@
+--- gdm-2.20.8/configure.ac.orig	Thu Dec  4 13:40:57 2008
++++ gdm-2.20.8/configure.ac	Thu Dec  4 13:45:33 2008
+@@ -390,10 +390,6 @@
+ dnl ## gdmopen building
+ dnl There are perhaps others where this works
+ GDMOPEN=
+-AC_CHECK_HEADERS(sys/vt.h, [
+-		 AC_DEFINE(HAVE_SYS_VT_H)])
+-AC_CHECK_HEADERS(sys/vt.h, [
+-		 GDMOPEN=gdmopen])
+ AC_SUBST(GDMOPEN)
+ 
+ dnl ## Authentication scheme
--- a/patches/gdm-05-multilabel-sessions.diff	Thu Dec 11 05:19:07 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-diff -urN gdm.orig/daemon/gdm-daemon-config.c gdm.new/daemon/gdm-daemon-config.c
---- gdm.orig/daemon/gdm-daemon-config.c	2008-07-23 14:19:57.452350000 +0100
-+++ gdm.new/daemon/gdm-daemon-config.c	2008-07-24 05:16:16.155101000 +0100
-@@ -1615,6 +1615,9 @@
- 			      GdmConfigValue     *value)
- {
- 	const char *str;
-+#ifdef HAVE_TSOL
-+	char *new;
-+#endif
- 
- 	str = gdm_config_value_get_string (value);
- 
-@@ -1622,6 +1625,12 @@
- 		gdm_error (_("%s: No sessions directory specified."), "gdm_config_parse");
- 	}
- 
-+#ifdef HAVE_TSOL
-+	new = g_strconcat (str, ":" DATADIR "/xsessions/multilabel/", NULL);
-+	gdm_config_value_set_string (value, new);
-+	g_free (new);
-+#endif
-+
- 	return TRUE;
- }
- 
-diff -urN gdm.orig/gui/gdmsession.c gdm.new/gui/gdmsession.c
---- gdm.orig/gui/gdmsession.c	2008-07-23 14:19:57.564219000 +0100
-+++ gdm.new/gui/gdmsession.c	2008-07-24 05:16:01.388589000 +0100
-@@ -30,6 +30,10 @@
- #include <gtk/gtk.h>
- #include <glib/gi18n.h>
- 
-+#ifdef HAVE_TSOL
-+#include <tsol/label.h>
-+#endif
-+
- #include "gdm.h"
- #include "gdmsession.h"
- #include "gdmcommon.h"
-@@ -167,6 +171,12 @@
- 	 ":", -1);
-     for (i = 0; vec != NULL && vec[i] != NULL; i++) {
- 	    const char *dir = vec[i];
-+#ifdef HAVE_TSOL
-+	    /* skip the multilabel dir if the system is not labeled */
-+           if (!is_system_labeled () &&
-+               strcmp (dir, DATADIR "/xsessions/multilabel/") == 0)
-+                   continue;
-+#endif
- 
- 	    /* Check that session dir is readable */
- 	    if G_UNLIKELY (dir == NULL || access (dir, R_OK|X_OK) != 0)
--- a/patches/gdm-06-xsession.diff	Thu Dec 11 05:19:07 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
---- gdm-2.20.8/config/Xsession.solaris.orig	2008-10-21 01:42:22.499854000 +0900
-+++ gdm-2.20.8/config/Xsession.solaris	2008-10-21 01:45:53.663493000 +0900
-@@ -20,7 +20,12 @@ export G_BROKEN_FILENAMES
- # G_FILENAME_ENCODING=@locale
- # export G_FILENAME_ENCODING
- 
--export VTE_CJK_WIDTH=1
-+case $LANG in
-+ja*) VTE_CJK_WIDTH=1; export VTE_CJK_WIDTH;;
-+ko*) VTE_CJK_WIDTH=1; export VTE_CJK_WIDTH;;
-+zh*) VTE_CJK_WIDTH=1; export VTE_CJK_WIDTH;;
-+*) ;;
-+esac
- 
- if [ "x$LANG" = "xzh" ] ; then
-   export LANGUAGE=zh:zh_CN.EUC
--- a/patches/gdm-07-fbconsole.diff	Thu Dec 11 05:19:07 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,178 +0,0 @@
-Index: daemon/display.h
-===================================================================
---- daemon/display.h	(revision 6551)
-+++ daemon/display.h	(working copy)
-@@ -126,6 +126,7 @@
- 	pid_t slavepid;
- 	pid_t greetpid;
- 	pid_t sesspid;
-+	pid_t fbconsolepid;
- 	int last_sess_status; /* status returned by last session */
- 
- 	/* Notification connection */
-Index: daemon/server.c
-===================================================================
---- daemon/server.c	(revision 6551)
-+++ daemon/server.c	(working copy)
-@@ -137,7 +137,6 @@
- static void
- gdm_exec_fbconsole (GdmDisplay *disp)
- {
--        pid_t pid;
-         char *argv[6];
- 
-         argv[0] = FBCONSOLE;
-@@ -148,113 +147,19 @@
- 
- 	gdm_debug ("Forking fbconsole");
- 
--        pid = fork ();
--        if (pid == 0) {
-+        d->fbconsolepid = fork ();
-+        if (d->fbconsolepid == 0) {
-                 gdm_close_all_descriptors (0 /* from */, -1 /* except */, -1 /* except2 */)
- ;
-                 VE_IGNORE_EINTR (execv (argv[0], argv));
-         }
--        if (pid == -1) {
-+        if (d->fbconsolepid == -1) {
-                 gdm_error (_("Can not start fallback console"));
-         }
- }
- #endif
- 
- /**
-- * gdm_server_reinit:
-- * @disp: Pointer to a GdmDisplay structure
-- *
-- * Reinit the display, basically sends a HUP signal
-- * but only if the display exists
-- */
--
--gboolean
--gdm_server_reinit (GdmDisplay *disp)
--{
--	if (disp == NULL)
--		return FALSE;
--
--	if (disp->servpid <= 0) {
--		/* Kill our connection if one existed, likely to result
--		 * in some bizzaro error right now */
--		if (disp->dsp != NULL) {
--			XCloseDisplay (disp->dsp);
--			disp->dsp = NULL;
--		}
--		return FALSE;
--	}
--
--	gdm_debug ("gdm_server_reinit: Server for %s is about to be reinitialized!", disp->name);
--
--	if ( ! setup_server_wait (disp))
--		return FALSE;
--
--	d->servstat = SERVER_PENDING;
--
--	if (disp->dsp != NULL) {
--		/* static because of the Setjmp */
--		static int (*old_xerror_handler)(Display *, XErrorEvent *) = NULL;
--		static int (*old_xioerror_handler)(Display *) = NULL;
--
--		old_xerror_handler = NULL;
--		old_xioerror_handler = NULL;
--
--		/* Do note the interaction of this Setjmp and the signal
--	   	   handlers and the Setjmp in slave.c */
--
--		/* Long live Setjmp, DIE DIE DIE XSetIOErrorHandler */
--
--		if (Setjmp (reinitjmp) == 0)  {
--			/* come here and we'll whack the server and wait to get
--			   an xio error */
--			old_xerror_handler = XSetErrorHandler (ignore_xerror_handler);
--			old_xioerror_handler = XSetIOErrorHandler (jumpback_xioerror_handler);
--
--			/* Now whack the server with a SIGHUP */
--			gdm_sigchld_block_push ();
--			if (disp->servpid > 1)
--				kill (disp->servpid, SIGHUP);
--			else
--				d->servstat = SERVER_DEAD;
--			gdm_sigchld_block_pop ();
--
--			/* the server is dead, weird */
--			if (disp->dsp != NULL) {
--				XCloseDisplay (disp->dsp);
--				disp->dsp = NULL;
--			}
--		}
--		/* no more display */
--		disp->dsp = NULL;
--		XSetErrorHandler (old_xerror_handler);
--		XSetIOErrorHandler (old_xioerror_handler);
--	} else {
--		/* Now whack the server with a SIGHUP */
--		gdm_sigchld_block_push ();
--		if (disp->servpid > 1)
--			kill (disp->servpid, SIGHUP);
--		else
--			d->servstat = SERVER_DEAD;
--		gdm_sigchld_block_pop ();
--	}
--
--	/* Wait for the SIGUSR1 */
--	do_server_wait (d);
--
--	if (d->servstat == SERVER_RUNNING) {
--#ifdef HAVE_FBCONSOLE
--		gdm_exec_fbconsole (d);
--#endif
--		return TRUE;
--        } else {
--		/* if something really REALLY screwed up, then whack the
--		   lockfiles for safety */
--		gdm_server_whack_lockfile (d);
--		return FALSE;
--	}
--}
--
--/**
-  * gdm_server_stop:
-  * @disp: Pointer to a GdmDisplay structure
-  *
-@@ -336,6 +241,13 @@
- 
-     gdm_server_wipe_cookies (disp);
- 
-+#ifdef HAVE_FBCONSOLE
-+    /* Kill fbconsole if it is running */
-+    if (d->fbconsolepid > 0)
-+        kill (d->fbconsolepid, SIGTERM);
-+    d->fbconsolepid = 0;
-+#endif
-+
-     gdm_slave_whack_temp_auth_file ();
- }
- 
-@@ -732,6 +644,10 @@
- 
-     d = disp;
- 
-+#ifdef HAVE_FBCONSOLE
-+    d->fbconsolepid = 0;
-+#endif
-+
-     /* if an X server exists, wipe it */
-     gdm_server_stop (d);
- 
-Index: daemon/server.h
-===================================================================
---- daemon/server.h	(revision 6551)
-+++ daemon/server.h	(working copy)
-@@ -56,7 +56,6 @@
- 					 int min_flexi_disp,
- 					 int flexi_retries);
- void		gdm_server_stop		(GdmDisplay *d);
--gboolean	gdm_server_reinit	(GdmDisplay *d);
- void		gdm_server_whack_clients (Display *dsp);
- void		gdm_server_checklog	(GdmDisplay *disp);
- 
--- a/patches/gdm-08-no-recreate-sockets.diff	Thu Dec 11 05:19:07 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
---- gdm-2.20.8/daemon/misc.c-orig	2008-11-12 16:53:54.907548000 -0600
-+++ gdm-2.20.8/daemon/misc.c	2008-11-12 16:53:58.406566000 -0600
-@@ -874,7 +874,11 @@ ensure_tmp_socket_dir (const char *dir)
-  * Done on startup and when running display_manage
-  * This can do some sanity ensuring, one of the things it does now is make
-  * sure /tmp/.ICE-unix and /tmp/.X11-unix exist and have the correct
-- * permissions
-+ * permissions.
-+ *
-+ * Do nothing on Solaris since this logic breaks Trusted Extensions, and
-+ * the Solaris X permissions model (socket & pipe directories only writable
-+ * by gid-root), and it ignores the Solaris /tmp/.X11-pipe directory.
-  */
- void
- gdm_ensure_sanity (void)
-@@ -882,6 +886,10 @@ gdm_ensure_sanity (void)
- 	uid_t old_euid;
- 	gid_t old_egid;
- 
-+#ifdef __sun
-+	return;
-+#endif
-+
- 	old_euid = geteuid ();
- 	old_egid = getegid ();
- 
--- a/patches/gdm-09-disable-vt.diff	Thu Dec 11 05:19:07 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
---- gdm-2.20.8/configure.ac.orig	Thu Dec  4 13:40:57 2008
-+++ gdm-2.20.8/configure.ac	Thu Dec  4 13:45:33 2008
-@@ -390,10 +390,6 @@
- dnl ## gdmopen building
- dnl There are perhaps others where this works
- GDMOPEN=
--AC_CHECK_HEADERS(sys/vt.h, [
--		 AC_DEFINE(HAVE_SYS_VT_H)])
--AC_CHECK_HEADERS(sys/vt.h, [
--		 GDMOPEN=gdmopen])
- AC_SUBST(GDMOPEN)
- 
- dnl ## Authentication scheme
--- a/patches/gst-plugins-good-02-cdda.diff	Thu Dec 11 05:19:07 2008 +0000
+++ b/patches/gst-plugins-good-02-cdda.diff	Thu Dec 11 09:08:54 2008 +0000
@@ -1,5 +1,5 @@
---- gst-plugins-good-0.10.10/configure.ac-orig	2008-08-27 23:55:37.014378000 -0500
-+++ gst-plugins-good-0.10.10/configure.ac	2008-08-27 23:56:40.464333000 -0500
+--- gst-plugins-good-0.10.11/configure.ac-orig	2008-10-26 21:11:50.571355000 -0500
++++ gst-plugins-good-0.10.11/configure.ac	2008-10-26 21:12:47.652126000 -0500
 @@ -660,6 +660,12 @@ AG_GST_CHECK_FEATURE(CAIRO, [Cairo graph
    AG_GST_PKG_CHECK_MODULES(CAIRO, cairo >= 1.0.0)
  ])
@@ -13,15 +13,15 @@
  dnl **** ESound ****
  translit(dnm, m, l) AM_CONDITIONAL(USE_ESD, true)
  AG_GST_CHECK_FEATURE(ESD, [ESounD sound daemon], esdsink, [
-@@ -955,6 +961,7 @@ AM_CONDITIONAL(USE_AALIB, false)
- AM_CONDITIONAL(USE_ANNODEX, false)
- AM_CONDITIONAL(USE_CAIRO, false)
+@@ -928,6 +934,7 @@ AM_CONDITIONAL(USE_DIRECTDRAW, false)
+ AM_CONDITIONAL(USE_DIRECTSOUND, false)
+ AM_CONDITIONAL(USE_DV1394, false)
  AM_CONDITIONAL(USE_ESD, false)
 +AM_CONDITIONAL(USE_CDDASRC, false)
  AM_CONDITIONAL(USE_FLAC, false)
  AM_CONDITIONAL(USE_GCONF, false)
- AM_CONDITIONAL(USE_GDK_PIXBUF, false)
-@@ -1073,6 +1080,7 @@ ext/Makefile
+ AM_CONDITIONAL(USE_GCONFTOOL, false)
+@@ -1055,6 +1062,7 @@ ext/Makefile
  ext/aalib/Makefile
  ext/annodex/Makefile
  ext/cairo/Makefile
--- a/patches/gst-python-01-pipelinetester.diff	Thu Dec 11 05:19:07 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
---- gst-python-0.10.10/examples/pipeline-tester-orig	2008-03-06 19:10:03.192956000 -0600
-+++ gst-python-0.10.10/examples/pipeline-tester	2008-03-06 19:19:59.729370000 -0600
-@@ -41,29 +41,29 @@ import debugslider
- data = (('Video capture via V4L',
-          'v4lsrc name=source \n'
-          '    ! videorate \n'
--         '    ! xvimagesink'),
-+         '    ! ffmpegcolorspace ! ximagesink'),
-         ('Video capture via V4L, fixed frame rate',
-          'v4lsrc name=source autoprobe=false autoprobe-fps=false \n'
-          '    ! video/x-raw-yuv,format=(fourcc)I420,framerate=(double)7.5 \n'
-          '    ! videorate \n'
-          '    ! ffmpegcolorspace \n'
--         '    ! xvimagesink'),
--        ('Sound capture via ALSA',
--         'alsasrc\n'
--         '    ! audio/x-raw-int,rate=22050,depth=16,channels=1,width=16,signed=(boolean)TRUE,endianness=1234\n'
-+         '    ! ximagesink'),
-+        ('Sound capture',
-+         'gconfaudiosrc\n'
-+         '    ! audio/x-raw-int,rate=22050,depth=16,channels=1,width=16,signed=(boolean)TRUE,endianness=(int)BYTE_ORDER\n'
-          '    ! level message=true\n'
-          '    ! fakesink'),
-         ('Streaming Ogg/Theora+Vorbis playback, tee to disk',
-          'gnomevfssrc location=http://gstreamer.freedesktop.org/media/small/cooldance.ogg \n'
-          '    ! tee name=tee \n'
-          '    tee. ! oggdemux name=demux \n'
--         '    demux. ! queue ! theoradec ! xvimagesink \n'
--         '    demux. ! queue ! vorbisdec ! audioconvert ! alsasink \n'
--         '    tee. ! queue ! filesink location=cooldance.ogg'),
-+         '    demux. ! queue ! theoradec ! ffmpegcolorspace ! ximagesink \n'
-+         '    demux. ! queue ! vorbisdec ! audioconvert ! gconfaudiosink \n'
-+         '    tee. ! queue ! filesink location=/tmp/cooldance.ogg'),
-         ('Video test, YUV format',
-          'videotestsrc \n'
-          '    ! video/x-raw-yuv,format=(fourcc)I420 \n'
--         '    ! xvimagesink'),
-+         '    ! ffmpegcolorspace ! ximagesink'),
-         ('Video test, RGB format',
-          'videotestsrc \n'
-          '    ! video/x-raw-rgb,red_mask=0xff00 \n'
-@@ -73,12 +73,12 @@ data = (('Video capture via V4L',
-          'videotestsrc \n'
-          '    ! video/x-raw-rgb,height=200,width=320 \n'
-          '    ! videoscale method=2 \n'
--         '    ! ximagesink'),
--        ('Reencode Vorbis to mulaw, play via ALSA',
--         'filesrc location=cooldance.ogg \n'
-+         '    ! ffmpegcolorspace ! ximagesink'),
-+        ('Reencode Vorbis to mulaw, play',
-+         'filesrc location=/tmp/cooldance.ogg \n'
-          '    ! oggdemux \n'
-          '    ! vorbisdec ! audioconvert \n'
--         '    ! mulawenc ! mulawdec ! alsasink'),
-+         '    ! mulawenc ! mulawdec ! gconfaudiosink'),
-         ('Capture DV via firewire, transcode into Ogg',
-          'dv1394src \n'
-          '    ! dvdemux name=demux \n'
-@@ -93,7 +93,7 @@ data = (('Video capture via V4L',
-          '    ! ffmpegcolorspace \n'
-          '    ! theoraenc \n'
-          '    ! oggmux name=mux \n'
--         '    ! filesink location=dv.ogg \n'
-+         '    ! filesink location=/tmp/dv.ogg \n'
-          ' \n'
-          '    demux. \n'
-          '    ! audio/x-raw-int \n'