[arch-commits] Commit in kstars/repos (8 files)

Antonio Rojas arojas at archlinux.org
Fri Apr 17 21:59:17 UTC 2015


    Date: Friday, April 17, 2015 @ 23:59:16
  Author: arojas
Revision: 237367

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

Added:
  kstars/repos/testing-i686/PKGBUILD
    (from rev 237366, kstars/trunk/PKGBUILD)
  kstars/repos/testing-i686/kstars.install
    (from rev 237366, kstars/trunk/kstars.install)
  kstars/repos/testing-x86_64/PKGBUILD
    (from rev 237366, kstars/trunk/PKGBUILD)
  kstars/repos/testing-x86_64/kstars.install
    (from rev 237366, kstars/trunk/kstars.install)
Deleted:
  kstars/repos/testing-i686/PKGBUILD
  kstars/repos/testing-i686/kstars.install
  kstars/repos/testing-x86_64/PKGBUILD
  kstars/repos/testing-x86_64/kstars.install

-------------------------------+
 /PKGBUILD                     |   94 ++++++++++++++++++++++++++++++++++++++++
 /kstars.install               |   22 +++++++++
 testing-i686/PKGBUILD         |   43 ------------------
 testing-i686/kstars.install   |   11 ----
 testing-x86_64/PKGBUILD       |   43 ------------------
 testing-x86_64/kstars.install |   11 ----
 6 files changed, 116 insertions(+), 108 deletions(-)

Deleted: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2015-04-17 21:58:14 UTC (rev 237366)
+++ testing-i686/PKGBUILD	2015-04-17 21:59:16 UTC (rev 237367)
@@ -1,43 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonamrs at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=kstars
-pkgver=15.04.0
-pkgrel=1
-pkgdesc="Desktop Planetarium"
-url="http://kde.org/applications/education/kstars/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde-applications' 'kdeedu')
-depends=('wcslib' 'libindi' 'kplotting' 'knewstuff' 'qt5-multimedia' 'kinit' 'ktexteditor')
-makedepends=('extra-cmake-modules' 'python' 'kdoctools' 'eigen')
-install=${pkgname}.install
-replaces=('kdeedu-kstars')
-conflicts=('kdeedu-kstars')
-source=("http://download.kde.org/stable/applications/${pkgver}/src/kstars-${pkgver}.tar.xz")
-sha1sums=('94b7124e803d41af4bf9e7ed53f7b4735471cf20')
-
-prepare() {
-  mkdir build
-}
-
-build() {
-  cd build
-  cmake ../kstars-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DBUILD_TESTING=OFF \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DWITH_Xplanet=OFF \
-    -DCMAKE_INSTALL_LIBDIR=lib \
-    -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="${pkgdir}" install
-
-  sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|g' \
-    "${pkgdir}"/usr/share/kstars/scripts/supernova_updates_parser.py
-}

Copied: kstars/repos/testing-i686/PKGBUILD (from rev 237366, kstars/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD	                        (rev 0)
+++ testing-i686/PKGBUILD	2015-04-17 21:59:16 UTC (rev 237367)
@@ -0,0 +1,47 @@
+# $Id$
+# Maintainer: Felix Yan <felixonamrs at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=kstars
+pkgver=15.04.0
+pkgrel=2
+pkgdesc="Desktop Planetarium"
+url="http://kde.org/applications/education/kstars/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde-applications' 'kdeedu')
+depends=('wcslib' 'libindi' 'kplotting' 'knewstuff' 'qt5-multimedia' 'kinit' 'ktexteditor')
+makedepends=('extra-cmake-modules' 'python' 'kdoctools' 'eigen' 'xplanet')
+optdepends=('xplanet: XPlanet support')
+install=${pkgname}.install
+replaces=('kdeedu-kstars')
+conflicts=('kdeedu-kstars')
+source=("http://download.kde.org/stable/applications/${pkgver}/src/kstars-${pkgver}.tar.xz")
+sha1sums=('94b7124e803d41af4bf9e7ed53f7b4735471cf20')
+
+prepare() {
+  mkdir build
+
+# Use python2
+  cd $pkgname-$pkgver
+  sed -e 's|"python"|"python2"|' -i kstars/skycomponents/supernovaecomponent.cpp 
+}
+
+build() {
+  cd build
+  cmake ../kstars-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DBUILD_TESTING=OFF \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=lib \
+    -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR="${pkgdir}" install
+
+  sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|g' \
+    "${pkgdir}"/usr/share/kstars/scripts/supernova_updates_parser.py
+}

Deleted: testing-i686/kstars.install
===================================================================
--- testing-i686/kstars.install	2015-04-17 21:58:14 UTC (rev 237366)
+++ testing-i686/kstars.install	2015-04-17 21:59:16 UTC (rev 237367)
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}

