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

Antonio Rojas arojas at archlinux.org
Sun Mar 15 13:34:19 UTC 2015


    Date: Sunday, March 15, 2015 @ 14:34:19
  Author: arojas
Revision: 233871

archrelease: copy kde-unstable to kde-unstable-i686, kde-unstable-x86_64

Added:
  kdeedu-marble/repos/kde-unstable-i686/PKGBUILD
    (from rev 233870, kdeedu-marble/kde-unstable/PKGBUILD)
  kdeedu-marble/repos/kde-unstable-i686/kdeedu-marble.install
    (from rev 233870, kdeedu-marble/kde-unstable/kdeedu-marble.install)
  kdeedu-marble/repos/kde-unstable-x86_64/PKGBUILD
    (from rev 233870, kdeedu-marble/kde-unstable/PKGBUILD)
  kdeedu-marble/repos/kde-unstable-x86_64/kdeedu-marble.install
    (from rev 233870, kdeedu-marble/kde-unstable/kdeedu-marble.install)
Deleted:
  kdeedu-marble/repos/kde-unstable-i686/PKGBUILD
  kdeedu-marble/repos/kde-unstable-i686/kdeedu-marble.install
  kdeedu-marble/repos/kde-unstable-x86_64/PKGBUILD
  kdeedu-marble/repos/kde-unstable-x86_64/kdeedu-marble.install

-------------------------------------------+
 /PKGBUILD                                 |  126 ++++++++++++++++++++++++++++
 /kdeedu-marble.install                    |   26 +++++
 kde-unstable-i686/PKGBUILD                |   37 --------
 kde-unstable-i686/kdeedu-marble.install   |   13 --
 kde-unstable-x86_64/PKGBUILD              |   37 --------
 kde-unstable-x86_64/kdeedu-marble.install |   13 --
 6 files changed, 152 insertions(+), 100 deletions(-)

Deleted: kde-unstable-i686/PKGBUILD
===================================================================
--- kde-unstable-i686/PKGBUILD	2015-03-15 13:34:00 UTC (rev 233870)
+++ kde-unstable-i686/PKGBUILD	2015-03-15 13:34:19 UTC (rev 233871)
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=kdeedu-marble
-pkgver=15.03.90
-pkgrel=1
-pkgdesc="Desktop Globe"
-url="http://kde.org/applications/education/marble/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4' 'gpsd')
-optdepends=('gpsd: GPS support'
-            'quazip: reading and displaying KMZ files')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/applications/${pkgver}/src/marble-${pkgver}.tar.xz")
-sha1sums=('6199ef73c3404812e4a8496496db9ea6033f5399')
-
-prepare() {
-  mkdir build
-}
-
-build() {
-  cd build
-  cmake ../marble-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DKDE4_BUILD_TESTS=OFF \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="${pkgdir}" install
-}

Copied: kdeedu-marble/repos/kde-unstable-i686/PKGBUILD (from rev 233870, kdeedu-marble/kde-unstable/PKGBUILD)
===================================================================
--- kde-unstable-i686/PKGBUILD	                        (rev 0)
+++ kde-unstable-i686/PKGBUILD	2015-03-15 13:34:19 UTC (rev 233871)
@@ -0,0 +1,63 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgbase=kdeedu-marble
+pkgname=('kdeedu-marble' 'marble-qt')
+pkgver=15.03.90
+pkgrel=2
+pkgdesc="Desktop Globe"
+url="http://kde.org/applications/education/marble/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+makedepends=('kdelibs' 'qt5-svg' 'qt5-webkit' 'qt5-script' 'qt5-tools' 'cmake' 'automoc4' 'gpsd')
+source=("http://download.kde.org/unstable/applications/${pkgver}/src/marble-${pkgver}.tar.xz")
+sha1sums=('6199ef73c3404812e4a8496496db9ea6033f5399')
+
+prepare() {
+  mkdir -p build{,-qt}
+}
+
+build() {
+  cd build
+  cmake ../marble-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DKDE4_BUILD_TESTS=OFF \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+
+  cd ../build-qt
+  cmake ../marble-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DQT5BUILD=TRUE \
+    -DCMAKE_INSTALL_PREFIX=/usr
+}
+
+package_kdeedu-marble() {
+  depends=('kdebase-runtime')
+  optdepends=('gpsd: GPS support'
+            'quazip: reading and displaying KMZ files')
+  groups=('kde' 'kdeedu')
+  install=$pkgname.install
+            
+  cd build
+  make DESTDIR="${pkgdir}" install
+# remove mobile and qt4 versions
+  rm -r "$pkgdir"/usr/bin/marble-*
+  rm -r "$pkgdir"/usr/share/applications/kde4/marble-*
+}
+
+package_marble-qt() {
+  pkgdesc="Desktop Globe (Qt version)"
+  depends=('qt5-svg' 'qt5-webkit' 'qt5-script')
+  optdepends=('gpsd: GPS support'
+          'quazip: reading and displaying KMZ files')
+  conflicts=('kdeedu-marble')
+  install=$pkgname.install  
+
+  cd build-qt
+  make DESTDIR="${pkgdir}" install
+# remove mobile version
+  rm -r "$pkgdir"/usr/bin/marble-{mobile,touch}
+  rm -r "$pkgdir"/usr/share/applications/marble-{mobile,touch}.desktop
+}

