poppler: update to 20.09.0

common/shlibs

@@ -351,7 +351,7 @@ libMagickCore-6.Q16.so.6 libmagick6-6.9.10.11_1
 libMagickWand-6.Q16.so.6 libmagick6-6.9.10.11_1
 libMagick++-6.Q16.so.8 libmagick6-6.9.10.11_1
 libltdl.so.7 libltdl-2.2.6_1
-libpoppler.so.90 libpoppler89-0.80.0_1
+libpoppler.so.102 libpoppler102-20.09.0_1
 libpoppler-glib.so.8 poppler-glib-0.18.2_1
 libpoppler-cpp.so.0 poppler-cpp-0.18.2_1
 libpoppler-qt5.so.1 poppler-qt5-0.31.0_1

srcpkgs/calligra/template

@@ -1,7 +1,7 @@
 # Template file for 'calligra'
 pkgname=calligra
 version=3.2.1
-revision=1
+revision=2
 build_style=cmake
 configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
  -DBUILD_TESTING=OFF"
@@ -15,6 +15,9 @@ makedepends="akonadi-contacts-devel akonadi5-devel ecm-devel eigen3.2
  poppler-qt5-devel qca-qt5-devel threadweaver-devel marble5-devel
  kauth-devel kparts-devel kcmutils-devel kdelibs4support-devel
  ktextwidgets-devel kross-devel kservice-devel kcrash-devel"
+depends="calligra-filters calligra-libs calligra-plugins calligra-karbon
+ calligra-kexi calligra-stage calligra-sheets calligra-extras
+ calligra-words calligra-handbook calligra-gemini calligra-plan"
 short_desc="Illustration application"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
@@ -24,13 +27,6 @@ checksum=b1f8a6eb8208543a2f908caa83d089075fcd1e530d00e19f5362b2f9cc371147
 
 replaces="calligra-braindump>=0 calligra-flow>=0"
 
-subpackages="calligra-filters calligra-libs calligra-plugins calligra-karbon
- calligra-kexi calligra-stage calligra-krita calligra-sheets calligra-extras
- calligra-words calligra-handbook calligra-gemini calligra-devtools"
-depends="calligra-filters calligra-libs calligra-plugins calligra-karbon
- calligra-kexi calligra-stage calligra-sheets calligra-extras
- calligra-words calligra-handbook calligra-gemini calligra-plan"
-
 build_options="webengine"
 desc_option_webengine="Use Qt5 WebEngine for Calligra Gemini"
 
@@ -58,11 +54,11 @@ post_patch() {
 # cmake doesn't detect the functions correctly
 pre_build() {
 	case $XBPS_TARGET_MACHINE in
-		*-musl) cat >> build/filters/words/msword-odf/wv2/src/config.h <<_EOF
-#define HAVE_FUNC_ISNAN 1
-#define HAVE_FUNC_ISINF 1
-#define HAVE_FUNC_ISFINITE 1
-_EOF
+		*-musl) cat >> build/filters/words/msword-odf/wv2/src/config.h <<-EOF
+		#define HAVE_FUNC_ISNAN 1
+		#define HAVE_FUNC_ISINF 1
+		#define HAVE_FUNC_ISFINITE 1
+		EOF
 		;;
 	esac
 }
