[arch-commits] Commit in kdebase/repos (18 files)

Antonio Rojas arojas at archlinux.org
Thu Apr 30 08:35:18 UTC 2015


    Date: Thursday, April 30, 2015 @ 10:35:18
  Author: arojas
Revision: 238289

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  kdebase/repos/extra-i686/PKGBUILD
    (from rev 238288, kdebase/trunk/PKGBUILD)
  kdebase/repos/extra-i686/dolphin-places.patch
    (from rev 238288, kdebase/trunk/dolphin-places.patch)
  kdebase/repos/extra-i686/kdebase-dolphin.install
    (from rev 238288, kdebase/trunk/kdebase-dolphin.install)
  kdebase/repos/extra-i686/kdebase-konqueror.install
    (from rev 238288, kdebase/trunk/kdebase-konqueror.install)
  kdebase/repos/extra-i686/kdebase.install
    (from rev 238288, kdebase/trunk/kdebase.install)
  kdebase/repos/extra-x86_64/PKGBUILD
    (from rev 238288, kdebase/trunk/PKGBUILD)
  kdebase/repos/extra-x86_64/dolphin-places.patch
    (from rev 238288, kdebase/trunk/dolphin-places.patch)
  kdebase/repos/extra-x86_64/kdebase-dolphin.install
    (from rev 238288, kdebase/trunk/kdebase-dolphin.install)
  kdebase/repos/extra-x86_64/kdebase-konqueror.install
    (from rev 238288, kdebase/trunk/kdebase-konqueror.install)
  kdebase/repos/extra-x86_64/kdebase.install
    (from rev 238288, kdebase/trunk/kdebase.install)
Deleted:
  kdebase/repos/extra-i686/PKGBUILD
  kdebase/repos/extra-i686/kdebase-dolphin.install
  kdebase/repos/extra-i686/kdebase-konqueror.install
  kdebase/repos/extra-i686/kdebase.install
  kdebase/repos/extra-x86_64/PKGBUILD
  kdebase/repos/extra-x86_64/kdebase-dolphin.install
  kdebase/repos/extra-x86_64/kdebase-konqueror.install
  kdebase/repos/extra-x86_64/kdebase.install

----------------------------------------+
 /PKGBUILD                              |  288 +++++++++++++++++++++++++++++++
 /kdebase-dolphin.install               |   22 ++
 /kdebase-konqueror.install             |   24 ++
 /kdebase.install                       |   22 ++
 extra-i686/PKGBUILD                    |  139 --------------
 extra-i686/dolphin-places.patch        |   26 ++
 extra-i686/kdebase-dolphin.install     |   11 -
 extra-i686/kdebase-konqueror.install   |   12 -
 extra-i686/kdebase.install             |   11 -
 extra-x86_64/PKGBUILD                  |  139 --------------
 extra-x86_64/dolphin-places.patch      |   26 ++
 extra-x86_64/kdebase-dolphin.install   |   11 -
 extra-x86_64/kdebase-konqueror.install |   12 -
 extra-x86_64/kdebase.install           |   11 -
 14 files changed, 408 insertions(+), 346 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2015-04-30 08:34:07 UTC (rev 238288)
