summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'games-action/xshipwars')
-rw-r--r--games-action/xshipwars/files/xshipwars-2.4.7-64bit-warnings.patch94
-rw-r--r--games-action/xshipwars/files/xshipwars-2.4.7-build.patch101
-rw-r--r--games-action/xshipwars/files/xshipwars-2.5.4-build.patch80
3 files changed, 0 insertions, 275 deletions
diff --git a/games-action/xshipwars/files/xshipwars-2.4.7-64bit-warnings.patch b/games-action/xshipwars/files/xshipwars-2.4.7-64bit-warnings.patch
deleted file mode 100644
index 3f7cef364371..000000000000
--- a/games-action/xshipwars/files/xshipwars-2.4.7-64bit-warnings.patch
+++ /dev/null
@@ -1,94 +0,0 @@
---- client/images.cpp
-+++ client/images.cpp
-@@ -285,8 +285,8 @@
- {
- fprintf(
- stderr,
--"ImgOpenData(): Warning: Unable to open TGA image data: 0x%.8x\n",
-- (u_int32_t)data
-+"ImgOpenData(): Warning: Unable to open TGA image data: %p\n",
-+ data
- );
- ImgUnload(img_num);
- return(-1);
---- global/osw-x.cpp
-+++ global/osw-x.cpp
-@@ -8598,8 +8598,8 @@
- /* Display */
- fprintf(
- stderr,
--" X server display connection pointer: 0x%.8x\n",
-- (u_int32_t)error_event->display
-+" X server display connection pointer: %p\n",
-+ error_event->display
- );
-
- /* Serial number */
---- widgets/wfile.cpp
-+++ widgets/wfile.cpp
-@@ -213,7 +213,7 @@
- status = TgaReadFromData(data, td, gui->depth);
- if(status != TgaSuccess)
- {
-- fprintf(stderr, "WidgetLoadImageFromTgaData(): 0x%.8x: ", (u_int32_t)data);
-+ fprintf(stderr, "WidgetLoadImageFromTgaData(): %p: ", data);
- switch(status)
- {
- case TgaNoBuffers:
-@@ -248,8 +248,8 @@
- {
- fprintf(
- stderr,
--"0x%.8x: Error: Unable to allocate GUI image.\n",
-- (u_int32_t)data
-+"%p: Error: Unable to allocate GUI image.\n",
-+ data
- );
- }
- else
-@@ -517,8 +517,8 @@
- {
- fprintf(
- stderr,
--"0x%.8x: Unable to open XPM data.\n",
-- (u_int32_t)data
-+"%p: Unable to open XPM data.\n",
-+ data
- );
- return(None);
- }
---- widgets/wglobal.cpp
-+++ widgets/wglobal.cpp
-@@ -602,8 +602,8 @@
-
- sprintf(
- s,
--"WidgetDestroyGlobals(): Warning: %s widget #%i 0x%.8x was not destroyed.",
-- type_name, i, (u_int32_t)widget
-+"WidgetDestroyGlobals(): Warning: %s widget #%i %p was not destroyed.",
-+ type_name, i, widget
- );
- fprintf(stderr, "%s\n", s);
- free(s);
-@@ -1484,8 +1484,8 @@
- default:
- fprintf(
- stderr,
--"WidgetDestroy(): Widget 0x%.8x: Unsupported widget type (type=%i).\n",
-- (u_int32_t)widget,
-+"WidgetDestroy(): Widget %p: Unsupported widget type (type=%i).\n",
-+ widget,
- type
- );
- break;
---- widgets/wlist.cpp
-+++ widgets/wlist.cpp
-@@ -2584,7 +2584,7 @@
-
- return(w);
- #else
-- return(NULL);
-+ return(None);
- #endif
- }
-
diff --git a/games-action/xshipwars/files/xshipwars-2.4.7-build.patch b/games-action/xshipwars/files/xshipwars-2.4.7-build.patch
deleted file mode 100644
index 82823effec15..000000000000
--- a/games-action/xshipwars/files/xshipwars-2.4.7-build.patch
+++ /dev/null
@@ -1,101 +0,0 @@
---- client/platforms.ini
-+++ client/platforms.ini
-@@ -199,7 +199,7 @@
- PlatformFeature = X11
- Description = X Window Systems
- MustExist = Yes
-- FeatureCFLAGS = -DUSE_XSHM -DHAVE_MWMUTIL_H
-+ FeatureCFLAGS = -DUSE_XSHM -DHAVE_MWMUTIL_H -DHAVE_X
- FeatureLIBS = -lX11 -lXext
- FeatureLIB_DIR = -L/usr/X11R6/lib/
- FeatureDepend = X11-lib
---- unvedit/platforms.ini
-+++ unvedit/platforms.ini
-@@ -140,7 +140,7 @@
- PlatformFeature = X11
- Description = X Window Systems
- MustExist = Yes
-- FeatureCFLAGS = -DUSE_XSHM -DHAVE_MWMUTIL_H
-+ FeatureCFLAGS = -DUSE_XSHM -DHAVE_MWMUTIL_H -DHAVE_X
- FeatureLIBS = -lX11 -lXext
- FeatureLIB_DIR = -L/usr/X11R6/lib/
- FeatureDepend = X11-lib
---- monitor/platforms.ini
-+++ monitor/platforms.ini
-@@ -140,7 +140,7 @@
- PlatformFeature = X11
- Description = X Window Systems
- MustExist = Yes
-- FeatureCFLAGS = -DUSE_XSHM -DHAVE_MWMUTIL_H
-+ FeatureCFLAGS = -DUSE_XSHM -DHAVE_MWMUTIL_H -DHAVE_X
- FeatureLIBS = -lX11 -lXext
- FeatureLIB_DIR = -L/usr/X11R6/lib/
- FeatureDepend = X11-lib
---- client/Makefile.install.UNIX
-+++ client/Makefile.install.UNIX
-@@ -11,9 +11,9 @@
- #
-
- INSTALL = install
--INSTBINFLAGS = -m 0755 -s
-+INSTBINFLAGS = -m 0755
- INSTUIDFLAGS = -m 4755
--INSTLIBFLAGS = -m 0755 -s
-+INSTLIBFLAGS = -m 0755
- INSTINCFLAGS = -m 0644
- INSTMANFLAGS = -m 0644
- INSTCFGFLAGS = -m 0644
-@@ -26,8 +26,10 @@
- MKDIRFLAGS = -p
-
-
--GAMES_DIR = $(PREFIX)/games
--XSW_DIR = $(PREFIX)/share/games/xshipwars
-+BINDIR = $(PREFIX)/games
-+GAMES_DIR = $(DESTDIR)$(BINDIR)
-+DATADIR = $(PREFIX)/share/games
-+XSW_DIR = $(DESTDIR)$(DATADIR)/xshipwars
- XSW_ETC_DIR = $(XSW_DIR)/etc
-
- XSW_CFG_FILE = xsw.ini
---- monitor/Makefile.install.UNIX
-+++ monitor/Makefile.install.UNIX
-@@ -27,8 +27,10 @@
- MKDIR = mkdir
- MKDIRFLAGS = -p
-
--GAMES_DIR = $(PREFIX)/games
--XSW_DIR = $(PREFIX)/share/games/xshipwars
-+BINDIR = $(PREFIX)/games
-+GAMES_DIR = $(DESTDIR)$(BINDIR)
-+DATADIR = $(PREFIX)/share/games
-+XSW_DIR = $(DESTDIR)$(DATADIR)/xshipwars
- MONITOR_IMAGES_DIR = $(XSW_DIR)/images/monitor
-
- HR = "-------------------------------------------------------------------------"
---- server/Makefile.install.UNIX
-+++ server/Makefile.install.UNIX
-@@ -29,7 +29,7 @@
- MKDIRFLAGS = -p
-
-
--SWSERV_BASE_DIR = $(PREFIX)/swserv
-+SWSERV_BASE_DIR = $(DESTDIR)$(PREFIX)/swserv
-
- SWSERV_BIN_DIR = $(SWSERV_BASE_DIR)/bin
- SWSERV_DB_DIR = $(SWSERV_BASE_DIR)/db
---- unvedit/Makefile.install.UNIX
-+++ unvedit/Makefile.install.UNIX
-@@ -26,8 +26,10 @@
- MKDIR = mkdir
- MKDIRFLAGS = -p
-
--GAMES_BIN_DIR = $(PREFIX)/games
--XSW_DATA_DIR = $(PREFIX)/share/games/xshipwars
-+BINDIR = $(PREFIX)/games
-+GAMES_BIN_DIR = $(DESTDIR)$(BINDIR)
-+DATADIR = $(PREFIX)/share/games
-+XSW_DATA_DIR = $(DESTDIR)$(DATADIR)/xshipwars
- UNVEDIT_IMAGES_DIR = $(XSW_DATA_DIR)/images/unvedit
-
- HR = "-------------------------------------------------------------------------"
diff --git a/games-action/xshipwars/files/xshipwars-2.5.4-build.patch b/games-action/xshipwars/files/xshipwars-2.5.4-build.patch
deleted file mode 100644
index 99a286848a08..000000000000
--- a/games-action/xshipwars/files/xshipwars-2.5.4-build.patch
+++ /dev/null
@@ -1,80 +0,0 @@
---- client/Makefile.install.UNIX
-+++ client/Makefile.install.UNIX
-@@ -11,9 +11,9 @@
- #
-
- INSTALL = install
--INSTBINFLAGS = -m 0755 -s
-+INSTBINFLAGS = -m 0755
- INSTUIDFLAGS = -m 4755
--INSTLIBFLAGS = -m 0755 -s
-+INSTLIBFLAGS = -m 0755
- INSTINCFLAGS = -m 0644
- INSTMANFLAGS = -m 0644
- INSTCFGFLAGS = -m 0644
-@@ -26,8 +26,10 @@
- MKDIRFLAGS = -p
-
-
--GAMES_DIR = $(PREFIX)/games
--XSW_DIR = $(PREFIX)/share/games/xshipwars
-+BINDIR = $(PREFIX)/games
-+GAMES_DIR = $(DESTDIR)$(BINDIR)
-+DATADIR = $(PREFIX)/share/games
-+XSW_DIR = $(DESTDIR)$(DATADIR)/xshipwars
- XSW_ETC_DIR = $(XSW_DIR)/etc
-
- XSW_CFG_FILE = xsw.ini
---- monitor/Makefile.install.UNIX
-+++ monitor/Makefile.install.UNIX
-@@ -27,8 +27,10 @@
- MKDIR = mkdir
- MKDIRFLAGS = -p
-
--GAMES_DIR = $(PREFIX)/games
--XSW_DIR = $(PREFIX)/share/games/xshipwars
-+BINDIR = $(PREFIX)/games
-+GAMES_DIR = $(DESTDIR)$(BINDIR)
-+DATADIR = $(PREFIX)/share/games
-+XSW_DIR = $(DESTDIR)$(DATADIR)/xshipwars
- MONITOR_IMAGES_DIR = $(XSW_DIR)/images/monitor
-
- HR = "-------------------------------------------------------------------------"
---- server/Makefile.install.UNIX
-+++ server/Makefile.install.UNIX
-@@ -29,7 +29,7 @@
- MKDIRFLAGS = -p
-
-
--SWSERV_BASE_DIR = $(PREFIX)/swserv
-+SWSERV_BASE_DIR = $(DESTDIR)$(PREFIX)/swserv
-
- SWSERV_BIN_DIR = $(SWSERV_BASE_DIR)/bin
- SWSERV_DB_DIR = $(SWSERV_BASE_DIR)/db
---- unvedit/Makefile.install.UNIX
-+++ unvedit/Makefile.install.UNIX
-@@ -26,8 +26,10 @@
- MKDIR = mkdir
- MKDIRFLAGS = -p
-
--GAMES_BIN_DIR = $(PREFIX)/games
--XSW_DATA_DIR = $(PREFIX)/share/games/xshipwars
-+BINDIR = $(PREFIX)/games
-+GAMES_BIN_DIR = $(DESTDIR)$(BINDIR)
-+DATADIR = $(PREFIX)/share/games
-+XSW_DATA_DIR = $(DESTDIR)$(DATADIR)/xshipwars
- UNVEDIT_IMAGES_DIR = $(XSW_DATA_DIR)/images/unvedit
-
- HR = "-------------------------------------------------------------------------"
-*** unvedit/printdlg.cpp Fri Dec 30 00:44:01 2005
---- unvedit/printdlg.cpp Mon Mar 6 15:19:00 2006
-***************
-*** 1,6 ****
---- 1,7 ----
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+ #include <unistd.h>
-
- #include "../include/string.h"
- #include "../include/disk.h"