Author: vcheng
Date: 2014-06-25 06:01:45 +0000 (Wed, 25 Jun 2014)
New Revision: 15130
Added:
packages/tags/0ad/0.0.16-4/
packages/tags/0ad/0.0.16-4/debian/patches/fix_gcc4.9_ftbfs.patch
Removed:
packages/tags/0ad/0.0.16-4/debian/patches/fix_gcc4.9_ftbfs.patch
Log:
[svn-buildpackage] Tagging 0ad 0.0.16-4
Deleted: packages/tags/0ad/0.0.16-4/debian/patches/fix_gcc4.9_ftbfs.patch
===================================================================
--- packages/trunk/0ad/debian/patches/fix_gcc4.9_ftbfs.patch 2014-06-25
04:29:56 UTC (rev 15128)
+++ packages/tags/0ad/0.0.16-4/debian/patches/fix_gcc4.9_ftbfs.patch
2014-06-25 06:01:45 UTC (rev 15130)
@@ -1,43 +0,0 @@
---- 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
Copied: packages/tags/0ad/0.0.16-4/debian/patches/fix_gcc4.9_ftbfs.patch (from
rev 15129, packages/trunk/0ad/debian/patches/fix_gcc4.9_ftbfs.patch)
===================================================================
--- packages/tags/0ad/0.0.16-4/debian/patches/fix_gcc4.9_ftbfs.patch
(rev 0)
+++ packages/tags/0ad/0.0.16-4/debian/patches/fix_gcc4.9_ftbfs.patch
2014-06-25 06:01:45 UTC (rev 15130)
@@ -0,0 +1,49 @@
+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
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
