r16073 - in packages/trunk/supertuxkart/debian: . patches

Vincent Cheng vcheng at moszumanska.debian.org
Mon Dec 18 04:51:13 UTC 2017 

Author: vcheng
Date: 2017-12-18 04:51:13 +0000 (Mon, 18 Dec 2017)
New Revision: 16073

Removed:
   packages/trunk/supertuxkart/debian/patches/fix_angelscript_ftbfs.patch
   packages/trunk/supertuxkart/debian/patches/replace-fonts-ubuntu-with-cantarell.patch
   packages/trunk/supertuxkart/debian/patches/update_boom_boom_boom_license.patch
Modified:
   packages/trunk/supertuxkart/debian/changelog
   packages/trunk/supertuxkart/debian/patches/build_against_system_enet.patch
   packages/trunk/supertuxkart/debian/patches/link_against_system_libs.patch
   packages/trunk/supertuxkart/debian/patches/remove_irrlicht_embedded_libs.patch
   packages/trunk/supertuxkart/debian/patches/series
Log:
supertuxkart: refresh patches


Modified: packages/trunk/supertuxkart/debian/changelog
===================================================================
--- packages/trunk/supertuxkart/debian/changelog	2017-12-18 04:34:30 UTC (rev 16072)
+++ packages/trunk/supertuxkart/debian/changelog	2017-12-18 04:51:13 UTC (rev 16073)
@@ -3,6 +3,9 @@
   * New upstream release.
     - Fix segfault in MusicInformation::isPlaying. (Closes: #873670)
     - Fix credits for Boom-boom-boom song. (Closes: #848001)
+    - Remove obsolete patches: replace-fonts-ubuntu-with-cantarell.patch,
+      update_boom_boom_boom_license.patch.
+    - Refresh remaining patches.
   * Bump Standards version to 4.1.2.
     - Change priority of debug package from extra to optional.
 

Modified: packages/trunk/supertuxkart/debian/patches/build_against_system_enet.patch
===================================================================
--- packages/trunk/supertuxkart/debian/patches/build_against_system_enet.patch	2017-12-18 04:34:30 UTC (rev 16072)
+++ packages/trunk/supertuxkart/debian/patches/build_against_system_enet.patch	2017-12-18 04:51:13 UTC (rev 16073)
@@ -1,11 +1,11 @@
 Description: Build supertuxkart against system enet instead of embedded copy
 Forwarded: not-yet
 Author: Vincent Cheng <vcheng at debian.org>
-Last-Update: 2016-07-17
+Last-Update: 2017-12-17
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -63,9 +63,9 @@
+@@ -105,9 +105,9 @@
  add_subdirectory("${PROJECT_SOURCE_DIR}/lib/bullet")
  include_directories("${PROJECT_SOURCE_DIR}/lib/bullet/src")
  
@@ -17,20 +17,19 @@
 +include_directories(${ENET_INCLUDE_DIR})
  
  # Build glew library
- add_definitions(-DGLEW_NO_GLU)
-@@ -342,11 +342,11 @@
+ if(NOT USE_GLES2 AND NOT SERVER_ONLY)
+@@ -406,10 +406,10 @@
      bulletdynamics
      bulletcollision
      bulletmath
 -    enet
-     glew
      stkirrlicht
      ${Angelscript_LIBRARIES}
      ${CURL_LIBRARIES}
 +    ${ENET_LIBRARIES}
      ${OGGVORBIS_LIBRARIES}
      ${OPENAL_LIBRARY}
-     ${OPENGL_LIBRARIES}
+     ${FREETYPE_LIBRARIES}
 --- /dev/null
 +++ b/cmake/FindENet.cmake
 @@ -0,0 +1,22 @@

Deleted: packages/trunk/supertuxkart/debian/patches/fix_angelscript_ftbfs.patch
===================================================================
--- packages/trunk/supertuxkart/debian/patches/fix_angelscript_ftbfs.patch	2017-12-18 04:34:30 UTC (rev 16072)
+++ packages/trunk/supertuxkart/debian/patches/fix_angelscript_ftbfs.patch	2017-12-18 04:51:13 UTC (rev 16073)
@@ -1,27 +0,0 @@
-Description: Fix FTBFS on arm64, mips/mips64/mipsel, ppc64el, s390x
-Origin: upstream, https://github.com/supertuxkart/stk-code/commit/5e05f1178ce6bc5f3a653b55ab3dc6d016196341
-Bug: https://github.com/supertuxkart/stk-code/issues/2569
-Bug-Debian: https://bugs.debian.org/830748
-Last-Update: 2016-12-03
-
---- a/lib/angelscript/projects/cmake/CMakeLists.txt
-+++ b/lib/angelscript/projects/cmake/CMakeLists.txt
-@@ -68,6 +68,7 @@ set(ANGELSCRIPT_SOURCE
-     ../../source/as_bytecode.cpp
-     ../../source/as_callfunc.cpp
-     ../../source/as_callfunc_x86.cpp
-+    ../../source/as_callfunc_mips.cpp
-     ../../source/as_callfunc_x64_gcc.cpp
-     ../../source/as_callfunc_x64_msvc.cpp
-     ../../source/as_callfunc_x64_mingw.cpp
---- a/lib/angelscript/source/as_config.h
-+++ b/lib/angelscript/source/as_config.h
-@@ -844,7 +844,7 @@
- 			#define THISCALL_PASS_OBJECT_POINTER_ON_THE_STACK
- 			#define AS_X86
- 			#undef AS_NO_THISCALL_FUNCTOR_METHOD
--		#elif defined(__LP64__) && !defined(__arm64__)
-+		#elif defined(__x86_64__)
- 			#define AS_X64_GCC
- 			#undef AS_NO_THISCALL_FUNCTOR_METHOD
- 			#define HAS_128_BIT_PRIMITIVES

Modified: packages/trunk/supertuxkart/debian/patches/link_against_system_libs.patch
===================================================================
--- packages/trunk/supertuxkart/debian/patches/link_against_system_libs.patch	2017-12-18 04:34:30 UTC (rev 16072)
+++ packages/trunk/supertuxkart/debian/patches/link_against_system_libs.patch	2017-12-18 04:51:13 UTC (rev 16073)
@@ -1,19 +1,19 @@
 Description: Link against system copies of zlib/libpng/libjpeg/bzip2
 Forwarded: not-yet
 Author: Vincent Cheng <vcheng at debian.org>
-Last-Update: 2016-07-17
+Last-Update: 2017-12-17
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -351,6 +351,11 @@
-     ${OPENAL_LIBRARY}
-     ${OPENGL_LIBRARIES}
+@@ -415,6 +415,11 @@
      ${FREETYPE_LIBRARIES}
+     ${JPEG_LIBRARIES}
+     ${TURBOJPEG_LIBRARY}
 +    X11
 +    z
 +    png
 +    jpeg
 +    bz2
+     #${VPX_LIBRARIES}
      )
  
- if(UNIX AND NOT APPLE)

Modified: packages/trunk/supertuxkart/debian/patches/remove_irrlicht_embedded_libs.patch
===================================================================
--- packages/trunk/supertuxkart/debian/patches/remove_irrlicht_embedded_libs.patch	2017-12-18 04:34:30 UTC (rev 16072)
+++ packages/trunk/supertuxkart/debian/patches/remove_irrlicht_embedded_libs.patch	2017-12-18 04:51:13 UTC (rev 16073)
@@ -7,29 +7,28 @@
  in debian/rules (e.g. in the clean target).
 Forwarded: no
 Author: Vincent Cheng <vcheng at debian.org>
-Last-Update: 2016-07-07
+Last-Update: 2017-12-07
 
 --- a/lib/irrlicht/CMakeLists.txt
 +++ b/lib/irrlicht/CMakeLists.txt
-@@ -2,11 +2,7 @@
+@@ -2,10 +2,7 @@
  find_package(PNG REQUIRED)
  find_package(JPEG REQUIRED)
  
 -include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include/"
 -                    "${JPEG_INCLUDE_DIR}"
 -                    "${PNG_INCLUDE_DIRS}"
--                    "${ZLIB_INCLUDE_DIR}"
--                    "${CMAKE_CURRENT_BINARY_DIR}/../zlib/") # For zconf.h on WIN32
+-                    "${ZLIB_INCLUDE_DIR}")
 +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/)
  
