diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:58:29 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:58:29 +0100 |
commit | 0cf2f20608308acdf3cb922c3736446bbd8f3388 (patch) | |
tree | 07815070629c7c11000a7f51ceb8ccbccb49a809 /games-strategy/scorched3d | |
parent | 1798c4aeca70ac8d0a243684d6a798fbc65735f8 (diff) |
gentoo resync : 14.07.2018
Diffstat (limited to 'games-strategy/scorched3d')
11 files changed, 0 insertions, 439 deletions
diff --git a/games-strategy/scorched3d/Manifest b/games-strategy/scorched3d/Manifest deleted file mode 100644 index 01f629e05553..000000000000 --- a/games-strategy/scorched3d/Manifest +++ /dev/null @@ -1,11 +0,0 @@ -AUX scorched3d-44-fix-c++14.patch 566 BLAKE2B 0924707c4da94b1ca088b46db19e145191708d38be6f848cdeec5a84a1f90002736d40ed3e95b8e836580adb496d5fbb0f247f31df991a28c797842086cca01e SHA512 f74db569f471e1ac24fe6dfa15c319ac6dce52a6b35d333efb314b59156b150e7a09c843e7046d804a4768eea294671546313043c46bc38ac5e951d1daa1c23d -AUX scorched3d-44-fixups.patch 717 BLAKE2B 24af35bbc6d1070d08282e4915d4575f1d0783a49d542a3d7aca45ad91ac8ab8378a0a48d19e7e593d71e39882ea1964a1686d6f4fbcacedb00cbc26f8e68d65 SHA512 8045df51e6a09d9101d971056edc77e03694b2872819cd892d1239c04ad5c59afa8a60adc2ca04a63a5d501bbb113221408522a33159eee836e600bb2b8d40c7 -AUX scorched3d-44-freetype.patch 1372 BLAKE2B a2b5f4551ae2d64c8a35cf9f305c3ff67b62d0cf5bf939b2c2a450fa347d6f39d6bc240346ee3deda98b8c3b87053a6fbcc22125c5ba0c63d149c64ab7194775 SHA512 98688db48920b32aa87aeb9fbfb245f18ebc0f5b2a92a341ffd49ad94fc10e6bee4ee5864e15497e7617467759cc1fe809887e107d881b199965f5b22045bfc9 -AUX scorched3d-44-gcc43.patch 561 BLAKE2B 4fb787d19161ecb21b40f0636288d521af62d281bfe9af7408761851f3f527e0645d0c698f42b47765743f72d2d07d85b45d32875182c6febe1b38e0862b3e45 SHA512 c00bfcf2feb7d740e4fc4337a5577962a198d56296bae68a96902046f78fd29856d83b57f309ea9c61d36d4a767e76ae101639a8ed786c5451b440b5a0d908c1 -AUX scorched3d-44-jpeg9.patch 614 BLAKE2B de7f71778be9530801a6f764d64f6020a260c9cef328dbf0481f9a486f50211879db981fffc54ec4fa67309a365fa8f1e712be28b72514dc69473c23c7b422e5 SHA512 8adb3bd124b11b006d8124e57fc506e8dc56415c89cca70440901cef7aa547f241d100c42281345fd489c95f9e8eb105d5e5de5ef18382087e203877cc8f6ca4 -AUX scorched3d-44-odbc.patch 503 BLAKE2B 90c212fd77732bad90d5455e967cbc18f3e28c6352637e6325dd9c3ae91e9e86d759dac66d1054a75a84ddfa827fb5b80aa4483d90e77782a5632ad4bc29fdd6 SHA512 8bf3e3f9a91502a7c84be73a73e0909c09b050266fb2c6847be2cca13b1a368697dd70c373b6bbce4b12ba97241b2d577cce3604640b4182b2be223d009a4f6e -AUX scorched3d-44-win32.patch 464 BLAKE2B 51362a695212dd8d37013c1b4a11d77fb1b8564b54e3ec9ce3e0165ee83e42d65883dc3df964180d975885a555b1ae02e87fc20cc3c85d4507308110ee7cf810 SHA512 992224f65f80527276c0b6e139ea44c6c29a2fbfa3a0af78e2f2366897dbd51e9988b065aa21ac95cf9b1a0efc8866e2e45646e1851f8afd195651b3c47a81dd -AUX scorched3d-44-wxgtk.patch 7001 BLAKE2B b120e1cc12343fa5be2e4348930d2656eb2c727224a8e9e63f00dfb4da71888918d3fcccc1a9a439737ce2f6fbe6224be06d4801b4cb857ad1e4765d2c444e4e SHA512 99e21ff6854bbea676c8ea0a5ef2b28a4d6020b34fbae134d9346d4febb7b6defbd39cb712f29b3dcff7ac829b2e76275a85d7d740e921835898f550c4471120 -DIST Scorched3D-44-src.tar.gz 41689613 BLAKE2B 61f5536ad6e9dedeb0e778f90d73aa918f890632385278d4d788a43f1e199e817d6199f923c264dadbe8084fa53c32968b599c9b08784de0d5752069f9bed818 SHA512 27341d12ef9db5b64c1051a8abe45cef8a957e26c2cd8928f64c071589052d2857fc6f8104772bb67d5d348aef14122a117d9e00d61e4d9f963f3b5bbe5859ca -EBUILD scorched3d-44-r2.ebuild 2310 BLAKE2B 3826272ff4fe72b696980b08102036a1bd87e4bbd1da35fa5d64abf39f86b14dec6c11fa8169393edb8e6935a10f91e76677a3a4fc8ab164fa9445a38326a06b SHA512 239d20d7d6125eb299c9e88a7d69feafbce593190daf724539bf846cc1dd4de13df6be9e8b8d02f59e4d2ad601310b7b37ef31e55d51909c4e245f5b30ccd74f -MISC metadata.xml 333 BLAKE2B da791c5728d5a17950492280dcf23b0543b6c444885f852b491a8eaa65f2befcd755470183e8084034a16fb6507b073b2de91afdb00d4db2eaca68077495daa8 SHA512 91b1e0f50ec4635e81ee904179228d25b8168bf74d00eacb734365514e43e681879c121cc2f60302b446367b8b6fb388842e28890719f6785fb5bf389f638171 diff --git a/games-strategy/scorched3d/files/scorched3d-44-fix-c++14.patch b/games-strategy/scorched3d/files/scorched3d-44-fix-c++14.patch deleted file mode 100644 index e3cba2741405..000000000000 --- a/games-strategy/scorched3d/files/scorched3d-44-fix-c++14.patch +++ /dev/null @@ -1,14 +0,0 @@ -In C++14, bool -> T* implicit conversions are not allowed anymore. -See also: https://bugs.gentoo.org/show_bug.cgi?id=601890 - ---- a/src/common/weapons/AccessoryStore.cpp -+++ b/src/common/weapons/AccessoryStore.cpp -@@ -156,7 +156,7 @@ - Accessory *parent, XMLNode *currentNode)
- {
- XMLNode *typeNode = 0;
-- if (!currentNode->getNamedParameter("type", typeNode)) return false;
-+ if (!currentNode->getNamedParameter("type", typeNode)) return NULL;
-
- AccessoryPart *accessoryPart =
- AccessoryMetaRegistration::getNewAccessory(typeNode->getContent(), this);
diff --git a/games-strategy/scorched3d/files/scorched3d-44-fixups.patch b/games-strategy/scorched3d/files/scorched3d-44-fixups.patch deleted file mode 100644 index 47499d4cf307..000000000000 --- a/games-strategy/scorched3d/files/scorched3d-44-fixups.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- scorched.orig/configure.ac -+++ scorched/configure.ac -@@ -13,22 +13,6 @@ - AC_PROG_INSTALL - AC_PROG_RANLIB - --LDFLAGS="$LDFLAGS -L/usr/X11R6/lib -L/usr/X11R6" --CPPFLAGS="$CPPFLAGS -I/usr/X11R6/include -I/usr/X11R6" -- --if test `uname` == Darwin; then --LDFLAGS="$LDFLAGS -lmx" --CPPFLAGS="$CPPFLAGS -DFFTW_USE_DOUBLE -D__DARWIN__ -D__MACOSX__" --else --LDFLAGS="$LDFLAGS -L/usr/local/lib" --CPPFLAGS="$CPPFLAGS -I/usr/local/include" --fi -- --AC_CHECK_LIB(fridge, beer, echo "Hmm?!",[ -- echo "Warning: No beer found in fridge!"; -- echo "We highly suggest that you rectify this situation immediately." --]) -- - AC_ARG_ENABLE(serveronly, - [ --enable-serveronly Enable server only compilation], - , enable_serveronly=no, diff --git a/games-strategy/scorched3d/files/scorched3d-44-freetype.patch b/games-strategy/scorched3d/files/scorched3d-44-freetype.patch deleted file mode 100644 index e4717972d81a..000000000000 --- a/games-strategy/scorched3d/files/scorched3d-44-freetype.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -437,7 +437,7 @@ - if test "$FT2_CONFIG" = "no" ; then - no_ft=yes - else -- FT2_CFLAGS=`$FT2_CONFIG $ft_config_args --cflags` -+ FT2_CFLAGS="`$FT2_CONFIG $ft_config_args --cflags` `$FT2_CONFIG $ft_config_args --cflags | sed -e 's:freetype2:freetype2/freetype:'`" - FT2_LIBS=`$FT2_CONFIG $ft_config_args --libs` - ft_config_major_version=`$FT2_CONFIG $ft_config_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` ---- a/src/client/GLEXT/GLFont2dFreeType.h -+++ b/src/client/GLEXT/GLFont2dFreeType.h -@@ -23,10 +23,10 @@ -
- #include <GLEXT/GLFont2dStorage.h>
- #include <ft2build.h>
--#include <freetype/freetype.h>
--#include <freetype/ftglyph.h>
--#include <freetype/ftoutln.h>
--#include <freetype/fttrigon.h>
-+#include <freetype.h>
-+#include <ftglyph.h>
-+#include <ftoutln.h>
-+#include <fttrigon.h>
- #include <string>
-
- class GLFont2dFreeType
---- a/src/launcher/wxdialogs/TrueTypeFont.h -+++ b/src/launcher/wxdialogs/TrueTypeFont.h -@@ -25,10 +25,10 @@ - #include <wx/image.h>
- #include <ft2build.h>
- #include <string>
--#include <freetype/freetype.h>
--#include <freetype/ftglyph.h>
--#include <freetype/ftoutln.h>
--#include <freetype/fttrigon.h>
-+#include <freetype.h>
-+#include <ftglyph.h>
-+#include <ftoutln.h>
-+#include <fttrigon.h>
-
- class TrueTypeFont
- {
diff --git a/games-strategy/scorched3d/files/scorched3d-44-gcc43.patch b/games-strategy/scorched3d/files/scorched3d-44-gcc43.patch deleted file mode 100644 index 79f40b70e652..000000000000 --- a/games-strategy/scorched3d/files/scorched3d-44-gcc43.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- scorched.old/src/common/common/main.h -+++ scorched/src/common/common/main.h -@@ -40,7 +40,7 @@ - void _no_storage()
- {
- printf("Failed to allocate memory!!");
-- std::exit(1);
-+ exit(1);
- }
-
- void run_main(int argc, char *argv[], OptionsParameters ¶ms)
---- scorched.old/src/common/porting/windows.h -+++ scorched/src/common/porting/windows.h -@@ -20,7 +20,7 @@ - typedef unsigned short WORD;
- typedef unsigned char BYTE;
-
--typedef int HWND;
-+// typedef int HWND;
- typedef void * HINSTANCE;
- typedef int WPARAM;
- typedef int LPARAM;
diff --git a/games-strategy/scorched3d/files/scorched3d-44-jpeg9.patch b/games-strategy/scorched3d/files/scorched3d-44-jpeg9.patch deleted file mode 100644 index 1cebf3ebd7bc..000000000000 --- a/games-strategy/scorched3d/files/scorched3d-44-jpeg9.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/src/common/image/ImageJpgFactory.cpp.old 2014-12-03 09:52:03.306552513 +0100 -+++ b/src/common/image/ImageJpgFactory.cpp 2014-12-03 09:53:22.117786304 +0100 -@@ -79,7 +79,7 @@ - src->next_input_byte = FakeEOI;
- src->bytes_in_buffer = 2;
-
-- return TRUE;
-+ return (boolean)TRUE;
- }
-
- METHODDEF(void)
-@@ -166,7 +166,7 @@ - src->bytes_in_buffer = buffer.getBufferUsed();
- src->next_input_byte = (JOCTET *) buffer.getBuffer();
-
-- jpeg_read_header(&cinfo, TRUE);
-+ jpeg_read_header(&cinfo, (boolean)TRUE);
- jpeg_start_decompress(&cinfo);
-
- if ((cinfo.output_components == 3 && !readalpha) ||
diff --git a/games-strategy/scorched3d/files/scorched3d-44-odbc.patch b/games-strategy/scorched3d/files/scorched3d-44-odbc.patch deleted file mode 100644 index e7f3833bf897..000000000000 --- a/games-strategy/scorched3d/files/scorched3d-44-odbc.patch +++ /dev/null @@ -1,16 +0,0 @@ -When x11-libs/wxGTK is built with the odbc use flag, scorched3d fails to build. -bug #285384 - patch from Bob Johnson - ---- scorched/src/common/porting/windows.h -+++ fix_scorched/src/common/porting/windows.h -@@ -11,8 +11,8 @@ -
- typedef char * LPSTR;
- typedef const char * LPCTSTR;
--typedef unsigned int DWORD;
--typedef unsigned int * LPDWORD;
-+typedef unsigned long DWORD;
-+typedef DWORD * LPDWORD;
- typedef unsigned char * LPBYTE;
- typedef int INT;
- typedef long LONG;
diff --git a/games-strategy/scorched3d/files/scorched3d-44-win32.patch b/games-strategy/scorched3d/files/scorched3d-44-win32.patch deleted file mode 100644 index 05f9c806b1c7..000000000000 --- a/games-strategy/scorched3d/files/scorched3d-44-win32.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- scorched.old/src/common/porting/windows.h -+++ scorched/src/common/porting/windows.h -@@ -9,6 +9,7 @@ - #include <ctype.h>
- #include <common/Defines.h>
-
-+#ifdef _WIN32
- typedef char * LPSTR;
- typedef const char * LPCTSTR;
- typedef unsigned int DWORD;
-@@ -27,6 +28,7 @@ - typedef int LRESULT;
- typedef void * HDC;
- typedef void * HGLRC;
-+#endif /* _WIN32 */
-
- #define _strnicmp(a,b,c) strncasecmp(a,b,c)
- #define stricmp(a,b) strcasecmp(a,b)
diff --git a/games-strategy/scorched3d/files/scorched3d-44-wxgtk.patch b/games-strategy/scorched3d/files/scorched3d-44-wxgtk.patch deleted file mode 100644 index ee8b97554656..000000000000 --- a/games-strategy/scorched3d/files/scorched3d-44-wxgtk.patch +++ /dev/null @@ -1,161 +0,0 @@ -Description: Fix to build with wxWidgets 3.0 -Author: Olly Betts <olly@survex.com> -Last-Update: 2014-05-01 - ---- a/src/launcher/wxdialogs/Display.cpp -+++ b/src/launcher/wxdialogs/Display.cpp -@@ -26,7 +26,7 @@ - // Display settings - wxStaticBox *displayBox = new wxStaticBox(parent, -1, wxT("&Display")); - wxStaticBoxSizer *displaySizer = new wxStaticBoxSizer(displayBox, wxVERTICAL); -- wxFlexGridSizer *displaySizer2 = new wxFlexGridSizer(2, 3, 5, 5); -+ wxFlexGridSizer *displaySizer2 = new wxFlexGridSizer(0, 3, 5, 5); - wxStaticText *resText = new wxStaticText(parent, -1, wxT("&Resolution :")); - IDC_DISPLAY_CTRL = - new wxComboBox(parent, -1, -@@ -88,7 +88,7 @@ - // Sound settings - wxStaticBox *soundBox = new wxStaticBox(parent, -1, wxT("&Sound")); - wxStaticBoxSizer *soundSizerMain = new wxStaticBoxSizer(soundBox, wxVERTICAL); -- wxFlexGridSizer *soundSizer1 = new wxFlexGridSizer(4, 2); -+ wxFlexGridSizer *soundSizer1 = new wxFlexGridSizer(0, 4, 2, 0); - wxStaticText *volumeText = new wxStaticText(parent, -1, wxT("Sound Volume :")); - wxStaticText *musicVolumeText = new wxStaticText(parent, -1, wxT("Music Volume :")); - wxStaticText *ambientVolumeText = new wxStaticText(parent, -1, wxT("Ambient Volume :")); -@@ -137,7 +137,7 @@ - wxT("Game Detail Options")); - wxStaticBoxSizer *speedSizer = new wxStaticBoxSizer(speedBox, wxHORIZONTAL); - -- wxGridSizer *loadSizer = new wxFlexGridSizer(2, 2); -+ wxGridSizer *loadSizer = new wxFlexGridSizer(0, 2, 2, 0); - IDC_LOADULTRA_CTRL = new wxButton(parent, ID_LOADULTRA, wxT("&Ultra Detail"), wxDefaultPosition, wxSize(120,-1)); - IDC_LOADDEFAULTS_CTRL = new wxButton(parent, ID_LOADDEFAULTS, wxT("&Normal Detail"), wxDefaultPosition, wxSize(120,-1)); - IDC_LOADMEDIUM_CTRL = new wxButton(parent, ID_LOADMEDIUM, wxT("Faster Detail"), wxDefaultPosition, wxSize(120,-1)); -@@ -256,7 +256,7 @@ - wxStaticBox *waterDetailBox = new wxStaticBox(parent, -1, - wxT("Graphics Detail")); - wxStaticBoxSizer *waterDetailSizer = new wxStaticBoxSizer(waterDetailBox, wxHORIZONTAL); -- wxGridSizer *waterDetailSizer2 = new wxGridSizer(3, 1, 10, 10); -+ wxGridSizer *waterDetailSizer2 = new wxGridSizer(0, 1, 10, 10); - - IDC_NOWATERREF_CTRL = - new wxCheckBox(parent, -1, wxT("Don't draw water reflections - Large Framerate Improvement")); -@@ -471,7 +471,7 @@ - { - wxScrolledWindow *scrolledWindow = new wxScrolledWindow(parent, -1, - wxDefaultPosition, wxSize(480, 250)); -- wxSizer *sizer = new wxFlexGridSizer(5, 1); -+ wxSizer *sizer = new wxFlexGridSizer(0, 5, 1, 0); - - keyboardKeyList.clear(); - if (!Keyboard::instance()->loadKeyFile()) ---- a/src/launcher/wxdialogs/SettingsDialog.cpp -+++ b/src/launcher/wxdialogs/SettingsDialog.cpp -@@ -105,7 +105,7 @@ - mainPanel_ = new wxPanel(book_, -1); - book_->AddPage(mainPanel_, wxT("Main")); - wxSizer *mainPanelSizer = new wxBoxSizer(wxVERTICAL); -- wxSizer *sizer = new wxFlexGridSizer(2, 2); -+ wxSizer *sizer = new wxFlexGridSizer(0, 2, 2, 0); - mainPanelSizer->Add(sizer, 0, wxALL | wxALIGN_CENTER, 10); - - setters_.push_back( -@@ -166,7 +166,7 @@ - { - moneyPanel_ = new wxPanel(book_, -1); - wxSizer *ecoPanelSizer = new wxBoxSizer(wxVERTICAL); -- wxSizer *sizer = new wxFlexGridSizer(2, 2); -+ wxSizer *sizer = new wxFlexGridSizer(0, 2, 2, 0); - ecoPanelSizer->Add(sizer, 0, wxALL | wxALIGN_CENTER, 10); - - setters_.push_back( -@@ -215,7 +215,7 @@ - { - scorePanel_ = new wxPanel(book_, -1); - wxSizer *ecoPanelSizer = new wxBoxSizer(wxVERTICAL); -- wxSizer *sizer = new wxFlexGridSizer(2, 2); -+ wxSizer *sizer = new wxFlexGridSizer(0, 2, 2, 0); - ecoPanelSizer->Add(sizer, 0, wxALL | wxALIGN_CENTER, 10); - - setters_.push_back( -@@ -249,7 +249,7 @@ - { - weaponsPanel_ = new wxPanel(book_, -1); - wxSizer *ecoPanelSizer = new wxBoxSizer(wxVERTICAL); -- wxSizer *sizer = new wxFlexGridSizer(2, 2); -+ wxSizer *sizer = new wxFlexGridSizer(0, 2, 2, 0); - ecoPanelSizer->Add(sizer, 0, wxALL | wxALIGN_CENTER, 10); - - setters_.push_back( -@@ -286,7 +286,7 @@ - { - envPanel_ = new wxPanel(book_, -1); - wxSizer *envPanelSizer = new wxBoxSizer(wxVERTICAL); -- wxSizer *sizer = new wxFlexGridSizer(2, 2); -+ wxSizer *sizer = new wxFlexGridSizer(0, 2, 2, 0); - envPanelSizer->Add(sizer, 0, wxALL | wxALIGN_CENTER, 10); - - setters_.push_back( -@@ -337,7 +337,7 @@ - wxScrolledWindow *scrolledWindow = new wxScrolledWindow(landPanel_, -1, - wxDefaultPosition, wxSize(225, 200)); - -- wxSizer *sizer = new wxFlexGridSizer(3, 3); -+ wxSizer *sizer = new wxFlexGridSizer(0, 3, 3, 0); - int i = 0; - std::list<LandscapeDefinitionsEntry> &defns = - landscapeDefinitions.getAllLandscapes(); -@@ -438,7 +438,7 @@ - wxT("Players are persistent for game")); - playersPanelSizer->Add(IDC_SERVER_RESIDUAL_CTRL, 0, wxALIGN_CENTER | wxTOP, 10); - -- wxSizer *sizer = new wxGridSizer(3, 3); -+ wxSizer *sizer = new wxGridSizer(0, 3, 3, 0); - playersPanelSizer->Add(sizer, 0, wxALL | wxALIGN_CENTER, 10); - - for (int i=0; i<24; i++) ---- a/src/launcher/wxdialogs/DisplayDialog.cpp -+++ b/src/launcher/wxdialogs/DisplayDialog.cpp -@@ -449,15 +449,15 @@ - IDC_SLIDER1_CTRL->SetValue(OptionsDisplay::instance()->getBrightness()); - IDC_SLIDER1_CTRL->SetToolTip(wxString(OptionsDisplay::instance()->getBrightnessEntry().getDescription(), wxConvUTF8)); - IDC_VOLUME_CTRL->SetRange(0, 128); -- IDC_VOLUME_CTRL->SetTickFreq(4, 0); -+ IDC_VOLUME_CTRL->SetTickFreq(4); - IDC_VOLUME_CTRL->SetValue(OptionsDisplay::instance()->getSoundVolume()); - IDC_VOLUME_CTRL->SetToolTip(wxString(OptionsDisplay::instance()->getSoundVolumeEntry().getDescription(), wxConvUTF8)); - IDC_MUSICVOLUME_CTRL->SetRange(0, 128); -- IDC_MUSICVOLUME_CTRL->SetTickFreq(4, 0); -+ IDC_MUSICVOLUME_CTRL->SetTickFreq(4); - IDC_MUSICVOLUME_CTRL->SetValue(OptionsDisplay::instance()->getMusicVolume()); - IDC_MUSICVOLUME_CTRL->SetToolTip(wxString(OptionsDisplay::instance()->getMusicVolumeEntry().getDescription(), wxConvUTF8)); - IDC_AMBIENTVOLUME_CTRL->SetRange(0, 128); -- IDC_AMBIENTVOLUME_CTRL->SetTickFreq(4, 0); -+ IDC_AMBIENTVOLUME_CTRL->SetTickFreq(4); - IDC_AMBIENTVOLUME_CTRL->SetValue(OptionsDisplay::instance()->getAmbientSoundVolume()); - IDC_AMBIENTVOLUME_CTRL->SetToolTip(wxString(OptionsDisplay::instance()->getAmbientSoundVolumeEntry().getDescription(), wxConvUTF8)); - IDC_USERNAME_CTRL->SetValue(wxString(OptionsDisplay::instance()->getOnlineUserName(), wxConvUTF8)); -@@ -733,11 +733,7 @@ - convertString(S3D::formatStringBuffer("%s.s3m", (const char *) (selection.mb_str(wxConvUTF8)))), // default filename - wxT(""), // default extension - wxT("*.s3m"), --#if wxCHECK_VERSION(2, 8, 0) - wxFD_SAVE); --#else -- wxSAVE); --#endif - if (file.empty()) return; - ModFiles files; - if (!files.loadModFiles(std::string(selection.mb_str(wxConvUTF8)), false)) -@@ -761,11 +757,7 @@ - wxT(""), // default filename - wxT(""), // default extension - wxT("*.s3m"), --#if wxCHECK_VERSION(2, 8, 0) - wxFD_OPEN | wxFD_FILE_MUST_EXIST); --#else -- wxOPEN | wxFILE_MUST_EXIST); --#endif - if (file.empty()) return; - ModFiles files; - std::string mod; diff --git a/games-strategy/scorched3d/metadata.xml b/games-strategy/scorched3d/metadata.xml deleted file mode 100644 index bad136330d96..000000000000 --- a/games-strategy/scorched3d/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>games@gentoo.org</email> - <name>Gentoo Games Project</name> - </maintainer> - <upstream> - <remote-id type="sourceforge">scorched3d</remote-id> - </upstream> -</pkgmetadata> diff --git a/games-strategy/scorched3d/scorched3d-44-r2.ebuild b/games-strategy/scorched3d/scorched3d-44-r2.ebuild deleted file mode 100644 index 6cd098e970d6..000000000000 --- a/games-strategy/scorched3d/scorched3d-44-r2.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -WX_GTK_VER=3.0 - -inherit autotools eutils wxwidgets - -DESCRIPTION="Multi-player tank battle in 3D (OpenGL)" -HOMEPAGE="http://www.scorched3d.co.uk/" -SRC_URI="mirror://sourceforge/scorched3d/Scorched3D-${PV}-src.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc64 ~x86" -IUSE="dedicated mysql" - -RDEPEND=" - dev-libs/expat - media-fonts/dejavu - media-libs/libpng:0= - media-libs/libsdl[video] - media-libs/sdl-net - sys-libs/zlib - virtual/jpeg:0 - !dedicated? ( - virtual/opengl - virtual/glu - media-libs/glew:0= - media-libs/libogg - media-libs/libvorbis - media-libs/openal - media-libs/freealut - x11-libs/wxGTK:${WX_GTK_VER}[X] - media-libs/freetype:2 - sci-libs/fftw:3.0= - ) - mysql? ( virtual/mysql )" -DEPEND="${RDEPEND} - !dedicated? ( virtual/pkgconfig )" - -S=${WORKDIR}/scorched - -PATCHES=( - "${FILESDIR}"/${P}-fixups.patch - "${FILESDIR}"/${P}-gcc43.patch - "${FILESDIR}"/${P}-odbc.patch - "${FILESDIR}"/${P}-win32.patch - "${FILESDIR}"/${P}-freetype.patch - "${FILESDIR}"/${P}-jpeg9.patch - "${FILESDIR}"/${P}-wxgtk.patch - "${FILESDIR}"/${P}-fix-c++14.patch -) - -pkg_setup() { - setup-wxwidgets -} - -src_prepare() { - edos2unix \ - src/launcher/wxdialogs/SettingsDialog.cpp \ - src/launcher/wxdialogs/DisplayDialog.cpp \ - src/launcher/wxdialogs/Display.cpp \ - src/launcher/wxdialogs/KeyDialog.cpp - default - eautoreconf -} - -src_configure() { - econf \ - --datadir="${EPREFIX}"/usr/share/${PN} \ - --with-fftw="${EPREFIX}"/usr \ - --with-ogg="${EPREFIX}"/usr \ - --with-vorbis="${EPREFIX}"/usr \ - --with-docdir="${EPREFIX}"/usr/share/doc/${PF} \ - --with-wx-config="${WX_CONFIG}" \ - --without-pgsql \ - $(use_with mysql) \ - $(use_enable dedicated serveronly) -} - -src_install() { - default - - # remove bundled fonts - rm "${ED%/}"/usr/share/${PN}/data/fonts/* || die - dosym /usr/share/fonts/dejavu/DejaVuSans.ttf /usr/share/${PN}/data/fonts/dejavusans.ttf - dosym /usr/share/fonts/dejavu/DejaVuSansCondensed-Bold.ttf /usr/share/${PN}/data/fonts/dejavusconbd.ttf - dosym /usr/share/fonts/dejavu/DejaVuSansMono-Bold.ttf /usr/share/${PN}/data/fonts/dejavusmobd.ttf - - if ! use dedicated; then - newicon data/images/tank-old.bmp ${PN}.bmp - make_desktop_entry ${PN} "Scorched 3D" /usr/share/pixmaps/${PN}.bmp - fi -} |