[csw-devel] SF.net SVN: gar:[9117] csw/mgar/pkg/wesnoth/trunk
jake_goerzen at users.sourceforge.net
jake_goerzen at users.sourceforge.net
Fri Mar 12 22:29:17 CET 2010
Revision: 9117
http://gar.svn.sourceforge.net/gar/?rev=9117&view=rev
Author: jake_goerzen
Date: 2010-03-12 21:29:16 +0000 (Fri, 12 Mar 2010)
Log Message:
-----------
wesnoth: 1.6.5 fixing gnuisms work in progress
Modified Paths:
--------------
csw/mgar/pkg/wesnoth/trunk/Makefile
csw/mgar/pkg/wesnoth/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/wesnoth/trunk/files/configure.diff
csw/mgar/pkg/wesnoth/trunk/files/generator_private.hpp.diff
csw/mgar/pkg/wesnoth/trunk/files/global.hpp.diff
csw/mgar/pkg/wesnoth/trunk/files/image.cpp.diff
csw/mgar/pkg/wesnoth/trunk/files/marked-up_text.cpp.diff
csw/mgar/pkg/wesnoth/trunk/files/simple_wml.cpp.diff
Removed Paths:
-------------
csw/mgar/pkg/wesnoth/trunk/files/configure.patch
csw/mgar/pkg/wesnoth/trunk/files/global.hpp.patch
csw/mgar/pkg/wesnoth/trunk/files/simple_wml.cpp.patch
Modified: csw/mgar/pkg/wesnoth/trunk/Makefile
===================================================================
--- csw/mgar/pkg/wesnoth/trunk/Makefile 2010-03-12 21:01:13 UTC (rev 9116)
+++ csw/mgar/pkg/wesnoth/trunk/Makefile 2010-03-12 21:29:16 UTC (rev 9117)
@@ -1,5 +1,5 @@
GARNAME = wesnoth
-GARVERSION = 1.7.13
+GARVERSION = 1.6.5
CATEGORIES = apps
DESCRIPTION = a free turn-based strategy game with a fanasy theme
@@ -9,7 +9,6 @@
MASTER_SITES += $(SF_MIRRORS)
DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2
-DISTFILES += Makefile.fixed
# We define upstream file regex so we can be notifed of new upstream software release
UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=89495
@@ -17,9 +16,12 @@
UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)
PATCHFILES = language.cpp.diff
-PATCHFILES += configure.patch
-PATCHFILES += simple_wml.cpp.patch
-PATCHFILES += global.hpp.patch
+PATCHFILES += configure.diff
+PATCHFILES += global.hpp.diff
+PATCHFILES += generator_private.hpp.diff
+PATCHFILES += image.cpp.diff
+PATCHFILES += marked-up_text.cpp.diff
+PATCHFILES += simple_wml.cpp.diff
RUNTIME_DEP_PKGS_CSWwesnoth = CSWboostrt
RUNTIME_DEP_PKGS_CSWwesnoth += CSWftype2
@@ -41,21 +43,28 @@
CHECKPKG_OVERRIDES_CSWwesnoth += symbol-not-found|wesnoth_editor
CHECKPKG_OVERRIDES_CSWwesnoth += symbol-not-found|wesnoth
CHECKPKG_OVERRIDES_CSWwesnoth += symbol-not-found|wesnothd
+CHECKPKG_OVERRIDES_CSWwesnoth += missing-dependency|CSWperl
+CHECKPKG_OVERRIDES_CSWwesnoth += missing-dependency|CSWruby
+EXTRA_LINKER_FLAGS = /usr/openwin/lib/libXext.so -L.
+
CONFIGURE_ARGS = --prefix=$(prefix)
+CONFIGURE_ARGS += PKG_CONFIG_PATH=/opt/csw/X11/lib/pkgconfig
CONFIGURE_ARGS += CXXFLAGS='-features=extensions -library=stlport4'
-CONFIGURE_ARGS += LDFLAGS='-L. -L/opt/csw/lib -lstlport -lintl -lsocket -lboost_iostreams -lsunmath -lSDL_ttf'
+CONFIGURE_ARGS += LIBS='-lstlport -lintl -lsocket -lboost_iostreams -lsunmath -lSDL_ttf -lcairo -lpango-1.0 -lpangocairo-1.0'
+CONFIGURE_ARGS += PANGO_CFLAGS='-I/opt/csw/include/pango-1.0 -I/opt/csw/include/glib-2.0 -I/opt/csw/lib/glib-2.0/include -I/opt/csw/include/cairo'
+CONFIGURE_ARGS += PANGO_LIBS='-L/opt/csw/lib -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 -lintl'
+CONFIGURE_ARGS += LUA_CFLAGS=-I/opt/csw/include
+CONFIGURE_ARGS += LUA_LIBS=-L/opt/csw/lib
CONFIGURE_ARGS += --with-fifodir=/var/opt/csw/run
-CONFIGURE_ARGS += --enable-server
-CONFIGURE_ARGS += --enable-campaign-server
-CONFIGURE_ARGS += --enable-tools
-CONFIGURE_ARGS += --enable-editor
+#CONFIGURE_ARGS += --enable-server
+#CONFIGURE_ARGS += --enable-campaign-server
+#CONFIGURE_ARGS += --enable-tools
+#CONFIGURE_ARGS += --enable-editor
CONFIGURE_ARGS += --with-boost=/opt/csw
+CONFIGURE_ARGS += --disable-strict-compilation
+CONFIGURE_ARGS += --with-zlib-prefix=/opt/csw
TEST_SCRIPTS =
include gar/category.mk
-
-post-configure-modulated:
- -cp $(FILEDIR)/Makefile.fixed $(WORKSRC)/src/Makefile
- $(MAKECOOKIE)
Modified: csw/mgar/pkg/wesnoth/trunk/checksums
===================================================================
--- csw/mgar/pkg/wesnoth/trunk/checksums 2010-03-12 21:01:13 UTC (rev 9116)
+++ csw/mgar/pkg/wesnoth/trunk/checksums 2010-03-12 21:29:16 UTC (rev 9117)
@@ -1,6 +1,8 @@
-f316fcd8051bec370f21ea75a2638477 Makefile.fixed
-76eeb1596dfa00c985f0f7c02d2c4b1b configure.patch
-1e4363990aa7b5eb2ceaf4cef2237c80 global.hpp.patch
+89db4313293372653371a66171268e4a configure.diff
+160398f59781477186c4ae0502d3beb2 generator_private.hpp.diff
+21dfaf10701d0f3a58c25d79a99cff1a global.hpp.diff
+5c51a1a28e56d5725f99841dbbc30530 image.cpp.diff
59968804e93a18220d7d18e8252fff8d language.cpp.diff
-b9890e1344f0f1d62bdf3e80cf4e4575 simple_wml.cpp.patch
-b1e452e8138e3c573e92eb75f8a2d31a wesnoth-1.7.13.tar.bz2
+29edd308920e8e44317fffb92eb19eb4 marked-up_text.cpp.diff
+3a8d9b365df3c142bac7dd4188e963b5 simple_wml.cpp.diff
+493826bbd9ba355930765a7e8fe3749a wesnoth-1.6.5.tar.bz2
Added: csw/mgar/pkg/wesnoth/trunk/files/configure.diff
===================================================================
--- csw/mgar/pkg/wesnoth/trunk/files/configure.diff (rev 0)
+++ csw/mgar/pkg/wesnoth/trunk/files/configure.diff 2010-03-12 21:29:16 UTC (rev 9117)
@@ -0,0 +1,16 @@
+--- wesnoth-1.6.5/configure 2009-09-06 18:46:43.000000000 +0200
++++ wesnoth-1.6.5.new/configure 2010-03-11 18:32:48.463409914 +0100
+@@ -6004,10 +6004,10 @@ then
+ # Don't use ansi for CFLAGS since it fails to compile.
+ CFLAGS="-O0 -DDEBUG -ggdb3 -W -Wall $CFLAGS"
+ CXXFLAGS="-O0 -DDEBUG -ggdb3 -W -Wall -ansi $CXXFLAGS"
+-else
++#else
+ # Don't use ansi for CFLAGS since it fails to compile.
+- CFLAGS="-O2 -W -Wall $CFLAGS"
+- CXXFLAGS="-O2 -W -Wall -ansi $CXXFLAGS"
++ #CFLAGS="-O2 -W -Wall $CFLAGS"
++ #CXXFLAGS="-O2 -W -Wall -ansi $CXXFLAGS"
+ fi
+
+ if test "x$profile" = "xyes"
Deleted: csw/mgar/pkg/wesnoth/trunk/files/configure.patch
===================================================================
--- csw/mgar/pkg/wesnoth/trunk/files/configure.patch 2010-03-12 21:01:13 UTC (rev 9116)
+++ csw/mgar/pkg/wesnoth/trunk/files/configure.patch 2010-03-12 21:29:16 UTC (rev 9117)
@@ -1,12 +0,0 @@
-diff -rupN wesnoth-1.4.7/configure wesnoth-1.4.7.new//configure
---- wesnoth-1.4.7/configure 2008-12-12 22:20:25.000000000 +0100
-+++ wesnoth-1.4.7.new//configure 2010-03-03 23:58:23.966426235 +0100
-@@ -5917,8 +5917,6 @@ fi
- if test "x$debug" = "xyes"
- then
- CXXFLAGS="$CXXFLAGS -O0 -DDEBUG -ggdb3 -W -Wall -ansi"
--else
-- CXXFLAGS="-O2 -W -Wall -ansi $CXXFLAGS"
- fi
-
- if test "x$profile" = "xyes"
Added: csw/mgar/pkg/wesnoth/trunk/files/generator_private.hpp.diff
===================================================================
--- csw/mgar/pkg/wesnoth/trunk/files/generator_private.hpp.diff (rev 0)
+++ csw/mgar/pkg/wesnoth/trunk/files/generator_private.hpp.diff 2010-03-12 21:29:16 UTC (rev 9117)
@@ -0,0 +1,71 @@
+--- wesnoth-1.6.5/src/gui/widgets/generator_private.hpp 2009-03-15 13:06:50.000000000 +0100
++++ wesnoth-1.6.5.new/src/gui/widgets/generator_private.hpp 2010-03-11 19:33:14.173591965 +0100
+@@ -170,7 +170,7 @@ struct thorizontal_list
+ * @return The best size,
+ */
+ tpoint calculate_best_size() const
+- { ERROR_LOG(false); }
++ { ERROR_LOG(false); return tpoint(0,0); }
+
+ /**
+ * Sets the size of the generator.
+@@ -198,11 +198,11 @@ struct thorizontal_list
+ { ERROR_LOG(false); }
+
+ /** Inherited from tgenerator_. */
+- twidget* find_widget(const tpoint&, const bool) { ERROR_LOG(false); }
++ twidget* find_widget(const tpoint&, const bool) { ERROR_LOG(false); return NULL;}
+
+ /** Inherited from tgenerator_. */
+ const twidget* find_widget(const tpoint&, const bool) const
+- { ERROR_LOG(false); }
++ { ERROR_LOG(false); return NULL;}
+
+ /***** ***** ***** ***** keyboard functions ***** ***** ***** *****/
+
+@@ -299,7 +299,7 @@ struct tmatrix
+
+ /** See thorizontal_list::calculate_best_size(). */
+ tpoint calculate_best_size() const
+- { ERROR_LOG(false); }
++ { ERROR_LOG(false); return tpoint(0,0); }
+
+ /** See thorizontal_list::set_size(). */
+ void set_size(const tpoint& /*origin*/, const tpoint& /*size*/)
+@@ -314,11 +314,11 @@ struct tmatrix
+ { ERROR_LOG(false); }
+
+ /** See thorizontal_list::find_widget(). */
+- twidget* find_widget(const tpoint&, const bool) { ERROR_LOG(false); }
++ twidget* find_widget(const tpoint&, const bool) { ERROR_LOG(false); return NULL; }
+
+ /** See thorizontal_list::find_widget(). */
+ const twidget* find_widget(const tpoint&, const bool) const
+- { ERROR_LOG(false); }
++ { ERROR_LOG(false); return NULL; }
+
+ /***** ***** ***** ***** keyboard functions ***** ***** ***** *****/
+
+@@ -354,7 +354,7 @@ struct tindependant
+
+ /** See thorizontal_list::calculate_best_size(). */
+ tpoint calculate_best_size() const
+- { ERROR_LOG(false); }
++ { ERROR_LOG(false); return tpoint(0,0); }
+
+ /** See thorizontal_list::set_size(). */
+ void set_size(const tpoint& /*origin*/, const tpoint& /*size*/)
+@@ -369,11 +369,11 @@ struct tindependant
+ { ERROR_LOG(false); }
+
+ /** See thorizontal_list::find_widget(). */
+- twidget* find_widget(const tpoint&, const bool) { ERROR_LOG(false); }
++ twidget* find_widget(const tpoint&, const bool) { ERROR_LOG(false); return NULL; }
+
+ /** See thorizontal_list::find_widget(). */
+ const twidget* find_widget(const tpoint&, const bool) const
+- { ERROR_LOG(false); }
++ { ERROR_LOG(false); return NULL; }
+
+ /***** ***** ***** ***** keyboard functions ***** ***** ***** *****/
+
Added: csw/mgar/pkg/wesnoth/trunk/files/global.hpp.diff
===================================================================
--- csw/mgar/pkg/wesnoth/trunk/files/global.hpp.diff (rev 0)
+++ csw/mgar/pkg/wesnoth/trunk/files/global.hpp.diff 2010-03-12 21:29:16 UTC (rev 9117)
@@ -0,0 +1,11 @@
+--- wesnoth-1.6.5/src/global.hpp 2009-01-01 11:28:26.000000000 +0100
++++ wesnoth-1.6.5.new/src/global.hpp 2010-03-12 20:48:48.684634033 +0100
+@@ -29,3 +29,8 @@
+ #endif
+
+ #endif
++
++#include <math.h>
++#include <stdlib.h>
++#include <unistd.h>
++#include <signal.h>
Deleted: csw/mgar/pkg/wesnoth/trunk/files/global.hpp.patch
===================================================================
--- csw/mgar/pkg/wesnoth/trunk/files/global.hpp.patch 2010-03-12 21:01:13 UTC (rev 9116)
+++ csw/mgar/pkg/wesnoth/trunk/files/global.hpp.patch 2010-03-12 21:29:16 UTC (rev 9117)
@@ -1,9 +0,0 @@
-diff -rupN wesnoth-1.4.7/src/global.hpp wesnoth-1.4.7.new/src/global.hpp
---- wesnoth-1.4.7/src/global.hpp 2008-02-16 09:47:16.000000000 +0100
-+++ wesnoth-1.4.7.new/src/global.hpp 2010-03-04 01:40:03.524211569 +0100
-@@ -80,3 +80,5 @@ namespace std {
-
- #endif
- #endif
-+
-+#include <signal.h>
Added: csw/mgar/pkg/wesnoth/trunk/files/image.cpp.diff
===================================================================
--- csw/mgar/pkg/wesnoth/trunk/files/image.cpp.diff (rev 0)
+++ csw/mgar/pkg/wesnoth/trunk/files/image.cpp.diff 2010-03-12 21:29:16 UTC (rev 9117)
@@ -0,0 +1,11 @@
+--- wesnoth-1.6.5/src/gui/widgets/image.cpp 2009-08-18 21:47:08.000000000 +0200
++++ wesnoth-1.6.5.new/src/gui/widgets/image.cpp 2010-03-11 19:23:36.284806844 +0100
+@@ -22,7 +22,7 @@ namespace gui2 {
+
+ tpoint timage::calculate_best_size() const
+ {
+- surface image(get_image(image::locator(label())));
++ surface image(image::get_image(image::locator(label())));
+
+ tpoint result(0, 0);
+ if(image) {
Added: csw/mgar/pkg/wesnoth/trunk/files/marked-up_text.cpp.diff
===================================================================
--- csw/mgar/pkg/wesnoth/trunk/files/marked-up_text.cpp.diff (rev 0)
+++ csw/mgar/pkg/wesnoth/trunk/files/marked-up_text.cpp.diff 2010-03-12 21:29:16 UTC (rev 9117)
@@ -0,0 +1,11 @@
+--- wesnoth-1.6.5/src/marked-up_text.cpp 2009-08-07 04:24:48.000000000 +0200
++++ wesnoth-1.6.5.new/src/marked-up_text.cpp 2010-03-11 21:33:02.491029941 +0100
+@@ -219,7 +219,7 @@ SDL_Rect draw_text(CVideo* gui, const SD
+ const SDL_Color& colour, const std::string& txt,
+ int x, int y, bool use_tooltips, int style)
+ {
+- return draw_text(gui != NULL ? gui->getSurface() : NULL, area, size, colour, txt, x, y, use_tooltips, style);
++ return draw_text((gui != NULL ? gui->getSurface() : (surface)NULL), area, size, colour, txt, x, y, use_tooltips, style);
+ }
+
+ bool is_format_char(char c)
Added: csw/mgar/pkg/wesnoth/trunk/files/simple_wml.cpp.diff
===================================================================
--- csw/mgar/pkg/wesnoth/trunk/files/simple_wml.cpp.diff (rev 0)
+++ csw/mgar/pkg/wesnoth/trunk/files/simple_wml.cpp.diff 2010-03-12 21:29:16 UTC (rev 9117)
@@ -0,0 +1,9 @@
+--- wesnoth-1.6.5/src/server/simple_wml.cpp 2009-09-01 20:36:12.000000000 +0200
++++ wesnoth-1.6.5.new/src/server/simple_wml.cpp 2010-03-12 20:03:24.441033156 +0100
+@@ -1,3 +1,6 @@
++#include <stdlib.h>
++#include <stdio.h>
++
+ #include <iostream>
+ #include <sstream>
+
Deleted: csw/mgar/pkg/wesnoth/trunk/files/simple_wml.cpp.patch
===================================================================
--- csw/mgar/pkg/wesnoth/trunk/files/simple_wml.cpp.patch 2010-03-12 21:01:13 UTC (rev 9116)
+++ csw/mgar/pkg/wesnoth/trunk/files/simple_wml.cpp.patch 2010-03-12 21:29:16 UTC (rev 9117)
@@ -1,11 +0,0 @@
-diff -rupN wesnoth-1.4.7/src/server/simple_wml.cpp wesnoth-1.4.7.new/src/server/simple_wml.cpp
---- wesnoth-1.4.7/src/server/simple_wml.cpp 2008-03-29 19:05:38.000000000 +0100
-+++ wesnoth-1.4.7.new/src/server/simple_wml.cpp 2010-03-04 00:07:07.874792552 +0100
-@@ -1,3 +1,7 @@
-+#include <signal.h>
-+#include <stdlib.h>
-+#include <stdio.h>
-+
- #include <assert.h>
- #include <algorithm>
- #include <iostream>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list