[hedgewars] 03/03: Update debian packaging
Gianfranco Costamagna
locutusofborg-guest at moszumanska.debian.org
Wed Dec 10 12:17:03 UTC 2014
This is an automated email from the git hooks/post-receive script.
locutusofborg-guest pushed a commit to annotated tag debian/0.9.20.5+git20141210-1
in repository hedgewars.
commit a530c50b4168a0818936ec5cd90afa4e0ce3af9b
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date: Fri Nov 28 19:35:02 2014 +0100
Update debian packaging
---
debian/changelog | 9 +
debian/clean | 2 +
debian/control | 9 +-
debian/copyright | 4 +
...t-when-BUILD_ENGINE_C-ON-and-FONTS_DIR-is.patch | 91 +++++++
...-Fixed-desktop-file-By-adding-an-xpm-icon.patch | 283 ---------------------
.../774cfec959227a52b9a54afa8b069277c2f7e656.patch | 21 --
.../b2d1b0d292c71b5a4266c9359280fa32a35ac56d.patch | 23 --
debian/patches/noversionupdate.patch | 41 ---
debian/patches/series | 7 +-
debian/patches/using_system_fonts.patch | 165 ------------
debian/patches/using_system_physfs.patch | 263 -------------------
debian/rules | 20 +-
13 files changed, 129 insertions(+), 809 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 11d6a62..d544fa1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+hedgewars (0.9.20.5+git20141210-1) experimental; urgency=medium
+
+ * New upstream release snapshot.
+ * Update copyright lua entry.
+ * Drop all debian patches, merged upstream.
+ * Use C engine where fpc is not available.
+
+ -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it> Wed, 10 Dec 2014 13:00:24 +0100
+
hedgewars (0.9.20.5-12) unstable; urgency=medium
* Fix experimental lintian warnings (copyright)
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..5ae2fb1
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,2 @@
+cmake_modules/checkModule.hi
+cmake_modules/checkModule.o
diff --git a/debian/control b/debian/control
index 3f95343..cd09107 100644
--- a/debian/control
+++ b/debian/control
@@ -5,10 +5,11 @@ 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: cmake,
+Build-Depends: clang [arm64 hurd-i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel ppc64el alpha hppa m68k powerpcspe sh4 x32],
+ cmake,
debhelper (>= 9),
dpkg-dev (>= 1.16.1~),
- fpc,
+ fpc [amd64 armel armhf i386 powerpc sparc ppc64],
freeglut3-dev,
ghc,
# convert function
@@ -17,13 +18,17 @@ Build-Depends: cmake,
libavformat-dev,
libghc-bytestring-show-dev,
libghc-dataenc-dev,
+ libghc-entropy-dev,
libghc-hslogger-dev,
libghc-mtl-dev,
libghc-network-dev,
libghc-parsec3-dev,
libghc-random-dev,
+ libghc-sha-dev,
libghc-utf8-string-dev,
libghc-vector-dev,
+ libghc-zlib-dev,
+ libglew-dev [arm64 hurd-i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel ppc64el alpha hppa m68k powerpcspe sh4 x32],
liblua5.1-dev,
# new dependency
libphysfs-dev,
diff --git a/debian/copyright b/debian/copyright
index 7b4cdfe..0616b8c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -245,6 +245,10 @@ Copyright:
written by Travis Wells, based on work from Ryan C. Gordon
License: zlib
+Files: misc/liblua/*
+Copyright: 1994-2008 Lua.org, PUC-Rio.
+License: MIT
+
Files: share/hedgewars/Data/Fonts/DroidSansFallback.ttf
Copyright: The Android Open Source Project
License: Apache-2.0
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
new file mode 100644
index 0000000..0047800
--- /dev/null
+++ b/debian/patches/0001-Fix-segfault-when-BUILD_ENGINE_C-ON-and-FONTS_DIR-is.patch
@@ -0,0 +1,91 @@
+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-Fixed-desktop-file-By-adding-an-xpm-icon.patch b/debian/patches/0001-Fixed-desktop-file-By-adding-an-xpm-icon.patch
deleted file mode 100644
index c8aaf37..0000000
--- a/debian/patches/0001-Fixed-desktop-file-By-adding-an-xpm-icon.patch
+++ /dev/null
@@ -1,283 +0,0 @@
-From 92cd3c66f4e5fee73070f2bdb6d872d0da89a53f Mon Sep 17 00:00:00 2001
-From: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
-Date: Fri, 24 Jan 2014 15:37:40 +0100
-Subject: [PATCH] Fixed desktop file By adding an xpm icon
-
----
- share/hedgewars/Data/misc/CMakeLists.txt | 1 +
- share/hedgewars/Data/misc/hedgewars.desktop | 1 +
- share/hedgewars/Data/misc/hedgewars.xpm | 239 ++++++++++++++++++++++++++++
- 3 files changed, 241 insertions(+)
- create mode 100644 share/hedgewars/Data/misc/hedgewars.xpm
-
-diff --git a/share/hedgewars/Data/misc/CMakeLists.txt b/share/hedgewars/Data/misc/CMakeLists.txt
-index 6b1aa41..afb360b 100644
---- a/share/hedgewars/Data/misc/CMakeLists.txt
-+++ b/share/hedgewars/Data/misc/CMakeLists.txt
-@@ -5,5 +5,6 @@ if(UNIX AND NOT APPLE)
- file(GLOB miscfiles *.xml *.desktop)
-
- install(FILES ${miscfiles} DESTINATION ${SHAREPATH}/Data/misc)
-+ install(FILES hedgewars.xpm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps)
- endif()
-
-diff --git a/share/hedgewars/Data/misc/hedgewars.desktop b/share/hedgewars/Data/misc/hedgewars.desktop
-index 47f4d0b..abd6bfb 100755
---- a/share/hedgewars/Data/misc/hedgewars.desktop
-+++ b/share/hedgewars/Data/misc/hedgewars.desktop
-@@ -2,6 +2,7 @@
- Type=Application
- Version=1.0
- Name=Hedgewars
-+Keywords=game;strategy;
- GenericName=Fighting Hedgehogs
- GenericName[de]=Kämpfende Igel
- GenericName[es]=Batallas entre erizos
-diff --git a/share/hedgewars/Data/misc/hedgewars.xpm b/share/hedgewars/Data/misc/hedgewars.xpm
-new file mode 100644
-index 0000000..c32d5f3
---- /dev/null
-+++ b/share/hedgewars/Data/misc/hedgewars.xpm
-@@ -0,0 +1,239 @@
-+/* XPM */
-+static char *Icon___x__x__[] = {
-+/* columns rows colors chars-per-pixel */
-+"32 32 201 2",
-+" c #010101",
-+". c #0A0709",
-+"X c #1A1A1A",
-+"o c #454545",
-+"O c #94005E",
-+"+ c #AE005D",
-+"@ c #970063",
-+"# c #9B0064",
-+"$ c #94066D",
-+"% c #9D036A",
-+"& c #9E086E",
-+"* c #880873",
-+"= c #960E74",
-+"- c #980D73",
-+"; c #8C1578",
-+": c #8C1A7D",
-+"> c #9D1075",
-+", c #9D177C",
-+"< c #91187D",
-+"1 c #9B1C7D",
-+"2 c #A20065",
-+"3 c #AA0067",
-+"4 c #A3046B",
-+"5 c #A0096F",
-+"6 c #A20C73",
-+"7 c #AD0B72",
-+"8 c #A41276",
-+"9 c #AD1074",
-+"0 c #A61479",
-+"q c #A81C7B",
-+"w c #7B2083",
-+"e c #772E8F",
-+"r c #7D2C8E",
-+"t c #732F91",
-+"y c #6B3596",
-+"u c #653B9B",
-+"i c #6D3A9B",
-+"p c #743294",
-+"a c #783092",
-+"s c #713899",
-+"d c #5641A1",
-+"f c #504BA9",
-+"g c #5A4EAD",
-+"h c #4D5AB6",
-+"j c #5652B0",
-+"k c #5058B5",
-+"l c #6444A3",
-+"z c #7C4CA8",
-+"x c #7654B2",
-+"c c #4363BF",
-+"v c #3D67C3",
-+"b c #3A69C5",
-+"n c #3C73CE",
-+"m c #2C77D1",
-+"M c #237CD6",
-+"N c #2C78D2",
-+"B c #2F7ED8",
-+"V c #3E7BD5",
-+"C c #5F71CC",
-+"Z c #6F6ECA",
-+"A c #627FD6",
-+"S c #6C7ED6",
-+"D c #617ED9",
-+"F c #6F7ED9",
-+"G c #881F82",
-+"H c #A11F83",
-+"J c #AC1D82",
-+"K c #872386",
-+"L c #8A2387",
-+"P c #8D2689",
-+"I c #8A2C8F",
-+"U c #952388",
-+"Y c #812F91",
-+"T c #873595",
-+"R c #8D3192",
-+"E c #8A3799",
-+"W c #84399A",
-+"Q c #AE2285",
-+"! c #A32488",
-+"~ c #A92D8D",
-+"^ c #B1258A",
-+"/ c #B32C8C",
-+"( c #BD298E",
-+") c #B5308E",
-+"_ c #B72E91",
-+"` c #BE2C91",
-+"' c #BA3495",
-+"] c #BA3895",
-+"[ c #BC3C9A",
-+"{ c #BF3BA0",
-+"} c #C32E93",
-+"| c #C23391",
-+" . c #CF3D9D",
-+".. c #C13DA2",
-+"X. c #CA3BA0",
-+"o. c #BE419C",
-+"O. c #8148A4",
-+"+. c #8152B0",
-+"@. c #C0439E",
-+"#. c #C345A3",
-+"$. c #C54EA5",
-+"%. c #CE4AA3",
-+"&. c #C645AA",
-+"*. c #C74EA9",
-+"=. c #C94AAE",
-+"-. c #D045AA",
-+";. c #D04BAF",
-+":. c #C750A8",
-+">. c #CC59AB",
-+",. c #CB4DB1",
-+"<. c #CC51B4",
-+"1. c #CD5AB0",
-+"2. c #D45CBF",
-+"3. c #D363BA",
-+"4. c #D65FC3",
-+"5. c #D769C0",
-+"6. c #DB6CC3",
-+"7. c #DE66C9",
-+"8. c #DE6BCE",
-+"9. c #DB74C5",
-+"0. c #DE76CB",
-+"q. c #DF6DD0",
-+"w. c #E068CC",
-+"e. c #EA7FCF",
-+"r. c #E06FD1",
-+"t. c #E274D5",
-+"y. c #E47BD6",
-+"u. c #E376D8",
-+"i. c #E479D9",
-+"p. c #E87FDE",
-+"a. c #1E83DC",
-+"s. c #2482DB",
-+"d. c #2B80DA",
-+"f. c #3682DC",
-+"g. c #1B8BE3",
-+"h. c #3187E0",
-+"j. c #3D8BE4",
-+"k. c #2790E8",
-+"l. c #3594EC",
-+"z. c #3D94EC",
-+"x. c #4C90EA",
-+"c. c #5494EB",
-+"v. c #469CF4",
-+"b. c #4C98F1",
-+"n. c #5A97F1",
-+"m. c #529AF2",
-+"M. c #5A9FF8",
-+"N. c #6B87E1",
-+"B. c #49A1F9",
-+"V. c #59A3F6",
-+"C. c #52A6FE",
-+"Z. c #5DA7FE",
-+"A. c #56AFFF",
-+"S. c #5CABFF",
-+"D. c #56B4FF",
-+"F. c #58B5FF",
-+"G. c #54BBFF",
-+"H. c #898989",
-+"J. c #8A918D",
-+"K. c #949394",
-+"L. c #9C9B9C",
-+"P. c #B5B4B5",
-+"I. c #E483D2",
-+"U. c #E789D6",
-+"Y. c #E781DA",
-+"T. c #E985DC",
-+"R. c #EA89DC",
-+"E. c #EC91DE",
-+"W. c #EE9BDA",
-+"Q. c #EC87E2",
-+"!. c #EC8CE2",
-+"~. c #EE93E1",
-+"^. c #F195E6",
-+"/. c #F29BE7",
-+"(. c #F49EE9",
-+"). c #F4A6E5",
-+"_. c #F5A2EB",
-+"`. c #F9A6EF",
-+"'. c #F6AAED",
-+"]. c #F5B2EC",
-+"[. c #F6A2F0",
-+"{. c #FAA6F1",
-+"}. c #FAAAF3",
-+"|. c #FBB7F5",
-+" X c #FEB1F8",
-+".X c #C8C7C8",
-+"XX c #CBCBCC",
-+"oX c #CDD1CF",
-+"OX c #F3D2EB",
-+"+X c #F7C6F0",
-+"@X c #F8C1F1",
-+"#X c #F8CAF2",
-+"$X c #FFD1FC",
-+"%X c #FDDBFB",
-+"&X c #F9E6F7",
-+"*X c #FDE5FA",
-+"=X c #FDEDFB",
-+"-X c #F3FCF5",
-+";X c #FCF3FA",
-+":X c #FEFEFE",
-+">X c None",
-+/* pixels */
-+">X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X",
-+">X>X>X>X>X>X>X>X>X>X>X= & >X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X",
-+">X>X>X>X>X>X>X>X>X>X>Xp v : >X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X",
-+">X>X>X>X>X>X>X>X>X>X>Xr k.f.u 4 >X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X",
-+">X>X>X>X>X>X>X>X>X>X>Xt z.Z.l.c : 3 >X>X>X>X>X>X>X>X>X>X>X>X>X>X",
-+">X>X>X>X>X>X>X>X>X>X>Xy l.Z.Z.B.h.l > >X>X>X>X>X>X>X>X>X>X>X>X>X",
-+">X>X>X>X4 >X>X>X>X>X>Xt j.Z.A.S.n.C f * % >X>X>X>X>X>X>X>X>X>X>X",
-+">X>X>X4 l g l i p r K : T P L R ~ ] [ ] ^ 8 O >X>X>X>X>X>X>X>X>X",
-+">X>X>X>Xs g.s.s.s.M M s.d 8 %.I.(._.{.`._.E.3.Q # >X>X>X>X>X>X>X",
-+">X>X>X>X4 D C.m.m.b.v.p ' E.}._.(././.(./._.`._.1.& >X>X>X>X>X>X",
-+">X>X>X>X>XT A.Z.D.D.W .}._././.(._.(.(././.^./.}.6.6 >X>X>X>X>X",
-+">X>X>X>X>X2 A D.N.W ( _._./.(.(.(.(.(./.'.+X at X_.].$X9.# >X>X>X>X",
-+">X>X>X>X>X>X1 E ; 7 i._.(.(.(.(.(._./.].:X:X:X;X:X:X:X$.>X>X>X>X",
-+">X>X>X>X4 < i b y -.!.(.(.(._.(.(.(./.*X:X:X:X:X:X:X-XOX6 >X>X>X",
-+">X>X6 r k m a.m ! 7.!._.(.(.(.(.(./._.:X:X:XL.P.:XH. XX>.>X>X>X",
-+">X* n a.M B z.C ( t.R._.(.(.(.(.(./.'.;X:X.X X :Xo J.W.# >X>X",
-+">X# a V v.V.G.z X.t.R._./._.(./.(.(.(.=X:X.X X :XK.. oX).% >X>X",
-+">X>X>X0 F G.S 2 ,.t.Y._./.(.(._.(._.^.#X:X:XK.P.:X:X-X=X~.8 >X>X",
-+">X>X>X>X4 x I w ,.u.y.(.(._.(.(._.(.(./.&X:X:X:X=X+X%X'.U.) ] >X",
-+">X>X>X>X>X+ h f .t.7.~.(./.(.(./.(.(.(._.#X&X*X|.{.3.U.U.] ^.q ",
-+">X>X>X>X>Xp g.h ` i.t.Q.}._./.(.(.(.(.(./.(.~.6.3. at .$.}.3.#. X) ",
-+">X>X>X>X: m d.c.! 7.,...3.E.`./.(._.(.(./._./.| @.r._.}.' 3.U.q ",
-+">X>X>X4 c M x.F.O.7 [ :.o.Q 3.{./.(.(._.(./._.{. X_._.R.^ r.J >X",
-+">X>X4 j g.z.F.V.U 6.}.}.}.E.Q 9.`./.(./.(.(.(././.).[.] 8 6 >X>X",
-+">X>X- l g Z N.x } [.(././.}.9._ (.(.(._._.(.(.(.^.^.,.% >X>X>X>X",
-+">X>X>X>X>X4 4 2 &.Q.(.(./._.T.Q t.y.R.~.~.~.Q.Q.Y.=.- >X>X>X>X>X",
-+">X>X>X>X>X>X>X>X^ u.R./.(.{.*.[ i.q.8.8.q.r.i.q.' & >X>X>X>X>X>X",
-+">X>X>X>X>X>X>X>X% _ 4.r.8.#.& ,.q.t.t.t.q.4.| J | 0 >X>X>X>X>X>X",
-+">X>X>X>X>X>X>X>X>X>X6 0 6 - &.' Q ^ ^ ^ Q / *.U. X[ >X>X>X>X>X>X",
-+">X>X>X>X>X>X>X>X>X>X>X>X>X6 q.!.~.I.U.*.] }.}._.}. at .>X>X>X>X>X>X",
-+">X>X>X>X>X>X>X>X>X>X>X>X>X>X' u.Q.^.~.Q &.Q.~.(.r.8 >X>X>X>X>X>X",
-+">X>X>X>X>X>X>X>X>X>X>X>X>X>X% ^ ,.&.J % 0 ..,...6 >X>X>X>X>X>X>X"
-+};
---
-1.8.3.2
-
diff --git a/debian/patches/774cfec959227a52b9a54afa8b069277c2f7e656.patch b/debian/patches/774cfec959227a52b9a54afa8b069277c2f7e656.patch
deleted file mode 100644
index eba1a10..0000000
--- a/debian/patches/774cfec959227a52b9a54afa8b069277c2f7e656.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 774cfec959227a52b9a54afa8b069277c2f7e656 Mon Sep 17 00:00:00 2001
-From: sheepluva <sheepyluva at gmail.com>
-Date: Fri, 15 Aug 2014 08:23:15 +0200
-Subject: [PATCH] part of patch in issue 803 (ty) - this hopefully should fix
- issues with cmake Makefiles trying to run "Qt4::lrelease" in the shell
-
----
- share/hedgewars/Data/Locale/CMakeLists.txt | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/share/hedgewars/Data/Locale/CMakeLists.txt b/share/hedgewars/Data/Locale/CMakeLists.txt
-index 6075ecb..3e0dada 100644
---- a/share/hedgewars/Data/Locale/CMakeLists.txt
-+++ b/share/hedgewars/Data/Locale/CMakeLists.txt
-@@ -1,3 +1,6 @@
-+find_package(Qt4 REQUIRED)
-+include(${QT_USE_FILE})
-+
- file(GLOB txttrans2 ??.txt)
- file(GLOB txttrans5 ?????.txt)
- file(GLOB tsfiles *.ts)
diff --git a/debian/patches/b2d1b0d292c71b5a4266c9359280fa32a35ac56d.patch b/debian/patches/b2d1b0d292c71b5a4266c9359280fa32a35ac56d.patch
deleted file mode 100644
index 60e7669..0000000
--- a/debian/patches/b2d1b0d292c71b5a4266c9359280fa32a35ac56d.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From b2d1b0d292c71b5a4266c9359280fa32a35ac56d Mon Sep 17 00:00:00 2001
-From: sheepluva <sheepyluva at gmail.com>
-Date: Wed, 13 Aug 2014 15:16:33 +0200
-Subject: [PATCH] this should fix the cmake 3.0 issue. thanks to Spacey for
- reporting
-
----
- tools/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
-index b55f09c..3da80ab 100644
---- a/tools/CMakeLists.txt
-+++ b/tools/CMakeLists.txt
-@@ -57,7 +57,7 @@ if(APPLE)
-
- #create the .dmg for deployment
- #first make sure .app exists, then remove any old .dmg with same name, finally run the script
-- add_custom_target(dmg COMMAND if [ ! -a Hedgewars.app ]; then make install\; fi;
-+ add_custom_target(dmg COMMAND "if [ ! -a Hedgewars.app ]; then make install\; fi;"
- COMMAND rm -f ${CMAKE_BINARY_DIR}/Hedgewars-${HEDGEWARS_VERSION}.dmg
- COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/create-dmg.sh
- --volname "Hedgewars ${HEDGEWARS_VERSION}"
diff --git a/debian/patches/noversionupdate.patch b/debian/patches/noversionupdate.patch
deleted file mode 100644
index 84332b6..0000000
--- a/debian/patches/noversionupdate.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-# HG changeset patch
-# User sheepluva
-# Date 1390210859 -3600
-# Mon Jan 20 10:40:59 2014 +0100
-# Node ID ec966363adbeeb83a3ec56ad221f8a39126a7902
-# Parent 7d21f52f04528049f483827b413ff9b76236f2c8
-new cmake option NOVERSIONINFOUPDATE -- to be used if source is in a git/repo that is NOT the hedgewars repo
-
-diff -r 7d21f52f0452 -r ec966363adbe CMakeLists.txt
---- a/CMakeLists.txt Mon Jan 20 10:16:29 2014 +0100
-+++ b/CMakeLists.txt Mon Jan 20 10:40:59 2014 +0100
-@@ -38,6 +38,8 @@
- set(DATA_INSTALL_DIR "share/hedgewars" CACHE STRING "Resource folder path")
- endif()
-
-+option(NOVERSIONINFOUPDATE "Disable update of version_info.txt. To be used if source is in a git/repo that is NOT the hedgewars repo" OFF)
-+
- #system paths for finding required fonts (see share/hedgewars/Data/fonts)
- #subdirectories will NOT be searched.
- #all fonts that can't be found will be bundled with hedgewars
-diff -r 7d21f52f0452 -r ec966363adbe cmake_modules/revinfo.cmake
---- a/cmake_modules/revinfo.cmake Mon Jan 20 10:16:29 2014 +0100
-+++ b/cmake_modules/revinfo.cmake Mon Jan 20 10:40:59 2014 +0100
-@@ -1,7 +1,7 @@
- #detect Mercurial revision and init rev/hash information
- find_program(HGCOMMAND hg)
- find_program(GITCOMMAND git)
--if(EXISTS ${CMAKE_SOURCE_DIR}/.hg AND HGCOMMAND)
-+if(EXISTS ${CMAKE_SOURCE_DIR}/.hg AND HGCOMMAND AND NOT NOVERSIONINFOUPDATE)
- execute_process(COMMAND ${HGCOMMAND} identify -in
- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
- OUTPUT_VARIABLE internal_version
-@@ -21,7 +21,7 @@
-
- #write down hash and rev for easy picking should hg be missing
- file(WRITE "${CMAKE_SOURCE_DIR}/share/version_info.txt" "Hedgewars versioning information, do not modify\nrev ${HEDGEWARS_REVISION}\nhash ${HEDGEWARS_HASH}\n")
--elseif(EXISTS ${CMAKE_SOURCE_DIR}/.git AND GITCOMMAND)
-+elseif(EXISTS ${CMAKE_SOURCE_DIR}/.git AND GITCOMMAND AND NOT NOVERSIONINFOUPDATE)
- execute_process(COMMAND ${GITCOMMAND} rev-parse --short HEAD
- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
- OUTPUT_VARIABLE HEDGEWARS_HASH
diff --git a/debian/patches/series b/debian/patches/series
index ce5f595..0ba91bd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1 @@
-using_system_physfs.patch
-using_system_fonts.patch
-noversionupdate.patch
-0001-Fixed-desktop-file-By-adding-an-xpm-icon.patch
-b2d1b0d292c71b5a4266c9359280fa32a35ac56d.patch
-774cfec959227a52b9a54afa8b069277c2f7e656.patch
+0001-Fix-segfault-when-BUILD_ENGINE_C-ON-and-FONTS_DIR-is.patch
diff --git a/debian/patches/using_system_fonts.patch b/debian/patches/using_system_fonts.patch
deleted file mode 100644
index d218444..0000000
--- a/debian/patches/using_system_fonts.patch
+++ /dev/null
@@ -1,165 +0,0 @@
-# HG changeset patch
-# User sheepluva
-# Date 1390062751 -3600
-# Sat Jan 18 17:32:31 2014 +0100
-# Branch 0.9.20
-# Node ID ab94889bd185654aac3a587c162ed5e4ce90445c
-# Parent f74ae7ee358599195c8e646f1f8e8652d0d38a24
-Description:
-backport of system fonts inclusion patches
-
-diff -r f74ae7ee3585 -r ab94889bd185 CMakeLists.txt
---- a/CMakeLists.txt Sat Jan 18 16:55:50 2014 +0100
-+++ b/CMakeLists.txt Sat Jan 18 17:32:31 2014 +0100
-@@ -38,6 +38,10 @@
- set(DATA_INSTALL_DIR "share/hedgewars" CACHE STRING "Resource folder path")
- endif()
-
-+#system paths for finding required fonts (see share/hedgewars/Data/fonts)
-+#subdirectories will NOT be searched.
-+#all fonts that can't be found will be bundled with hedgewars
-+set(FONTS_DIRS "" CACHE STRING "Additional paths to folders where required fonts can be found ( ; is separator)")
-
- #versioning
- set(CPACK_PACKAGE_VERSION_MAJOR 0)
-diff -r f74ae7ee3585 -r ab94889bd185 hedgewars/CMakeLists.txt
---- a/hedgewars/CMakeLists.txt Sat Jan 18 16:55:50 2014 +0100
-+++ b/hedgewars/CMakeLists.txt Sat Jan 18 17:32:31 2014 +0100
-@@ -23,6 +23,17 @@
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.inc.in ${CMAKE_CURRENT_BINARY_DIR}/config.inc)
- include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
-+# 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")
-+
-+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.inc.in ${CMAKE_CURRENT_BINARY_DIR}/config.inc)
-+include_directories(${CMAKE_CURRENT_BINARY_DIR})
-+
-
- #set the sources with the correct order of dependencies so that cmake won't be confused
- set(engine_sources
-diff -r f74ae7ee3585 -r ab94889bd185 hedgewars/config.inc.in
---- a/hedgewars/config.inc.in Sat Jan 18 16:55:50 2014 +0100
-+++ b/hedgewars/config.inc.in Sat Jan 18 17:32:31 2014 +0100
-@@ -26,3 +26,4 @@
- cRevisionString = '${HEDGEWARS_REVISION}';
- cHashString = '${HEDGEWARS_HASH}';
- cDefaultPathPrefix = '${HEDGEWARS_FULL_DATADIR}/Data';
-+ cFontsPaths: ${FONTS_DIRS_ARRAY}
-diff -r f74ae7ee3585 -r ab94889bd185 hedgewars/uPhysFSLayer.pas
---- a/hedgewars/uPhysFSLayer.pas Sat Jan 18 16:55:50 2014 +0100
-+++ b/hedgewars/uPhysFSLayer.pas Sat Jan 18 17:32:31 2014 +0100
-@@ -3,6 +3,8 @@
- interface
- uses SDLh, LuaPas;
-
-+{$INCLUDE "config.inc"}
-+
- const PhysfsLibName = {$IFDEF PHYSFS_INTERNAL}'libhwphysfs'{$ELSE}'libphysfs'{$ENDIF};
- const PhyslayerLibName = 'libphyslayer';
-
-@@ -41,12 +43,13 @@
- function PHYSFSRWOPS_openRead(fname: PChar): PSDL_RWops; cdecl ; external PhyslayerLibName;
- function PHYSFSRWOPS_openWrite(fname: PChar): PSDL_RWops; cdecl; external PhyslayerLibName;
-
--function PHYSFS_mount(newDir, mountPoint: PChar; appendToPath: LongBool) : LongInt; cdecl; external PhysfsLibName;
-+function PHYSFS_mount(newDir, mountPoint: PChar; appendToPath: LongBool) : LongBool; cdecl; external PhysfsLibName;
- function PHYSFS_openRead(fname: PChar): PFSFile; cdecl; external PhysfsLibName;
- function PHYSFS_eof(f: PFSFile): LongBool; cdecl; external PhysfsLibName;
- function PHYSFS_readBytes(f: PFSFile; buffer: pointer; len: Int64): Int64; cdecl; external PhysfsLibName;
- function PHYSFS_close(f: PFSFile): LongBool; cdecl; external PhysfsLibName;
- function PHYSFS_exists(fname: PChar): LongBool; cdecl; external PhysfsLibName;
-+function PHYSFS_getLastError(): PChar; cdecl; external PhysfsLibName;
-
- procedure hedgewarsMountPackages(); cdecl; external PhyslayerLibName;
-
-@@ -127,9 +130,23 @@
- pfsBlockRead:= r
- end;
-
-+procedure pfsMount(path: AnsiString; mountpoint: PChar);
-+begin
-+ if PHYSFS_mount(Str2PChar(path), mountpoint, false) then
-+ AddFileLog('[PhysFS] mount ' + path + ' at ' + mountpoint + ' : ok')
-+ else
-+ AddFileLog('[PhysFS] mount ' + path + ' at ' + mountpoint + ' : FAILED ("' + PHYSFS_getLastError() + '")');
-+end;
-+
-+procedure pfsMountAtRoot(path: AnsiString);
-+begin
-+ pfsMount(path, '/');
-+end;
-+
- procedure initModule;
- var i: LongInt;
- cPhysfsId: shortstring;
-+ fp: PChar;
- begin
- {$IFDEF HWLIBRARY}
- //TODO: http://icculus.org/pipermail/physfs/2011-August/001006.html
-@@ -141,16 +158,21 @@
- i:= PHYSFS_init(Str2PChar(cPhysfsId));
- AddFileLog('[PhysFS] init: ' + inttostr(i));
-
-- i:= PHYSFS_mount(Str2PChar(PathPrefix), nil, false);
-- AddFileLog('[PhysFS] mount ' + PathPrefix + ': ' + inttostr(i));
-- i:= PHYSFS_mount(Str2PChar(UserPathPrefix + '/Data'), nil, false);
-- AddFileLog('[PhysFS] mount ' + UserPathPrefix + '/Data: ' + inttostr(i));
-+ // mount system fonts paths first
-+ for i:= low(cFontsPaths) to high(cFontsPaths) do
-+ begin
-+ fp := cFontsPaths[i];
-+ if fp <> nil then
-+ pfsMount(fp, '/Fonts');
-+ end;
-+
-+ pfsMountAtRoot(PathPrefix);
-+ pfsMountAtRoot(UserPathPrefix + '/Data');
-
- hedgewarsMountPackages;
-
-- i:= PHYSFS_mount(Str2PChar(UserPathPrefix), nil, false);
- // need access to teams and frontend configs (for bindings)
-- AddFileLog('[PhysFS] mount ' + UserPathPrefix + ': ' + inttostr(i));
-+ pfsMountAtRoot(UserPathPrefix);
- end;
-
- procedure freeModule;
-diff -r f74ae7ee3585 -r ab94889bd185 share/hedgewars/Data/Fonts/CMakeLists.txt
---- a/share/hedgewars/Data/Fonts/CMakeLists.txt Sat Jan 18 16:55:50 2014 +0100
-+++ b/share/hedgewars/Data/Fonts/CMakeLists.txt Sat Jan 18 17:32:31 2014 +0100
-@@ -1,4 +1,26 @@
--install(FILES
-+set(FONTFILES
- DejaVuSans-Bold.ttf
-- wqy-zenhei.ttc
-- DESTINATION ${SHAREPATH}Data/Fonts)
-+ wqy-zenhei.ttc)
-+
-+if (FONTS_DIRS)
-+ foreach(fontfile ${FONTFILES})
-+ set(missing 1)
-+ foreach(fontdir ${FONTS_DIRS})
-+ if (EXISTS "${fontdir}/${fontfile}")
-+ message(STATUS "Fonts: Found ${fontfile} in ${fontdir}")
-+ set(missing 0)
-+ break()
-+ endif()
-+ endforeach(fontdir)
-+ if(missing)
-+ set(MISSINGFONTFILES ${MISSINGFONTFILES} ${fontfile})
-+ message(STATUS "Fonts: Could not find ${fontfile}, it will be installed")
-+ endif()
-+ endforeach(fontfile)
-+else()
-+ set(MISSINGFONTFILES ${FONTFILES})
-+endif()
-+
-+if (MISSINGFONTFILES)
-+ install(FILES ${MISSINGFONTFILES} DESTINATION ${SHAREPATH}Data/Fonts)
-+endif()
diff --git a/debian/patches/using_system_physfs.patch b/debian/patches/using_system_physfs.patch
deleted file mode 100644
index de07633..0000000
--- a/debian/patches/using_system_physfs.patch
+++ /dev/null
@@ -1,263 +0,0 @@
-# HG changeset patch
-# User sheepluva
-# Date 1390060550 -3600
-# Sat Jan 18 16:55:50 2014 +0100
-# Branch 0.9.20
-# Node ID f74ae7ee358599195c8e646f1f8e8652d0d38a24
-# Parent 9d79a52c5586b3f2350c3d9dea6b9906b011c3ab
-Description:
-backport of PhysicsFS 2.0 compatibility patches
-
-diff -r 9d79a52c5586 -r f74ae7ee3585 CMakeLists.txt
---- a/CMakeLists.txt Sat Jan 04 02:36:55 2014 +0100
-+++ b/CMakeLists.txt Sat Jan 18 16:55:50 2014 +0100
-@@ -18,12 +18,12 @@
-
- #libraries are built shared unless explicitly added as a static
- option(BUILD_SHARED_LIBS "Build libraries as shared modules (on)" ON)
--#set this to ON when 2.1.0 becomes more widespread (and only for linux)
--option(PHYSFS_SYSTEM "Use system physfs (off)" OFF)
-
- if(WIN32 OR APPLE)
-+ option(PHYSFS_SYSTEM "Use system physfs (off)" OFF)
- option(LUA_SYSTEM "Use system lua (off)" OFF)
- else()
-+ option(PHYSFS_SYSTEM "Use system physfs (on)" ON)
- option(LUA_SYSTEM "Use system lua (on)" ON)
- endif()
-
-@@ -152,8 +152,9 @@
- string(REGEX MATCH "([0-9]+)" physfs_patchversion "${physfs_patchversion}")
- set(physfs_detected_ver "${physfs_majorversion}.${physfs_minorversion}.${physfs_patchversion}")
-
-- if (physfs_detected_ver VERSION_LESS "2.1.0")
-- message(FATAL_ERROR "PhysFS version is too old (dected ${physfs_detected_ver}, required 2.1.0)")
-+ if (physfs_detected_ver VERSION_LESS "2.0.0")
-+ message(FATAL_ERROR "PhysFS version is too old (detected ${physfs_detected_ver}, required 2.0.0)\n"
-+ "Perform an update or rerun cmake with -DPHYSFS_SYSTEM=off to build the internal version")
- set(physfs_too_old true)
- endif()
- endif()
-diff -r 9d79a52c5586 -r f74ae7ee3585 INSTALL
---- a/INSTALL Sat Jan 04 02:36:55 2014 +0100
-+++ b/INSTALL Sat Jan 18 16:55:50 2014 +0100
-@@ -8,7 +8,7 @@
- - SDL_image >= 1.2
- - SDL_ttf >= 2.0
- - Lua >= 5.1.0
-- - Physfs >= 2.1.0
-+ - Physfs >= 2.0.0
- For server:
- - Glasgow Haskell Compiler >= 6.10
- - bytestring-show package
-diff -r 9d79a52c5586 -r f74ae7ee3585 hedgewars/CMakeLists.txt
---- a/hedgewars/CMakeLists.txt Sat Jan 04 02:36:55 2014 +0100
-+++ b/hedgewars/CMakeLists.txt Sat Jan 18 16:55:50 2014 +0100
-@@ -141,7 +141,7 @@
- add_flag_append(CMAKE_Pascal_FLAGS "-XLAlua=${lua_output_name}")
- endif()
-
--if(PHYSFS_FOUND)
-+if(PHYSFS_SYSTEM)
- get_filename_component(PHYSFS_LIBRARY_DIR ${PHYSFS_LIBRARY} PATH)
- add_flag_append(CMAKE_Pascal_FLAGS "-Fl${PHYSFS_LIBRARY}")
- else()
-diff -r 9d79a52c5586 -r f74ae7ee3585 misc/libphyslayer/CMakeLists.txt
---- a/misc/libphyslayer/CMakeLists.txt Sat Jan 04 02:36:55 2014 +0100
-+++ b/misc/libphyslayer/CMakeLists.txt Sat Jan 18 16:55:50 2014 +0100
-@@ -7,6 +7,7 @@
- ## extra functions needed by Hedgewars
- ## TODO: maybe it's better to have them in a separate library?
- set(PHYSLAYER_SRCS
-+ physfscompat.c
- physfsrwops.c
- physfslualoader.c
- hwpacksmounter.c
-diff -r 9d79a52c5586 -r f74ae7ee3585 misc/libphyslayer/hwpacksmounter.h
---- a/misc/libphyslayer/hwpacksmounter.h Sat Jan 04 02:36:55 2014 +0100
-+++ b/misc/libphyslayer/hwpacksmounter.h Sat Jan 18 16:55:50 2014 +0100
-@@ -3,6 +3,8 @@
-
- #include "physfs.h"
-
-+#include "physfscompat.h"
-+
- #ifdef __cplusplus
- extern "C" {
- #endif
-diff -r 9d79a52c5586 -r f74ae7ee3585 misc/libphyslayer/physfscompat.c
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/misc/libphyslayer/physfscompat.c Sat Jan 18 16:55:50 2014 +0100
-@@ -0,0 +1,73 @@
-+/*
-+ * Hedgewars, a free turn based strategy game
-+ * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr at gmail.com>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; version 2 of the License
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-+ */
-+
-+#include "physfscompat.h"
-+
-+#ifdef HW_PHYSFS_COMPAT
-+
-+PHYSFS_DECL int PHYSFS_stat(const char *fname, PHYSFS_Stat *stat)
-+{
-+ PHYSFS_File * handle;
-+
-+ if (PHYSFS_exists(fname))
-+ {
-+ handle = PHYSFS_openRead(fname);
-+ if (handle)
-+ {
-+ stat->filesize = PHYSFS_fileLength(handle);
-+ PHYSFS_close(handle);
-+ handle = 0;
-+ }
-+ else
-+ stat->filesize = -1;
-+
-+ stat->modtime = PHYSFS_getLastModTime(fname);
-+ stat->createtime = -1;
-+ stat->accesstime = -1;
-+
-+ if (PHYSFS_isSymbolicLink(fname))
-+ stat->filetype = PHYSFS_FILETYPE_SYMLINK;
-+ else if (PHYSFS_isDirectory(fname))
-+ stat->filetype = PHYSFS_FILETYPE_DIRECTORY;
-+ else stat->filetype = PHYSFS_FILETYPE_REGULAR;
-+
-+ stat->readonly = 0; /* not supported */
-+
-+ /* success */
-+ return 1;
-+ }
-+
-+ /* does not exist, can't stat */
-+ return 0;
-+}
-+
-+PHYSFS_DECL PHYSFS_sint64 PHYSFS_readBytes(PHYSFS_File *handle, void *buffer,
-+ PHYSFS_uint64 len)
-+{
-+ return PHYSFS_read(handle, buffer, 1, len);
-+}
-+
-+
-+PHYSFS_DECL PHYSFS_sint64 PHYSFS_writeBytes(PHYSFS_File *handle,
-+ const void *buffer,
-+ PHYSFS_uint64 len)
-+{
-+ return PHYSFS_write(handle, buffer, 1, len);
-+}
-+
-+#endif /* HW_PHYSFS_COMPAT */
-diff -r 9d79a52c5586 -r f74ae7ee3585 misc/libphyslayer/physfscompat.h
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/misc/libphyslayer/physfscompat.h Sat Jan 18 16:55:50 2014 +0100
-@@ -0,0 +1,71 @@
-+/*
-+ * Hedgewars, a free turn based strategy game
-+ * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr at gmail.com>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; version 2 of the License
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-+ */
-+
-+#ifndef _HEDGEWARS_PHYSFSCOMPAT_C_
-+#define _HEDGEWARS_PHYSFSCOMPAT_C_
-+
-+#include "physfs.h"
-+
-+#if PHYSFS_VER_MAJOR == 2
-+#if PHYSFS_VER_MINOR == 0
-+
-+#define HW_PHYSFS_COMPAT
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+#define PHYSFS_DECL __EXPORT__
-+
-+typedef enum PHYSFS_FileType
-+{
-+ PHYSFS_FILETYPE_REGULAR,
-+ PHYSFS_FILETYPE_DIRECTORY,
-+ PHYSFS_FILETYPE_SYMLINK,
-+ PHYSFS_FILETYPE_OTHER
-+} PHYSFS_FileType;
-+
-+typedef struct PHYSFS_Stat
-+{
-+ PHYSFS_sint64 filesize;
-+ PHYSFS_sint64 modtime;
-+ PHYSFS_sint64 createtime;
-+ PHYSFS_sint64 accesstime;
-+ PHYSFS_FileType filetype;
-+ int readonly;
-+} PHYSFS_Stat;
-+
-+PHYSFS_DECL int PHYSFS_stat(const char *fname, PHYSFS_Stat *stat);
-+
-+PHYSFS_DECL PHYSFS_sint64 PHYSFS_readBytes(PHYSFS_File *handle, void *buffer,
-+ PHYSFS_uint64 len);
-+
-+
-+PHYSFS_DECL PHYSFS_sint64 PHYSFS_writeBytes(PHYSFS_File *handle,
-+ const void *buffer,
-+ PHYSFS_uint64 len);
-+
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif /* PHYSFS_VER_MAJOR == 2 */
-+#endif /* PHYSFS_VER_MINOR == 0 */
-+
-+#endif /* _HEDGEWARS_PHYSFSCOMPAT_C_ */
-diff -r 9d79a52c5586 -r f74ae7ee3585 misc/libphyslayer/physfslualoader.c
---- a/misc/libphyslayer/physfslualoader.c Sat Jan 04 02:36:55 2014 +0100
-+++ b/misc/libphyslayer/physfslualoader.c Sat Jan 18 16:55:50 2014 +0100
-@@ -1,6 +1,8 @@
- #include "lua.h"
- #include "physfs.h"
-
-+#include "physfscompat.h"
-+
- #define BUFSIZE 1024
-
- void *physfsReaderBuffer;
-diff -r 9d79a52c5586 -r f74ae7ee3585 misc/libphyslayer/physfsrwops.h
---- a/misc/libphyslayer/physfsrwops.h Sat Jan 04 02:36:55 2014 +0100
-+++ b/misc/libphyslayer/physfsrwops.h Sat Jan 18 16:55:50 2014 +0100
-@@ -26,6 +26,8 @@
- #include "physfs.h"
- #include "SDL.h"
-
-+#include "physfscompat.h"
-+
- #ifdef __cplusplus
- extern "C" {
- #endif
diff --git a/debian/rules b/debian/rules
index 320c8d4..4674860 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,20 @@
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)
+
override_dh_clean:
rm -rf tmp-icon
dh_clean
@@ -23,8 +37,4 @@ override_dh_auto_configure:
mkdir -p tmp-icon/$$dirname/apps; \
convert $$icon tmp-icon/$$dirname/apps/$$basename.png; \
done
- dh_auto_configure -- -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
+ dh_auto_configure -- $(HEDGEWARS_OPTIONS)
--
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