2008-02-14 Damien Carbery <[email protected]>
authordcarbery
Thu, 14 Feb 2008 08:24:24 +0000
changeset 11635 9fa096fe7e3e
parent 11634 084e99b20db7
child 11636 3ada0c8e3831
2008-02-14 Damien Carbery <[email protected]> * base-specs/glibmm.spec: Add patch 01-testutils to fix build. * patches/glibmm-01-gtestutils.diff: Added. Includes glib/gtestutils.h in some source files to define g_assert macro.
ChangeLog
base-specs/glibmm.spec
patches/glibmm-01-gtestutils.diff
--- a/ChangeLog	Thu Feb 14 08:15:43 2008 +0000
+++ b/ChangeLog	Thu Feb 14 08:24:24 2008 +0000
@@ -1,3 +1,9 @@
+2008-02-14  Damien Carbery <[email protected]>
+
+	* base-specs/glibmm.spec: Add patch 01-testutils to fix build.
+	* patches/glibmm-01-gtestutils.diff: Added. Includes glib/gtestutils.h
+	  in some source files to define g_assert macro.
+
 2008-02-14  Dave Lin  <[email protected]>
 
 	* base-specs/firefox.spec: Bump to 2.0.0.12
--- a/base-specs/glibmm.spec	Thu Feb 14 08:15:43 2008 +0000
+++ b/base-specs/glibmm.spec	Thu Feb 14 08:24:24 2008 +0000
@@ -19,6 +19,8 @@
 Summary:                 glibmm - C++ Wrapper for the Glib2 Library
 URL:                     http://www.gtkmm.org/
 Source:                  http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.14/%{name}-%{version}.tar.bz2
+# owner:dcarbery date:2008-02-14 type:bug bugzilla:??????
+Patch1:                  glibmm-01-gtestutils.diff
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 BuildRequires:           libsigc++-devel >= 2.0.0
 BuildRequires:           glib2-devel >= 2.9.0
@@ -31,6 +33,7 @@
 
 %prep
 %setup -q -n glibmm-%version
+%patch1 -p1
 
 %build
 %ifos linux
@@ -69,6 +72,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Thu Feb 14 2008 - [email protected]
+- Add patch 01-gtestutils to include glib/gtestutils.h in some source files to
+  define g_assert macro.
 * Tue Feb 12 2008 - [email protected]
 - Added all the examples to the /usr/share/doc.
   Also cleaned out %files and %files-devel where are not used here.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/glibmm-01-gtestutils.diff	Thu Feb 14 08:24:24 2008 +0000
@@ -0,0 +1,40 @@
+--- glibmm-2.14.2/glib/glibmm/exception.cc.orig	2008-02-14 07:46:30.519476580 +0000
++++ glibmm-2.14.2/glib/glibmm/exception.cc	2008-02-14 07:46:39.577368816 +0000
+@@ -21,6 +21,7 @@
+  */
+ 
+ #include <glib/gmessages.h>
++#include <glib/gtestutils.h>
+ #include <glibmm/exception.h>
+ 
+ 
+--- glibmm-2.14.2/glib/glibmm/error.cc.orig	2008-02-14 07:46:11.102706926 +0000
++++ glibmm-2.14.2/glib/glibmm/error.cc	2008-02-14 07:46:20.130659655 +0000
+@@ -22,6 +22,7 @@
+ 
+ #include <glib/gerror.h>
+ #include <glib/gmessages.h>
++#include <glib/gtestutils.h>
+ 
+ #include <map>
+ #include <glibmmconfig.h>
+--- glibmm-2.14.2/glib/glibmm/convert.cc.orig	2008-02-14 07:44:04.644655820 +0000
++++ glibmm-2.14.2/glib/glibmm/convert.cc	2008-02-14 07:44:50.798555932 +0000
+@@ -26,6 +26,7 @@
+ 
+ #include <glib/gconvert.h>
+ #include <glib/gmessages.h>
++#include <glib/gtestutils.h>
+ #include <glib/gunicode.h>
+ #include <glibmm/utility.h>
+ 
+--- glibmm-2.14.2/glib/glibmm/date.cc.orig	2008-02-14 07:45:03.394810498 +0000
++++ glibmm-2.14.2/glib/glibmm/date.cc	2008-02-14 07:45:17.263659107 +0000
+@@ -26,6 +26,7 @@
+ 
+ #include <glib/gmem.h>
+ #include <glib/gmessages.h>
++#include <glib/gtestutils.h>
+ 
+ #include <ctime>
+ #include <algorithm>