--- a/ChangeLog	Thu Aug 14 09:28:16 2008 +0000
+++ b/ChangeLog	Thu Aug 14 12:02:48 2008 +0000
@@ -1,3 +1,15 @@
+2008-08-14  Damien Carbery <[email protected]>
+
+	* base-specs/gedit.spec: Bump to 2.23.3. Remove upstream patches
+	  02-void-return and 03-func-mismatch. Add patch,
+	  02-gthread-dependency, to add gthread-2.0 dependency to fix build
+	  failure.
+	* patches/gedit-02-gthread-dependency.diff: Added to fix #547756.
+	* patches/gedit-02-void-return.diff,
+	  patches/gedit-03-func-mismatch.diff: Deleted, upstream.
+	* SUNWgnome-text-editor.spec: Add BuildRequires SUNWwxinc for sm.pc and
+	  SUNWlxml-devel for libxml-2.0.pc (both referenced in configure.ac).
+
 2008-08-14 Erwann Chenede - <[email protected]>
 
 	* base-specs/nimbus.spec: bumped to 0.0.17

--- a/SUNWgnome-text-editor.spec	Thu Aug 14 09:28:16 2008 +0000
+++ b/SUNWgnome-text-editor.spec	Thu Aug 14 12:02:48 2008 +0000
@@ -38,6 +38,8 @@
 Requires: SUNWpostrun
 Requires: SUNWgnome-gtksourceview
 Requires: SUNWgnome-spell
+BuildRequires: SUNWxwinc
+BuildRequires: SUNWlxml-devel
 BuildRequires: SUNWgnome-base-libs-devel
 BuildRequires: SUNWgnome-config-devel
 BuildRequires: SUNWgnome-vfs-devel
@@ -198,6 +200,9 @@
 %{_includedir}/*
 
 %changelog
+* Sun Oct 07 2007 - [email protected]
+- Add BuildRequires SUNWwxinc for sm.pc and SUNWlxml-devel for libxml-2.0.pc
+  (both referenced in configure.ac).
 * Thu Jan  3 2008 - [email protected]
 - use gconf-install.script instead of an inline script
 * Sun Oct 07 2007 - [email protected]

--- a/base-specs/gedit.spec	Thu Aug 14 09:28:16 2008 +0000
+++ b/base-specs/gedit.spec	Thu Aug 14 12:02:48 2008 +0000
@@ -11,7 +11,7 @@
 Name:		gedit
 License:	GPL
 Group:		System/GUI/GNOME
-Version:	2.23.1
+Version:	2.23.3
 Release:	1
 Distribution:	Java Desktop System
 Vendor:		Sun Microsystems, Inc.
@@ -23,10 +23,8 @@
 %endif
 # date:2006-06-06 owner:gman type:branding
 Patch1:         gedit-01-menu-entry.diff
-# date:2008-06-05 owner:dcarbery type:bug bugzilla:536789 state:upstream
-Patch2:         gedit-02-void-return.diff
-# date:2008-06-05 owner:dcarbery type:bug bugzilla:536809 state:upstream
-Patch3:         gedit-03-func-mismatch.diff
+# date:2008-08-14 owner:dcarbery type:bug bugzilla:547756
+Patch2:         gedit-02-gthread-dependency.diff
 URL:            http://www.gnome.org
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Docdir:         %{_docdir}/doc
@@ -76,7 +74,6 @@
 %endif
 %patch1 -p1
 %patch2 -p1
-%patch3 -p0
 
 %build
 %ifos linux
@@ -158,6 +155,11 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Thu Aug 14 2008 - [email protected]
+- Bump to 2.23.3. Remove upstream patches 02-void-return and 03-func-mismatch.
+  Add patch, 02-gthread-dependency, to add gthread-2.0 dependency to fix build
+  failure.
+
 * Thu Jun 05 2008 - [email protected]
 - Add patch 03-func-mismatch to fix bugzilla 536809. Variable type in function
   declaration and definition did not match and broke build.

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gedit-02-gthread-dependency.diff	Thu Aug 14 12:02:48 2008 +0000
@@ -0,0 +1,10 @@
+--- gedit-2.23.3/configure.ac.orig	2008-08-14 12:15:48.685278896 +0100
++++ gedit-2.23.3/configure.ac	2008-08-14 12:19:25.067621503 +0100
+@@ -166,6 +166,7 @@
+ 	sm >= 1.0.0
+ 	libxml-2.0 >= 2.5.0
+ 	glib-2.0 >= 2.13.0
++	gthread-2.0 >= 2.13.0
+ 	gio-2.0 >= 2.16.0
+ 	gtk+-2.0 >= 2.13.0
+ 	gtksourceview-2.0 >= 2.2.0

--- a/patches/gedit-02-void-return.diff	Thu Aug 14 09:28:16 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- gedit-2.23.1/gedit/gedit-module.c.orig	2008-06-05 12:40:59.400913571 +0100
-+++ gedit-2.23.1/gedit/gedit-module.c	2008-06-05 12:41:05.038083720 +0100
-@@ -226,7 +226,7 @@
- gedit_module_class_garbage_collect (GeditModuleClass *klass)
- {
- 	g_return_if_fail (GEDIT_IS_MODULE_CLASS (klass));
--	return GEDIT_MODULE_CLASS (klass)->garbage_collect ();
-+	GEDIT_MODULE_CLASS (klass)->garbage_collect ();
- }
- 
- GObject *

--- a/patches/gedit-03-func-mismatch.diff	Thu Aug 14 09:28:16 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
---- plugins/filebrowser/gedit-file-browser-store.c.orig	2008-06-05 14:26:38.986142579 +0100
-+++ plugins/filebrowser/gedit-file-browser-store.c	2008-06-05 14:29:18.289464860 +0100
-@@ -181,10 +181,10 @@
- static void next_files_async 				    (GFileEnumerator * enumerator,
- 							     FileBrowserNodeDir * dir);
- 
--static void on_directory_monitor_event                      (GFileMonitor * handle,
--							     GFile *monitor_file,
-+static void on_directory_monitor_event                      (GFileMonitor * monitor,
-+							     GFile * file,
- 							     GFile * info_file,
--							     guint event_type,
-+							     GFileMonitorEvent event_type,
- 							     FileBrowserNode * parent);
- 
- GEDIT_PLUGIN_DEFINE_TYPE_WITH_CODE (GeditFileBrowserStore, gedit_file_browser_store,