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

[Vincent Cheng]

Author: vcheng
Date: 2014-10-14 03:13:28 +0000 (Tue, 14 Oct 2014)
New Revision: 15290

Removed:
   packages/trunk/0ad/debian/patches/fix_gcc4.9_ftbfs.patch
   packages/trunk/0ad/debian/patches/support_miniupnpc_1.9.patch
Modified:
   packages/trunk/0ad/debian/changelog
   packages/trunk/0ad/debian/patches/series
Log:
0ad: drop patches applied upstream


Modified: packages/trunk/0ad/debian/changelog
===================================================================
--- packages/trunk/0ad/debian/changelog	2014-10-14 03:10:37 UTC (rev 15289)
+++ packages/trunk/0ad/debian/changelog	2014-10-14 03:13:28 UTC (rev 15290)
@@ -1,6 +1,8 @@
 0ad (0.0.17-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+    - Drop debian/patches/{support_miniupnpc_1.9.patch,fix_gcc4.9_ftbfs.patch}:
+      applied upstream.
   * Update Standards version to 3.9.6, no changes required.
 
  -- Vincent Cheng <vcheng at debian.org>  Mon, 13 Oct 2014 20:01:57 -0700

Deleted: packages/trunk/0ad/debian/patches/fix_gcc4.9_ftbfs.patch
===================================================================
--- packages/trunk/0ad/debian/patches/fix_gcc4.9_ftbfs.patch	2014-10-14 03:10:37 UTC (rev 15289)
+++ packages/trunk/0ad/debian/patches/fix_gcc4.9_ftbfs.patch	2014-10-14 03:13:28 UTC (rev 15290)
@@ -1,49 +0,0 @@
-Description: Fix FTBFS when running the test suite when built with gcc 4.9.
-Origin: upstream, http://trac.wildfiregames.com/changeset/15334
-Bug: http://trac.wildfiregames.com/ticket/2481
-Bug-Debian: https://bugs.debian.org/746822
-Last-Update: 2014-06-24
-
---- a/source/lib/allocators/headerless.cpp
-+++ b/source/lib/allocators/headerless.cpp
-@@ -54,12 +54,14 @@
- 	{
- 	}
- 
--	FreedBlock(uintptr_t id, size_t size)
--		:  m_magic(s_magic), m_size(size), m_id(id)
-+	void Setup(uintptr_t id, size_t size)
- 	{
-+		m_magic = s_magic;
-+		m_size = size;
-+		m_id = id;
- 	}
- 
--	~FreedBlock()
-+	void Reset()
- 	{
- 		// clear all fields to prevent accidental reuse
- 		prev = next = 0;
-@@ -410,8 +412,9 @@
- 
- 	FreedBlock* WriteTags(u8* p, size_t size)
- 	{
--		FreedBlock* freedBlock = new(p) FreedBlock(s_headerId, size);
--		(void)new(Footer(freedBlock)) FreedBlock(s_footerId, size);
-+		FreedBlock* freedBlock = (FreedBlock*)p;
-+		freedBlock->Setup(s_headerId, size);
-+		Footer(freedBlock)->Setup(s_footerId, size);
- 
- 		m_freeBlocks++;
- 		m_freeBytes += size;
-@@ -430,8 +433,8 @@
- 		m_freeBytes -= freedBlock->Size();
- 
- 		FreedBlock* footer = Footer(freedBlock);
--		freedBlock->~FreedBlock();
--		footer->~FreedBlock();
-+		freedBlock->Reset();
-+		footer->Reset();
- 	}
- 
- 	FreedBlock* PrecedingBlock(u8* p, u8* beginningOfPool) const

Modified: packages/trunk/0ad/debian/patches/series
===================================================================
--- packages/trunk/0ad/debian/patches/series	2014-10-14 03:10:37 UTC (rev 15289)
+++ packages/trunk/0ad/debian/patches/series	2014-10-14 03:13:28 UTC (rev 15290)
@@ -1,3 +1 @@
 enable-hardening-relro.patch
-support_miniupnpc_1.9.patch
-fix_gcc4.9_ftbfs.patch

Deleted: packages/trunk/0ad/debian/patches/support_miniupnpc_1.9.patch
===================================================================
--- packages/trunk/0ad/debian/patches/support_miniupnpc_1.9.patch	2014-10-14 03:10:37 UTC (rev 15289)
+++ packages/trunk/0ad/debian/patches/support_miniupnpc_1.9.patch	2014-10-14 03:13:28 UTC (rev 15290)
@@ -1,17 +0,0 @@
-Description: Fix FTBFS with miniupnpc >= 1.9
-Origin: upstream, http://trac.wildfiregames.com/ticket/2552
-Bug-Debian: https://bugs.debian.org/751224
-Last-Update: 2014-06-11
-
---- a/source/network/NetServer.cpp
-+++ b/source/network/NetServer.cpp
-@@ -275,6 +275,9 @@
- 	ret = UPNP_GetSpecificPortMappingEntry(urls.controlURL,
- 									 data.first.servicetype,
- 									 psPort, protocall,
-+#if MINIUPNPC_API_VERSION >= 10
-+									 NULL/*remoteHost*/,
-+#endif
- 									 intClient, intPort, NULL/*desc*/,
- 									 NULL/*enabled*/, duration);
-