ark and ksirk upstream new sources

ark/PKGBUILD

@@ -4,7 +4,7 @@ source ../kdeapps.conf
 pkgname=ark
 arch=('x86_64')
 pkgver=${_kdever}
-pkgrel=1
+pkgrel=2
 pkgdesc="Archiver for various compression formats"
 url="http://www.kde.org"
 license=(GPL)
@@ -17,11 +17,20 @@ replaces=(kdeutils-ark)
 groups=('kde' 'kde-uninstall' 'kde-applications' 'kdeutils')
 install=kdeutils.install
 
-source=("$_mirror/${pkgname}-$_kdever.tar.xz")
-sha256sums=(`grep ${pkgname}-$_kdever.tar.xz  ../checksums.txt | cut -d " " -f1`)
+source=("$_mirror/${pkgname}-$_kdever.tar.xz"
+        'ark-rar-path-with-space.patch')
+sha256sums=(`grep ${pkgname}-$_kdever.tar.xz  ../checksums.txt | cut -d " " -f1`
+            '4cc0fbec1c958560fc65dab30a612562eb29963a72af904b94ac21787da42d16')
 
 prepare() {
   mkdir -p build
+  
+  cd  ${pkgbase}-${pkgver}
+  
+  # Ark 15.12 can't open rar file with space in path correctly.
+  # https://git.reviewboard.kde.org/r/126360/diff/2#0
+  patch  -Np1  -i  ../ark-rar-path-with-space.patch
+  
 }
 
 build() {

ark/ark-rar-path-with-space.patch

@@ -0,0 +1,24 @@
+diff --git a/plugins/clirarplugin/cliplugin.cpp b/plugins/clirarplugin/cliplugin.cpp
+index 23eb6cc..9b3e086 100644
+--- a/plugins/clirarplugin/cliplugin.cpp
++++ b/plugins/clirarplugin/cliplugin.cpp
+@@ -172,7 +172,8 @@ void CliPlugin::handleUnrar5Line(const QString &line) {
+     if (m_parseState == ParseStateComment) {
+ 
+         // RegExp matching end of comment field.
+-        QRegularExpression rxCommentEnd(QStringLiteral("^Archive: \\S+$"));
++        // FIXME: Comment itself could also contain the Archive path string here.
++        QRegularExpression rxCommentEnd(QStringLiteral("^Archive: .+$"));
+ 
+         if (rxCommentEnd.match(line).hasMatch()) {
+             m_parseState = ParseStateHeader;
+@@ -293,7 +294,8 @@ void CliPlugin::handleUnrar4Line(const QString &line) {
+     if (m_parseState == ParseStateComment) {
+ 
+         // RegExp matching end of comment field.
+-        QRegularExpression rxCommentEnd(QStringLiteral("^(Solid archive|Archive|Volume) \\S+$"));
++        // FIXME: Comment itself could also contain the Archive path string here.
++        QRegularExpression rxCommentEnd(QStringLiteral("^(Solid archive|Archive|Volume) .+$"));
+ 
+         if (rxCommentEnd.match(line).hasMatch()) {
+ 

checksums.txt

@@ -2,7 +2,7 @@
 ee195dea2b26c6411f765429dd89f21d57d59e321ace5bf45726add0f216bfb3  akonadi-calendar-15.12.0.tar.xz
 ae8fec72abf5cfc312ccff8a3f23bf87bbe062a50c74e327a086851952090da0  akonadi-search-15.12.0.tar.xz
 9acf7309d557a69677091722bd186830da659ddb5feb97b7ab431f970ca953fc  analitza-15.12.0.tar.xz
-eb06a8b832fd2dbe1f7c1eefa03fd178c864975ba70d1dee7ab1ec63551edf71  ark-15.12.0.tar.xz
+c3a67c3a1c377989d567dc9c0228b684dc475612405d3c4638f40d0dbd87bd7c  ark-15.12.0.tar.xz
 5aa1f578fc78e50d979907e18cbad6ea79016ce3bae249688d39f66eff5c2b71  artikulate-15.12.0.tar.xz
 a5d95ee92acf89d178ba886cece3fa2ecffb43e547df6b4be8deadb106d9cb04  audiocd-kio-15.12.0.tar.xz
 e17e97a5989b0ccfc68a65b093db340bc4962a23ebbcc825f93c975916b77251  baloo-widgets-15.12.0.tar.xz
@@ -124,7 +124,7 @@ d7544f71a01697ab230932909269ece2f77c8043543d511c9ba517de0dd5ebbf  kruler-15.12.0
 6e43e32958218882bf0358b8e64fb8d60960990c8f2b758029d01b1992ea8dff  ksaneplugin-15.12.0.tar.xz
 80bb0d1abb2d6a156e718b28f1e19ed1f0c266628a48b0e04d9dd4b998e017f4  kscd-15.12.0.tar.xz
 2ac81c17beda68110f2c9825fb2d20f3ed7b8cf984127f143fa52023d0cbf8ab  kshisen-15.12.0.tar.xz
-5f80be5c433d2c94db9b6eb10af7352d914b25809154579f503b00019dde125c  ksirk-15.12.0.tar.xz
+1e72de20a031f4e3c25a55b7fe8fcaeb51c9b8920d2bb1e98e48da7bfebdfe12  ksirk-15.12.0.tar.xz
 50d720fbb18d5e7768df077960add14d1f59622707bc73f8940333d9d03eb3de  ksnakeduel-15.12.0.tar.xz
 0c8b8fc04087e0cde46b4fa33a9ccd17a7aa484d39a53d335148b026ffe3e393  kspaceduel-15.12.0.tar.xz
 3fc650f190c214844e467b43f9c9f4cb3b999dc1a9faf647fb3fca97920cbff0  ksquares-15.12.0.tar.xz

kdegames-ksirk/PKGBUILD

@@ -4,7 +4,7 @@ source ../kdeapps.conf
 pkgname=kdegames-ksirk
 _pkgname=ksirk
 pkgver=${_kdever}
-pkgrel=1
+pkgrel=2
 pkgdesc="World domination strategy game"
 arch=('x86_64')
 url='http://kde.org/applications/games/ksirk/'