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

[Mark Purcell]

Author: msp
Date: 2012-06-20 12:56:05 +0000 (Wed, 20 Jun 2012)
New Revision: 19264

Added:
   kde-extras/ctemplate/trunk/debian/patches/r129.patch
Modified:
   kde-extras/ctemplate/trunk/debian/changelog
   kde-extras/ctemplate/trunk/debian/patches/series
Log:
Fix "g++-4.7 -std=c++0x issue" upstream r129.patch (Closes: #665360)

Modified: kde-extras/ctemplate/trunk/debian/changelog
===================================================================
--- kde-extras/ctemplate/trunk/debian/changelog	2012-06-16 11:15:39 UTC (rev 19263)
+++ kde-extras/ctemplate/trunk/debian/changelog	2012-06-20 12:56:05 UTC (rev 19264)
@@ -1,3 +1,9 @@
+ctemplate (2.2-3) unstable; urgency=low
+
+  * Fix "g++-4.7 -std=c++0x issue" upstream r129.patch (Closes: #665360)
+
+ -- Mark Purcell <msp at debian.org>  Wed, 20 Jun 2012 22:54:29 +1000
+
 ctemplate (2.2-2) unstable; urgency=low
 
   * Upload to unstable - coordinated through debian-release

Added: kde-extras/ctemplate/trunk/debian/patches/r129.patch
===================================================================
--- kde-extras/ctemplate/trunk/debian/patches/r129.patch	                        (rev 0)
+++ kde-extras/ctemplate/trunk/debian/patches/r129.patch	2012-06-20 12:56:05 UTC (rev 19264)
@@ -0,0 +1,26 @@
+Index: ctemplate-2.2/src/ctemplate/template_string.h.in
+===================================================================
+--- ctemplate-2.2.orig/src/ctemplate/template_string.h.in	2012-04-19 07:49:56.000000000 +1000
++++ ctemplate-2.2/src/ctemplate/template_string.h.in	2012-06-20 22:52:46.000000000 +1000
+@@ -337,7 +337,7 @@
+ 
+ // Don't use this.  This is used only in auto-generated .varnames.h files.
+ #define STS_INIT_WITH_HASH(name, str, hash)                                   \
+-  { { str, sizeof(""str"")-1, hash } };                                       \
++  { { str, sizeof("" str "")-1, hash } };                                       \
+   namespace ctemplate_sts_init {                                              \
+   static const @ac_google_namespace@::StaticTemplateStringInitializer name##_init(&name); \
+   }
+Index: ctemplate-2.2/src/template_dictionary.cc
+===================================================================
+--- ctemplate-2.2.orig/src/template_dictionary.cc	2012-04-19 07:49:56.000000000 +1000
++++ ctemplate-2.2/src/template_dictionary.cc	2012-06-20 22:53:11.000000000 +1000
+@@ -861,7 +861,7 @@
+ 
+   string GetDictNum(size_t index, size_t size) const {
+     char buf[64];   // big enough for two ints
+-    snprintf(buf, sizeof(buf), "%" PRIuS" of %" PRIuS, index, size);
++    snprintf(buf, sizeof(buf), "%" PRIuS " of %" PRIuS, index, size);
+     return buf;
+   }
+ 

Modified: kde-extras/ctemplate/trunk/debian/patches/series
===================================================================
--- kde-extras/ctemplate/trunk/debian/patches/series	2012-06-16 11:15:39 UTC (rev 19263)
+++ kde-extras/ctemplate/trunk/debian/patches/series	2012-06-20 12:56:05 UTC (rev 19264)
@@ -1 +1,2 @@
+r129.patch
 gcc-4.6.patch