Package: pugixml
Version: 1.2-1
Followup-For: Bug #704718
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu saucy ubuntu-patch



In Ubuntu, the attached patch was applied to achieve the following:

  * Use regex patterns in symbols file to fix FTBFS on 32-bit arches.

This is much simpler than having symbols files for each arch (which
is overkill), or build-depending on pkgkde-tools for its symbol
mangling magic.  The intent of the patch should be self-explanatory.

... Adam

-- System Information:
Debian Release: wheezy/sid
  APT prefers saucy-updates
  APT policy: (500, 'saucy-updates'), (500, 'saucy-security'), (500, 'saucy')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.9.0-3-generic (SMP w/4 CPU cores)
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru pugixml-1.2/debian/changelog pugixml-1.2/debian/changelog
diff -Nru pugixml-1.2/debian/libpugixml1.symbols pugixml-1.2/debian/libpugixml1.symbols
--- pugixml-1.2/debian/libpugixml1.symbols	2013-01-12 10:55:32.000000000 -0700
+++ pugixml-1.2/debian/libpugixml1.symbols	2013-06-02 20:09:48.000000000 -0600
@@ -12,10 +12,10 @@
  _ZN4pugi11xpath_queryC2EPKcPNS_18xpath_variable_setE@Base 1.2
  _ZN4pugi11xpath_queryD1Ev@Base 1.2
  _ZN4pugi11xpath_queryD2Ev@Base 1.2
- _ZN4pugi12xml_document11load_bufferEPKvmjNS_12xml_encodingE@Base 1.2
- _ZN4pugi12xml_document16load_buffer_implEPvmjNS_12xml_encodingEbb@Base 1.2
- _ZN4pugi12xml_document19load_buffer_inplaceEPvmjNS_12xml_encodingE@Base 1.2
- _ZN4pugi12xml_document23load_buffer_inplace_ownEPvmjNS_12xml_encodingE@Base 1.2
+ (regex)"^_ZN4pugi12xml_document11load_bufferEPKv(m|j)jNS_12xml_encodingE@Base" 1.2
+ (regex)"^_ZN4pugi12xml_document16load_buffer_implEPv(m|j)jNS_12xml_encodingEbb@Base" 1.2
+ (regex)"^_ZN4pugi12xml_document19load_buffer_inplaceEPv(m|j)jNS_12xml_encodingE@Base" 1.2
+ (regex)"^_ZN4pugi12xml_document23load_buffer_inplace_ownEPv(m|j)jNS_12xml_encodingE@Base" 1.2
  _ZN4pugi12xml_document4loadEPKcj@Base 1.2
  _ZN4pugi12xml_document4loadERSijNS_12xml_encodingE@Base 1.2
  _ZN4pugi12xml_document4loadERSt13basic_istreamIwSt11char_traitsIwEEj@Base 1.2
@@ -68,7 +68,7 @@
  _ZN4pugi15xml_tree_walkerD0Ev@Base 1.2
  _ZN4pugi15xml_tree_walkerD1Ev@Base 1.2
  _ZN4pugi15xml_tree_walkerD2Ev@Base 1.2
- _ZN4pugi15xml_writer_file5writeEPKvm@Base 1.2
+ (regex)"^_ZN4pugi15xml_writer_file5writeEPKv(m|j)@Base" 1.2
  _ZN4pugi15xml_writer_fileC1EPv@Base 1.2
  _ZN4pugi15xml_writer_fileC2EPv@Base 1.2
  _ZN4pugi15xml_writer_fileD0Ev@Base 1.2
@@ -91,7 +91,7 @@
  _ZN4pugi17xml_node_iteratormmEv@Base 1.2
  _ZN4pugi17xml_node_iteratorppEi@Base 1.2
  _ZN4pugi17xml_node_iteratorppEv@Base 1.2
- _ZN4pugi17xml_writer_stream5writeEPKvm@Base 1.2
+ (regex)"^_ZN4pugi17xml_writer_stream5writeEPKv(m|j)@Base" 1.2
  _ZN4pugi17xml_writer_streamC1ERSo@Base 1.2
  _ZN4pugi17xml_writer_streamC1ERSt13basic_ostreamIwSt11char_traitsIwEE@Base 1.2
  _ZN4pugi17xml_writer_streamC2ERSo@Base 1.2
@@ -128,7 +128,7 @@
  _ZN4pugi23xml_named_node_iteratorppEi@Base 1.2
  _ZN4pugi23xml_named_node_iteratorppEv@Base 1.2
  _ZN4pugi30get_memory_allocation_functionEv@Base 1.2
- _ZN4pugi31set_memory_management_functionsEPFPvmEPFvS0_E@Base 1.2
+ (regex)"^_ZN4pugi31set_memory_management_functionsEPFPv(m|j)EPFvS0_E@Base" 1.2
  _ZN4pugi32get_memory_deallocation_functionEv@Base 1.2
  _ZN4pugi7as_utf8EPKw@Base 1.2
  _ZN4pugi7as_utf8ERKSbIwSt11char_traitsIwESaIwEE@Base 1.2
@@ -189,7 +189,7 @@
  _ZNK4pugi10xpath_nodentEv@Base 1.2
  _ZNK4pugi11xpath_query11return_typeEv@Base 1.2
  _ZNK4pugi11xpath_query15evaluate_numberERKNS_10xpath_nodeE@Base 1.2
- _ZNK4pugi11xpath_query15evaluate_stringEPcmRKNS_10xpath_nodeE@Base 1.2
+ (regex)"^_ZNK4pugi11xpath_query15evaluate_stringEPc(m|j)RKNS_10xpath_nodeE@Base" 1.2
  _ZNK4pugi11xpath_query15evaluate_stringERKNS_10xpath_nodeE@Base 1.2
  _ZNK4pugi11xpath_query16evaluate_booleanERKNS_10xpath_nodeE@Base 1.2
  _ZNK4pugi11xpath_query17evaluate_node_setERKNS_10xpath_nodeE@Base 1.2
@@ -229,7 +229,7 @@
  _ZNK4pugi14xpath_node_set5beginEv@Base 1.2
  _ZNK4pugi14xpath_node_set5emptyEv@Base 1.2
  _ZNK4pugi14xpath_node_set5firstEv@Base 1.2
- _ZNK4pugi14xpath_node_setixEm@Base 1.2
+ (regex)"^_ZNK4pugi14xpath_node_setixE(m|j)@Base" 1.2
  _ZNK4pugi14xpath_variable10get_numberEv@Base 1.2
  _ZNK4pugi14xpath_variable10get_stringEv@Base 1.2
  _ZNK4pugi14xpath_variable11get_booleanEv@Base 1.2

Reply via email to