From 671a60577f8457b3582708fb3ebda442bfe34495 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Mon, 20 Nov 2017 13:17:19 +0100 Subject: [PATCH] Revert "marble: update to 17.08.3 (#9290)" This reverts commit f6f523e01b0dd0e402d5297898afd06341a5022c. --- common/shlibs | 5 ++--- srcpkgs/marble/template | 19 +++++++++---------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/common/shlibs b/common/shlibs index 1f3bdc0eebb..26ab530f79a 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1926,9 +1926,8 @@ libdruntime-ldc-debug.so.75 ldc-runtime-1.5.0_1 libdruntime-ldc.so.75 ldc-runtime-1.5.0_1 libphobos2-ldc.so.75 ldc-runtime-1.5.0_1 libphobos2-ldc-debug.so.75 ldc-runtime-1.5.0_1 -libmarblewidget-qt5.so.28 marble-17.08.3_1 -libastro.so.1 marble-17.08.3_1 -libmarbledeclarative.so marble-17.08.3_1 +libmarblewidget.so.19 marble-4.14.3_2 +libastro.so.1 marble-4.14.3_2 libparrot.so.6.9.0 parrot-6.9.0_1 libkipi.so.11 libkipi-4.14.3_1 libasr.so.0 libasr-1.0.0_1 diff --git a/srcpkgs/marble/template b/srcpkgs/marble/template index a410e8d1aea..d2118f32bf6 100644 --- a/srcpkgs/marble/template +++ b/srcpkgs/marble/template @@ -1,20 +1,19 @@ # Template file for 'marble' +# vim: set ts=4 sw=4 sts=4 et: +reverts=17.08.3_1 pkgname=marble -version=17.08.3 -revision=1 +version=4.14.3 +revision=5 maintainer="Carlo Dormeletti " homepage="https://marble.kde.org" license="GPL-3" short_desc="Virtual globe and world atlas" build_style=cmake -hostmakedepends="extra-cmake-modules kdoctools qt5-host-tools qt5-qmake" -makedepends="knewstuff-devel kparts-devel krunner-devel libressl-devel -phonon-devel plasma-framework-devel qt5-devel qt5-location-devel -qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite -qt5-plugin-tds qt5-serialport-devel qt5-webkit-devel" +hostmakedepends="automoc4 pkg-config" +makedepends="libressl-devel qt-devel qt-webkit-devel kdelibs-devel phonon-devel" replaces="libmarble>=0" -distfiles="http://download.kde.org/stable/applications/${version}/src/${pkgname}-${version}.tar.xz" -checksum=c27f8b33ad0f1cc36c5af4f23352f02ab8de4a18e8a448f8ef80b41756f2bf62 +distfiles="http://download.kde.org/stable/${version}/src/marble-${version}.tar.xz" +checksum="4d6667cf67ae9976e4c1efc306be222d13f2ee5927483325411ae0e9631dc0f0" marble-devel_package() { replaces="libmarble-devel>=0" @@ -23,6 +22,6 @@ marble-devel_package() { pkg_install() { vmove usr/include vmove "usr/lib/*.so" - vmove usr/lib/cmake + vmove usr/share/apps/cmake } }