From d8b9a13fd636b92090f161f004afbbd943a4b310 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Thu, 29 Jun 2023 12:57:11 +0100
Subject: [PATCH] libreoffice: revbump for libpoppler-23.08.0_1.

---
 srcpkgs/libreoffice/template | 48 +++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 25 deletions(-)

diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 8c080b7e843..a5ade73cc19 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,13 +1,11 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
 version=7.5.5.2
-revision=1
+revision=2
 build_style=meta
 make_build_target="build"
-nocross="Several dependencies are nocross=yes"
-
 hostmakedepends="automake flex gperf hyphen icu libtool openldap which gettext xz
- perl-Archive-Zip pkg-config qt5-qmake sane ucpp unzip zip python3-setuptools
+ perl-Archive-Zip pkg-config qt5-qmake sane unzip zip python3-setuptools
  fontforge python3-lxml qt6-base-devel gtk4-devel gobject-introspection gnupg"
 makedepends="CoinMP-devel apr-devel avahi-libs-devel clucene-devel
  frameworkintegration-devel glyphy-devel gpgmepp-devel gst-plugins-base1-devel
@@ -26,30 +24,31 @@ makedepends="CoinMP-devel apr-devel avahi-libs-devel clucene-devel
  expat-devel fontconfig-devel freetype-devel harfbuzz-devel gpgmepp-devel
  lcms2-devel openssl-devel libpng-devel tiff-devel librevenge-devel
  qrcodegen-devel xmlsec1-devel poppler-cpp-devel libxml2-devel zxing-cpp-devel"
-depends="libreoffice-common>=${version}_${revision}"
-depends+=" libreoffice-base>=${version}_${revision}"
-depends+=" libreoffice-calc>=${version}_${revision}"
-depends+=" libreoffice-draw>=${version}_${revision}"
-depends+=" libreoffice-fonts>=${version}_${revision}"
-depends+=" libreoffice-gnome>=${version}_${revision}"
-depends+=" libreoffice-impress>=${version}_${revision}"
-depends+=" libreoffice-math>=${version}_${revision}"
-depends+=" libreoffice-postgresql>=${version}_${revision}"
-depends+=" libreoffice-writer>=${version}_${revision}"
-depends+=" libreoffice-xtensions>=${version}_${revision}"
 # Add the previously installed default languages as well
-depends+=" libreoffice-i18n-en-US>=${version}_${revision}"
-depends+=" libreoffice-i18n-de>=${version}_${revision}"
-depends+=" libreoffice-i18n-es>=${version}_${revision}"
-depends+=" libreoffice-i18n-fr>=${version}_${revision}"
-depends+=" libreoffice-i18n-it>=${version}_${revision}"
-depends+=" libreoffice-i18n-pl>=${version}_${revision}"
-depends+=" libreoffice-i18n-pt>=${version}_${revision}"
+depends="libreoffice-common>=${version}_${revision}
+ libreoffice-base>=${version}_${revision}
+ libreoffice-calc>=${version}_${revision}
+ libreoffice-draw>=${version}_${revision}
+ libreoffice-fonts>=${version}_${revision}
+ libreoffice-gnome>=${version}_${revision}
+ libreoffice-impress>=${version}_${revision}
+ libreoffice-math>=${version}_${revision}
+ libreoffice-postgresql>=${version}_${revision}
+ libreoffice-writer>=${version}_${revision}
+ libreoffice-xtensions>=${version}_${revision}
+ libreoffice-i18n-en-US>=${version}_${revision}
+ libreoffice-i18n-de>=${version}_${revision}
+ libreoffice-i18n-es>=${version}_${revision}
+ libreoffice-i18n-fr>=${version}_${revision}
+ libreoffice-i18n-it>=${version}_${revision}
+ libreoffice-i18n-pl>=${version}_${revision}
+ libreoffice-i18n-pt>=${version}_${revision}"
 checkdepends="gdb"
 short_desc="Productivity suite"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.libreoffice.org/"
+nocross="Several dependencies are nocross=yes"
 
 # Source, dictionary, help and translations
 _baseurl="https://download.documentfoundation.org/libreoffice/src/${version%.*}"
@@ -161,6 +160,8 @@ replaces="libreoffice-firebird<6.2.4.2_1"
 build_options="java"
 desc_option_java="Enable Java support"
 
+CXXFLAGS="-DGLM_ENABLE_EXPERIMENTAL -DU_USING_ICU_NAMESPACE=1"
+
 case "$XBPS_TARGET_MACHINE" in
 	i686*)	# Broken unit tests
 		CXXFLAGS+=" -DDISABLE_CVE_TESTS=1"
@@ -170,8 +171,6 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 esac
 
-CXXFLAGS+=" -DGLM_ENABLE_EXPERIMENTAL -DU_USING_ICU_NAMESPACE=1"
-
 # Move files listed in a <name>_list.txt into $PKGDESTDIR
 _split() {
 	local list file dir destdir
@@ -459,7 +458,6 @@ do_configure() {
 	# opts+=" --with-system-icu-for-build=yes"
 	# use system utilities
 	opts+=" --enable-build-opensymbol"
-	opts+=" --with-system-ucpp=yes"
 	# finish configuring build
 	opts+=" --with-external-dict-dir=${XBPS_CROSS_BASE}/usr/share/hunspell"
 	opts+=" --with-external-hyph-dir=${XBPS_CROSS_BASE}/usr/share/hyphen"