[hedgewars] 03/03: New upstream release, patches dropped
Gianfranco Costamagna
locutusofborg-guest at moszumanska.debian.org
Tue Jan 6 22:05:46 UTC 2015
This is an automated email from the git hooks/post-receive script.
locutusofborg-guest pushed a commit to branch master
in repository hedgewars.
commit ea68b60b602d8f260e4a792adc6b7250939594b3
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date: Tue Jan 6 22:53:32 2015 +0100
New upstream release, patches dropped
---
debian/changelog | 4 +-
debian/patches/0001-Fix-arm-build-failures.patch | 33 --------
...t-when-BUILD_ENGINE_C-ON-and-FONTS_DIR-is.patch | 91 ----------------------
...urn-value-instead-of-looking-for-the-stde.patch | 33 --------
debian/patches/series | 3 -
5 files changed, 3 insertions(+), 161 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 9706945..9eced39 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
-hedgewars (0.9.21-4) UNRELEASED; urgency=medium
+hedgewars (0.9.21.1-1) unstable; urgency=medium
+ * New upstream bugfix release.
+ - Drop every debian patch, all merged upstream.
[ Reiner Herrmann ]
* Make hedgewars create reproducible builds, by removing timestamp
on build-time created png icons. (Closes: #774633)
diff --git a/debian/patches/0001-Fix-arm-build-failures.patch b/debian/patches/0001-Fix-arm-build-failures.patch
deleted file mode 100644
index 272641a..0000000
--- a/debian/patches/0001-Fix-arm-build-failures.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 52a97b25e6ea09449d75ae6b3838490161315259 Mon Sep 17 00:00:00 2001
-From: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
-Date: Tue, 30 Dec 2014 15:56:09 +0100
-Subject: [PATCH] Fix arm* build failures
-
----
- hedgewars/uRender.pas | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/hedgewars/uRender.pas b/hedgewars/uRender.pas
-index cefea5f..a7f0fb9 100644
---- a/hedgewars/uRender.pas
-+++ b/hedgewars/uRender.pas
-@@ -535,11 +535,14 @@ begin
- end;
-
- procedure openglRotatef(RotX, RotY, RotZ: GLfloat; dir: LongInt); inline;
-+{ workaround for pascal bug http://bugs.freepascal.org/view.php?id=27222 }
-+var tmpdir: LongInt;
- begin
-+tmpdir:=dir;
- {$IFDEF GL2}
-- hglRotatef(RotX, RotY, RotZ, dir);
-+ hglRotatef(RotX, RotY, RotZ, tmpdir);
- {$ELSE}
-- glRotatef(RotX, RotY, RotZ, dir);
-+ glRotatef(RotX, RotY, RotZ, tmpdir);
- {$ENDIF}
- end;
-
---
-1.9.1
-
diff --git a/debian/patches/0001-Fix-segfault-when-BUILD_ENGINE_C-ON-and-FONTS_DIR-is.patch b/debian/patches/0001-Fix-segfault-when-BUILD_ENGINE_C-ON-and-FONTS_DIR-is.patch
deleted file mode 100644
index 0047800..0000000
--- a/debian/patches/0001-Fix-segfault-when-BUILD_ENGINE_C-ON-and-FONTS_DIR-is.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From 4dd79f547ad8a690b085a49ebcff41bada8c800d Mon Sep 17 00:00:00 2001
-From: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
-Date: Sat, 29 Nov 2014 14:53:41 +0100
-Subject: [PATCH 1/2] Fix segfault when BUILD_ENGINE_C=ON and FONTS_DIR is
- provided
-
----
- hedgewars/CMakeLists.txt | 16 ++++++++++------
- hedgewars/config.inc.in | 4 ----
- hedgewars/uPhysFSLayer.pas | 2 +-
- project_files/hwc/CMakeLists.txt | 11 +++++++++++
- 4 files changed, 22 insertions(+), 11 deletions(-)
-
-diff --git a/hedgewars/CMakeLists.txt b/hedgewars/CMakeLists.txt
-index 3fc769f..e4ac4bc 100644
---- a/hedgewars/CMakeLists.txt
-+++ b/hedgewars/CMakeLists.txt
-@@ -21,12 +21,16 @@ if(UNIX)
- endif(UNIX)
-
- # convert list into pascal array
--list(LENGTH FONTS_DIRS ndirs)
--set(FONTS_DIRS_ARRAY "array [0..${ndirs}] of PChar = (")
--foreach(fontdir ${FONTS_DIRS})
-- set(FONTS_DIRS_ARRAY "${FONTS_DIRS_ARRAY}\n'${fontdir}',")
--endforeach(fontdir)
--set(FONTS_DIRS_ARRAY "${FONTS_DIRS_ARRAY}\nnil);\n")
-+if(FONTS_DIRS)
-+ list(LENGTH FONTS_DIRS ndirs)
-+ set(FONTS_DIRS_ARRAY "array [0..${ndirs}] of PChar = (")
-+ foreach(fontdir ${FONTS_DIRS})
-+ set(FONTS_DIRS_ARRAY "${FONTS_DIRS_ARRAY}\n'${fontdir}',")
-+ endforeach(fontdir)
-+ set(FONTS_DIRS_ARRAY "${FONTS_DIRS_ARRAY}\nnil);\n")
-+else(FONTS_DIRS)
-+ set(FONTS_DIRS_ARRAY "array [0..1] of PChar = (nil, nil);")
-+endif(FONTS_DIRS)
-
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.inc.in ${CMAKE_CURRENT_BINARY_DIR}/config.inc)
- include_directories(${CMAKE_CURRENT_BINARY_DIR})
-diff --git a/hedgewars/config.inc.in b/hedgewars/config.inc.in
-index 4345c8f..15c2a80 100644
---- a/hedgewars/config.inc.in
-+++ b/hedgewars/config.inc.in
-@@ -26,8 +26,4 @@ const cNetProtoVersion = ${HEDGEWARS_PROTO_VER};
- cRevisionString = '${HEDGEWARS_REVISION}';
- cHashString = '${HEDGEWARS_HASH}';
- cDefaultPathPrefix = '${HEDGEWARS_FULL_DATADIR}/Data';
--{$IFDEF PAS2C}
-- cFontsPaths: array[0..1] of PChar = (nil, nil);
--{$ELSE}
- cFontsPaths: ${FONTS_DIRS_ARRAY}
--{$ENDIF}
-diff --git a/hedgewars/uPhysFSLayer.pas b/hedgewars/uPhysFSLayer.pas
-index 37726c7..7f8b2bf 100644
---- a/hedgewars/uPhysFSLayer.pas
-+++ b/hedgewars/uPhysFSLayer.pas
-@@ -166,7 +166,7 @@ begin
- // mount system fonts paths first
- for i:= low(cFontsPaths) to high(cFontsPaths) do
- begin
-- fp := cFontsPaths[i];
-+ fp := PChar(cFontsPaths[i]);
- if fp <> nil then
- pfsMount(ansistring(fp), PChar('/Fonts'));
- end;
-diff --git a/project_files/hwc/CMakeLists.txt b/project_files/hwc/CMakeLists.txt
-index 66cbefa..159071f 100644
---- a/project_files/hwc/CMakeLists.txt
-+++ b/project_files/hwc/CMakeLists.txt
-@@ -16,6 +16,17 @@ include_directories(${LUA_INCLUDE_DIR})
- include_directories(${SDL_INCLUDE_DIR})
- add_subdirectory(rtl)
-
-+# convert list into pascal array
-+if(FONTS_DIRS)
-+ list(LENGTH FONTS_DIRS ndirs)
-+ set(FONTS_DIRS_ARRAY "array [0..${ndirs}] of shortstring = (")
-+ foreach(fontdir ${FONTS_DIRS})
-+ set(FONTS_DIRS_ARRAY "${FONTS_DIRS_ARRAY}\n'${fontdir}',")
-+ endforeach(fontdir)
-+ set(FONTS_DIRS_ARRAY "${FONTS_DIRS_ARRAY}\nnil);\n")
-+else(FONTS_DIRS)
-+ set(FONTS_DIRS_ARRAY "array [0..1] of PChar = (nil, nil);")
-+endif(FONTS_DIRS)
- configure_file(${CMAKE_SOURCE_DIR}/hedgewars/config.inc.in ${CMAKE_CURRENT_BINARY_DIR}/config.inc)
-
- #get the list of pas files that are going to be converted and compiled
---
-1.9.1
-
diff --git a/debian/patches/0001-Use-ghc-return-value-instead-of-looking-for-the-stde.patch b/debian/patches/0001-Use-ghc-return-value-instead-of-looking-for-the-stde.patch
deleted file mode 100644
index 2d47a5a..0000000
--- a/debian/patches/0001-Use-ghc-return-value-instead-of-looking-for-the-stde.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From ced39df2419d49f3ef1307acc0123268d95f46f3 Mon Sep 17 00:00:00 2001
-From: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
-Date: Mon, 29 Dec 2014 12:27:51 +0100
-Subject: [PATCH] Use ghc return value instead of looking for the stderr, do
- not throw error when an haskell module throws a build failure, e.g. because
- of false positives like this one (debian/arm*) "You are using a new version
- of LLVM that hasn't been tested yet! We will try though..."
-
----
- cmake_modules/CheckHaskellModuleExists.cmake | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/cmake_modules/CheckHaskellModuleExists.cmake b/cmake_modules/CheckHaskellModuleExists.cmake
-index 872b1a0..26b6812 100644
---- a/cmake_modules/CheckHaskellModuleExists.cmake
-+++ b/cmake_modules/CheckHaskellModuleExists.cmake
-@@ -30,11 +30,11 @@ macro(CHECK_HASKELL_MODULE_EXISTS MODULE FUNCTION PARAMCOUNT LIBRARY)
- "-DPARAMETERS=${PARAMETERS}"
- -cpp
- -c "${CMAKE_MODULE_PATH}/checkModule.hs"
-+ RESULT_VARIABLE COMMAND_RESULT
- ERROR_VARIABLE BUILD_ERROR
- OUTPUT_STRIP_TRAILING_WHITESPACE
- )
--
-- if("${BUILD_ERROR}" STREQUAL "")
-+ if(${COMMAND_RESULT} EQUAL 0)
- message(STATUS "Looking for ${FUNCTION} in ${MODULE} - found")
- set(${VARIABLE} 1 CACHE INTERNAL "Have module ${MODULE}")
- file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
---
-1.9.1
-
diff --git a/debian/patches/series b/debian/patches/series
index 89fbbe6..a03d01c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1 @@
-0001-Fix-segfault-when-BUILD_ENGINE_C-ON-and-FONTS_DIR-is.patch
disable-fstack-protector.patch
-0001-Use-ghc-return-value-instead-of-looking-for-the-stde.patch
-0001-Fix-arm-build-failures.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/hedgewars.git
More information about the Pkg-games-commits
mailing list