Date: Sunday, December 6, 2020 @ 21:51:32 Author: foutrelis Revision: 771217
Add glob2-gcc6.patch to svn; bitbucket is 404 Added: glob2/trunk/glob2-gcc6.patch Modified: glob2/trunk/PKGBUILD ------------------+ PKGBUILD | 4 ++-- glob2-gcc6.patch | 28 ++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-12-06 21:51:17 UTC (rev 771216) +++ PKGBUILD 2020-12-06 21:51:32 UTC (rev 771217) @@ -15,7 +15,7 @@ makedepends=('scons' 'boost' 'mesa' 'patch') source=(https://dl.sv.nongnu.org/releases/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.gz glob2-0.9.4.1-gcc44.patch fix-ftbfs-gcc49.diff - glob2-gcc6.patch::"https://bitbucket.org/giszmo/glob2/commits/a9a16d8631db0176267b4f4aefd8e93767f8d247/raw/" + glob2-gcc6.patch glob2-scons3.patch glob2-bool.patch scons-python3.patch) @@ -22,7 +22,7 @@ sha256sums=('0f4d898ec6b05ce27b4a12ef242cc26571304b90d2509932a4743c71311314b8' '3a0cfc06696d1aaf2d7948b5f6a09a8ce96492767039dc09bfc25182b92d7b7a' '2bf0e51ca5de8c6f4910b68522a0265e07bb32beefe13b9912b59e5954c5bfba' - '40013ef6805694f3d96407ca5df46c4083f0d13677c75c8f05c53efbe3d33e20' + 'a371eb801407a75021c1a0105ffa1e713358d7def3eba8a9bd861f528e051d9b' '4b7833d58d62abb8c737cb60e959fe3bb27cc4a19917e4fd5fca7a7debada5cc' '81d28fde429be01ae2398ca33537daf9203bafb45182d51f04b2d00dd173b591' '6daec0ee916f6bbc4e9696a0a713e2b06e4951381d508af814e67e980bd28664') Added: glob2-gcc6.patch =================================================================== --- glob2-gcc6.patch (rev 0) +++ glob2-gcc6.patch 2020-12-06 21:51:32 UTC (rev 771217) @@ -0,0 +1,28 @@ +Description: Fix some compiler warnings + This fixes a FTBFS with GCC 6 where the warnings are now errors. +Bug-Debian: https://bugs.debian.org/812167 +Origin: upstream, https://bitbucket.org/giszmo/glob2/commits/a9a16d8631db0176267b4f4aefd8e93767f8d247 +Author: Leo Wandersleb <leo.wanders...@gmx.de> +Last-Update: 2011-11-03 +--- a/src/ChooseMapScreen.cpp ++++ b/src/ChooseMapScreen.cpp +@@ -31,7 +31,7 @@ + + #include "Game.h" + +-ChooseMapScreen::ChooseMapScreen(const char *directory, const char *extension, bool recurse, const char* alternateDirectory, const char* alternateExtension, const char* alternateRecurse) ++ChooseMapScreen::ChooseMapScreen(const char *directory, const char *extension, bool recurse, const char* alternateDirectory, const char* alternateExtension, const bool alternateRecurse) + { + ok = new TextButton(440, 360, 180, 40, ALIGN_SCREEN_CENTERED, ALIGN_SCREEN_CENTERED, "menu", Toolkit::getStringTable()->getString("[ok]"), OK, 13); + addWidget(ok); +--- a/src/ChooseMapScreen.h ++++ b/src/ChooseMapScreen.h +@@ -43,7 +43,7 @@ + /// Constructor. Directory is the source of the listed files. + /// extension is the file extension to show. If recurse is true, + /// subdirectoried are shown and can be opened. +- ChooseMapScreen(const char *directory, const char *extension, bool recurse, const char* alternateDirectory=NULL, const char* alternateExtension=NULL, const char* alternateRecurse=NULL); ++ ChooseMapScreen(const char *directory, const char *extension, bool recurse, const char* alternateDirectory=NULL, const char* alternateExtension=NULL, const bool alternateRecurse=NULL); + //! Destructor + virtual ~ChooseMapScreen(); + virtual void onAction(Widget *source, Action action, int par1, int par2);