r15929 - in packages/trunk/0ad/debian: . patches

[Vincent Cheng]

Author: vcheng
Date: 2016-11-13 01:08:33 +0000 (Sun, 13 Nov 2016)
New Revision: 15929

Removed:
   packages/trunk/0ad/debian/patches/fix-gcc6-segfault.patch
Modified:
   packages/trunk/0ad/debian/changelog
   packages/trunk/0ad/debian/control
   packages/trunk/0ad/debian/install
   packages/trunk/0ad/debian/patches/enable-hardening-relro.patch
   packages/trunk/0ad/debian/patches/series
   packages/trunk/0ad/debian/rules
Log:
0ad: remove obsolete patch, refresh patches, add appdata file, and partially sync with ubuntu PPA package


Modified: packages/trunk/0ad/debian/changelog
===================================================================
--- packages/trunk/0ad/debian/changelog	2016-11-13 00:53:11 UTC (rev 15928)
+++ packages/trunk/0ad/debian/changelog	2016-11-13 01:08:33 UTC (rev 15929)
@@ -1,6 +1,8 @@
 0ad (0.0.21-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+    - Drop debian/patches/fix-gcc6-segfault.patch, obsolete.
+    - Refresh remaining patches.
 
  -- Vincent Cheng <vcheng at debian.org>  Sat, 12 Nov 2016 16:46:11 -0800
 

Modified: packages/trunk/0ad/debian/control
===================================================================
--- packages/trunk/0ad/debian/control	2016-11-13 00:53:11 UTC (rev 15928)
+++ packages/trunk/0ad/debian/control	2016-11-13 01:08:33 UTC (rev 15929)
@@ -26,6 +26,7 @@
  libxml2-dev,
  pkg-config,
  python,
+ python3,
  zlib1g-dev
 Standards-Version: 3.9.8
 Homepage: http://play0ad.com/

Modified: packages/trunk/0ad/debian/install
===================================================================
--- packages/trunk/0ad/debian/install	2016-11-13 00:53:11 UTC (rev 15928)
+++ packages/trunk/0ad/debian/install	2016-11-13 01:08:33 UTC (rev 15929)
@@ -4,6 +4,7 @@
 binaries/system/libmozjs31-ps-release.so        usr/lib/games/0ad/
 binaries/system/ActorEditor                     usr/lib/games/0ad/
 binaries/system/pyrogenesis                     usr/games/
+build/resources/0ad.appdata.xml                 usr/share/appdata/
 build/resources/0ad.desktop                     usr/share/applications/
 build/resources/0ad.png                         usr/share/pixmaps/
 usr/games/0ad

Modified: packages/trunk/0ad/debian/patches/enable-hardening-relro.patch
===================================================================
--- packages/trunk/0ad/debian/patches/enable-hardening-relro.patch	2016-11-13 00:53:11 UTC (rev 15928)
+++ packages/trunk/0ad/debian/patches/enable-hardening-relro.patch	2016-11-13 01:08:33 UTC (rev 15929)
@@ -3,14 +3,14 @@
  "hardening-no-relro".
 Forwarded: http://trac.wildfiregames.com/ticket/1416
 Author: Vincent Cheng <vcheng at debian.org>
-Last-Update: 2013-09-05
+Last-Update: 2016-11-12
 
 --- a/build/premake/premake4.lua
 +++ b/build/premake/premake4.lua
-@@ -281,7 +281,7 @@
- 				end
+@@ -283,7 +283,7 @@
  
  				if os.is("linux") or os.is("bsd") then
+ 					buildoptions { "-fPIC" }
 -					linkoptions { "-Wl,--no-undefined", "-Wl,--as-needed" }
 +					linkoptions { "-Wl,--no-undefined", "-Wl,--as-needed", "-Wl,-z,relro" }
  				end

Deleted: packages/trunk/0ad/debian/patches/fix-gcc6-segfault.patch
===================================================================
--- packages/trunk/0ad/debian/patches/fix-gcc6-segfault.patch	2016-11-13 00:53:11 UTC (rev 15928)
+++ packages/trunk/0ad/debian/patches/fix-gcc6-segfault.patch	2016-11-13 01:08:33 UTC (rev 15929)
@@ -1,32 +0,0 @@
-Description: Fix segfault due to spidermonkey GC bug when built with gcc 6
-Bug: http://trac.wildfiregames.com/ticket/4053 (based off of  tmpfixgcsegfault3.patch)
-Last-Update: 2016-09-07
-
---- a/libraries/source/spidermonkey/FixGCSegfault.diff
-+++ b/libraries/source/spidermonkey/FixGCSegfault.diff
-@@ -0,0 +1,16 @@
-+diff --git a/js/src/configure b/js/src/configure
-+--- a/js/src/configure
-++++ b/js/src/configure
-+@@ -8776,11 +8776,11 @@ if test "$GNU_CC"; then
-+     if test -z "$DEVELOPER_OPTIONS"; then
-+         CFLAGS="$CFLAGS -ffunction-sections -fdata-sections"
-+         CXXFLAGS="$CXXFLAGS -ffunction-sections -fdata-sections"
-+     fi
-+     CFLAGS="$CFLAGS -fno-math-errno"
-+-    CXXFLAGS="$CXXFLAGS -fno-exceptions -fno-math-errno"
-++    CXXFLAGS="$CXXFLAGS -fno-exceptions -fno-math-errno -fno-delete-null-pointer-checks"
-+ fi
-+ 
-+ 
-+ # Check whether --enable-icf or --disable-icf was given.
-+ if test "${enable_icf+set}" = set; then
---- a/libraries/source/spidermonkey/patch.sh
-+++ b/libraries/source/spidermonkey/patch.sh
-@@ -23,3 +23,6 @@
- 
- # Fix debug build failure on platforms with Ion disabled (eg AArch64)
- patch -p1 -i ../FixBug1037470.diff
-+
-+# Temporary fix for segfault occurring in the GC when built with GCC 6
-+patch -p1 -i ../FixGCSegfault.diff

Modified: packages/trunk/0ad/debian/patches/series
===================================================================
--- packages/trunk/0ad/debian/patches/series	2016-11-13 00:53:11 UTC (rev 15928)
+++ packages/trunk/0ad/debian/patches/series	2016-11-13 01:08:33 UTC (rev 15929)
@@ -1,4 +1,3 @@
 enable-hardening-relro.patch
 allow-build-with-root.patch
 fix-bindir.patch
-fix-gcc6-segfault.patch

Modified: packages/trunk/0ad/debian/rules
===================================================================
--- packages/trunk/0ad/debian/rules	2016-11-13 00:53:11 UTC (rev 15928)
+++ packages/trunk/0ad/debian/rules	2016-11-13 01:08:33 UTC (rev 15929)
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+include /usr/share/dpkg/architecture.mk
+
 ifeq ($(findstring parallel=,$(DEB_BUILD_OPTIONS)),)
 	export DEB_BUILD_OPTIONS+=parallel=$(shell getconf _NPROCESSORS_ONLN)
 endif