From 6595a75f06f1cbde302142540fc6c1af792c00ba Mon Sep 17 00:00:00 2001 From: Mingcong Bai Date: Sat, 17 Jun 2023 05:01:44 +0000 Subject: [PATCH 1/7] libpaper: update to 2.1.2 Current version no longer builds with Core 11 toolchain. --- runtime-productivity/libpaper/autobuild/beyond | 10 ++-------- runtime-productivity/libpaper/autobuild/defines | 3 +++ runtime-productivity/libpaper/spec | 6 +++--- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/runtime-productivity/libpaper/autobuild/beyond b/runtime-productivity/libpaper/autobuild/beyond index f9a3f956469..71f1f85009f 100644 --- a/runtime-productivity/libpaper/autobuild/beyond +++ b/runtime-productivity/libpaper/autobuild/beyond @@ -1,8 +1,2 @@ -install -dm 755 abdist/etc/libpaper.d - -pushd debian/po -for i in `ls *.po`; do - install -dm 755 ../../abdist/usr/share/locale/${i%.po}/LC_MESSAGES/; - msgfmt $i -o ../../abdist/usr/share/locale/${i%.po}/LC_MESSAGES/libpaper.mo; -done -popd +abinfo "Creating /etc/libpaper.d ..." +mkdir -pv "$PKGDIR"/etc/libpaper.d diff --git a/runtime-productivity/libpaper/autobuild/defines b/runtime-productivity/libpaper/autobuild/defines index 0e58a061e4a..1d478fdf494 100644 --- a/runtime-productivity/libpaper/autobuild/defines +++ b/runtime-productivity/libpaper/autobuild/defines @@ -2,3 +2,6 @@ PKGNAME=libpaper PKGSEC=libs PKGDES="Library for handling paper characteristics" PKGDEP="bash" + +PKGBREAK="cups<=2.4.2 html2ps<=1.0b7-1 texlive<=20220321-1 \ + libreoffice<=7.5.4.2-1 ghostscript<=9.54.0" diff --git a/runtime-productivity/libpaper/spec b/runtime-productivity/libpaper/spec index 1113d67a877..1b7247ec6b1 100644 --- a/runtime-productivity/libpaper/spec +++ b/runtime-productivity/libpaper/spec @@ -1,4 +1,4 @@ -VER=1.1.24+nmu5 -SRCS="tbl::https://repo.aosc.io/aosc-repacks/libpaper_$VER.tar.gz" -CHKSUMS="sha256::e29deda4cd7350189c71af0925cbf4a4473f9841d1419a922e1e8ff1954db1f2" +VER=2.1.2 +SRCS="tbl::https://github.com/rrthomas/libpaper/releases/download/v$VER/libpaper-$VER.tar.gz" +CHKSUMS="sha256::1fda0cf64efa46b9684a4ccc17df4386c4cc83254805419222c064bf62ea001f" CHKUPDATE="anitya::id=15136" From 18ca500e79a0dd0547e0373a2d2e3ccee2c80496 Mon Sep 17 00:00:00 2001 From: Mingcong Bai Date: Sat, 17 Jun 2023 05:01:56 +0000 Subject: [PATCH 2/7] cups: rebuild for libpaper 2.1.2 --- app-admin/cups/spec | 1 + 1 file changed, 1 insertion(+) diff --git a/app-admin/cups/spec b/app-admin/cups/spec index 14a73174198..dc68deab976 100644 --- a/app-admin/cups/spec +++ b/app-admin/cups/spec @@ -1,4 +1,5 @@ VER=2.4.2 +REL=1 SRCS="tbl::https://github.com/OpenPrinting/cups/releases/download/v$VER/cups-${VER}-source.tar.gz" CHKSUMS="sha256::f03ccb40b087d1e30940a40e0141dcbba263f39974c20eb9f2521066c9c6c908" CHKUPDATE="anitya::id=380" From de8478378c7ad50cad69e172406159ed47e0748b Mon Sep 17 00:00:00 2001 From: Mingcong Bai Date: Sat, 17 Jun 2023 05:02:14 +0000 Subject: [PATCH 3/7] html2ps: rebuild for libpaper 2.1.2 --- app-doc/html2ps/spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-doc/html2ps/spec b/app-doc/html2ps/spec index 647483eb5fc..e052b2bad8c 100644 --- a/app-doc/html2ps/spec +++ b/app-doc/html2ps/spec @@ -1,5 +1,5 @@ VER=1.0b7 -REL=1 +REL=2 SRCS="tbl::http://deb.debian.org/debian/pool/main/h/html2ps/html2ps_$VER.orig.tar.gz" CHKSUMS="sha256::d553980468a14bae738982c384c17f426ecf77dafd9a4e2499d520953f156f14" CHKUPDATE="html::url=http://deb.debian.org/debian/pool/main/h/html2ps;pattern=html2ps_(.+?).orig.tar.gz" From ec29915e62fd8e0f3a5ae4a46c21c07ecdcb66f1 Mon Sep 17 00:00:00 2001 From: Mingcong Bai Date: Sat, 17 Jun 2023 05:04:45 +0000 Subject: [PATCH 4/7] texlive: rebuild for libpaper 2.1.2 --- app-doc/texlive/spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-doc/texlive/spec b/app-doc/texlive/spec index a8b7d9224a4..7d7e9af9fc8 100644 --- a/app-doc/texlive/spec +++ b/app-doc/texlive/spec @@ -1,5 +1,5 @@ VER=20220321 -REL=1 +REL=2 SRCS="tbl::ftp://tug.org/texlive/historic/${VER:0:4}/texlive-$VER-source.tar.xz \ file::rename=texlive-$VER-texmf.tar.xz::ftp://tug.org/texlive/historic/${VER:0:4}/texlive-$VER-texmf.tar.xz" CHKSUMS="sha256::5ffa3485e51eb2c4490496450fc69b9d7bd7cb9e53357d92db4bcd4fd6179b56 \ From 4ef549e69df2369a14ba70f19fecfada0ee94e45 Mon Sep 17 00:00:00 2001 From: Mingcong Bai Date: Sat, 17 Jun 2023 05:05:24 +0000 Subject: [PATCH 5/7] ghostscript: rebuild for libpaper 2.1.2 --- app-doc/ghostscript/spec | 1 + 1 file changed, 1 insertion(+) diff --git a/app-doc/ghostscript/spec b/app-doc/ghostscript/spec index 0ccc4d277fe..bb376ce5b15 100644 --- a/app-doc/ghostscript/spec +++ b/app-doc/ghostscript/spec @@ -1,4 +1,5 @@ VER=9.54.0 +REL=1 SRCS="tbl::https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${VER//./}/ghostscript-$VER.tar.gz" CHKSUMS="sha256::0646bb97f6f4d10a763f4919c54fa28b4fbdd3dff8e7de3410431c81762cade0" CHKUPDATE="anitya::id=1157" From 3dfa43a0db087f74bfd7b28fbf1bf6a5e48abbe6 Mon Sep 17 00:00:00 2001 From: Mingcong Bai Date: Tue, 21 Nov 2023 23:22:09 -0800 Subject: [PATCH 6/7] libreoffice: rebuild for libpaper 2.1.2 --- app-productivity/libreoffice/spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-productivity/libreoffice/spec b/app-productivity/libreoffice/spec index cd7c4b290b7..d2516625bd4 100644 --- a/app-productivity/libreoffice/spec +++ b/app-productivity/libreoffice/spec @@ -1,5 +1,5 @@ VER=7.5.4.2 -REL=1 +REL=2 SRCS="tbl::https://download.documentfoundation.org/libreoffice/src/${VER:0:5}/libreoffice-$VER.tar.xz \ file::rename=LibreOffice_${VER}_Linux_x86-64_rpm_helppack_am.tar.gz::https://downloadarchive.documentfoundation.org/libreoffice/old/${VER}/rpm/x86_64/LibreOffice_${VER}_Linux_x86-64_rpm_helppack_am.tar.gz \ file::rename=LibreOffice_${VER}_Linux_x86-64_rpm_helppack_ar.tar.gz::https://downloadarchive.documentfoundation.org/libreoffice/old/${VER}/rpm/x86_64/LibreOffice_${VER}_Linux_x86-64_rpm_helppack_ar.tar.gz \ From 72f115bb09df7d2d5f2f7330b28c9b733caec689 Mon Sep 17 00:00:00 2001 From: Mingcong Bai Date: Wed, 22 Nov 2023 14:29:15 -0800 Subject: [PATCH 7/7] texlive: fix executables and postinst - Preload libkpathsea.so.6 in $PKGDIR to make sure `make texlinks' creates executable symlinks to the correct paths. - Bump trie_size in /etc/texmf/web2c/texmf.cnf to fix postinst. --- app-doc/texlive/autobuild/build | 8 +++++++- .../texlive/autobuild/overrides/etc/texmf/web2c/texmf.cnf | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app-doc/texlive/autobuild/build b/app-doc/texlive/autobuild/build index f7f20dd7351..84394ccc3c5 100644 --- a/app-doc/texlive/autobuild/build +++ b/app-doc/texlive/autobuild/build @@ -44,8 +44,14 @@ make abinfo "Installing TeX Live binaries..." make install DESTDIR="$PKGDIR" + abinfo "Creating symlinks to actual binaries.." -make texlinks DESTDIR="$PKGDIR" +# FIXME: Symlink installation requires kpsewhich, which depends on +# libkpathsea.so.6, which is not yet available in LD_LIBRARY_PATH. +# +# Ref: https://gitlab.archlinux.org/archlinux/packaging/packages/texlive-bin/-/blob/f83b722db0c99cef02c18db41947b95299f0c735/PKGBUILD#L115 +LD_PRELOAD="$PKGDIR/usr/lib/libkpathsea.so.6" \ + make texlinks DESTDIR="$PKGDIR" cd .. diff --git a/app-doc/texlive/autobuild/overrides/etc/texmf/web2c/texmf.cnf b/app-doc/texlive/autobuild/overrides/etc/texmf/web2c/texmf.cnf index b8289fc065f..65bfeeb89da 100644 --- a/app-doc/texlive/autobuild/overrides/etc/texmf/web2c/texmf.cnf +++ b/app-doc/texlive/autobuild/overrides/etc/texmf/web2c/texmf.cnf @@ -734,7 +734,7 @@ buf_size = 200000 % for all known free hyphenation patterns to be loaded simultaneously % (as TeX Live does). % -trie_size = 1000000 +trie_size = 4194303 hyph_size = 8191 % prime number of hyphenation exceptions, >610, <32767. % http://primes.utm.edu/curios/page.php/8191.html