Copied: kstars/repos/testing-i686/kstars.install (from rev 237366, kstars/trunk/kstars.install)
===================================================================
--- testing-i686/kstars.install	                        (rev 0)
+++ testing-i686/kstars.install	2015-04-17 21:59:16 UTC (rev 237367)
@@ -0,0 +1,11 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}

Deleted: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2015-04-17 21:58:14 UTC (rev 237366)
+++ testing-x86_64/PKGBUILD	2015-04-17 21:59:16 UTC (rev 237367)
@@ -1,43 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonamrs at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=kstars
-pkgver=15.04.0
-pkgrel=1
-pkgdesc="Desktop Planetarium"
-url="http://kde.org/applications/education/kstars/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde-applications' 'kdeedu')
-depends=('wcslib' 'libindi' 'kplotting' 'knewstuff' 'qt5-multimedia' 'kinit' 'ktexteditor')
-makedepends=('extra-cmake-modules' 'python' 'kdoctools' 'eigen')
-install=${pkgname}.install
-replaces=('kdeedu-kstars')
-conflicts=('kdeedu-kstars')
-source=("http://download.kde.org/stable/applications/${pkgver}/src/kstars-${pkgver}.tar.xz")
-sha1sums=('94b7124e803d41af4bf9e7ed53f7b4735471cf20')
-
-prepare() {
-  mkdir build
-}
-
-build() {
-  cd build
-  cmake ../kstars-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DBUILD_TESTING=OFF \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DWITH_Xplanet=OFF \
-    -DCMAKE_INSTALL_LIBDIR=lib \
-    -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="${pkgdir}" install
-
-  sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|g' \
-    "${pkgdir}"/usr/share/kstars/scripts/supernova_updates_parser.py
-}

Copied: kstars/repos/testing-x86_64/PKGBUILD (from rev 237366, kstars/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD	                        (rev 0)
+++ testing-x86_64/PKGBUILD	2015-04-17 21:59:16 UTC (rev 237367)
@@ -0,0 +1,47 @@
+# $Id$
+# Maintainer: Felix Yan <felixonamrs at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=kstars
+pkgver=15.04.0
+pkgrel=2
+pkgdesc="Desktop Planetarium"
+url="http://kde.org/applications/education/kstars/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde-applications' 'kdeedu')
+depends=('wcslib' 'libindi' 'kplotting' 'knewstuff' 'qt5-multimedia' 'kinit' 'ktexteditor')
+makedepends=('extra-cmake-modules' 'python' 'kdoctools' 'eigen' 'xplanet')
+optdepends=('xplanet: XPlanet support')
+install=${pkgname}.install
+replaces=('kdeedu-kstars')
+conflicts=('kdeedu-kstars')
+source=("http://download.kde.org/stable/applications/${pkgver}/src/kstars-${pkgver}.tar.xz")
+sha1sums=('94b7124e803d41af4bf9e7ed53f7b4735471cf20')
+
+prepare() {
+  mkdir build
+
+# Use python2
+  cd $pkgname-$pkgver
+  sed -e 's|"python"|"python2"|' -i kstars/skycomponents/supernovaecomponent.cpp 
+}
+
+build() {
+  cd build
+  cmake ../kstars-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DBUILD_TESTING=OFF \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=lib \
+    -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR="${pkgdir}" install
+
+  sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|g' \
+    "${pkgdir}"/usr/share/kstars/scripts/supernova_updates_parser.py
+}

Deleted: testing-x86_64/kstars.install
===================================================================
--- testing-x86_64/kstars.install	2015-04-17 21:58:14 UTC (rev 237366)
+++ testing-x86_64/kstars.install	2015-04-17 21:59:16 UTC (rev 237367)
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}

Copied: kstars/repos/testing-x86_64/kstars.install (from rev 237366, kstars/trunk/kstars.install)
===================================================================
--- testing-x86_64/kstars.install	                        (rev 0)
+++ testing-x86_64/kstars.install	2015-04-17 21:59:16 UTC (rev 237367)
@@ -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