[arch-commits] Commit in (5 files)

[Felix Yan]

    Date: Friday, January 16, 2015 @ 04:06:44
  Author: fyan
Revision: 229146

rename kdeedu-kig -> kig

Added:
  kig/
  kig/trunk/kig.install
    (from rev 229059, kdeedu-kig/trunk/kdeedu-kig.install)
Modified:
  kig/trunk/PKGBUILD
Deleted:
  kdeedu-kig/
  kig/trunk/kdeedu-kig.install

--------------------+
 PKGBUILD           |   28 ++++++++++++++++++----------
 kdeedu-kig.install |   12 ------------
 kig.install        |   12 ++++++++++++
 3 files changed, 30 insertions(+), 22 deletions(-)

Modified: kig/trunk/PKGBUILD
===================================================================
--- kdeedu-kig/trunk/PKGBUILD	2015-01-15 12:50:20 UTC (rev 229059)
+++ kig/trunk/PKGBUILD	2015-01-16 03:06:44 UTC (rev 229146)
@@ -1,8 +1,9 @@
 # $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
 
-pkgname=kdeedu-kig
-pkgver=4.14.3
+pkgname=kig
+pkgver=14.12.1
 pkgrel=1
 pkgdesc="Interactive Geometry"
 url="http://kde.org/applications/education/kig/"
@@ -9,19 +10,26 @@
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdeedu')
-depends=('kdebase-runtime' 'boost-libs')
-makedepends=('cmake' 'automoc4' 'boost')
+depends=('ktexteditor' 'kdelibs4support')
+makedepends=('extra-cmake-modules' 'kdoctools' 'python' 'boost')
+replaces=('kdeedu-kig')
+conflicts=('kdeedu-kig')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kig-${pkgver}.tar.xz")
-sha1sums=('730a87d7a9b95199385076e7a281712bd278b88a')
+source=("http://download.kde.org/stable/applications/${pkgver}/src/kig-${pkgver}.tar.xz")
+sha1sums=('03efba505fd1fbefd5ab05adc512e2feda957afe')
 
+prepare() {
+  mkdir -p build
+}
+
 build() {
-  mkdir build
   cd build
   cmake ../kig-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
-    -DKDE4_BUILD_TESTS=OFF \
-    -DCMAKE_INSTALL_PREFIX=/usr
+    -DBUILD_TESTING=OFF \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=lib \
+    -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
   make
 }
 

Deleted: kig/trunk/kdeedu-kig.install
===================================================================
--- kdeedu-kig/trunk/kdeedu-kig.install	2015-01-15 12:50:20 UTC (rev 229059)
+++ kig/trunk/kdeedu-kig.install	2015-01-16 03:06:44 UTC (rev 229146)
@@ -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: kig/trunk/kig.install (from rev 229059, kdeedu-kig/trunk/kdeedu-kig.install)
===================================================================
--- kig/trunk/kig.install	                        (rev 0)
+++ kig/trunk/kig.install	2015-01-16 03:06:44 UTC (rev 229146)
@@ -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
+}