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

Antonio Rojas arojas at archlinux.org
Thu Sep 17 22:46:52 UTC 2015


    Date: Friday, September 18, 2015 @ 00:46:52
  Author: arojas
Revision: 246550

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

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

-------------------------------+
 /PKGBUILD                     |  168 ++++++++++++++++++++++++++++++++++++++++
 /marble.install               |   26 ++++++
 testing-i686/PKGBUILD         |   84 --------------------
 testing-i686/marble.install   |   13 ---
 testing-x86_64/PKGBUILD       |   84 --------------------
 testing-x86_64/marble.install |   13 ---
 6 files changed, 194 insertions(+), 194 deletions(-)

Deleted: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2015-09-17 22:45:12 UTC (rev 246549)
+++ testing-i686/PKGBUILD	2015-09-17 22:46:52 UTC (rev 246550)
@@ -1,84 +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=15.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-qt5 libwlocate phonon-qt5 qt5-webkit krunner kparts knewstuff qt5-tools)
-source=("http://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz")
-md5sums=('07d2986ff88fbf21ddba94614288a14e')
-
-prepare() {
-  mkdir -p build
-
-  # fix installation designer plugins path
-  sed 's|LIB_SUFFIX}/plugins|LIB_SUFFIX}/qt/plugins|g' -i $pkgbase-$pkgver/CMakeLists.txt
-
-  # 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_USE_QT_SYS_PATHS=ON \
-    -DBUILD_TESTING=OFF \
-    -DBUILD_MARBLE_EXAMPLES=OFF \
-    -DBUILD_MARBLE_TOOLS=ON \
-    -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 hicolor-icon-theme quazip-qt5)
-  optdepends=('gpsd: GPS based geolocation'
-            '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)
-  install=marble.install
-
-  cd build
-  make DESTDIR="$pkgdir" install
-
-# provided by libastro
-  rm -r "$pkgdir"/usr/include/astro
-  rm "$pkgdir"/usr/lib/libastro.*
-
-# provided by marble-data
-  rm -r "$pkgdir"/usr/share/{icons,marble/data}
-}
-
-package_marble-data() {
-  pkgdesc='Data for Marble'
-  conflicts=('kdeedu-marble<15.07' 'marble<15.07.80-3' marble-qt)
-
-  cd build/data
-  make DESTDIR="$pkgdir" install
-}

