[enigma] Added a patch to fix build with GCC 4.6

Kalev Lember kalev at fedoraproject.org
Thu Mar 10 13:47:16 UTC 2011


commit 4fedb500bea8a16effca29044b3dcc249865c840
Author: Kalev Lember <kalev at smartlink.ee>
Date:   Thu Mar 10 15:46:47 2011 +0200

    Added a patch to fix build with GCC 4.6

 enigma-gcc-4.6-ftbfs.patch |   22 ++++++++++++++++++++++
 enigma.spec                |    7 ++++++-
 2 files changed, 28 insertions(+), 1 deletions(-)
---
diff --git a/enigma-gcc-4.6-ftbfs.patch b/enigma-gcc-4.6-ftbfs.patch
new file mode 100644
index 0000000..89ad787
--- /dev/null
+++ b/enigma-gcc-4.6-ftbfs.patch
@@ -0,0 +1,22 @@
+diff -up enigma-1.01/lib-src/enigma-core/ecl_dict.hh.gcc46 enigma-1.01/lib-src/enigma-core/ecl_dict.hh
+--- enigma-1.01/lib-src/enigma-core/ecl_dict.hh.gcc46	2011-03-10 15:34:54.077340295 +0200
++++ enigma-1.01/lib-src/enigma-core/ecl_dict.hh	2011-03-10 15:35:34.204776840 +0200
+@@ -20,6 +20,7 @@
+ #define ECL_DICT_HH
+ 
+ #include "ecl_error.hh"
++#include <cstddef>
+ #include <utility>
+ 
+ namespace ecl
+diff -up enigma-1.01/lib-src/zipios++/src/directory.h.gcc46 enigma-1.01/lib-src/zipios++/src/directory.h
+--- enigma-1.01/lib-src/zipios++/src/directory.h.gcc46	2007-09-08 15:20:05.000000000 +0300
++++ enigma-1.01/lib-src/zipios++/src/directory.h	2011-03-10 15:34:43.741227679 +0200
+@@ -27,6 +27,7 @@
+ 
+ // --------------------------------------------------------------------------
+ 
++#include <cstddef>
+ #include <iterator>
+ #include <string>
+ #include <ctime>
diff --git a/enigma.spec b/enigma.spec
index 3b202ca..d458375 100644
--- a/enigma.spec
+++ b/enigma.spec
@@ -1,6 +1,6 @@
 Name:           enigma
 Version:        1.01
-Release:        14
+Release:        15
 Summary:        Clone of the ATARI game Oxyd
 
 Group:          Amusements/Games
@@ -13,6 +13,7 @@ Patch1:         enigma-gcc-4.3-ftbfs.patch
 Patch2:         enigma-gcc-4.4-ftbfs.patch
 Patch3:         enigma-consts.patch
 Patch4:         enigma-xerces.patch
+Patch5:         enigma-gcc-4.6-ftbfs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       %{_datadir}/fonts/dejavu/DejaVuSans.ttf 
@@ -44,6 +45,7 @@ innumerable puzzles blocking your direct way to the Oxyd stones...
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1 -b .gcc46
 
 %build
 %configure --enable-optimize
@@ -95,6 +97,9 @@ gtk-update-icon-cache -qf %{_datadir}/icons/hicolor 2>/dev/null || :
 %exclude %{_libdir}/libenet.a
 
 %changelog
+* Thu Mar 10 2011 Kalev Lember <kalev at smartlink.ee> - 1.01-15
+- Added a patch to fix build with GCC 4.6
+
 * Thu Mar 10 2011 Kalev Lember <kalev at smartlink.ee> - 1.01-14
 - Rebuilt with xerces-c 3.1
 


More information about the scm-commits mailing list