--- a/ChangeLog	Mon Apr 12 18:58:28 2010 +0000
+++ b/ChangeLog	Mon Apr 12 22:29:32 2010 +0000
@@ -1,3 +1,29 @@
+2010-04-12  Christian Kelly  <[email protected]>
+
+	* SUNWgnome-cd-burner.spec, patches/brasero-01-load-by-gksu.diff: Bump
+	  to 2.30.0.
+	* patches/control-center-09-about-me.diff, 
+	  base-specs/control-center.spec: Bump to 2.30.0, re-work patch.
+	* base-specs/gnome-desktop.spec: Bump to 2.30.0.
+	* base-specs/nautilus.spec: Bump to 2.30.0.
+	* base-specs/libgsf.spec: Bump to 1.14.18.
+	* base-specs/gnome-mag.spec, patches/gnome-mag-01-x11-build-error.diff:
+	  Bump to 0.16.1.
+	* base-specs/libgnomeprinui.spec: Bump to 2.18.4.
+	* base-specs/gnome-nettool.spec, 
+	  patches/gnome-nettool-01-sun-patch.diff: Bump to 2.30.0.
+	* base-specs/libbonoboui.spec: Fix patches.
+	* base-specs/totem.spec, patches/totem-pl-parser-04-memmem.diff,
+	  patches/totem-01-remove-unsupported-format.diff: Bump to 2.30.0.
+	* base-specs/firefox.spec, patches/firefox3-28-bad-ssl.diff: Add patch 
+	  to fix build issue.
+	* base-specs/gcalctool.spec, patches/gcalctool-01-getline.diff,
+	  SUNWgnome-calculator.spec, patches/gcalctool-01-gtk-tooltips.diff: 
+	  Bump to 5.30.0 and add patch to fix build issue.
+	* base-specs/libgnomeprint.spec: Bump to 2.18.7.
+	* base-specs/metacity.spec: Bump to 2.30.1.
+	* SUNWlibvisual.spec: Re-disable plugins.
+
 2010-04-12  Christian Kelly  <[email protected]>
 
 	* base-specs/gcalctool.spec: Bump to 5.30.0.

--- a/SUNWgnome-calculator.spec	Mon Apr 12 18:58:28 2010 +0000
+++ b/SUNWgnome-calculator.spec	Mon Apr 12 22:29:32 2010 +0000
@@ -97,10 +97,10 @@
 %{_datadir}/gcalctool
 %dir %attr (0755, root, other) %{_datadir}/gnome
 %{_datadir}/gnome/help/*/C
-%{_datadir}/omf/*/*-C.omf
 %dir %attr(0755, root, bin) %{_mandir}
 %dir %attr(0755, root, bin) %{_mandir}/*
 %{_mandir}/*/*
+%{_datadir}/gnome/help/*/.help.copyright
 
 %if %build_l10n
 %files l10n
@@ -109,8 +109,6 @@
 %dir %attr (0755, root, other) %{_datadir}/gnome
 %attr (-, root, other) %{_datadir}/locale
 %{_datadir}/gnome/help/*/[a-z]*
-%{_datadir}/omf/*/*-[a-z][a-z].omf
-%{_datadir}/omf/*/*-[a-z][a-z]_[A-Z]*.omf
 %endif
 
 %files root

--- a/SUNWgnome-cd-burner.spec	Mon Apr 12 18:58:28 2010 +0000
+++ b/SUNWgnome-cd-burner.spec	Mon Apr 12 22:29:32 2010 +0000
@@ -15,9 +15,9 @@
 
 Name:           SUNWgnome-cd-burner
 License:        GPL
-Version:        2.29.91
+Version:        2.30.0
 Summary:        Gnome CD/DVD burner
-Source:         http://ftp.gnome.org/pub/GNOME/sources/brasero/2.29/brasero-%{version}.tar.bz2
+Source:         http://ftp.gnome.org/pub/GNOME/sources/brasero/2.30/brasero-%{version}.tar.bz2
 Source1:        l10n-configure.sh 
 Source2:        brasero-po-sun-%{po_sun_version}.tar.bz2
 #Source3:        %{name}-manpages-0.1.tar.gz

