[arch-commits] Commit in swift/trunk (PKGBUILD swift-gcc11.patch)

[Antonio Rojas]

    Date: Friday, December 17, 2021 @ 07:25:31
  Author: arojas
Revision: 1075885

Fix build with GCC 11

Added:
  swift/trunk/swift-gcc11.patch
Modified:
  swift/trunk/PKGBUILD

-------------------+
 PKGBUILD          |    8 ++++++--
 swift-gcc11.patch |   13 +++++++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-12-17 07:18:47 UTC (rev 1075884)
+++ PKGBUILD	2021-12-17 07:25:31 UTC (rev 1075885)
@@ -15,12 +15,14 @@
         'swift-4.0.2-boost-1.69-compatibility.patch'
         'swift-4.0.2-qt-5.11-compatibility.patch'
         'swift-4.0.2-qt-5.15-compatibility.patch'
-        repro-builds.patch)
+        repro-builds.patch
+        swift-gcc11.patch)
 sha256sums=('1c7c9fb981ecb9b589890c36523dbbabde2f0a708f71a66eb71e9526bf8e0a70'
             'd166362c146f859ec89c535f8676ac12c6e51e281e6c88c5e36b25e4ea5655d1'
             '7970844d39c38ff6d36c2d1e26c145495ff8f5a5a31a399467eca66854dc3e67'
             '18feef21870b0f441a6fb0faf7b35a826cfec4fe4a1d717bbb1c373a8c1ccb95'
-            '90c586cc67dc9831a0e8ce75c12478f674b5d429dd46dae4c47f241d7902beb1')
+            '90c586cc67dc9831a0e8ce75c12478f674b5d429dd46dae4c47f241d7902beb1'
+            'eae6d270660353e0038dfbbdebff974e84e59cd44992ce7fc37add9926fb49c0')
 
 # Those options need to be consistent between each scons invocation.
 _scons_options=(max_jobs=1 optimize=1 debug=0 swiften_dll=1 cflags="${CPPFLAGS} ${CFLAGS}" cxxflags="${CPPFLAGS} ${CFLAGS}" linkflags="${LDFLAGS}")
@@ -32,6 +34,8 @@
   patch -p1 -i ../swift-4.0.2-qt-5.15-compatibility.patch
   # https://github.com/swift/swift/pull/129
   patch -p1 -i ../repro-builds.patch
+  # Fix build with GCC 11
+  patch -p1 -i ../swift-gcc11.patch
 }
 
 build() {

Added: swift-gcc11.patch
===================================================================
--- swift-gcc11.patch	                        (rev 0)
+++ swift-gcc11.patch	2021-12-17 07:25:31 UTC (rev 1075885)
@@ -0,0 +1,13 @@
+diff --git a/Swift/Controllers/ShowProfileController.h b/Swift/Controllers/ShowProfileController.h
+index 0d01ba1a0..5dc7197ff 100644
+--- a/Swift/Controllers/ShowProfileController.h
++++ b/Swift/Controllers/ShowProfileController.h
+@@ -18,6 +18,8 @@
+ 
+ #include <Swift/Controllers/UIEvents/UIEvent.h>
+ 
++#include <map>
++
+ namespace Swift {
+     class VCardManager;
+     class ProfileWindow;