diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2013-02-09 11:13:39 +0100 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-02-09 11:13:39 +0100 |
commit | 80c5e58be137999f5d9690b682e888436ffe69b2 (patch) | |
tree | 5aef91b2cbc21ef5471d9ab69066ba7beaf747f0 /extra/kdeedu-marble | |
parent | 9866fa59a35ebbae88bec725eba8551f34990e03 (diff) | |
parent | e9c244cac8e5dc1c59c7e8b7bc885fef04224b70 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/haskell-dataenc/PKGBUILD
community/haskell-haskeline/PKGBUILD
community/haskell-hslogger/PKGBUILD
community/haskell-terminfo/PKGBUILD
community/haskell-utf8-string/PKGBUILD
community/haskell-x11-xft/PKGBUILD
core/openssl/PKGBUILD
extra/cabal-install/PKGBUILD
extra/haskell-http/PKGBUILD
extra/haskell-mtl/PKGBUILD
extra/haskell-network/PKGBUILD
extra/haskell-parsec/PKGBUILD
extra/haskell-text/PKGBUILD
extra/haskell-transformers/PKGBUILD
extra/haskell-zlib/PKGBUILD
extra/kdebindings-python/PKGBUILD
Diffstat (limited to 'extra/kdeedu-marble')
-rw-r--r-- | extra/kdeedu-marble/PKGBUILD | 7 | ||||
-rw-r--r-- | extra/kdeedu-marble/kdeedu-marble.install | 1 |
2 files changed, 5 insertions, 3 deletions
diff --git a/extra/kdeedu-marble/PKGBUILD b/extra/kdeedu-marble/PKGBUILD index 729e2dcda..f6954a72b 100644 --- a/extra/kdeedu-marble/PKGBUILD +++ b/extra/kdeedu-marble/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 174652 2013-01-05 13:06:11Z andrea $ +# $Id: PKGBUILD 177645 2013-02-08 08:56:05Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-marble -pkgver=4.9.5 +pkgver=4.10.0 pkgrel=1 pkgdesc="Desktop Globe" url="http://kde.org/applications/education/marble/" @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4' 'gpsd') optdepends=('gpsd: gps support') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.xz") -sha1sums=('75cf56d9c3c88ef3f7d27f0d4891964372ba467f') +sha1sums=('c1db6b1785ca1ad230de6da0e67ee84bf7e3a2cd') build() { cd "${srcdir}" @@ -22,6 +22,7 @@ build() { cd build cmake ../marble-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ + -DKDE4_BUILD_TESTS=OFF \ -DCMAKE_INSTALL_PREFIX=/usr make } diff --git a/extra/kdeedu-marble/kdeedu-marble.install b/extra/kdeedu-marble/kdeedu-marble.install index 81ce5c4b0..117b47128 100644 --- a/extra/kdeedu-marble/kdeedu-marble.install +++ b/extra/kdeedu-marble/kdeedu-marble.install @@ -1,6 +1,7 @@ post_install() { xdg-icon-resource forceupdate --theme hicolor &> /dev/null update-desktop-database -q + update-mime-database usr/share/mime &> /dev/null } post_upgrade() { |