[arch-commits] Commit in marble/repos (10 files)
Antonio Rojas
arojas at archlinux.org
Tue Mar 15 10:54:50 UTC 2016
Date: Tuesday, March 15, 2016 @ 11:54:50
Author: arojas
Revision: 261553
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
marble/repos/extra-i686/PKGBUILD
(from rev 261552, marble/trunk/PKGBUILD)
marble/repos/extra-i686/marble-isnan.patch
(from rev 261552, marble/trunk/marble-isnan.patch)
marble/repos/extra-i686/marble.install
(from rev 261552, marble/trunk/marble.install)
marble/repos/extra-x86_64/PKGBUILD
(from rev 261552, marble/trunk/PKGBUILD)
marble/repos/extra-x86_64/marble-isnan.patch
(from rev 261552, marble/trunk/marble-isnan.patch)
marble/repos/extra-x86_64/marble.install
(from rev 261552, marble/trunk/marble.install)
Deleted:
marble/repos/extra-i686/PKGBUILD
marble/repos/extra-i686/marble.install
marble/repos/extra-x86_64/PKGBUILD
marble/repos/extra-x86_64/marble.install
---------------------------------+
/PKGBUILD | 178 ++++++++++++++++++++++++++++++++++++++
/marble.install | 26 +++++
extra-i686/PKGBUILD | 84 -----------------
extra-i686/marble-isnan.patch | 47 ++++++++++
extra-i686/marble.install | 13 --
extra-x86_64/PKGBUILD | 84 -----------------
extra-x86_64/marble-isnan.patch | 47 ++++++++++
extra-x86_64/marble.install | 13 --
8 files changed, 298 insertions(+), 194 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2016-03-15 10:54:31 UTC (rev 261552)
+++ extra-i686/PKGBUILD 2016-03-15 10:54:50 UTC (rev 261553)
@@ -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.12.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-qt5 libwlocate phonon-qt5 qt5-webkit krunner
- kparts knewstuff qt5-tools kdoctools)
-source=("http://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz")
-md5sums=('f927ac3b9cb016bd299a93d77e4b7e9d')
-
-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_USE_QT_SYS_PATHS=ON \
- -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-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'
- depends=(hicolor-icon-theme)
- conflicts=('kdeedu-marble<15.07' 'marble<15.07.80-3' marble-qt)
- install=marble.install
-
- cd build/data
- make DESTDIR="$pkgdir" install
-}
Copied: marble/repos/extra-i686/PKGBUILD (from rev 261552, marble/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2016-03-15 10:54:50 UTC (rev 261553)
@@ -0,0 +1,89 @@
+# $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.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 quazip-qt5 libwlocate phonon-qt5 qt5-webkit krunner
+ kparts knewstuff qt5-tools kdoctools)
+source=("http://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz" marble-isnan.patch)
+md5sums=('128857af8fce7768608f3583bc0266d2'
+ '16dbd5e7b0dfb8048fe8b0fa56c59189')
+
+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
+
+# Fix build with glibc 2.23
+ cd $pkgbase-$pkgver
+ patch -p1 -i ../marble-isnan.patch
+}
+
+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 \
+ -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-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'
+ depends=(hicolor-icon-theme)
+ conflicts=('kdeedu-marble<15.07' 'marble<15.07.80-3' marble-qt)
+ install=marble.install
+
+ cd build/data
+ make DESTDIR="$pkgdir" install
+}
Copied: marble/repos/extra-i686/marble-isnan.patch (from rev 261552, marble/trunk/marble-isnan.patch)
===================================================================
--- extra-i686/marble-isnan.patch (rev 0)
+++ extra-i686/marble-isnan.patch 2016-03-15 10:54:50 UTC (rev 261553)
@@ -0,0 +1,47 @@
+--- marble-15.12.3/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp.0 2016-03-11 22:27:57.718237558 +0000
++++ marble-15.12.3/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp 2016-03-11 22:28:06.871536643 +0000
+@@ -76,7 +76,7 @@
+ {
+ PositionProviderStatus oldStatus = m_status;
+ GeoDataCoordinates oldPosition = m_position;
+- if ( data.status == STATUS_NO_FIX || isnan( data.fix.longitude ) || isnan( data.fix.latitude ) )
++ if ( data.status == STATUS_NO_FIX || std::isnan( data.fix.longitude ) || std::isnan( data.fix.latitude ) )
+ m_status = PositionProviderStatusAcquiring;
+ else {
+ m_status = PositionProviderStatusAvailable;
+@@ -88,29 +88,29 @@
+
+ m_accuracy.level = GeoDataAccuracy::Detailed;
+ #if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 3 )
+- if ( !isnan( data.fix.epx ) && !isnan( data.fix.epy ) ) {
++ if ( !std::isnan( data.fix.epx ) && !std::isnan( data.fix.epy ) ) {
+ m_accuracy.horizontal = qMax( data.fix.epx, data.fix.epy );
+ }
+ #else
+- if ( !isnan( data.fix.eph ) ) {
++ if ( !std::isnan( data.fix.eph ) ) {
+ m_accuracy.horizontal = data.fix.eph;
+ }
+ #endif
+- if ( !isnan( data.fix.epv ) ) {
++ if ( !std::isnan( data.fix.epv ) ) {
+ m_accuracy.vertical = data.fix.epv;
+ }
+
+- if( !isnan(data.fix.speed ) )
++ if( !std::isnan(data.fix.speed ) )
+ {
+ m_speed = data.fix.speed;
+ }
+
+- if( !isnan( data.fix.track ) )
++ if( !std::isnan( data.fix.track ) )
+ {
+ m_track = data.fix.track;
+ }
+
+- if ( !isnan( data.fix.time ) )
++ if ( !std::isnan( data.fix.time ) )
+ {
+ m_timestamp = QDateTime::fromMSecsSinceEpoch( data.fix.time * 1000 );
+ }
Deleted: extra-i686/marble.install
===================================================================
--- extra-i686/marble.install 2016-03-15 10:54:31 UTC (rev 261552)
+++ extra-i686/marble.install 2016-03-15 10:54:50 UTC (rev 261553)
@@ -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/extra-i686/marble.install (from rev 261552, marble/trunk/marble.install)
===================================================================
--- extra-i686/marble.install (rev 0)
+++ extra-i686/marble.install 2016-03-15 10:54:50 UTC (rev 261553)
@@ -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: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2016-03-15 10:54:31 UTC (rev 261552)
+++ extra-x86_64/PKGBUILD 2016-03-15 10:54:50 UTC (rev 261553)
@@ -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.12.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-qt5 libwlocate phonon-qt5 qt5-webkit krunner
- kparts knewstuff qt5-tools kdoctools)
-source=("http://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz")
-md5sums=('f927ac3b9cb016bd299a93d77e4b7e9d')
-
-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_USE_QT_SYS_PATHS=ON \
- -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-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'
- depends=(hicolor-icon-theme)
- conflicts=('kdeedu-marble<15.07' 'marble<15.07.80-3' marble-qt)
- install=marble.install
-
- cd build/data
- make DESTDIR="$pkgdir" install
-}
Copied: marble/repos/extra-x86_64/PKGBUILD (from rev 261552, marble/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2016-03-15 10:54:50 UTC (rev 261553)
@@ -0,0 +1,89 @@
+# $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.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 quazip-qt5 libwlocate phonon-qt5 qt5-webkit krunner
+ kparts knewstuff qt5-tools kdoctools)
+source=("http://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz" marble-isnan.patch)
+md5sums=('128857af8fce7768608f3583bc0266d2'
+ '16dbd5e7b0dfb8048fe8b0fa56c59189')
+
+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
+
+# Fix build with glibc 2.23
+ cd $pkgbase-$pkgver
+ patch -p1 -i ../marble-isnan.patch
+}
+
+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 \
+ -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-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'
+ depends=(hicolor-icon-theme)
+ conflicts=('kdeedu-marble<15.07' 'marble<15.07.80-3' marble-qt)
+ install=marble.install
+
+ cd build/data
+ make DESTDIR="$pkgdir" install
+}
Copied: marble/repos/extra-x86_64/marble-isnan.patch (from rev 261552, marble/trunk/marble-isnan.patch)
===================================================================
--- extra-x86_64/marble-isnan.patch (rev 0)
+++ extra-x86_64/marble-isnan.patch 2016-03-15 10:54:50 UTC (rev 261553)
@@ -0,0 +1,47 @@
+--- marble-15.12.3/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp.0 2016-03-11 22:27:57.718237558 +0000
++++ marble-15.12.3/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp 2016-03-11 22:28:06.871536643 +0000
+@@ -76,7 +76,7 @@
+ {
+ PositionProviderStatus oldStatus = m_status;
+ GeoDataCoordinates oldPosition = m_position;
+- if ( data.status == STATUS_NO_FIX || isnan( data.fix.longitude ) || isnan( data.fix.latitude ) )
++ if ( data.status == STATUS_NO_FIX || std::isnan( data.fix.longitude ) || std::isnan( data.fix.latitude ) )
+ m_status = PositionProviderStatusAcquiring;
+ else {
+ m_status = PositionProviderStatusAvailable;
+@@ -88,29 +88,29 @@
+
+ m_accuracy.level = GeoDataAccuracy::Detailed;
+ #if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 3 )
+- if ( !isnan( data.fix.epx ) && !isnan( data.fix.epy ) ) {
++ if ( !std::isnan( data.fix.epx ) && !std::isnan( data.fix.epy ) ) {
+ m_accuracy.horizontal = qMax( data.fix.epx, data.fix.epy );
+ }
+ #else
+- if ( !isnan( data.fix.eph ) ) {
++ if ( !std::isnan( data.fix.eph ) ) {
+ m_accuracy.horizontal = data.fix.eph;
+ }
+ #endif
+- if ( !isnan( data.fix.epv ) ) {
++ if ( !std::isnan( data.fix.epv ) ) {
+ m_accuracy.vertical = data.fix.epv;
+ }
+
+- if( !isnan(data.fix.speed ) )
++ if( !std::isnan(data.fix.speed ) )
+ {
+ m_speed = data.fix.speed;
+ }
+
+- if( !isnan( data.fix.track ) )
++ if( !std::isnan( data.fix.track ) )
+ {
+ m_track = data.fix.track;
+ }
+
+- if ( !isnan( data.fix.time ) )
++ if ( !std::isnan( data.fix.time ) )
+ {
+ m_timestamp = QDateTime::fromMSecsSinceEpoch( data.fix.time * 1000 );
+ }
Deleted: extra-x86_64/marble.install
===================================================================
--- extra-x86_64/marble.install 2016-03-15 10:54:31 UTC (rev 261552)
+++ extra-x86_64/marble.install 2016-03-15 10:54:50 UTC (rev 261553)
@@ -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/extra-x86_64/marble.install (from rev 261552, marble/trunk/marble.install)
===================================================================
--- extra-x86_64/marble.install (rev 0)
+++ extra-x86_64/marble.install 2016-03-15 10:54:50 UTC (rev 261553)
@@ -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