Date: Tue, 26 Aug 2014 16:50:56 +0000 (UTC) From: Adam Weinberger <adamw@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r366224 - in head/textproc/google-ctemplate: . files Message-ID: <201408261650.s7QGouvn086629@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adamw Date: Tue Aug 26 16:50:55 2014 New Revision: 366224 URL: http://svnweb.freebsd.org/changeset/ports/366224 QAT: https://qat.redports.org/buildarchive/r366224/ Log: Apply a patch from upstream to fix build against gcc 4.7. This fixes ctemplate-based build failures in mysql-workbench. Added: head/textproc/google-ctemplate/files/patch-src__ctemplate__template_string.h.in (contents, props changed) head/textproc/google-ctemplate/files/patch-src__template_dictionary.cc (contents, props changed) Modified: head/textproc/google-ctemplate/Makefile Modified: head/textproc/google-ctemplate/Makefile ============================================================================== --- head/textproc/google-ctemplate/Makefile Tue Aug 26 16:36:41 2014 (r366223) +++ head/textproc/google-ctemplate/Makefile Tue Aug 26 16:50:55 2014 (r366224) @@ -3,7 +3,7 @@ PORTNAME= google-ctemplate PORTVERSION= 2.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc MASTER_SITES= GOOGLE_CODE PROJECTHOST= ctemplate Added: head/textproc/google-ctemplate/files/patch-src__ctemplate__template_string.h.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/google-ctemplate/files/patch-src__ctemplate__template_string.h.in Tue Aug 26 16:50:55 2014 (r366224) @@ -0,0 +1,11 @@ +--- ./src/ctemplate/template_string.h.in.orig 2014-08-26 12:35:28.229739993 -0400 ++++ ./src/ctemplate/template_string.h.in 2014-08-26 12:35:50.132984993 -0400 +@@ -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); \ + } Added: head/textproc/google-ctemplate/files/patch-src__template_dictionary.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/google-ctemplate/files/patch-src__template_dictionary.cc Tue Aug 26 16:50:55 2014 (r366224) @@ -0,0 +1,11 @@ +--- ./src/template_dictionary.cc.orig 2014-08-26 12:36:15.829733992 -0400 ++++ ./src/template_dictionary.cc 2014-08-26 12:36:37.238772992 -0400 +@@ -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; + } +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408261650.s7QGouvn086629>