--- a/SUNWgnome-media-player.spec	Mon Apr 12 18:58:28 2010 +0000
+++ b/SUNWgnome-media-player.spec	Mon Apr 12 22:29:32 2010 +0000
@@ -202,6 +202,7 @@
 %dir %attr (0755, root, other) %{_datadir}/icons/hicolor/24x24
 %dir %attr (0755, root, other) %{_datadir}/icons/hicolor/24x24/apps
 %dir %attr (0755, root, other) %{_datadir}/icons/hicolor/24x24/devices
+%dir %attr (0755, root, other) %{_datadir}/icons/hicolor/24x24/places
 %dir %attr (0755, root, other) %{_datadir}/icons/hicolor/32x32
 %dir %attr (0755, root, other) %{_datadir}/icons/hicolor/32x32/apps
 %dir %attr (0755, root, other) %{_datadir}/icons/hicolor/32x32/devices

--- a/SUNWlibvisual.spec	Mon Apr 12 18:58:28 2010 +0000
+++ b/SUNWlibvisual.spec	Mon Apr 12 22:29:32 2010 +0000
@@ -57,12 +57,12 @@
 %ifarch amd64 sparcv9
 mkdir %name-%version/%_arch64
 %libvisual64.prep -d %name-%version/%_arch64
-%libvisual_plugins64.prep -d %name-%version/%_arch64
+#%libvisual_plugins64.prep -d %name-%version/%_arch64
 %endif
 
 mkdir %name-%version/%{base_arch}
 %libvisual.prep -d %name-%version/%{base_arch}
-%libvisual_plugins.prep -d %name-%version/%{base_arch}
+#%libvisual_plugins.prep -d %name-%version/%{base_arch}
 
 %build
 
@@ -77,7 +77,7 @@
 export RPM_OPT_FLAGS="$CFLAGS"
 export LDFLAGS="$FLAG64 -L%{_builddir}/%name-%version/%{_arch64}/libvisual-%{libvisual.version}/libvisual/.libs -L/usr/X11/lib/amd64 -R/usr/X11/lib/amd64"
 export PKG_CONFIG_PATH="%{_builddir}/%name-%version/%{_arch64}/libvisual-%{libvisual.version}:%{_pkg_config_path}"
-%libvisual_plugins64.build -d %name-%version/%_arch64
+#%libvisual_plugins64.build -d %name-%version/%_arch64
 %endif
 
 export CFLAGS="-features=extensions -D__volatile=__volatile__"
@@ -89,18 +89,18 @@
 export CFLAGS="$CFLAGS -I%{_builddir}/%name-%version/%{base_arch}/libvisual-%{libvisual.version}"
 export LDFLAGS="%_ldflags -L%{_builddir}/%name-%version/%{base_arch}/libvisual-%{libvisual.version}/libvisual/.libs"
 export PKG_CONFIG_PATH="%{_builddir}/%name-%version/%{base_arch}/libvisual-%{libvisual.version}:%{_pkg_config_path}"
-%libvisual_plugins.build -d %name-%version/%{base_arch}
+#%libvisual_plugins.build -d %name-%version/%{base_arch}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %ifarch amd64 sparcv9
 %libvisual64.install -d %name-%version/%_arch64
-%libvisual_plugins64.install -d %name-%version/%_arch64
+#%libvisual_plugins64.install -d %name-%version/%_arch64
 %endif
 
 %libvisual.install -d %name-%version/%{base_arch}
-%libvisual_plugins.install -d %name-%version/%{base_arch}
+#%libvisual_plugins.install -d %name-%version/%{base_arch}
 
 find $RPM_BUILD_ROOT%{_libdir} -type f -name "*.la" -exec rm -f {} ';'
 find $RPM_BUILD_ROOT%{_libdir} -type f -name "*.a" -exec rm -f {} ';'
@@ -124,19 +124,19 @@
 %endif
 %defattr (-, root, other)
 %dir %attr(0755, root, sys) %{_datadir}
-%{_datadir}/libvisual*
+#%{_datadir}/libvisual*
 %doc %{base_arch}/libvisual-%{libvisual.version}/AUTHORS
 %doc %{base_arch}/libvisual-%{libvisual.version}/README
 %doc(bzip2) %{base_arch}/libvisual-%{libvisual.version}/COPYING
 %doc(bzip2) %{base_arch}/libvisual-%{libvisual.version}/NEWS
 %doc(bzip2) %{base_arch}/libvisual-%{libvisual.version}/ChangeLog
 %doc(bzip2) %{base_arch}/libvisual-%{libvisual.version}/po/ChangeLog
