Dear maintainer, I've prepared an NMU for pinot (versioned as 1.05-1.2) and uploaded it under the zero-day NMU rules.
After uploading, I discovered upstream has now moved development to github: https://github.com/FabriceColin/pinot The patch fix-ftbfs-with-gcc6.patch is incorporated there already: https://github.com/FabriceColin/pinot/commit/4d263b15216146915bc4108884c77053161dd252 And the patch fix-hardcoded-mangled-symbol-name.patch has been partly addressed, but only for clang - I've submitted a PR to fix the conditional used, which means this patch should be obsoleted by a future upstream release: https://github.com/FabriceColin/pinot/pull/1 Cheers, Olly
diff -Nru pinot-1.05/debian/changelog pinot-1.05/debian/changelog --- pinot-1.05/debian/changelog 2015-09-07 17:59:39.000000000 +1200 +++ pinot-1.05/debian/changelog 2016-09-30 15:05:23.000000000 +1300 @@ -1,3 +1,15 @@ +pinot (1.05-1.2) unstable; urgency=medium + + * Non-maintainer upload. + * Version dependency on libxapian-dev for Xapian 1.4 transition. + * Fix to build with GCC6, new patch: fix-ftbfs-with-gcc6.patch + (Closes: #812165) + * Fix segfault on startup due to hard-coded mangled symbol name, + which has changed with C++11. New patch: + fix-hardcoded-mangled-symbol-name.patch + + -- Olly Betts <o...@survex.com> Fri, 30 Sep 2016 15:05:23 +1300 + pinot (1.05-1.1) unstable; urgency=medium * Non-maintainer upload. diff -Nru pinot-1.05/debian/control pinot-1.05/debian/control --- pinot-1.05/debian/control 2013-03-06 03:12:17.000000000 +1300 +++ pinot-1.05/debian/control 2016-09-30 14:29:12.000000000 +1300 @@ -9,7 +9,7 @@ debhelper, dh-buildinfo, libcurl4-openssl-dev, - libxapian-dev, + libxapian-dev (>= 1.4.0~), libboost-dev, libexttextcat-dev, libtag1-dev, diff -Nru pinot-1.05/debian/patches/fix-ftbfs-with-gcc6.patch pinot-1.05/debian/patches/fix-ftbfs-with-gcc6.patch --- pinot-1.05/debian/patches/fix-ftbfs-with-gcc6.patch 1970-01-01 12:00:00.000000000 +1200 +++ pinot-1.05/debian/patches/fix-ftbfs-with-gcc6.patch 2016-08-06 12:02:50.000000000 +1200 @@ -0,0 +1,17 @@ +Description: Fix to build with GCC6 +Author: Olly Betts <o...@survex.com> +Bug-Debian: https://bugs.debian.org/812165 +Forwarded: no +Last-Update: 2016-08-06 + +--- pinot-1.05.orig/IndexSearch/ModuleFactory.cpp ++++ pinot-1.05/IndexSearch/ModuleFactory.cpp +@@ -132,7 +132,7 @@ IndexInterface *ModuleFactory::getLibrar + (typeIter->second.m_canIndex == false)) + { + // We don't know about this type, or doesn't support indexes +- return false; ++ return NULL; + } + + void *pHandle = typeIter->second.m_pHandle; diff -Nru pinot-1.05/debian/patches/fix-hardcoded-mangled-symbol-name.patch pinot-1.05/debian/patches/fix-hardcoded-mangled-symbol-name.patch --- pinot-1.05/debian/patches/fix-hardcoded-mangled-symbol-name.patch 1970-01-01 12:00:00.000000000 +1200 +++ pinot-1.05/debian/patches/fix-hardcoded-mangled-symbol-name.patch 2016-09-30 15:05:15.000000000 +1300 @@ -0,0 +1,18 @@ +Description: Fix hard-coded mangled symbol name + With C++11 support, the mangled symbol is now different, and this + causes pinot to fail to find it and then segfault. +Author: Olly Betts <o...@survex.com> +Forwarded: no +Last-Update: 2016-09-30 + +--- pinot-1.05.orig/Tokenize/filters/FilterFactory.cc ++++ pinot-1.05/Tokenize/filters/FilterFactory.cc +@@ -42,7 +42,7 @@ + #endif + #endif + +-#define GETFILTERTYPESFUNC "_Z16get_filter_typesRSt3setISsSt4lessISsESaISsEE" ++#define GETFILTERTYPESFUNC "_Z16get_filter_typesRSt3setINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4lessIS5_ESaIS5_EE" + #define GETFILTERFUNC "_Z10get_filterRKSs" + + using std::clog; diff -Nru pinot-1.05/debian/patches/series pinot-1.05/debian/patches/series --- pinot-1.05/debian/patches/series 2012-06-23 15:36:32.000000000 +1200 +++ pinot-1.05/debian/patches/series 2016-09-30 15:04:25.000000000 +1300 @@ -1 +1,3 @@ boost1.48.patch +fix-ftbfs-with-gcc6.patch +fix-hardcoded-mangled-symbol-name.patch
signature.asc
Description: PGP signature