Deleted: kde-unstable-i686/kdeedu-marble.install
===================================================================
--- kde-unstable-i686/kdeedu-marble.install	2015-03-15 13:34:00 UTC (rev 233870)
+++ kde-unstable-i686/kdeedu-marble.install	2015-03-15 13:34:19 UTC (rev 233871)
@@ -1,13 +0,0 @@
-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: kdeedu-marble/repos/kde-unstable-i686/kdeedu-marble.install (from rev 233870, kdeedu-marble/kde-unstable/kdeedu-marble.install)
===================================================================
--- kde-unstable-i686/kdeedu-marble.install	                        (rev 0)
+++ kde-unstable-i686/kdeedu-marble.install	2015-03-15 13:34:19 UTC (rev 233871)
@@ -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
+}

Deleted: kde-unstable-x86_64/PKGBUILD
===================================================================
--- kde-unstable-x86_64/PKGBUILD	2015-03-15 13:34:00 UTC (rev 233870)
+++ kde-unstable-x86_64/PKGBUILD	2015-03-15 13:34:19 UTC (rev 233871)
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=kdeedu-marble
-pkgver=15.03.90
-pkgrel=1
-pkgdesc="Desktop Globe"
-url="http://kde.org/applications/education/marble/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4' 'gpsd')
-optdepends=('gpsd: GPS support'
-            'quazip: reading and displaying KMZ files')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/applications/${pkgver}/src/marble-${pkgver}.tar.xz")
-sha1sums=('6199ef73c3404812e4a8496496db9ea6033f5399')
-
-prepare() {
-  mkdir build
-}
-
-build() {
-  cd build
-  cmake ../marble-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DKDE4_BUILD_TESTS=OFF \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="${pkgdir}" install
-}

Copied: kdeedu-marble/repos/kde-unstable-x86_64/PKGBUILD (from rev 233870, kdeedu-marble/kde-unstable/PKGBUILD)
===================================================================
--- kde-unstable-x86_64/PKGBUILD	                        (rev 0)
+++ kde-unstable-x86_64/PKGBUILD	2015-03-15 13:34:19 UTC (rev 233871)
@@ -0,0 +1,63 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgbase=kdeedu-marble
+pkgname=('kdeedu-marble' 'marble-qt')
+pkgver=15.03.90
+pkgrel=2
+pkgdesc="Desktop Globe"
+url="http://kde.org/applications/education/marble/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+makedepends=('kdelibs' 'qt5-svg' 'qt5-webkit' 'qt5-script' 'qt5-tools' 'cmake' 'automoc4' 'gpsd')
+source=("http://download.kde.org/unstable/applications/${pkgver}/src/marble-${pkgver}.tar.xz")
+sha1sums=('6199ef73c3404812e4a8496496db9ea6033f5399')
+
+prepare() {
+  mkdir -p build{,-qt}
+}
+
+build() {
+  cd build
+  cmake ../marble-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DKDE4_BUILD_TESTS=OFF \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+
+  cd ../build-qt
+  cmake ../marble-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DQT5BUILD=TRUE \
+    -DCMAKE_INSTALL_PREFIX=/usr
+}
+
+package_kdeedu-marble() {
+  depends=('kdebase-runtime')
+  optdepends=('gpsd: GPS support'
+            'quazip: reading and displaying KMZ files')
+  groups=('kde' 'kdeedu')
+  install=$pkgname.install
+            
+  cd build
+  make DESTDIR="${pkgdir}" install
+# remove mobile and qt4 versions
+  rm -r "$pkgdir"/usr/bin/marble-*
+  rm -r "$pkgdir"/usr/share/applications/kde4/marble-*
+}
+
+package_marble-qt() {
+  pkgdesc="Desktop Globe (Qt version)"
+  depends=('qt5-svg' 'qt5-webkit' 'qt5-script')
+  optdepends=('gpsd: GPS support'
+          'quazip: reading and displaying KMZ files')
+  conflicts=('kdeedu-marble')
+  install=$pkgname.install  
+
+  cd build-qt
+  make DESTDIR="${pkgdir}" install
+# remove mobile version
+  rm -r "$pkgdir"/usr/bin/marble-{mobile,touch}
+  rm -r "$pkgdir"/usr/share/applications/marble-{mobile,touch}.desktop
+}

Deleted: kde-unstable-x86_64/kdeedu-marble.install
===================================================================
--- kde-unstable-x86_64/kdeedu-marble.install	2015-03-15 13:34:00 UTC (rev 233870)
+++ kde-unstable-x86_64/kdeedu-marble.install	2015-03-15 13:34:19 UTC (rev 233871)
@@ -1,13 +0,0 @@
-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: kdeedu-marble/repos/kde-unstable-x86_64/kdeedu-marble.install (from rev 233870, kdeedu-marble/kde-unstable/kdeedu-marble.install)
===================================================================
--- kde-unstable-x86_64/kdeedu-marble.install	                        (rev 0)
+++ kde-unstable-x86_64/kdeedu-marble.install	2015-03-15 13:34:19 UTC (rev 233871)
@@ -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
+}



More information about the arch-commits mailing list