[arch-commits] Commit in (8 files)

[Felix Yan]

    Date: Thursday, January 15, 2015 @ 12:13:01
  Author: fyan
Revision: 229039

kate moved to kf5

Added:
  kate/
  kate/trunk/kate.install
  kate/trunk/katepart.install
    (from rev 228052, kdesdk-kate/trunk/kdebase-katepart.install)
  kate/trunk/kwrite.install
    (from rev 228052, kdesdk-kate/trunk/kdebase-kwrite.install)
Modified:
  kate/trunk/PKGBUILD
Deleted:
  kate/trunk/kdebase-katepart.install
  kate/trunk/kdebase-kwrite.install
  kdesdk-kate/

--------------------------+
 PKGBUILD                 |   58 ++++++++++++++++++++-------------------------
 kate.install             |   13 ++++++++++
 katepart.install         |   11 ++++++++
 kdebase-katepart.install |   11 --------
 kdebase-kwrite.install   |   12 ---------
 kwrite.install           |   12 +++++++++
 6 files changed, 62 insertions(+), 55 deletions(-)

Modified: kate/trunk/PKGBUILD
===================================================================
--- kdesdk-kate/trunk/PKGBUILD	2014-12-25 23:20:06 UTC (rev 228052)
+++ kate/trunk/PKGBUILD	2015-01-15 11:13:01 UTC (rev 229039)
@@ -1,25 +1,23 @@
 # $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
 
-pkgbase=kdesdk-kate
-pkgname=('kdebase-katepart'
-         'kdebase-kwrite'
-         'kdesdk-kate')
-pkgver=4.14.3
+pkgbase=kate
+pkgname=('kwrite'
+         'kate')
+pkgver=14.12.1
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL' 'FDL')
-makedepends=('kdelibs ''cmake' 'automoc4' 'kdebindings-python')
-source=("http://download.kde.org/stable/${pkgver}/src/kate-${pkgver}.tar.xz"
-        'pkgbuild-syntax-highlight.patch')
-sha1sums=('da37195e86b5449fcdfe69a3f7df6373a5da900c'
-          '80c324c9db81c07a02374e7a092d75e0bdd6b4ea')
+depends=('knewstuff' 'ktexteditor' 'plasma-framework' 'threadweaver' 'kinit' 'kitemmodels')
+makedepends=('extra-cmake-modules' 'kdoctools' 'python')
+source=("http://download.kde.org/stable/applications/${pkgver}/src/kate-${pkgver}.tar.xz")
+sha1sums=('e7097f07f9876c44e482a88d7fdae0db92aa2359')
 
 prepare() {
   mkdir build
 
   cd kate-${pkgver}
-  patch -p1 -i "${srcdir}"/pkgbuild-syntax-highlight.patch
 }
 
 build() {
@@ -26,27 +24,22 @@
   cd build
   cmake ../kate-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
-    -DKDE4_BUILD_TESTS=OFF \
-    -DCMAKE_INSTALL_PREFIX=/usr
+    -DBUILD_TESTING=OFF \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=lib \
+    -DSYSCONF_INSTALL_DIR=/etc \
+    -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
   make
 }
 
-package_kdebase-katepart() {
-  pkgdesc="A fast and feature-rich text editor component"
-  depends=('kdelibs')
-  url="http://kate-editor.org/about-katepart/"
-  install='kdebase-katepart.install'
-
-  cd build/part
-  make DESTDIR="${pkgdir}" install
-}
-
-package_kdebase-kwrite() {
+package_kwrite() {
   pkgdesc="Text Editor"
-  depends=('kdebase-runtime' 'kdebase-katepart')
   groups=('kde' 'kdebase')
   url="http://www.kde.org/applications/utilities/kwrite/"
-  install='kdebase-kwrite.install'
+  install='kwrite.install'
+  replaces=('kdebase-kwrite')
+  conflicts=('kdebase-kwrite')
+  provides=('kdebase-kwrite')
 
   cd build/kwrite
   make DESTDIR="${pkgdir}" install
@@ -55,14 +48,15 @@
   make DESTDIR="${pkgdir}" install
 }
 
-package_kdesdk-kate() {
+package_kate() {
   pkgdesc="Advanced Text Editor"
-  depends=('kdebase-runtime' 'kdebase-katepart' 'qjson')
   groups=('kde' 'kdesdk')
   url="http://www.kde.org/applications/utilities/kate/"
-  install='kdesdk-kate.install'
-  optdepends=('kdebase-konsole: open a terminal in Kate'
-              'kdebindings-python: python bindings')
+  install='kate.install'
+  replaces=('kdesdk-kate')
+  conflicts=('kdesdk-kate')
+  provides=('kdesdk-kate')
+  optdepends=('konsole: open a terminal in Kate')
 
   cd build/kate
   make DESTDIR="${pkgdir}" install

Added: kate/trunk/kate.install
===================================================================
--- kate/trunk/kate.install	                        (rev 0)
+++ kate/trunk/kate.install	2015-01-15 11:13:01 UTC (rev 229039)
@@ -0,0 +1,13 @@
+post_install() {
+    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+    update-mime-database usr/share/mime &> /dev/null
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}

Copied: kate/trunk/katepart.install (from rev 228052, kdesdk-kate/trunk/kdebase-katepart.install)
===================================================================
--- kate/trunk/katepart.install	                        (rev 0)
+++ kate/trunk/katepart.install	2015-01-15 11:13:01 UTC (rev 229039)
@@ -0,0 +1,11 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}

Deleted: kate/trunk/kdebase-katepart.install
===================================================================
--- kdesdk-kate/trunk/kdebase-katepart.install	2014-12-25 23:20:06 UTC (rev 228052)
+++ kate/trunk/kdebase-katepart.install	2015-01-15 11:13:01 UTC (rev 229039)
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}

Deleted: kate/trunk/kdebase-kwrite.install
===================================================================
--- kdesdk-kate/trunk/kdebase-kwrite.install	2014-12-25 23:20:06 UTC (rev 228052)
+++ kate/trunk/kdebase-kwrite.install	2015-01-15 11:13:01 UTC (rev 229039)
@@ -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: kate/trunk/kwrite.install (from rev 228052, kdesdk-kate/trunk/kdebase-kwrite.install)
===================================================================
--- kate/trunk/kwrite.install	                        (rev 0)
+++ kate/trunk/kwrite.install	2015-01-15 11:13:01 UTC (rev 229039)
@@ -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
+}