[arch-commits] Commit in marble/repos (8 files)
Antonio Rojas
arojas at archlinux.org
Sat Mar 26 23:04:25 UTC 2016
Date: Sunday, March 27, 2016 @ 00:04:25
Author: arojas
Revision: 262689
archrelease: copy kde-unstable to staging-i686, staging-x86_64
Added:
marble/repos/staging-i686/
marble/repos/staging-i686/PKGBUILD
(from rev 262688, marble/kde-unstable/PKGBUILD)
marble/repos/staging-i686/marble-isnan.patch
(from rev 262688, marble/kde-unstable/marble-isnan.patch)
marble/repos/staging-i686/marble.install
(from rev 262688, marble/kde-unstable/marble.install)
marble/repos/staging-x86_64/
marble/repos/staging-x86_64/PKGBUILD
(from rev 262688, marble/kde-unstable/PKGBUILD)
marble/repos/staging-x86_64/marble-isnan.patch
(from rev 262688, marble/kde-unstable/marble-isnan.patch)
marble/repos/staging-x86_64/marble.install
(from rev 262688, marble/kde-unstable/marble.install)
-----------------------------------+
staging-i686/PKGBUILD | 84 ++++++++++++++++++++++++++++++++++++
staging-i686/marble-isnan.patch | 47 ++++++++++++++++++++
staging-i686/marble.install | 13 +++++
staging-x86_64/PKGBUILD | 84 ++++++++++++++++++++++++++++++++++++
staging-x86_64/marble-isnan.patch | 47 ++++++++++++++++++++
staging-x86_64/marble.install | 13 +++++
6 files changed, 288 insertions(+)
Copied: marble/repos/staging-i686/PKGBUILD (from rev 262688, marble/kde-unstable/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2016-03-26 23:04:25 UTC (rev 262689)
@@ -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=16.03.80
+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/unstable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz")
+md5sums=('1b974ad9f2473285b0238ab2e5d50ae1')
+
+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/staging-i686/marble-isnan.patch (from rev 262688, marble/kde-unstable/marble-isnan.patch)
===================================================================
--- staging-i686/marble-isnan.patch (rev 0)
+++ staging-i686/marble-isnan.patch 2016-03-26 23:04:25 UTC (rev 262689)
@@ -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 );
+ }
Copied: marble/repos/staging-i686/marble.install (from rev 262688, marble/kde-unstable/marble.install)
===================================================================
--- staging-i686/marble.install (rev 0)
+++ staging-i686/marble.install 2016-03-26 23:04:25 UTC (rev 262689)
@@ -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
+}
+
Copied: marble/repos/staging-x86_64/PKGBUILD (from rev 262688, marble/kde-unstable/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2016-03-26 23:04:25 UTC (rev 262689)
@@ -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=16.03.80
+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/unstable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz")
+md5sums=('1b974ad9f2473285b0238ab2e5d50ae1')
+
+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/staging-x86_64/marble-isnan.patch (from rev 262688, marble/kde-unstable/marble-isnan.patch)
===================================================================
--- staging-x86_64/marble-isnan.patch (rev 0)
+++ staging-x86_64/marble-isnan.patch 2016-03-26 23:04:25 UTC (rev 262689)
@@ -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 );
+ }
Copied: marble/repos/staging-x86_64/marble.install (from rev 262688, marble/kde-unstable/marble.install)
===================================================================
--- staging-x86_64/marble.install (rev 0)
+++ staging-x86_64/marble.install 2016-03-26 23:04:25 UTC (rev 262689)
@@ -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