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

Antonio Rojas arojas at archlinux.org
Thu Mar 9 16:50:22 UTC 2017


    Date: Thursday, March 9, 2017 @ 16:50:21
  Author: arojas
Revision: 290312

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

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

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

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2017-03-09 16:49:44 UTC (rev 290311)
+++ extra-i686/PKGBUILD	2017-03-09 16:50:21 UTC (rev 290312)
@@ -1,90 +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>
-# Contributor: Balló György <ballogyor+arch at gmail dot com>
-
-pkgbase=marble
-pkgname=(marble-data marble-common marble-qt marble)
-pkgver=16.12.2
-pkgrel=3
-pkgdesc="Desktop Globe"
-arch=(i686 x86_64)
-url="https://www.kde.org/applications/system/marble"
-license=(GPL)
-makedepends=(extra-cmake-modules gpsd kdoctools knewstuff kparts krunner libwlocate phonon-qt5
-             plasma-workspace qt5-serialport qt5-tools qt5-webkit shapelib)
-source=("http://download.kde.org/stable/applications/$pkgver/src/$pkgbase-$pkgver.tar.xz"{,.sig})
-md5sums=('83bc30b139eca4f4e511e3ea2587dd0d'
-         'SKIP')
-validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7) # Albert Astals Cid <aacid at kde.org>
-
-prepare() {
-  mkdir -p build
-}
-
-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_marble-data() {
-  pkgdesc='Data for Marble'
-  depends=(hicolor-icon-theme)
-  conflicts=(kdeedu-marble)
-
-  cd build
-  make -C doc DESTDIR="$pkgdir" install
-  make -C data DESTDIR="$pkgdir" install
-}
-
-package_marble-common() {
-  pkgdesc='Common libraries and plugins for Marble'
-  depends=(marble-data qt5-svg qt5-webkit phonon-qt5)
-  optdepends=('gpsd: GPS based geolocation'
-              'libwlocate: WLAN based geolocation'
-              'qt5-serialport: APRS plugin'
-              'shapelib: SHP plugin')
-  conflicts=(kdeedu-marble libastro libmarble4)
-  replaces=(libastro)
-
-  cd build
-  make -C src/lib/marble DESTDIR="$pkgdir" install
-  make -C src/lib/astro DESTDIR="$pkgdir" install
-  make -C src/lib/marble/declarative DESTDIR="$pkgdir" install
-  make -C src/plugins DESTDIR="$pkgdir" install
-}
-
-package_marble-qt() {
-  pkgdesc+=' (Qt version)'
-  depends=(marble-common)
-
-  cd build
-  make -C src/apps/marble-qt DESTDIR="$pkgdir" install
-}
-
-package_marble() {
-  depends=(marble-common knewstuff kparts)
-  optdepends=('krunner: Krunner plugin')
-  conflicts=(kdeedu-marble)
-  replaces=(kdeedu-marble)
-  groups=(kde-applications kdeedu)
-
-  cd build
-  make -C src/apps/marble-kde DESTDIR="$pkgdir" install
-  make -C src/plasma DESTDIR="$pkgdir" install
-  make -C src/plasmarunner DESTDIR="$pkgdir" install
-  make -C src/thumbnailer DESTDIR="$pkgdir" install
-  rm -r "$pkgdir"/usr/share/icons
-}

