On Wed, Jul 28, 2021 at 12:22:23PM +0300, Adrian Bunk wrote: > Package: release.debian.org > Severity: normal > User: release.debian....@packages.debian.org > Usertags: unblock > > Please unblock package antlr4-cpp-runtime > > * Make ANTLRInputStream.h usable with C++17. (Closes: #991482) > > This fixed building mysql-workbench (not in bullseye), > and would equally affect users building their own C++17 code. > > unblock antlr4-cpp-runtime/4.9+dfsg-1.1
debdiff is now attached. cu Adrian
diff -Nru antlr4-cpp-runtime-4.9+dfsg/debian/changelog antlr4-cpp-runtime-4.9+dfsg/debian/changelog --- antlr4-cpp-runtime-4.9+dfsg/debian/changelog 2020-12-01 10:41:23.000000000 +0200 +++ antlr4-cpp-runtime-4.9+dfsg/debian/changelog 2021-07-25 19:02:59.000000000 +0300 @@ -1,3 +1,10 @@ +antlr4-cpp-runtime (4.9+dfsg-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Make ANTLRInputStream.h usable with C++17. (Closes: #991482) + + -- Adrian Bunk <b...@debian.org> Sun, 25 Jul 2021 19:02:59 +0300 + antlr4-cpp-runtime (4.9+dfsg-1) unstable; urgency=medium [ Debian Janitor ] diff -Nru antlr4-cpp-runtime-4.9+dfsg/debian/patches/cxx17.patch antlr4-cpp-runtime-4.9+dfsg/debian/patches/cxx17.patch --- antlr4-cpp-runtime-4.9+dfsg/debian/patches/cxx17.patch 1970-01-01 02:00:00.000000000 +0200 +++ antlr4-cpp-runtime-4.9+dfsg/debian/patches/cxx17.patch 2021-07-25 19:02:59.000000000 +0300 @@ -0,0 +1,34 @@ +Description: Revert change that broke using libantlr4-runtime4.9 with C++17 + Upstream commit 254b144b creeated a different ABI for C++17, + but it is not even possible to build antlr4-cpp-runtime for this ABI. + . + The proper fix would be upgrading to 4.9.2 where two commits + in March 2021 fixed this issue: + https://github.com/antlr/antlr4/commits/master/runtime/Cpp/runtime/src/ANTLRInputStream.h + . + The upstream fix changes ABI, do the simple fix instead that does + not offer a different ABI the library cannot even be built for. +Author: Adrian Bunk <b...@debian.org> + +--- antlr4-cpp-runtime-4.9+dfsg.orig/runtime/src/ANTLRInputStream.h ++++ antlr4-cpp-runtime-4.9+dfsg/runtime/src/ANTLRInputStream.h +@@ -25,19 +25,11 @@ namespace antlr4 { + /// What is name or source of this char stream? + std::string name; + +-#if __cplusplus >= 201703L +- ANTLRInputStream(std::string_view input = ""); +-#else + ANTLRInputStream(const std::string &input = ""); +-#endif + ANTLRInputStream(const char data_[], size_t numberOfActualCharsInArray); + ANTLRInputStream(std::istream &stream); + +-#if __cplusplus >= 201703L +- virtual void load(std::string_view input); +-#else + virtual void load(const std::string &input); +-#endif + virtual void load(std::istream &stream); + + /// Reset the stream so that it's in the same state it was diff -Nru antlr4-cpp-runtime-4.9+dfsg/debian/patches/series antlr4-cpp-runtime-4.9+dfsg/debian/patches/series --- antlr4-cpp-runtime-4.9+dfsg/debian/patches/series 2020-11-30 15:45:31.000000000 +0200 +++ antlr4-cpp-runtime-4.9+dfsg/debian/patches/series 2021-07-25 19:02:54.000000000 +0300 @@ -1 +1,2 @@ system-utfcpp.patch +cxx17.patch
