--- a/ChangeLog	Tue May 15 02:25:41 2012 +0000
+++ b/ChangeLog	Tue May 15 06:38:17 2012 +0000
@@ -1,3 +1,11 @@
+2012-05-14  Brian Cameron  <[email protected]>
+
+	* base-specs/gtk3.spec, patches/gtk3+-01-libtool.diff: Remove patch no
+	  longer needed.
+	* base-specs/pulseaudio.spec, patches/pulseaudio-02-solaris.diff: 
+	  patches/libgc-02-rename-libbgc.diff,
+	  patches/libcanberra-01-solaris.diff: build with latest autotools.
+
 2012-05-14  Brian Cameron  <[email protected]>
 
 	* copyright/SUNWgnome-cd.copyright,

--- a/base-specs/gtk3.spec	Tue May 15 02:25:41 2012 +0000
+++ b/base-specs/gtk3.spec	Tue May 15 06:38:17 2012 +0000
@@ -59,14 +59,12 @@
 Patch16:      gtk+-16-remove-papi.diff
 # date:2012-03-27 owner:padraig type:bug bugster:7149817
 Patch17:      gtk+-17-unregister-callback.diff
-# date:2010-07-16 owner:yippi type:branding
-Patch30:      gtk3+-01-libtool.diff
 # date:2010-07-16 owner:yippi type:bug bugzilla:654720
-Patch31:      gtk3+-02-configure.diff
+Patch30:      gtk3+-01-configure.diff
 # This just worksaround a compile issue and should be fixed properly.
-Patch32:      gtk3+-03-disable-papi.diff
+Patch31:      gtk3+-02-disable-papi.diff
 # date:2012-05-02 owner:yippi type:bug
-Patch33:      gtk3+-04-compile.diff
+Patch32:      gtk3+-03-compile.diff
 
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Docdir:       %{_defaultdocdir}/doc
@@ -155,7 +153,6 @@
 %patch30 -p1
 %patch31 -p1
 %patch32 -p1
-%patch33 -p1
 
 %build
 %ifos linux
