From 79fa77b8fffe4936756784e7ccaefe3466ec132c Mon Sep 17 00:00:00 2001 From: John Date: Fri, 6 Jul 2018 13:34:20 +0200 Subject: [PATCH] plume-creator: clean up template and drop wrong quazip dep --- srcpkgs/plume-creator/template | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/srcpkgs/plume-creator/template b/srcpkgs/plume-creator/template index 4283eb3e747..3355e582215 100644 --- a/srcpkgs/plume-creator/template +++ b/srcpkgs/plume-creator/template @@ -8,10 +8,10 @@ build_style=qmake hostmakedepends="qt5-qmake qt5-host-tools pkg-config" makedepends="qt5-devel qt5-declarative-devel qt5-tools-devel qt5-quickcontrols2-devel qt5-multimedia-devel qt5-svg-devel - hunspell-devel libzip-devel quazip-devel quazip-qt5-devel" + hunspell-devel libzip-devel quazip-devel" short_desc="An open-source tool for novelists" maintainer="VargMon " -license="GPL-3" +license="GPL-3.0-or-later" homepage="http://plume-creator.eu/" configure_args="plume-creator-all.pro" distfiles=" @@ -22,24 +22,27 @@ checksum=" 7d473ee7283bc311c7d4dd3311d1e7726df7d45fa0123894265f355b436298e1" if [ "$CROSS_BUILD" ]; then - hostmakedepends+=" + hostmakedepends+=" qt5-multimedia-devel qt5-devel qt5-declarative-devel qt5-quickcontrols2-devel hunspell-devel - libzip-devel quazip-devel quazip-qt5-devel" + libzip-devel quazip-devel" fi post_extract() { - mv -f ${wrksrc}/../debian ${wrksrc}/ - mv -f ${wrksrc}/../resources/themes ${wrksrc}/ - mv -f ${wrksrc}/../src/pics/* ${wrksrc}/src/pics/ - patch -p1 <${wrksrc}/debian/patches/git.2014-01-09.patch - patch -p1 <${wrksrc}/debian/patches/remove-external.patch - patch -p1 <${wrksrc}/debian/patches/remove-SlimUpdater.patch - patch -p1 <${wrksrc}/debian/patches/translations-es.patch - patch -p1 <${wrksrc}/debian/patches/built-in-Qt5.patch - sed -i 's/-lhunspell/-lhunspell-1.6/g' ${wrksrc}/plume-creator.pro - patch -p1 <${wrksrc}/debian/patches/desktop.patch + mv -f ${wrksrc}/../debian ${wrksrc}/ + mv -f ${wrksrc}/../resources/themes ${wrksrc}/ + mv -f ${wrksrc}/../src/pics/* ${wrksrc}/src/pics/ + patch -p1 <${wrksrc}/debian/patches/git.2014-01-09.patch + patch -p1 <${wrksrc}/debian/patches/remove-external.patch + patch -p1 <${wrksrc}/debian/patches/remove-SlimUpdater.patch + patch -p1 <${wrksrc}/debian/patches/translations-es.patch + patch -p1 <${wrksrc}/debian/patches/built-in-Qt5.patch + sed -i 's/-lhunspell/-lhunspell-1.6/g' ${wrksrc}/plume-creator.pro + patch -p1 <${wrksrc}/debian/patches/desktop.patch + sed -i 's|quazip/JlCompress|quazip5/JlCompress|g' src/fileupdater.cpp src/hub.h \ + src/themes.cpp src/importuserdictdialog.cpp src/zipper/zipper.cpp \ + src/common/utils.h } pre_build() { - [ -d ${wrksrc}/externals/quazip ] || ln -s -T ${XBPS_CROSS_BASE}/usr/include/quazip ${wrksrc}/externals/quazip + [ -d ${wrksrc}/externals/quazip ] || ln -s -T ${XBPS_CROSS_BASE}/usr/include/quazip5 ${wrksrc}/externals/quazip }