Copied: marble/repos/extra-i686/PKGBUILD (from rev 290311, marble/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2017-03-09 16:50:21 UTC (rev 290312)
@@ -0,0 +1,90 @@
+# $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>
+# Contributor: Balló György <ballogyor+arch at gmail dot com>
+
+pkgbase=marble
+pkgname=(marble-data marble-common marble-qt marble)
+pkgver=16.12.3
+pkgrel=1
+pkgdesc="Desktop Globe"
+arch=(i686 x86_64)
+url="https://www.kde.org/applications/system/marble"
+license=(GPL)
+makedepends=(extra-cmake-modules gpsd kdoctools knewstuff kparts krunner libwlocate phonon-qt5
+             plasma-workspace qt5-serialport qt5-tools qt5-webkit shapelib)
+source=("https://download.kde.org/stable/applications/$pkgver/src/$pkgbase-$pkgver.tar.xz"{,.sig})
+sha256sums=('522006e0042fb4bf405a7bc90e015fa6e8fb863652ea81b64f53061c6b9ebe21'
+            'SKIP')
+validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7) # Albert Astals Cid <aacid at kde.org>
+
+prepare() {
+  mkdir -p build
+}
+
+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_marble-data() {
+  pkgdesc='Data for Marble'
+  depends=(hicolor-icon-theme)
+  conflicts=(kdeedu-marble)
+
+  cd build
+  make -C doc DESTDIR="$pkgdir" install
+  make -C data DESTDIR="$pkgdir" install
+}
+
+package_marble-common() {
+  pkgdesc='Common libraries and plugins for Marble'
+  depends=(marble-data qt5-svg qt5-webkit phonon-qt5)
+  optdepends=('gpsd: GPS based geolocation'
+              'libwlocate: WLAN based geolocation'
+              'qt5-serialport: APRS plugin'
+              'shapelib: SHP plugin')
+  conflicts=(kdeedu-marble libastro libmarble4)
+  replaces=(libastro)
+
+  cd build
+  make -C src/lib/marble DESTDIR="$pkgdir" install
+  make -C src/lib/astro DESTDIR="$pkgdir" install
+  make -C src/lib/marble/declarative DESTDIR="$pkgdir" install
+  make -C src/plugins DESTDIR="$pkgdir" install
+}
+
+package_marble-qt() {
+  pkgdesc+=' (Qt version)'
+  depends=(marble-common)
+
+  cd build
+  make -C src/apps/marble-qt DESTDIR="$pkgdir" install
+}
+
+package_marble() {
+  depends=(marble-common knewstuff kparts)
+  optdepends=('krunner: Krunner plugin')
+  conflicts=(kdeedu-marble)
+  replaces=(kdeedu-marble)
+  groups=(kde-applications kdeedu)
+
+  cd build
+  make -C src/apps/marble-kde DESTDIR="$pkgdir" install
+  make -C src/plasma DESTDIR="$pkgdir" install
+  make -C src/plasmarunner DESTDIR="$pkgdir" install
+  make -C src/thumbnailer DESTDIR="$pkgdir" install
+  rm -r "$pkgdir"/usr/share/icons
+}

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2017-03-09 16:49:44 UTC (rev 290311)
+++ extra-x86_64/PKGBUILD	2017-03-09 16:50:21 UTC (rev 290312)
@@ -1,90 +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>
-# Contributor: Balló György <ballogyor+arch at gmail dot com>
-
-pkgbase=marble
-pkgname=(marble-data marble-common marble-qt marble)
-pkgver=16.12.2
-pkgrel=3
-pkgdesc="Desktop Globe"
-arch=(i686 x86_64)
-url="https://www.kde.org/applications/system/marble"
-license=(GPL)
-makedepends=(extra-cmake-modules gpsd kdoctools knewstuff kparts krunner libwlocate phonon-qt5
-             plasma-workspace qt5-serialport qt5-tools qt5-webkit shapelib)
-source=("http://download.kde.org/stable/applications/$pkgver/src/$pkgbase-$pkgver.tar.xz"{,.sig})
-md5sums=('83bc30b139eca4f4e511e3ea2587dd0d'
-         'SKIP')
-validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7) # Albert Astals Cid <aacid at kde.org>
-
-prepare() {
-  mkdir -p build
-}
-
-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_marble-data() {
-  pkgdesc='Data for Marble'
-  depends=(hicolor-icon-theme)
-  conflicts=(kdeedu-marble)
-
-  cd build
-  make -C doc DESTDIR="$pkgdir" install
-  make -C data DESTDIR="$pkgdir" install
-}
-
-package_marble-common() {
-  pkgdesc='Common libraries and plugins for Marble'
-  depends=(marble-data qt5-svg qt5-webkit phonon-qt5)
-  optdepends=('gpsd: GPS based geolocation'
-              'libwlocate: WLAN based geolocation'
-              'qt5-serialport: APRS plugin'
-              'shapelib: SHP plugin')
-  conflicts=(kdeedu-marble libastro libmarble4)
-  replaces=(libastro)
-
-  cd build
-  make -C src/lib/marble DESTDIR="$pkgdir" install
-  make -C src/lib/astro DESTDIR="$pkgdir" install
-  make -C src/lib/marble/declarative DESTDIR="$pkgdir" install
-  make -C src/plugins DESTDIR="$pkgdir" install
-}
-
-package_marble-qt() {
-  pkgdesc+=' (Qt version)'
-  depends=(marble-common)
-
-  cd build
-  make -C src/apps/marble-qt DESTDIR="$pkgdir" install
-}
-
-package_marble() {
-  depends=(marble-common knewstuff kparts)
-  optdepends=('krunner: Krunner plugin')
-  conflicts=(kdeedu-marble)
-  replaces=(kdeedu-marble)
-  groups=(kde-applications kdeedu)
-
-  cd build
-  make -C src/apps/marble-kde DESTDIR="$pkgdir" install
-  make -C src/plasma DESTDIR="$pkgdir" install
-  make -C src/plasmarunner DESTDIR="$pkgdir" install
-  make -C src/thumbnailer DESTDIR="$pkgdir" install
-  rm -r "$pkgdir"/usr/share/icons
-}