@@ -216,9 +213,7 @@
 install -d $RPM_BUILD_ROOT%{_datadir}/locale/zh_HK/LC_MESSAGES
 install --mode=0644 $RPM_BUILD_ROOT%{_datadir}/locale/zh_TW/LC_MESSAGES/*.mo $RPM_BUILD_ROOT%{_datadir}/locale/zh_HK/LC_MESSAGES/
 
-rm $RPM_BUILD_ROOT%{_libdir}/gtk-3.0/*/printbackends/*.a
 rm $RPM_BUILD_ROOT%{_libdir}/gtk-3.0/*/printbackends/*.la
-rm $RPM_BUILD_ROOT%{_libdir}/*.a
 rm $RPM_BUILD_ROOT%{_libdir}/*.la
 
 %clean

--- a/base-specs/pulseaudio.spec	Tue May 15 02:25:41 2012 +0000
+++ b/base-specs/pulseaudio.spec	Tue May 15 06:38:17 2012 +0000
@@ -68,6 +68,8 @@
 # Need to specify /usr/include/gc as an include directory since the atomic_ops
 # headers are delivered there on Solaris.
 #
+export ACLOCAL=aclocal-1.11
+export AUTOMAKE=automake-1.11
 export CPPFLAGS="-xc99"
 export LDFLAGS="$SOLARIS_PULSE_LDFLAGS"
 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gtk3+-01-configure.diff	Tue May 15 06:38:17 2012 +0000
@@ -0,0 +1,19 @@
+--- gtk+-3.1.12/configure.ac-orig	2011-08-18 07:12:43.425834135 -0500
++++ gtk+-3.1.12/configure.ac	2011-08-18 07:13:06.216930259 -0500
+@@ -177,6 +177,7 @@ dnl Check for a working C++ compiler, bu
+ dnl We use this for an automated test for C++ header correctness.
+ dnl
+ AC_CHECK_TOOLS(CXX, [$CCC c++ g++ gcc CC cxx cc++ cl], gcc)
++AC_PROG_CXX
+ AC_LANG_PUSH([C++])
+ 
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]],
+@@ -191,7 +192,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@in
+                   [OBJC=yes],[OBJC=no])
+ AM_CONDITIONAL(HAVE_OBJC, test "$OBJC" = "yes")
+ CXXFLAGS="$gtk_save_cxxflags"
+-AC_LANG_POP([C++])
++#AC_LANG_POP([C++])
+ 
+ if test "$os_win32" = "yes"; then
+   if test x$enable_static = xyes -o x$enable_static = x; then

--- a/patches/gtk3+-01-libtool.diff	Tue May 15 02:25:41 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
---- gtk+-3.1.8/configure.ac-orig	2011-07-05 20:26:51.103407687 -0500
-+++ gtk+-3.1.8/configure.ac	2011-07-05 20:27:25.082457299 -0500
-@@ -59,6 +59,8 @@ AC_SUBST(CAIRO_REQUIRED_VERSION)
- AC_SUBST(GDK_PIXBUF_REQUIRED_VERSION)
- AC_SUBST(INTROSPECTION_REQUIRED_VERSION)
- 
-+AC_PROG_LIBTOOL
-+
- # Save this value here, since automake will set cflags later
- cflags_set=${CFLAGS+set}
- 
-@@ -199,12 +201,6 @@ if test "$os_win32" = "yes"; then
-   enable_shared=yes
- fi
- 
--dnl Initialize libtool
--LT_PREREQ([2.2.6])
--LT_INIT([disable-static win32-dll])
--# Create libtool early, because it's used in configure
--LT_OUTPUT
--
- # Make sure we use 64-bit versions of various file stuff.
- AC_SYS_LARGEFILE
- 

--- a/patches/gtk3+-02-configure.diff	Tue May 15 02:25:41 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
---- gtk+-3.1.12/configure.ac-orig	2011-08-18 07:12:43.425834135 -0500
-+++ gtk+-3.1.12/configure.ac	2011-08-18 07:13:06.216930259 -0500
-@@ -177,6 +177,7 @@ dnl Check for a working C++ compiler, bu
- dnl We use this for an automated test for C++ header correctness.
- dnl
- AC_CHECK_TOOLS(CXX, [$CCC c++ g++ gcc CC cxx cc++ cl], gcc)
-+AC_PROG_CXX
- AC_LANG_PUSH([C++])
- 
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]],
-@@ -191,7 +192,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@in
-                   [OBJC=yes],[OBJC=no])
- AM_CONDITIONAL(HAVE_OBJC, test "$OBJC" = "yes")
- CXXFLAGS="$gtk_save_cxxflags"
--AC_LANG_POP([C++])
-+#AC_LANG_POP([C++])
- 
- if test "$os_win32" = "yes"; then
-   if test x$enable_static = xyes -o x$enable_static = x; then

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gtk3+-02-disable-papi.diff	Tue May 15 06:38:17 2012 +0000
@@ -0,0 +1,32 @@
+--- gtk+-3.1.8/modules/printbackends/papi/gtkprintbackendpapi.c-orig	2011-07-06 01:27:53.885698174 -0500
++++ gtk+-3.1.8/modules/printbackends/papi/gtkprintbackendpapi.c	2011-07-06 01:34:39.807351164 -0500
+@@ -426,10 +426,12 @@ gtk_print_backend_papi_print_stream (Gtk
+   else if (val == GTK_PRINT_DUPLEX_VERTICAL)
+     papiAttributeListAddString (&attrs, PAPI_ATTR_EXCL, "Duplex", "DuplexTumble");
+ 
++#if 0
+   if (job->num_copies > 1) 
+     {
+       papiAttributeListAddInteger (&attrs, PAPI_ATTR_EXCL, "copies", job->num_copies); 
+     }
++#endif
+ 
+   prtnm = strdup (gtk_printer_get_name (GTK_PRINTER(printer)));
+ 
+@@ -773,6 +775,7 @@ papi_printer_prepare_for_print (GtkPrint
+   GtkPaperSize *papersize = NULL;
+   char *ppd_paper_name;
+ 
++#if 0
+   print_job->print_pages = gtk_print_settings_get_print_pages (settings);
+   print_job->page_ranges = NULL;
+   print_job->num_page_ranges = 0;
+@@ -802,7 +805,7 @@ papi_printer_prepare_for_print (GtkPrint
+     print_job->page_set = GTK_PAGE_SET_ALL;
+ 
+   print_job->rotate_to_orientation = TRUE;
+-
++#endif
+ }
+ 
+ gboolean

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gtk3+-03-compile.diff	Tue May 15 06:38:17 2012 +0000
@@ -0,0 +1,51 @@
+--- gtk+-3.4.1/gdk/x11/gdkwindow-x11.c-orig	2012-05-02 10:20:25.362968583 -0500
++++ gtk+-3.4.1/gdk/x11/gdkwindow-x11.c	2012-05-02 10:20:43.083360771 -0500
+@@ -3199,7 +3199,7 @@ void
+ gdk_x11_window_set_theme_variant (GdkWindow *window,
+                                   char      *variant)
+ {
+-  return gdk_x11_window_set_utf8_property (window, "_GTK_THEME_VARIANT", variant);
++  gdk_x11_window_set_utf8_property (window, "_GTK_THEME_VARIANT", variant);
+ }
+ 
+ #define GDK_SELECTION_MAX_SIZE(display)                                 \
+--- gtk+-3.4.1/gtk/gtkapplicationwindow.c-orig	2012-05-02 12:00:46.348150665 -0500
++++ gtk+-3.4.1/gtk/gtkapplicationwindow.c	2012-05-02 12:03:20.455778494 -0500
+@@ -519,7 +519,7 @@ gtk_application_window_activate_action (
+ {
+   GtkApplicationWindow *window = GTK_APPLICATION_WINDOW (group);
+ 
+-  return g_action_group_activate_action (G_ACTION_GROUP (window->priv->actions), action_name, parameter);
++  g_action_group_activate_action (G_ACTION_GROUP (window->priv->actions), action_name, parameter);
+ }
+ 
+ static void
+@@ -529,7 +529,7 @@ gtk_application_window_change_action_sta
+ {
+   GtkApplicationWindow *window = GTK_APPLICATION_WINDOW (group);
+ 
+-  return g_action_group_change_action_state (G_ACTION_GROUP (window->priv->actions), action_name, state);
++  g_action_group_change_action_state (G_ACTION_GROUP (window->priv->actions), action_name, state);
+ }
+ 
+ static GAction *
+--- gtk+-3.4.1/gtk/gtkbitmaskprivateimpl.h-orig	2012-05-02 12:07:59.207487957 -0500
++++ gtk+-3.4.1/gtk/gtkbitmaskprivateimpl.h	2012-05-02 12:08:10.986408477 -0500
+@@ -38,7 +38,7 @@ static inline void
+ _gtk_bitmask_free (GtkBitmask *mask)
+ {
+   if (_gtk_bitmask_is_allocated (mask))
+-    return _gtk_allocated_bitmask_free (mask);
++    _gtk_allocated_bitmask_free (mask);
+ }
+ 
+ static inline char *
+@@ -55,7 +55,7 @@ static inline void
+ _gtk_bitmask_print (const GtkBitmask *mask,
+                     GString          *string)
+ {
+-  return _gtk_allocated_bitmask_print (mask, string);
++  _gtk_allocated_bitmask_print (mask, string);
+ }
+ 
+ static inline GtkBitmask *

--- a/patches/gtk3+-03-disable-papi.diff	Tue May 15 02:25:41 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
---- gtk+-3.1.8/modules/printbackends/papi/gtkprintbackendpapi.c-orig	2011-07-06 01:27:53.885698174 -0500
-+++ gtk+-3.1.8/modules/printbackends/papi/gtkprintbackendpapi.c	2011-07-06 01:34:39.807351164 -0500
-@@ -426,10 +426,12 @@ gtk_print_backend_papi_print_stream (Gtk
-   else if (val == GTK_PRINT_DUPLEX_VERTICAL)
-     papiAttributeListAddString (&attrs, PAPI_ATTR_EXCL, "Duplex", "DuplexTumble");
- 
-+#if 0
-   if (job->num_copies > 1) 
-     {
-       papiAttributeListAddInteger (&attrs, PAPI_ATTR_EXCL, "copies", job->num_copies); 
-     }
-+#endif
- 
-   prtnm = strdup (gtk_printer_get_name (GTK_PRINTER(printer)));
- 
-@@ -773,6 +775,7 @@ papi_printer_prepare_for_print (GtkPrint
-   GtkPaperSize *papersize = NULL;
-   char *ppd_paper_name;
- 
-+#if 0
-   print_job->print_pages = gtk_print_settings_get_print_pages (settings);
-   print_job->page_ranges = NULL;
-   print_job->num_page_ranges = 0;
-@@ -802,7 +805,7 @@ papi_printer_prepare_for_print (GtkPrint
-     print_job->page_set = GTK_PAGE_SET_ALL;
- 
-   print_job->rotate_to_orientation = TRUE;
--
-+#endif
- }
- 
- gboolean

--- a/patches/gtk3+-04-compile.diff	Tue May 15 02:25:41 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
---- gtk+-3.4.1/gdk/x11/gdkwindow-x11.c-orig	2012-05-02 10:20:25.362968583 -0500
-+++ gtk+-3.4.1/gdk/x11/gdkwindow-x11.c	2012-05-02 10:20:43.083360771 -0500
-@@ -3199,7 +3199,7 @@ void
- gdk_x11_window_set_theme_variant (GdkWindow *window,
-                                   char      *variant)
- {
--  return gdk_x11_window_set_utf8_property (window, "_GTK_THEME_VARIANT", variant);
-+  gdk_x11_window_set_utf8_property (window, "_GTK_THEME_VARIANT", variant);
- }
- 
- #define GDK_SELECTION_MAX_SIZE(display)                                 \
---- gtk+-3.4.1/gtk/gtkapplicationwindow.c-orig	2012-05-02 12:00:46.348150665 -0500
-+++ gtk+-3.4.1/gtk/gtkapplicationwindow.c	2012-05-02 12:03:20.455778494 -0500
-@@ -519,7 +519,7 @@ gtk_application_window_activate_action (
- {
-   GtkApplicationWindow *window = GTK_APPLICATION_WINDOW (group);
- 
--  return g_action_group_activate_action (G_ACTION_GROUP (window->priv->actions), action_name, parameter);
-+  g_action_group_activate_action (G_ACTION_GROUP (window->priv->actions), action_name, parameter);
- }
- 
- static void
-@@ -529,7 +529,7 @@ gtk_application_window_change_action_sta
- {
-   GtkApplicationWindow *window = GTK_APPLICATION_WINDOW (group);
- 
--  return g_action_group_change_action_state (G_ACTION_GROUP (window->priv->actions), action_name, state);
-+  g_action_group_change_action_state (G_ACTION_GROUP (window->priv->actions), action_name, state);
- }
- 
- static GAction *
---- gtk+-3.4.1/gtk/gtkbitmaskprivateimpl.h-orig	2012-05-02 12:07:59.207487957 -0500
-+++ gtk+-3.4.1/gtk/gtkbitmaskprivateimpl.h	2012-05-02 12:08:10.986408477 -0500
-@@ -38,7 +38,7 @@ static inline void
- _gtk_bitmask_free (GtkBitmask *mask)
- {
-   if (_gtk_bitmask_is_allocated (mask))
--    return _gtk_allocated_bitmask_free (mask);
-+    _gtk_allocated_bitmask_free (mask);
- }
- 
- static inline char *
-@@ -55,7 +55,7 @@ static inline void
- _gtk_bitmask_print (const GtkBitmask *mask,
-                     GString          *string)
- {
--  return _gtk_allocated_bitmask_print (mask, string);
-+  _gtk_allocated_bitmask_print (mask, string);
- }
- 
- static inline GtkBitmask *

--- a/patches/libcanberra-01-solaris.diff	Tue May 15 02:25:41 2012 +0000
+++ b/patches/libcanberra-01-solaris.diff	Tue May 15 06:38:17 2012 +0000
@@ -1,36 +1,10 @@
---- libcanberra-0.26/configure.ac-orig	2010-06-14 13:40:45.221735831 -0500
-+++ libcanberra-0.26/configure.ac	2010-06-14 13:41:18.525027478 -0500
-@@ -23,7 +23,7 @@ m4_define([ca_major],[0])
- m4_define([ca_minor],[28])
- m4_define([ca_version],[ca_major.ca_minor])
- 
--AC_PREREQ(2.63)
-+AC_PREREQ(2.61)
- 
- AC_INIT([libcanberra],[ca_version],[mzyvopnaoreen (at) 0pointer (dot) de])
- AC_CONFIG_SRCDIR([src/common.c])
-@@ -63,14 +63,8 @@ AC_USE_SYSTEM_EXTENSIONS
+--- libcanberra-0.28/configure.ac-orig	2012-05-15 00:30:35.175801936 -0500
++++ libcanberra-0.28/configure.ac	2012-05-15 00:31:42.161745065 -0500
+@@ -63,7 +63,6 @@ AC_USE_SYSTEM_EXTENSIONS
  
  AC_PROG_CXX
  
 -DESIRED_FLAGS="-Wall -W -Wextra -pedantic -pipe -Wno-long-long -Winline -Wvla -Wno-overlength-strings -Wunsafe-loop-optimizations -Wundef -Wformat=2 -Wlogical-op -Wsign-compare -Wpacked -Wformat-security -Wmissing-include-dirs -Wformat-nonliteral -Wold-style-definition -Wpointer-arith -Winit-self -Wdeclaration-after-statement -Wfloat-equal -Wmissing-declarations -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls -Wmissing-noreturn -Wshadow -Wendif-labels -Wstrict-aliasing=2 -Wcast-align -Wwrite-strings -Wno-unused-parameter -ffast-math -Wp,-D_FORTIFY_SOURCE=2 -fno-common -fdiagnostics-show-option -fno-strict-aliasing"
--
--for flag in $DESIRED_FLAGS ; do
--  CC_CHECK_CFLAGS([$flag], [CFLAGS="$CFLAGS $flag"])
--done
--
- #### libtool stuff ####
--LT_PREREQ(2.2)
-+AC_PROG_LIBTOOL
- LT_INIT([dlopen win32-dll disable-static])
  
- dnl Unfortunately, even up to libtool 2.2.6a there is no way to know
-@@ -91,7 +85,7 @@ dnl can give the proper place to find li
- dnl variables like LDFLAGS and CPPFLAGS.
- 
- AC_CHECK_HEADER([ltdl.h],
--    [AC_CHECK_LIB([ltdl], [lt_dladvise_init], [LIBLTDL=-lltdl], [LIBLTDL=])],
-+    [AC_CHECK_LIB([ltdl], [lt_dlclose], [LIBLTDL=-lltdl], [LIBLTDL=])],
-     [LIBLTDL=])
- 
- AS_IF([test "x$LIBLTDL" = "x"],
+ for flag in $DESIRED_FLAGS ; do
+   CC_CHECK_CFLAGS([$flag], [CFLAGS="$CFLAGS $flag"])

--- a/patches/libgc-02-rename-libbgc.diff	Tue May 15 02:25:41 2012 +0000
+++ b/patches/libgc-02-rename-libbgc.diff	Tue May 15 06:38:17 2012 +0000
@@ -125,14 +125,3 @@
 -Libs: -L${libdir} -lgc
 +Libs: -L${libdir} -lbgc
  Cflags: -I${includedir}
---- gc-7.2alpha6/configure.ac-orig	2011-09-09 12:07:17.917200158 -0500
-+++ gc-7.2alpha6/configure.ac	2011-09-09 12:07:22.910365110 -0500
-@@ -22,7 +22,7 @@ AC_INIT(gc,7.2alpha6,[email protected])
- AC_CONFIG_SRCDIR(gcj_mlc.c)
- AC_CONFIG_MACRO_DIR([m4])
- AC_CANONICAL_TARGET
--AC_PREREQ(2.64)
-+AC_PREREQ(2.63)
- AC_REVISION($Revision: 1.67 $)
- GC_SET_VERSION
- AM_INIT_AUTOMAKE([foreign dist-bzip2 nostdinc])

--- a/patches/pulseaudio-02-solaris.diff	Tue May 15 02:25:41 2012 +0000
+++ b/patches/pulseaudio-02-solaris.diff	Tue May 15 06:38:17 2012 +0000
@@ -52,15 +52,6 @@
  ])
 --- pulseaudio-0.99.2/configure.ac-orig	2011-09-19 11:46:56.537031090 -0500
 +++ pulseaudio-0.99.2/configure.ac	2011-09-19 11:45:16.405113983 -0500
-@@ -26,7 +26,7 @@ AC_INIT([pulseaudio],[m4_esyscmd(./git-v
- AC_CONFIG_SRCDIR([src/daemon/main.c])
- AC_CONFIG_MACRO_DIR([m4])
- AC_CONFIG_HEADERS([config.h])
--AM_INIT_AUTOMAKE([foreign 1.11 -Wall -Wno-portability silent-rules dist-xz tar-ustar])
-+AM_INIT_AUTOMAKE([foreign 1.10 -Wall -Wno-portability tar-ustar])
- 
- m4_define(pa_major, `echo $VERSION | cut -d. -f1 | cut -d- -f1`)
- m4_define(pa_minor, `echo $VERSION | cut -d. -f2 | cut -d- -f1`)
 @@ -64,7 +64,7 @@ AS_IF([test "x$STOW" = "xyes" && test -d
      ac_default_prefix="/usr/local/stow/${PACKAGE_NAME}-${PACKAGE_VERSION}"
  ])