-%doc %{base_arch}/libvisual-plugins-%{libvisual_plugins.version}/AUTHORS
-%doc %{base_arch}/libvisual-plugins-%{libvisual_plugins.version}/NEWS
-%doc %{base_arch}/libvisual-plugins-%{libvisual_plugins.version}/README
-%doc %{base_arch}/libvisual-plugins-%{libvisual_plugins.version}/po/ChangeLog
-%doc(bzip2) %{base_arch}/libvisual-plugins-%{libvisual_plugins.version}/COPYING
-%doc(bzip2) %{base_arch}/libvisual-plugins-%{libvisual_plugins.version}/ChangeLog
+#%doc %{base_arch}/libvisual-plugins-%{libvisual_plugins.version}/AUTHORS
+#%doc %{base_arch}/libvisual-plugins-%{libvisual_plugins.version}/NEWS
+#%doc %{base_arch}/libvisual-plugins-%{libvisual_plugins.version}/README
+#%doc %{base_arch}/libvisual-plugins-%{libvisual_plugins.version}/po/ChangeLog
+#%doc(bzip2) %{base_arch}/libvisual-plugins-%{libvisual_plugins.version}/COPYING
+#%doc(bzip2) %{base_arch}/libvisual-plugins-%{libvisual_plugins.version}/ChangeLog
 
 %if %build_l10n
 %files l10n

--- a/base-specs/control-center.spec	Mon Apr 12 18:58:28 2010 +0000
+++ b/base-specs/control-center.spec	Mon Apr 12 22:29:32 2010 +0000
@@ -15,12 +15,12 @@
 Name:         gnome-control-center
 License:      GPL
 Group:        System/GUI/GNOME
-Version:      2.29.92
+Version:      2.30.0
 Release:      1
 Distribution: Java Desktop System
 Vendor:       Sun Microsystems, Inc.
 Summary:      The GNOME control center for GNOME
-Source:       http://ftp.gnome.org/pub/GNOME/sources/gnome-control-center/2.29/gnome-control-center-%{version}.tar.bz2
+Source:       http://ftp.gnome.org/pub/GNOME/sources/gnome-control-center/2.30/gnome-control-center-%{version}.tar.bz2
 Source1:     %{name}-po-sun-%{po_sun_version}.tar.bz2
 %ifnarch sparc
 Source2:      visual-effects-images.tar.bz2
