[spring] 08/10: Add remove-ConvertUTF.patch

[Markus Koschany]

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

apo pushed a commit to branch master
in repository spring.

commit 32981af140bf57c0b6ec7415c8f83165ed2810b2
Author: Markus Koschany <apo at debian.org>
Date:   Fri Jan 6 19:44:12 2017 +0100

    Add remove-ConvertUTF.patch
---
 debian/changelog                       |  1 +
 debian/patches/glShaderSource.patch    |  4 ++--
 debian/patches/remove-ConvertUTF.patch | 41 ++++++++++++++++++++++++++++++++++
 debian/patches/reproducible.patch      | 12 +++++++++-
 debian/patches/sdl-debian.patch        |  2 +-
 debian/patches/series                  |  1 +
 6 files changed, 57 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 45d3297..564d553 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 spring (103.0+dfsg2-1) unstable; urgency=medium
 
   * Repack the tarball and remove possible non-free ConvertUTF directory.
+  * Add remove-ConvertUTF.patch.
   * Build-depend on asciidoc-base instead of asciidoc.
     Thanks to Joseph Herlant for the report. (Closes: #850387)
   * Update debian/copyright and remove unicode paragraph.
diff --git a/debian/patches/glShaderSource.patch b/debian/patches/glShaderSource.patch
index e3e9ff6..fbb4d49 100644
--- a/debian/patches/glShaderSource.patch
+++ b/debian/patches/glShaderSource.patch
@@ -11,10 +11,10 @@ Forwarded: http://springrts.com/mantis/view.php?id=4208
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/rts/lib/headlessStubs/glstub.c b/rts/lib/headlessStubs/glstub.c
-index 0d41f15..1ade8a3 100644
+index 0de7682..a86bb90 100644
 --- a/rts/lib/headlessStubs/glstub.c
 +++ b/rts/lib/headlessStubs/glstub.c
-@@ -130,7 +130,7 @@ GLAPI void APIENTRY glGetShaderSource(GLuint shader, GLsizei bufSize, GLsizei *l
+@@ -122,7 +122,7 @@ GLAPI void APIENTRY glGetShaderSource(GLuint shader, GLsizei bufSize, GLsizei *l
  GLAPI void APIENTRY glCompileShader(GLuint shader) {}
  GLAPI void APIENTRY glGetShaderiv(GLuint shader, GLenum pname, GLint *params) {}
  GLAPI void APIENTRY glGetShaderInfoLog(GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog) {}
diff --git a/debian/patches/remove-ConvertUTF.patch b/debian/patches/remove-ConvertUTF.patch
new file mode 100644
index 0000000..1c3b04f
--- /dev/null
+++ b/debian/patches/remove-ConvertUTF.patch
@@ -0,0 +1,41 @@
+From: Markus Koschany <apo at debian.org>
+Date: Fri, 6 Jan 2017 19:43:56 +0100
+Subject: remove ConvertUTF
+
+---
+ rts/lib/assimp/code/CMakeLists.txt | 8 --------
+ 1 file changed, 8 deletions(-)
+
+diff --git a/rts/lib/assimp/code/CMakeLists.txt b/rts/lib/assimp/code/CMakeLists.txt
+index 72e1fc1..dc4739e 100644
+--- a/rts/lib/assimp/code/CMakeLists.txt
++++ b/rts/lib/assimp/code/CMakeLists.txt
+@@ -530,12 +530,6 @@ SET( IrrXML_SRCS
+ )
+ SOURCE_GROUP( IrrXML FILES ${IrrXML_SRCS})
+ 
+-SET( ConvertUTF_SRCS
+-	../contrib/ConvertUTF/ConvertUTF.h
+-	../contrib/ConvertUTF/ConvertUTF.c
+-)
+-SOURCE_GROUP( ConvertUTF FILES ${ConvertUTF_SRCS})
+-
+ SET( Clipper_SRCS 
+ 	../contrib/clipper/clipper.hpp
+ 	../contrib/clipper/clipper.cpp
+@@ -638,7 +632,6 @@ ADD_LIBRARY( assimp STATIC
+ 	
+ 	# Third-party libraries
+ 	${IrrXML_SRCS}
+-	${ConvertUTF_SRCS}
+ 	${unzip_compile_SRCS}
+ 	${Poly2Tri_SRCS}
+ 	${Clipper_SRCS}
+@@ -699,7 +692,6 @@ ADD_LIBRARY( assimp SHARED
+ 	
+ 	# Third-party libraries
+ 	${IrrXML_SRCS}
+-	${ConvertUTF_SRCS}
+ 	${unzip_compile_SRCS}
+ 	${Poly2Tri_SRCS}
+ 	${Clipper_SRCS}
diff --git a/debian/patches/reproducible.patch b/debian/patches/reproducible.patch
index 781ad68..b6718c9 100644
--- a/debian/patches/reproducible.patch
+++ b/debian/patches/reproducible.patch
@@ -1,6 +1,16 @@
+From: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Date: Fri, 6 Jan 2017 19:43:11 +0100
+Subject: reproducible
+
+---
+ cont/base/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cont/base/CMakeLists.txt b/cont/base/CMakeLists.txt
+index 71c487d..ce0c307 100644
 --- a/cont/base/CMakeLists.txt
 +++ b/cont/base/CMakeLists.txt
-@@ -18,7 +18,7 @@
+@@ -18,7 +18,7 @@ MACRO(CreateBaseContentArchive outputdir filename files)
  	set(outputfile "${Spring_BINARY_DIR}/${outputdir}/${filename}")
  	add_custom_command(
  		OUTPUT "${outputfile}"
diff --git a/debian/patches/sdl-debian.patch b/debian/patches/sdl-debian.patch
index c67b321..6e49f54 100644
--- a/debian/patches/sdl-debian.patch
+++ b/debian/patches/sdl-debian.patch
@@ -26,7 +26,7 @@ index 258ac52..eff31cf 100644
  # This list was created using this *nix shell command:
  # > find . -name "*.cpp"" | sort
 diff --git a/rts/builds/dedicated/CMakeLists.txt b/rts/builds/dedicated/CMakeLists.txt
-index abd72b4..cfde11e 100644
+index 19e0b78..bddc39a 100644
 --- a/rts/builds/dedicated/CMakeLists.txt
 +++ b/rts/builds/dedicated/CMakeLists.txt
 @@ -62,6 +62,7 @@ ELSE  (MINGW OR APPLE)
diff --git a/debian/patches/series b/debian/patches/series
index bf6db38..949d32c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ glShaderSource.patch
 sdl-debian.patch
 reproducible.patch
 gold-linker.patch
+remove-ConvertUTF.patch

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