From 5cfef3c94cd7e82136c69a0322f5ba21f7e64632 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 19 Apr 2018 14:14:48 +0100 Subject: gentoo resync : 19.04.2018 --- games-arcade/amphetamine/Manifest | 1 - .../amphetamine/files/amphetamine-0.8.10-etc.patch | 126 --------------------- 2 files changed, 127 deletions(-) delete mode 100644 games-arcade/amphetamine/files/amphetamine-0.8.10-etc.patch (limited to 'games-arcade/amphetamine') diff --git a/games-arcade/amphetamine/Manifest b/games-arcade/amphetamine/Manifest index 6ab9a96f6553..e3a8e1119d30 100644 --- a/games-arcade/amphetamine/Manifest +++ b/games-arcade/amphetamine/Manifest @@ -1,7 +1,6 @@ AUX amphetamine-0.8.10-64bit.patch 2708 BLAKE2B 6abc82e1758000b1fbb3e930f51873026a9e6ab0c1558b2f793a9fad75d240b5c31fec6d69f7144a9c3a91eca809fca6860fdb72a1211b8aefd0d4d64480774a SHA512 8216a5b59c52488f35416295256087771c82e8996787e74d03d416829b628267d17b47cc5f6d7bae2ff87b442bdb38aec4f78f14cd130fb045f5c8272f6b4c9d AUX amphetamine-0.8.10-bugs.patch 1821 BLAKE2B 3b0870cecaa55879da3d5107e2c23d7c972e49b1289519b2107fa0da48376c562364b8d4c632812dd20a80e4e6a02fc9ddd157aa8e104a3a8e097f238c422ae9 SHA512 30cc93031152e3f244a30cb56430b451ddfb8ccfddde0fc6cd681cbc6bf0ffb4d4801df642b5330fc1462d68cb0fc3e8d8f97f7e4dc87925b5335f5b1707ff8e AUX amphetamine-0.8.10-build.patch 700 BLAKE2B d63c5a73f065f181a6673feb3d90e852e85befb51446ac003eca6ea6076caa36cbd911ac0e33064b5aa549c9ffee8264c5a31a34bfa7ecc659f8c07687d12130 SHA512 c79c133bb6acfc666e557e09b0ca3b556203331d167b5266217a19880b5af2101776b651a420a81b53fc4fbf790de221d0b758979955632230226581dfa30ced -AUX amphetamine-0.8.10-etc.patch 3838 BLAKE2B 0aa89ad89f0131db3fcb8c7935b2350cfa690d50d61b538fc29d859c8c8dd029b24ebc3036a214c7ce84ec83b2af137bc572e041a5f95fbfe578b7c264a6c234 SHA512 a1afaf30fdd86dfb518bb370b65c46ae4bf46b3acd4a81767f557b93b0a60983ac880b7082240c14c7b551263af116c4f26880ab7fe2bde5ca8f599e82ef1d2e AUX amphetamine-0.8.10-missing-headers.patch 457 BLAKE2B 00c50c928487ff0e8fc4bf1c707d77b6ab28b064a9682e1d7f086e6b0555868c662dd68d5b474dca6346a23eb9bc91620b3f92ce18a6e7f0be597c14b41e0c5d SHA512 1f95ac463f600b0e3812afba10682657cdd8b95dd1e77f6a2fb93af7dab60fcb85c85e60613ee4c93421faf7492ca4663d2c94bc96172c52913effe63d259523 AUX amphetamine-0.8.10-newline.patch 11906 BLAKE2B bf505f9f51d800b6b99b4a80d9c8cd30a91c97262e7984f371be16044328475ba5905145297019bc411c5c1394a81ee2c3cc3f753af46254cf4269f8e21449fe SHA512 9bb6e300f5c17a4ae2502162c3a7940a9574fcd6c09274454a6170c5b0cfdfdf3e4668d9c6e7876f7ea48119c94e098aef605836c866f8a475d81a15129d28b1 AUX amphetamine-0.8.10-no-lxt.patch 504 BLAKE2B ab06ee2b2209b293d0a126127c5d0cbc0d51081295d9c53d4805cd386027cd77b94a8c8153c64da6bbf6d4bcf88c0cd79a4730d04d06be4785478ec5b39b8d7b SHA512 6c96aa314cc63de4b3472bfff6e0d0d25407f4f8e8a0974df5d20af9dc44fd95a70974cec3174c642ca01be70223c1a1eaea5d300d2026a35805e03e65028207 diff --git a/games-arcade/amphetamine/files/amphetamine-0.8.10-etc.patch b/games-arcade/amphetamine/files/amphetamine-0.8.10-etc.patch deleted file mode 100644 index f4ad132dce64..000000000000 --- a/games-arcade/amphetamine/files/amphetamine-0.8.10-etc.patch +++ /dev/null @@ -1,126 +0,0 @@ -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 -+ -- cgit v1.2.3