summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /games-arcade/blobwars/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'games-arcade/blobwars/files')
-rw-r--r--games-arcade/blobwars/files/blobwars-1.19-ldflags.patch22
-rw-r--r--games-arcade/blobwars/files/blobwars-1.19-linking-order.patch36
-rw-r--r--games-arcade/blobwars/files/blobwars-1.19-zlib-1.2.5.2.patch22
3 files changed, 80 insertions, 0 deletions
diff --git a/games-arcade/blobwars/files/blobwars-1.19-ldflags.patch b/games-arcade/blobwars/files/blobwars-1.19-ldflags.patch
new file mode 100644
index 000000000000..8b006f1003a8
--- /dev/null
+++ b/games-arcade/blobwars/files/blobwars-1.19-ldflags.patch
@@ -0,0 +1,22 @@
+--- makefile~ 2011-08-29 20:32:22.000000000 +0200
++++ makefile 2011-08-29 20:33:27.052159159 +0200
+@@ -82,16 +82,16 @@
+
+ # linking the program.
+ $(PROG): $(GAMEOBJS)
+- $(CXX) $(GAMEOBJS) -o $(PROG) $(LIBS)
++ $(CXX) $(LDFLAGS) $(GAMEOBJS) -o $(PROG) $(LIBS)
+
+ pak: $(PAKOBJS)
+- $(CXX) $(PAKOBJS) -o pak $(LIBS)
++ $(CXX) $(LDFLAGS) $(PAKOBJS) -o pak $(LIBS)
+
+ %.mo: %.po
+ msgfmt -c -o $@ $<
+
+ mapeditor: $(MAPOBJS)
+- $(CXX) $(MAPOBJS) -o mapeditor $(LIBS)
++ $(CXX) $(LDFLAGS) $(MAPOBJS) -o mapeditor $(LIBS)
+
+ # cleaning everything that can be automatically recreated with "make".
+ clean:
diff --git a/games-arcade/blobwars/files/blobwars-1.19-linking-order.patch b/games-arcade/blobwars/files/blobwars-1.19-linking-order.patch
new file mode 100644
index 000000000000..6b0010138652
--- /dev/null
+++ b/games-arcade/blobwars/files/blobwars-1.19-linking-order.patch
@@ -0,0 +1,36 @@
+From 896cde549eeb254cc4960f20f54cab845e95b061 Mon Sep 17 00:00:00 2001
+From: Andreas Moog <amoog@ubuntu.com>
+Date: Sun, 19 Jun 2011 22:03:10 +0200
+Subject: [PATCH] LIBS go after objects to allow linking with ld --as-needed
+
+---
+ makefile | 6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/makefile b/makefile
+index 0a9cc94..509c2ff 100755
+--- a/makefile
++++ b/makefile
+@@ -82,16 +82,16 @@ all: $(ALL)
+
+ # linking the program.
+ $(PROG): $(GAMEOBJS)
+- $(CXX) $(LIBS) $(GAMEOBJS) -o $(PROG)
++ $(CXX) $(GAMEOBJS) -o $(PROG) $(LIBS)
+
+ pak: $(PAKOBJS)
+- $(CXX) $(LIBS) $(PAKOBJS) -o pak
++ $(CXX) $(PAKOBJS) -o pak $(LIBS)
+
+ %.mo: %.po
+ msgfmt -c -o $@ $<
+
+ mapeditor: $(MAPOBJS)
+- $(CXX) $(LIBS) $(MAPOBJS) -o mapeditor
++ $(CXX) $(MAPOBJS) -o mapeditor $(LIBS)
+
+ # cleaning everything that can be automatically recreated with "make".
+ clean:
+--
+1.7.5.4
+
diff --git a/games-arcade/blobwars/files/blobwars-1.19-zlib-1.2.5.2.patch b/games-arcade/blobwars/files/blobwars-1.19-zlib-1.2.5.2.patch
new file mode 100644
index 000000000000..cf101170e26c
--- /dev/null
+++ b/games-arcade/blobwars/files/blobwars-1.19-zlib-1.2.5.2.patch
@@ -0,0 +1,22 @@
+http://bugs.gentoo.org/408459
+
+--- src/pak.cpp
++++ src/pak.cpp
+@@ -119,7 +119,7 @@
+ {
+ printf("Couldn't open %s for reading!\n", filename);
+ closedir(dirp);
+- gzclose(pak);
++ gzclose((gzFile)pak);
+ exit(1);
+ }
+
+@@ -141,7 +141,7 @@
+ {
+ printf("Couldn't open %s for reading!\n", filename);
+ closedir(dirp);
+- gzclose(pak);
++ gzclose((gzFile)pak);
+ exit(1);
+ }
+ else