Merge pull request #7884 from Rmys/master

konversation rebuild

desktop/kde/applications/konversation/files/konversation-1.7.5-fix-regex-for-cap-ack.patch

@@ -0,0 +1,25 @@
+From 6d896b4efc93c18246ce4db7c788929b0ce75559 Mon Sep 17 00:00:00 2001
+From: Peter Simonsson <peter.simonsson@gmail.com>
+Date: Sun, 23 Sep 2018 08:29:43 +0200
+Subject: Fix regex for cap ack
+
+Seems to have worked despite being broken
+---
+ src/irc/inputfilter.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/irc/inputfilter.cpp b/src/irc/inputfilter.cpp
+index fbd268b..45d4f88 100644
+--- a/src/irc/inputfilter.cpp
++++ b/src/irc/inputfilter.cpp
+@@ -795,7 +795,7 @@ void InputFilter::parseServerCommand(const QString &prefix, const QString &comma
+ 
+                 foreach(const QString& capability, capabilities)
+                 {
+-                    int nameStart = capability.indexOf(QRegExp(QStringLiteral("[a-z0-9"), Qt::CaseInsensitive));
++                    int nameStart = capability.indexOf(QRegExp(QStringLiteral("[a-z0-9]"), Qt::CaseInsensitive));
+                     QString modifierString = capability.left(nameStart);
+                     QString name = capability.mid(nameStart);
+ 
+-- 
+cgit v1.1

desktop/kde/applications/konversation/files/konversation-1.7.5-missing-header.patch

@@ -0,0 +1,23 @@
+From 4d0036617becc26a76fd021138c98aceec4c7b53 Mon Sep 17 00:00:00 2001
+From: Luca Beltrame <lbeltrame@kde.org>
+Date: Sun, 21 Jul 2019 09:14:32 +0200
+Subject: Fix build with Qt 5.13
+
+---
+ src/irc/outputfilter.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/irc/outputfilter.cpp b/src/irc/outputfilter.cpp
+index f9e6253..45d11fb 100644
+--- a/src/irc/outputfilter.cpp
++++ b/src/irc/outputfilter.cpp
+@@ -32,6 +32,7 @@
+ 
+ #include <QStringList>
+ #include <QFile>
++#include <QMetaMethod>
+ #include <QRegExp>
+ #include <QTextCodec>
+ #include <QByteArray>
+-- 
+cgit v1.1

desktop/kde/applications/konversation/pspec.xml

@@ -44,6 +44,10 @@
             <Dependency>gettext-devel</Dependency>
             <Dependency>docbook-xsl</Dependency>
         </BuildDependencies>
+        <Patches>
+            <Patch level="1">konversation-1.7.5-fix-regex-for-cap-ack.patch</Patch>
+            <Patch level="1">konversation-1.7.5-missing-header.patch</Patch>
+        </Patches>
     </Source>
 
     <Package>
@@ -90,7 +94,7 @@
 
     <History>
         <Update release="25">
-            <Date>2020-02-02</Date>
+            <Date>2020-02-07</Date>
             <Version>1.7.5</Version>
             <Comment>Version bump.</Comment>
             <Name>Mustafa Cinasal</Name>