From: "Pacho Ramos" <pacho@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: games-arcade/amphetamine/, games-arcade/amphetamine/files/
Date: Sun, 15 Apr 2018 09:11:35 +0000 (UTC) [thread overview]
Message-ID: <1523783478.6d2e57855778e51db9024cae8c47697c919c2043.pacho@gentoo> (raw)
commit: 6d2e57855778e51db9024cae8c47697c919c2043
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 15 08:47:44 2018 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Apr 15 09:11:18 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d2e5785
games-arcade/amphetamine: Apply Debian fixes and drop games.eclass usage
Package-Manager: Portage-2.3.28, Repoman-2.3.9
.../amphetamine/amphetamine-0.8.10-r1.ebuild | 48 +++
.../files/amphetamine-0.8.10-bugs.patch | 56 ++++
.../files/amphetamine-0.8.10-build.patch | 4 +-
.../amphetamine/files/amphetamine-0.8.10-etc.patch | 126 ++++++++
| 13 +
.../files/amphetamine-0.8.10-newline.patch | 358 +++++++++++++++++++++
.../files/amphetamine-0.8.10-no-lxt.patch | 14 +
7 files changed, 617 insertions(+), 2 deletions(-)
diff --git a/games-arcade/amphetamine/amphetamine-0.8.10-r1.ebuild b/games-arcade/amphetamine/amphetamine-0.8.10-r1.ebuild
new file mode 100644
index 00000000000..8df81545c76
--- /dev/null
+++ b/games-arcade/amphetamine/amphetamine-0.8.10-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit desktop
+
+DESCRIPTION="a cool Jump'n Run game offering some unique visual effects"
+HOMEPAGE="http://homepage.hispeed.ch/loehrer/amph/amph.html"
+SRC_URI="http://homepage.hispeed.ch/loehrer/amph/files/${P}.tar.bz2
+ http://homepage.hispeed.ch/loehrer/amph/files/${PN}-data-0.8.6.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="media-libs/libsdl[sound,video]
+ x11-libs/libXpm"
+RDEPEND=${DEPEND}
+
+PATCHES=(
+ "${FILESDIR}"/${P}-build.patch
+ "${FILESDIR}"/${P}-64bit.patch
+
+ # From Debian:
+ "${FILESDIR}"/${P}-no-lxt.patch
+ "${FILESDIR}"/${P}-bugs.patch
+ "${FILESDIR}"/${P}-missing-headers.patch
+ "${FILESDIR}"/${P}-newline.patch
+)
+
+src_prepare() {
+ default
+ sed -i -e '55d' src/ObjInfo.cpp || die
+}
+
+src_compile() {
+ emake INSTALL_DIR=/usr/share/${PN}
+}
+
+src_install() {
+ newbin amph ${PN}
+ insinto /usr/share/${PN}
+ doins -r ../amph/*
+ newicon amph.xpm ${PN}.xpm
+ make_desktop_entry ${PN} Amphetamine ${PN}
+ einstalldocs
+}
diff --git a/games-arcade/amphetamine/files/amphetamine-0.8.10-bugs.patch b/games-arcade/amphetamine/files/amphetamine-0.8.10-bugs.patch
new file mode 100644
index 00000000000..40a8345516c
--- /dev/null
+++ b/games-arcade/amphetamine/files/amphetamine-0.8.10-bugs.patch
@@ -0,0 +1,56 @@
+description: fix issues in collision detection
+Index: amphetamine-0.8.10/src/Appl.cpp
+===================================================================
+--- amphetamine-0.8.10.orig/src/Appl.cpp 2006-05-15 19:16:56.000000000 +0200
++++ amphetamine-0.8.10/src/Appl.cpp 2006-05-15 19:17:02.000000000 +0200
+@@ -183,7 +183,7 @@
+
+ firstPlayRound = 1;
+ command = kCmdNoCommand;
+- syncTime = gSystem->GetTicks();
++ syncTime = gSystem->GetTicks() - 20;
+ aveTime = 20;
+
+ while (command == kCmdNoCommand) {
+@@ -256,7 +256,7 @@
+
+ if (gSystem->KeyPressed(kKeyEscape)) {
+ command = gGUI->RunUserInterface(kMainPage);
+- syncTime = gSystem->GetTicks();
++ syncTime = gSystem->GetTicks() - aveTime;
+ }
+
+ if (command >= kSaveGameSlot0 && command <= kSaveGameSlot5) {
+Index: amphetamine-0.8.10/src/Object.cpp
+===================================================================
+--- amphetamine-0.8.10.orig/src/Object.cpp 2006-05-15 19:18:21.000000000 +0200
++++ amphetamine-0.8.10/src/Object.cpp 2006-05-15 19:18:33.000000000 +0200
+@@ -70,10 +70,13 @@
+ {
+ if (ABS(forcex) > ABS(forcey)) {
+ sx += SIGN(forcex);
+- sy += forcey / ABS(forcex);
++ if (forcex != 0)
++ sy += forcey / ABS(forcex);
+ }else{
+ sy += SIGN(forcey);
+- sx += forcex / ABS(forcey);
++ /* Avoid SIGFE on alpha on divide by zero. -- JEH */
++ if (forcey != 0)
++ sx += forcex / ABS(forcey);
+ }
+ }
+
+Index: amphetamine-0.8.10/src/Pltform.cpp
+===================================================================
+--- amphetamine-0.8.10.orig/src/Pltform.cpp 2006-05-15 19:18:25.000000000 +0200
++++ amphetamine-0.8.10/src/Pltform.cpp 2006-05-15 19:18:33.000000000 +0200
+@@ -136,7 +136,7 @@
+
+ short CPlatform::Forces()
+ {
+- short collisionObject, collisionCode;
++ short collisionObject = 0, collisionCode;
+ CObject *collObj;
+
+ CObject::Forces();
diff --git a/games-arcade/amphetamine/files/amphetamine-0.8.10-build.patch b/games-arcade/amphetamine/files/amphetamine-0.8.10-build.patch
index 2c0185f3ff0..185826c35c3 100644
--- a/games-arcade/amphetamine/files/amphetamine-0.8.10-build.patch
+++ b/games-arcade/amphetamine/files/amphetamine-0.8.10-build.patch
@@ -1,5 +1,5 @@
---- Makefile
-+++ Makefile
+--- a/Makefile
++++ b/Makefile
@@ -26,8 +26,8 @@
# makemake variables
diff --git a/games-arcade/amphetamine/files/amphetamine-0.8.10-etc.patch b/games-arcade/amphetamine/files/amphetamine-0.8.10-etc.patch
new file mode 100644
index 00000000000..f4ad132dce6
--- /dev/null
+++ b/games-arcade/amphetamine/files/amphetamine-0.8.10-etc.patch
@@ -0,0 +1,126 @@
+description: use /etc/amphetamine for config files
+Index: amphetamine-0.8.10/src/ConstVal.cpp
+===================================================================
+--- amphetamine-0.8.10.orig/src/ConstVal.cpp 2006-05-15 19:16:56.000000000 +0200
++++ amphetamine-0.8.10/src/ConstVal.cpp 2006-05-15 19:17:02.000000000 +0200
+@@ -19,7 +19,7 @@
+ {
+ char levelSetString[11] = "xxLevelSet";
+ char levelBkgndString[13] = "xxLevelBkgnd";
+- FILE *paramFile = fopen(gSystem->QualifyDataDir(kParFileName), "r"); // by LL
++ FILE *paramFile = fopen(gSystem->QualifyEtcDir(kParFileName), "r"); // by LL
+
+ gConst = new tConstValues;
+
+@@ -159,7 +159,7 @@
+ fclose(paramFile);
+
+ // Hier sollte auch im Home Directory gesucht werden...
+- paramFile = gSystem->FindFile(gConst->kFileConfig); // by LL
++ paramFile = fopen(gSystem->QualifyEtcDir(gConst->kFileConfig), "r"); // by LL
+
+ gConfigData->leftKey = GetLongConstant(paramFile, "LeftKey");
+ GetStringConstant(paramFile, "LeftKeyText", gConfigData->leftKeyText);
+@@ -212,6 +212,7 @@
+ char c = 0;
+ short n;
+
++ key[0] = '\0';
+ fseek(f, 0, SEEK_SET);
+
+ while (strcmp(key, constName)) {
+Index: amphetamine-0.8.10/src/Gui.cpp
+===================================================================
+--- amphetamine-0.8.10.orig/src/Gui.cpp 2006-05-15 19:16:56.000000000 +0200
++++ amphetamine-0.8.10/src/Gui.cpp 2006-05-15 19:17:02.000000000 +0200
+@@ -688,7 +688,7 @@
+
+ void CGUI::LoadMessages()
+ {
+- FILE *f = fopen(gSystem->QualifyDataDir(kParFileName), "r"); // by LL
++ FILE *f = fopen(gSystem->QualifyEtcDir(kParFileName), "r"); // by LL
+ char msgString[6] = "msgxx";
+ short n;
+
+@@ -724,7 +724,7 @@
+
+ void LoadGUIParameters()
+ {
+- FILE *f = fopen(gSystem->QualifyDataDir(kParFileName), "r"); // by LL
++ FILE *f = fopen(gSystem->QualifyEtcDir(kParFileName), "r"); // by LL
+
+ gGUIConst = new tGUIConstants;
+
+Index: amphetamine-0.8.10/src/System.cpp
+===================================================================
+--- amphetamine-0.8.10.orig/src/System.cpp 2006-05-15 19:16:56.000000000 +0200
++++ amphetamine-0.8.10/src/System.cpp 2006-05-15 19:17:02.000000000 +0200
+@@ -143,6 +143,14 @@
+ return tmp;
+ }
+
++char *CSystem::QualifyEtcDir(const char *fname)
++{
++ char *tmp = new char[strlen(etcDir)+strlen(fname)+2];
++ sprintf(tmp, "%s/%s", etcDir, fname);
++
++ return tmp;
++}
++
+ void CSystem::GetHomeDir()
+ {
+ char *tmp;
+@@ -169,7 +177,9 @@
+ GetHomeDir();
+ dataDir = new char[strlen(INSTALL_DIR)+1];
+ strcpy(dataDir, INSTALL_DIR);
+-
++ etcDir = new char[strlen(ETC_DIR)+1];
++ strcpy(etcDir, ETC_DIR);
++
+ char *logFileName = QualifyHomeDir(kLogFileName);
+
+ logFile = fopen(logFileName, "w"); // by LL
+@@ -180,6 +190,8 @@
+ if ( SDL_Init(SDL_INIT_VIDEO|SDL_INIT_AUDIO) < 0 ) {
+ MSG("SDL_Init_Failed.");
+ MSG(SDL_GetError());
++ /* Ouput to stdout too. */
++ printf("SDL_Init_Failed: %s\n", SDL_GetError());
+
+ exit(1);
+ }
+Index: amphetamine-0.8.10/src/System.hpp
+===================================================================
+--- amphetamine-0.8.10.orig/src/System.hpp 2006-05-15 19:16:57.000000000 +0200
++++ amphetamine-0.8.10/src/System.hpp 2006-05-15 19:17:02.000000000 +0200
+@@ -16,6 +16,10 @@
+ #define INSTALL_DIR "/usr/local/games/amph"
+ #endif
+
++#ifndef ETC_DIR
++#define ETC_DIR "/etc/amphetamine"
++#endif
++
+ #if SDL_BYTEORDER == SDL_LIL_ENDIAN
+ #undef __BIG_ENDIAN__
+ #else
+@@ -76,6 +80,7 @@
+ RGBcolor *palColors;
+ char *homeDir;
+ char *dataDir;
++ char *etcDir;
+ int workingSound;
+
+ //"""""""""""""""" System Stuff
+@@ -107,8 +112,10 @@
+ void GetHomeDir();
+ char *QualifyDataDir(const char *fname);
+ char *QualifyHomeDir(const char *fname);
++ char *QualifyEtcDir(const char *fname);
+ void ScreenShot();
+ FILE *FindFile(const char *fname);
+ };
+
+ #endif
++
--git a/games-arcade/amphetamine/files/amphetamine-0.8.10-missing-headers.patch b/games-arcade/amphetamine/files/amphetamine-0.8.10-missing-headers.patch
new file mode 100644
index 00000000000..f9c1b9932b1
--- /dev/null
+++ b/games-arcade/amphetamine/files/amphetamine-0.8.10-missing-headers.patch
@@ -0,0 +1,13 @@
+description: include string.h
+Index: amphetamine-0.8.10/src/Surface.cpp
+===================================================================
+--- amphetamine-0.8.10.orig/src/Surface.cpp 2006-05-15 19:10:49.000000000 +0200
++++ amphetamine-0.8.10/src/Surface.cpp 2006-05-15 19:11:01.000000000 +0200
+@@ -3,6 +3,7 @@
+ #include "ShapeLd.hpp"
+ #include "Clut.hpp"
+ #include "ConstVal.hpp"
++#include <string.h>
+ #include <memory.h>
+
+ const short kNoCharSpace = 20;
diff --git a/games-arcade/amphetamine/files/amphetamine-0.8.10-newline.patch b/games-arcade/amphetamine/files/amphetamine-0.8.10-newline.patch
new file mode 100644
index 00000000000..36482ef30fb
--- /dev/null
+++ b/games-arcade/amphetamine/files/amphetamine-0.8.10-newline.patch
@@ -0,0 +1,358 @@
+description: fix newlines
+Index: amphetamine-0.8.10/src/AmpHead.hpp
+===================================================================
+--- amphetamine-0.8.10.orig/src/AmpHead.hpp 2002-03-25 11:38:15.000000000 +0100
++++ amphetamine-0.8.10/src/AmpHead.hpp 2006-05-15 19:08:52.000000000 +0200
+@@ -185,4 +185,4 @@
+
+ #define MSG(message) if (logFile) fprintf(logFile, message); fflush(logFile)
+
+-#endif
+\ No newline at end of file
++#endif
+Index: amphetamine-0.8.10/src/Appl.cpp
+===================================================================
+--- amphetamine-0.8.10.orig/src/Appl.cpp 2002-03-25 12:47:49.000000000 +0100
++++ amphetamine-0.8.10/src/Appl.cpp 2006-05-15 19:08:52.000000000 +0200
+@@ -404,4 +404,4 @@
+ if (preRenderQueue == remove) bulletList = bulletList->nextBullet;
+ if (remove->nextBullet) remove->nextBullet->prevBullet = remove->prevBullet;
+ if (remove->prevBullet) remove->prevBullet->nextBullet = remove->nextBullet;
+-}*/
+\ No newline at end of file
++}*/
+Index: amphetamine-0.8.10/src/Appl.hpp
+===================================================================
+--- amphetamine-0.8.10.orig/src/Appl.hpp 2002-03-24 09:49:09.000000000 +0100
++++ amphetamine-0.8.10/src/Appl.hpp 2006-05-15 19:08:52.000000000 +0200
+@@ -102,4 +102,4 @@
+
+ };
+
+-#endif
+\ No newline at end of file
++#endif
+Index: amphetamine-0.8.10/src/Clut.hpp
+===================================================================
+--- amphetamine-0.8.10.orig/src/Clut.hpp 2002-03-24 09:49:09.000000000 +0100
++++ amphetamine-0.8.10/src/Clut.hpp 2006-05-15 19:08:52.000000000 +0200
+@@ -84,4 +84,4 @@
+
+ void SwapBlackWhite(Graphic_file *gf);
+
+-#endif
+\ No newline at end of file
++#endif
+Index: amphetamine-0.8.10/src/ConstVal.cpp
+===================================================================
+--- amphetamine-0.8.10.orig/src/ConstVal.cpp 2002-03-24 09:49:09.000000000 +0100
++++ amphetamine-0.8.10/src/ConstVal.cpp 2006-05-15 19:08:52.000000000 +0200
+@@ -271,4 +271,5 @@
+ void GetStringConstant(FILE *f, char *constName, char *buffer)
+ {
+ GetValue(f, constName, buffer);
+-}
+\ No newline at end of file
++}
++
+Index: amphetamine-0.8.10/src/ConstVal.hpp
+===================================================================
+--- amphetamine-0.8.10.orig/src/ConstVal.hpp 2002-03-24 09:49:09.000000000 +0100
++++ amphetamine-0.8.10/src/ConstVal.hpp 2006-05-15 19:08:52.000000000 +0200
+@@ -160,4 +160,4 @@
+ short disableShapeModes;
+ };
+
+-#endif
+\ No newline at end of file
++#endif
+Index: amphetamine-0.8.10/src/Creeper.hpp
+===================================================================
+--- amphetamine-0.8.10.orig/src/Creeper.hpp 2002-03-24 09:49:09.000000000 +0100
++++ amphetamine-0.8.10/src/Creeper.hpp 2006-05-15 19:08:52.000000000 +0200
+@@ -4,4 +4,4 @@
+ #include "Monster.hpp"
+
+
+-#endif
+\ No newline at end of file
++#endif
+Index: amphetamine-0.8.10/src/Element.cpp
+===================================================================
+--- amphetamine-0.8.10.orig/src/Element.cpp 2002-03-24 09:49:09.000000000 +0100
++++ amphetamine-0.8.10/src/Element.cpp 2006-05-15 19:08:52.000000000 +0200
+@@ -373,4 +373,4 @@
+ CElement::Read(f);
+
+ OnAllocate();
+-}
+\ No newline at end of file
++}
+Index: amphetamine-0.8.10/src/File.cpp
+===================================================================
+--- amphetamine-0.8.10.orig/src/File.cpp 2002-03-24 09:49:09.000000000 +0100
++++ amphetamine-0.8.10/src/File.cpp 2006-05-15 19:08:52.000000000 +0200
+@@ -26,4 +26,4 @@
+ long CFile::ReadData(void *data, long size)
+ {
+ return fread(data, size, 1, fileRef);
+-}
+\ No newline at end of file
++}
+Index: amphetamine-0.8.10/src/Graphfil.hpp
+===================================================================
+--- amphetamine-0.8.10.orig/src/Graphfil.hpp 2002-03-24 09:49:09.000000000 +0100
++++ amphetamine-0.8.10/src/Graphfil.hpp 2006-05-15 19:08:52.000000000 +0200
+@@ -54,4 +54,4 @@
+ Graphic_file *LoadGIF(FILE *fp, char *fname );
+ Graphic_file *LoadPICTR(FILE *fp, char *fname );
+
+-#endif
+\ No newline at end of file
++#endif
+Index: amphetamine-0.8.10/src/Gui.cpp
+===================================================================
+--- amphetamine-0.8.10.orig/src/Gui.cpp 2002-03-24 09:49:09.000000000 +0100
++++ amphetamine-0.8.10/src/Gui.cpp 2006-05-15 19:08:52.000000000 +0200
+@@ -796,4 +796,5 @@
+ fclose(f);
+ }
+
+-
+\ No newline at end of file
++
++
+Index: amphetamine-0.8.10/src/Gui.hpp
+===================================================================
+--- amphetamine-0.8.10.orig/src/Gui.hpp 2002-03-24 09:49:09.000000000 +0100
++++ amphetamine-0.8.10/src/Gui.hpp 2006-05-15 19:08:52.000000000 +0200
+@@ -183,4 +183,4 @@
+ void DisplayInfotext(short num);
+ };
+
+-#endif
+\ No newline at end of file
++#endif
+Index: amphetamine-0.8.10/src/Item.cpp
+===================================================================
+--- amphetamine-0.8.10.orig/src/Item.cpp 2002-03-24 09:49:09.000000000 +0100
++++ amphetamine-0.8.10/src/Item.cpp 2006-05-15 19:08:52.000000000 +0200
+@@ -309,4 +309,4 @@
+
+ READDATA(pickedUp);
+ READDATA(type);
+-}
+\ No newline at end of file
++}
+Index: amphetamine-0.8.10/src/Item.hpp
+===================================================================
+--- amphetamine-0.8.10.orig/src/Item.hpp 2002-03-24 11:10:24.000000000 +0100
++++ amphetamine-0.8.10/src/Item.hpp 2006-05-15 19:08:52.000000000 +0200
+@@ -84,4 +84,4 @@
+ void Read(FILE *f);
+ };
+
+-#endif
+\ No newline at end of file
++#endif
+Index: amphetamine-0.8.10/src/Level.hpp
+===================================================================
+--- amphetamine-0.8.10.orig/src/Level.hpp 2002-03-24 09:49:09.000000000 +0100
++++ amphetamine-0.8.10/src/Level.hpp 2006-05-15 19:08:52.000000000 +0200
+@@ -29,4 +29,4 @@
+ };
+
+
+-#endif
+\ No newline at end of file
++#endif
+Index: amphetamine-0.8.10/src/Main.cpp
+===================================================================
+--- amphetamine-0.8.10.orig/src/Main.cpp 2002-03-24 09:49:09.000000000 +0100
++++ amphetamine-0.8.10/src/Main.cpp 2006-05-15 19:08:52.000000000 +0200
+@@ -84,4 +84,4 @@
+ delete gApplication;
+
+ return 0;
+-}
+\ No newline at end of file
++}
+Index: amphetamine-0.8.10/src/Monster.cpp
+===================================================================
+--- amphetamine-0.8.10.orig/src/Monster.cpp 2002-03-25 11:53:27.000000000 +0100
++++ amphetamine-0.8.10/src/Monster.cpp 2006-05-15 19:08:52.000000000 +0200
+@@ -372,4 +372,4 @@
+ READDATA(health);
+
+ if (dieFrame != -1) gApplication->Dequeue(&gApplication->collisionThingList, this);
+-}
+\ No newline at end of file
++}
+Index: amphetamine-0.8.10/src/Monster.hpp
+===================================================================
+--- amphetamine-0.8.10.orig/src/Monster.hpp 2002-03-24 09:49:09.000000000 +0100
++++ amphetamine-0.8.10/src/Monster.hpp 2006-05-15 19:08:52.000000000 +0200
+@@ -86,4 +86,4 @@
+
+
+
+-#endif
+\ No newline at end of file
++#endif
+Index: amphetamine-0.8.10/src/Monstrxx.hpp
+===================================================================
+--- amphetamine-0.8.10.orig/src/Monstrxx.hpp 2002-03-24 09:49:09.000000000 +0100
++++ amphetamine-0.8.10/src/Monstrxx.hpp 2006-05-15 19:08:52.000000000 +0200
+@@ -123,4 +123,4 @@
+ void Read(FILE *f);
+ };
+
+-#endif
+\ No newline at end of file
++#endif
+Index: amphetamine-0.8.10/src/ObjInfo.hpp
+===================================================================
+--- amphetamine-0.8.10.orig/src/ObjInfo.hpp 2002-03-24 09:49:09.000000000 +0100
++++ amphetamine-0.8.10/src/ObjInfo.hpp 2006-05-15 19:08:52.000000000 +0200
+@@ -97,4 +97,4 @@
+ tWeaponInfo *FindWeapon(short ref);
+ };
+
+-#endif
+\ No newline at end of file
++#endif
+Index: amphetamine-0.8.10/src/Player.cpp
+===================================================================
+--- amphetamine-0.8.10.orig/src/Player.cpp 2002-03-24 09:49:09.000000000 +0100
++++ amphetamine-0.8.10/src/Player.cpp 2006-05-15 19:08:52.000000000 +0200
+@@ -527,4 +527,4 @@
+
+ READDATA(oxygen);
+ READDATA(lastOxygenDecTime);
+-}
+\ No newline at end of file
++}
+Index: amphetamine-0.8.10/src/Player.hpp
+===================================================================
+--- amphetamine-0.8.10.orig/src/Player.hpp 2002-03-24 11:10:24.000000000 +0100
++++ amphetamine-0.8.10/src/Player.hpp 2006-05-15 19:08:52.000000000 +0200
+@@ -81,4 +81,4 @@
+
+ };
+
+-#endif
+\ No newline at end of file
++#endif
+Index: amphetamine-0.8.10/src/Pltform.cpp
+===================================================================
+--- amphetamine-0.8.10.orig/src/Pltform.cpp 2002-03-24 09:49:09.000000000 +0100
++++ amphetamine-0.8.10/src/Pltform.cpp 2006-05-15 19:08:52.000000000 +0200
+@@ -276,4 +276,4 @@
+ fread(info, sizeof(tPlatformInfo), 1, f);
+
+ OnAllocate();
+-}
+\ No newline at end of file
++}
+Index: amphetamine-0.8.10/src/ShapeDes.hpp
+===================================================================
+--- amphetamine-0.8.10.orig/src/ShapeDes.hpp 2002-03-24 09:49:09.000000000 +0100
++++ amphetamine-0.8.10/src/ShapeDes.hpp 2006-05-15 19:08:52.000000000 +0200
+@@ -376,4 +376,4 @@
+ };
+
+
+-#endif
+\ No newline at end of file
++#endif
+Index: amphetamine-0.8.10/src/ShapeLd.cpp
+===================================================================
+--- amphetamine-0.8.10.orig/src/ShapeLd.cpp 2002-03-24 09:49:09.000000000 +0100
++++ amphetamine-0.8.10/src/ShapeLd.cpp 2006-05-15 19:08:52.000000000 +0200
+@@ -93,4 +93,4 @@
+ height = backgroundPicture->height;
+
+ return backgroundPicture->bitmap;
+-}
+\ No newline at end of file
++}
+Index: amphetamine-0.8.10/src/SndSys.cpp
+===================================================================
+--- amphetamine-0.8.10.orig/src/SndSys.cpp 2002-03-24 09:49:09.000000000 +0100
++++ amphetamine-0.8.10/src/SndSys.cpp 2006-05-15 19:08:52.000000000 +0200
+@@ -132,4 +132,5 @@
+ playList->RemoveCurrent();
+ }
+ }
+-}
+\ No newline at end of file
++}
++
+Index: amphetamine-0.8.10/src/SndSys.hpp
+===================================================================
+--- amphetamine-0.8.10.orig/src/SndSys.hpp 2002-03-24 09:49:09.000000000 +0100
++++ amphetamine-0.8.10/src/SndSys.hpp 2006-05-15 19:08:52.000000000 +0200
+@@ -99,4 +99,5 @@
+
+ };
+
+-#endif
+\ No newline at end of file
++#endif
++
+Index: amphetamine-0.8.10/src/SoundList.hpp
+===================================================================
+--- amphetamine-0.8.10.orig/src/SoundList.hpp 2002-03-24 09:49:09.000000000 +0100
++++ amphetamine-0.8.10/src/SoundList.hpp 2006-05-15 19:08:52.000000000 +0200
+@@ -55,4 +55,4 @@
+ SoundState *first, *prev, *current;
+ };
+
+-#endif
+\ No newline at end of file
++#endif
+Index: amphetamine-0.8.10/src/System.cpp
+===================================================================
+--- amphetamine-0.8.10.orig/src/System.cpp 2002-03-25 10:31:27.000000000 +0100
++++ amphetamine-0.8.10/src/System.cpp 2006-05-15 19:08:52.000000000 +0200
+@@ -554,4 +554,5 @@
+ delete [] tmp;
+
+ return NULL; // failed
+-}
+\ No newline at end of file
++}
++
+Index: amphetamine-0.8.10/src/Thing.hpp
+===================================================================
+--- amphetamine-0.8.10.orig/src/Thing.hpp 2002-03-24 17:16:00.000000000 +0100
++++ amphetamine-0.8.10/src/Thing.hpp 2006-05-15 19:08:52.000000000 +0200
+@@ -64,4 +64,4 @@
+
+ };
+
+-#endif
+\ No newline at end of file
++#endif
+Index: amphetamine-0.8.10/src/Weapon.cpp
+===================================================================
+--- amphetamine-0.8.10.orig/src/Weapon.cpp 2002-03-24 09:49:09.000000000 +0100
++++ amphetamine-0.8.10/src/Weapon.cpp 2006-05-15 19:08:52.000000000 +0200
+@@ -467,4 +467,4 @@
+ READDATA(dx);
+ READDATA(dy);
+
+-}
+\ No newline at end of file
++}
+Index: amphetamine-0.8.10/src/Weapon.hpp
+===================================================================
+--- amphetamine-0.8.10.orig/src/Weapon.hpp 2002-03-24 17:16:14.000000000 +0100
++++ amphetamine-0.8.10/src/Weapon.hpp 2006-05-15 19:08:52.000000000 +0200
+@@ -152,4 +152,4 @@
+ short Shoot(double directionx, double directiony, double targetpos);
+ };
+
+-#endif
+\ No newline at end of file
++#endif
diff --git a/games-arcade/amphetamine/files/amphetamine-0.8.10-no-lxt.patch b/games-arcade/amphetamine/files/amphetamine-0.8.10-no-lxt.patch
new file mode 100644
index 00000000000..1e654dc8920
--- /dev/null
+++ b/games-arcade/amphetamine/files/amphetamine-0.8.10-no-lxt.patch
@@ -0,0 +1,14 @@
+description: don't link against Xt
+Index: amphetamine-0.8.10/Makefile
+===================================================================
+--- amphetamine-0.8.10.orig/Makefile 2006-11-08 11:05:57.000000000 +0100
++++ amphetamine-0.8.10/Makefile 2006-11-08 11:06:01.000000000 +0100
+@@ -69,7 +69,7 @@
+ LOADLIBES := -lm $(SDL_LIBS)
+
+ ifeq ($(USE_LIB_XPM),TRUE)
+- LOADLIBES := $(LOADLIBES) -lXpm -lXt
++ LOADLIBES := $(LOADLIBES) -lXpm
+ endif
+
+ LDFLAGS = -L/usr/lib -L/usr/local/lib -L/usr/X11R6/lib
next reply other threads:[~2018-04-15 9:11 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-15 9:11 Pacho Ramos [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-07-21 9:40 [gentoo-commits] repo/gentoo:master commit in: games-arcade/amphetamine/, games-arcade/amphetamine/files/ Pacho Ramos
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1523783478.6d2e57855778e51db9024cae8c47697c919c2043.pacho@gentoo \
--to=pacho@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox