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

Antonio Rojas arojas at archlinux.org
Thu Oct 13 16:04:54 UTC 2016


    Date: Thursday, October 13, 2016 @ 16:04:54
  Author: arojas
Revision: 278679

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

Added:
  marble/repos/extra-i686/PKGBUILD
    (from rev 278678, marble/trunk/PKGBUILD)
  marble/repos/extra-x86_64/PKGBUILD
    (from rev 278678, marble/trunk/PKGBUILD)
Deleted:
  marble/repos/extra-i686/PKGBUILD
  marble/repos/extra-x86_64/PKGBUILD

-----------------------+
 /PKGBUILD             |  166 ++++++++++++++++++++++++++++++++++++++++++++++++
 extra-i686/PKGBUILD   |   83 ------------------------
 extra-x86_64/PKGBUILD |   83 ------------------------
 3 files changed, 166 insertions(+), 166 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2016-10-13 16:04:47 UTC (rev 278678)
+++ extra-i686/PKGBUILD	2016-10-13 16:04:54 UTC (rev 278679)
@@ -1,83 +0,0 @@
-# $Id$
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Gustavo Alvarez <sl1pkn07 at gmail.com>
-
-pkgbase=marble
-pkgname=(marble libastro marble-data)
-pkgver=16.08.1
-pkgrel=1
-pkgdesc="Desktop Globe"
-arch=(i686 x86_64)
-url="https://www.kde.org/applications/system/marble"
-license=(GPL)
-makedepends=(extra-cmake-modules gpsd quazip libwlocate phonon-qt5 qt5-webkit krunner
-             kparts knewstuff qt5-tools kdoctools qt5-serialport)
-source=("http://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz")
-md5sums=('b110b476e049c17a45023427c8351523')
-
-prepare() {
-  mkdir -p build
-
-  # only build the KDE app
-  sed -e '/mobile/d' \
-      -e '/qt/d'  \
-      -e '/Quick/d' \
-      -e '/touch/d' \
-      -i $pkgname-$pkgver/src/apps/CMakeLists.txt
-}
-
-build() {
-  cd build
-  cmake ../$pkgbase-$pkgver \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_LIBDIR=lib \
-    -DKDE_INSTALL_SYSCONFDIR=/etc \
-    -DQT_PLUGINS_DIR=lib/qt/plugins \
-    -DBUILD_TESTING=OFF \
-    -DBUILD_MARBLE_EXAMPLES=OFF \
-    -DBUILD_MARBLE_TESTS=OFF \
-    -DMOBILE=OFF
-  make
-}
-
-package_libastro() {
-  pkgdesc='Marble astronomy library'
-  depends=(gcc-libs)
-  conflicts=('kdeedu-marble<15.07' marble-qt)
-
-  cd build/src/lib/astro
-  make DESTDIR="$pkgdir" install
-}
-
-package_marble() {
-  depends=(libastro marble-data qt5-webkit kparts knewstuff quazip)
-  optdepends=('gpsd: GPS based geolocation'
-            'qt5-serialport: APRS plugin'
-            'libwlocate: WLAN based geolocation'
-            'krunner: Krunner plugin')
-  conflicts=('kdeedu-marble<15.04.3-3' marble-qt)
-  replaces=(kdeedu-marble 'marble-qt<15.07')
-  groups=(kde-applications kdeedu)
-
-  cd build
-  make DESTDIR="$pkgdir" install
-
-# provided by libastro
-  rm -r "$pkgdir"/usr/include/astro
-  rm -r "$pkgdir"/usr/lib/{libastro.*,cmake/Astro}
-
-# provided by marble-data
-  rm -r "$pkgdir"/usr/share/{icons,marble/data,mime}
-}
-
-package_marble-data() {
-  pkgdesc='Data for Marble'
-  depends=(hicolor-icon-theme)
-  conflicts=('kdeedu-marble<15.07' 'marble<15.07.80-3' marble-qt)
-
-  cd build/data
-  make DESTDIR="$pkgdir" install
-}

