--- a/ChangeLog	Thu Aug 09 12:48:47 2007 +0000
+++ b/ChangeLog	Thu Aug 09 16:15:36 2007 +0000
@@ -1,3 +1,10 @@
+2007-08-09  Damien Carbery <[email protected]>
+
+	* SUNWgnome-crash-report.spec: Change to use gcc.
+	* base-specs/bug-buddy.spec: Add patch, 02-solaris-int, to fix some
+	  Solaris specific issues.
+	* patches/bug-buddy-02-solaris-int.diff: Added to help build on Solaris
+
 2007-08-09  Laszlo (Laca) Peter  <[email protected]>
 
 	* include/base.inc: fix defining gcc_optflags (ported from SFE)

--- a/SUNWgnome-crash-report.spec	Thu Aug 09 12:48:47 2007 +0000
+++ b/SUNWgnome-crash-report.spec	Thu Aug 09 16:15:36 2007 +0000
@@ -62,10 +62,13 @@
 gzcat %SOURCE0 | tar xf -
 
 %build
+export CC=/usr/sfw/bin/gcc
+export CXX=/usr/sfw/bin/g++
+export CFLAGS="%gcc_optflags -I%{_includedir} -I/usr/sfw/include/c++/3.4.3"
+export CXXFLAGS="%gcc_cxx_optflags -I%{_includedir} -I/usr/sfw/include/c++/3.4.3"
 export PKG_CONFIG_PATH=%{_pkg_config_path}
 export MSGFMT="/usr/bin/msgfmt"
 export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
-export CFLAGS="%optflags -I%{_includedir}"
 export RPM_OPT_FLAGS="$CFLAGS"
 export LDFLAGS="%_ldflags"
 %bug_buddy.build -d %name-%version
@@ -152,6 +155,8 @@
 %endif
 
 %changelog
+* Thu Aug 09 2007 - [email protected]
+- Change to use gcc.
 * Tue Apr 24 2007 - [email protected]
 - s/0755/-/ in defattr so that files are not made all executable
 * Fri Sep 08 2006 - [email protected]

--- a/base-specs/bug-buddy.spec	Thu Aug 09 12:48:47 2007 +0000
+++ b/base-specs/bug-buddy.spec	Thu Aug 09 16:15:36 2007 +0000
@@ -18,6 +18,8 @@
 Source:       http://ftp.gnome.org/pub/GNOME/sources/bug-buddy/2.19/bug-buddy-%{version}.tar.bz2
 # date:2004-11-08 type:feature owner:mattman bugster:5102045
 Patch1:       bug-buddy-01-use-pstack.diff
+# date:2007-08-09 type:bug owner:dcarbery
+Patch2:       bug-buddy-02-solaris-int.diff
 URL:          http://www.gnome.org/
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Docdir:       %{_docdir}/bug-buddy
@@ -41,6 +43,7 @@
 %prep
 %setup -q
 ## FIXME: needs engineer rework: %patch1 -p1
+%patch2 -p1
 
 %build
 %ifos linux
@@ -108,7 +111,9 @@
  
 
 %changelog
-* Tur Jul 31 2007 - [email protected]
+* Thu Aug 09 2007 - [email protected]
+- Add patch, 02-solaris-int, to fix some Solaris specific issues.
+* Tue Jul 31 2007 - [email protected]
 - Bump to 2.19.0.
 * Thu Apr 12 2007 - [email protected]
 - Bump to 2.18.1.

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/bug-buddy-02-solaris-int.diff	Thu Aug 09 16:15:36 2007 +0000
@@ -0,0 +1,70 @@
+--- bug-buddy-2.19.0/google-breakpad/src/google_breakpad/common/breakpad_types.h.orig   2007-08-02 15:13:25.272247387 +0100
++++ bug-buddy-2.19.0/google-breakpad/src/google_breakpad/common/breakpad_types.h 2007-08-02 15:27:13.865304434 +0100
+@@ -43,6 +43,12 @@
+ #ifndef _WIN32
+ 
+ #include <sys/types.h>
++#ifdef __sun
++typedef uint8_t  u_int8_t;
++typedef uint16_t u_int16_t;
++typedef uint32_t u_int32_t;
++typedef uint64_t u_int64_t;
++#endif
+ 
+ #else  /* !_WIN32 */
+ 
+--- bug-buddy-2.19.0/google-breakpad/src/processor/minidump_processor.cc.orig	2007-08-09 15:15:59.991429848 +0100
++++ bug-buddy-2.19.0/google-breakpad/src/processor/minidump_processor.cc	2007-08-09 15:18:14.074532880 +0100
+@@ -36,6 +36,7 @@
+ #include "processor/logging.h"
+ #include "processor/scoped_ptr.h"
+ #include "processor/stackwalker_x86.h"
++#include "google_breakpad/common/breakpad_types.h"
+ 
+ namespace google_breakpad {
+ 
+--- bug-buddy-2.19.0/google-breakpad/src/google_breakpad/processor/minidump_processor.h.orig	2007-08-09 15:27:15.608912209 +0100
++++ bug-buddy-2.19.0/google-breakpad/src/google_breakpad/processor/minidump_processor.h	2007-08-09 15:24:29.447822467 +0100
+@@ -31,6 +31,12 @@
+ #define GOOGLE_BREAKPAD_PROCESSOR_MINIDUMP_PROCESSOR_H__
+ 
+ #include <string>
++#ifdef __sun
++typedef uint8_t  u_int8_t;
++typedef uint16_t u_int16_t;
++typedef uint32_t u_int32_t;
++typedef uint64_t u_int64_t;
++#endif
+ 
+ namespace google_breakpad {
+ 
+--- bug-buddy-2.19.0/google-breakpad/src/google_breakpad/processor/code_module.h.orig	2007-08-09 15:26:43.656727577 +0100
++++ bug-buddy-2.19.0/google-breakpad/src/google_breakpad/processor/code_module.h	2007-08-09 15:26:50.918312748 +0100
+@@ -36,6 +36,12 @@
+ #define GOOGLE_BREAKPAD_PROCESSOR_CODE_MODULE_H__
+ 
+ #include <string>
++#ifdef __sun
++typedef uint8_t  u_int8_t;
++typedef uint16_t u_int16_t;
++typedef uint32_t u_int32_t;
++typedef uint64_t u_int64_t;
++#endif
+ 
+ namespace google_breakpad {
+ 
+--- bug-buddy-2.19.0/google-breakpad/src/google_breakpad/processor/process_state.h.orig	2007-08-09 15:26:25.101056093 +0100
++++ bug-buddy-2.19.0/google-breakpad/src/google_breakpad/processor/process_state.h	2007-08-09 15:24:59.125315152 +0100
+@@ -35,6 +35,12 @@
+ #define GOOGLE_BREAKPAD_PROCESSOR_PROCESS_STATE_H__
+ 
+ #include <string>
++#ifdef __sun
++typedef uint8_t  u_int8_t;
++typedef uint16_t u_int16_t;
++typedef uint32_t u_int32_t;
++typedef uint64_t u_int64_t;
++#endif
+ #include <vector>
+ #include "google_breakpad/processor/system_info.h"
+