@@ -230,6 +230,8 @@
 %{_libdir}/*.so
 
 %changelog
+* Mon Apr 12 2010 - [email protected]
+- Bump to 2.30.0.
 * Thu Mar 11 2010 - [email protected]
 - Bump to 2.29.92.
 * Tue Feb 23 2010 - [email protected]

--- a/base-specs/firefox.spec	Mon Apr 12 18:58:28 2010 +0000
+++ b/base-specs/firefox.spec	Mon Apr 12 22:29:32 2010 +0000
@@ -138,6 +138,8 @@
 # status:upstream
 Patch27: firefox3-27-522684-ssl-tunnel-hang.diff
 
+Patch28: firefox3-28-bad-ssl.diff
+
 URL:         http://www.mozilla.com/firefox
 
 BuildRoot:   %{_tmppath}/%{name}-%{tarball_version}-build
@@ -198,6 +200,7 @@
 %patch25 -p1
 %patch26 -p1
 %patch27 -p1
+%patch28 -p1
 
 %if %option_with_indiana_branding
 %patch14 -p1

--- a/base-specs/gcalctool.spec	Mon Apr 12 18:58:28 2010 +0000
+++ b/base-specs/gcalctool.spec	Mon Apr 12 22:29:32 2010 +0000
@@ -29,7 +29,6 @@
 Docdir:       %{_defaultdocdir}/%{name}
 Autoreqprov:  on
 
-#owner:chrisk type:bug date:2010-04-12
 Patch1:       gcalctool-01-getline.diff
 
 %define glib2_version 2.6.0
@@ -129,9 +128,6 @@
 %{_mandir}/man1/
 
 %changelog
-* Mon Apr 12 2010 - [email protected]
-- Bump to 5.30.0.
-- Add gcalctool-01-getline.diff.
 * Mon Oct 19 2009 - [email protected]
 - Bump to 5.28.1
 * Wed Sep 23 2009 - [email protected]

--- a/base-specs/gnome-desktop.spec	Mon Apr 12 18:58:28 2010 +0000
+++ b/base-specs/gnome-desktop.spec	Mon Apr 12 22:29:32 2010 +0000
@@ -14,12 +14,12 @@
 Name:         gnome-desktop
 License:      LGPL
 Group:        System/Libraries/GNOME
-Version:      2.29.92
+Version:      2.30.0
 Release:      1
 Distribution: Java Desktop System
 Vendor:       Sun Microsystems, Inc.
 Summary:      GNOME Desktop Library
-Source:       http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.29/%{name}-%{version}.tar.bz2
+Source:       http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.30/%{name}-%{version}.tar.bz2
 Source1:      blueprint-extra-icons.tar.bz2
 Source2:      gnome-feedback.xml
 Source3:      sun-gnome-version.xml
@@ -95,7 +95,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch5 -p1
+#%patch5 -p1
 
 %build
 %ifos linux
@@ -187,6 +187,8 @@
 %{_libdir}/libgnome-desktop-2.so
 
 %changelog
+* Mon Apr 12 2010 - [email protected]
+- Bump to 2.30.0.
 * Thu Mar 11 2010 - [email protected]
 - Bump to 2.29.92.
 - Remove patches/gnome-desktop-02-hicolor-icons.

--- a/base-specs/gnome-mag.spec	Mon Apr 12 18:58:28 2010 +0000
+++ b/base-specs/gnome-mag.spec	Mon Apr 12 22:29:32 2010 +0000
@@ -13,7 +13,7 @@
 Name:         gnome-mag
 License:      LGPL
 Group:        System/Libraries
-Version:      0.16.0
+Version:      0.16.1
 Release:      201
 Distribution: Java Desktop System
 Vendor:       Sun Microsystems, Inc.

--- a/base-specs/gnome-nettool.spec	Mon Apr 12 18:58:28 2010 +0000
+++ b/base-specs/gnome-nettool.spec	Mon Apr 12 22:29:32 2010 +0000
@@ -14,10 +14,10 @@
 Name:               gnome-nettool
 License:	    GPL/LGPL
 Group:		    System/GUI/GNOME
-Version:            2.28.0
+Version:            2.30.0
 Release:	    1
 Summary:	    GNOME Network Tools
-Source:		    http://ftp.gnome.org/pub/GNOME/sources/gnome-nettool/2.28/gnome-nettool-%{version}.tar.bz2
+Source:		    http://ftp.gnome.org/pub/GNOME/sources/gnome-nettool/2.30/gnome-nettool-%{version}.tar.bz2
 #owner:gheet date:2008-09-10 type:feature bugster:6736233
 Patch1:             %{name}-01-sun-patch.diff
 SUNW_BaseDir:       %{_basedir}

--- a/base-specs/libbonoboui.spec	Mon Apr 12 18:58:28 2010 +0000
+++ b/base-specs/libbonoboui.spec	Mon Apr 12 22:29:32 2010 +0000
@@ -25,10 +25,8 @@
 # owner:yippi date:2004-11-23 type:branding
 # Needed to support /usr/share/gnome/gnome-2.0/ui for backwards compatibility.
 Patch1:	      libbonoboui-01-solaris-backcompat.diff
-# owner:jefftsai date:2009-10-15 bugzilla:598362 type:bug 
-Patch2:	      libbonoboui-02-acce.diff
 
-Patch3:       libbonoboui-03-module-sections.diff
+Patch2:       libbonoboui-02-module-sections.diff
 
 URL:          http://www.gnome.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build

--- a/base-specs/libgnomeprint.spec	Mon Apr 12 18:58:28 2010 +0000
+++ b/base-specs/libgnomeprint.spec	Mon Apr 12 22:29:32 2010 +0000
@@ -13,7 +13,7 @@
 Name:         libgnomeprint
 License:      LGPL
 Group:        System/Libraries/GNOME
-Version:      2.18.7
+Version:      2.18.6
 Release:      1
 Distribution: Java Desktop System
 Vendor:	      Sun Microsystems, Inc.
@@ -144,8 +144,6 @@
 %{_mandir}/man3/*
 
 %changelog
-* Mon Mar 12 2010 - [email protected]
-- Bump to 2.18.7.
 * Wed Jan 13 2010 - [email protected]
 - Fix build issue.
 * Fri Mar 13 2009 - [email protected]

--- a/base-specs/libgsf.spec	Mon Apr 12 18:58:28 2010 +0000
+++ b/base-specs/libgsf.spec	Mon Apr 12 22:29:32 2010 +0000
@@ -13,7 +13,7 @@
 Name:			libgsf
 License:		LGPL 2.1
 Group:			System/Libraries
-Version:		1.14.17
+Version:		1.14.18
 Release:	 	1	
 Distribution:		Java Desktop System
 Vendor:			Sun Microsystems, Inc.
@@ -188,6 +188,8 @@
 %{_datadir}/gtk-doc/html/libgsf/*
 
 %changelog
+* Mon Apr 12 2010 - [email protected]
+- Bump to 2.14.18.
 * Sun Feb 14 2010 - [email protected]
 - Bump to 1.14.17.
 * Wed Oct 14 2009 - [email protected]

--- a/base-specs/metacity.spec	Mon Apr 12 18:58:28 2010 +0000
+++ b/base-specs/metacity.spec	Mon Apr 12 22:29:32 2010 +0000
@@ -14,7 +14,7 @@
 Name:         metacity
 License:      GPL
 Group:        System/GUI/GNOME
-Version:      2.30.0
+Version:      2.30.1
 Release:      1
 Distribution: Java Desktop System
 Vendor:       Sun Microsystems, Inc.

--- a/base-specs/nautilus.spec	Mon Apr 12 18:58:28 2010 +0000
+++ b/base-specs/nautilus.spec	Mon Apr 12 22:29:32 2010 +0000
@@ -13,13 +13,13 @@
 Name:         nautilus
 License:      GPL
 Group:        Productivity/File utilities
-Version:      2.29.92.1
+Version:      2.30.0
 Release:      1
 Distribution: Java Desktop System
 Vendor:       Sun Microsystems, Inc.
 Summary:      The GNOME Filemanager
 URL:          http://www.gnome.org
-Source:       http://ftp.gnome.org/pub/GNOME/sources/nautilus/2.29/nautilus-%{version}.tar.bz2
+Source:       http://ftp.gnome.org/pub/GNOME/sources/nautilus/2.30/nautilus-%{version}.tar.bz2
 Source1:      %{name}-po-sun-%{po_sun_version}.tar.bz2
 # NOTE: If the version is bumped the new tarball must be uploaded to the
 #       Sun Download Center. Contact GNOME RE for assistance.
@@ -150,7 +150,7 @@
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
-%patch16 -p1
+#�%patch16 -p1
 
 cp %SOURCE4 icons
 cp %SOURCE5 icons
@@ -252,6 +252,8 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Apr 12 2010 - [email protected]
+- Bump to 2.30.0.
 * Fri Mar 12 2010 - [email protected]
 - Bump to 2.29.92.1.
 * Wed Mar  10 2010 - [email protected]

--- a/base-specs/totem.spec	Mon Apr 12 18:58:28 2010 +0000
+++ b/base-specs/totem.spec	Mon Apr 12 22:29:32 2010 +0000
@@ -14,12 +14,12 @@
 Name:         totem
 License:      GPL v2, LGPL v2, BSD
 Group:        System/GUI/GNOME
-Version:      2.29.92
+Version:      2.30.0
 Release:      1
 Distribution: Java Desktop System
 Vendor:       Sun Microsystems, Inc.
 Summary:      Totem Multimedia Player
-Source:       http://ftp.gnome.org/pub/GNOME/sources/totem/2.29/%{name}-%{version}.tar.bz2
+Source:       http://ftp.gnome.org/pub/GNOME/sources/totem/2.30/%{name}-%{version}.tar.bz2
 Source1:      %{name}-po-sun-%{po_sun_version}.tar.bz2
 %if %build_l10n
 Source2:                 l10n-configure.sh
@@ -161,6 +161,8 @@
 %{_includedir}/totem/*
 
 %changelog
+* Mon Apr 12 2010 - [email protected]
+- Bump to 2.30.0.
 * Fri Mar 19 2010 - [email protected]
 - Bump to 2.29.92.
 * Sun Mar 14 2010 - [email protected]

--- a/patches/brasero-01-load-by-gksu.diff	Mon Apr 12 18:58:28 2010 +0000
+++ b/patches/brasero-01-load-by-gksu.diff	Mon Apr 12 22:29:32 2010 +0000
@@ -24,3 +24,14 @@
  Icon=system-file-manager
  MimeType=x-content/blank-cd;x-content/blank-dvd;x-content/blank-bd;x-content/blank-hddvd;
  StartupNotify=true
+--- brasero-2.29.4/configure.in.orig	2010-04-12 21:27:51.512932723 +0100
++++ brasero-2.29.4/configure.in	2010-04-12 21:28:17.439226641 +0100
+@@ -2,6 +2,8 @@
+ AC_INIT([brasero],[2.30.0])
+ AC_CONFIG_SRCDIR(src/main.c)
+ 
++AC_PROG_LIBTOOL
++
+ BRASERO_MAJOR_VERSION=2
+ BRASERO_MINOR_VERSION=30
+ BRASERO_SUB=0

--- a/patches/control-center-09-about-me.diff	Mon Apr 12 18:58:28 2010 +0000
+++ b/patches/control-center-09-about-me.diff	Mon Apr 12 22:29:32 2010 +0000
@@ -15,17 +15,6 @@
  about_me_button_clicked_cb (GtkDialog *dialog, gint response_id, GnomeAboutMe *me)
  {
  	if (response_id == GTK_RESPONSE_HELP)
-@@ -808,9 +816,7 @@
- 			g_source_remove (me->commit_timeout_id);
- 			about_me_commit (me);
- 		}
--
--		about_me_destroy (me);
--		gtk_main_quit ();
-+		gtk_widget_destroy ((GtkWidget *)dialog);
- 	}
- }
- 
 @@ -879,6 +885,8 @@
  	main_dialog = WID ("about-me-dialog");
  	g_signal_connect (main_dialog, "response",
@@ -35,3 +24,17 @@
  
  	gtk_window_set_resizable (GTK_WINDOW (main_dialog), FALSE);
  	capplet_set_icon (main_dialog, "user-info");
+diff -ruN gnome-control-center-2.30.0.orig/capplets/about-me/gnome-about-me.c gnome-control-center-2.30.0/capplets/about-me/gnome-about-me.c
+--- gnome-control-center-2.30.0.orig/capplets/about-me/gnome-about-me.c	2010-04-12 21:35:17.541021626 +0100
++++ gnome-control-center-2.30.0/capplets/about-me/gnome-about-me.c	2010-04-12 21:38:46.189052309 +0100
+@@ -820,9 +820,7 @@
+ 			g_source_remove (me->commit_timeout_id);
+ 			about_me_commit (me);
+ 		}
+-
+-		about_me_destroy ();
+-		gtk_main_quit ();
++                gtk_widget_destroy ((GtkWidget *)dialog);
+ 	}
+ }
+ 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/firefox3-28-bad-ssl.diff	Mon Apr 12 22:29:32 2010 +0000
@@ -0,0 +1,14 @@
+diff -ruN mozilla-1.9.2.orig/security/nss/cmd/lib/SSLerrs.h mozilla-1.9.2/security/nss/cmd/lib/SSLerrs.h
+--- mozilla-1.9.2.orig/security/nss/cmd/lib/SSLerrs.h	2010-04-12 19:05:10.190559617 +0100
++++ mozilla-1.9.2/security/nss/cmd/lib/SSLerrs.h	2010-04-12 19:06:23.573457823 +0100
+@@ -397,8 +397,8 @@
+ ER3(SSL_ERROR_RENEGOTIATION_NOT_ALLOWED,       (SSL_ERROR_BASE + 112),
+ "Renegotiation is not allowed on this SSL socket.")
+ 
+-ER3(SSL_ERROR_UNSAFE_NEGOTIATION,              (SSL_ERROR_BASE + 113),
++/*ER3(SSL_ERROR_UNSAFE_NEGOTIATION,              (SSL_ERROR_BASE + 113),
+ "Peer attempted old style (potentially vulnerable) handshake.")
+ 
+ ER3(SSL_ERROR_RX_UNEXPECTED_UNCOMPRESSED_RECORD, (SSL_ERROR_BASE + 114),
+-"SSL received an unexpected uncompressed record.")
++"SSL received an unexpected uncompressed record.") */

