Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #8208 from Rmys/master

Browse Source 
texlive
This commit is contained in:
Rmys
2020-03-22 22:32:09 +03:00
committed by GitHub
parent 6949b4d0c6 d22c913f35
commit 9ab7de8623
7 changed files with 5633 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
editor/texlive-bin/actions.py
+6 -3
View File
@@ -14,7 +14,7 @@ from pisi.actionsapi import texlivemodules
import os
WorkDir = "."
buildDir = 'source/build'
buildDir = 'texlive-20190410-source/build'
def setup():
shelltools.makedirs(buildDir)
@@ -30,8 +30,10 @@ def setup():
--with-banner-add=/PisiLinux \
--disable-psutils \
--disable-t1utils \
--enable-multiplatform \
--disable-multiplatform \
--disable-static \
--disable-dvisvgm \
--enable-shared \
--enable-ipc \
--with-x \
--disable-xindy \
@@ -43,6 +45,7 @@ def setup():
--without-system-xpdf \
--with-system-graphite2 \
--with-system-freetype2 \
--with-system-harfbuzz \
--disable-luatex")
def build():
@@ -153,4 +156,4 @@ def install():
pisitools.dosym("euptex", "/usr/bin/uplatex")
pisitools.dosym("xetex", "/usr/bin/xelatex")
pisitools.removeDir("/usr/share/texmf-dist")
pisitools.removeDir("/usr/share/texmf-dist")
editor/texlive-bin/files/arch/pdftex-poppler0.76.patch
+1411
View File
File diff suppressed because it is too large Load Diff
editor/texlive-bin/files/arch/texlive-20190410-source-upstream_fixes-1.patch
+4096
View File
File diff suppressed because it is too large Load Diff
editor/texlive-bin/files/arch/texlive-poppler-0.83.patch
+46
View File
@@ -0,0 +1,46 @@
diff -ru texlive-source-orig/texk/web2c/pdftexdir/pdftoepdf.cc texlive-source/texk/web2c/pdftexdir/pdftoepdf.cc
--- texlive-source-orig/texk/web2c/pdftexdir/pdftoepdf.cc 2020-01-07 22:42:03.717667766 +0000
+++ texlive-source/texk/web2c/pdftexdir/pdftoepdf.cc 2020-01-07 22:47:42.818888622 +0000
@@ -723,7 +723,7 @@
#endif
// initialize
if (!isInit) {
- globalParams = new GlobalParams();
+ globalParams.reset(new GlobalParams());
globalParams->setErrQuiet(false);
isInit = true;
}
@@ -1108,6 +1108,5 @@
delete_document(p);
}
// see above for globalParams
- delete globalParams;
}
}
diff -ru texlive-source-orig/texk/web2c/pdftexdir/pdftosrc.cc texlive-source/texk/web2c/pdftexdir/pdftosrc.cc
--- texlive-source-orig/texk/web2c/pdftexdir/pdftosrc.cc 2020-01-07 22:42:03.714334387 +0000
+++ texlive-source/texk/web2c/pdftexdir/pdftosrc.cc 2020-01-07 22:50:08.070708640 +0000
@@ -79,7 +79,7 @@
exit(1);
}
fileName = new GString(argv[1]);
- globalParams = new GlobalParams();
+ globalParams.reset(new GlobalParams());
doc = new PDFDoc(fileName);
if (!doc->isOk()) {
fprintf(stderr, "Invalid PDF file\n");
@@ -100,7 +100,7 @@
if (objnum == 0) {
srcStream = catalogDict.dictLookup("SourceObject");
static char const_SourceFile[] = "SourceFile";
- if (!srcStream.isStream(const_SourceFile)) {
+ if (!srcStream.isDict(const_SourceFile)) {
fprintf(stderr, "No SourceObject found\n");
exit(1);
}
@@ -202,5 +202,4 @@
fprintf(stderr, "Cross-reference table extracted to %s\n", outname);
fclose(outfile);
delete doc;
- delete globalParams;
}
editor/texlive-bin/files/arch/texlive-poppler-0.84.patch
+44
View File
@@ -0,0 +1,44 @@
From cf05aae9685e5c6a46b4313e7bfce49edc6f51f9 Mon Sep 17 00:00:00 2001
From: Mikle Kolyada <zlogene@gentoo.org>
Date: Tue, 31 Dec 2019 11:29:30 +0300
Subject: [PATCH] poppler-0.84 compat
Upstream report: https://tug.org/pipermail/tex-k/2019-December/003096.html
Signed-off-by: Mikle Kolyada <zlogene@gentoo.org>
---
texk/web2c/pdftexdir/utils.c | 1 -
texk/web2c/xetexdir/XeTeX_ext.c | 3 +++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/texk/web2c/pdftexdir/utils.c b/texk/web2c/pdftexdir/utils.c
index c93a8781..6f866e76 100644
--- a/texk/web2c/pdftexdir/utils.c
+++ b/texk/web2c/pdftexdir/utils.c
@@ -33,7 +33,6 @@ with this program. If not, see <http://www.gnu.org/licenses/>.
#include "ptexlib.h"
#include <png.h>
#ifdef POPPLER_VERSION
-#include <poppler-config.h>
#define xpdfVersion POPPLER_VERSION
#define xpdfString "poppler"
#else
diff --git a/texk/web2c/xetexdir/XeTeX_ext.c b/texk/web2c/xetexdir/XeTeX_ext.c
index 4968ee41..0aee4ee3 100644
--- a/texk/web2c/xetexdir/XeTeX_ext.c
+++ b/texk/web2c/xetexdir/XeTeX_ext.c
@@ -38,7 +38,10 @@ authorization from the copyright holders.
#include <w2c/config.h>
+#ifndef POPPLER_VERSION
#include <poppler-config.h>
+#endif
+
#include <png.h>
#include <zlib.h>
#include <graphite2/Font.h>
--
2.24.1
editor/texlive-bin/files/arch/texlive-poppler-0.86.patch
+11
View File
@@ -0,0 +1,11 @@
--- a/texk/web2c/pdftexdir/pdftoepdf.cc 2020-03-03 21:11:35.102711802 +0000
+++ b/texk/web2c/pdftexdir/pdftoepdf.cc 2020-03-03 21:13:13.057420111 +0000
@@ -757,7 +757,7 @@
if (page_name) {
// get page by name
GString name(page_name);
- LinkDest *link = pdf_doc->doc->findDest(&name);
+ LinkDest *link = pdf_doc->doc->findDest(&name).get();
if (link == 0 || !link->isOk())
pdftex_fail("PDF inclusion: invalid destination <%s>", page_name);
Ref ref = link->getPageRef();
editor/texlive-bin/pspec.xml
+19 -3
View File
@@ -13,30 +13,38 @@
<Summary>Tex Live binaries</Summary>
<Description>Texlive binaries that are an essential part of TeXLive component.</Description>
<!--<Archive sha1sum="7fdc8972d22347880d1117bec8c3b75f82c4fbd5" type="tarxz">http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-texmf-20120623.tar.xz</Archive>-->
<Archive sha1sum="2d176c127470638ee9818592464500252fe5569b" type="tarxz">http://mirrors.edge.kernel.org/archlinux/other/texlive/texlive-bin-source-2018.47465.tar.xz</Archive>
<!-- <Archive sha1sum="2d176c127470638ee9818592464500252fe5569b" type="tarxz">http://mirrors.edge.kernel.org/archlinux/other/texlive/texlive-bin-source-2018.47465.tar.xz</Archive> -->
<Archive sha1sum="d700878d3e19b6ad1313791dd5cef4bf0acfd675" type="tarxz">ftp://tug.org/texlive/historic/2019/texlive-20190410-source.tar.xz</Archive>
<Archive sha1sum="cc36248ee8abfffb73e448459df978a56f10bcd1" type="targz">https://sourceforge.net/projects/biblatex-biber/files/biblatex-biber/2.13/binaries/Linux/biber-linux_x86_64.tar.gz</Archive>
<BuildDependencies>
<Dependency>poppler-devel</Dependency>
<Dependency>graphite2</Dependency>
<Dependency>libpaper-devel</Dependency>
<Dependency>gd-devel</Dependency>
<Dependency>icu4c-devel</Dependency>
<Dependency>libXt-devel</Dependency>
<Dependency>t1lib-devel</Dependency>
<Dependency>ffcall-devel</Dependency>
<Dependency>libpng-devel</Dependency>
<Dependency>libXaw-devel</Dependency>
<Dependency>libXmu-devel</Dependency>
<Dependency>libXpm-devel</Dependency>
<Dependency>libsigsegv-devel</Dependency>
<Dependency>clisp-devel</Dependency>
<Dependency>libXi-devel</Dependency>
<Dependency>harfbuzz-devel</Dependency>
<Dependency>freetype-devel</Dependency>
<Dependency>graphite2-devel</Dependency>
<Dependency>libsigsegv-devel</Dependency>
<Dependency>ghostscript-devel</Dependency>
<Dependency>fontconfig-devel</Dependency>
<Dependency>libpng-devel</Dependency>
<Dependency>freetype-devel</Dependency>
<Dependency>graphite2-devel</Dependency>
<!-- <Dependency>zziplib-devel</Dependency> -->
<!-- <Dependency>potrace</Dependency> -->
</BuildDependencies>
<Patches>
<Patch level="1">arch/texlive-20190410-source-upstream_fixes-1.patch</Patch>
</Patches>
</Source>
<Package>
@@ -55,6 +63,7 @@
<Dependency>libXaw</Dependency>
<Dependency>libXmu</Dependency>
<Dependency>libXpm</Dependency>
<Dependency>harfbuzz</Dependency>
<Dependency>freetype</Dependency>
<Dependency>graphite2</Dependency>
<Dependency>fontconfig</Dependency>
@@ -91,6 +100,13 @@
</Package>
<History>
<Update release="2">
<Date>2020-03-21</Date>
<Version>20190410</Version>
<Comment>Version bump</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@pisilinux.org</Email>
</Update>
<Update release="1">
<Date>2020-03-21</Date>
<Version>2018.47465</Version>