rev 18633 - in kde-extras/ctemplate/trunk/debian: . patches

[Mark Purcell]

Author: msp
Date: 2010-08-09 22:15:05 +0000 (Mon, 09 Aug 2010)
New Revision: 18633

Added:
   kde-extras/ctemplate/trunk/debian/patches/
   kde-extras/ctemplate/trunk/debian/patches/dbug592142-sparc.patch
   kde-extras/ctemplate/trunk/debian/patches/series
Modified:
   kde-extras/ctemplate/trunk/debian/changelog
Log:
* Add sparc memory alignment patch from Jurij Smakov <jurij at wooyd.org>
  - Fixes "FTBFS on sparc: 10 of 20 tests failed" (Closes: #592142)

Modified: kde-extras/ctemplate/trunk/debian/changelog
===================================================================
--- kde-extras/ctemplate/trunk/debian/changelog	2010-08-09 19:53:06 UTC (rev 18632)
+++ kde-extras/ctemplate/trunk/debian/changelog	2010-08-09 22:15:05 UTC (rev 18633)
@@ -1,3 +1,10 @@
+ctemplate (0.97-3) unstable; urgency=low
+
+  * Add sparc memory alignment patch from Jurij Smakov <jurij at wooyd.org>
+    - Fixes "FTBFS on sparc: 10 of 20 tests failed" (Closes: #592142)
+
+ -- Mark Purcell <msp at debian.org>  Tue, 10 Aug 2010 08:08:29 +1000
+
 ctemplate (0.97-2) unstable; urgency=low
 
   * Include debian/* in copyright

Added: kde-extras/ctemplate/trunk/debian/patches/dbug592142-sparc.patch
===================================================================
--- kde-extras/ctemplate/trunk/debian/patches/dbug592142-sparc.patch	                        (rev 0)
+++ kde-extras/ctemplate/trunk/debian/patches/dbug592142-sparc.patch	2010-08-09 22:15:05 UTC (rev 18633)
@@ -0,0 +1,41 @@
+diff -aur a/src/template_dictionary.cc b/src/template_dictionary.cc
+--- a/src/template_dictionary.cc	2010-04-08 20:42:46.000000000 +0100
++++ b/src/template_dictionary.cc	2010-08-08 20:27:55.000000000 +0100
+@@ -87,9 +87,8 @@
+   arena_->Free(p, n * sizeof(T));
+ }
+ 
+-// TODO(csilvers): sizeof(void*) may be too big.  But is probably ok.
+ /*static*/ template<class T> const int ArenaAllocator<T>::kAlignment =
+-    (1 == sizeof(T) ? 1 : sizeof(void*));
++    (1 == sizeof(T) ? 1 : BaseArena::kDefaultAlignment);
+ 
+ // ----------------------------------------------------------------------
+ // TemplateDictionary::map_arena_init
+@@ -123,7 +122,7 @@
+   if (*dict != NULL)
+     return;
+   // Placement new: construct the map in the memory used by *dict.
+-  void* buffer = arena_->AllocAligned(sizeof(**dict), sizeof(void*));
++  void* buffer = arena_->AllocAligned(sizeof(**dict), BaseArena::kDefaultAlignment);
+   new (buffer) T(arena_);
+   *dict = reinterpret_cast<T*>(buffer);
+ }
+@@ -138,7 +137,7 @@
+ }
+ 
+ inline TemplateDictionary::DictVector* TemplateDictionary::CreateDictVector() {
+-  void* buffer = arena_->AllocAligned(sizeof(DictVector), sizeof(void*));
++  void* buffer = arena_->AllocAligned(sizeof(DictVector), BaseArena::kDefaultAlignment);
+   // Placement new: construct the vector in the memory used by buffer.
+   new (buffer) DictVector(arena_);
+   return reinterpret_cast<DictVector*>(buffer);
+@@ -149,7 +148,7 @@
+     UnsafeArena* arena,
+     TemplateDictionary* parent_dict,
+     TemplateDictionary* template_global_dict_owner) {
+-  void* buffer = arena->AllocAligned(sizeof(TemplateDictionary), sizeof(void*));
++  void* buffer = arena->AllocAligned(sizeof(TemplateDictionary), BaseArena::kDefaultAlignment);
+   // Placement new: construct the sub-tpl in the memory used by tplbuf.
+   new (buffer) TemplateDictionary(name, arena, parent_dict,
+                                   template_global_dict_owner);

Added: kde-extras/ctemplate/trunk/debian/patches/series
===================================================================
--- kde-extras/ctemplate/trunk/debian/patches/series	                        (rev 0)
+++ kde-extras/ctemplate/trunk/debian/patches/series	2010-08-09 22:15:05 UTC (rev 18633)
@@ -0,0 +1 @@
+dbug592142-sparc.patch