[deng] 03/04: refresh patches for 1.15.0
Michael Gilbert
mgilbert at moszumanska.debian.org
Sun Jun 28 22:44:44 UTC 2015
This is an automated email from the git hooks/post-receive script.
mgilbert pushed a commit to branch master
in repository deng.
commit 3d4840d8f2b754d3efef0eeca36e0f38390049e7
Author: Michael Gilbert <mgilbert at debian.org>
Date: Sun Jun 28 18:42:39 2015 -0400
refresh patches for 1.15.0
---
debian/patches/exit-calls.patch | 199 ++++++++++++++++++++++++++++++++++++++++
debian/patches/freedoom.patch | 8 +-
debian/patches/noexample.patch | 5 +-
debian/patches/nofsaa.patch | 13 ---
debian/patches/paths.patch | 3 +-
debian/patches/rpath.patch | 3 +-
debian/patches/series | 5 +-
debian/patches/spelling.patch | 26 +++---
8 files changed, 225 insertions(+), 37 deletions(-)
diff --git a/debian/patches/exit-calls.patch b/debian/patches/exit-calls.patch
new file mode 100644
index 0000000..bf60dd5
--- /dev/null
+++ b/debian/patches/exit-calls.patch
@@ -0,0 +1,199 @@
+description: use abort() instead of exit() in shared libraries
+author: Michael Gilbert <mgilbert at debian.org>
+
+--- a/doomsday/plugins/hexen/src/st_stuff.cpp
++++ b/doomsday/plugins/hexen/src/st_stuff.cpp
+@@ -2942,7 +2942,7 @@ void ST_Start(int player)
+ if(player < 0 || player >= MAXPLAYERS)
+ {
+ Con_Error("ST_Start: Invalid player #%i.", player);
+- exit(1); // Unreachable.
++ abort(); // Unreachable.
+ }
+ hudstate_t *hud = &hudStates[player];
+
+@@ -3061,7 +3061,7 @@ struct uiwidgetdef_t
+ if(player < 0 || player >= MAXPLAYERS)
+ {
+ Con_Error("ST_BuildWidgets: Invalid player #%i.", player);
+- exit(1); // Unreachable.
++ abort(); // Unreachable.
+ }
+
+ for(int i = 0; i < widgetGroupDefCount; ++i)
+@@ -3142,7 +3142,7 @@ uiwidget_t *ST_UIChatForPlayer(int playe
+ return GUI_FindObjectById(hud->chatWidgetId);
+ }
+ Con_Error("ST_UIChatForPlayer: Invalid player #%i.", player);
+- exit(1); // Unreachable.
++ abort(); // Unreachable.
+ }
+
+ uiwidget_t *ST_UILogForPlayer(int player)
+@@ -3153,7 +3153,7 @@ uiwidget_t *ST_UILogForPlayer(int player
+ return GUI_FindObjectById(hud->logWidgetId);
+ }
+ Con_Error("ST_UILogForPlayer: Invalid player #%i.", player);
+- exit(1); // Unreachable.
++ abort(); // Unreachable.
+ }
+
+ uiwidget_t *ST_UIAutomapForPlayer(int player)
+@@ -3164,7 +3164,7 @@ uiwidget_t *ST_UIAutomapForPlayer(int pl
+ return GUI_FindObjectById(hud->automapWidgetId);
+ }
+ Con_Error("ST_UIAutomapForPlayer: Invalid player #%i.", player);
+- exit(1); // Unreachable.
++ abort(); // Unreachable.
+ }
+
+ int ST_ChatResponder(int player, event_t *ev)
+--- a/doomsday/plugins/common/src/am_map.c
++++ b/doomsday/plugins/common/src/am_map.c
+@@ -341,7 +341,7 @@ void AM_SetColor(automapcfg_t* mcfg, aut
+
+ default:
+ Con_Error("AM_SetColor: Object %i does not use color.", (int) name);
+- exit(1); // Unreachable.
++ abort(); // Unreachable.
+ }
+
+ info->rgba[0] = r;
+--- a/doomsday/plugins/common/src/g_game.cpp
++++ b/doomsday/plugins/common/src/g_game.cpp
+@@ -674,7 +674,7 @@ fontid_t R_MustFindFontForName(char cons
+ Uri_Delete(uri);
+ if(fontId) return fontId;
+ Con_Error("Failed loading font \"%s\".", name);
+- exit(1); // Unreachable.
++ abort(); // Unreachable.
+ }
+
+ void R_InitRefresh()
+--- a/doomsday/plugins/common/src/hu_lib.cpp
++++ b/doomsday/plugins/common/src/hu_lib.cpp
+@@ -51,7 +51,7 @@ static void errorIfNotInited(char const
+ if(inited) return;
+ Con_Error("%s: GUI module is not presently initialized.", callerName);
+ // Unreachable. Prevents static analysers from getting rather confused, poor things.
+- exit(1);
++ abort();
+ }
+
+ static uiwidgetid_t nextUnusedId()
+--- a/doomsday/plugins/common/src/p_mapsetup.cpp
++++ b/doomsday/plugins/common/src/p_mapsetup.cpp
+@@ -693,7 +693,7 @@ void P_SetupMap(de::Uri const &mapUri)
+ if(!P_MapChange(mapUri.compose().toUtf8().constData()))
+ {
+ Con_Error("P_SetupMap: Failed changing/loading map \"%s\".\n", mapUri.compose().toUtf8().constData());
+- exit(1); // Unreachable.
++ abort(); // Unreachable.
+ }
+
+ // Make sure the game is paused for the requested period.
+--- a/doomsday/plugins/common/src/r_common.c
++++ b/doomsday/plugins/common/src/r_common.c
+@@ -91,7 +91,7 @@ static dd_bool maximizedViewWindow(int p
+ if(player < 0 || player >= MAXPLAYERS)
+ {
+ Con_Error("maximizedViewWindow: Invalid player #%i.", player);
+- exit(1);
++ abort();
+ }
+ return (!(G_GameState() == GS_MAP && cfg.common.screenBlocks <= 10 &&
+ !(P_MobjIsCamera(plr->plr->mo) && Get(DD_PLAYBACK)))); // $democam: can be set on every game tic.
+@@ -129,7 +129,7 @@ static void resizeViewWindow(int player,
+ if(player < 0 || player >= MAXPLAYERS)
+ {
+ Con_Error("resizeViewWindow: Invalid player #%i.", player);
+- exit(1); // Unreachable.
++ abort(); // Unreachable.
+ }
+
+ // Calculate fixed 320x200 scale factors.
+--- a/doomsday/plugins/doom/src/st_stuff.cpp
++++ b/doomsday/plugins/doom/src/st_stuff.cpp
+@@ -2822,7 +2822,7 @@ void ST_Start(int player)
+ if(player < 0 || player >= MAXPLAYERS)
+ {
+ Con_Error("ST_Start: Invalid player #%i.", player);
+- exit(1); // Unreachable.
++ abort(); // Unreachable.
+ }
+ hud = &hudStates[player];
+
+@@ -2948,7 +2948,7 @@ struct uiwidgetdef_t
+ if(player < 0 || player >= MAXPLAYERS)
+ {
+ Con_Error("ST_BuildWidgets: Invalid player #%i.", player);
+- exit(1); // Unreachable.
++ abort(); // Unreachable.
+ }
+
+ for(i = 0; i < sizeof(widgetGroupDefs)/sizeof(widgetGroupDefs[0]); ++i)
+@@ -3022,7 +3022,7 @@ uiwidget_t *ST_UIChatForPlayer(int playe
+ return GUI_FindObjectById(hud->chatWidgetId);
+ }
+ Con_Error("ST_UIChatForPlayer: Invalid player #%i.", player);
+- exit(1); // Unreachable.
++ abort(); // Unreachable.
+ }
+
+ uiwidget_t *ST_UILogForPlayer(int player)
+@@ -3033,7 +3033,7 @@ uiwidget_t *ST_UILogForPlayer(int player
+ return GUI_FindObjectById(hud->logWidgetId);
+ }
+ Con_Error("ST_UILogForPlayer: Invalid player #%i.", player);
+- exit(1); // Unreachable.
++ abort(); // Unreachable.
+ }
+
+ uiwidget_t *ST_UIAutomapForPlayer(int player)
+@@ -3044,7 +3044,7 @@ uiwidget_t *ST_UIAutomapForPlayer(int pl
+ return GUI_FindObjectById(hud->automapWidgetId);
+ }
+ Con_Error("ST_UIAutomapForPlayer: Invalid player #%i.", player);
+- exit(1); // Unreachable.
++ abort(); // Unreachable.
+ }
+
+ int ST_ChatResponder(int player, event_t* ev)
+--- a/doomsday/plugins/doom64/src/st_stuff.c
++++ b/doomsday/plugins/doom64/src/st_stuff.c
+@@ -675,7 +675,7 @@ void ST_Start(int player)
+ if(player < 0 || player >= MAXPLAYERS)
+ {
+ Con_Error("ST_Start: Invalid player #%i.", player);
+- exit(1); // Unreachable.
++ abort(); // Unreachable.
+ }
+ hud = &hudStates[player];
+
+@@ -786,7 +786,7 @@ uiwidget_t* ST_UIChatForPlayer(int playe
+ return GUI_FindObjectById(hud->chatWidgetId);
+ }
+ Con_Error("ST_UIChatForPlayer: Invalid player #%i.", player);
+- exit(1); // Unreachable.
++ abort(); // Unreachable.
+ }
+
+ uiwidget_t* ST_UILogForPlayer(int player)
+@@ -797,7 +797,7 @@ uiwidget_t* ST_UILogForPlayer(int player
+ return GUI_FindObjectById(hud->logWidgetId);
+ }
+ Con_Error("ST_UILogForPlayer: Invalid player #%i.", player);
+- exit(1); // Unreachable.
++ abort(); // Unreachable.
+ }
+
+ uiwidget_t* ST_UIAutomapForPlayer(int player)
+@@ -808,7 +808,7 @@ uiwidget_t* ST_UIAutomapForPlayer(int pl
+ return GUI_FindObjectById(hud->automapWidgetId);
+ }
+ Con_Error("ST_UIAutomapForPlayer: Invalid player #%i.", player);
+- exit(1); // Unreachable.
++ abort(); // Unreachable.
+ }
+
+ int ST_ChatResponder(int player, event_t* ev)
diff --git a/debian/patches/freedoom.patch b/debian/patches/freedoom.patch
index 6dc7f7a..811c800 100644
--- a/debian/patches/freedoom.patch
+++ b/debian/patches/freedoom.patch
@@ -18,7 +18,7 @@ description: add support for loading freedoom wads
GameDef const hacxDef = {
"hacx", "hacx",
"HACX - Twitch 'n Kill", "Banjo Software",
-@@ -112,6 +121,24 @@ int G_RegisterGames(int hookType, int pa
+@@ -120,6 +129,24 @@ int G_RegisterGames(int hookType, int pa
DENG_UNUSED(hookType); DENG_UNUSED(param); DENG_UNUSED(data);
@@ -43,7 +43,7 @@ description: add support for loading freedoom wads
/* HacX */
gameIds[doom2_hacx] = DD_DefineGame(&hacxDef);
DD_AddGameResource(GID(doom2_hacx), RC_PACKAGE, FF_STARTUP, STARTUPPK3, 0);
-@@ -178,6 +205,9 @@ void DP_Load(void)
+@@ -186,6 +213,9 @@ void DP_Load(void)
gameIds[doom2_tnt] = DD_GameIdForKey("doom2-tnt");
gameIds[doom2_plut] = DD_GameIdForKey("doom2-plut");
gameIds[doom2_hacx] = DD_GameIdForKey("hacx");
@@ -55,7 +55,7 @@ description: add support for loading freedoom wads
}
--- a/doomsday/plugins/doom/include/doomdef.h
+++ b/doomsday/plugins/doom/include/doomdef.h
-@@ -74,6 +74,9 @@ typedef enum {
+@@ -72,6 +72,9 @@ typedef enum {
doom2_plut,
doom2_tnt,
doom2_hacx,
@@ -65,7 +65,7 @@ description: add support for loading freedoom wads
NUM_GAME_MODES
} gamemode_t;
-@@ -86,9 +89,12 @@ typedef enum {
+@@ -84,9 +87,12 @@ typedef enum {
#define GM_DOOM2_PLUT 0x20
#define GM_DOOM2_TNT 0x40
#define GM_DOOM2_HACX 0x80
diff --git a/debian/patches/noexample.patch b/debian/patches/noexample.patch
index 80bbe9c..c7dde2d 100644
--- a/debian/patches/noexample.patch
+++ b/debian/patches/noexample.patch
@@ -1,4 +1,5 @@
description: don't build unused example plugin
+author: Michael Gilbert <mgilbert at debian.org>
--- a/doomsday/plugins/plugins.pro
+++ b/doomsday/plugins/plugins.pro
@@ -6,8 +7,8 @@ description: don't build unused example plugin
include(../config.pri)
TEMPLATE = subdirs
--SUBDIRS = dehread savegameconverter wadmapconverter example
-+SUBDIRS = dehread savegameconverter wadmapconverter
+-SUBDIRS = dehread savegameconverter idtech1converter example
++SUBDIRS = dehread savegameconverter idtech1converter
# Games.
SUBDIRS += doom heretic hexen
diff --git a/debian/patches/nofsaa.patch b/debian/patches/nofsaa.patch
deleted file mode 100644
index c1e9cbc..0000000
--- a/debian/patches/nofsaa.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-description: turn fsaa off by default (because it doesn't work in 1.14)
-
---- a/doomsday/libgui/modules/gui.de
-+++ b/doomsday/libgui/modules/gui.de
-@@ -32,7 +32,7 @@ def setDefaults(d)
-
- # Window manager defaults.
- record d.window
-- d.window.fsaa = True # Remove this (should be window-specific).
-+ d.window.fsaa = False # Remove this (should be window-specific).
-
- # Configure the main window.
- record d.window.main
diff --git a/debian/patches/paths.patch b/debian/patches/paths.patch
index 885b2e0..0ee2207 100644
--- a/debian/patches/paths.patch
+++ b/debian/patches/paths.patch
@@ -1,8 +1,9 @@
description: use FHS installation paths for games
+author: Michael Gilbert <mgilbert at debian.org>
--- a/doomsday/config_unix.pri
+++ b/doomsday/config_unix.pri
-@@ -26,22 +26,19 @@ isEmpty(PREFIX) {
+@@ -28,22 +28,19 @@ isEmpty(PREFIX) {
}
# Binary location.
diff --git a/debian/patches/rpath.patch b/debian/patches/rpath.patch
index af98619..a591eac 100644
--- a/debian/patches/rpath.patch
+++ b/debian/patches/rpath.patch
@@ -1,8 +1,9 @@
description: use rpath to set library search path
+author: Michael Gilbert <mgilbert at debian.org>
--- a/doomsday/config_unix.pri
+++ b/doomsday/config_unix.pri
-@@ -36,7 +36,7 @@ DENG_PLUGIN_LIB_DIR = $$DENG_LIB_DIR/plu
+@@ -38,7 +38,7 @@ DENG_PLUGIN_LIB_DIR = $$DENG_LIB_DIR/plu
# When installing libraries to a non-standard location, instruct
# the linker where to find them.
diff --git a/debian/patches/series b/debian/patches/series
index b12b8c2..51ec554 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,10 +1,9 @@
paths.patch
rpath.patch
-spelling.patch
manpages.patch
-
+spelling.patch
freedoom.patch
noexample.patch
-nofsaa.patch
+exit-calls.patch
diff --git a/debian/patches/spelling.patch b/debian/patches/spelling.patch
index eb6a33a..333ac67 100644
--- a/debian/patches/spelling.patch
+++ b/debian/patches/spelling.patch
@@ -1,18 +1,18 @@
description: fix spelling errors
author: Michael Gilbert <mgilbert at debian.org>
---- a/doomsday/plugins/wadmapconverter/src/id1map.cpp
-+++ b/doomsday/plugins/wadmapconverter/src/id1map.cpp
-@@ -380,7 +380,7 @@ DENG2_PIMPL(Id1Map)
+--- a/doomsday/plugins/idtech1converter/src/mapimporter.cpp
++++ b/doomsday/plugins/idtech1converter/src/mapimporter.cpp
+@@ -943,7 +943,7 @@ DENG2_PIMPL(MapImporter)
void transferVertexes()
{
- LOGDEV_MAP_XVERBOSE("Transfering vertexes...");
+ LOGDEV_MAP_XVERBOSE("Transferring vertexes...");
- int const numVertexes = vertexCount();
- int *indices = new int[numVertexes];
+ dint const numVertexes = vertexCount();
+ dint *indices = new dint[numVertexes];
for(int i = 0; i < numVertexes; ++i)
-@@ -393,7 +393,7 @@ DENG2_PIMPL(Id1Map)
+@@ -956,7 +956,7 @@ DENG2_PIMPL(MapImporter)
void transferSectors()
{
@@ -21,7 +21,7 @@ author: Michael Gilbert <mgilbert at debian.org>
DENG2_FOR_EACH(Sectors, i, sectors)
{
-@@ -421,7 +421,7 @@ DENG2_PIMPL(Id1Map)
+@@ -984,7 +984,7 @@ DENG2_PIMPL(MapImporter)
void transferLinesAndSides()
{
@@ -29,8 +29,8 @@ author: Michael Gilbert <mgilbert at debian.org>
+ LOGDEV_MAP_XVERBOSE("Transferring lines and sides...");
DENG2_FOR_EACH(Lines, i, lines)
{
- mside_t *front = ((i)->sides[RIGHT] >= 0? &sides[(i)->sides[RIGHT]] : 0);
-@@ -493,7 +493,7 @@ DENG2_PIMPL(Id1Map)
+ SideDef *front = (i->hasFront()? &sides[i->front()] : 0);
+@@ -1056,7 +1056,7 @@ DENG2_PIMPL(MapImporter)
{
if(surfaceTints.empty()) return;
@@ -38,8 +38,8 @@ author: Michael Gilbert <mgilbert at debian.org>
+ LOGDEV_MAP_XVERBOSE("Transferring surface tints...");
DENG2_FOR_EACH(SurfaceTints, i, surfaceTints)
{
- int idx = i - surfaceTints.begin();
-@@ -511,7 +511,7 @@ DENG2_PIMPL(Id1Map)
+ dint idx = i - surfaceTints.begin();
+@@ -1074,7 +1074,7 @@ DENG2_PIMPL(MapImporter)
{
if(polyobjs.empty()) return;
@@ -48,7 +48,7 @@ author: Michael Gilbert <mgilbert at debian.org>
DENG2_FOR_EACH(Polyobjs, i, polyobjs)
{
MPE_PolyobjCreate(i->lineIndices.constData(), i->lineIndices.count(),
-@@ -525,7 +525,7 @@ DENG2_PIMPL(Id1Map)
+@@ -1088,7 +1088,7 @@ DENG2_PIMPL(MapImporter)
{
if(things.empty()) return;
@@ -56,4 +56,4 @@ author: Michael Gilbert <mgilbert at debian.org>
+ LOGDEV_MAP_XVERBOSE("Transferring things...");
DENG2_FOR_EACH(Things, i, things)
{
- int idx = i - things.begin();
+ dint idx = i - things.begin();
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/deng.git
More information about the Pkg-games-commits
mailing list