From a3e41bb25c96306518a0c204e22b4343953556ea Mon Sep 17 00:00:00 2001 From: Denis Leroy Date: Feb 15 2008 11:47:35 +0000 Subject: Added patch for g++ 4.3 --- diff --git a/glom-1.6.8-gcc43.patch b/glom-1.6.8-gcc43.patch new file mode 100644 index 0000000..eebea59 --- /dev/null +++ b/glom-1.6.8-gcc43.patch @@ -0,0 +1,40 @@ +--- glom-1.6.8/glom/translation/window_translations.cc.orig 2008-02-15 12:36:22.000000000 +0100 ++++ glom-1.6.8/glom/translation/window_translations.cc 2008-02-15 12:36:47.000000000 +0100 +@@ -33,6 +33,7 @@ + + #include + #include ++#include + + namespace Glom + { +--- glom-1.6.8/glom/libglom/connectionpool.cc.orig 2008-02-15 12:27:23.000000000 +0100 ++++ glom-1.6.8/glom/libglom/connectionpool.cc 2008-02-15 12:27:55.000000000 +0100 +@@ -39,6 +39,7 @@ + #include //For sockaddr_in + + #include //To catch segfaults ++#include + + #include "gst-package.h" + +--- glom-1.6.8/glom/libglom/document/document_glom.h.orig 2008-02-15 12:27:39.000000000 +0100 ++++ glom-1.6.8/glom/libglom/document/document_glom.h 2008-02-15 12:24:32.000000000 +0100 +@@ -40,6 +40,7 @@ + #include + #include + #include ++#include + + namespace Glom + { +--- glom-1.6.8/glom/libglom/data_structure/glomconversions.cc.orig 2008-02-15 12:15:55.000000000 +0100 ++++ glom-1.6.8/glom/libglom/data_structure/glomconversions.cc 2008-02-15 12:16:55.000000000 +0100 +@@ -30,6 +30,7 @@ + #include // for struct tm + #include // for cout, endl + #include ++#include + + + namespace Glom diff --git a/glom.spec b/glom.spec index 502a5e9..64f8ed0 100644 --- a/glom.spec +++ b/glom.spec @@ -10,6 +10,7 @@ Group: Applications/Databases License: GPLv2+ URL: http://www.glom.org/ Source0: http://ftp.gnome.org/pub/GNOME/sources/glom/%{major_version}/%{name}-%{major_version}.%{minor_version}.tar.bz2 +Patch0: glom-1.6.8-gcc43.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: bakery-devel >= 2.4.3 @@ -55,6 +56,7 @@ buttons. Glom uses the PostgreSQL database backend. %prep %setup -q +%patch0 -p1 -b .gcc43 %build @@ -126,6 +128,7 @@ scrollkeeper-update -q || : %changelog * Mon Feb 11 2008 Denis Leroy - 1.6.8-1 - Update to 1.6.8, bugfix release +- Added patch for g++ 4.3 * Tue Jan 29 2008 Denis Leroy - 1.6.7-1 - Update to upstream 1.6.7, bugfix release, BR versions updated