+++ extra-i686/PKGBUILD	2015-04-30 08:35:18 UTC (rev 238289)
@@ -1,139 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Pierre Schmitz <pierre at archlinux.de>
-
-pkgbase=kdebase
-pkgname=('kdebase-dolphin'
-         'kdebase-kdepasswd'
-         'kdebase-kdialog'
-         'kdebase-keditbookmarks'
-         'kdebase-kfind'
-         'kdebase-konq-plugins'
-         'kdebase-konqueror'
-         'kdebase-lib'
-         'kdebase-plasma')
-pkgver=15.04.0
-pkgrel=2
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde-applications' 'kdebase')
-makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml' 'baloo4-widgets')
-source=("http://download.kde.org/stable/applications/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz")
-sha1sums=('18ec78a547ca68b110d3b82a12a0001bf62d0b66')
-
-prepare() {
-  mkdir build
-}
-
-build() {
-  cd build
-  cmake ../kde-baseapps-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DKDE4_BUILD_TESTS=OFF \
-    -DCMAKE_SKIP_RPATH=ON \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package_kdebase-dolphin() {
-  pkgdesc='File Manager'
-  depends=('kdebase-runtime' 'kdebase-lib' 'baloo4-widgets')
-  optdepends=('kdegraphics-svgpart: thumbailers for SVG files'
-              'kdegraphics-thumbnailers: thumbnailers for various graphics files'
-              'kdemultimedia-ffmpegthumbs: thumbnailers for video files'
-              'kdemultimedia-mplayerthumbs: thumbnailers for video files'
-              'kdesdk-thumbnailers: thumbnailers for development files'
-              'icoutils: thumbnailers for MS files'
-              'ruby: servicemenu installation'
-              'konsolepart4: open terminal in context menu')
-  url="http://kde.org/applications/system/dolphin/"
-  install=kdebase-dolphin.install
-
-  cd "$srcdir"/build/dolphin
-  make DESTDIR="$pkgdir" install
-  cd "$srcdir"/build/doc/dolphin
-  make DESTDIR="$pkgdir" install
-}
-
-package_kdebase-kdepasswd() {
-  pkgdesc='Change Password'
-  depends=('kdebase-runtime' 'kdebase-lib')
-
-  cd "$srcdir"/build/kdepasswd
-  make DESTDIR="$pkgdir" install
-  cd "$srcdir"/build/doc/kdepasswd
-  make DESTDIR="$pkgdir" install
-}
-
-package_kdebase-kdialog() {
-  pkgdesc='A utility for displaying dialog boxes from shell scripts'
-  depends=('kdebase-runtime')
-
-  cd "$srcdir"/build/kdialog
-  make DESTDIR="$pkgdir" install
-}
-
-package_kdebase-keditbookmarks() {
-  pkgdesc='Bookmark Organizer and Editor'
-  depends=('kdebase-runtime')
-
-  cd "$srcdir"/build/keditbookmarks
-  make DESTDIR="$pkgdir" install
-}
-
-package_kdebase-kfind() {
-  pkgdesc='Find Files/Folders'
-  depends=('kdebase-runtime' 'kdebase-lib')
-  url="http://kde.org/applications/utilities/kfind/"
-  install='kdebase.install'
-
-  cd "$srcdir"/build/kfind
-  make DESTDIR="$pkgdir" install
-  cd "$srcdir"/build/doc/kfind
-  make DESTDIR="$pkgdir" install
-}
-
-package_kdebase-konq-plugins() {
-  pkgdesc='Extra plugins for Konqueror'
-  depends=('kdebase-konqueror' 'tidyhtml')
-  replaces=('konq-plugins')
-  install='kdebase.install'
-
-  cd "$srcdir"/build/konq-plugins
-  make DESTDIR="$pkgdir" install
-}
-
-package_kdebase-konqueror() {
-  pkgdesc='KDE File Manager & Web Browser'
-  depends=('kdebase-dolphin' 'kdebase-keditbookmarks')
-  optdepends=('kwebkitpart: to enable webkit engine')
-  url="http://kde.org/applications/internet/konqueror/"
-  install='kdebase-konqueror.install'
-  conflicts=('kdebase-nsplugins')
-  replaces=('kdebase-nsplugins')
-
-  for i in konqueror doc/konqueror nsplugins; do
-    cd "$srcdir"/build/${i}
-    make DESTDIR="$pkgdir" install
-  done
-}
-
-package_kdebase-lib() {
-  pkgdesc='KDE libraries for the basic desktop applications'
-  groups=()
-  depends=('kdelibs')
-
-  cd "$srcdir"/build/lib
-  make DESTDIR="$pkgdir" install
-}
-
-package_kdebase-plasma() {
-  pkgdesc='Display the contents of folders (User´s home folder as default)'
-  depends=('kdebase-workspace' 'kdebase-lib')
-  groups=()
-
-  cd "$srcdir"/build/plasma
-  make DESTDIR="$pkgdir" install
-}

Copied: kdebase/repos/extra-i686/PKGBUILD (from rev 238288, kdebase/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2015-04-30 08:35:18 UTC (rev 238289)
@@ -0,0 +1,144 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
+
+pkgbase=kdebase
+pkgname=('kdebase-dolphin'
+         'kdebase-kdepasswd'
+         'kdebase-kdialog'
+         'kdebase-keditbookmarks'
+         'kdebase-kfind'
+         'kdebase-konq-plugins'
+         'kdebase-konqueror'
+         'kdebase-lib'
+         'kdebase-plasma')
+pkgver=15.04.0
+pkgrel=3
+arch=('i686' 'x86_64')
+url='http://www.kde.org'
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde-applications' 'kdebase')
+makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml' 'baloo4-widgets')
+source=("http://download.kde.org/stable/applications/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz" 'dolphin-places.patch')
+sha1sums=('18ec78a547ca68b110d3b82a12a0001bf62d0b66'
+          'a3c0536eece94ac288184ceaed3b6bde9241f2dc')
+
+prepare() {
+  mkdir build
+
+# Fix disappearing bookmarks in Dolphin https://bugs.kde.org/show_bug.cgi?id=345174
+  cd kde-baseapps-$pkgver
+  patch -p1 -i "$srcdir"/dolphin-places.patch
+}
+
+build() {
+  cd build
+  cmake ../kde-baseapps-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DKDE4_BUILD_TESTS=OFF \
+    -DCMAKE_SKIP_RPATH=ON \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package_kdebase-dolphin() {
+  pkgdesc='File Manager'
+  depends=('kdebase-runtime' 'kdebase-lib' 'baloo4-widgets')
+  optdepends=('kdegraphics-svgpart: thumbailers for SVG files'
+              'kdegraphics-thumbnailers: thumbnailers for various graphics files'
+              'kdemultimedia-ffmpegthumbs: thumbnailers for video files'
+              'kdemultimedia-mplayerthumbs: thumbnailers for video files'
+              'kdesdk-thumbnailers: thumbnailers for development files'
+              'icoutils: thumbnailers for MS files'
+              'ruby: servicemenu installation'
+              'konsolepart4: open terminal in context menu')
+  url="http://kde.org/applications/system/dolphin/"
+  install=kdebase-dolphin.install
+
+  cd "$srcdir"/build/dolphin
+  make DESTDIR="$pkgdir" install
+  cd "$srcdir"/build/doc/dolphin
+  make DESTDIR="$pkgdir" install
+}
+
+package_kdebase-kdepasswd() {
+  pkgdesc='Change Password'
+  depends=('kdebase-runtime' 'kdebase-lib')
+
+  cd "$srcdir"/build/kdepasswd
+  make DESTDIR="$pkgdir" install
+  cd "$srcdir"/build/doc/kdepasswd
+  make DESTDIR="$pkgdir" install
+}
+
+package_kdebase-kdialog() {
+  pkgdesc='A utility for displaying dialog boxes from shell scripts'
+  depends=('kdebase-runtime')
+
+  cd "$srcdir"/build/kdialog
+  make DESTDIR="$pkgdir" install
+}
+
+package_kdebase-keditbookmarks() {
+  pkgdesc='Bookmark Organizer and Editor'
+  depends=('kdebase-runtime')
+
+  cd "$srcdir"/build/keditbookmarks
+  make DESTDIR="$pkgdir" install
+}
+
+package_kdebase-kfind() {
+  pkgdesc='Find Files/Folders'
+  depends=('kdebase-runtime' 'kdebase-lib')
+  url="http://kde.org/applications/utilities/kfind/"
+  install='kdebase.install'
+
+  cd "$srcdir"/build/kfind
+  make DESTDIR="$pkgdir" install
+  cd "$srcdir"/build/doc/kfind
+  make DESTDIR="$pkgdir" install
+}
+
+package_kdebase-konq-plugins() {
+  pkgdesc='Extra plugins for Konqueror'
+  depends=('kdebase-konqueror' 'tidyhtml')
+  replaces=('konq-plugins')
+  install='kdebase.install'
+
+  cd "$srcdir"/build/konq-plugins
+  make DESTDIR="$pkgdir" install
+}
+
+package_kdebase-konqueror() {
+  pkgdesc='KDE File Manager & Web Browser'
+  depends=('kdebase-dolphin' 'kdebase-keditbookmarks')
+  optdepends=('kwebkitpart: to enable webkit engine')
+  url="http://kde.org/applications/internet/konqueror/"
+  install='kdebase-konqueror.install'
+  conflicts=('kdebase-nsplugins')
+  replaces=('kdebase-nsplugins')
+
+  for i in konqueror doc/konqueror nsplugins; do
+    cd "$srcdir"/build/${i}
+    make DESTDIR="$pkgdir" install
+  done
+}
+
+package_kdebase-lib() {
+  pkgdesc='KDE libraries for the basic desktop applications'
+  groups=()
+  depends=('kdelibs')
+
+  cd "$srcdir"/build/lib
+  make DESTDIR="$pkgdir" install
+}
+
+package_kdebase-plasma() {
+  pkgdesc='Display the contents of folders (User´s home folder as default)'
+  depends=('kdebase-workspace' 'kdebase-lib')
+  groups=()
+
+  cd "$srcdir"/build/plasma
+  make DESTDIR="$pkgdir" install
+}

Copied: kdebase/repos/extra-i686/dolphin-places.patch (from rev 238288, kdebase/trunk/dolphin-places.patch)
===================================================================
--- extra-i686/dolphin-places.patch	                        (rev 0)
+++ extra-i686/dolphin-places.patch	2015-04-30 08:35:18 UTC (rev 238289)
@@ -0,0 +1,26 @@
+From: Emmanuel Pescosta <emmanuelpescosta099 at gmail.com>
+Date: Thu, 30 Apr 2015 08:12:24 +0000
+Subject: Use user-places.xbel instead of bookmarks.xml in places model.
+X-Git-Url: http://quickgit.kde.org/?p=kde-baseapps.git&a=commitdiff&h=270d2affaafcc9e87ba14f82bfe579e22607e2d2
+---
+Use user-places.xbel instead of bookmarks.xml in places model.
+
+FIXED-IN: 15.04.1
+CCBUG: 345174
+---
+
+
+--- a/dolphin/src/panels/places/placesitemmodel.cpp
++++ b/dolphin/src/panels/places/placesitemmodel.cpp
+@@ -85,8 +85,8 @@
+     Baloo::IndexerConfig config;
+     m_fileIndexingEnabled = config.fileIndexingEnabled();
+ #endif
+-    const QString file = KStandardDirs::locateLocal("data", "kfileplaces/bookmarks.xml");
+-    m_bookmarkManager = KBookmarkManager::managerForFile(file, "kfilePlaces");
++    const QString file = KStandardDirs().localxdgdatadir() + "user-places.xbel";
++    m_bookmarkManager = KBookmarkManager::managerForExternalFile(file);
+ 
+     createSystemBookmarks();
+     initializeAvailableDevices();
+

Deleted: extra-i686/kdebase-dolphin.install
===================================================================
--- extra-i686/kdebase-dolphin.install	2015-04-30 08:34:07 UTC (rev 238288)
+++ extra-i686/kdebase-dolphin.install	2015-04-30 08:35:18 UTC (rev 238289)
@@ -1,11 +0,0 @@
-post_install() {
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}

Copied: kdebase/repos/extra-i686/kdebase-dolphin.install (from rev 238288, kdebase/trunk/kdebase-dolphin.install)
===================================================================
--- extra-i686/kdebase-dolphin.install	                        (rev 0)
+++ extra-i686/kdebase-dolphin.install	2015-04-30 08:35:18 UTC (rev 238289)
@@ -0,0 +1,11 @@
+post_install() {
+    update-desktop-database -q
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}

Deleted: extra-i686/kdebase-konqueror.install
===================================================================
--- extra-i686/kdebase-konqueror.install	2015-04-30 08:34:07 UTC (rev 238288)
+++ extra-i686/kdebase-konqueror.install	2015-04-30 08:35:18 UTC (rev 238289)
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}

Copied: kdebase/repos/extra-i686/kdebase-konqueror.install (from rev 238288, kdebase/trunk/kdebase-konqueror.install)
===================================================================
--- extra-i686/kdebase-konqueror.install	                        (rev 0)
+++ extra-i686/kdebase-konqueror.install	2015-04-30 08:35:18 UTC (rev 238289)
@@ -0,0 +1,12 @@
+post_install() {
+    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}

Deleted: extra-i686/kdebase.install
===================================================================
--- extra-i686/kdebase.install	2015-04-30 08:34:07 UTC (rev 238288)
+++ extra-i686/kdebase.install	2015-04-30 08:35:18 UTC (rev 238289)
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}

Copied: kdebase/repos/extra-i686/kdebase.install (from rev 238288, kdebase/trunk/kdebase.install)
===================================================================
--- extra-i686/kdebase.install	                        (rev 0)
+++ extra-i686/kdebase.install	2015-04-30 08:35:18 UTC (rev 238289)
@@ -0,0 +1,11 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2015-04-30 08:34:07 UTC (rev 238288)
+++ extra-x86_64/PKGBUILD	2015-04-30 08:35:18 UTC (rev 238289)
@@ -1,139 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Pierre Schmitz <pierre at archlinux.de>
-
-pkgbase=kdebase
-pkgname=('kdebase-dolphin'
-         'kdebase-kdepasswd'
-         'kdebase-kdialog'
-         'kdebase-keditbookmarks'
-         'kdebase-kfind'
-         'kdebase-konq-plugins'
-         'kdebase-konqueror'
-         'kdebase-lib'
-         'kdebase-plasma')
-pkgver=15.04.0
-pkgrel=2
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde-applications' 'kdebase')
-makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml' 'baloo4-widgets')
-source=("http://download.kde.org/stable/applications/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz")
-sha1sums=('18ec78a547ca68b110d3b82a12a0001bf62d0b66')
-
-prepare() {
-  mkdir build
-}
-
-build() {
-  cd build
-  cmake ../kde-baseapps-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DKDE4_BUILD_TESTS=OFF \
-    -DCMAKE_SKIP_RPATH=ON \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package_kdebase-dolphin() {
-  pkgdesc='File Manager'
-  depends=('kdebase-runtime' 'kdebase-lib' 'baloo4-widgets')
-  optdepends=('kdegraphics-svgpart: thumbailers for SVG files'
-              'kdegraphics-thumbnailers: thumbnailers for various graphics files'
-              'kdemultimedia-ffmpegthumbs: thumbnailers for video files'
-              'kdemultimedia-mplayerthumbs: thumbnailers for video files'
-              'kdesdk-thumbnailers: thumbnailers for development files'
-              'icoutils: thumbnailers for MS files'
-              'ruby: servicemenu installation'
-              'konsolepart4: open terminal in context menu')
-  url="http://kde.org/applications/system/dolphin/"
-  install=kdebase-dolphin.install
-
-  cd "$srcdir"/build/dolphin
-  make DESTDIR="$pkgdir" install
-  cd "$srcdir"/build/doc/dolphin
-  make DESTDIR="$pkgdir" install
-}
-
-package_kdebase-kdepasswd() {
-  pkgdesc='Change Password'
-  depends=('kdebase-runtime' 'kdebase-lib')
-
-  cd "$srcdir"/build/kdepasswd
-  make DESTDIR="$pkgdir" install
-  cd "$srcdir"/build/doc/kdepasswd
-  make DESTDIR="$pkgdir" install
-}
-
-package_kdebase-kdialog() {
-  pkgdesc='A utility for displaying dialog boxes from shell scripts'
-  depends=('kdebase-runtime')
-
-  cd "$srcdir"/build/kdialog
-  make DESTDIR="$pkgdir" install
-}
-
-package_kdebase-keditbookmarks() {
-  pkgdesc='Bookmark Organizer and Editor'
-  depends=('kdebase-runtime')
-
-  cd "$srcdir"/build/keditbookmarks
-  make DESTDIR="$pkgdir" install
-}
-
-package_kdebase-kfind() {
-  pkgdesc='Find Files/Folders'
-  depends=('kdebase-runtime' 'kdebase-lib')
-  url="http://kde.org/applications/utilities/kfind/"
-  install='kdebase.install'
-
-  cd "$srcdir"/build/kfind
-  make DESTDIR="$pkgdir" install
-  cd "$srcdir"/build/doc/kfind
-  make DESTDIR="$pkgdir" install
-}
-
-package_kdebase-konq-plugins() {
-  pkgdesc='Extra plugins for Konqueror'
-  depends=('kdebase-konqueror' 'tidyhtml')
-  replaces=('konq-plugins')
-  install='kdebase.install'
-
-  cd "$srcdir"/build/konq-plugins
-  make DESTDIR="$pkgdir" install
-}
-
-package_kdebase-konqueror() {
-  pkgdesc='KDE File Manager & Web Browser'
-  depends=('kdebase-dolphin' 'kdebase-keditbookmarks')
-  optdepends=('kwebkitpart: to enable webkit engine')
-  url="http://kde.org/applications/internet/konqueror/"
-  install='kdebase-konqueror.install'
-  conflicts=('kdebase-nsplugins')
-  replaces=('kdebase-nsplugins')
-
-  for i in konqueror doc/konqueror nsplugins; do
-    cd "$srcdir"/build/${i}
-    make DESTDIR="$pkgdir" install
-  done
-}
-
-package_kdebase-lib() {
-  pkgdesc='KDE libraries for the basic desktop applications'
-  groups=()
-  depends=('kdelibs')
-
-  cd "$srcdir"/build/lib
-  make DESTDIR="$pkgdir" install
-}
-
-package_kdebase-plasma() {
-  pkgdesc='Display the contents of folders (User´s home folder as default)'
-  depends=('kdebase-workspace' 'kdebase-lib')
-  groups=()
-
-  cd "$srcdir"/build/plasma
-  make DESTDIR="$pkgdir" install
-}

Copied: kdebase/repos/extra-x86_64/PKGBUILD (from rev 238288, kdebase/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2015-04-30 08:35:18 UTC (rev 238289)
@@ -0,0 +1,144 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
+
+pkgbase=kdebase
+pkgname=('kdebase-dolphin'
+         'kdebase-kdepasswd'
+         'kdebase-kdialog'
+         'kdebase-keditbookmarks'
+         'kdebase-kfind'
+         'kdebase-konq-plugins'
+         'kdebase-konqueror'
+         'kdebase-lib'
+         'kdebase-plasma')
+pkgver=15.04.0
+pkgrel=3
+arch=('i686' 'x86_64')
+url='http://www.kde.org'
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde-applications' 'kdebase')
+makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml' 'baloo4-widgets')
+source=("http://download.kde.org/stable/applications/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz" 'dolphin-places.patch')
+sha1sums=('18ec78a547ca68b110d3b82a12a0001bf62d0b66'
+          'a3c0536eece94ac288184ceaed3b6bde9241f2dc')
+
+prepare() {
+  mkdir build
+
+# Fix disappearing bookmarks in Dolphin https://bugs.kde.org/show_bug.cgi?id=345174
+  cd kde-baseapps-$pkgver
+  patch -p1 -i "$srcdir"/dolphin-places.patch
+}
+
+build() {
+  cd build
+  cmake ../kde-baseapps-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DKDE4_BUILD_TESTS=OFF \
+    -DCMAKE_SKIP_RPATH=ON \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package_kdebase-dolphin() {
+  pkgdesc='File Manager'
+  depends=('kdebase-runtime' 'kdebase-lib' 'baloo4-widgets')
+  optdepends=('kdegraphics-svgpart: thumbailers for SVG files'
+              'kdegraphics-thumbnailers: thumbnailers for various graphics files'
+              'kdemultimedia-ffmpegthumbs: thumbnailers for video files'
+              'kdemultimedia-mplayerthumbs: thumbnailers for video files'
+              'kdesdk-thumbnailers: thumbnailers for development files'
+              'icoutils: thumbnailers for MS files'
+              'ruby: servicemenu installation'
+              'konsolepart4: open terminal in context menu')
+  url="http://kde.org/applications/system/dolphin/"
+  install=kdebase-dolphin.install
+
+  cd "$srcdir"/build/dolphin
+  make DESTDIR="$pkgdir" install
+  cd "$srcdir"/build/doc/dolphin
+  make DESTDIR="$pkgdir" install
+}
+
+package_kdebase-kdepasswd() {
+  pkgdesc='Change Password'
+  depends=('kdebase-runtime' 'kdebase-lib')
+
+  cd "$srcdir"/build/kdepasswd
+  make DESTDIR="$pkgdir" install
+  cd "$srcdir"/build/doc/kdepasswd
+  make DESTDIR="$pkgdir" install
+}
+
+package_kdebase-kdialog() {
+  pkgdesc='A utility for displaying dialog boxes from shell scripts'
+  depends=('kdebase-runtime')
+
+  cd "$srcdir"/build/kdialog
+  make DESTDIR="$pkgdir" install
+}
+
+package_kdebase-keditbookmarks() {
+  pkgdesc='Bookmark Organizer and Editor'
+  depends=('kdebase-runtime')
+
+  cd "$srcdir"/build/keditbookmarks
+  make DESTDIR="$pkgdir" install
+}
+
+package_kdebase-kfind() {
+  pkgdesc='Find Files/Folders'
+  depends=('kdebase-runtime' 'kdebase-lib')
+  url="http://kde.org/applications/utilities/kfind/"
+  install='kdebase.install'
+
+  cd "$srcdir"/build/kfind
+  make DESTDIR="$pkgdir" install
+  cd "$srcdir"/build/doc/kfind
+  make DESTDIR="$pkgdir" install
+}
+
+package_kdebase-konq-plugins() {
+  pkgdesc='Extra plugins for Konqueror'
+  depends=('kdebase-konqueror' 'tidyhtml')
+  replaces=('konq-plugins')
+  install='kdebase.install'
+
+  cd "$srcdir"/build/konq-plugins
+  make DESTDIR="$pkgdir" install
+}
+
+package_kdebase-konqueror() {
+  pkgdesc='KDE File Manager & Web Browser'
+  depends=('kdebase-dolphin' 'kdebase-keditbookmarks')
+  optdepends=('kwebkitpart: to enable webkit engine')
+  url="http://kde.org/applications/internet/konqueror/"
+  install='kdebase-konqueror.install'
+  conflicts=('kdebase-nsplugins')
+  replaces=('kdebase-nsplugins')
+
+  for i in konqueror doc/konqueror nsplugins; do
+    cd "$srcdir"/build/${i}
+    make DESTDIR="$pkgdir" install
+  done
+}
+
+package_kdebase-lib() {
+  pkgdesc='KDE libraries for the basic desktop applications'
+  groups=()
+  depends=('kdelibs')
+
+  cd "$srcdir"/build/lib
+  make DESTDIR="$pkgdir" install
+}
+
+package_kdebase-plasma() {
+  pkgdesc='Display the contents of folders (User´s home folder as default)'
+  depends=('kdebase-workspace' 'kdebase-lib')
+  groups=()
+
+  cd "$srcdir"/build/plasma
+  make DESTDIR="$pkgdir" install
+}

Copied: kdebase/repos/extra-x86_64/dolphin-places.patch (from rev 238288, kdebase/trunk/dolphin-places.patch)
===================================================================
--- extra-x86_64/dolphin-places.patch	                        (rev 0)
+++ extra-x86_64/dolphin-places.patch	2015-04-30 08:35:18 UTC (rev 238289)
@@ -0,0 +1,26 @@
+From: Emmanuel Pescosta <emmanuelpescosta099 at gmail.com>
+Date: Thu, 30 Apr 2015 08:12:24 +0000
+Subject: Use user-places.xbel instead of bookmarks.xml in places model.
+X-Git-Url: http://quickgit.kde.org/?p=kde-baseapps.git&a=commitdiff&h=270d2affaafcc9e87ba14f82bfe579e22607e2d2
+---
+Use user-places.xbel instead of bookmarks.xml in places model.
+
+FIXED-IN: 15.04.1
+CCBUG: 345174
+---
+
+
+--- a/dolphin/src/panels/places/placesitemmodel.cpp
++++ b/dolphin/src/panels/places/placesitemmodel.cpp
+@@ -85,8 +85,8 @@
+     Baloo::IndexerConfig config;
+     m_fileIndexingEnabled = config.fileIndexingEnabled();
+ #endif
+-    const QString file = KStandardDirs::locateLocal("data", "kfileplaces/bookmarks.xml");
+-    m_bookmarkManager = KBookmarkManager::managerForFile(file, "kfilePlaces");
++    const QString file = KStandardDirs().localxdgdatadir() + "user-places.xbel";
++    m_bookmarkManager = KBookmarkManager::managerForExternalFile(file);
+ 
+     createSystemBookmarks();
+     initializeAvailableDevices();
+

Deleted: extra-x86_64/kdebase-dolphin.install
===================================================================
--- extra-x86_64/kdebase-dolphin.install	2015-04-30 08:34:07 UTC (rev 238288)
+++ extra-x86_64/kdebase-dolphin.install	2015-04-30 08:35:18 UTC (rev 238289)
@@ -1,11 +0,0 @@
-post_install() {
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}

Copied: kdebase/repos/extra-x86_64/kdebase-dolphin.install (from rev 238288, kdebase/trunk/kdebase-dolphin.install)
===================================================================
--- extra-x86_64/kdebase-dolphin.install	                        (rev 0)
+++ extra-x86_64/kdebase-dolphin.install	2015-04-30 08:35:18 UTC (rev 238289)
@@ -0,0 +1,11 @@
+post_install() {
+    update-desktop-database -q
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}

Deleted: extra-x86_64/kdebase-konqueror.install
===================================================================
--- extra-x86_64/kdebase-konqueror.install	2015-04-30 08:34:07 UTC (rev 238288)
+++ extra-x86_64/kdebase-konqueror.install	2015-04-30 08:35:18 UTC (rev 238289)
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}

Copied: kdebase/repos/extra-x86_64/kdebase-konqueror.install (from rev 238288, kdebase/trunk/kdebase-konqueror.install)
===================================================================
--- extra-x86_64/kdebase-konqueror.install	                        (rev 0)
+++ extra-x86_64/kdebase-konqueror.install	2015-04-30 08:35:18 UTC (rev 238289)
@@ -0,0 +1,12 @@
+post_install() {
+    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}

Deleted: extra-x86_64/kdebase.install
===================================================================
--- extra-x86_64/kdebase.install	2015-04-30 08:34:07 UTC (rev 238288)
+++ extra-x86_64/kdebase.install	2015-04-30 08:35:18 UTC (rev 238289)
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}

Copied: kdebase/repos/extra-x86_64/kdebase.install (from rev 238288, kdebase/trunk/kdebase.install)
===================================================================
--- extra-x86_64/kdebase.install	                        (rev 0)
+++ extra-x86_64/kdebase.install	2015-04-30 08:35:18 UTC (rev 238289)
@@ -0,0 +1,11 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}



More information about the arch-commits mailing list