rpms/enigma/devel enigma-gcc-4.3-ftbfs.patch, NONE, 1.1 enigma.spec, 1.19, 1.20

Thorsten Leemhuis (thl) fedora-extras-commits at redhat.com
Fri Jan 4 14:39:28 UTC 2008


Author: thl

Update of /cvs/pkgs/rpms/enigma/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16575

Modified Files:
	enigma.spec 
Added Files:
	enigma-gcc-4.3-ftbfs.patch 
Log Message:
* Fri Jan 04 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.01-4.1
- add enigma-gcc-4.3-ftbfs.patch from debian package


enigma-gcc-4.3-ftbfs.patch:

--- NEW FILE enigma-gcc-4.3-ftbfs.patch ---
# fix some FTBFS with newer, stricter GCCs
# patch from http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=413414
# thanks, Martin Michlmayr
--- src/gui/widgets.cc~	2007-03-04 21:06:31.000000000 +0000
+++ src/gui/widgets.cc	2007-03-04 21:13:34.000000000 +0000
@@ -28,6 +28,7 @@
 #include <cassert>
 #include <algorithm>
 #include <iostream>
+#include <limits.h>
 
 using namespace enigma::gui;
 using namespace ecl;
--- lib-src/enigma-core/ecl_util.hh~	2007-03-04 20:38:24.000000000 +0000
+++ lib-src/enigma-core/ecl_util.hh	2007-03-04 20:55:44.000000000 +0000
@@ -20,6 +20,7 @@
 #define ECL_UTIL_HH_INCLUDED
 
 #include <string>
+#include <algorithm>
 
 /* hide GNU extensions for non-gnu compilers: */
 #ifndef __GNU__


Index: enigma.spec
===================================================================
RCS file: /cvs/pkgs/rpms/enigma/devel/enigma.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- enigma.spec	12 Sep 2007 19:29:27 -0000	1.19
+++ enigma.spec	4 Jan 2008 14:38:40 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           enigma
 Version:        1.01
-Release:        3.1
+Release:        4.1
 Summary:        Clone of the ATARI game Oxyd
 
 Group:          Amusements/Games
@@ -8,6 +8,7 @@
 URL:            http://www.nongnu.org/enigma/
 Source0:        http://download.berlios.de/enigma-game/enigma-1.01-64bit.tar.gz
 Patch0:         enigma-1.01-desktop.patch
+Patch1:         enigma-gcc-4.3-ftbfs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel >= 1.2  
@@ -32,6 +33,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1
 
 %build
 %configure --enable-optimize
@@ -76,6 +78,9 @@
 %exclude %{_libdir}/libenet.a
 
 %changelog
+* Fri Jan 04 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.01-4.1
+- add enigma-gcc-4.3-ftbfs.patch from debian package
+
 * Wed Sep 12 2007 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.01-3.1
 - use the newly 64bit-clean upstream tarball
 




More information about the fedora-extras-commits mailing list