From 389d48320166a68994456b8ea563be633d9213b1 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Tue, 14 Jul 2020 00:15:06 -0400 Subject: [PATCH 01/13] xbps-src: rename texlive virtual pkg, default to native texlive --- etc/defaults.virtual | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/defaults.virtual b/etc/defaults.virtual index e1d7fb2dd2c..083ab6349ea 100644 --- a/etc/defaults.virtual +++ b/etc/defaults.virtual @@ -30,7 +30,7 @@ phonon-backend phonon-backend-gstreamer phonon-qt5-backend phonon-qt5-backend-gstreamer rkt-stage1 rkt-stage1-coreos smtp-server opensmtpd -texlive texlive-bin +tex texlive xserver-abi-input xorg-server xserver-abi-video xorg-server libGL libglvnd From 126124c319734a2c05983eb62c17bcf68f5f5b03 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Tue, 14 Jul 2020 00:17:13 -0400 Subject: [PATCH 02/13] texlive2014-bin: provide tex virtual package --- srcpkgs/texlive2014-bin/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/texlive2014-bin/template b/srcpkgs/texlive2014-bin/template index c63a58ee7c5..4e5b199b04f 100644 --- a/srcpkgs/texlive2014-bin/template +++ b/srcpkgs/texlive2014-bin/template @@ -1,12 +1,13 @@ # Template file for 'texlive2014-bin' pkgname=texlive2014-bin version=2014 -revision=8 +revision=9 archs="x86_64* i686 aarch64 arm*" create_wrksrc=yes depends="cairo pixman graphite gd poppler libsigsegv zziplib libpng libjpeg-turbo freetype icu harfbuzz wget perl ghostscript xz" +provides="tex-${version}_1" short_desc="TeX Live Binary distribution through tl-install" maintainer="Leah Neukirchen " license="GPL-2" From 60a73cc40889398031feb80137d211bcb948f926 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Tue, 14 Jul 2020 00:17:13 -0400 Subject: [PATCH 03/13] texlive2016-bin: provide tex virtual package --- srcpkgs/texlive2016-bin/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/texlive2016-bin/template b/srcpkgs/texlive2016-bin/template index 4412561108d..6f2ed09c366 100644 --- a/srcpkgs/texlive2016-bin/template +++ b/srcpkgs/texlive2016-bin/template @@ -1,7 +1,7 @@ # Template file for 'texlive-bin' pkgname=texlive2016-bin version=2016 -revision=2 +revision=3 archs="x86_64* i686 aarch64 arm*" maintainer="Leah Neukirchen " homepage="http://tug.org/texlive/" @@ -10,6 +10,7 @@ short_desc="TeX Live Binary distribution through tl-install" depends="cairo pixman graphite gd poppler libsigsegv zziplib libpng libjpeg-turbo freetype icu harfbuzz wget perl ghostscript xz" +provides="tex-${version}_1" distfiles="ftp://ftp.tug.org/texlive/historic/${version}/install-tl-unx.tar.gz>${pkgname}-${version}-${revision}.tar.gz" checksum=a0559306f4ef1903b92c829a11177dcbf3b85ddb9c6b512a80791e2c543f7d95 create_wrksrc=yes From 48b029e920c111bc086a642ffde852530b6dbc94 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Tue, 14 Jul 2020 00:17:13 -0400 Subject: [PATCH 04/13] texlive2017-bin: provide tex virtual package --- srcpkgs/texlive2017-bin/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/texlive2017-bin/template b/srcpkgs/texlive2017-bin/template index 52f5b1af27d..2dd12a23e45 100644 --- a/srcpkgs/texlive2017-bin/template +++ b/srcpkgs/texlive2017-bin/template @@ -1,7 +1,7 @@ # Template file for 'texlive-bin' pkgname=texlive2017-bin version=2017 -revision=3 +revision=4 archs="x86_64* i686 aarch64 arm*" maintainer="Leah Neukirchen " homepage="http://tug.org/texlive/" @@ -10,6 +10,7 @@ short_desc="TeX Live Binary distribution through tl-install" depends="cairo pixman graphite gd poppler libsigsegv zziplib libpng libjpeg-turbo freetype icu harfbuzz wget perl ghostscript xz" +provides="tex-${version}_1" distfiles="ftp://ftp.tug.org/texlive/historic/${version}/install-tl-unx.tar.gz>${pkgname}-${version}-${revision}.tar.gz" checksum=d4e07ed15dace1ea7fabe6d225ca45ba51f1cb7783e17850bc9fe3b890239d6d create_wrksrc=yes From d55dded230830fc2d697d9958cb7960cae5b38c1 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Tue, 14 Jul 2020 00:17:13 -0400 Subject: [PATCH 05/13] texlive2018-bin: provide tex virtual package --- srcpkgs/texlive2018-bin/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/texlive2018-bin/template b/srcpkgs/texlive2018-bin/template index a389fc42379..9fec7b8246c 100644 --- a/srcpkgs/texlive2018-bin/template +++ b/srcpkgs/texlive2018-bin/template @@ -1,7 +1,7 @@ # Template file for 'texlive-bin' pkgname=texlive2018-bin version=2018 -revision=2 +revision=3 archs="x86_64* i686 aarch64 arm*" maintainer="Leah Neukirchen " homepage="http://tug.org/texlive/" @@ -10,6 +10,7 @@ short_desc="TeX Live Binary distribution through tl-install" depends="cairo pixman graphite gd poppler libsigsegv zziplib libpng libjpeg-turbo freetype icu harfbuzz wget perl ghostscript xz" +provides="tex-${version}_1" distfiles="ftp://ftp.tug.org/texlive/historic/${version}/install-tl-unx.tar.gz>${pkgname}-${version}-${revision}.tar.gz" checksum=82c13110852af162c4c5ef1579fa2f4f51c2040850ec02fb7f97497da45eb446 create_wrksrc=yes From 802e2acabf951718e4bd42cbde1a4a33d4759b3f Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Tue, 14 Jul 2020 00:17:13 -0400 Subject: [PATCH 06/13] texlive2019-bin: provide tex virtual package --- srcpkgs/texlive2019-bin/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/texlive2019-bin/template b/srcpkgs/texlive2019-bin/template index d7cd1c71664..fc0553b0802 100644 --- a/srcpkgs/texlive2019-bin/template +++ b/srcpkgs/texlive2019-bin/template @@ -1,7 +1,7 @@ # Template file for 'texlive2019-bin' pkgname=texlive2019-bin version=2019 -revision=2 +revision=3 archs="x86_64* i686 aarch64 arm*" maintainer="Leah Neukirchen " homepage="http://tug.org/texlive/" @@ -10,6 +10,7 @@ short_desc="TeX Live Binary distribution through tl-install" depends="cairo pixman graphite gd poppler libsigsegv zziplib libpng libjpeg-turbo freetype icu harfbuzz wget perl ghostscript xz" +provides="tex-${version}_1" distfiles="ftp://ftp.tug.org/texlive/historic/${version}/install-tl-unx.tar.gz>${pkgname}-${version}-${revision}.tar.gz" checksum=44aa41b5783e345b7021387f19ac9637ff1ce5406a59754230c666642dfe7750 create_wrksrc=yes From 86a3b1430b958eba48f9132569da8ec7e8eba40c Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Tue, 14 Jul 2020 00:17:13 -0400 Subject: [PATCH 07/13] texlive2020-bin: provide tex virtual package --- srcpkgs/texlive2020-bin/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/texlive2020-bin/template b/srcpkgs/texlive2020-bin/template index ee7f347cc25..94376abd509 100644 --- a/srcpkgs/texlive2020-bin/template +++ b/srcpkgs/texlive2020-bin/template @@ -1,7 +1,7 @@ # Template file for 'texlive-bin' pkgname=texlive2020-bin version=2020 -revision=1 +revision=2 archs="x86_64* i686 aarch64 arm*" maintainer="Leah Neukirchen " homepage="http://tug.org/texlive/" @@ -10,6 +10,7 @@ short_desc="TeX Live Binary distribution through tl-install" depends="cairo pixman graphite gd poppler libsigsegv zziplib libpng libjpeg-turbo freetype icu harfbuzz wget perl ghostscript xz" +provides="tex-${version}_1" distfiles="ftp://ftp.tug.org/texlive/historic/${version}/install-tl-unx.tar.gz>${pkgname}-${version}-${revision}.tar.gz" checksum=7c90a50e55533d57170cbc7c0370a010019946eb18570282948e1af6f809382d create_wrksrc=yes From befb6e08189f4167e4f0e17d22f0bc12acfdc484 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Tue, 14 Jul 2020 00:17:43 -0400 Subject: [PATCH 08/13] texlive: provide tex virtual package --- srcpkgs/texlive/template | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/srcpkgs/texlive/template b/srcpkgs/texlive/template index 8aa8208d733..27a2b7a9d8a 100644 --- a/srcpkgs/texlive/template +++ b/srcpkgs/texlive/template @@ -1,7 +1,7 @@ # Template file for 'texlive' pkgname=texlive version=20200406 -revision=1 +revision=2 wrksrc="texlive-${version}-source" build_wrksrc="build" build_style=gnu-configure @@ -72,6 +72,8 @@ makedepends="cairo-devel freetype-devel gd-devel graphite-devel gmp-devel poppler-devel pixman-devel libteckit-devel zlib-devel zziplib-devel libXaw-devel" depends="dialog ghostscript perl-Tk texlive-core xbps-triggers>=0.115_1" +# Virtual package cares only about year part of version +provides="tex-${version%${version#????}}_1" short_desc="TeX Live" maintainer="fosslinux " license="GPL-2.0-or-later" From c2b05407128ed5518b41149119b10284a45ebdcd Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Tue, 14 Jul 2020 00:18:13 -0400 Subject: [PATCH 09/13] python-pyx: depend on tex virtual package --- srcpkgs/python-pyx/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python-pyx/template b/srcpkgs/python-pyx/template index ce3aeebe130..1ece52764ab 100644 --- a/srcpkgs/python-pyx/template +++ b/srcpkgs/python-pyx/template @@ -1,13 +1,13 @@ # Template file for 'python-pyx' pkgname=python-pyx version=0.12.1 -revision=3 +revision=4 archs=noarch wrksrc="PyX-${version}" build_style=python2-module pycompile_module="pyx" hostmakedepends="python-setuptools" -depends="python texlive-bin" +depends="python virtual?tex" short_desc="Python library for the creation of PostScript and PDF files" maintainer="cipr3s " license="GPL-2.0-or-later" From f488069b65b1b8b84d7a2c29692c2de750e7e02f Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Tue, 14 Jul 2020 00:19:02 -0400 Subject: [PATCH 10/13] python3-pyx: update to 0.15. --- srcpkgs/python3-pyx/template | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/srcpkgs/python3-pyx/template b/srcpkgs/python3-pyx/template index 89963bed89f..f8de127e420 100644 --- a/srcpkgs/python3-pyx/template +++ b/srcpkgs/python3-pyx/template @@ -1,16 +1,15 @@ # Template file for 'python3-pyx' pkgname=python3-pyx -version=0.14.1 -revision=2 +version=0.15 +revision=1 archs=noarch wrksrc="PyX-${version}" build_style=python3-module -pycompile_module="pyx" hostmakedepends="python3-setuptools" -depends="python3 texlive-bin" +depends="python3 virtual?tex" short_desc="Python3 library for the creation of PostScript and PDF files" maintainer="cipr3s " -license="GPL-2" -homepage="http://pyx.sourceforge.net" +license="GPL-2.0-or-later" +homepage="https://pyx-project.org" distfiles="${PYPI_SITE}/P/PyX/PyX-${version}.tar.gz" -checksum=05d1b7fc813379d2c12fcb5bd0195cab522b5aabafac88f72913f1d47becd912 +checksum=0fc3b00c5e7fb6f4aefbf63b95f624297dde47700a82b8b5ad6ebb346b5e4977 From e565fdf5a22929e429e59afdbcb6dfa973d66e51 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Tue, 14 Jul 2020 00:18:28 -0400 Subject: [PATCH 11/13] rubber: depend on tex virtual package --- srcpkgs/rubber/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/rubber/template b/srcpkgs/rubber/template index c7fe4cbbd06..de6652231aa 100644 --- a/srcpkgs/rubber/template +++ b/srcpkgs/rubber/template @@ -1,11 +1,11 @@ # Template file for 'rubber' pkgname=rubber version=1.5.1 -revision=2 +revision=3 archs=noarch build_style=python3-module hostmakedepends="python3" -depends="python3 texlive-bin" +depends="python3 virtual?tex" pycompile_module="rubber" short_desc="LaTeX building tool" maintainer="Matteo Signer " From 56bdf6d0b5ecbf22fda6c699151254600653d1e2 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Tue, 14 Jul 2020 00:18:34 -0400 Subject: [PATCH 12/13] xournalpp: depend on tex virtual package --- srcpkgs/xournalpp/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/xournalpp/template b/srcpkgs/xournalpp/template index 6d6acc26d55..026bf592413 100644 --- a/srcpkgs/xournalpp/template +++ b/srcpkgs/xournalpp/template @@ -1,12 +1,12 @@ # Template file for 'xournalpp' pkgname=xournalpp version=1.0.18 -revision=1 +revision=2 build_style=cmake hostmakedepends="pkg-config gettext" makedepends="libxml2-devel libcppunit-devel poppler-glib-devel gtk+3-devel portaudio-cpp-devel libsndfile-devel libzip-devel" -depends="texlive-bin" +depends="virtual?tex" short_desc="Handwriting Notetaking software with PDF annotation support" maintainer="mobinmob " license="GPL-2.0-or-later" From c02dba69cc7cc23085edaf8e50bbc8663055f31b Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Tue, 14 Jul 2020 01:43:03 -0400 Subject: [PATCH 13/13] lyx: update to 2.3.5.2. [ci skip] --- srcpkgs/lyx/template | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/srcpkgs/lyx/template b/srcpkgs/lyx/template index b6a18075c52..a1ef18ae595 100644 --- a/srcpkgs/lyx/template +++ b/srcpkgs/lyx/template @@ -1,18 +1,16 @@ # Template file for 'lyx' pkgname=lyx -version=2.3.5.1 +version=2.3.5.2 revision=1 -wrksrc="${pkgname}-${version%.*}-${version##*.}" build_style=gnu-configure configure_args="--enable-qt5 --without-included-mythes --without-included-boost" hostmakedepends="pkg-config bc qt5-devel" makedepends="file-devel boost-devel mythes-devel enchant-devel qt5-svg-devel" -depends="virtual?texlive GraphicsMagick python3" +depends="virtual?tex GraphicsMagick python3" short_desc="Document Processor WYSIWYM Editor & Latex frontend" maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://www.lyx.org/Home" -#distfiles="ftp://ftp.lyx.org/pub/${pkgname}/stable/2.3.x/${pkgname}-${version}.tar.bz2" -distfiles="https://fossies.org/linux/misc/lyx-${version}.tar.bz2" -checksum=97a77ba9dc4002035e1e32855f42c0838bca6b8a159af0c727388304d26cdb67 +distfiles="https://ftp.lip6.fr/pub/lyx/stable/2.3.x/${pkgname}-${version}.tar.gz" +checksum=63b75505d6fed264a7ed51f9ee3e4279c1d49a3960c06afe3c94f1c72bedea7e python_version=3