[arch-commits] Commit in kdeedu-marble/trunk (PKGBUILD)
Date: Thursday, May 21, 2015 @ 19:55:30
Author: arojas
Revision: 239623
gpsd 3.14 rebuild
Modified:
kdeedu-marble/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-05-21 17:35:18 UTC (rev 239622)
+++ PKGBUILD2015-05-21 17:55:30 UTC (rev 239623)
@@ -5,7 +5,7 @@
pkgbase=kdeedu-marble
pkgname=('kdeedu-marble' 'marble-qt')
pkgver=15.04.1
-pkgrel=1
+pkgrel=2
pkgdesc="Desktop Globe"
url="http://kde.org/applications/education/marble/";
arch=('i686' 'x86_64')
[arch-commits] Commit in kdeedu-marble/trunk (PKGBUILD)
Date: Friday, April 17, 2015 @ 23:00:22
Author: arojas
Revision: 237326
Make libwlocate optional
Modified:
kdeedu-marble/trunk/PKGBUILD
--+
PKGBUILD | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-04-17 20:55:47 UTC (rev 237325)
+++ PKGBUILD2015-04-17 21:00:22 UTC (rev 237326)
@@ -5,7 +5,7 @@
pkgbase=kdeedu-marble
pkgname=('kdeedu-marble' 'marble-qt')
pkgver=15.04.0
-pkgrel=1
+pkgrel=2
pkgdesc="Desktop Globe"
url="http://kde.org/applications/education/marble/";
arch=('i686' 'x86_64')
@@ -34,8 +34,8 @@
}
package_kdeedu-marble() {
- depends=('kdebase-runtime' 'libwlocate')
- optdepends=('gpsd: GPS support'
+ depends=('kdebase-runtime')
+ optdepends=('gpsd: GPS support' 'libwlocate: WLAN based geolocation'
'quazip: reading and displaying KMZ files')
groups=('kde-applications' 'kdeedu')
install=$pkgname.install
@@ -49,8 +49,8 @@
package_marble-qt() {
pkgdesc="Desktop Globe (Qt version)"
- depends=('qt5-svg' 'qt5-webkit' 'qt5-script' 'libwlocate')
- optdepends=('gpsd: GPS support'
+ depends=('qt5-svg' 'qt5-webkit' 'qt5-script')
+ optdepends=('gpsd: GPS support' 'libwlocate: WLAN based geolocation'
'quazip: reading and displaying KMZ files')
conflicts=('kdeedu-marble')
install=$pkgname.install
[arch-commits] Commit in kdeedu-marble/trunk (PKGBUILD)
Date: Wednesday, March 4, 2015 @ 11:03:02
Author: fyan
Revision: 232550
upgpkg: kdeedu-marble 14.12.3-1
Modified:
kdeedu-marble/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-03-04 10:00:34 UTC (rev 232549)
+++ PKGBUILD2015-03-04 10:03:02 UTC (rev 232550)
@@ -3,7 +3,7 @@
# Contributor: Andrea Scarpino
pkgname=kdeedu-marble
-pkgver=14.12.2
+pkgver=14.12.3
pkgrel=1
pkgdesc="Desktop Globe"
url="http://kde.org/applications/education/marble/";
@@ -16,7 +16,7 @@
'quazip: reading and displaying KMZ files')
install=${pkgname}.install
source=("http://download.kde.org/stable/applications/${pkgver}/src/marble-${pkgver}.tar.xz";)
-sha1sums=('712f1ef2fba8739da1c51e4fb884437e7166b3d2')
+sha1sums=('165a3484b755b8874ab179eff3a5c14f5cc59b16')
prepare() {
mkdir build
[arch-commits] Commit in kdeedu-marble/trunk (PKGBUILD)
Date: Wednesday, February 4, 2015 @ 05:36:17
Author: fyan
Revision: 230462
upgpkg: kdeedu-marble 14.12.2-1
Modified:
kdeedu-marble/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-02-04 04:36:11 UTC (rev 230461)
+++ PKGBUILD2015-02-04 04:36:17 UTC (rev 230462)
@@ -3,7 +3,7 @@
# Contributor: Andrea Scarpino
pkgname=kdeedu-marble
-pkgver=14.12.1
+pkgver=14.12.2
pkgrel=1
pkgdesc="Desktop Globe"
url="http://kde.org/applications/education/marble/";
@@ -16,7 +16,7 @@
'quazip: reading and displaying KMZ files')
install=${pkgname}.install
source=("http://download.kde.org/stable/applications/${pkgver}/src/marble-${pkgver}.tar.xz";)
-sha1sums=('9f027b548fecb6d36fd6ecef6c89373518be8f82')
+sha1sums=('712f1ef2fba8739da1c51e4fb884437e7166b3d2')
prepare() {
mkdir build
[arch-commits] Commit in kdeedu-marble/trunk (PKGBUILD)
Date: Thursday, January 15, 2015 @ 13:43:54
Author: fyan
Revision: 229054
upgpkg: kdeedu-marble 14.12.1-1
Modified:
kdeedu-marble/trunk/PKGBUILD
--+
PKGBUILD |9 +
1 file changed, 5 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-01-15 12:25:38 UTC (rev 229053)
+++ PKGBUILD2015-01-15 12:43:54 UTC (rev 229054)
@@ -1,8 +1,9 @@
# $Id$
-# Maintainer: Andrea Scarpino
+# Maintainer: Felix Yan
+# Contributor: Andrea Scarpino
pkgname=kdeedu-marble
-pkgver=4.14.3
+pkgver=14.12.1
pkgrel=1
pkgdesc="Desktop Globe"
url="http://kde.org/applications/education/marble/";
@@ -14,8 +15,8 @@
optdepends=('gpsd: GPS support'
'quazip: reading and displaying KMZ files')
install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.xz";)
-sha1sums=('e2b039e61bdf828e30dd078c5bd5b55df0f5ef2b')
+source=("http://download.kde.org/stable/applications/${pkgver}/src/marble-${pkgver}.tar.xz";)
+sha1sums=('9f027b548fecb6d36fd6ecef6c89373518be8f82')
prepare() {
mkdir build
[arch-commits] Commit in kdeedu-marble/trunk (PKGBUILD)
Date: Wednesday, November 19, 2014 @ 18:05:25
Author: fyan
Revision: 226440
upgpkg: kdeedu-marble 4.14.3-1
upstream new release
Modified:
kdeedu-marble/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-11-19 17:04:38 UTC (rev 226439)
+++ PKGBUILD2014-11-19 17:05:25 UTC (rev 226440)
@@ -2,7 +2,7 @@
# Maintainer: Andrea Scarpino
pkgname=kdeedu-marble
-pkgver=4.14.2
+pkgver=4.14.3
pkgrel=1
pkgdesc="Desktop Globe"
url="http://kde.org/applications/education/marble/";
@@ -15,7 +15,7 @@
'quazip: reading and displaying KMZ files')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.xz";)
-sha1sums=('feb29a75076351bd2b118cf0058e1a1ae3452a2b')
+sha1sums=('e2b039e61bdf828e30dd078c5bd5b55df0f5ef2b')
prepare() {
mkdir build
[arch-commits] Commit in kdeedu-marble/trunk (PKGBUILD)
Date: Monday, September 22, 2014 @ 19:33:15
Author: andrea
Revision: 222681
upgpkg: kdeedu-marble 4.14.1-2
gpsd
Modified:
kdeedu-marble/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-09-22 17:32:07 UTC (rev 222680)
+++ PKGBUILD2014-09-22 17:33:15 UTC (rev 222681)
@@ -3,7 +3,7 @@
pkgname=kdeedu-marble
pkgver=4.14.1
-pkgrel=1
+pkgrel=2
pkgdesc="Desktop Globe"
url="http://kde.org/applications/education/marble/";
arch=('i686' 'x86_64')
[arch-commits] Commit in kdeedu-marble/trunk (PKGBUILD)
Date: Saturday, September 20, 2014 @ 18:09:53
Author: svenstaro
Revision: 15
upgpkg: kdeedu-marble 4.14.1-1
kde 4.14.1
Modified:
kdeedu-marble/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-09-20 16:09:51 UTC (rev 14)
+++ PKGBUILD2014-09-20 16:09:53 UTC (rev 15)
@@ -2,7 +2,7 @@
# Maintainer: Andrea Scarpino
pkgname=kdeedu-marble
-pkgver=4.14.0
+pkgver=4.14.1
pkgrel=1
pkgdesc="Desktop Globe"
url="http://kde.org/applications/education/marble/";
@@ -15,7 +15,7 @@
'quazip: reading and displaying KMZ files')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.xz";)
-sha1sums=('a2557995c02b30efce34eb42113b24c4b6c48c81')
+sha1sums=('8af0a07eb7c7c3cbfc3ef915a2b860291c7b7251')
prepare() {
mkdir build
[arch-commits] Commit in kdeedu-marble/trunk (PKGBUILD)
Date: Saturday, August 16, 2014 @ 22:02:49
Author: svenstaro
Revision: 219828
upgpkg: kdeedu-marble 4.14.0-1
kde 4.14.0
Modified:
kdeedu-marble/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-08-16 20:02:47 UTC (rev 219827)
+++ PKGBUILD2014-08-16 20:02:49 UTC (rev 219828)
@@ -2,7 +2,7 @@
# Maintainer: Andrea Scarpino
pkgname=kdeedu-marble
-pkgver=4.13.3
+pkgver=4.14.0
pkgrel=1
pkgdesc="Desktop Globe"
url="http://kde.org/applications/education/marble/";
@@ -15,7 +15,7 @@
'quazip: reading and displaying KMZ files')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.xz";)
-sha1sums=('bcc60ba0028dc6aa29b76a93271bc18bde69c478')
+sha1sums=('a2557995c02b30efce34eb42113b24c4b6c48c81')
prepare() {
mkdir build
[arch-commits] Commit in kdeedu-marble/trunk (PKGBUILD)
Date: Friday, July 18, 2014 @ 13:29:01
Author: svenstaro
Revision: 217092
upgpkg: kdeedu-marble 4.13.3-1
upstream release 4.13.3
Modified:
kdeedu-marble/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-07-18 11:28:59 UTC (rev 217091)
+++ PKGBUILD2014-07-18 11:29:01 UTC (rev 217092)
@@ -2,7 +2,7 @@
# Maintainer: Andrea Scarpino
pkgname=kdeedu-marble
-pkgver=4.13.2
+pkgver=4.13.3
pkgrel=1
pkgdesc="Desktop Globe"
url="http://kde.org/applications/education/marble/";
@@ -15,7 +15,7 @@
'quazip: reading and displaying KMZ files')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.xz";)
-sha1sums=('007dbe5abc646a1c54b2661fa417db8f63f45b3a')
+sha1sums=('bcc60ba0028dc6aa29b76a93271bc18bde69c478')
prepare() {
mkdir build
[arch-commits] Commit in kdeedu-marble/trunk (PKGBUILD)
Date: Monday, June 9, 2014 @ 05:04:41
Author: svenstaro
Revision: 214447
upgpkg: kdeedu-marble 4.13.2-1
upstream release 4.12.2
Modified:
kdeedu-marble/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-06-09 03:04:39 UTC (rev 214446)
+++ PKGBUILD2014-06-09 03:04:41 UTC (rev 214447)
@@ -2,7 +2,7 @@
# Maintainer: Andrea Scarpino
pkgname=kdeedu-marble
-pkgver=4.13.1
+pkgver=4.13.2
pkgrel=1
pkgdesc="Desktop Globe"
url="http://kde.org/applications/education/marble/";
@@ -15,7 +15,7 @@
'quazip: reading and displaying KMZ files')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.xz";)
-sha1sums=('9d7cedc13098ddf1d759b44d570b9cf68d7f3ae7')
+sha1sums=('007dbe5abc646a1c54b2661fa417db8f63f45b3a')
prepare() {
mkdir build
[arch-commits] Commit in kdeedu-marble/trunk (PKGBUILD)
Date: Wednesday, May 14, 2014 @ 21:53:36
Author: svenstaro
Revision: 212472
upgpkg: kdeedu-marble 4.13.1-1
upstream release 4.13.1
Modified:
kdeedu-marble/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-05-14 19:53:33 UTC (rev 212471)
+++ PKGBUILD2014-05-14 19:53:36 UTC (rev 212472)
@@ -2,7 +2,7 @@
# Maintainer: Andrea Scarpino
pkgname=kdeedu-marble
-pkgver=4.13.0
+pkgver=4.13.1
pkgrel=1
pkgdesc="Desktop Globe"
url="http://kde.org/applications/education/marble/";
@@ -15,7 +15,7 @@
'quazip: reading and displaying KMZ files')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.xz";)
-sha1sums=('1a3364e8c0a3ec26ed7e8b76867410f3d20facd9')
+sha1sums=('9d7cedc13098ddf1d759b44d570b9cf68d7f3ae7')
prepare() {
mkdir build
[arch-commits] Commit in kdeedu-marble/trunk (PKGBUILD)
Date: Monday, March 31, 2014 @ 11:58:17
Author: svenstaro
Revision: 209309
upgpkg: kdeedu-marble 4.12.4-1
kde 4.12.4 release
Modified:
kdeedu-marble/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-03-31 09:58:15 UTC (rev 209308)
+++ PKGBUILD2014-03-31 09:58:17 UTC (rev 209309)
@@ -2,7 +2,7 @@
# Maintainer: Andrea Scarpino
pkgname=kdeedu-marble
-pkgver=4.12.3
+pkgver=4.12.4
pkgrel=1
pkgdesc="Desktop Globe"
url="http://kde.org/applications/education/marble/";
@@ -15,7 +15,7 @@
'quazip: reading and displaying KMZ files')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.xz";)
-sha1sums=('b232858b78f3d9afee42c26de23aa272f9bcf8fa')
+sha1sums=('cbe3a7169ccee70bda20906c26d3798b562a6341')
prepare() {
mkdir build
[arch-commits] Commit in kdeedu-marble/trunk (PKGBUILD)
Date: Tuesday, February 4, 2014 @ 14:52:59
Author: svenstaro
Revision: 205138
upgpkg: kdeedu-marble 4.12.2-1
upstream release 4.12.2
Modified:
kdeedu-marble/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-02-04 13:52:57 UTC (rev 205137)
+++ PKGBUILD2014-02-04 13:52:59 UTC (rev 205138)
@@ -2,7 +2,7 @@
# Maintainer: Andrea Scarpino
pkgname=kdeedu-marble
-pkgver=4.12.1
+pkgver=4.12.2
pkgrel=1
pkgdesc="Desktop Globe"
url="http://kde.org/applications/education/marble/";
@@ -15,7 +15,7 @@
'quazip: reading and displaying KMZ files')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.xz";)
-sha1sums=('fa418ec92b6cd0f70d19e085725120f75c43e910')
+sha1sums=('3b9a02ea73a40801476ef67874df60b21512bcd3')
prepare() {
mkdir build
[arch-commits] Commit in kdeedu-marble/trunk (PKGBUILD)
Date: Tuesday, January 14, 2014 @ 08:37:13
Author: svenstaro
Revision: 203726
upgpkg: kdeedu-marble 4.12.1-1
upstream release 4.12.1
Modified:
kdeedu-marble/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-01-14 07:37:11 UTC (rev 203725)
+++ PKGBUILD2014-01-14 07:37:13 UTC (rev 203726)
@@ -2,7 +2,7 @@
# Maintainer: Andrea Scarpino
pkgname=kdeedu-marble
-pkgver=4.12.0
+pkgver=4.12.1
pkgrel=1
pkgdesc="Desktop Globe"
url="http://kde.org/applications/education/marble/";
@@ -15,7 +15,7 @@
'quazip: reading and displaying KMZ files')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.xz";)
-sha1sums=('65f4272a015b36b06d7aacf1a4dd6e757557e2b9')
+sha1sums=('fa418ec92b6cd0f70d19e085725120f75c43e910')
prepare() {
mkdir build
[arch-commits] Commit in kdeedu-marble/trunk (PKGBUILD)
Date: Friday, December 6, 2013 @ 13:18:43
Author: svenstaro
Revision: 200917
upgpkg: kdeedu-marble 4.11.4-1
KDE 4.11.4
Modified:
kdeedu-marble/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-12-06 12:18:39 UTC (rev 200916)
+++ PKGBUILD2013-12-06 12:18:43 UTC (rev 200917)
@@ -2,7 +2,7 @@
# Maintainer: Andrea Scarpino
pkgname=kdeedu-marble
-pkgver=4.11.3
+pkgver=4.11.4
pkgrel=1
pkgdesc="Desktop Globe"
url="http://kde.org/applications/education/marble/";
@@ -14,7 +14,7 @@
optdepends=('gpsd: gps support')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.xz";)
-sha1sums=('b0b0cf06b4c60262861e748c6815d62513df13a7')
+sha1sums=('7569630e8b2fdaafb2fdf6da79aa165ead17e842')
build() {
mkdir build
[arch-commits] Commit in kdeedu-marble/trunk (PKGBUILD)
Date: Tuesday, October 1, 2013 @ 17:16:29
Author: svenstaro
Revision: 195535
upgpkg: kdeedu-marble 4.11.2-1
kde 4.11.2 release
Modified:
kdeedu-marble/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-10-01 15:16:27 UTC (rev 195534)
+++ PKGBUILD2013-10-01 15:16:29 UTC (rev 195535)
@@ -2,7 +2,7 @@
# Maintainer: Andrea Scarpino
pkgname=kdeedu-marble
-pkgver=4.11.1
+pkgver=4.11.2
pkgrel=1
pkgdesc="Desktop Globe"
url="http://kde.org/applications/education/marble/";
@@ -14,7 +14,7 @@
optdepends=('gpsd: gps support')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.xz";)
-sha1sums=('d4842516fd6fedbf24da2770bc12dec794107141')
+sha1sums=('d37528ba9c61f8938569ea6af39d0fd5181f52d4')
build() {
mkdir build
[arch-commits] Commit in kdeedu-marble/trunk (PKGBUILD)
Date: Tuesday, May 7, 2013 @ 15:27:03
Author: andrea
Revision: 184489
KDE 4.10.3
Modified:
kdeedu-marble/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-05-07 13:27:02 UTC (rev 184488)
+++ PKGBUILD2013-05-07 13:27:03 UTC (rev 184489)
@@ -2,7 +2,7 @@
# Maintainer: Andrea Scarpino
pkgname=kdeedu-marble
-pkgver=4.10.2
+pkgver=4.10.3
pkgrel=1
pkgdesc="Desktop Globe"
url="http://kde.org/applications/education/marble/";
@@ -14,7 +14,7 @@
optdepends=('gpsd: gps support')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.xz";)
-sha1sums=('e4ba65f861f715a7c4881dd78ed1deb03a36')
+sha1sums=('814fffa64d91bec647c3f7e5cb130a2027dd6815')
build() {
mkdir build
[arch-commits] Commit in kdeedu-marble/trunk (PKGBUILD)
Date: Thursday, April 4, 2013 @ 05:58:10
Author: svenstaro
Revision: 181446
upgpkg: kdeedu-marble 4.10.2-1
upstream
Modified:
kdeedu-marble/trunk/PKGBUILD
--+
PKGBUILD |6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-04-04 03:58:07 UTC (rev 181445)
+++ PKGBUILD2013-04-04 03:58:10 UTC (rev 181446)
@@ -2,7 +2,7 @@
# Maintainer: Andrea Scarpino
pkgname=kdeedu-marble
-pkgver=4.10.1
+pkgver=4.10.2
pkgrel=1
pkgdesc="Desktop Globe"
url="http://kde.org/applications/education/marble/";
@@ -14,11 +14,9 @@
optdepends=('gpsd: gps support')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.xz";)
-sha1sums=('0704e76204eba8b5cf32239f32d3c385063716ff')
+sha1sums=('e4ba65f861f715a7c4881dd78ed1deb03a36')
build() {
- . /etc/profile.d/qt4.sh
-
mkdir build
cd build
cmake ../marble-${pkgver} \
[arch-commits] Commit in kdeedu-marble/trunk (PKGBUILD)
Date: Monday, March 4, 2013 @ 12:09:41
Author: andrea
Revision: 179156
KDE 4.10.1
Modified:
kdeedu-marble/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-03-04 11:09:39 UTC (rev 179155)
+++ PKGBUILD2013-03-04 11:09:41 UTC (rev 179156)
@@ -2,8 +2,8 @@
# Maintainer: Andrea Scarpino
pkgname=kdeedu-marble
-pkgver=4.10.0
-pkgrel=2
+pkgver=4.10.1
+pkgrel=1
pkgdesc="Desktop Globe"
url="http://kde.org/applications/education/marble/";
arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@
optdepends=('gpsd: gps support')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.xz";)
-sha1sums=('c1db6b1785ca1ad230de6da0e67ee84bf7e3a2cd')
+sha1sums=('0704e76204eba8b5cf32239f32d3c385063716ff')
build() {
. /etc/profile.d/qt4.sh
[arch-commits] Commit in kdeedu-marble/trunk (PKGBUILD)
Date: Tuesday, February 26, 2013 @ 08:27:14
Author: andrea
Revision: 178679
upgpkg: kdeedu-marble 4.10.0-2
qt4 rebuild
Modified:
kdeedu-marble/trunk/PKGBUILD
--+
PKGBUILD |7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-02-26 07:21:23 UTC (rev 178678)
+++ PKGBUILD2013-02-26 07:27:14 UTC (rev 178679)
@@ -3,7 +3,7 @@
pkgname=kdeedu-marble
pkgver=4.10.0
-pkgrel=1
+pkgrel=2
pkgdesc="Desktop Globe"
url="http://kde.org/applications/education/marble/";
arch=('i686' 'x86_64')
@@ -17,7 +17,8 @@
sha1sums=('c1db6b1785ca1ad230de6da0e67ee84bf7e3a2cd')
build() {
- cd "${srcdir}"
+ . /etc/profile.d/qt4.sh
+
mkdir build
cd build
cmake ../marble-${pkgver} \
@@ -28,6 +29,6 @@
}
package() {
- cd "${srcdir}"/build
+ cd build
make DESTDIR="${pkgdir}" install
}
[arch-commits] Commit in kdeedu-marble/trunk (PKGBUILD)
Date: Wednesday, January 2, 2013 @ 06:00:55
Author: andrea
Revision: 174053
KDE 4.9.5
Modified:
kdeedu-marble/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-01-02 11:00:51 UTC (rev 174052)
+++ PKGBUILD2013-01-02 11:00:55 UTC (rev 174053)
@@ -2,7 +2,7 @@
# Maintainer: Andrea Scarpino
pkgname=kdeedu-marble
-pkgver=4.9.4
+pkgver=4.9.5
pkgrel=1
pkgdesc="Desktop Globe"
url="http://kde.org/applications/education/marble/";
@@ -14,7 +14,7 @@
optdepends=('gpsd: gps support')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.xz";)
-sha1sums=('32631172148b5994e81ba51dddf0e5bbd2a1867c')
+sha1sums=('75cf56d9c3c88ef3f7d27f0d4891964372ba467f')
build() {
cd "${srcdir}"
[arch-commits] Commit in kdeedu-marble/trunk (PKGBUILD)
Date: Sunday, December 2, 2012 @ 02:43:15
Author: andrea
Revision: 172217
KDE 4.9.4
Modified:
kdeedu-marble/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-12-02 07:43:11 UTC (rev 172216)
+++ PKGBUILD2012-12-02 07:43:15 UTC (rev 172217)
@@ -2,7 +2,7 @@
# Maintainer: Andrea Scarpino
pkgname=kdeedu-marble
-pkgver=4.9.3
+pkgver=4.9.4
pkgrel=1
pkgdesc="Desktop Globe"
url="http://kde.org/applications/education/marble/";
@@ -14,7 +14,7 @@
optdepends=('gpsd: gps support')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.xz";)
-sha1sums=('f15e058468b5edcb0a2d274c50ef9ef98e22ad34')
+sha1sums=('32631172148b5994e81ba51dddf0e5bbd2a1867c')
build() {
cd "${srcdir}"
[arch-commits] Commit in kdeedu-marble/trunk (PKGBUILD)
Date: Tuesday, November 6, 2012 @ 07:58:07
Author: andrea
Revision: 170265
KDE 4.9.3
Modified:
kdeedu-marble/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-11-06 12:58:03 UTC (rev 170264)
+++ PKGBUILD2012-11-06 12:58:07 UTC (rev 170265)
@@ -2,7 +2,7 @@
# Maintainer: Andrea Scarpino
pkgname=kdeedu-marble
-pkgver=4.9.2
+pkgver=4.9.3
pkgrel=1
pkgdesc="Desktop Globe"
url="http://kde.org/applications/education/marble/";
@@ -14,7 +14,7 @@
optdepends=('gpsd: gps support')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.xz";)
-sha1sums=('71f0ab4845a7bf5505eba0bf5b654720a59d4028')
+sha1sums=('f15e058468b5edcb0a2d274c50ef9ef98e22ad34')
build() {
cd "${srcdir}"
[arch-commits] Commit in kdeedu-marble/trunk (PKGBUILD)
Date: Tuesday, October 2, 2012 @ 05:10:19
Author: andrea
Revision: 167445
KDE 4.9.2
Modified:
kdeedu-marble/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-10-02 09:10:16 UTC (rev 167444)
+++ PKGBUILD2012-10-02 09:10:19 UTC (rev 167445)
@@ -2,7 +2,7 @@
# Maintainer: Andrea Scarpino
pkgname=kdeedu-marble
-pkgver=4.9.1
+pkgver=4.9.2
pkgrel=1
pkgdesc="Desktop Globe"
url="http://kde.org/applications/education/marble/";
@@ -14,7 +14,7 @@
optdepends=('gpsd: gps support')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.xz";)
-sha1sums=('5975a99ef55b418b709279c95ff9afe01cf64264')
+sha1sums=('71f0ab4845a7bf5505eba0bf5b654720a59d4028')
build() {
cd "${srcdir}"
[arch-commits] Commit in kdeedu-marble/trunk (PKGBUILD)
Date: Monday, September 3, 2012 @ 17:49:26
Author: andrea
Revision: 165941
KDE 4.9.1
Modified:
kdeedu-marble/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-09-03 21:49:23 UTC (rev 165940)
+++ PKGBUILD2012-09-03 21:49:26 UTC (rev 165941)
@@ -2,7 +2,7 @@
# Maintainer: Andrea Scarpino
pkgname=kdeedu-marble
-pkgver=4.9.0
+pkgver=4.9.1
pkgrel=1
pkgdesc="Desktop Globe"
url="http://kde.org/applications/education/marble/";
@@ -14,7 +14,7 @@
optdepends=('gpsd: gps support')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.xz";)
-sha1sums=('2eb264123f487629399d807151e1ae6ea1c6c8bb')
+sha1sums=('5975a99ef55b418b709279c95ff9afe01cf64264')
build() {
cd "${srcdir}"
[arch-commits] Commit in kdeedu-marble/trunk (PKGBUILD)
Date: Wednesday, June 6, 2012 @ 12:14:46
Author: andrea
Revision: 160831
KDE 4.8.4
Modified:
kdeedu-marble/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-06-06 16:14:42 UTC (rev 160830)
+++ PKGBUILD2012-06-06 16:14:46 UTC (rev 160831)
@@ -2,7 +2,7 @@
# Maintainer: Andrea Scarpino
pkgname=kdeedu-marble
-pkgver=4.8.3
+pkgver=4.8.4
pkgrel=1
pkgdesc="Desktop Globe"
url="http://kde.org/applications/education/marble/";
@@ -14,7 +14,7 @@
optdepends=('gpsd: gps support')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.xz";)
-sha1sums=('d33d73d757b14a42640176b994ad5930ebc1df30')
+sha1sums=('ec3cd41a1d333e9e3b34595adf6e4859315159b9')
build() {
cd "${srcdir}"
[arch-commits] Commit in kdeedu-marble/trunk (PKGBUILD)
Date: Thursday, May 3, 2012 @ 09:20:59
Author: andrea
Revision: 158150
KDE 4.8.3
Modified:
kdeedu-marble/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-05-03 13:20:56 UTC (rev 158149)
+++ PKGBUILD2012-05-03 13:20:59 UTC (rev 158150)
@@ -2,7 +2,7 @@
# Maintainer: Andrea Scarpino
pkgname=kdeedu-marble
-pkgver=4.8.2
+pkgver=4.8.3
pkgrel=1
pkgdesc="Desktop Globe"
url="http://kde.org/applications/education/marble/";
@@ -14,7 +14,7 @@
optdepends=('gpsd: gps support')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.xz";)
-sha1sums=('f57f134976b27fd0622ba2a24e32128ab23f5494')
+sha1sums=('d33d73d757b14a42640176b994ad5930ebc1df30')
build() {
cd "${srcdir}"
[arch-commits] Commit in kdeedu-marble/trunk (PKGBUILD)
Date: Friday, March 30, 2012 @ 12:12:48
Author: andrea
Revision: 154673
KDE 4.8.2
Modified:
kdeedu-marble/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-03-30 16:12:44 UTC (rev 154672)
+++ PKGBUILD2012-03-30 16:12:48 UTC (rev 154673)
@@ -2,7 +2,7 @@
# Maintainer: Andrea Scarpino
pkgname=kdeedu-marble
-pkgver=4.8.1
+pkgver=4.8.2
pkgrel=1
pkgdesc="Desktop Globe"
url="http://kde.org/applications/education/marble/";
@@ -14,7 +14,7 @@
optdepends=('gpsd: gps support')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.xz";)
-sha1sums=('542da37f6ea2df21b331aea28cab810eb6802b78')
+sha1sums=('f57f134976b27fd0622ba2a24e32128ab23f5494')
build() {
cd "${srcdir}"
[arch-commits] Commit in kdeedu-marble/trunk (PKGBUILD)
Date: Tuesday, March 6, 2012 @ 13:29:12
Author: andrea
Revision: 152343
Path has been changed; new kdepim tarball
Modified:
kdeedu-marble/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-03-06 18:29:09 UTC (rev 152342)
+++ PKGBUILD2012-03-06 18:29:12 UTC (rev 152343)
@@ -13,7 +13,7 @@
makedepends=('cmake' 'automoc4' 'gpsd')
optdepends=('gpsd: gps support')
install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/xz/marble-${pkgver}.tar.xz";)
+source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.xz";)
sha1sums=('542da37f6ea2df21b331aea28cab810eb6802b78')
build() {
[arch-commits] Commit in kdeedu-marble/trunk (PKGBUILD fix-with-qt48.patch)
Date: Sunday, March 4, 2012 @ 06:08:43
Author: andrea
Revision: 151950
KDE 4.8.1
Modified:
kdeedu-marble/trunk/PKGBUILD
Deleted:
kdeedu-marble/trunk/fix-with-qt48.patch
-+
PKGBUILD| 13 ++-
fix-with-qt48.patch | 87 --
2 files changed, 4 insertions(+), 96 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-03-04 11:08:33 UTC (rev 151949)
+++ PKGBUILD2012-03-04 11:08:43 UTC (rev 151950)
@@ -2,8 +2,8 @@
# Maintainer: Andrea Scarpino
pkgname=kdeedu-marble
-pkgver=4.8.0
-pkgrel=2
+pkgver=4.8.1
+pkgrel=1
pkgdesc="Desktop Globe"
url="http://kde.org/applications/education/marble/";
arch=('i686' 'x86_64')
@@ -13,15 +13,10 @@
makedepends=('cmake' 'automoc4' 'gpsd')
optdepends=('gpsd: gps support')
install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.bz2";
-'fix-with-qt48.patch')
-sha1sums=('6c3c6b03c9d8e92730d6955adcbdb5de42fda43d'
- '3ec130564aa1b7a61a0c3cd51533c69c6c35bd0e')
+source=("http://download.kde.org/stable/${pkgver}/src/xz/marble-${pkgver}.tar.xz";)
+sha1sums=('542da37f6ea2df21b331aea28cab810eb6802b78')
build() {
- cd "${srcdir}"/marble-${pkgver}
- patch -p1 -i "${srcdir}"/fix-with-qt48.patch
-
cd "${srcdir}"
mkdir build
cd build
Deleted: fix-with-qt48.patch
===
--- fix-with-qt48.patch 2012-03-04 11:08:33 UTC (rev 151949)
+++ fix-with-qt48.patch 2012-03-04 11:08:43 UTC (rev 151950)
@@ -1,87 +0,0 @@
-commit 79c39f45468bace95169d1ba959884ce27087d1e
-Author: Torsten Rahn
-Date: Wed Feb 8 17:18:15 2012 +0100
-
-Fixes for Marble with Qt 4.8:
-
-- Provide proper colors for Marble's Atlas, Temperature,
- Precipitation and Venus/Mars Topography maps.
- ( due to introduction of QImage::fill( QColor ) overload )
-
-- Show proper icons for MarbleLegendBrowser
- ( due to new interpretation of the "current directory" in
-QTextBrowser )
-
-diff --git a/src/lib/MarbleLegendBrowser.cpp b/src/lib/MarbleLegendBrowser.cpp
-index 4a25095..ffa0a23 100644
a/src/lib/MarbleLegendBrowser.cpp
-+++ b/src/lib/MarbleLegendBrowser.cpp
-@@ -130,26 +130,24 @@ void MarbleLegendBrowser::loadLegend()
- t.start();
-
- // Read the html string.
--QString finalHtml;
-+QString legendPath;
-
- // Check for a theme specific legend.html first
- if ( d->m_marbleModel != 0 && d->m_marbleModel->mapTheme() != 0 )
- {
- GeoSceneDocument *currentMapTheme = d->m_marbleModel->mapTheme();
-
--QString customLegendPath = MarbleDirs::path( "maps/" +
-+legendPath = MarbleDirs::path( "maps/" +
- currentMapTheme->head()->target() + '/' +
- currentMapTheme->head()->theme() + "/legend.html" );
--if ( !customLegendPath.isEmpty() )
--finalHtml = readHtml( QUrl::fromLocalFile( customLegendPath ) );
--else
--finalHtml.clear();
- }
--
--if ( finalHtml.isEmpty() ) {
--finalHtml = readHtml( QUrl::fromLocalFile( MarbleDirs::path(
"legend.html" ) ) );
-+if ( legendPath.isEmpty() ) {
-+ legendPath = MarbleDirs::path( "legend.html" );
- }
-
-+QString finalHtml = readHtml( QUrl::fromLocalFile( legendPath ) );
-+finalHtml.replace( QString( "./" ), legendPath.section( '/', 0, -2 ) +
'/' );
-+
- // Generate some parts of the html from the MapTheme tag.
- const QString sectionsHtml = generateSectionsHtml();
-
-diff --git a/src/lib/TextureColorizer.cpp b/src/lib/TextureColorizer.cpp
-index 4a4f8f3..d0deead 100644
a/src/lib/TextureColorizer.cpp
-+++ b/src/lib/TextureColorizer.cpp
-@@ -176,7 +176,7 @@ void TextureColorizer::colorize( QImage *origimg, const
ViewportParams *viewport
- m_coastImage = QImage( viewport->size(), QImage::Format_RGB32 );
-
- // update coast image
--m_coastImage.fill( Qt::transparent );
-+m_coastImage.fill( QColor( 0, 0, 255, 0) );
-
- bool doClip = false; //assume false
- switch( viewport->projection() ) {
-commit b89ff577fcbd085fbd180f59aa669dded1818082
-Author: Bernhard Beschow
-Date: Wed Feb 8 18:14:59 2012 +0100
-
-compile with Qt < 4.8
-
-* take into account the comment in the API doc, which suggests to use
QColor::rgb()
-(cherry picked from commit 6eafb31f509c622e2672c31b73ebcb1b3dafb3e9)
-
-diff --git a/src/lib/TextureColorizer.cpp b/src/lib/TextureColorizer.cpp
-index d0deead..9319a89 100644
a/src/lib/TextureColorizer.cpp
-+++ b/src/lib/TextureColorizer.cpp
-@@ -176,7 +176,7 @@ void TextureColorizer::colorize( QImage *origimg, const
ViewportParams *viewport
- m_coastImage = QImage( viewport->size(), QImage::Format_RGB32 );
-
- // update coast image
--m_coastImage.fill( QColor( 0, 0, 255, 0) );
-+m_coastImage.fill( QColor( 0,
[arch-commits] Commit in kdeedu-marble/trunk (PKGBUILD fix-with-qt48.patch)
Date: Thursday, February 9, 2012 @ 09:11:07
Author: andrea
Revision: 149701
upgpkg: kdeedu-marble 4.8.0-2
Fix bugs with Qt 4.8
Added:
kdeedu-marble/trunk/fix-with-qt48.patch
Modified:
kdeedu-marble/trunk/PKGBUILD
-+
PKGBUILD| 11 --
fix-with-qt48.patch | 87 ++
2 files changed, 95 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-02-09 04:56:34 UTC (rev 149700)
+++ PKGBUILD2012-02-09 14:11:07 UTC (rev 149701)
@@ -3,7 +3,7 @@
pkgname=kdeedu-marble
pkgver=4.8.0
-pkgrel=1
+pkgrel=2
pkgdesc="Desktop Globe"
url="http://kde.org/applications/education/marble/";
arch=('i686' 'x86_64')
@@ -13,10 +13,15 @@
makedepends=('cmake' 'automoc4' 'gpsd')
optdepends=('gpsd: gps support')
install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.bz2";)
-sha1sums=('6c3c6b03c9d8e92730d6955adcbdb5de42fda43d')
+source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.bz2";
+'fix-with-qt48.patch')
+sha1sums=('6c3c6b03c9d8e92730d6955adcbdb5de42fda43d'
+ '3ec130564aa1b7a61a0c3cd51533c69c6c35bd0e')
build() {
+ cd "${srcdir}"/marble-${pkgver}
+ patch -p1 -i "${srcdir}"/fix-with-qt48.patch
+
cd "${srcdir}"
mkdir build
cd build
Added: fix-with-qt48.patch
===
--- fix-with-qt48.patch (rev 0)
+++ fix-with-qt48.patch 2012-02-09 14:11:07 UTC (rev 149701)
@@ -0,0 +1,87 @@
+commit 79c39f45468bace95169d1ba959884ce27087d1e
+Author: Torsten Rahn
+Date: Wed Feb 8 17:18:15 2012 +0100
+
+Fixes for Marble with Qt 4.8:
+
+- Provide proper colors for Marble's Atlas, Temperature,
+ Precipitation and Venus/Mars Topography maps.
+ ( due to introduction of QImage::fill( QColor ) overload )
+
+- Show proper icons for MarbleLegendBrowser
+ ( due to new interpretation of the "current directory" in
+QTextBrowser )
+
+diff --git a/src/lib/MarbleLegendBrowser.cpp b/src/lib/MarbleLegendBrowser.cpp
+index 4a25095..ffa0a23 100644
+--- a/src/lib/MarbleLegendBrowser.cpp
b/src/lib/MarbleLegendBrowser.cpp
+@@ -130,26 +130,24 @@ void MarbleLegendBrowser::loadLegend()
+ t.start();
+
+ // Read the html string.
+-QString finalHtml;
++QString legendPath;
+
+ // Check for a theme specific legend.html first
+ if ( d->m_marbleModel != 0 && d->m_marbleModel->mapTheme() != 0 )
+ {
+ GeoSceneDocument *currentMapTheme = d->m_marbleModel->mapTheme();
+
+-QString customLegendPath = MarbleDirs::path( "maps/" +
++legendPath = MarbleDirs::path( "maps/" +
+ currentMapTheme->head()->target() + '/' +
+ currentMapTheme->head()->theme() + "/legend.html" );
+-if ( !customLegendPath.isEmpty() )
+-finalHtml = readHtml( QUrl::fromLocalFile( customLegendPath ) );
+-else
+-finalHtml.clear();
+ }
+-
+-if ( finalHtml.isEmpty() ) {
+-finalHtml = readHtml( QUrl::fromLocalFile( MarbleDirs::path(
"legend.html" ) ) );
++if ( legendPath.isEmpty() ) {
++ legendPath = MarbleDirs::path( "legend.html" );
+ }
+
++QString finalHtml = readHtml( QUrl::fromLocalFile( legendPath ) );
++finalHtml.replace( QString( "./" ), legendPath.section( '/', 0, -2 ) +
'/' );
++
+ // Generate some parts of the html from the MapTheme tag.
+ const QString sectionsHtml = generateSectionsHtml();
+
+diff --git a/src/lib/TextureColorizer.cpp b/src/lib/TextureColorizer.cpp
+index 4a4f8f3..d0deead 100644
+--- a/src/lib/TextureColorizer.cpp
b/src/lib/TextureColorizer.cpp
+@@ -176,7 +176,7 @@ void TextureColorizer::colorize( QImage *origimg, const
ViewportParams *viewport
+ m_coastImage = QImage( viewport->size(), QImage::Format_RGB32 );
+
+ // update coast image
+-m_coastImage.fill( Qt::transparent );
++m_coastImage.fill( QColor( 0, 0, 255, 0) );
+
+ bool doClip = false; //assume false
+ switch( viewport->projection() ) {
+commit b89ff577fcbd085fbd180f59aa669dded1818082
+Author: Bernhard Beschow
+Date: Wed Feb 8 18:14:59 2012 +0100
+
+compile with Qt < 4.8
+
+* take into account the comment in the API doc, which suggests to use
QColor::rgb()
+(cherry picked from commit 6eafb31f509c622e2672c31b73ebcb1b3dafb3e9)
+
+diff --git a/src/lib/TextureColorizer.cpp b/src/lib/TextureColorizer.cpp
+index d0deead..9319a89 100644
+--- a/src/lib/TextureColorizer.cpp
b/src/lib/TextureColorizer.cpp
+@@ -176,7 +176,7 @@ void TextureColorizer::colorize( QImage *origimg, const
ViewportParams *viewport
+ m_coastImage = QImage( viewport->size(), QImage::Format_RGB32 );
+
+ // update coast image
+-m_coastImage.fill( QColor( 0, 0, 255, 0) );
++m_coastImage.fill( QColor( 0, 0, 255, 0).
[arch-commits] Commit in kdeedu-marble/trunk (PKGBUILD)
Date: Wednesday, January 25, 2012 @ 15:34:33
Author: andrea
Revision: 147294
KDE 4.8.0
Modified:
kdeedu-marble/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-01-25 20:34:30 UTC (rev 147293)
+++ PKGBUILD2012-01-25 20:34:33 UTC (rev 147294)
@@ -2,7 +2,7 @@
# Maintainer: Andrea Scarpino
pkgname=kdeedu-marble
-pkgver=4.7.97
+pkgver=4.8.0
pkgrel=1
pkgdesc="Desktop Globe"
url="http://kde.org/applications/education/marble/";
@@ -13,8 +13,8 @@
makedepends=('cmake' 'automoc4' 'gpsd')
optdepends=('gpsd: gps support')
install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/marble-${pkgver}.tar.bz2";)
-sha1sums=('7b91f34d79c13dc3cac47f53249cddfe229251e3')
+source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.bz2";)
+sha1sums=('6c3c6b03c9d8e92730d6955adcbdb5de42fda43d')
build() {
cd "${srcdir}"
[arch-commits] Commit in kdeedu-marble/trunk (PKGBUILD)
Date: Wednesday, January 4, 2012 @ 08:16:53
Author: andrea
Revision: 145967
KDE 4.8RC2
Modified:
kdeedu-marble/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-01-04 13:16:50 UTC (rev 145966)
+++ PKGBUILD2012-01-04 13:16:53 UTC (rev 145967)
@@ -2,7 +2,7 @@
# Maintainer: Andrea Scarpino
pkgname=kdeedu-marble
-pkgver=4.7.95
+pkgver=4.7.97
pkgrel=1
pkgdesc="Desktop Globe"
url="http://kde.org/applications/education/marble/";
@@ -14,7 +14,7 @@
optdepends=('gpsd: gps support')
install=${pkgname}.install
source=("http://download.kde.org/unstable/${pkgver}/src/marble-${pkgver}.tar.bz2";)
-sha1sums=('cb4d4a4b5ac69ac43d18a4b3f5dea4211bb89785')
+sha1sums=('7b91f34d79c13dc3cac47f53249cddfe229251e3')
build() {
cd "${srcdir}"
[arch-commits] Commit in kdeedu-marble/trunk (PKGBUILD)
Date: Thursday, December 22, 2011 @ 02:58:51
Author: andrea
Revision: 145368
KDE 4.8RC1
Modified:
kdeedu-marble/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-12-22 07:58:48 UTC (rev 145367)
+++ PKGBUILD2011-12-22 07:58:51 UTC (rev 145368)
@@ -2,7 +2,7 @@
# Maintainer: Andrea Scarpino
pkgname=kdeedu-marble
-pkgver=4.7.90
+pkgver=4.7.95
pkgrel=1
pkgdesc="Desktop Globe"
url="http://kde.org/applications/education/marble/";
@@ -14,7 +14,7 @@
optdepends=('gpsd: gps support')
install=${pkgname}.install
source=("http://download.kde.org/unstable/${pkgver}/src/marble-${pkgver}.tar.bz2";)
-sha1sums=('5b184a51a5e6448657ebc9926ee41c7f894e5898')
+sha1sums=('cb4d4a4b5ac69ac43d18a4b3f5dea4211bb89785')
build() {
cd "${srcdir}"
[arch-commits] Commit in kdeedu-marble/trunk (PKGBUILD)
Date: Wednesday, December 7, 2011 @ 03:22:57
Author: andrea
Revision: 144511
KDE 4.8beta2
Modified:
kdeedu-marble/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-12-07 08:22:54 UTC (rev 144510)
+++ PKGBUILD2011-12-07 08:22:57 UTC (rev 144511)
@@ -2,7 +2,7 @@
# Maintainer: Andrea Scarpino
pkgname=kdeedu-marble
-pkgver=4.7.80
+pkgver=4.7.90
pkgrel=1
pkgdesc="Desktop Globe"
url="http://kde.org/applications/education/marble/";
@@ -14,7 +14,7 @@
optdepends=('gpsd: gps support')
install=${pkgname}.install
source=("http://download.kde.org/unstable/${pkgver}/src/marble-${pkgver}.tar.bz2";)
-sha1sums=('e525f3bca3bef13a3506f5b295847e62fd69e4b2')
+sha1sums=('5b184a51a5e6448657ebc9926ee41c7f894e5898')
build() {
cd "${srcdir}"
[arch-commits] Commit in kdeedu-marble/trunk (PKGBUILD)
Date: Sunday, October 30, 2011 @ 07:17:29
Author: andrea
Revision: 141407
KDE 4.7.3
Modified:
kdeedu-marble/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-10-30 11:17:27 UTC (rev 141406)
+++ PKGBUILD2011-10-30 11:17:29 UTC (rev 141407)
@@ -2,7 +2,7 @@
# Maintainer: Andrea Scarpino
pkgname=kdeedu-marble
-pkgver=4.7.2
+pkgver=4.7.3
pkgrel=1
pkgdesc="Desktop Globe"
url="http://kde.org/applications/education/marble/";
@@ -14,7 +14,7 @@
optdepends=('gpsd: gps support')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.bz2";)
-sha1sums=('2b6353ff589d66dcf95a3eb79059275f620e03b2')
+sha1sums=('980a8dae9c7a0f8483fde5dc839fae834763933a')
build() {
cd "${srcdir}"
[arch-commits] Commit in kdeedu-marble/trunk (PKGBUILD gpsd3.patch)
Date: Tuesday, October 4, 2011 @ 13:49:56
Author: andrea
Revision: 139688
KDE 4.7.2
Modified:
kdeedu-marble/trunk/PKGBUILD
Deleted:
kdeedu-marble/trunk/gpsd3.patch
-+
PKGBUILD| 11 +++
gpsd3.patch | 42 --
2 files changed, 3 insertions(+), 50 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-10-04 17:49:53 UTC (rev 139687)
+++ PKGBUILD2011-10-04 17:49:56 UTC (rev 139688)
@@ -2,7 +2,7 @@
# Maintainer: Andrea Scarpino
pkgname=kdeedu-marble
-pkgver=4.7.1
+pkgver=4.7.2
pkgrel=1
pkgdesc="Desktop Globe"
url="http://kde.org/applications/education/marble/";
@@ -13,15 +13,10 @@
makedepends=('cmake' 'automoc4' 'gpsd')
optdepends=('gpsd: gps support')
install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.bz2";
-'gpsd3.patch')
-sha1sums=('71c9ccd884495b34c8af4f7c432ca8942dfaa9dd'
- '3916dd6307109d70d0dd538de913c91eede81d78')
+source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.bz2";)
+sha1sums=('2b6353ff589d66dcf95a3eb79059275f620e03b2')
build() {
- cd "${srcdir}"/marble-${pkgver}
- patch -p1 -i "${srcdir}"/gpsd3.patch
-
cd "${srcdir}"
mkdir build
cd build
Deleted: gpsd3.patch
===
--- gpsd3.patch 2011-10-04 17:49:53 UTC (rev 139687)
+++ gpsd3.patch 2011-10-04 17:49:56 UTC (rev 139688)
@@ -1,42 +0,0 @@
-diff -up
marble-4.7.0/src/plugins/positionprovider/gpsd/GpsdConnection.cpp.orig
marble-4.7.0/src/plugins/positionprovider/gpsd/GpsdConnection.cpp
marble-4.7.0/src/plugins/positionprovider/gpsd/GpsdConnection.cpp.orig
2011-05-20 15:34:41.0 -0500
-+++ marble-4.7.0/src/plugins/positionprovider/gpsd/GpsdConnection.cpp
2011-08-24 13:38:37.050200241 -0500
-@@ -20,6 +20,9 @@ using namespace Marble;
-
- GpsdConnection::GpsdConnection( QObject* parent )
- : QObject( parent ),
-+#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 )
-+ m_gpsd("localhost", DEFAULT_GPSD_PORT),
-+#endif
- m_timer( 0 )
- {
- m_oldLocale = setlocale( LC_NUMERIC, NULL );
-@@ -35,7 +38,11 @@ GpsdConnection::~GpsdConnection()
- void GpsdConnection::initialize()
- {
- m_timer.stop();
-+#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 )
-+gps_data_t* data;
-+#else
- gps_data_t* data = m_gpsd.open();
-+#endif
- if ( data ) {
- m_status = PositionProviderStatusAcquiring;
- emit statusChanged( m_status );
-@@ -82,8 +89,16 @@ void GpsdConnection::initialize()
- void GpsdConnection::update()
- {
- #if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 3 ) &&
defined( PACKET_SET )
-+#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 )
-+if ( m_gpsd.waiting(0) ) {
-+#else
- if ( m_gpsd.waiting() ) {
-+#endif
-+#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 )
-+gps_data_t* data = m_gpsd.read();
-+#else
- gps_data_t* data = m_gpsd.poll();
-+#endif
- if ( data && data->set & PACKET_SET ) {
- emit gpsdInfo( *data );
- }
[arch-commits] Commit in kdeedu-marble/trunk (PKGBUILD)
Date: Tuesday, September 6, 2011 @ 04:20:57
Author: andrea
Revision: 137119
KDE 4.7.1
Modified:
kdeedu-marble/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-09-06 08:20:54 UTC (rev 137118)
+++ PKGBUILD2011-09-06 08:20:57 UTC (rev 137119)
@@ -2,8 +2,8 @@
# Maintainer: Andrea Scarpino
pkgname=kdeedu-marble
-pkgver=4.7.0
-pkgrel=3
+pkgver=4.7.1
+pkgrel=1
pkgdesc="Desktop Globe"
url="http://kde.org/applications/education/marble/";
arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.bz2";
'gpsd3.patch')
-sha1sums=('bbe08a57a33e06fceea3a51aed1406bc71ee02a9'
+sha1sums=('71c9ccd884495b34c8af4f7c432ca8942dfaa9dd'
'3916dd6307109d70d0dd538de913c91eede81d78')
build() {
[arch-commits] Commit in kdeedu-marble/trunk (PKGBUILD gpsd-2.96.patch gpsd3.patch)
Date: Thursday, August 25, 2011 @ 04:57:13
Author: andrea
Revision: 136261
upgpkg: kdeedu-marble 4.7.0-3
Update patch for gpsd 3.0
Added:
kdeedu-marble/trunk/gpsd3.patch
Modified:
kdeedu-marble/trunk/PKGBUILD
Deleted:
kdeedu-marble/trunk/gpsd-2.96.patch
-+
PKGBUILD|8
gpsd-2.96.patch | 41 -
gpsd3.patch | 42 ++
3 files changed, 46 insertions(+), 45 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-08-25 08:51:06 UTC (rev 136260)
+++ PKGBUILD2011-08-25 08:57:13 UTC (rev 136261)
@@ -3,7 +3,7 @@
pkgname=kdeedu-marble
pkgver=4.7.0
-pkgrel=2
+pkgrel=3
pkgdesc="Desktop Globe"
url="http://kde.org/applications/education/marble/";
arch=('i686' 'x86_64')
@@ -14,13 +14,13 @@
optdepends=('gpsd: gps support')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.bz2";
-'gpsd-2.96.patch')
+'gpsd3.patch')
sha1sums=('bbe08a57a33e06fceea3a51aed1406bc71ee02a9'
- 'f44dfd3bb384e631d59b93d7dda3413795da8183')
+ '3916dd6307109d70d0dd538de913c91eede81d78')
build() {
cd "${srcdir}"/marble-${pkgver}
- patch -p1 -i "${srcdir}"/gpsd-2.96.patch
+ patch -p1 -i "${srcdir}"/gpsd3.patch
cd "${srcdir}"
mkdir build
Deleted: gpsd-2.96.patch
===
--- gpsd-2.96.patch 2011-08-25 08:51:06 UTC (rev 136260)
+++ gpsd-2.96.patch 2011-08-25 08:57:13 UTC (rev 136261)
@@ -1,41 +0,0 @@
marble-4.6.80/src/plugins/positionprovider/gpsd/GpsdConnection.cpp
-+++ marble-4.6.80/src/plugins/positionprovider/gpsd/GpsdConnection.cpp
-@@ -18,6 +18,9 @@ using namespace Marble;
-
- GpsdConnection::GpsdConnection( QObject* parent )
- : QObject( parent ),
-+#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 )
-+ m_gpsd("localhost", DEFAULT_GPSD_PORT),
-+#endif
- m_timer( 0 )
- {
- connect( &m_timer, SIGNAL( timeout() ), this, SLOT( update() ) );
-@@ -26,7 +29,11 @@ GpsdConnection::GpsdConnection( QObject*
- void GpsdConnection::initialize()
- {
- m_timer.stop();
-+#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 )
-+gps_data_t* data;
-+#else
- gps_data_t* data = m_gpsd.open();
-+#endif
- if ( data ) {
- m_status = PositionProviderStatusAcquiring;
- emit statusChanged( m_status );
-@@ -73,8 +80,16 @@ void GpsdConnection::initialize()
- void GpsdConnection::update()
- {
- #if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 3 ) &&
defined( PACKET_SET )
-+#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 )
-+if ( m_gpsd.waiting(0) ) {
-+#else
- if ( m_gpsd.waiting() ) {
-+#endif
-+#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 )
-+gps_data_t* data = m_gpsd.read();
-+#else
- gps_data_t* data = m_gpsd.poll();
-+#endif
- if ( data && data->set & PACKET_SET ) {
- emit gpsdInfo( *data );
- }
Added: gpsd3.patch
===
--- gpsd3.patch (rev 0)
+++ gpsd3.patch 2011-08-25 08:57:13 UTC (rev 136261)
@@ -0,0 +1,42 @@
+diff -up
marble-4.7.0/src/plugins/positionprovider/gpsd/GpsdConnection.cpp.orig
marble-4.7.0/src/plugins/positionprovider/gpsd/GpsdConnection.cpp
+--- marble-4.7.0/src/plugins/positionprovider/gpsd/GpsdConnection.cpp.orig
2011-05-20 15:34:41.0 -0500
marble-4.7.0/src/plugins/positionprovider/gpsd/GpsdConnection.cpp
2011-08-24 13:38:37.050200241 -0500
+@@ -20,6 +20,9 @@ using namespace Marble;
+
+ GpsdConnection::GpsdConnection( QObject* parent )
+ : QObject( parent ),
++#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 )
++ m_gpsd("localhost", DEFAULT_GPSD_PORT),
++#endif
+ m_timer( 0 )
+ {
+ m_oldLocale = setlocale( LC_NUMERIC, NULL );
+@@ -35,7 +38,11 @@ GpsdConnection::~GpsdConnection()
+ void GpsdConnection::initialize()
+ {
+ m_timer.stop();
++#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 )
++gps_data_t* data;
++#else
+ gps_data_t* data = m_gpsd.open();
++#endif
+ if ( data ) {
+ m_status = PositionProviderStatusAcquiring;
+ emit statusChanged( m_status );
+@@ -82,8 +89,16 @@ void GpsdConnection::initialize()
+ void GpsdConnection::update()
+ {
+ #if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 3 ) &&
defined( PACKET_SET )
++#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 )
++if ( m_gpsd.waiting(0) ) {
++#else
+ if ( m_gpsd.waiting() ) {
++#endif
++#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 )
++gps_data_t* data = m_gpsd.read();
++#else
+ gps_data_t* data = m_gps
[arch-commits] Commit in kdeedu-marble/trunk (PKGBUILD)
Date: Tuesday, August 2, 2011 @ 04:56:19
Author: andrea
Revision: 134137
upgpkg: kdeedu-marble 4.7.0-2
Move gpsd as optional dependence
Modified:
kdeedu-marble/trunk/PKGBUILD
--+
PKGBUILD |7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-08-02 04:36:05 UTC (rev 134136)
+++ PKGBUILD2011-08-02 08:56:19 UTC (rev 134137)
@@ -3,14 +3,15 @@
pkgname=kdeedu-marble
pkgver=4.7.0
-pkgrel=1
+pkgrel=2
pkgdesc="Desktop Globe"
url="http://kde.org/applications/education/marble/";
arch=('i686' 'x86_64')
license=('GPL' 'LGPL' 'FDL')
groups=('kde' 'kdeedu')
-depends=('kdebase-runtime' 'gpsd')
-makedepends=('cmake' 'automoc4')
+depends=('kdebase-runtime')
+makedepends=('cmake' 'automoc4' 'gpsd')
+optdepends=('gpsd: gps support')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.bz2";
'gpsd-2.96.patch')
