patch that official arch pkg uses (crash-fix)

2 files changed, 11 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ed6c08a3a16..bb2b2819f49 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = dolphin-meld
 	pkgdesc = KDE File Manager, using Meld rather than Kompare
 	pkgver = 18.04.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://kde.org/applications/system/dolphin/
 	arch = x86_64
 	groups = kde-applications
@@ -26,10 +26,12 @@ pkgbase = dolphin-meld
 	conflicts = dolphin=18.04.0
 	source = https://download.kde.org/stable/applications/18.04.0/src/dolphin-18.04.0.tar.xz
 	source = https://download.kde.org/stable/applications/18.04.0/src/dolphin-18.04.0.tar.xz.sig
+	source = kdebug-393528.patch::https://cgit.kde.org/dolphin.git/patch/?id=0c05b992
 	validpgpkeys = CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7
 	validpgpkeys = F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87
 	sha256sums = b5068a26b34e2edac25f3528799ce48c7d211ee70113751275b01a5c87ba6d53
 	sha256sums = SKIP
+	sha256sums = 5b05a6658ebc633e36fd86b8e8f90751a200bb1aa15a11cc5500fa87e017bf89
 
 pkgname = dolphin-meld
 
diff --git a/PKGBUILD b/PKGBUILD
index 3fa63cd5c5f..270efe9100c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@
 _pkgname=dolphin
 pkgname=dolphin-meld
 pkgver=18.04.0
-pkgrel=1
+pkgrel=2
 pkgdesc="KDE File Manager, using Meld rather than Kompare"
 arch=(x86_64)
 url="https://kde.org/applications/system/dolphin/"
@@ -21,9 +21,11 @@ optdepends=('kde-cli-tools: for editing file type options' 'ffmpegthumbs: video
             'meld: file comparisons'
             'ruby: installing new service menus from KDE Store' 'kdegraphics-thumbnailers: PDF and PS thumbnails' 'konsole: terminal panel')
 groups=(kde-applications kdebase)
-source=("https://download.kde.org/stable/applications/$pkgver/src/$_pkgname-$pkgver.tar.xz"{,.sig})
+source=("https://download.kde.org/stable/applications/$pkgver/src/$_pkgname-$pkgver.tar.xz"{,.sig}
+        kdebug-393528.patch::"https://cgit.kde.org/dolphin.git/patch/?id=0c05b992")
 sha256sums=('b5068a26b34e2edac25f3528799ce48c7d211ee70113751275b01a5c87ba6d53'
-            'SKIP')
+            'SKIP'
+            '5b05a6658ebc633e36fd86b8e8f90751a200bb1aa15a11cc5500fa87e017bf89')
 validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid <aacid@kde.org>
               F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck <cfeck@kde.org>
 
@@ -32,6 +34,9 @@ prepare() {
   cd $_pkgname-$pkgver/src
   sed -i 's/kompare -c/meld/g' dolphinmainwindow.cpp
   sed -i 's/findExecutable(QStringLiteral("kompare")).isEmpty()/findExecutable(QStringLiteral("meld")).isEmpty()/g' dolphinmainwindow.cpp
+
+  cd ..
+  patch -p1 -i ../kdebug-393528.patch # Fix crash with duplicated entries in user-places.xbel
 }
 
 build() {