[widelands] 02/04: Forget commented patches: they are actually useless now

[Martin Quinson]

This is an automated email from the git hooks/post-receive script.

mquinson pushed a commit to branch master
in repository widelands.

commit ef3284e826ebcf1175308e1dbcd1852828070c22
Author: Martin Quinson <martin.quinson at loria.fr>
Date:   Sat Mar 11 09:01:20 2017 +0100

    Forget commented patches: they are actually useless now
---
 debian/patches/mips_gcc_ICE_with-03  | 31 ---------------------
 debian/patches/s390_new_architecture | 52 ------------------------------------
 debian/patches/series                |  2 --
 3 files changed, 85 deletions(-)

diff --git a/debian/patches/mips_gcc_ICE_with-03 b/debian/patches/mips_gcc_ICE_with-03
deleted file mode 100644
index a01f505..0000000
--- a/debian/patches/mips_gcc_ICE_with-03
+++ /dev/null
@@ -1,31 +0,0 @@
-Description: Set compilation level to -02 on mips (it's -03 by default upstream)
- .
- Optimizing further drives gcc nuts and produce ICE.
- .
- https://buildd.debian.org/status/fetch.php?pkg=widelands&arch=mips&ver=1%3A18-1&stamp=1393243179
-Author: Martin Quinson
-Forwarded-Upstream: should be
-
----
- CMakeLists.txt |    6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-Index: b/CMakeLists.txt
-===================================================================
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -264,10 +264,12 @@
-     OUTPUT_VARIABLE WLBUILD_COMPILERVERSION
-   )
-   STRING(REGEX REPLACE ".*(4)\\.(5)\\.([0-9]).*" "\\1.\\2.\\3" WLBUILD_COMPILERVERSION_REP ${WLBUILD_COMPILERVERSION})
--  IF (WLBUILD_COMPILERVERSION_REP STREQUAL "4.5.1" OR WLBUILD_COMPILERVERSION_REP STREQUAL "4.5.2")
--    message("Detected gcc ${WLBUILD_COMPILERVERSION_REP}")
-+  IF (WLBUILD_COMPILERVERSION_REP STREQUAL "4.5.1" OR WLBUILD_COMPILERVERSION_REP STREQUAL "4.5.2" OR PROCESSOR_ARCHITECTURE STREQUAL "mips64" OR PROCESSOR_ARCHITECTURE STREQUAL "mips")
-+    message("Detected gcc ${WLBUILD_COMPILERVERSION_REP} on ${PROCESSOR_ARCHITECTURE}")
-     message("Suffering from gcc bug, disabling -O3")
-     set (WL_COMPILERFLAG_OPTIMIZATIONS "-O2")
-+  else (WLBUILD_COMPILERVERSION_REP STREQUAL "4.5.1" OR WLBUILD_COMPILERVERSION_REP STREQUAL "4.5.2" OR PROCESSOR_ARCHITECTURE STREQUAL "mips64" OR PROCESSOR_ARCHITECTURE STREQUAL "mips")
-+    message("Detected architecture: ${PROCESSOR_ARCHITECTURE}")
-   ENDIF (WLBUILD_COMPILERVERSION_REP STREQUAL "4.5.1" OR WLBUILD_COMPILERVERSION_REP STREQUAL "4.5.2")
- ENDIF (CMAKE_COMPILER_IS_GNUCXX)
- 
diff --git a/debian/patches/s390_new_architecture b/debian/patches/s390_new_architecture
deleted file mode 100644
index 1d06d12..0000000
--- a/debian/patches/s390_new_architecture
+++ /dev/null
@@ -1,52 +0,0 @@
-Description: Port the game to the s390 architecture
-Forwarded-Upstream: should be
-
----
- src/logic/widelands.h |   20 ++++++++++++++++++++
- 1 file changed, 20 insertions(+)
-
-Index: b/src/logic/widelands.h
-===================================================================
---- a/src/logic/widelands.h
-+++ b/src/logic/widelands.h
-@@ -78,6 +78,13 @@
- 	{
- 		assert(I < std::numeric_limits<value_t>::max());
- 	}
-+#if (defined(__s390__) && !defined(__s390x__))
-+	explicit _Index(uintptr_t  const I)
-+		: i(static_cast<value_t>(I))
-+	{
-+		assert(I < std::numeric_limits<value_t>::max());
-+	}
-+#endif
- 
- 	/// For compatibility with old code that use int32_t for building index
- 	/// and use -1 to indicate invalidity.
-@@ -116,6 +123,17 @@
- 	value_t i;
- };
- 
-+#if (defined(__s390__) && !defined(__s390x__)) 
-+#define DEFINE_INDEX(NAME)                                                    \
-+   struct NAME : public _Index<NAME> {                                        \
-+      NAME(NAME const & other = Null()) : _Index<NAME>(other) {}              \
-+      explicit NAME(value_t const I) : _Index<NAME>(I) {}                     \
-+      explicit NAME(size_t  const I) : _Index<NAME>(I) {}                     \
-+      explicit NAME(int32_t const I) __attribute__((deprecated));             \
-+      explicit NAME(uintptr_t  const I) : _Index<NAME>(I) {}                  \
-+   };                                                                         \
-+
-+#else
- #define DEFINE_INDEX(NAME)                                                    \
-    struct NAME : public Index_<NAME> {                                        \
-       NAME(const NAME & other = Null()) : Index_<NAME>(other) {}              \
-@@ -124,6 +142,8 @@
-       explicit NAME(int32_t const I) __attribute__((deprecated));             \
-    };                                                                         \
- 
-+#endif /* s390 architecture */
-+
- DEFINE_INDEX(Building_Index)
- DEFINE_INDEX(Ware_Index)
- 
diff --git a/debian/patches/series b/debian/patches/series
index 2c5ffe9..70c0f36 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
-# mips_gcc_ICE_with-03
-# s390_new_architecture
 system-wide_minizip
 hurd_PATH_MAX_missing
 dbg_symbols

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/widelands.git