--- a/Solaris/SUNWgnome-panel.spec	Tue Mar 16 19:41:58 2004 +0000
+++ b/Solaris/SUNWgnome-panel.spec	Tue Mar 16 23:36:03 2004 +0000
@@ -206,7 +206,7 @@
 export PERL5LIB=%{_prefix}/perl5/site_perl/5.6.1/sun4-solaris-64int
 export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
 export PKG_CONFIG_PATH="../gnome-desktop-%{gdesktop.version}/libgnome-desktop:../libwnck-%{lwnck.version}:../gnome-panel-%{gpanel.version}/libpanel-applet:../libxklavier-%{libxkl.version}:%{_libdir}/pkgconfig:/usr/lib/pkgconfig"
-export CFLAGS="%optflags -I/usr/sfw/include -DANSICPP -D__STDC_VERSION__=199901L"
+export CFLAGS="%optflags -I/usr/sfw/include -DANSICPP -D__STDC_VERSION__=199901L -g"
 export RPM_OPT_FLAGS="$CFLAGS"
 export CPPFLAGS="-I/usr/sfw/include"
 export LDFLAGS="-L/usr/sfw/lib -R/usr/sfw/lib -L%{_libdir} -R%{_libdir}"
@@ -214,7 +214,7 @@
 
 %lwnck.build -d %name-%version
 
-export CFLAGS="%optflags -I/usr/sfw/include -DANSICPP"
+export CFLAGS="%optflags -I/usr/sfw/include -DANSICPP -g"
 export RPM_OPT_FLAGS="$CFLAGS"
 %gdesktop.build -d %name-%version
 
@@ -222,12 +222,12 @@
 
 %libxkl.build -d %name-%version
 
-export CFLAGS="%optflags -I/usr/sfw/include -I%{_builddir}/%name-%version/libxklavier-%{libxkl.version} -DANSICPP"
+export CFLAGS="%optflags -I/usr/sfw/include -I%{_builddir}/%name-%version/libxklavier-%{libxkl.version} -DANSICPP -g"
 export RPM_OPT_FLAGS="$CFLAGS"
 export LDFLAGS="-L/usr/sfw/lib -R/usr/sfw/lib -L%{_builddir}/%name-%version/libxklavier-%{libxkl.version}/libxklavier -L%{_libdir} -R%{_libdir}"
 %gapplets.build -d %name-%version
 
-export CFLAGS="%optflags -I/usr/sfw/include -DANSICPP"
+export CFLAGS="%optflags -I/usr/sfw/include -DANSICPP -g"
 export RPM_OPT_FLAGS="$CFLAGS"
 export LDFLAGS="-L/usr/sfw/lib -R/usr/sfw/lib -L%{_libdir} -R%{_libdir}"
 #%gaddress.build -d %name-%version
@@ -238,7 +238,7 @@
 
 %libical.build -d %name-%version
 
-export CFLAGS="%optflags -I%{_includedir} -I/usr/sfw/include -I%{_builddir}/%name-%version/libical-%{libical.version}/src/libical -DANSICPP"
+export CFLAGS="%optflags -I%{_includedir} -I/usr/sfw/include -I%{_builddir}/%name-%version/libical-%{libical.version}/src/libical -DANSICPP -g"
 export RPM_OPT_FLAGS="$CFLAGS"
 export LDFLAGS="-L%{_libdir} -L/usr/sfw/lib -R/usr/sfw/lib -L%{_builddir}/%name-%version/libical-%{libical.version}/src/libical -L%{_libdir} -R%{_libdir}"
 %now.build -d %name-%version

--- a/gtk2.spec	Tue Mar 16 19:41:58 2004 +0000
+++ b/gtk2.spec	Tue Mar 16 23:36:03 2004 +0000
@@ -21,6 +21,7 @@
 Patch3:       gtk+-03-text-plain-dnd.diff
 Patch4:       gtk+-04-gdk-x11-uninstalled-pc.diff
 Patch5:       gtk+-05-return-void.diff
+Patch6:       gtk+-06-fix-render-icon.diff
 
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Docdir:       %{_defaultdocdir}/doc
@@ -65,6 +66,7 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 bzcat %SOURCE3 | tar xvf -
 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gtk+-06-fix-render-icon.diff	Tue Mar 16 23:36:03 2004 +0000
@@ -0,0 +1,13 @@
+--- gtk+-2.3.6/gtk/gtkwidget.orig	Tue Mar 16 15:20:40 2004
++++ gtk+-2.3.6/gtk/gtkwidget.c	Tue Mar 16 15:20:51 2004
+@@ -5043,8 +5043,8 @@
+   
+   g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
+   g_return_val_if_fail (stock_id != NULL, NULL);
+-  g_return_val_if_fail (size > GTK_ICON_SIZE_INVALID, NULL);
+-  
++  g_return_val_if_fail (size > GTK_ICON_SIZE_INVALID || size == -1, NULL);
++
+   gtk_widget_ensure_style (widget);
+   
+   icon_set = gtk_style_lookup_icon_set (widget->style, stock_id);