--- a/patches/gcalctool-01-getline.diff	Mon Apr 12 18:58:28 2010 +0000
+++ b/patches/gcalctool-01-getline.diff	Mon Apr 12 22:29:32 2010 +0000
@@ -1,5 +1,6 @@
---- gcalctool-5.30.0.orig/src/gcalccmd.c        2010-04-12 19:36:47.448967764 +0100
-+++ gcalctool-5.30.0/src/gcalccmd.c     2010-04-12 19:37:18.126222836 +0100
+diff -ruN gcalctool-5.30.0.orig/src/gcalccmd.c gcalctool-5.30.0/src/gcalccmd.c
+--- gcalctool-5.30.0.orig/src/gcalccmd.c	2010-04-12 19:36:47.448967764 +0100
++++ gcalctool-5.30.0/src/gcalccmd.c	2010-04-12 19:37:18.126222836 +0100
 @@ -82,7 +82,8 @@
      while (1) {
          printf("> ");

--- a/patches/gcalctool-01-gtk-tooltips.diff	Mon Apr 12 18:58:28 2010 +0000
+++ b/patches/gcalctool-01-gtk-tooltips.diff	Mon Apr 12 22:29:32 2010 +0000
@@ -80,3 +80,16 @@
              }
              g_object_set_data(G_OBJECT(Gtk_buttons[n]),
                                "button", &buttons[n]);