Copied: marble/repos/testing-i686/PKGBUILD (from rev 246549, marble/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD	                        (rev 0)
+++ testing-i686/PKGBUILD	2015-09-17 22:46:52 UTC (rev 246550)
@@ -0,0 +1,84 @@
+# $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=15.08.1
+pkgrel=2
+pkgdesc="Desktop Globe"
+arch=(i686 x86_64)
+url="https://www.kde.org/applications/system/marble"
+license=(GPL)
+makedepends=(extra-cmake-modules gpsd quazip-qt5 libwlocate phonon-qt5 qt5-webkit krunner kparts knewstuff qt5-tools)
+source=("http://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz")
+md5sums=('07d2986ff88fbf21ddba94614288a14e')
+
+prepare() {
+  mkdir -p build
+
+  # fix installation designer plugins path https://bugs.kde.org/show_bug.cgi?id=348554
+  sed 's|LIBDIR}/plugins|LIBDIR}/qt/plugins|g' -i $pkgbase-$pkgver/CMakeLists.txt
+
+  # 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_USE_QT_SYS_PATHS=ON \
+    -DBUILD_TESTING=OFF \
+    -DBUILD_MARBLE_EXAMPLES=OFF \
+    -DBUILD_MARBLE_TOOLS=ON \
+    -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 hicolor-icon-theme quazip-qt5)
+  optdepends=('gpsd: GPS based geolocation'
+            '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)
+  install=marble.install
+
+  cd build
+  make DESTDIR="$pkgdir" install
+
+# provided by libastro
+  rm -r "$pkgdir"/usr/include/astro
+  rm "$pkgdir"/usr/lib/libastro.*
+
+# provided by marble-data
+  rm -r "$pkgdir"/usr/share/{icons,marble/data}
+}
+
+package_marble-data() {
+  pkgdesc='Data for Marble'
+  conflicts=('kdeedu-marble<15.07' 'marble<15.07.80-3' marble-qt)
+
+  cd build/data
+  make DESTDIR="$pkgdir" install
+}

Deleted: testing-i686/marble.install
===================================================================
--- testing-i686/marble.install	2015-09-17 22:45:12 UTC (rev 246549)
+++ testing-i686/marble.install	2015-09-17 22:46:52 UTC (rev 246550)
@@ -1,13 +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: marble/repos/testing-i686/marble.install (from rev 246549, marble/trunk/marble.install)
===================================================================
--- testing-i686/marble.install	                        (rev 0)
+++ testing-i686/marble.install	2015-09-17 22:46:52 UTC (rev 246550)
@@ -0,0 +1,13 @@
+post_install() {
+  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
+

Deleted: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2015-09-17 22:45:12 UTC (rev 246549)
+++ testing-x86_64/PKGBUILD	2015-09-17 22:46:52 UTC (rev 246550)
@@ -1,84 +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=15.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-qt5 libwlocate phonon-qt5 qt5-webkit krunner kparts knewstuff qt5-tools)
-source=("http://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz")
-md5sums=('07d2986ff88fbf21ddba94614288a14e')
-
-prepare() {
-  mkdir -p build
-
-  # fix installation designer plugins path
-  sed 's|LIB_SUFFIX}/plugins|LIB_SUFFIX}/qt/plugins|g' -i $pkgbase-$pkgver/CMakeLists.txt
-
-  # 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_USE_QT_SYS_PATHS=ON \
-    -DBUILD_TESTING=OFF \
-    -DBUILD_MARBLE_EXAMPLES=OFF \
-    -DBUILD_MARBLE_TOOLS=ON \
-    -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 hicolor-icon-theme quazip-qt5)
-  optdepends=('gpsd: GPS based geolocation'
-            '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)
-  install=marble.install
-
-  cd build
-  make DESTDIR="$pkgdir" install
-
-# provided by libastro
-  rm -r "$pkgdir"/usr/include/astro
-  rm "$pkgdir"/usr/lib/libastro.*
-
-# provided by marble-data
-  rm -r "$pkgdir"/usr/share/{icons,marble/data}
-}
-
-package_marble-data() {
-  pkgdesc='Data for Marble'
-  conflicts=('kdeedu-marble<15.07' 'marble<15.07.80-3' marble-qt)
-
-  cd build/data
-  make DESTDIR="$pkgdir" install
-}

Copied: marble/repos/testing-x86_64/PKGBUILD (from rev 246549, marble/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD	                        (rev 0)
+++ testing-x86_64/PKGBUILD	2015-09-17 22:46:52 UTC (rev 246550)
@@ -0,0 +1,84 @@
+# $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=15.08.1
+pkgrel=2
+pkgdesc="Desktop Globe"
+arch=(i686 x86_64)
+url="https://www.kde.org/applications/system/marble"
+license=(GPL)
+makedepends=(extra-cmake-modules gpsd quazip-qt5 libwlocate phonon-qt5 qt5-webkit krunner kparts knewstuff qt5-tools)
+source=("http://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz")
+md5sums=('07d2986ff88fbf21ddba94614288a14e')
+
+prepare() {
+  mkdir -p build
+
+  # fix installation designer plugins path https://bugs.kde.org/show_bug.cgi?id=348554
+  sed 's|LIBDIR}/plugins|LIBDIR}/qt/plugins|g' -i $pkgbase-$pkgver/CMakeLists.txt
+
+  # 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_USE_QT_SYS_PATHS=ON \
+    -DBUILD_TESTING=OFF \
+    -DBUILD_MARBLE_EXAMPLES=OFF \
+    -DBUILD_MARBLE_TOOLS=ON \
+    -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 hicolor-icon-theme quazip-qt5)
+  optdepends=('gpsd: GPS based geolocation'
+            '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)
+  install=marble.install
+
+  cd build
+  make DESTDIR="$pkgdir" install
+
+# provided by libastro
+  rm -r "$pkgdir"/usr/include/astro
+  rm "$pkgdir"/usr/lib/libastro.*
+
+# provided by marble-data
+  rm -r "$pkgdir"/usr/share/{icons,marble/data}
+}
+
+package_marble-data() {
+  pkgdesc='Data for Marble'
+  conflicts=('kdeedu-marble<15.07' 'marble<15.07.80-3' marble-qt)
+
+  cd build/data
+  make DESTDIR="$pkgdir" install
+}

Deleted: testing-x86_64/marble.install
===================================================================
--- testing-x86_64/marble.install	2015-09-17 22:45:12 UTC (rev 246549)
+++ testing-x86_64/marble.install	2015-09-17 22:46:52 UTC (rev 246550)
@@ -1,13 +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: marble/repos/testing-x86_64/marble.install (from rev 246549, marble/trunk/marble.install)
===================================================================
--- testing-x86_64/marble.install	                        (rev 0)
+++ testing-x86_64/marble.install	2015-09-17 22:46:52 UTC (rev 246550)
@@ -0,0 +1,13 @@
+post_install() {
+  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
+



More information about the arch-commits mailing list