Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/games
In directory sc8-pr-cvs17:/tmp/cvs-serv19404
Modified Files:
xscorch.info xscorch.patch
Log Message:
move to stable at maintainer's request
Index: xscorch.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/games/xscorch.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- xscorch.info 20 Jan 2006 20:12:53 -0000 1.1
+++ xscorch.info 24 Jul 2007 12:37:37 -0000 1.2
@@ -1,27 +1,36 @@
Package: xscorch
-Version: 0.1.15
-Revision: 23
-Architecture: powerpc
+Version: 0.2.0
+Revision: 2
Maintainer: Alexander Strange <[EMAIL PROTECTED]>
-BuildDepends: gtk+, libmikmod, libjpeg, libpng3, libtiff, audiofile, esound,
glib, orbit-dev, giflib, imlib, gnome-libs-dev, gettext-dev, gcc3.3
-Depends: gtk+-shlibs, gnome-libs-shlibs, libmikmod-shlibs
-Source: http://chaos2.org/%n/%n-%v.tar.gz
-Source-MD5: 6bea7bfae61355cfedf2c673411bbe33
-UpdateLibtool: yes
+BuildDepends: atk1, glib2-dev, gtk+2-dev, libgettext3-dev, libiconv-dev,
pango1-xft2-dev, pkgconfig, x11-dev
+Depends: atk1-shlibs, glib2-shlibs, gtk+2-shlibs, libgettext3-shlibs,
libiconv, pango1-xft2-shlibs, x11-shlibs
+Source: http://www.xscorch.org/releases/%n-%v.tar.gz
+Source-MD5: 42862dbde1d0ebf87be30f7e04462a66
+Source2: http://www.xscorch.org/releases/xscorch-0.2.0-stack-smash.patch.gz
+Source2-MD5: 43cf6229e0f034c235805ec8a54e6718
+Source3: http://www.xscorch.org/releases/xscorch-0.2.0-64bit.patch.gz
+Source3-MD5: 00c6b5e67683ac8562488547659a72f3
Patch: %n.patch
-ConfigureParams: --mandir=%p/share/man --enable-opt --disable-warn
-SetCPPFlags: -no-cpp-precomp
-SetCFlags: -no-cpp-precomp -fexpensive-optimizations
-CompileScript: <<
- export CC=gcc-3.3; export CXX=g++-3.3; ./configure %c
- make CC=gcc-3.3 CXX=g++-3.3
+PatchScript: <<
+gzcat ../xscorch-0.2.0-stack-smash.patch.gz | patch -p0
+gzcat ../xscorch-0.2.0-64bit.patch.gz | patch -p0
<<
+ConfigureParams: --mandir=%p/share/man --enable-opt --disable-sound
--with-gnome --without-readline --with-gtk-12=no
InstallScript: make install DESTDIR=%d
DocFiles: doc/AI doc/NOTES doc/NETWORK doc/xscorch.txt AUTHORS COPYING INSTALL
NEWS README TODO
-Description: Scorched Earth - "the mother of all games"
+Description: Scorched Earth clone for X11
DescDetail:<<
This is the *nix clone of Scorched Earth, a classic tank game.
-Some weapons have not been added yet.
+
+(It may break if you change the font)
<<
-Homepage: http://www.chaos2.org/xscorch/
+DescPackaging: <<
+The optional libraries (GNOME, MikMod, readline) are disabled because they
aren't actually used for anything.
+
+dmacks switched from gtk1 to gtk2:
+gtk-12=no switches to gtk-20, not disables gtk entirely.
+Uses deprecated gtk functions.
+Placed local -I before global.
+<<
+Homepage: http://www.xscorch.org
License: GPL
Index: xscorch.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/games/xscorch.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- xscorch.patch 20 Jan 2006 20:12:53 -0000 1.1
+++ xscorch.patch 24 Jul 2007 12:37:37 -0000 1.2
@@ -1,90 +1,58 @@
-diff -ruN xscorch-0.1.15/Makefile.in xscorch-0.1.15-patched/Makefile.in
---- xscorch-0.1.15/Makefile.in Mon Jun 17 22:33:52 2002
-+++ xscorch-0.1.15-patched/Makefile.in Sat Aug 16 13:24:53 2003
-@@ -116,7 +116,7 @@
- bin_PROGRAMS = $(GTK_PROGRAM) $(NETWORK_PROGRAM)
-
- xscorch_SOURCES = xscorch.c
--xscorch_LDADD = $(GTK_LIBS) $(LIBMIKMOD_LIBS) sgame/libscorch_game.a
sgtk/libscorch_gtk.a sgtk/swidgets/libscorch_widget_gtk.a sai/libscorch_ai.a
$(MIKMOD_LD_ADD) $(NETWORK_LD_ADD) sutil/libscorch_util.a sgame/libscorch_game.a
-+xscorch_LDADD = sgame/libscorch_game.a sgtk/libscorch_gtk.a
sgtk/swidgets/libscorch_widget_gtk.a sai/libscorch_ai.a $(MIKMOD_LD_ADD)
$(NETWORK_LD_ADD) sutil/libscorch_util.a sgame/libscorch_game.a $(GTK_LIBS)
$(LIBMIKMOD_LIBS)
-
- xscorch_server_SOURCES = xscorch.c
- xscorch_server_LDADD = -lm $(LIBREADLINE_LIBS) sgame/libscorch_game.a
sconsole/libscorch_console.a sai/libscorch_ai.a ssound/libscorch_sound_null.a
$(NETWORK_LD_ADD) sutil/libscorch_util.a sgame/libscorch_game.a
-diff -ruN xscorch-0.1.15/sutil/Makefile.in
xscorch-0.1.15-patched/sutil/Makefile.in
---- xscorch-0.1.15/sutil/Makefile.in Mon Jun 17 22:33:53 2002
-+++ xscorch-0.1.15-patched/sutil/Makefile.in Sat Aug 16 13:38:34 2003
-@@ -107,7 +107,7 @@
+diff -Nurd -x'*~' xscorch-0.2.0.orig/sgtk/Makefile.in
xscorch-0.2.0/sgtk/Makefile.in
+--- xscorch-0.2.0.orig/sgtk/Makefile.in 2004-03-25 00:24:11.000000000
-0500
++++ xscorch-0.2.0/sgtk/Makefile.in 2007-05-14 22:42:59.000000000 -0400
+@@ -146,7 +146,7 @@
+ libscorch_gtk_a_SOURCES = sai-gtk.c sautodef-gtk.c
scolor-gtk.c scolor-gtk.h sdialog-gtk.h
seconomy-gtk.c send-gtk.c sexplosion-gtk.c
sexplosion-gtk.h sfile-gtk.c sfont-gtk.c
sgraphics-gtk.c sgtk.h simage-gtk.c
simage-gtk.h sinventory-gtk.c sland-gtk.c
slottery-gtk.c smainmenu-gtk.c smenu-gtk.c
smenu-gtk.h snet-gtk.c snet-gtk.h
soptions-gtk.c spaint-gtk.c sphysics-gtk.c
splayer-gtk.c ssetup-gtk.h ssound-gtk.c
sspill-gtk.c sstatus-gtk.c sstatus-gtk.h
ssystem-gtk.c ssystem-gtk.h stank-gtk.c
stank-gtk.h sweapons-gtk.c swindow-gtk.c
swindow-gtk.h
- # Game code
- #
--libscorch_util_a_SOURCES = _reg.h getopt.c
getopt.h getopt1.c randserv.c
randserv.h reg.c regblock.c regio.c
regvar.c sslink.c sslink.h
shash.c shash.h sreg.h
sfractal.c sfractal.h srand.c srand.h
sstr.c sstr.h
-+libscorch_util_a_SOURCES = _reg.h randserv.c randserv.h
reg.c regblock.c regio.c
regvar.c sslink.c sslink.h shash.c
shash.h sreg.h sfractal.c
sfractal.h srand.c srand.h
sstr.c sstr.h
+-INCLUDES = $(GTK_CFLAGS) -Iswidgets -I../libj
++INCLUDES = -Iswidgets -I../libj $(GTK_CFLAGS)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h
+ CONFIG_CLEAN_FILES =
+diff -Nurd -x'*~' xscorch-0.2.0.orig/sgtk/sdialog-gtk.h
xscorch-0.2.0/sgtk/sdialog-gtk.h
+--- xscorch-0.2.0.orig/sgtk/sdialog-gtk.h 2004-02-26 10:27:56.000000000
-0500
++++ xscorch-0.2.0/sgtk/sdialog-gtk.h 2007-05-14 22:27:45.000000000 -0400
+@@ -31,6 +31,8 @@
+ #include <slabel.h>
+ #include <sgame/shelp.h>
+ #include <libj/jstr/libjstr.h>
++#undef GTK_DISABLE_DEPRECATED
++#include <gtk/gtkcombo.h>
- INCLUDES =
-diff -ruN xscorch-0.1.15/sutil/getopt.c xscorch-0.1.15-patched/sutil/getopt.c
---- xscorch-0.1.15/sutil/getopt.c Sun Jul 8 18:21:22 2001
-+++ xscorch-0.1.15-patched/sutil/getopt.c Sat Aug 16 13:41:43 2003
-@@ -121,7 +121,7 @@
- Also, when `ordering' is RETURN_IN_ORDER,
- each non-option ARGV-element is returned here. */
--char *optarg = NULL;
-+//char *optarg = NULL;
+ /* Tooltips and dialogue helpers */
+diff -Nurd -x'*~' xscorch-0.2.0.orig/sgtk/swidgets/Makefile.in
xscorch-0.2.0/sgtk/swidgets/Makefile.in
+--- xscorch-0.2.0.orig/sgtk/swidgets/Makefile.in 2004-03-25
00:24:12.000000000 -0500
++++ xscorch-0.2.0/sgtk/swidgets/Makefile.in 2007-05-14 22:42:46.000000000
-0400
+@@ -142,7 +142,7 @@
+ libscorch_widget_gtk_a_SOURCES = sactiveconsole.c
sactiveconsole.h sactoggle.c sactoggle.h
sconsole.c sconsole.h sdialog.c
sdialog.h sdisplay.c sdisplay.h
sdrawbuf.c sdrawbuf.h slabel.c
slabel.h slinkcheck.c slinkcheck.h
slinkcombo.c slinkcombo.h slinkentry.c
slinkentry.h slinkspin.c slinkspin.h
- /* Index in ARGV of the next element to be scanned.
- This is used for communication to and from the caller
-@@ -136,7 +136,7 @@
- how much of ARGV has been scanned so far. */
- /* 1003.2 says this must be 1 before any call. */
--int optind = 1;
-+//int optind = 1;
+-INCLUDES = $(GTK_CFLAGS) -I../ -I../../sutil -I../../libj
++INCLUDES = -I../ -I../../sutil -I../../libj $(GTK_CFLAGS)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../config.h
+ CONFIG_CLEAN_FILES =
+diff -Nurd -x'*~' xscorch-0.2.0.orig/sgtk/swidgets/sdialog.h
xscorch-0.2.0/sgtk/swidgets/sdialog.h
+--- xscorch-0.2.0.orig/sgtk/swidgets/sdialog.h 2004-02-26 10:27:58.000000000
-0500
++++ xscorch-0.2.0/sgtk/swidgets/sdialog.h 2007-05-14 22:38:13.000000000
-0400
+@@ -26,6 +26,7 @@
- /* Formerly, initialization of getopt depended on optind==0, which
- causes problems with re-calling getopt as programs generally don't
-@@ -156,13 +156,13 @@
- /* Callers store zero here to inhibit the error message
- for unrecognized options. */
--int opterr = 1;
-+//int opterr = 1;
+ #include <sgtk.h>
++#undef GTK_DISABLE_DEPRECATED
+ #include <gtk/gtk.h>
+ #include <gtk/gtkwindow.h>
- /* Set to an option character which was unrecognized.
- This must be initialized on some systems to avoid linking in the
- system's own getopt implementation. */
+diff -Nurd -x'*~' xscorch-0.2.0.orig/sgtk/swidgets/slinkcombo.h
xscorch-0.2.0/sgtk/swidgets/slinkcombo.h
+--- xscorch-0.2.0.orig/sgtk/swidgets/slinkcombo.h 2004-02-26
10:27:58.000000000 -0500
++++ xscorch-0.2.0/sgtk/swidgets/slinkcombo.h 2007-05-14 22:26:51.000000000
-0400
+@@ -27,6 +27,7 @@
--int optopt = '?';
-+//int optopt = '?';
+ #include <sgtk.h>
+ #include <gtk/gtk.h>
++#undef GTK_DISABLE_DEPRECATED
+ #include <gtk/gtkcombo.h>
- /* Describe how to deal with options that follow non-option ARGV-elements.
-@@ -920,7 +920,7 @@
- return c;
- }
- }
--
-+/*
- int
- getopt(argc, argv, optstring)
- int argc;
-@@ -932,7 +932,7 @@
- (int *) 0,
- 0);
- }
--
-+*/
- #endif /* Not ELIDE_CODE. */
-
- #ifdef TEST
-diff -ruN xscorch-0.1.15/xscorch.c xscorch-0.1.15-patched/xscorch.c
---- xscorch-0.1.15/xscorch.c Mon Jun 17 22:29:47 2002
-+++ xscorch-0.1.15-patched/xscorch.c Sat Aug 16 13:24:53 2003
-@@ -70,7 +70,6 @@
- sigemptyset(&sigset);
- sigaddset(&sigset, SIGPIPE);
- sa.sa_handler = sc_signal_handler;
-- sa.sa_sigaction = NULL;
- sa.sa_mask = sigset;
- sa.sa_flags = 0;
- sigaction(SIGPIPE, &sa, NULL);
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
