[arch-commits] Commit in dolphin/repos/extra-x86_64 (PKGBUILD PKGBUILD)

[Antonio Rojas]

    Date: Sunday, April 29, 2018 @ 17:57:05
  Author: arojas
Revision: 323119

archrelease: copy trunk to extra-x86_64

Added:
  dolphin/repos/extra-x86_64/PKGBUILD
    (from rev 323118, dolphin/trunk/PKGBUILD)
Deleted:
  dolphin/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |   87 ++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 46 insertions(+), 41 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-04-29 17:49:44 UTC (rev 323118)
+++ PKGBUILD	2018-04-29 17:57:05 UTC (rev 323119)
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer: Antonio Rojas <arojas at archlinux,org>
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Pierre Schmitz <pierre at archlinux.de>
-
-pkgname=dolphin
-pkgver=18.04.0
-pkgrel=1
-pkgdesc="KDE File Manager"
-arch=(x86_64)
-url="https://kde.org/applications/system/dolphin/"
-license=(LGPL)
-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' 
-            '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})
-sha256sums=('b5068a26b34e2edac25f3528799ce48c7d211ee70113751275b01a5c87ba6d53'
-            'SKIP')
-validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid <aacid at kde.org>
-              F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck <cfeck at kde.org>
-
-prepare() {
-  mkdir -p build
-}
-
-build() {
-  cd build
-  cmake ../$pkgname-$pkgver \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_LIBDIR=lib \
-    -DBUILD_TESTING=OFF
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="$pkgdir" install
-}

Copied: dolphin/repos/extra-x86_64/PKGBUILD (from rev 323118, dolphin/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-04-29 17:57:05 UTC (rev 323119)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Antonio Rojas <arojas at archlinux,org>
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
+
+pkgname=dolphin
+pkgver=18.04.0
+pkgrel=2
+pkgdesc="KDE File Manager"
+arch=(x86_64)
+url="https://kde.org/applications/system/dolphin/"
+license=(LGPL)
+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' 
+            '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')
+validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid <aacid at kde.org>
+              F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck <cfeck at kde.org>
+
+prepare() {
+  mkdir -p build
+
+  cd $pkgname-$pkgver
+  patch -p1 -i ../kdebug-393528.patch # Fix crash with duplicated entries in user-places.xbel
+}
+
+build() {
+  cd build
+  cmake ../$pkgname-$pkgver \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=lib \
+    -DBUILD_TESTING=OFF
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR="$pkgdir" install
+}