version bump, and one less patch

2 files changed, 13 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bb2b2819f49..7646a13ffaf 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 = 2
+	pkgver = 18.04.1
+	pkgrel = 1
 	url = https://kde.org/applications/system/dolphin/
 	arch = x86_64
 	groups = kde-applications
@@ -22,16 +22,14 @@ pkgbase = dolphin-meld
 	optdepends = ruby: installing new service menus from KDE Store
 	optdepends = kdegraphics-thumbnailers: PDF and PS thumbnails
 	optdepends = konsole: terminal panel
-	provides = dolphin=18.04.0
-	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
+	provides = dolphin=18.04.1
+	conflicts = dolphin=18.04.1
+	source = https://download.kde.org/stable/applications/18.04.1/src/dolphin-meld-18.04.1.tar.xz
+	source = https://download.kde.org/stable/applications/18.04.1/src/dolphin-meld-18.04.1.tar.xz.sig
 	validpgpkeys = CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7
 	validpgpkeys = F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87
-	sha256sums = b5068a26b34e2edac25f3528799ce48c7d211ee70113751275b01a5c87ba6d53
+	sha256sums = 50db0e6c59383c3141ba96f733d36ac63b8f4d3e1f3d233b4a27da5931179587
 	sha256sums = SKIP
-	sha256sums = 5b05a6658ebc633e36fd86b8e8f90751a200bb1aa15a11cc5500fa87e017bf89
 
 pkgname = dolphin-meld
 
diff --git a/PKGBUILD b/PKGBUILD
index 270efe9100c..ac743f95589 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,8 +7,8 @@
 
 _pkgname=dolphin
 pkgname=dolphin-meld
-pkgver=18.04.0
-pkgrel=2
+pkgver=18.04.1
+pkgrel=1
 pkgdesc="KDE File Manager, using Meld rather than Kompare"
 arch=(x86_64)
 url="https://kde.org/applications/system/dolphin/"
@@ -17,15 +17,13 @@ provides=("$_pkgname=$pkgver")
 conflicts=("$_pkgname=$pkgver")
 depends=(baloo-widgets knewstuff kio-extras kuiserver kcmutils kparts kinit)
 makedepends=(extra-cmake-modules kdoctools)
-optdepends=('kde-cli-tools: for editing file type options' 'ffmpegthumbs: video thumbnails' 
+optdepends=('kde-cli-tools: for editing file type options' 'ffmpegthumbs: video thumbnails'
             '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}
-        kdebug-393528.patch::"https://cgit.kde.org/dolphin.git/patch/?id=0c05b992")
-sha256sums=('b5068a26b34e2edac25f3528799ce48c7d211ee70113751275b01a5c87ba6d53'
-            'SKIP'
-            '5b05a6658ebc633e36fd86b8e8f90751a200bb1aa15a11cc5500fa87e017bf89')
+source=("https://download.kde.org/stable/applications/$pkgver/src/$_pkgname-$pkgver.tar.xz"{,.sig})
+sha256sums=('50db0e6c59383c3141ba96f733d36ac63b8f4d3e1f3d233b4a27da5931179587'
+            'SKIP')
 validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid <aacid@kde.org>
               F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck <cfeck@kde.org>
 
@@ -34,9 +32,6 @@ 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() {