* Re: [PR PATCH] [Updated] texlive: make tlmgr work.
2020-08-15 23:41 [PR PATCH] texlive: make tlmgr work fosslinux
@ 2020-08-15 23:42 ` fosslinux
2020-08-16 1:13 ` [PR REVIEW] " ericonr
` (22 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: fosslinux @ 2020-08-15 23:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 523 bytes --]
There is an updated pull request by fosslinux against master on the void-packages repository
https://github.com/fosslinux/void-packages texlive-fix-tlmgr
https://github.com/void-linux/void-packages/pull/24300
texlive: make tlmgr work.
tlmgr was attempting to lookup a relative path to /usr/bin, while it
expects to be in /usr/share/texmf-dist. Instead of symlinking it, create
a smallscript to run it from the correct location.
A patch file from https://github.com/void-linux/void-packages/pull/24300.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-texlive-fix-tlmgr-24300.patch --]
[-- Type: text/x-diff, Size: 2344 bytes --]
From 3d4f37ff3b44d00872005c9890bd32725bbf4153 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sun, 16 Aug 2020 09:39:27 +1000
Subject: [PATCH] texlive: make tlmgr work.
tlmgr was attempting to lookup a relative path to /usr/bin, while it
expects to be in /usr/share/texmf-dist. Instead of symlinking it, create
a smallscript to run it from the correct location.
Closes #24013
[ci skip]
---
srcpkgs/texlive/files/tlmgr | 2 ++
srcpkgs/texlive/template | 9 ++++++---
2 files changed, 8 insertions(+), 3 deletions(-)
create mode 100755 srcpkgs/texlive/files/tlmgr
diff --git a/srcpkgs/texlive/files/tlmgr b/srcpkgs/texlive/files/tlmgr
new file mode 100755
index 00000000000..07f5abe332d
--- /dev/null
+++ b/srcpkgs/texlive/files/tlmgr
@@ -0,0 +1,2 @@
+#!/bin/sh
+$(dirname $(realpath -s $0))/../share/texmf-dist/scripts/texlive/tlmgr.pl $@
diff --git a/srcpkgs/texlive/template b/srcpkgs/texlive/template
index 27a2b7a9d8a..0f7eaf24514 100644
--- a/srcpkgs/texlive/template
+++ b/srcpkgs/texlive/template
@@ -1,7 +1,7 @@
# Template file for 'texlive'
pkgname=texlive
version=20200406
-revision=2
+revision=3
wrksrc="texlive-${version}-source"
build_wrksrc="build"
build_style=gnu-configure
@@ -72,8 +72,6 @@ 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 <fosslinux@aussies.space>"
license="GPL-2.0-or-later"
@@ -81,6 +79,8 @@ homepage="https://www.tug.org/texlive/"
distfiles="ftp://tug.org/texlive/historic/2020/texlive-${version}-source.tar.xz"
checksum=e32f3d08cbbbcf21d8d3f96f2143b64a1f5e4cb01b06b761d6249c8785249078
python_version=3
+# Virtual package cares only about year part of version
+provides="tex-${version%${version#????}}_1"
if [ "$CROSS_BUILD" ] ; then
# Tangle is required for cross compile
@@ -252,6 +252,9 @@ post_install() {
done
ln -s eptex "${DESTDIR}/usr/bin/platex"
ln -s euptex "${DESTDIR}/usr/bin/uplatex"
+ # Create tlmgr smallscript
+ rm -f "${DESTDIR}/usr/bin/tlmgr"
+ vbin "${FILESDIR}/tlmgr"
}
texlive-XeTeX_package() {
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PR REVIEW] texlive: make tlmgr work.
2020-08-15 23:41 [PR PATCH] texlive: make tlmgr work fosslinux
2020-08-15 23:42 ` [PR PATCH] [Updated] " fosslinux
@ 2020-08-16 1:13 ` ericonr
2020-08-16 1:26 ` fosslinux
` (21 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: ericonr @ 2020-08-16 1:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 326 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/24300#discussion_r471050895
Comment:
Why not just `/usr/share` ? And `$@` should be quoted, so `"$@"`.
I dislike this as a solution, tho. The texlive-bin packages have it working, so what are we doing differently?
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PR REVIEW] texlive: make tlmgr work.
2020-08-15 23:41 [PR PATCH] texlive: make tlmgr work fosslinux
2020-08-15 23:42 ` [PR PATCH] [Updated] " fosslinux
2020-08-16 1:13 ` [PR REVIEW] " ericonr
@ 2020-08-16 1:26 ` fosslinux
2020-08-16 1:38 ` fosslinux
` (20 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: fosslinux @ 2020-08-16 1:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 587 bytes --]
New review comment by fosslinux on void-packages repository
https://github.com/void-linux/void-packages/pull/24300#discussion_r471051674
Comment:
There is no gurantee it will be `/usr`.
> The texlive-bin packages have it working, so what are we doing differently?
Literally *everything*. Compiling TeXLive from source is a completely different beast to the distributed installations. TBH, this is essentially the wrong question.
I don't disagree that it is a bad solution, though... still looking for a btter solution that uses kpsewhich like the rest of the TeX packages do.
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PR REVIEW] texlive: make tlmgr work.
2020-08-15 23:41 [PR PATCH] texlive: make tlmgr work fosslinux
` (2 preceding siblings ...)
2020-08-16 1:26 ` fosslinux
@ 2020-08-16 1:38 ` fosslinux
2020-08-16 2:28 ` ericonr
` (19 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: fosslinux @ 2020-08-16 1:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1590 bytes --]
New review comment by fosslinux on void-packages repository
https://github.com/void-linux/void-packages/pull/24300#discussion_r471052407
Comment:
The problem lies here in `texmf.cnf` and `tlmgr`. First, in `texmf.cnf`:
```
% ^L Part 1: Search paths and directories.
% This is the parent directory of our several trees, i.e.,
% /usr/local/texlive/YYYY in the original TeX Live distribution.
%
% The path definitions here assume the directories are organized
% according to the TeX Directory Structure (http://tug.org/tds).
%
% Redistributors will probably want $SELFAUTODIR/share, i.e., /usr/share.
% Kpathsea sets (in kpathsea/progname.c):
% SELFAUTOLOC (directory of the binary=/usr/local/texlive/YYYY/bin/i386-linux),
% SELFAUTODIR (its parent = /usr/local/texlive/YYYY/bin),
% SELFAUTOPARENT (its grandparent = /usr/local/texlive/YYYY), and
% SELFAUTOGRANDPARENT (its great-grandparent = /usr/local/texlive).
```
`tlmgr` has:
```
if (-r "$bindir/$kpsewhichname") {
# if not in bootstrapping mode => kpsewhich exists, so use it to get $Master
chomp($Master = `kpsewhich -var-value=SELFAUTOPARENT`);
}
```
Hence because `SELFAUTLOC=/usr/bin` `SELFAUTOPARENT=/` and so it adds `/tlpkg` and `/texmf-dist/scripts/texlive` to `@INC` and can't find anything. These variable definitions are hardcoded into kpathsea so they cannot be changed; `SELFAUTOPARENT` will always be `/`. So, the three options are a wrapper like this one, patching tlmgr to use `/usr/share/texmf-dist` as `$Master` or patching kpathsea. None of these are all that nice, IMHO.
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PR REVIEW] texlive: make tlmgr work.
2020-08-15 23:41 [PR PATCH] texlive: make tlmgr work fosslinux
` (3 preceding siblings ...)
2020-08-16 1:38 ` fosslinux
@ 2020-08-16 2:28 ` ericonr
2020-08-16 2:52 ` fosslinux
` (18 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: ericonr @ 2020-08-16 2:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 581 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/24300#discussion_r471055630
Comment:
> There is no gurantee it will be /usr.
Why not? We are the ones putting the script there.
> % Redistributors will probably want $SELFAUTODIR/share, i.e., /usr/share.
Doesn't this mean that this is a known usecase, and that they are ready for it? It feels like it should require config options instead of patching :/
Overall, a wrapper script is better than patching, if only because it avoids rebasing for a new release.
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PR REVIEW] texlive: make tlmgr work.
2020-08-15 23:41 [PR PATCH] texlive: make tlmgr work fosslinux
` (4 preceding siblings ...)
2020-08-16 2:28 ` ericonr
@ 2020-08-16 2:52 ` fosslinux
2020-08-16 2:53 ` [PR PATCH] [Updated] " fosslinux
` (17 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: fosslinux @ 2020-08-16 2:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 934 bytes --]
New review comment by fosslinux on void-packages repository
https://github.com/void-linux/void-packages/pull/24300#discussion_r471057241
Comment:
TeX only officially supports https://tug.org/tds/tds.html the TDS. Its kinda dumb IMO; they expect **all** things, including its scripts such as tlmgr, to be in its own self-contained tree which doesn't adhere to FHS. Hence they by default expect binaries to be in this tree. All Linux distributions that I know of ignore the TDS for binaries and adhere to `/usr/bin` for binaries as per the FHS. This is why `texlive-bin` works, it has the TDS in `/opt/texlive/YYYY`.
> Doesn't this mean that this is a known usecase, and that they are ready for it?
The line you quotes pertains to the line after that I missed in my code excerpt, about `TEXMFROOT` (which it expects its own scripts to be).
> Why not? We are the ones putting the script there.
Mm, I guess. I'll change it.
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PR PATCH] [Updated] texlive: make tlmgr work.
2020-08-15 23:41 [PR PATCH] texlive: make tlmgr work fosslinux
` (5 preceding siblings ...)
2020-08-16 2:52 ` fosslinux
@ 2020-08-16 2:53 ` fosslinux
2020-08-16 2:54 ` [PR REVIEW] " ericonr
` (16 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: fosslinux @ 2020-08-16 2:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 523 bytes --]
There is an updated pull request by fosslinux against master on the void-packages repository
https://github.com/fosslinux/void-packages texlive-fix-tlmgr
https://github.com/void-linux/void-packages/pull/24300
texlive: make tlmgr work.
tlmgr was attempting to lookup a relative path to /usr/bin, while it
expects to be in /usr/share/texmf-dist. Instead of symlinking it, create
a smallscript to run it from the correct location.
A patch file from https://github.com/void-linux/void-packages/pull/24300.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-texlive-fix-tlmgr-24300.patch --]
[-- Type: text/x-diff, Size: 2317 bytes --]
From 99e59469367e40ab2862520cf5c6435b78b84e46 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sun, 16 Aug 2020 09:39:27 +1000
Subject: [PATCH] texlive: make tlmgr work.
tlmgr was attempting to lookup a relative path to /usr/bin, while it
expects to be in /usr/share/texmf-dist. Instead of symlinking it, create
a smallscript to run it from the correct location.
Closes #24013
[ci skip]
---
srcpkgs/texlive/files/tlmgr | 2 ++
srcpkgs/texlive/template | 9 ++++++---
2 files changed, 8 insertions(+), 3 deletions(-)
create mode 100755 srcpkgs/texlive/files/tlmgr
diff --git a/srcpkgs/texlive/files/tlmgr b/srcpkgs/texlive/files/tlmgr
new file mode 100755
index 00000000000..d895f33a326
--- /dev/null
+++ b/srcpkgs/texlive/files/tlmgr
@@ -0,0 +1,2 @@
+#!/bin/sh
+/usr/share/texmf-dist/scripts/texlive/tlmgr.pl $@
diff --git a/srcpkgs/texlive/template b/srcpkgs/texlive/template
index 27a2b7a9d8a..0f7eaf24514 100644
--- a/srcpkgs/texlive/template
+++ b/srcpkgs/texlive/template
@@ -1,7 +1,7 @@
# Template file for 'texlive'
pkgname=texlive
version=20200406
-revision=2
+revision=3
wrksrc="texlive-${version}-source"
build_wrksrc="build"
build_style=gnu-configure
@@ -72,8 +72,6 @@ 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 <fosslinux@aussies.space>"
license="GPL-2.0-or-later"
@@ -81,6 +79,8 @@ homepage="https://www.tug.org/texlive/"
distfiles="ftp://tug.org/texlive/historic/2020/texlive-${version}-source.tar.xz"
checksum=e32f3d08cbbbcf21d8d3f96f2143b64a1f5e4cb01b06b761d6249c8785249078
python_version=3
+# Virtual package cares only about year part of version
+provides="tex-${version%${version#????}}_1"
if [ "$CROSS_BUILD" ] ; then
# Tangle is required for cross compile
@@ -252,6 +252,9 @@ post_install() {
done
ln -s eptex "${DESTDIR}/usr/bin/platex"
ln -s euptex "${DESTDIR}/usr/bin/uplatex"
+ # Create tlmgr smallscript
+ rm -f "${DESTDIR}/usr/bin/tlmgr"
+ vbin "${FILESDIR}/tlmgr"
}
texlive-XeTeX_package() {
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PR REVIEW] texlive: make tlmgr work.
2020-08-15 23:41 [PR PATCH] texlive: make tlmgr work fosslinux
` (6 preceding siblings ...)
2020-08-16 2:53 ` [PR PATCH] [Updated] " fosslinux
@ 2020-08-16 2:54 ` ericonr
2020-08-16 2:55 ` ericonr
` (15 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: ericonr @ 2020-08-16 2:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 325 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/24300#discussion_r471057344
Comment:
> Its kinda dumb IMO; they expect all things, including its scripts such as tlmgr, to be in its own self-contained tree which doesn't adhere to FHS
lol, sounds great. Ok then!
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PR REVIEW] texlive: make tlmgr work.
2020-08-15 23:41 [PR PATCH] texlive: make tlmgr work fosslinux
` (7 preceding siblings ...)
2020-08-16 2:54 ` [PR REVIEW] " ericonr
@ 2020-08-16 2:55 ` ericonr
2020-08-16 4:07 ` ericonr
` (14 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: ericonr @ 2020-08-16 2:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 168 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/24300#discussion_r471057407
Comment:
`$@` should be quoted
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: texlive: make tlmgr work.
2020-08-15 23:41 [PR PATCH] texlive: make tlmgr work fosslinux
` (8 preceding siblings ...)
2020-08-16 2:55 ` ericonr
@ 2020-08-16 4:07 ` ericonr
2020-08-16 4:10 ` fosslinux
` (13 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: ericonr @ 2020-08-16 4:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 317 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/24300#issuecomment-674475925
Comment:
I'm working on splitting `libsynctex` into a sub-package so zathura can use it by default without pulling in `texlive` as a whole. Do you think it could be merged into this PR?
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: texlive: make tlmgr work.
2020-08-15 23:41 [PR PATCH] texlive: make tlmgr work fosslinux
` (9 preceding siblings ...)
2020-08-16 4:07 ` ericonr
@ 2020-08-16 4:10 ` fosslinux
2020-08-16 4:12 ` ericonr
` (12 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: fosslinux @ 2020-08-16 4:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 241 bytes --]
New comment by fosslinux on void-packages repository
https://github.com/void-linux/void-packages/pull/24300#issuecomment-674476098
Comment:
Sure but separate commits, they're completely unrelated (I assume this is to avoid a build-twice).
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: texlive: make tlmgr work.
2020-08-15 23:41 [PR PATCH] texlive: make tlmgr work fosslinux
` (10 preceding siblings ...)
2020-08-16 4:10 ` fosslinux
@ 2020-08-16 4:12 ` ericonr
2020-08-16 4:12 ` ericonr
` (11 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: ericonr @ 2020-08-16 4:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 268 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/24300#issuecomment-674476194
Comment:
Pull in https://github.com/ericonr/void-packages/commit/7c0f52d9f8a2385cebf8185c3bf20c7920273733 , I will open a PR for zatura.
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: texlive: make tlmgr work.
2020-08-15 23:41 [PR PATCH] texlive: make tlmgr work fosslinux
` (11 preceding siblings ...)
2020-08-16 4:12 ` ericonr
@ 2020-08-16 4:12 ` ericonr
2020-08-16 4:13 ` ericonr
` (10 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: ericonr @ 2020-08-16 4:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 177 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/24300#issuecomment-674476233
Comment:
Gah, I missed quotes on that commit!
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: texlive: make tlmgr work.
2020-08-15 23:41 [PR PATCH] texlive: make tlmgr work fosslinux
` (12 preceding siblings ...)
2020-08-16 4:12 ` ericonr
@ 2020-08-16 4:13 ` ericonr
2020-08-16 4:14 ` fosslinux
` (9 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: ericonr @ 2020-08-16 4:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 290 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/24300#issuecomment-674476233
Comment:
Gah, I missed quotes on that commit!
Perhaps it isn't needed, the package has the correct contents... But all other templates use quotes for this.
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: texlive: make tlmgr work.
2020-08-15 23:41 [PR PATCH] texlive: make tlmgr work fosslinux
` (13 preceding siblings ...)
2020-08-16 4:13 ` ericonr
@ 2020-08-16 4:14 ` fosslinux
2020-08-16 4:31 ` ericonr
` (8 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: fosslinux @ 2020-08-16 4:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 311 bytes --]
New comment by fosslinux on void-packages repository
https://github.com/void-linux/void-packages/pull/24300#issuecomment-674476422
Comment:
Just use quotes to avoid any weird behavior, glob expansion is weird.
Also create a `libsynctex-devel` package and move all the synctex stuff out of `texlive-devel`.
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: texlive: make tlmgr work.
2020-08-15 23:41 [PR PATCH] texlive: make tlmgr work fosslinux
` (14 preceding siblings ...)
2020-08-16 4:14 ` fosslinux
@ 2020-08-16 4:31 ` ericonr
2020-08-16 4:36 ` [PR PATCH] [Updated] " fosslinux
` (7 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: ericonr @ 2020-08-16 4:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 263 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/24300#issuecomment-674477519
Comment:
Tis the new commit https://github.com/void-linux/void-packages/pull/24305/commits/f387f89e60469512dc1126be289a3033750e84eb
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PR PATCH] [Updated] texlive: make tlmgr work.
2020-08-15 23:41 [PR PATCH] texlive: make tlmgr work fosslinux
` (15 preceding siblings ...)
2020-08-16 4:31 ` ericonr
@ 2020-08-16 4:36 ` fosslinux
2020-08-16 5:25 ` [do not merge] texlive: make tlmgr work and split libsynctex fosslinux
` (6 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: fosslinux @ 2020-08-16 4:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 523 bytes --]
There is an updated pull request by fosslinux against master on the void-packages repository
https://github.com/fosslinux/void-packages texlive-fix-tlmgr
https://github.com/void-linux/void-packages/pull/24300
texlive: make tlmgr work.
tlmgr was attempting to lookup a relative path to /usr/bin, while it
expects to be in /usr/share/texmf-dist. Instead of symlinking it, create
a smallscript to run it from the correct location.
A patch file from https://github.com/void-linux/void-packages/pull/24300.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-texlive-fix-tlmgr-24300.patch --]
[-- Type: text/x-diff, Size: 3651 bytes --]
From eef9a7f1ba35639511f938001857c2469a0a16e3 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sun, 16 Aug 2020 09:39:27 +1000
Subject: [PATCH 1/2] texlive: make tlmgr work.
tlmgr was attempting to lookup a relative path to /usr/bin, while it
expects to be in /usr/share/texmf-dist. Instead of symlinking it, create
a smallscript to run it from the correct location.
Closes #24013
---
srcpkgs/texlive/files/tlmgr | 2 ++
srcpkgs/texlive/template | 9 ++++++---
2 files changed, 8 insertions(+), 3 deletions(-)
create mode 100755 srcpkgs/texlive/files/tlmgr
diff --git a/srcpkgs/texlive/files/tlmgr b/srcpkgs/texlive/files/tlmgr
new file mode 100755
index 00000000000..95bbe227492
--- /dev/null
+++ b/srcpkgs/texlive/files/tlmgr
@@ -0,0 +1,2 @@
+#!/bin/sh
+/usr/share/texmf-dist/scripts/texlive/tlmgr.pl "$@"
diff --git a/srcpkgs/texlive/template b/srcpkgs/texlive/template
index 27a2b7a9d8a..0f7eaf24514 100644
--- a/srcpkgs/texlive/template
+++ b/srcpkgs/texlive/template
@@ -1,7 +1,7 @@
# Template file for 'texlive'
pkgname=texlive
version=20200406
-revision=2
+revision=3
wrksrc="texlive-${version}-source"
build_wrksrc="build"
build_style=gnu-configure
@@ -72,8 +72,6 @@ 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 <fosslinux@aussies.space>"
license="GPL-2.0-or-later"
@@ -81,6 +79,8 @@ homepage="https://www.tug.org/texlive/"
distfiles="ftp://tug.org/texlive/historic/2020/texlive-${version}-source.tar.xz"
checksum=e32f3d08cbbbcf21d8d3f96f2143b64a1f5e4cb01b06b761d6249c8785249078
python_version=3
+# Virtual package cares only about year part of version
+provides="tex-${version%${version#????}}_1"
if [ "$CROSS_BUILD" ] ; then
# Tangle is required for cross compile
@@ -252,6 +252,9 @@ post_install() {
done
ln -s eptex "${DESTDIR}/usr/bin/platex"
ln -s euptex "${DESTDIR}/usr/bin/uplatex"
+ # Create tlmgr smallscript
+ rm -f "${DESTDIR}/usr/bin/tlmgr"
+ vbin "${FILESDIR}/tlmgr"
}
texlive-XeTeX_package() {
From 473f2489f650cc0fcfee8303b44425fbdeae8c4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 16 Aug 2020 01:09:40 -0300
Subject: [PATCH 2/2] texlive: create libsynctex sub-package.
Other packages can link against this library, and they don't need to
pull in the whole texlive package.
[ci skip]
---
common/shlibs | 1 +
srcpkgs/texlive/template | 7 +++++++
2 files changed, 8 insertions(+)
diff --git a/common/shlibs b/common/shlibs
index 4d3dfa3c7fe..ea8a526b870 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3973,6 +3973,7 @@ libkpathsea.so.6 texlive-20200406_1
libtexluajit.so.2 texlive-LuaTeX-20200406_1
libtexlua53.so.5 texlive-LuaTeX-20200406_1
libptexenc.so.1 texlive-20200406_1
+libsynctex.so.2 libsynctex-20200406_3
libdolphinvcs.so.5 dolphin-20.04.3_1
libcglm.so.0 cglm-0.7.6_1
libfcft.so.3 fcft-2.2.2_1
diff --git a/srcpkgs/texlive/template b/srcpkgs/texlive/template
index 0f7eaf24514..b472c31d752 100644
--- a/srcpkgs/texlive/template
+++ b/srcpkgs/texlive/template
@@ -338,6 +338,13 @@ texlive-Xdvi_package() {
}
}
+libsynctex_package() {
+ short_desc+=" - libsynctex"
+ pkg_install() {
+ vmove "usr/lib/libsynctex.so.*"
+ }
+}
+
texlive-devel_package() {
depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [do not merge] texlive: make tlmgr work and split libsynctex
2020-08-15 23:41 [PR PATCH] texlive: make tlmgr work fosslinux
` (16 preceding siblings ...)
2020-08-16 4:36 ` [PR PATCH] [Updated] " fosslinux
@ 2020-08-16 5:25 ` fosslinux
2020-08-16 5:29 ` ericonr
` (5 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: fosslinux @ 2020-08-16 5:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 216 bytes --]
New comment by fosslinux on void-packages repository
https://github.com/void-linux/void-packages/pull/24300#issuecomment-674481240
Comment:
a number of problems with that patch, including the lack of a symlink...
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [do not merge] texlive: make tlmgr work and split libsynctex
2020-08-15 23:41 [PR PATCH] texlive: make tlmgr work fosslinux
` (17 preceding siblings ...)
2020-08-16 5:25 ` [do not merge] texlive: make tlmgr work and split libsynctex fosslinux
@ 2020-08-16 5:29 ` ericonr
2020-08-16 5:30 ` ericonr
` (4 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: ericonr @ 2020-08-16 5:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 271 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/24300#issuecomment-674481548
Comment:
I need to clean up my work tree, the number of files there makes me miss symlinks all the time D:
Anything else I should solve?
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [do not merge] texlive: make tlmgr work and split libsynctex
2020-08-15 23:41 [PR PATCH] texlive: make tlmgr work fosslinux
` (18 preceding siblings ...)
2020-08-16 5:29 ` ericonr
@ 2020-08-16 5:30 ` ericonr
2020-08-16 5:36 ` fosslinux
` (3 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: ericonr @ 2020-08-16 5:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 391 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/24300#issuecomment-674481548
Comment:
I need to clean up my work tree, the number of files there makes me miss symlinks all the time D:
Anything else I should solve?
Also, commit https://github.com/void-linux/void-packages/pull/24305/commits/a810b574f1007f1d3724bb5992577df01398f5e3
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [do not merge] texlive: make tlmgr work and split libsynctex
2020-08-15 23:41 [PR PATCH] texlive: make tlmgr work fosslinux
` (19 preceding siblings ...)
2020-08-16 5:30 ` ericonr
@ 2020-08-16 5:36 ` fosslinux
2020-08-16 8:04 ` fosslinux
` (2 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: fosslinux @ 2020-08-16 5:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 194 bytes --]
New comment by fosslinux on void-packages repository
https://github.com/void-linux/void-packages/pull/24300#issuecomment-674482089
Comment:
i think that's it, just waiting for build to finish
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [do not merge] texlive: make tlmgr work and split libsynctex
2020-08-15 23:41 [PR PATCH] texlive: make tlmgr work fosslinux
` (20 preceding siblings ...)
2020-08-16 5:36 ` fosslinux
@ 2020-08-16 8:04 ` fosslinux
2020-08-16 8:07 ` [PR PATCH] [Updated] " fosslinux
2020-08-17 13:48 ` [PR PATCH] [Closed]: " ahesford
23 siblings, 0 replies; 25+ messages in thread
From: fosslinux @ 2020-08-16 8:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 163 bytes --]
New comment by fosslinux on void-packages repository
https://github.com/void-linux/void-packages/pull/24300#issuecomment-674495368
Comment:
Tested and it works!
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PR PATCH] [Updated] texlive: make tlmgr work and split libsynctex
2020-08-15 23:41 [PR PATCH] texlive: make tlmgr work fosslinux
` (21 preceding siblings ...)
2020-08-16 8:04 ` fosslinux
@ 2020-08-16 8:07 ` fosslinux
2020-08-17 13:48 ` [PR PATCH] [Closed]: " ahesford
23 siblings, 0 replies; 25+ messages in thread
From: fosslinux @ 2020-08-16 8:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 543 bytes --]
There is an updated pull request by fosslinux against master on the void-packages repository
https://github.com/fosslinux/void-packages texlive-fix-tlmgr
https://github.com/void-linux/void-packages/pull/24300
texlive: make tlmgr work and split libsynctex
tlmgr was attempting to lookup a relative path to /usr/bin, while it
expects to be in /usr/share/texmf-dist. Instead of symlinking it, create
a smallscript to run it from the correct location.
A patch file from https://github.com/void-linux/void-packages/pull/24300.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-texlive-fix-tlmgr-24300.patch --]
[-- Type: text/x-diff, Size: 3917 bytes --]
From eef9a7f1ba35639511f938001857c2469a0a16e3 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sun, 16 Aug 2020 09:39:27 +1000
Subject: [PATCH 1/2] texlive: make tlmgr work.
tlmgr was attempting to lookup a relative path to /usr/bin, while it
expects to be in /usr/share/texmf-dist. Instead of symlinking it, create
a smallscript to run it from the correct location.
Closes #24013
---
srcpkgs/texlive/files/tlmgr | 2 ++
srcpkgs/texlive/template | 9 ++++++---
2 files changed, 8 insertions(+), 3 deletions(-)
create mode 100755 srcpkgs/texlive/files/tlmgr
diff --git a/srcpkgs/texlive/files/tlmgr b/srcpkgs/texlive/files/tlmgr
new file mode 100755
index 00000000000..95bbe227492
--- /dev/null
+++ b/srcpkgs/texlive/files/tlmgr
@@ -0,0 +1,2 @@
+#!/bin/sh
+/usr/share/texmf-dist/scripts/texlive/tlmgr.pl "$@"
diff --git a/srcpkgs/texlive/template b/srcpkgs/texlive/template
index 27a2b7a9d8a..0f7eaf24514 100644
--- a/srcpkgs/texlive/template
+++ b/srcpkgs/texlive/template
@@ -1,7 +1,7 @@
# Template file for 'texlive'
pkgname=texlive
version=20200406
-revision=2
+revision=3
wrksrc="texlive-${version}-source"
build_wrksrc="build"
build_style=gnu-configure
@@ -72,8 +72,6 @@ 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 <fosslinux@aussies.space>"
license="GPL-2.0-or-later"
@@ -81,6 +79,8 @@ homepage="https://www.tug.org/texlive/"
distfiles="ftp://tug.org/texlive/historic/2020/texlive-${version}-source.tar.xz"
checksum=e32f3d08cbbbcf21d8d3f96f2143b64a1f5e4cb01b06b761d6249c8785249078
python_version=3
+# Virtual package cares only about year part of version
+provides="tex-${version%${version#????}}_1"
if [ "$CROSS_BUILD" ] ; then
# Tangle is required for cross compile
@@ -252,6 +252,9 @@ post_install() {
done
ln -s eptex "${DESTDIR}/usr/bin/platex"
ln -s euptex "${DESTDIR}/usr/bin/uplatex"
+ # Create tlmgr smallscript
+ rm -f "${DESTDIR}/usr/bin/tlmgr"
+ vbin "${FILESDIR}/tlmgr"
}
texlive-XeTeX_package() {
From fe5dfcdc91d5d64052c0b250a4e81b3ef58951d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 16 Aug 2020 01:09:40 -0300
Subject: [PATCH 2/2] texlive: create libsynctex sub-package.
Other packages can link against this library, and they don't need to
pull in the whole texlive package.
[ci skip]
---
common/shlibs | 1 +
srcpkgs/libsynctex | 1 +
srcpkgs/texlive/template | 7 +++++++
3 files changed, 9 insertions(+)
create mode 120000 srcpkgs/libsynctex
diff --git a/common/shlibs b/common/shlibs
index 4d3dfa3c7fe..ea8a526b870 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3973,6 +3973,7 @@ libkpathsea.so.6 texlive-20200406_1
libtexluajit.so.2 texlive-LuaTeX-20200406_1
libtexlua53.so.5 texlive-LuaTeX-20200406_1
libptexenc.so.1 texlive-20200406_1
+libsynctex.so.2 libsynctex-20200406_3
libdolphinvcs.so.5 dolphin-20.04.3_1
libcglm.so.0 cglm-0.7.6_1
libfcft.so.3 fcft-2.2.2_1
diff --git a/srcpkgs/libsynctex b/srcpkgs/libsynctex
new file mode 120000
index 00000000000..c6cca627ba9
--- /dev/null
+++ b/srcpkgs/libsynctex
@@ -0,0 +1 @@
+texlive
\ No newline at end of file
diff --git a/srcpkgs/texlive/template b/srcpkgs/texlive/template
index 0f7eaf24514..b472c31d752 100644
--- a/srcpkgs/texlive/template
+++ b/srcpkgs/texlive/template
@@ -338,6 +338,13 @@ texlive-Xdvi_package() {
}
}
+libsynctex_package() {
+ short_desc+=" - libsynctex"
+ pkg_install() {
+ vmove "usr/lib/libsynctex.so.*"
+ }
+}
+
texlive-devel_package() {
depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PR PATCH] [Closed]: texlive: make tlmgr work and split libsynctex
2020-08-15 23:41 [PR PATCH] texlive: make tlmgr work fosslinux
` (22 preceding siblings ...)
2020-08-16 8:07 ` [PR PATCH] [Updated] " fosslinux
@ 2020-08-17 13:48 ` ahesford
23 siblings, 0 replies; 25+ messages in thread
From: ahesford @ 2020-08-17 13:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 373 bytes --]
There's a closed pull request on the void-packages repository
texlive: make tlmgr work and split libsynctex
https://github.com/void-linux/void-packages/pull/24300
Description:
tlmgr was attempting to lookup a relative path to /usr/bin, while it
expects to be in /usr/share/texmf-dist. Instead of symlinking it, create
a smallscript to run it from the correct location.
^ permalink raw reply [flat|nested] 25+ messages in thread