+diff -ruN gcalctool-5.30.0.orig/src/gcalccmd.c gcalctool-5.30.0/src/gcalccmd.c
+--- gcalctool-5.30.0.orig/src/gcalccmd.c	2010-04-12 19:36:47.448967764 +0100
++++ gcalctool-5.30.0/src/gcalccmd.c	2010-04-12 19:37:18.126222836 +0100
+@@ -82,7 +82,8 @@
+     while (1) {
+         printf("> ");
+         equation = (char *) malloc(MAXLINE * sizeof(char));
+-        bytes_read = getline(&equation, &nbytes, stdin);
++        #bytes_read = getline(&equation, &nbytes, stdin);
++        bytes_read = fgets(&equation, &nbytes, stdin);
+ 
+         if (bytes_read != -1) {
+             str_adjust(equation);

--- a/patches/gnome-mag-01-x11-build-error.diff	Mon Apr 12 18:58:28 2010 +0000
+++ b/patches/gnome-mag-01-x11-build-error.diff	Mon Apr 12 22:29:32 2010 +0000
@@ -11,14 +11,3 @@
  
  enum {
  	STRUT_LEFT = 0,
-diff -ruN gnome-mag-0.16.0.orig/configure.in gnome-mag-0.16.0/configure.in
---- gnome-mag-0.16.0.orig/configure.in	2010-02-16 08:11:31.638602086 +0000
-+++ gnome-mag-0.16.0/configure.in	2010-02-16 08:12:06.568757744 +0000
-@@ -322,7 +322,6 @@
- fi
- 
- AC_SUBST(CB_POT)
--AM_SUBST_NOTMAKE(CB_POT)
- 
- AC_OUTPUT([
- Makefile

--- a/patches/gnome-nettool-01-sun-patch.diff	Mon Apr 12 18:58:28 2010 +0000
+++ b/patches/gnome-nettool-01-sun-patch.diff	Mon Apr 12 22:29:32 2010 +0000
@@ -142,15 +142,6 @@
  		if (netinfo->stbar_text)
  			g_free (netinfo->stbar_text);
  		netinfo->stbar_text = g_strdup (_("Getting routing table"));
-@@ -485,7 +493,7 @@
- 	g_return_if_fail (line != NULL);
- 
- 	count = strip_route_line (line, &data);
--#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
-+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(sun)
- 	if (count == 6) {
- #else
- 	if ((count == 8) || (count == 7)) {
 @@ -541,7 +549,11 @@
  		gtk_list_store_set (GTK_LIST_STORE (model), &iter,
  					0, data.destination,
@@ -163,15 +154,6 @@
  					3, data.iface, -1);
  
  		gtk_tree_view_set_model (widget, model);
-@@ -562,7 +574,7 @@
- 	gchar **items;
- #endif
- 
--#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
-+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(sun)
- 	count = sscanf (line, NETSTAT_ROUTE_FORMAT,
- 			data->destination,
- 			data->gateway, flags,
 @@ -718,9 +730,15 @@
  	gint count = 0;
  	gint members;
@@ -314,3 +296,24 @@
  #if (GLIB_MINOR_VERSION < 2)
  
  #  define _g_vsprintf  vsprintf
+diff -ruN gnome-nettool-2.30.0.orig/src/netstat.c gnome-nettool-2.30.0/src/netstat.c
+--- gnome-nettool-2.30.0.orig/src/netstat.c	2010-04-12 22:19:53.848593242 +0100
++++ gnome-nettool-2.30.0/src/netstat.c	2010-04-12 22:21:14.229846239 +0100
+@@ -493,7 +493,7 @@
+ 	g_return_if_fail (line != NULL);
+ 
+ 	count = strip_route_line (line, &data);
+-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(sun)
+ 	if (count == 6) {
+ #else
+ 	if ((count == 8) || (count == 7)) {
+@@ -574,7 +574,7 @@
+ 	gchar **items;
+ #endif
+ 
+-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(sun)
+ 	count = sscanf (line, NETSTAT_ROUTE_FORMAT,
+ 			data->destination,
+ 			data->gateway, flags,

--- a/patches/totem-01-remove-unsupported-format.diff	Mon Apr 12 18:58:28 2010 +0000
+++ b/patches/totem-01-remove-unsupported-format.diff	Mon Apr 12 22:29:32 2010 +0000
@@ -24,14 +24,6 @@
  application/x-extension-m4a
  application/x-extension-mp4
  application/x-flac
-@@ -29,7 +28,6 @@ audio/mpeg
- audio/mpegurl
- audio/ogg
- audio/prs.sid
--audio/vnd.rn-realaudio
- audio/x-ape
- audio/x-flac
- audio/x-gsm
 @@ -47,12 +45,8 @@ audio/x-ms-wma
  audio/x-musepack
  audio/x-pn-aiff
@@ -61,3 +53,14 @@
  video/vnd.vivo
  video/x-anim
  video/x-avi
+diff -ruN totem-2.30.0.orig/data/mime-type-list.txt totem-2.30.0/data/mime-type-list.txt
+--- totem-2.30.0.orig/data/mime-type-list.txt	2010-04-12 22:01:14.632291275 +0100
++++ totem-2.30.0/data/mime-type-list.txt	2010-04-12 22:01:41.145205829 +0100
+@@ -28,7 +28,6 @@
+ audio/mpegurl
+ audio/ogg
+ audio/prs.sid
+-audio/vnd.rn-realaudio
+ audio/x-aiff
+ audio/x-ape
+ audio/x-flac

--- a/patches/totem-pl-parser-04-memmem.diff	Mon Apr 12 18:58:28 2010 +0000
+++ b/patches/totem-pl-parser-04-memmem.diff	Mon Apr 12 22:29:32 2010 +0000
@@ -1,13 +1,13 @@
-ff -ruN totem-pl-parser-2.30.0.orig/configure.in totem-pl-parser-2.30.0/configure.in
---- totem-pl-parser-2.30.0.orig/configure.in    2010-04-12 16:02:53.859350525 +0100
-+++ totem-pl-parser-2.30.0/configure.in 2010-04-12 16:05:04.469502260 +0100
+diff -ruN totem-pl-parser-2.30.0.orig/configure.in totem-pl-parser-2.30.0/configure.in
+--- totem-pl-parser-2.30.0.orig/configure.in	2010-04-12 19:09:41.297986410 +0100
++++ totem-pl-parser-2.30.0/configure.in	2010-04-12 19:10:46.593613814 +0100
 @@ -71,8 +71,8 @@
  
  if test "x$enable_gmime" = "xyes" ; then
     PKG_CHECK_MODULES(GMIME,  
--                    gmime-2.4,
+-		     gmime-2.4,
 -                     [have_gmime=yes GMIME=gmime-2.4], 
-+                    gmime-2.6,
++		     gmime-2.6,
 +                     [have_gmime=yes GMIME=gmime-2.6], 
                       [have_gmime=no])
     if test "x$have_gmime" != "xyes" ; then