Copied: marble/repos/extra-x86_64/PKGBUILD (from rev 290311, marble/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2017-03-09 16:50:21 UTC (rev 290312)
@@ -0,0 +1,90 @@
+# $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>
+# Contributor: Balló György <ballogyor+arch at gmail dot com>
+
+pkgbase=marble
+pkgname=(marble-data marble-common marble-qt marble)
+pkgver=16.12.3
+pkgrel=1
+pkgdesc="Desktop Globe"
+arch=(i686 x86_64)
+url="https://www.kde.org/applications/system/marble"
+license=(GPL)
+makedepends=(extra-cmake-modules gpsd kdoctools knewstuff kparts krunner libwlocate phonon-qt5
+             plasma-workspace qt5-serialport qt5-tools qt5-webkit shapelib)
+source=("https://download.kde.org/stable/applications/$pkgver/src/$pkgbase-$pkgver.tar.xz"{,.sig})
+sha256sums=('522006e0042fb4bf405a7bc90e015fa6e8fb863652ea81b64f53061c6b9ebe21'
+            'SKIP')
+validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7) # Albert Astals Cid <aacid at kde.org>
+
+prepare() {
+  mkdir -p build
+}
+
+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_marble-data() {
+  pkgdesc='Data for Marble'
+  depends=(hicolor-icon-theme)
+  conflicts=(kdeedu-marble)
+
+  cd build
+  make -C doc DESTDIR="$pkgdir" install
+  make -C data DESTDIR="$pkgdir" install
+}
+
+package_marble-common() {
+  pkgdesc='Common libraries and plugins for Marble'
+  depends=(marble-data qt5-svg qt5-webkit phonon-qt5)
+  optdepends=('gpsd: GPS based geolocation'
+              'libwlocate: WLAN based geolocation'
+              'qt5-serialport: APRS plugin'
+              'shapelib: SHP plugin')
+  conflicts=(kdeedu-marble libastro libmarble4)
+  replaces=(libastro)
+
+  cd build
+  make -C src/lib/marble DESTDIR="$pkgdir" install
+  make -C src/lib/astro DESTDIR="$pkgdir" install
+  make -C src/lib/marble/declarative DESTDIR="$pkgdir" install
+  make -C src/plugins DESTDIR="$pkgdir" install
+}
+
+package_marble-qt() {
+  pkgdesc+=' (Qt version)'
+  depends=(marble-common)
+
+  cd build
+  make -C src/apps/marble-qt DESTDIR="$pkgdir" install
+}
+
+package_marble() {
+  depends=(marble-common knewstuff kparts)
+  optdepends=('krunner: Krunner plugin')
+  conflicts=(kdeedu-marble)
+  replaces=(kdeedu-marble)
+  groups=(kde-applications kdeedu)
+
+  cd build
+  make -C src/apps/marble-kde DESTDIR="$pkgdir" install
+  make -C src/plasma DESTDIR="$pkgdir" install
+  make -C src/plasmarunner DESTDIR="$pkgdir" install
+  make -C src/thumbnailer DESTDIR="$pkgdir" install
+  rm -r "$pkgdir"/usr/share/icons
+}


More information about the arch-commits mailing list