- find_package(OpenGL REQUIRED)
- include_directories(${OPENGL_INCLUDE_DIR})
-@@ -508,7 +504,7 @@
- endif()
+ if(MSVC OR APPLE)
+     include_directories("${CMAKE_CURRENT_BINARY_DIR}/../zlib/" # For zconf.h on WIN32
+@@ -577,7 +574,7 @@
  
  add_library(stkirrlicht STATIC ${IRRLICHT_SOURCES})
+ 
 -target_link_libraries(stkirrlicht ${PNG_LIBRARY} ${JPEG_LIBRARY} ${ZLIB_LIBRARY})
 +target_link_libraries(stkirrlicht png jpeg z)
  
- if(WIN32)
-     target_link_libraries(stkirrlicht imm32)
+ if(NOT SERVER_ONLY)
+     if(UNIX AND NOT APPLE)

Deleted: packages/trunk/supertuxkart/debian/patches/replace-fonts-ubuntu-with-cantarell.patch
===================================================================
--- packages/trunk/supertuxkart/debian/patches/replace-fonts-ubuntu-with-cantarell.patch	2017-12-18 04:34:30 UTC (rev 16072)
+++ packages/trunk/supertuxkart/debian/patches/replace-fonts-ubuntu-with-cantarell.patch	2017-12-18 04:51:13 UTC (rev 16073)
@@ -1,32 +0,0 @@
-Description: Remove non-free Ubuntu Font Family fonts, replaced with Cantarell
-Origin: upstream, https://github.com/supertuxkart/stk-code/commit/19acdad9b4784a84e1ae87cd2e2953ebe6df97bc
-Bug: https://github.com/supertuxkart/stk-code/issues/2570
-Bug-Debian: https://bugs.debian.org/830751
-Last-Update: 2016-12-03
-
---- a/data/stk_config.xml
-+++ b/data/stk_config.xml
-@@ -411,11 +411,11 @@
-   which leads to crash with STK), but the fonts are to blame, what's the point of not
-   using industry standard nowadays...
-   -->
--  <font default="Ubuntu-R.ttf"
-+  <font default="Cantarell-Regular.otf"
-         default_fallback="FreeSans.ttf"
-         cjk="wqy-microhei.ttf"
-         ar="NotoNaskhArabicUI-Bold.ttf"
--        bold="Ubuntu-B.ttf"
-+        bold="Cantarell-Bold.otf"
-         bold_fallback="FreeSansBold.ttf"
-         digit="SigmarOne.otf" />
- 
---- a/data/ttf/LICENSE
-+++ b/data/ttf/LICENSE
-@@ -7,6 +7,6 @@
- 
- Noto Naskh Arabic UI is released under Apache-2.0 license
- 
--Ubuntu font is released under the ubuntu font license (http://font.ubuntu.com/licence/)
-+Cantarell font is released under the SIL open font license 1.1
- 
- SigmarOne is released under the SIL open font license 1.1 ( https://www.google.com/fonts/specimen/Sigmar+One )

Modified: packages/trunk/supertuxkart/debian/patches/series
===================================================================
--- packages/trunk/supertuxkart/debian/patches/series	2017-12-18 04:34:30 UTC (rev 16072)
+++ packages/trunk/supertuxkart/debian/patches/series	2017-12-18 04:51:13 UTC (rev 16073)
@@ -1,9 +1,6 @@
 build_against_system_enet.patch
 link_against_system_libs.patch
 remove_irrlicht_embedded_libs.patch
-replace-fonts-ubuntu-with-cantarell.patch
-update_boom_boom_boom_license.patch
-fix_angelscript_ftbfs.patch
 # Irrlicht patches taken directly from irrlicht source package in Debian
 irrlicht/arch-support.diff
 irrlicht/use-system-libs.diff

Deleted: packages/trunk/supertuxkart/debian/patches/update_boom_boom_boom_license.patch
===================================================================
--- packages/trunk/supertuxkart/debian/patches/update_boom_boom_boom_license.patch	2017-12-18 04:34:30 UTC (rev 16072)
+++ packages/trunk/supertuxkart/debian/patches/update_boom_boom_boom_license.patch	2017-12-18 04:51:13 UTC (rev 16073)
@@ -1,23 +0,0 @@
-Description: Correct author and license information for the "Boom boom boom" song
-Origin: upstream, https://sourceforge.net/p/supertuxkart/code/16762/
-Bug: https://github.com/supertuxkart/stk-code/issues/2577
-Bug-Debian: https://bugs.debian.org/832062
-Last-Update: 2016-12-03
-
---- a/data/music/Boom_boom_boom.music
-+++ b/data/music/Boom_boom_boom.music
-@@ -1,4 +1,4 @@
- <?xml version="1.0"?>
- <music title    = "Boom boom boom"
--       composer = "kbx128"
-+       composer = "Keith Baylis aka Vim"
-        file     = "Boom_boom_boom.ogg"/>
---- a/data/music/License.txt
-+++ b/data/music/License.txt
-@@ -1,5 +1,5 @@
- bay.ogg                     by 0zone0ne, license: CC-SA v3.0
--Boom_boom_boom.ogg          by Matt Thomas, license: GNU GPL v3 (or later)
-+Boom_boom_boom.ogg          by Keith Baylis aka Vim, license: CC-BY-SA v4.0
- celtic.ogg                  by 0zone0ne and Krobonil, license: CC-BY-SA v3.0
- Demonhill.ogg               by 0zone0ne, license: CC-SA v3.0
- egypt.ogg                   by 0zone0ne, license: CC-SA v3.0

More information about the Pkg-games-commits mailing list