diff --git a/common/shlibs b/common/shlibs index 2e3a395214..98b28735c4 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3158,7 +3158,7 @@ libembb_mtapi_c.so embb-devel-1.0.0_1 libembb_mtapi_network_c.so embb-devel-1.0.0_1 libembb_base_cpp.so embb-devel-1.0.0_1 libembb_base_c.so embb-devel-1.0.0_1 -libhpdf.so Haru-devel-2.3.0_1 +libhpdf-2.3.0.so Haru-2.3.0_3 libKF5Contacts.so.5 kcontacts-5.63.0_1 libKF5AkonadiPrivate.so.5 akonadi5-17.12.0_1 libKF5AkonadiCore.so.5 akonadi5-17.12.0_1 diff --git a/srcpkgs/Haru/patches/Add-license.patch b/srcpkgs/Haru/patches/Add-license.patch deleted file mode 100644 index 367048748f..0000000000 --- a/srcpkgs/Haru/patches/Add-license.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 24443b76f4daf74c21307044e81b4942bd4e586a Mon Sep 17 00:00:00 2001 -From: Maciej Klemarczyk -Date: Sun, 28 Jun 2015 12:05:05 +0200 -Subject: [PATCH 4/4] Missing LICENSE file was created - -File was created based on license provided by README file. ---- - LICENCE | 20 ++++++++++++++++++++ - 1 file changed, 20 insertions(+) - create mode 100644 LICENSE - -diff --git LICENSE LICENSE -new file mode 100644 -index 0000000..bdf271e ---- /dev/null -+++ LICENSE -@@ -0,0 +1,20 @@ -+ -+Copyright (C) 1999-2006 Takeshi Kanno -+Copyright (C) 2007-2009 Antony Dovgal -+ -+This software is provided 'as-is', without any express or implied warranty. -+ -+In no event will the authors be held liable for any damages arising from the -+use of this software. -+ -+Permission is granted to anyone to use this software for any purpose,including -+commercial applications, and to alter it and redistribute it freely, subject -+to the following restrictions: -+ -+ 1. The origin of this software must not be misrepresented; you must not claim -+ that you wrote the original software. If you use this software in a -+ product, an acknowledgment in the product documentation would be -+ appreciated but is not required. -+ 2. Altered source versions must be plainly marked as such, and must not be -+ misrepresented as being the original software. -+ 3. This notice may not be removed or altered from any source distribution. --- -2.24.0 - diff --git a/srcpkgs/Haru/template b/srcpkgs/Haru/template index c343c70ec5..80db1e0e89 100644 --- a/srcpkgs/Haru/template +++ b/srcpkgs/Haru/template @@ -1,19 +1,20 @@ # Template file for 'Haru' pkgname=Haru version=2.3.0 -revision=2 +revision=3 wrksrc="libharu-RELEASE_${version//./_}" -build_style=cmake +build_style=gnu-configure +hostmakedepends="automake libtool" makedepends="zlib-devel libpng-devel" short_desc="Free, cross platform, open source library for generating PDF files" maintainer="Florian Eich " -license="ZLIB/LIBPNG" +license="Zlib" homepage="http://libharu.org/" distfiles="https://github.com/libharu/libharu/archive/RELEASE_${version//./_}.tar.gz" checksum=8f9e68cc5d5f7d53d1bc61a1ed876add1faf4f91070dbc360d8b259f46d9a4d2 -post_install() { - vlicense LICENSE +pre_configure() { + make -f build.mk } Haru-devel_package() { @@ -21,7 +22,7 @@ Haru-devel_package() { depends="${sourcepkg}>=${version}_${revision}" pkg_install() { vmove usr/include - vmove usr/lib/*.a - vmove usr/lib/*.so + vmove "usr/lib/*.a" + vmove usr/lib/libhpdf.so } }