Copied: marble/repos/extra-i686/PKGBUILD (from rev 278678, marble/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2016-10-13 16:04:54 UTC (rev 278679)
@@ -0,0 +1,83 @@
+# $Id$
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Gustavo Alvarez <sl1pkn07 at gmail.com>
+
+pkgbase=marble
+pkgname=(marble libastro marble-data)
+pkgver=16.08.2
+pkgrel=1
+pkgdesc="Desktop Globe"
+arch=(i686 x86_64)
+url="https://www.kde.org/applications/system/marble"
+license=(GPL)
+makedepends=(extra-cmake-modules gpsd quazip libwlocate phonon-qt5 qt5-webkit krunner
+             kparts knewstuff qt5-tools kdoctools qt5-serialport)
+source=("http://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz")
+md5sums=('c8bd34ca0f43b704a7cc890444c8e03b')
+
+prepare() {
+  mkdir -p build
+
+  # only build the KDE app
+  sed -e '/mobile/d' \
+      -e '/qt/d'  \
+      -e '/Quick/d' \
+      -e '/touch/d' \
+      -i $pkgname-$pkgver/src/apps/CMakeLists.txt
+}
+
+build() {
+  cd build
+  cmake ../$pkgbase-$pkgver \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=lib \
+    -DKDE_INSTALL_SYSCONFDIR=/etc \
+    -DQT_PLUGINS_DIR=lib/qt/plugins \
+    -DBUILD_TESTING=OFF \
+    -DBUILD_MARBLE_EXAMPLES=OFF \
+    -DBUILD_MARBLE_TESTS=OFF \
+    -DMOBILE=OFF
+  make
+}
+
+package_libastro() {
+  pkgdesc='Marble astronomy library'
+  depends=(gcc-libs)
+  conflicts=('kdeedu-marble<15.07' marble-qt)
+
+  cd build/src/lib/astro
+  make DESTDIR="$pkgdir" install
+}
+
+package_marble() {
+  depends=(libastro marble-data qt5-webkit kparts knewstuff quazip)
+  optdepends=('gpsd: GPS based geolocation'
+            'qt5-serialport: APRS plugin'
+            'libwlocate: WLAN based geolocation'
+            'krunner: Krunner plugin')
+  conflicts=('kdeedu-marble<15.04.3-3' marble-qt)
+  replaces=(kdeedu-marble 'marble-qt<15.07')
+  groups=(kde-applications kdeedu)
+
+  cd build
+  make DESTDIR="$pkgdir" install
+
+# provided by libastro
+  rm -r "$pkgdir"/usr/include/astro
+  rm -r "$pkgdir"/usr/lib/{libastro.*,cmake/Astro}
+
+# provided by marble-data
+  rm -r "$pkgdir"/usr/share/{icons,marble/data,mime}
+}
+
+package_marble-data() {
+  pkgdesc='Data for Marble'
+  depends=(hicolor-icon-theme)
+  conflicts=('kdeedu-marble<15.07' 'marble<15.07.80-3' marble-qt)
+
+  cd build/data
+  make DESTDIR="$pkgdir" install
+}

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2016-10-13 16:04:47 UTC (rev 278678)
+++ extra-x86_64/PKGBUILD	2016-10-13 16:04:54 UTC (rev 278679)
@@ -1,83 +0,0 @@
-# $Id$
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Gustavo Alvarez <sl1pkn07 at gmail.com>
-
-pkgbase=marble
-pkgname=(marble libastro marble-data)
-pkgver=16.08.1
-pkgrel=1
-pkgdesc="Desktop Globe"
-arch=(i686 x86_64)
-url="https://www.kde.org/applications/system/marble"
-license=(GPL)
-makedepends=(extra-cmake-modules gpsd quazip libwlocate phonon-qt5 qt5-webkit krunner
-             kparts knewstuff qt5-tools kdoctools qt5-serialport)
-source=("http://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz")
-md5sums=('b110b476e049c17a45023427c8351523')
-
-prepare() {
-  mkdir -p build
-
-  # only build the KDE app
-  sed -e '/mobile/d' \
-      -e '/qt/d'  \
-      -e '/Quick/d' \
-      -e '/touch/d' \
-      -i $pkgname-$pkgver/src/apps/CMakeLists.txt
-}
-
-build() {
-  cd build
-  cmake ../$pkgbase-$pkgver \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_LIBDIR=lib \
-    -DKDE_INSTALL_SYSCONFDIR=/etc \
-    -DQT_PLUGINS_DIR=lib/qt/plugins \
-    -DBUILD_TESTING=OFF \
-    -DBUILD_MARBLE_EXAMPLES=OFF \
-    -DBUILD_MARBLE_TESTS=OFF \
-    -DMOBILE=OFF
-  make
-}
-
-package_libastro() {
-  pkgdesc='Marble astronomy library'
-  depends=(gcc-libs)
-  conflicts=('kdeedu-marble<15.07' marble-qt)
-
-  cd build/src/lib/astro
-  make DESTDIR="$pkgdir" install
-}
-
-package_marble() {
-  depends=(libastro marble-data qt5-webkit kparts knewstuff quazip)
-  optdepends=('gpsd: GPS based geolocation'
-            'qt5-serialport: APRS plugin'
-            'libwlocate: WLAN based geolocation'
-            'krunner: Krunner plugin')
-  conflicts=('kdeedu-marble<15.04.3-3' marble-qt)
-  replaces=(kdeedu-marble 'marble-qt<15.07')
-  groups=(kde-applications kdeedu)
-
-  cd build
-  make DESTDIR="$pkgdir" install
-
-# provided by libastro
-  rm -r "$pkgdir"/usr/include/astro
-  rm -r "$pkgdir"/usr/lib/{libastro.*,cmake/Astro}
-
-# provided by marble-data
-  rm -r "$pkgdir"/usr/share/{icons,marble/data,mime}
-}
-
-package_marble-data() {
-  pkgdesc='Data for Marble'
-  depends=(hicolor-icon-theme)
-  conflicts=('kdeedu-marble<15.07' 'marble<15.07.80-3' marble-qt)
-
-  cd build/data
-  make DESTDIR="$pkgdir" install
-}

Copied: marble/repos/extra-x86_64/PKGBUILD (from rev 278678, marble/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2016-10-13 16:04:54 UTC (rev 278679)
@@ -0,0 +1,83 @@
+# $Id$
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Gustavo Alvarez <sl1pkn07 at gmail.com>
+
+pkgbase=marble
+pkgname=(marble libastro marble-data)
+pkgver=16.08.2
+pkgrel=1
+pkgdesc="Desktop Globe"
+arch=(i686 x86_64)
+url="https://www.kde.org/applications/system/marble"
+license=(GPL)
+makedepends=(extra-cmake-modules gpsd quazip libwlocate phonon-qt5 qt5-webkit krunner
+             kparts knewstuff qt5-tools kdoctools qt5-serialport)
+source=("http://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz")
+md5sums=('c8bd34ca0f43b704a7cc890444c8e03b')
+
+prepare() {
+  mkdir -p build
+
+  # only build the KDE app
+  sed -e '/mobile/d' \
+      -e '/qt/d'  \
+      -e '/Quick/d' \
+      -e '/touch/d' \
+      -i $pkgname-$pkgver/src/apps/CMakeLists.txt
+}
+
+build() {
+  cd build
+  cmake ../$pkgbase-$pkgver \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=lib \
+    -DKDE_INSTALL_SYSCONFDIR=/etc \
+    -DQT_PLUGINS_DIR=lib/qt/plugins \
+    -DBUILD_TESTING=OFF \
+    -DBUILD_MARBLE_EXAMPLES=OFF \
+    -DBUILD_MARBLE_TESTS=OFF \
+    -DMOBILE=OFF
+  make
+}
+
+package_libastro() {
+  pkgdesc='Marble astronomy library'
+  depends=(gcc-libs)
+  conflicts=('kdeedu-marble<15.07' marble-qt)
+
+  cd build/src/lib/astro
+  make DESTDIR="$pkgdir" install
+}
+
+package_marble() {
+  depends=(libastro marble-data qt5-webkit kparts knewstuff quazip)
+  optdepends=('gpsd: GPS based geolocation'
+            'qt5-serialport: APRS plugin'
+            'libwlocate: WLAN based geolocation'
+            'krunner: Krunner plugin')
+  conflicts=('kdeedu-marble<15.04.3-3' marble-qt)
+  replaces=(kdeedu-marble 'marble-qt<15.07')
+  groups=(kde-applications kdeedu)
+
+  cd build
+  make DESTDIR="$pkgdir" install
+
+# provided by libastro
+  rm -r "$pkgdir"/usr/include/astro
+  rm -r "$pkgdir"/usr/lib/{libastro.*,cmake/Astro}
+
+# provided by marble-data
+  rm -r "$pkgdir"/usr/share/{icons,marble/data,mime}
+}
+
+package_marble-data() {
+  pkgdesc='Data for Marble'
+  depends=(hicolor-icon-theme)
+  conflicts=('kdeedu-marble<15.07' 'marble<15.07.80-3' marble-qt)
+
+  cd build/data
+  make DESTDIR="$pkgdir" install
+}



More information about the arch-commits mailing list