@@ -112,8 +108,6 @@ calligra-stage_package() {
 	pkg_install() {
 		cd ${wrksrc}/build/stage
 		make DESTDIR=$PKGDESTDIR install
-		#cd ../doc/stage
-		#make DESTDIR=$PKGDESTDIR install
 	}
 }
 calligra-krita_package() {
@@ -126,8 +120,6 @@ calligra-sheets_package() {
 	pkg_install() {
 		cd ${wrksrc}/build/sheets
 		make DESTDIR=$PKGDESTDIR install
-		#cd ../doc/sheets
-		#make DESTDIR=$PKGDESTDIR install
 	}
 }
 calligra-words_package() {
@@ -140,7 +132,6 @@ calligra-words_package() {
 }
 calligra-handbook_package() {
 	build_style=meta
-	archs=noarch
 	short_desc+=" - Documentation (removed temporarily)"
 	#pkg_install() {
 	#	cd ${wrksrc}/build/doc/calligra

srcpkgs/extractpdfmark/template

@@ -1,12 +1,13 @@
 # Template file for 'extractpdfmark'
 pkgname=extractpdfmark
 version=1.1.0
-revision=5
+revision=6
 build_wrksrc=build
 build_style=gnu-configure
 configure_script="../configure"
-hostmakedepends="pkg-config automake autogen gettext tar"
-makedepends="gettext-devel poppler-devel"
+configure_args="--with-poppler=cpp"
+hostmakedepends="pkg-config automake autogen gettext-devel tar"
+makedepends="poppler-cpp-devel"
 short_desc="Extract page mode and named destinations as PDFmark from PDF"
 maintainer="newbluemoon <blaumolch@mailbox.org>"
 license="GPL-3.0-or-later"

srcpkgs/inkscape/template

@@ -1,12 +1,15 @@
 # Template file for 'inkscape'
 pkgname=inkscape
-version=1.0
+version=1.0.1
 revision=1
 wrksrc="${pkgname}-INKSCAPE_${version//./_}"
 build_style=cmake
 hostmakedepends="automake pkg-config libtool intltool gettext-devel
  glib-devel perl-XML-Parser tar which xz"
-makedepends="harfbuzz-devel libsoup-devel gsl-devel pango-devel double-conversion-devel gc-devel libwpd-devel libcdr-devel libvisio-devel poppler-devel libwpd-devel potrace-devel gtkmm-devel gdl-devel gtkspell3-devel aspell-devel libxslt-devel libgomp-devel libwpg-devel poppler-glib-devel"
+makedepends="harfbuzz-devel libsoup-devel gsl-devel pango-devel
+ double-conversion-devel gc-devel libwpd-devel libcdr-devel libvisio-devel
+ poppler-devel libwpd-devel potrace-devel gtkmm-devel gdl-devel gtkspell3-devel
+ aspell-devel libxslt-devel libgomp-devel libwpg-devel poppler-glib-devel"
 depends="desktop-file-utils hicolor-icon-theme python3-lxml python3-numpy python3-scour"
 short_desc="Vector-based drawing program"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -15,7 +18,7 @@ homepage="http://inkscape.org/"
 _extension_rev=7099a364be65e17a76c0d9b7961232788d427d73
 distfiles="https://gitlab.com/inkscape/inkscape/-/archive/INKSCAPE_${version//./_}/inkscape-INKSCAPE_${version//./_}.tar.bz2
  https://gitlab.com/inkscape/extensions/-/archive/${_extension_rev}/extensions-${_extension_rev}.tar.bz2"
-checksum="673a1d8dfff4993917ac560d73ded4cab6edf8360cb97b99703658b14c03031f
+checksum="0ccb623b2c7872b9edec405874eab3ff279dd209f496b496dd99969fdc3834d3
  11d573e30d4b0c821e9c59a524c9f98b935dcfdad979066cc65fdf111cf116fe"
 python_version=3
 

srcpkgs/inkscape/update

@@ -1 +1,2 @@
-pattern='Current stable version: \K([\d\.]+)'
+site="https://inkscape.org/release/"
+pattern='release/inkscape-\K[0-9.]+(?=/)'

srcpkgs/ipe/template

@@ -1,8 +1,8 @@
 # Template file for 'ipe'
 pkgname=ipe
 version=7.2.20
-revision=1
-_tools_commit=2480d96e205316115a1febd123403c7d65a292e6
+revision=2
+_tools_commit=v7.2.20.1
 hostmakedepends="pkg-config qt5-qmake qt5-tools qt5-host-tools"
 makedepends="cairo-devel gsl-devel libcurl-devel libjpeg-turbo-devel
  lua53-devel poppler-devel qt5-devel"
@@ -13,7 +13,7 @@ homepage="http://ipe.otfried.org/"
 distfiles="https://dl.bintray.com/otfried/generic/ipe/${version%.*}/ipe-${version}-src.tar.gz
  https://github.com/otfried/ipe-tools/archive/${_tools_commit}.tar.gz"
 checksum="2c9389225198047000d70d02be3dbccf40fd9a9ae6efc0968814e4f8d45a8d38
- 8b66c274a2b378fca2c91e3cde2c1146e7f64cbc956e48ada51c9eec059619ca"
+ 233f5629986ade3d70de6dd1af85d578d6aa0f92f9bcd1ecd4e8e5a94b508376"
 nocross="something with gsl"
 
 post_extract() {

srcpkgs/poppler-qt5/template

@@ -1,10 +1,10 @@
 # Template file for 'poppler-qt5'
 #
-# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/poppler"; IT IS SPLITTED TO AVOID
-# A CYCLIC DEPENDENCY: qt5 -> cups -> poppler -> qt5.
+# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/poppler"
+# IT IS SPLIT TO AVOID A CYCLIC DEPENDENCY: qt5 -> cups -> poppler -> qt5.
 #
 pkgname=poppler-qt5
-version=0.80.0
+version=20.09.0
 revision=1
 wrksrc="poppler-${version}"
 build_style=cmake
@@ -18,7 +18,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GPL-3.0-or-later"
 homepage="https://poppler.freedesktop.org"
 distfiles="${homepage}/poppler-${version}.tar.xz"
-checksum=4d3ca6b79bc13b8e24092e34f83ef5f387f3bb0bbd7359a6c078e09c696d104f
+checksum=4ed6eb5ddc4c37f2435c9d78ff9c7c4036455aea3507d1ce8400070aab745363
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DTHREADS_PTHREAD_ARG=2"

srcpkgs/poppler/template

@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/poppler-qt5".
 #
 pkgname=poppler
-version=0.80.0
+version=20.09.0
 revision=1
 build_style=cmake
 build_helper="gir"
@@ -18,17 +18,17 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GPL-3.0-or-later"
 homepage="https://poppler.freedesktop.org"
 distfiles="${homepage}/${pkgname}-${version}.tar.xz"
-checksum=4d3ca6b79bc13b8e24092e34f83ef5f387f3bb0bbd7359a6c078e09c696d104f
+checksum=4ed6eb5ddc4c37f2435c9d78ff9c7c4036455aea3507d1ce8400070aab745363
 
 # Package build options
 build_options="gir"
 build_options_default="gir"
 
-libpoppler89_package() {
+libpoppler102_package() {
 	depends="poppler-data"
 	short_desc+=" - poppler runtime library"
 	pkg_install() {
-		vmove usr/lib/libpoppler.so.*
+		vmove usr/lib/libpoppler.so.${pkgname/libpoppler/}*
 	}
 }
 
@@ -50,7 +50,7 @@ poppler-cpp_package() {
 }
 
 poppler-devel_package() {
-	depends="libglib-devel libpoppler89-${version}_${revision}"
+	depends="libglib-devel libpoppler102>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove "usr/include/poppler/*.h"

srcpkgs/texlive/template

@@ -1,7 +1,7 @@
 # Template file for 'texlive'
 pkgname=texlive
 version=20200406
-revision=3
+revision=4
 wrksrc="texlive-${version}-source"
 build_wrksrc="build"
 build_style=gnu-configure
@@ -135,8 +135,8 @@ export DASM_ARCH
 
 post_extract() {
 	# pdftex poppler compatibility
-	cp -pv texk/web2c/pdftexdir/pdftoepdf{-poppler0.76.0,}.cc
-	cp -pv texk/web2c/pdftexdir/pdftosrc{-poppler0.76.0,}.cc
+	cp -pv texk/web2c/pdftexdir/pdftoepdf{-poppler0.86.0,}.cc
+	cp -pv texk/web2c/pdftexdir/pdftosrc{-poppler0.83.0,}.cc
 
 	mkdir -p "${build_wrksrc}"
 	cp -rf texk/web2c "${build_wrksrc}/web2c-host"