From c29a18ac06b9925b7f51506baa56dcf6c43d21ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 21 Nov 2020 09:29:10 +0700 Subject: [PATCH] katarakt: fix build for poppler-qt5 20.09.0 --- .../katarakt/patches/not-an-octal-number.patch | 15 +++++++++++++++ srcpkgs/katarakt/template | 12 ++++-------- 2 files changed, 19 insertions(+), 8 deletions(-) create mode 100644 srcpkgs/katarakt/patches/not-an-octal-number.patch diff --git a/srcpkgs/katarakt/patches/not-an-octal-number.patch b/srcpkgs/katarakt/patches/not-an-octal-number.patch new file mode 100644 index 0000000000..95b9f01695 --- /dev/null +++ b/srcpkgs/katarakt/patches/not-an-octal-number.patch @@ -0,0 +1,15 @@ +--- katarakt.pro.orig 2020-11-21 07:57:05.333858604 +0700 ++++ katarakt.pro 2020-11-21 07:58:23.713527253 +0700 +@@ -17,9 +17,9 @@ + + isEmpty(PKG_CONFIG):PKG_CONFIG = pkg-config # same as in link_pkgconfig.prf + POPPLER_VERSION = $$system($$PKG_CONFIG --modversion $$POPPLER) +- POPPLER_VERSION_MAJOR = $$system(echo "$$POPPLER_VERSION" | cut -d . -f 1) +- POPPLER_VERSION_MINOR = $$system(echo "$$POPPLER_VERSION" | cut -d . -f 2) +- POPPLER_VERSION_MICRO = $$system(echo "$$POPPLER_VERSION" | cut -d . -f 3) ++ POPPLER_VERSION_MAJOR = $$system(echo "$$POPPLER_VERSION" | cut -d . -f 1 | sed 's/^0*//' | sed 's/^$/0/') ++ POPPLER_VERSION_MINOR = $$system(echo "$$POPPLER_VERSION" | cut -d . -f 2 | sed 's/^0*//' | sed 's/^$/0/') ++ POPPLER_VERSION_MICRO = $$system(echo "$$POPPLER_VERSION" | cut -d . -f 3 | sed 's/^0*//' | sed 's/^$/0/') + + DEFINES += POPPLER_VERSION_MAJOR=$$POPPLER_VERSION_MAJOR + DEFINES += POPPLER_VERSION_MINOR=$$POPPLER_VERSION_MINOR diff --git a/srcpkgs/katarakt/template b/srcpkgs/katarakt/template index 48e528c8d9..13fc25ba66 100644 --- a/srcpkgs/katarakt/template +++ b/srcpkgs/katarakt/template @@ -1,23 +1,19 @@ # Template file for 'katarakt' pkgname=katarakt version=0.2 -revision=2 +revision=3 wrksrc="katarakt-v${version}" build_style=qmake -hostmakedepends="qt5-qmake pkg-config asciidoc" +hostmakedepends="qt5-qmake pkg-config asciidoc qt5-host-tools" makedepends="qt5-devel poppler-qt5-devel" -short_desc="A simple PDF viewer" +short_desc="Simple PDF viewer" maintainer="Lukas Braun " -license="BSD" +license="BSD-2-Clause" homepage="https://wwwcip.cs.fau.de/~go18gomu/katarakt" #distfiles="https://wwwcip.cs.fau.de/~go18gomu/katarakt/tarballs/katarakt-${version}.tar.xz" distfiles="https://gitlab.cs.fau.de/Qui_Sum/katarakt/-/archive/v${version}/katarakt-v${version}.tar.gz" checksum=f60b3b7477975301a6c6657eb0a24d5cc28d321cca70e9746d4d1ea91e239c46 -if [ "$CROSS_BUILD" ]; then - hostmakedepends+=" qt5-devel" -fi - post_build() { make doc }