Control: tags 812041 + patch
Control: tags 812041 + pending
Dear maintainer,
I've prepared an NMU for thrift-compiler (versioned as 0.9.1-2.1) and
uploaded it to DELAYED/10. Please feel free to tell me if I
should delay it longer or if you would like me to dcut the upload.
Also, I would be interested in collaborating on an update to a newer
version of the thrift compiler. Please let me know if you are amenable
to that.
Cheers,
tony
diff -Nru thrift-compiler-0.9.1/debian/changelog thrift-compiler-0.9.1/debian/changelog
--- thrift-compiler-0.9.1/debian/changelog 2014-10-12 00:21:34.000000000 -0700
+++ thrift-compiler-0.9.1/debian/changelog 2016-06-30 21:33:13.000000000 -0700
@@ -1,3 +1,10 @@
+thrift-compiler (0.9.1-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Add gcc6.patch to address FTBFS with GCC 6. (Closes: #812041)
+
+ -- tony mancill <tmanc...@debian.org> Thu, 30 Jun 2016 21:32:33 -0700
+
thrift-compiler (0.9.1-2) unstable; urgency=low
* Output modernized Go (closes: #729430).
diff -Nru thrift-compiler-0.9.1/debian/patches/gcc6.patch thrift-compiler-0.9.1/debian/patches/gcc6.patch
--- thrift-compiler-0.9.1/debian/patches/gcc6.patch 1969-12-31 16:00:00.000000000 -0800
+++ thrift-compiler-0.9.1/debian/patches/gcc6.patch 2016-06-30 21:33:13.000000000 -0700
@@ -0,0 +1,31 @@
+--- a/cpp/src/generate/t_java_generator.cc
++++ b/cpp/src/generate/t_java_generator.cc
+@@ -2827,7 +2827,7 @@
+ bool first = true;
+ if (xceptions.size() > 0) {
+ for (x_iter = xceptions.begin(); x_iter != xceptions.end(); ++x_iter) {
+- first ? first = false : indent(f_service_) << "else ";
++ if (first) { first = false; } else { indent(f_service_) << "else "; }
+ indent(f_service_) << "if (e instanceof " << type_name((*x_iter)->get_type(), false, false)<<") {" << endl;
+ indent(f_service_) << indent() << "result." << (*x_iter)->get_name() << " = (" << type_name((*x_iter)->get_type(), false, false) << ") e;" << endl;
+ indent(f_service_) << indent() << "result.set" << get_cap_name((*x_iter)->get_name()) << get_cap_name("isSet") << "(true);" << endl;
+--- a/cpp/src/generate/t_rb_generator.cc
++++ b/cpp/src/generate/t_rb_generator.cc
+@@ -363,7 +363,7 @@
+ for(c_iter = constants.begin(); c_iter != constants.end(); ++c_iter) {
+ // Populate the hash
+ int value = (*c_iter)->get_value();
+- first ? first = false : f_types_ << ", ";
++ if (first) { first = false; } else { f_types_ << ", "; }
+ f_types_ << value << " => \"" << capitalize((*c_iter)->get_name()) << "\"";
+ }
+ f_types_ << "}" << endl;
+@@ -373,7 +373,7 @@
+ first = true;
+ for (c_iter = constants.begin(); c_iter != constants.end(); ++c_iter) {
+ // Populate the set
+- first ? first = false : f_types_ << ", ";
++ if (first) { first = false; } else { f_types_ << ", "; }
+ f_types_ << capitalize((*c_iter)->get_name());
+ }
+ f_types_ << "]).freeze" << endl;
diff -Nru thrift-compiler-0.9.1/debian/patches/series thrift-compiler-0.9.1/debian/patches/series
--- thrift-compiler-0.9.1/debian/patches/series 2014-10-12 00:21:20.000000000 -0700
+++ thrift-compiler-0.9.1/debian/patches/series 2016-06-30 21:33:13.000000000 -0700
@@ -1 +1,2 @@
thrift-2247-binary-as-string-keys.patch
+gcc6.patch
