upgpkg: 1.4.0

Packaged Qt libraries got upgraded to 5.15.11, and unfortunately that
seems to have increased the number of Qt-versioned STL symbols the
XnView binary expects. Update qt5_std_fun_forwarder.S accordingly.

3 files changed, 30 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 92908c401d21..0b1eeed65319 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = xnviewmp-system-libs
 	pkgdesc = An efficient multimedia viewer, browser and converter (using system libraries).
-	pkgver = 1.3.1
+	pkgver = 1.4.0
 	pkgrel = 1
 	url = https://www.xnview.com/en/xnviewmp/
 	arch = x86_64
@@ -15,15 +15,15 @@ pkgbase = xnviewmp-system-libs
 	depends = openexr
 	optdepends = glib2: support for moving files to trash
 	conflicts = xnviewmp
-	source = XnViewMP-linux-x64_1.3.1-rel1.tgz::https://download.xnview.com/XnViewMP-linux-x64.tgz
+	source = XnViewMP-linux-x64_1.4.0-rel1.tgz::https://download.xnview.com/XnViewMP-linux-x64.tgz
 	source = xnview.sh
 	source = xnviewmp.desktop
 	source = qt5_std_fun_forwarder.S
 	source = qt5_std_fun_forwarder.lds
-	sha256sums = 892784F914C2C1DF8C47772EFFEBF8C4978E3C732E4936D7A4AEA04A0BF133E1
+	sha256sums = 6EF3D6EE272CC9293084952A90BF936131128671C5F74791A84185AD733EDBAE
 	sha256sums = 87ec80c5049745dc3018fcdcf4dddf0e877ae3b20706705f2a80715232ad2141
 	sha256sums = F6B3A4AAA0A55B5F21D9B91AB6F3DA3D6EE077BA7FDD17E7C4AB1C69AD2A9E3A
-	sha256sums = 7B5EF056AD43F090FF074AE749AC84CD090511E5C2B6A8386AA1882BD8D32F38
+	sha256sums = D16B4F1ABA4664B169211FD0FE2FF27892AA02F60A5C7C50F55D43FAB0E255DC
 	sha256sums = 3D6DA484CD55EAC8910D5CF87F9057E6EADEAC842A249DCBDA35E1C6F3FCDC0D
 
 pkgname = xnviewmp-system-libs
diff --git a/PKGBUILD b/PKGBUILD
index a5db8613d455..3a9f06fa0755 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=xnviewmp-system-libs
 _pkgname=xnviewmp
-pkgver=1.3.1
+pkgver=1.4.0
 srcrel=1 # Incremented when there is a new release for the same version number
 pkgrel=1
 pkgdesc="An efficient multimedia viewer, browser and converter (using system libraries)."
@@ -26,10 +26,10 @@ source=("XnViewMP-linux-x64_${pkgver}-rel${srcrel}.tgz::https://download.xnview.
         'xnviewmp.desktop'
         'qt5_std_fun_forwarder.S'
         'qt5_std_fun_forwarder.lds')
-sha256sums=('892784F914C2C1DF8C47772EFFEBF8C4978E3C732E4936D7A4AEA04A0BF133E1'
+sha256sums=('6EF3D6EE272CC9293084952A90BF936131128671C5F74791A84185AD733EDBAE'
             '87ec80c5049745dc3018fcdcf4dddf0e877ae3b20706705f2a80715232ad2141'
             'F6B3A4AAA0A55B5F21D9B91AB6F3DA3D6EE077BA7FDD17E7C4AB1C69AD2A9E3A'
-            '7B5EF056AD43F090FF074AE749AC84CD090511E5C2B6A8386AA1882BD8D32F38'
+            'D16B4F1ABA4664B169211FD0FE2FF27892AA02F60A5C7C50F55D43FAB0E255DC'
             '3D6DA484CD55EAC8910D5CF87F9057E6EADEAC842A249DCBDA35E1C6F3FCDC0D')
 
 # There is a lot of useless files in the archive, only install those from that
@@ -98,7 +98,7 @@ package() {
   # attempting to view a RAW file), use the one provided.
   install -D -m644 "lib/liblibraw.so.1" -t "${pkg_opt_dir}/lib"
   # There is no package for libmdk, which is anyway distributed as binary, so
-  # just the one provided.
+  # just use the one provided.
   install -D -m644 "lib/libmdk.so.0" -t "${pkg_opt_dir}/lib"
 
   install -m755 "${srcdir}/xnview.sh" "${pkg_opt_dir}"
diff --git a/qt5_std_fun_forwarder.S b/qt5_std_fun_forwarder.S
index 899cd35dd198..745c33a4136a 100644
--- a/qt5_std_fun_forwarder.S
+++ b/qt5_std_fun_forwarder.S
@@ -11,3 +11,25 @@
 
 DEFINE_QT5_FORWARDER(_ZNSt28__atomic_futex_unsigned_base19_M_futex_wait_untilEPjjbNSt6chrono8durationIlSt5ratioILl1ELl1EEEENS2_IlS3_ILl1ELl1000000000EEEE)
 DEFINE_QT5_FORWARDER(_ZNSt28__atomic_futex_unsigned_base19_M_futex_notify_allEPj)
+
+DEFINE_QT5_FORWARDER(_ZNKSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE13find_first_ofEPKcmm)
+DEFINE_QT5_FORWARDER(_ZNKSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE17find_first_not_ofEcm)
+DEFINE_QT5_FORWARDER(_ZNKSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE4copyEPcmm)
+DEFINE_QT5_FORWARDER(_ZNKSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE4findEcm)
+DEFINE_QT5_FORWARDER(_ZNKSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE7compareEPKc)
+DEFINE_QT5_FORWARDER(_ZNKSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE7compareERKS4_)
+DEFINE_QT5_FORWARDER(_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE10_M_replaceEmmPKcm)
+DEFINE_QT5_FORWARDER(_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE12_M_constructEmc)
+DEFINE_QT5_FORWARDER(_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE14_M_replace_auxEmmmc)
+DEFINE_QT5_FORWARDER(_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE4swapERS4_)
+DEFINE_QT5_FORWARDER(_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE6assignEPKc)
+DEFINE_QT5_FORWARDER(_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE6resizeEmc)
+DEFINE_QT5_FORWARDER(_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE7replaceEmmPKcm)
+DEFINE_QT5_FORWARDER(_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE7reserveEm)
+DEFINE_QT5_FORWARDER(_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE8_M_eraseEmm)
+DEFINE_QT5_FORWARDER(_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE9_M_appendEPKcm)
+DEFINE_QT5_FORWARDER(_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE9_M_assignERKS4_)
+DEFINE_QT5_FORWARDER(_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE9_M_createERmm)
+DEFINE_QT5_FORWARDER(_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE9_M_mutateEmmPKcm)
+DEFINE_QT5_FORWARDER(_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE9push_backEc)
+DEFINE_QT5_FORWARDER(_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEED1Ev)