From d7280bbc66e8899db97990378ed220e121fb6071 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Tue, 29 Nov 2016 01:19:10 +0000 Subject: [PATCH] thunderbird: fix gcc6 build (firefox-esr patch) --- .../patches/fix-gcc6-cpluplus_scope.patch | 15 +++++++++++++++ srcpkgs/thunderbird/template | 2 -- 2 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/thunderbird/patches/fix-gcc6-cpluplus_scope.patch diff --git a/srcpkgs/thunderbird/patches/fix-gcc6-cpluplus_scope.patch b/srcpkgs/thunderbird/patches/fix-gcc6-cpluplus_scope.patch new file mode 100644 index 00000000000..096acd8323d --- /dev/null +++ b/srcpkgs/thunderbird/patches/fix-gcc6-cpluplus_scope.patch @@ -0,0 +1,15 @@ +Add patch to to correct the source to be compatible with gcc6 by +preventing c++ scope errors. + +--- mozilla/nsprpub/config/make-system-wrappers.pl 2016-05-12 19:10:05.000000000 +0200 ++++ mozilla/nsprpub/config/make-system-wrappers.pl 2016-09-17 15:03:53.901400739 +0200 +@@ -19,7 +19,9 @@ + open OUT, ">$output_dir/$_"; + print OUT "#pragma GCC system_header\n"; # suppress include_next warning + print OUT "#pragma GCC visibility push(default)\n"; ++ print OUT "#define _GLIBCXX_INCLUDE_NEXT_C_HEADERS\n"; + print OUT "#include_next \<$_\>\n"; ++ print OUT "#undef _GLIBCXX_INCLUDE_NEXT_C_HEADERS\n"; + print OUT "#pragma GCC visibility pop\n"; + close OUT; + } diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template index 29a71877190..18d0f631dee 100644 --- a/srcpkgs/thunderbird/template +++ b/srcpkgs/thunderbird/template @@ -22,8 +22,6 @@ makedepends=" libSM-devel libXScrnSaver-devel libXt-devel libXdamage-devel" depends="desktop-file-utils hicolor-icon-theme" -broken="https://build.voidlinux.eu/builders/x86_64_builder/builds/28104/steps/shell_3/logs/stdio" - if [ "${XBPS_GCC_VERSION_MAJOR}" -gt 5 ]; then # Append CFLAGS and CXXFLAGS to set work around code which gcc6 would # otherwise regard as out-of-specification and allow it to produce a