From a23d51a3c7ef763113ced0943bf89c29500ba6d7 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, 16 Jul 2022 21:04:14 +0700 Subject: [PATCH] poppler-qt: enable qt6, fix devel's dependencies --- srcpkgs/poppler-qt5/template | 36 +++++++++++++++++++++++++++++++----- srcpkgs/poppler-qt6 | 1 + srcpkgs/poppler-qt6-devel | 1 + 3 files changed, 33 insertions(+), 5 deletions(-) create mode 120000 srcpkgs/poppler-qt6 create mode 120000 srcpkgs/poppler-qt6-devel diff --git a/srcpkgs/poppler-qt5/template b/srcpkgs/poppler-qt5/template index 23dcc6485ac..30fc5d93d8a 100644 --- a/srcpkgs/poppler-qt5/template +++ b/srcpkgs/poppler-qt5/template @@ -9,10 +9,11 @@ revision=1 wrksrc="poppler-${version}" build_style=cmake configure_args="-DENABLE_UNSTABLE_API_ABI_HEADERS=ON -DENABLE_GLIB=OFF - -DENABLE_QT5=ON -DENABLE_UTILS=OFF -DENABLE_CPP=OFF -DENABLE_BOOST=OFF" + -DENABLE_QT5=ON -DENABLE_UTILS=OFF -DENABLE_CPP=OFF -DENABLE_BOOST=OFF + -DENABLE_QT6=ON -DQT_HOST_PATH=/usr" hostmakedepends="pkg-config qt5-devel" -makedepends="libpng-devel tiff-devel lcms2-devel libcurl-devel - fontconfig-devel cairo-devel libopenjpeg2-devel qt5-devel" +makedepends="libpng-devel tiff-devel lcms2-devel libcurl-devel nss-devel + fontconfig-devel cairo-devel libopenjpeg2-devel qt5-devel qt6-base-devel" short_desc="PDF rendering library - Qt5 bindings" maintainer="Orphaned " license="GPL-2.0-or-later, GPL-3.0-or-later" @@ -28,19 +29,44 @@ if [ "$CROSS_BUILD" ]; then fi post_install() { + local f rm -f ${DESTDIR}/usr/lib/libpoppler.* for f in poppler-cairo poppler-splash poppler; do rm -f ${DESTDIR}/usr/lib/pkgconfig/${f}.pc done + for f in ${DESTDIR}/usr/include/poppler/*; do + case "$f" in + */qt5 | */qt6) ;; + *) + rm -rf "$f" ;; + esac + done } poppler-qt5-devel_package() { - depends="poppler-devel>=${version} ${sourcepkg}-${version}_${revision}" + depends="qt5-devel poppler-devel>=${version} + ${sourcepkg}-${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include/poppler/qt5 vmove usr/lib/libpoppler-qt5.so vmove usr/lib/pkgconfig/poppler-qt5.pc - rm -rf ${DESTDIR}/usr/include + } +} + +poppler-qt6_package() { + short_desc="${short_desc/Qt5/Qt6}" + pkg_install() { + vmove usr/lib/libpoppler-qt6.so.* + } +} + +poppler-qt6-devel_package() { + depends="poppler-devel>=${version} poppler-qt6-${version}_${revision}" + short_desc="${short_desc/Qt5/Qt6} - development files" + pkg_install() { + vmove usr/include/poppler/qt6 + vmove usr/lib/libpoppler-qt6.so + vmove usr/lib/pkgconfig/poppler-qt6.pc } } diff --git a/srcpkgs/poppler-qt6 b/srcpkgs/poppler-qt6 new file mode 120000 index 00000000000..8cdcfdfe2b4 --- /dev/null +++ b/srcpkgs/poppler-qt6 @@ -0,0 +1 @@ +poppler-qt5 \ No newline at end of file diff --git a/srcpkgs/poppler-qt6-devel b/srcpkgs/poppler-qt6-devel new file mode 120000 index 00000000000..8cdcfdfe2b4 --- /dev/null +++ b/srcpkgs/poppler-qt6-devel @@ -0,0 +1 @@ +poppler-qt5 \ No newline at end of file