Bug#921116: eris: mark additional template symbols optional for compatibility with gcc-8 -O3

[Steve Langasek]

Package: eris
Version: 1.3.23-7
Severity: minor
Tags: patch
User: ubuntu-devel at lists.ubuntu.com
Usertags: origin-ubuntu disco ubuntu-patch

Dear Olek,

eris is again failing to build from source on ppc64el in Ubuntu, as the only
architecture where packages are built with -O3 by default, because some
additional template symbols are now being optimized out with gcc-8 compared
to previous toolchains.

Please find attached a patch that marks these further template symbols
optional, allowing the package to build from source with or without -O3.

Cheers,
-- 
Steve Langasek                   Give me a lever long enough and a Free OS
Debian Developer                   to set it on, and I can move the world.
Ubuntu Developer                                   https://www.debian.org/
slangasek at ubuntu.com                                     vorlon at debian.org
-------------- next part --------------
diff -Nru eris-1.3.23/debian/control eris-1.3.23/debian/control
--- eris-1.3.23/debian/control	2019-02-01 09:05:24.000000000 -0800
+++ eris-1.3.23/debian/control	2019-02-01 10:03:38.000000000 -0800
@@ -1,8 +1,7 @@
 Source: eris
 Section: libs
 Priority: optional
-Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
-XSBC-Original-Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Olek Wojnar <olekw.dev at gmail.com>
 Build-Depends: debhelper (>= 11),
                libatlas-cpp-0.6-dev (>= 0.6.3),
diff -Nru eris-1.3.23/debian/liberis-1.3-21.symbols eris-1.3.23/debian/liberis-1.3-21.symbols
--- eris-1.3.23/debian/liberis-1.3-21.symbols	2018-10-03 12:19:59.000000000 -0700
+++ eris-1.3.23/debian/liberis-1.3-21.symbols	2019-02-01 10:02:52.000000000 -0800
@@ -231,9 +231,9 @@
  _ZN4Eris20TerrainModTranslator10parseStuffIN6WFMath7PolygonEEEbRKNS2_5PointILi3EEERKNS2_10QuaternionERKSt3mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEN5Atlas7Message7ElementESt4lessISH_ESaISt4pairIKSH_SK_EEERSO_RT_ILi2EERKSK_ at Base 1.3.23
  _ZN4Eris20TerrainModTranslator11getModifierEv at Base 1.3.19
  _ZN4Eris20TerrainModTranslator13parsePositionERKN6WFMath5PointILi3EEERKSt3mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEN5Atlas7Message7ElementESt4lessISC_ESaISt4pairIKSC_SF_EEE at Base 1.3.23
- _ZN4Eris20TerrainModTranslator14createInstanceIN8Mercator15SlopeTerrainModEN6WFMath4BallEEEbRT0_ILi2EERKNS4_5PointILi3EEERKSt3mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEN5Atlas7Message7ElementESt4lessISJ_ESaISt4pairIKSJ_SM_EEEff at Base 1.3.23
- _ZN4Eris20TerrainModTranslator14createInstanceIN8Mercator15SlopeTerrainModEN6WFMath6RotBoxEEEbRT0_ILi2EERKNS4_5PointILi3EEERKSt3mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEN5Atlas7Message7ElementESt4lessISJ_ESaISt4pairIKSJ_SM_EEEff at Base 1.3.23
- _ZN4Eris20TerrainModTranslator14createInstanceIN8Mercator15SlopeTerrainModEN6WFMath7PolygonEEEbRT0_ILi2EERKNS4_5PointILi3EEERKSt3mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEN5Atlas7Message7ElementESt4lessISJ_ESaISt4pairIKSJ_SM_EEEff at Base 1.3.23
+ (optional)_ZN4Eris20TerrainModTranslator14createInstanceIN8Mercator15SlopeTerrainModEN6WFMath4BallEEEbRT0_ILi2EERKNS4_5PointILi3EEERKSt3mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEN5Atlas7Message7ElementESt4lessISJ_ESaISt4pairIKSJ_SM_EEEff at Base 1.3.23
+ (optional)_ZN4Eris20TerrainModTranslator14createInstanceIN8Mercator15SlopeTerrainModEN6WFMath6RotBoxEEEbRT0_ILi2EERKNS4_5PointILi3EEERKSt3mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEN5Atlas7Message7ElementESt4lessISJ_ESaISt4pairIKSJ_SM_EEEff at Base 1.3.23
+ (optional)_ZN4Eris20TerrainModTranslator14createInstanceIN8Mercator15SlopeTerrainModEN6WFMath7PolygonEEEbRT0_ILi2EERKNS4_5PointILi3EEERKSt3mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEN5Atlas7Message7ElementESt4lessISJ_ESaISt4pairIKSJ_SM_EEEff at Base 1.3.23
  _ZN4Eris20TerrainModTranslator9parseDataERKN6WFMath5PointILi3EEERKNS1_10QuaternionERKSt3mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEN5Atlas7Message7ElementESt4lessISF_ESaISt4pairIKSF_SI_EEE at Base 1.3.23
  _ZN4Eris20TerrainModTranslatorC1Ev at Base 1.3.19
  _ZN4Eris20TerrainModTranslatorC2Ev at Base 1.3.19
@@ -735,7 +735,7 @@
  _ZNSt4pairIKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEN5Atlas7Message7ElementEED1Ev at Base 1.3.23
  _ZNSt4pairIKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEN5Atlas7Message7ElementEED2Ev at Base 1.3.23
  _ZNSt5dequeIN5Atlas7Objects8SmartPtrINS1_9Operation17RootOperationDataEEESaIS5_EE16_M_push_back_auxIJRKS5_EEEvDpOT_ at Base 1.3.23
- _ZNSt5dequeIN5Atlas7Objects8SmartPtrINS1_9Operation17RootOperationDataEEESaIS5_EE19_M_destroy_data_auxESt15_Deque_iteratorIS5_RS5_PS5_ESB_ at Base 1.3.19
+ (optional)_ZNSt5dequeIN5Atlas7Objects8SmartPtrINS1_9Operation17RootOperationDataEEESaIS5_EE19_M_destroy_data_auxESt15_Deque_iteratorIS5_RS5_PS5_ESB_ at Base 1.3.19
  _ZNSt5dequeIN5Atlas7Objects8SmartPtrINS1_9Operation17RootOperationDataEEESaIS5_EED1Ev at Base 1.3.19
  _ZNSt5dequeIN5Atlas7Objects8SmartPtrINS1_9Operation17RootOperationDataEEESaIS5_EED2Ev at Base 1.3.19
  (optional=inline)_ZNSt5dequeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE16_M_pop_front_auxEv at Base 1.3.23