packages: wesnoth/wesnoth.spec, wesnoth/wesnoth-gcc.patch (NEW) - added gcc...

qboosh qboosh at pld-linux.org
Wed May 4 20:44:43 CEST 2011


Author: qboosh                       Date: Wed May  4 18:44:43 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added gcc patch (fixes build with gcc 4.6)
- changed locale dir passing (*.mo buildsystem expects LOCALEDIR to be relative)

---- Files affected:
packages/wesnoth:
   wesnoth.spec (1.146 -> 1.147) , wesnoth-gcc.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/wesnoth/wesnoth.spec
diff -u packages/wesnoth/wesnoth.spec:1.146 packages/wesnoth/wesnoth.spec:1.147
--- packages/wesnoth/wesnoth.spec:1.146	Wed May  4 15:50:04 2011
+++ packages/wesnoth/wesnoth.spec	Wed May  4 20:44:37 2011
@@ -21,6 +21,7 @@
 Patch0:		%{name}-libpng.patch
 Patch1:		%{name}-desktop.patch
 Patch2:		%{name}-locale_dir.patch
+Patch3:		%{name}-gcc.patch
 URL:		http://www.wesnoth.org/
 BuildRequires:	SDL-devel >= 1.2.14-4
 BuildRequires:	SDL_image-devel >= 1.2
@@ -116,9 +117,10 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 # don't install locales in %{_datadir}/%{name}
-%{__sed} -i 's,${DATADIR}/${LOCALEDIR},${LOCALEDIR},' CMakeLists.txt
+%{__sed} -i 's,${DATADIR}/${LOCALEDIR},${DATAROOTDIR}/${LOCALEDIR},' CMakeLists.txt
 
 # link using libpng instead of libpng12
 %{__sed} -i 's,png12,png,' src/CMakeLists.txt
@@ -132,7 +134,7 @@
 	-DENABLE_STRICT_COMPILATION="off" \
 	-DBINDIR="%{_bindir}" \
 	-DMANDIR="%{_mandir}" \
-	-DLOCALEDIR="%{_datadir}/locale" \
+	-DLOCALEDIR="locale" \
 	%{!?with_server:-DENABLE_SERVER="off"} \
 	%{?with_server:-DENABLE_CAMPAIGN_SERVER="on"} \
 	%{!?with_tools:-DENABLE_EDITOR="off"} \
@@ -266,6 +268,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.147  2011/05/04 18:44:37  qboosh
+- added gcc patch (fixes build with gcc 4.6)
+- changed locale dir passing (*.mo buildsystem expects LOCALEDIR to be relative)
+
 Revision 1.146  2011/05/04 13:50:04  arekm
 - release 2
 

================================================================
Index: packages/wesnoth/wesnoth-gcc.patch
diff -u /dev/null packages/wesnoth/wesnoth-gcc.patch:1.1
--- /dev/null	Wed May  4 20:44:43 2011
+++ packages/wesnoth/wesnoth-gcc.patch	Wed May  4 20:44:37 2011
@@ -0,0 +1,10 @@
+--- wesnoth-1.8.5/src/server/simple_wml.hpp.orig	2009-10-08 21:38:22.000000000 +0200
++++ wesnoth-1.8.5/src/server/simple_wml.hpp	2011-05-04 19:32:54.845421388 +0200
+@@ -3,6 +3,7 @@
+ 
+ #include <string.h>
+ 
++#include <cstddef>
+ #include <iosfwd>
+ #include <map>
+ #include <string>
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/wesnoth/wesnoth.spec?r1=1.146&r2=1.147&f=u



More information about the pld-cvs-commit mailing list