diff --git a/srcpkgs/plume-creator/patches/qt5.13.patch b/srcpkgs/plume-creator/patches/qt5.13.patch deleted file mode 100644 index 644a7f52adc..00000000000 --- a/srcpkgs/plume-creator/patches/qt5.13.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- a/src/newProjectWizard/selectpage.cpp 2013-11-06 14:12:32.000000000 +0100 -+++ b/src/newProjectWizard/selectpage.cpp 2013-11-06 14:12:32.000000000 +0100 -@@ -1,5 +1,6 @@ - #include "selectpage.h" - #include "ui_selectpage.h" -+#include - - SelectPage::SelectPage(QWidget *parent) : - QWizardPage(parent), diff --git a/srcpkgs/plume-creator/template b/srcpkgs/plume-creator/template index 3c415a06cdd..8368fd0480d 100644 --- a/srcpkgs/plume-creator/template +++ b/srcpkgs/plume-creator/template @@ -1,9 +1,8 @@ # Template file for 'plume-creator' pkgname=plume-creator -version=0.66.1 -revision=3 -_debianversion=0.66+dfsg1 -_debianbuild=3.1build2 +version=0.66+dfsg1pl3.2 +revision=1 +wrksrc="$pkgname-${version%+*}.1" build_style=qmake hostmakedepends="qt5-qmake qt5-host-tools pkg-config" makedepends="qt5-devel qt5-declarative-devel qt5-tools-devel @@ -15,22 +14,21 @@ license="GPL-3.0-or-later" homepage="http://plume-creator.eu/" configure_args="plume-creator-all.pro" distfiles=" - ${UBUNTU_SITE}/universe/p/plume-creator/${pkgname}_${_debianversion}.orig.tar.xz - ${UBUNTU_SITE}/universe/p/plume-creator/${pkgname}_${_debianversion}-${_debianbuild}.debian.tar.bz2" + ${DEBIAN_SITE}/main/p/plume-creator/${pkgname}_${version%pl*}.orig.tar.xz + ${DEBIAN_SITE}/main/p/plume-creator/${pkgname}_${version/pl/-}.debian.tar.bz2" checksum=" f88f9524184bcf60dae855d6ad37899aefa39de0edd56098e93ce3b97b679e0c - 7d473ee7283bc311c7d4dd3311d1e7726df7d45fa0123894265f355b436298e1" + e3c5421ca91bf823843bcb6c08be32cec7ddd9b6f069a4ebbe2085fcc5aeea00" + +skip_extraction="${pkgname}_${version/pl/-}.debian.tar.bz2" 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 - patch -p1 <${wrksrc}/debian/patches/desktop.patch + local p + TAR=$(command -v bsdtar || command -v tar) + $TAR -xf $XBPS_SRCDISTDIR/$pkgname-$version/$skip_extraction + for p in $(cat debian/patches/series); do + patch -Np1 -F0 -i debian/patches/$p || return 1 + done 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