From ac8f116bd70a3de6f7df53dc336c659d135dc77e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Mon, 12 Feb 2018 09:26:38 +0100 Subject: [PATCH] New package: marble5-17.12.3 [ci skip] --- common/shlibs | 2 ++ srcpkgs/marble/template | 2 ++ srcpkgs/marble5-devel | 1 + srcpkgs/marble5/patches/soversion.diff | 24 +++++++++++++++++++ srcpkgs/marble5/template | 33 ++++++++++++++++++++++++++ 5 files changed, 62 insertions(+) create mode 120000 srcpkgs/marble5-devel create mode 100644 srcpkgs/marble5/patches/soversion.diff create mode 100644 srcpkgs/marble5/template diff --git a/common/shlibs b/common/shlibs index dfd10b6e1d1..edb967f8397 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1978,6 +1978,8 @@ libphobos2-ldc-debug-shared.so.78 ldc-runtime-1.8.0_1 libldc-jit.so.78 ldc-runtime-1.8.0_1 libmarblewidget.so.19 marble-4.14.3_2 libastro.so.1 marble-4.14.3_2 +libmarblewidget-qt5.so.28 marble5-17.12.2_1 +libastro.so.2 marble5-17.12.2_1 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 d2118f32bf6..432a7fa6cc2 100644 --- a/srcpkgs/marble/template +++ b/srcpkgs/marble/template @@ -14,11 +14,13 @@ makedepends="libressl-devel qt-devel qt-webkit-devel kdelibs-devel phonon-devel" replaces="libmarble>=0" distfiles="http://download.kde.org/stable/${version}/src/marble-${version}.tar.xz" checksum="4d6667cf67ae9976e4c1efc306be222d13f2ee5927483325411ae0e9631dc0f0" +conflicts="marble5" marble-devel_package() { replaces="libmarble-devel>=0" short_desc+=" - development files" depends="${makedepends} ${sourcepkg}>=${version}_${revision}" + conflicts="marble5-devel" pkg_install() { vmove usr/include vmove "usr/lib/*.so" diff --git a/srcpkgs/marble5-devel b/srcpkgs/marble5-devel new file mode 120000 index 00000000000..a3bce4779eb --- /dev/null +++ b/srcpkgs/marble5-devel @@ -0,0 +1 @@ +marble5 \ No newline at end of file diff --git a/srcpkgs/marble5/patches/soversion.diff b/srcpkgs/marble5/patches/soversion.diff new file mode 100644 index 00000000000..84cec617b0d --- /dev/null +++ b/srcpkgs/marble5/patches/soversion.diff @@ -0,0 +1,24 @@ +--- src/lib/astro/CMakeLists.txt 2018-01-10 08:43:24.000000000 +0100 ++++ src/lib/astro/CMakeLists.txt 2018-02-10 15:08:03.545093856 +0100 +@@ -6,7 +6,7 @@ + ) + + set(ASTRO_LIB_VERSION "0.17.20") +-set(ASTRO_LIB_SOVERSION "1") ++set(ASTRO_LIB_SOVERSION "2") + + ADD_DEFINITIONS(-O3) + +--- src/lib/marble/declarative/CMakeLists.txt 2018-01-10 08:43:24.000000000 +0100 ++++ src/lib/marble/declarative/CMakeLists.txt 2018-02-10 15:08:55.007096153 +0100 +@@ -30,6 +30,10 @@ + RouteRelationModel.cpp + ) + ++set_target_properties(marbledeclarative PROPERTIES ++ SOVERSION 2 ++) ++ + generate_export_header(marbledeclarative BASE_NAME marble_declarative) + target_include_directories(marbledeclarative PUBLIC $) + diff --git a/srcpkgs/marble5/template b/srcpkgs/marble5/template new file mode 100644 index 00000000000..24b0ac187ac --- /dev/null +++ b/srcpkgs/marble5/template @@ -0,0 +1,33 @@ +# Template file for 'marble5' +pkgname=marble5 +version=17.12.3 +revision=1 +maintainer="Piotr Wójcik " +homepage="https://marble.kde.org" +license="GPL-3" +short_desc="Virtual globe and world atlas" +build_style=cmake +wrksrc="${pkgname%5}-${version}" +hostmakedepends="extra-cmake-modules" +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" +distfiles="http://download.kde.org/stable/applications/${version}/src/${pkgname%5}-${version}.tar.xz" +checksum=f1004b0a63767cfba91865623598c309ca7529a7e37ccf451d439f5edbb6f8dd +conflicts="marble" + +if [ -n "$CROSS_BUILD" ]; then + hostmakedepends+=" kdoctools qt5-host-tools qt5-qmake" +fi + +marble5-devel_package() { + short_desc+=" - development files" + depends="${makedepends} ${sourcepkg}>=${version}_${revision}" + conflicts="marble-devel" + pkg_install() { + vmove usr/include + vmove "usr/lib/*.so" + vmove usr/lib/cmake + } +}