lukechilds
/
termux-packages
mirror of https://github.com/lukechilds/termux-packages.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

texlive-bin: sync with master branch 

%ci:reset-backlog
android-5
Leonid Plyushch 6 years ago
parent
224b2065a7
commit
c71dc6c92d
No known key found for this signature in database GPG Key ID: 45F2964132545795
4 changed files with 7 additions and 9 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      packages/texlive-bin/build.sh
  2. 4
      packages/texlive-bin/pdftoepdf-poppler0.76.0.cc
  3. 5
      packages/texlive-bin/pdftosrc-poppler0.76.0.cc
  4. 1
      packages/texlive-bin/texlive-bin-dev.subpackage.sh

6
packages/texlive-bin/build.sh
View File

@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="TeX Live is a distribution of the TeX typesetting system
TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_LICENSE="GPL-2.0"
TERMUX_PKG_MAINTAINER="Henrik Grimler @Grimler91" TERMUX_PKG_MAINTAINER="Henrik Grimler @Grimler91"
TERMUX_PKG_VERSION=20190410 TERMUX_PKG_VERSION=20190410
TERMUX_PKG_REVISION=2 TERMUX_PKG_REVISION=3
TERMUX_PKG_SRCURL=https://github.com/TeX-Live/texlive-source/archive/build-svn50882.tar.gz TERMUX_PKG_SRCURL=https://github.com/TeX-Live/texlive-source/archive/build-svn50882.tar.gz
TERMUX_PKG_SHA256=a7462f8e29163faa52ad2ac658727b60f95241449832f1a4dac8d8a406d18233 TERMUX_PKG_SHA256=a7462f8e29163faa52ad2ac658727b60f95241449832f1a4dac8d8a406d18233
TERMUX_PKG_DEPENDS="libc++, libiconv, freetype, libpng, libgd, libgmp, libmpfr, libicu, liblua, poppler, libgraphite, harfbuzz, harfbuzz-icu, teckit, libpixman, libcairo, zlib" TERMUX_PKG_DEPENDS="libc++, libiconv, freetype, libpng, libgd, libgmp, libmpfr, libicu, liblua, poppler, libgraphite, harfbuzz, harfbuzz-icu, teckit, libpixman, libcairo, zlib"
@ -130,6 +130,6 @@ termux_step_pre_configure() {
{} + {} +
# These files are from upstream master: # These files are from upstream master:
cp "$TERMUX_PKG_BUILDER_DIR"/pdftoepdf-poppler0.75.0.cc "$TERMUX_PKG_SRCDIR"/texk/web2c/pdftexdir/pdftoepdf.cc # commit 4dbbcd8 cp "$TERMUX_PKG_BUILDER_DIR"/pdftoepdf-poppler0.76.0.cc "$TERMUX_PKG_SRCDIR"/texk/web2c/pdftexdir/pdftoepdf.cc # commit 473d82b
cp "$TERMUX_PKG_BUILDER_DIR"/pdftosrc-poppler0.72.0.cc "$TERMUX_PKG_SRCDIR"/texk/web2c/pdftexdir/pdftosrc.cc # commit 68f53cf cp "$TERMUX_PKG_BUILDER_DIR"/pdftosrc-poppler0.76.0.cc "$TERMUX_PKG_SRCDIR"/texk/web2c/pdftexdir/pdftosrc.cc # commit 473d82b
} }

4
packages/texlive-bin/pdftoepdf-poppler0.75.0.cc → packages/texlive-bin/pdftoepdf-poppler0.76.0.cc
View File

@ -22,7 +22,7 @@ This is based on the patch texlive-poppler-0.59.patch <2017-09-19> at
https://git.archlinux.org/svntogit/packages.git/plain/texlive-bin/trunk https://git.archlinux.org/svntogit/packages.git/plain/texlive-bin/trunk
by Arch Linux. A little modifications are made to avoid a crash for by Arch Linux. A little modifications are made to avoid a crash for
some kind of pdf images, such as figure_missing.pdf in gnuplot. some kind of pdf images, such as figure_missing.pdf in gnuplot.
The poppler should be 0.75.0 or newer versions. The poppler should be 0.76.0 or newer versions.
POPPLER_VERSION should be defined. POPPLER_VERSION should be defined.
*/ */
@ -761,7 +761,7 @@ read_pdf_info(char *image_name, char *page_name, int page_num,
if (link == 0 || !link->isOk()) if (link == 0 || !link->isOk())
pdftex_fail("PDF inclusion: invalid destination <%s>", page_name); pdftex_fail("PDF inclusion: invalid destination <%s>", page_name);
Ref ref = link->getPageRef(); Ref ref = link->getPageRef();
page_num = pdf_doc->doc->getCatalog()->findPage(ref.num, ref.gen); page_num = pdf_doc->doc->getCatalog()->findPage(ref);
if (page_num == 0) if (page_num == 0)
pdftex_fail("PDF inclusion: destination is not a page <%s>", pdftex_fail("PDF inclusion: destination is not a page <%s>",
page_name); page_name);

5
packages/texlive-bin/pdftosrc-poppler0.72.0.cc → packages/texlive-bin/pdftosrc-poppler0.76.0.cc
View File

@ -20,7 +20,7 @@ with this program. If not, see <http://www.gnu.org/licenses/>.
/* /*
This is based on the patch texlive-poppler-0.59.patch <2017-09-19> at This is based on the patch texlive-poppler-0.59.patch <2017-09-19> at
https://git.archlinux.org/svntogit/packages.git/plain/texlive-bin/trunk https://git.archlinux.org/svntogit/packages.git/plain/texlive-bin/trunk
by Arch Linux. The poppler should be 0.72.0 or newer versions. by Arch Linux. The poppler should be 0.76.0 or newer versions.
POPPLER_VERSION should be defined. POPPLER_VERSION should be defined.
*/ */
@ -174,8 +174,7 @@ int main(int argc, char *argv[])
// parse the header: object numbers and offsets // parse the header: object numbers and offsets
objStr.streamReset(); objStr.streamReset();
str = new EmbedStream(objStr.getStream(), Object(objNull), true, first); str = new EmbedStream(objStr.getStream(), Object(objNull), true, first);
lexer = new Lexer(xref, str); parser = new Parser(xref, str, false);
parser = new Parser(xref, lexer, false);
for (n = 0; n < nObjects; ++n) { for (n = 0; n < nObjects; ++n) {
obj1 = parser->getObj(); obj1 = parser->getObj();
obj2 = parser->getObj(); obj2 = parser->getObj();

1
packages/texlive-bin/texlive-bin-dev.subpackage.sh
View File

@ -1,5 +1,4 @@
TERMUX_SUBPKG_INCLUDE="include lib/pkgconfig" TERMUX_SUBPKG_INCLUDE="include lib/pkgconfig"
TERMUX_SUBPKG_DESCRIPTION="Development files for texlive" TERMUX_SUBPKG_DESCRIPTION="Development files for texlive"
TERMUX_SUBPKG_DEPENDS="texlive-bin"
TERMUX_SUBPKG_REPLACES="texlive-dev" TERMUX_SUBPKG_REPLACES="texlive-dev"
TERMUX_SUBPKG_CONFLICTS="texlive-dev" TERMUX_SUBPKG_CONFLICTS="texlive-dev"

Write Preview
Loading…
Cancel
Save