[hedgewars] 01/01: Update debian packaging, disable BUILD_ENGINE_C because not yet stable
Gianfranco Costamagna
locutusofborg-guest at moszumanska.debian.org
Tue Dec 23 16:52:51 UTC 2014
This is an automated email from the git hooks/post-receive script.
locutusofborg-guest pushed a commit to branch master
in repository hedgewars.
commit 9e54dcd2d3ab9055595323e95c4b34136b248ed0
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date: Tue Dec 23 17:51:08 2014 +0100
Update debian packaging, disable BUILD_ENGINE_C because not yet stable
---
debian/control | 7 +-
...t-when-BUILD_ENGINE_C-ON-and-FONTS_DIR-is.patch | 91 ----------------------
debian/patches/disable-fstack-protector.patch | 13 ----
debian/patches/series | 2 -
debian/rules | 9 +--
5 files changed, 4 insertions(+), 118 deletions(-)
diff --git a/debian/control b/debian/control
index 440cfb1..f846661 100644
--- a/debian/control
+++ b/debian/control
@@ -5,11 +5,10 @@ Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
Uploaders: Dmitry E. Oboukhov <unera at debian.org>,
Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Standards-Version: 3.9.6
-Build-Depends: clang [arm64 hurd-i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel ppc64el s390x alpha hppa m68k powerpcspe sh4 x32],
- cmake,
+Build-Depends: cmake,
debhelper (>= 9),
dpkg-dev (>= 1.16.1~),
- fpc [amd64 armel armhf i386 powerpc sparc ppc64],
+ fpc,
freeglut3-dev,
ghc,
# convert function
@@ -28,7 +27,7 @@ Build-Depends: clang [arm64 hurd-i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel p
libghc-utf8-string-dev,
libghc-vector-dev,
libghc-zlib-dev,
- libglew-dev [arm64 hurd-i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel ppc64el s390x alpha hppa m68k powerpcspe sh4 x32],
+ libglew-dev,
liblua5.1-dev,
# new dependency
libphysfs-dev,
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/disable-fstack-protector.patch b/debian/patches/disable-fstack-protector.patch
deleted file mode 100644
index c225ecf..0000000
--- a/debian/patches/disable-fstack-protector.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/cmake_modules/compilerchecks.cmake b/cmake_modules/compilerchecks.cmake
-index 2029712..aba4abc 100644
---- a/cmake_modules/compilerchecks.cmake
-+++ b/cmake_modules/compilerchecks.cmake
-@@ -17,7 +17,7 @@ if(NOT (WIN32 OR (CMAKE_SYSTEM_NAME MATCHES BSD.OS) OR (CMAKE_SYSTEM_NAME MATCHE
- #some bsd installations reported problems too
- #(see 822312 654424 on bugzilla.redhat.com)
- check_c_compiler_flag("-fstack-protector-all -fstack-protector" HAVE_STACKPROTECTOR)
-- if(HAVE_STACKPROTECTOR)
-+ if(HAVE_STACKPROTECTOR AND NOT BUILD_ENGINE_C)
- add_flag_append(CMAKE_C_FLAGS "-fstack-protector-all -fstack-protector")
- add_flag_append(CMAKE_CXX_FLAGS "-fstack-protector-all -fstack-protector")
- endif()
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 10c6876..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-0001-Fix-segfault-when-BUILD_ENGINE_C-ON-and-FONTS_DIR-is.patch
-disable-fstack-protector.patch
diff --git a/debian/rules b/debian/rules
index 4674860..2dac865 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,19 +5,12 @@
DEJAVU_DIRECTORY := $(shell dirname `readlink -f /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf`)
-ifeq ($(shell dpkg-query --status fpc |grep -o Package), Package)
- BUILD_ENGINE_C := NO
-else
- BUILD_ENGINE_C := YES
-endif
-
HEDGEWARS_OPTIONS= \
-DCMAKE_INSTALL_PREFIX=/usr/lib/hedgewars \
-DDATA_INSTALL_DIR=/usr/share/games/hedgewars \
-DCMAKE_BUILD_TYPE=RELEASE -DPHYSFS_SYSTEM=ON \
-DFONTS_DIRS='/usr/share/fonts/truetype/wqy;$(DEJAVU_DIRECTORY)' \
- -DNOVERSIONINFOUPDATE=1 \
- -DBUILD_ENGINE_C=$(BUILD_ENGINE_C)
+ -DNOVERSIONINFOUPDATE=1
override_dh_clean:
rm -rf tmp-icon
--
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