[tlbuild] patches in Debian for texlive-source

Norbert Preining preining at logic.at
Fri Mar 8 00:57:41 CET 2019


Hi Karl, hi all,

here are some patches we have in Debian:

freetype-use-pkg-config
	make freetype being searched with pkg-config

disdvi_man.patch
dv2dt_man.patch
gftodvi_man.patch
patch_xdvi.1.in
	man page formatting


There is a patch that I need to push upstream and improve, it is about
finding dvisvgm libraries in a better way. It simply doesn't work
on Debian when linking with the libs being separately packaged.
	dvisvgm-fix-missing-libs

Feel free to pick whatever is good ;-) More patches on the tldev mailing
list concerning the stuff under Master.

Best

Norbert

--
PREINING Norbert                               http://www.preining.info
Accelia Inc.     +    JAIST     +    TeX Live     +    Debian Developer
GPG: 0x860CDC13   fp: F7D8 A928 26E3 16A1 9FA0 ACF0 6CAC A448 860C DC13
-------------- next part --------------
---
 m4/kpse-freetype2-flags.m4 |    4 ++++
 1 file changed, 4 insertions(+)

--- texlive-bin.orig/m4/kpse-freetype2-flags.m4
+++ texlive-bin/m4/kpse-freetype2-flags.m4
@@ -28,9 +28,13 @@
 AC_DEFUN([KPSE_FREETYPE2_SYSTEM_FLAGS], [dnl
 AC_REQUIRE([AC_CANONICAL_HOST])[]dnl
 AC_CHECK_TOOL([FT2_CONFIG], [freetype-config], [false])[]dnl
+AC_CHECK_TOOL([PKG_CONFIG], [pkg-config], [false])[]dnl
 if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
   FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
   FREETYPE2_LIBS=`$FT2_CONFIG --libs`
+elif $PKG_CONFIG --libs freetype2 >/dev/null 2>&1; then
+  FREETYPE2_INCLUDES=`$PKG_CONFIG --cflags freetype2`
+  FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2`
 elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
   AC_MSG_ERROR([did not find freetype-config required for system freetype2 library])
 fi
-------------- next part --------------
A non-text attachment was scrubbed...
Name: disdvi_man.patch
Type: text/x-diff
Size: 745 bytes
Desc: not available
URL: <https://tug.org/pipermail/tlbuild/attachments/20190308/d22336ad/attachment.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: gftodvi_man.patch
Type: text/x-diff
Size: 3456 bytes
Desc: not available
URL: <https://tug.org/pipermail/tlbuild/attachments/20190308/d22336ad/attachment-0001.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: dv2dt_man.patch
Type: text/x-diff
Size: 2401 bytes
Desc: not available
URL: <https://tug.org/pipermail/tlbuild/attachments/20190308/d22336ad/attachment-0002.bin>
-------------- next part --------------
--- texlive-bin.orig/texk/xdvik/xdvi.1.in
+++ texlive-bin/texk/xdvik/xdvi.1.in
@@ -648,7 +648,7 @@
 .BR -fg .
 .\"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 .TP
-.BI \-fullscreen
+.B \-fullscreen
 When this option is used, xdvi will (try to) run in fullscreen mode, with
 no window decorations.
 This option is not guaranteed to work with all windowmanagers/desktops;
@@ -853,7 +853,7 @@
 Prints licensing information.
 .\"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 .TP
-.BI \-linkcolor
+.B \-linkcolor
 .RB ( .linkColor )
 Color used for unvisited hyperlinks (`Blue2' by default). Hyperlinks
 are unvisited before you click on them, or after the DVI file has been reloaded.
@@ -867,7 +867,7 @@
 .BR \-linkstyle .
 .\"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 .TP
-.BI \-linkstyle
+.B \-linkstyle
 .RB ( .LinkStyle )
 Determines the style in which hyperlinks are displayed. Possible
 values and their meanings are:
@@ -882,9 +882,9 @@
 .sp 1n
 .fi
 The values for \fIlink color\fR are specified by the options/resources
-.BI \-linkcolor
+.B \-linkcolor
 and
-.BI \-visitedlinkcolor
+.B \-visitedlinkcolor
 (which see).
 .\"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 .TP
@@ -1165,7 +1165,7 @@
 #endif
 .\"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 .TP
-.BI \-noomega
+.B \-noomega
 .RB ( .omega )
 This will disable the use of Omega extensions when interpreting DVI files.
 By default, the additional opcodes
@@ -1249,7 +1249,7 @@
 .\"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 #ift1
 .TP
-.BI \-notype1fonts
+.B \-notype1fonts
 .RB ( .type1 )
 This will disable the use of the FreeType library to display PostScript<tm>
 Type 1 fonts.
@@ -1461,7 +1461,7 @@
 (default: foreground color).
 .\"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 .TP
-.BI \-q
+.B \-q
 .RB ( .noInitFile )
 Ignore the
 .I $HOME/.xdvirc
@@ -1581,7 +1581,7 @@
 Otherwise, if one of the filenames does contain a path component (e.g.:
 .IR ./test.tex ,
 .IR ../test.tex ,
-.IR /my/homedir/tex/test.tex
+.I /my/homedir/tex/test.tex
 or any combination of these), both filenames are expanded to a full path,
 with any occurrences of
 .I ../
@@ -1674,7 +1674,7 @@
 currently ignored.
 .\"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 .TP
-.BI \-useTeXpages
+.B \-useTeXpages
 Use logical \*(Te\& pages (the values of the
 .I \ecount0
 register) instead of physical pages for the pagelist labels and
@@ -1686,12 +1686,12 @@
 keystroke.
 .\"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 .TP
-.BI \-version
+.B \-version
 Print information on the version of
 .BR xdvi .
 .\"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 .TP
-.BI \-visitedlinkcolor
+.B \-visitedlinkcolor
 .RB ( .visitedLinkColor )
 Color used for visited hyperlinks (`Purple4' by default). Hyperlinks become
 visited once you click on them. As for
@@ -1966,7 +1966,7 @@
 history items.
 .\"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 .TP
-.BR ^
+.B ^
 .RB [ home() ]
 Move to the ``home'' position of the page.  This is normally the upper
 left-hand corner of the page, depending on the margins as described in the
@@ -3267,7 +3267,7 @@
 stay open after the
 .B dvips
 process has terminated. The value of
-.BR dvipsHangTime
+.B dvipsHangTime
 is used if the process terminates successfully;
 .B dvipsFailHangTime
 is used if it terminates with an error. The default values are 1.5 and 5 seconds, respectively.
@@ -4112,7 +4112,7 @@
 .IR %s ,
 which will be replaced by the file name.
 .TP
-.BI needsterminal
+.B needsterminal
 If this flag is used, the command will be executed in a new xterm
 window by prepending
 .RI `` "xterm -e "''
-------------- next part --------------
---
 texk/dvisvgm/dvisvgm-src/src/Makefile.am |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

--- texlive-bin.orig/texk/dvisvgm/dvisvgm-src/src/Makefile.am
+++ texlive-bin/texk/dvisvgm/dvisvgm-src/src/Makefile.am
@@ -17,14 +17,14 @@ dvisvgm_srcdir = $(top_srcdir)/dvisvgm-s
 dvisvgm_LDADD = \
 	$(noinst_LIBRARIES) \
 	../libs/clipper/libclipper.a \
-	$(POTRACE_LIBS) \
-	$(XXHASH_LIBS)
+	-lpotrace \
+	-lxxhash
 
 if ENABLE_WOFF
 dvisvgm_LDADD += \
 	../libs/ff-woff/libfontforge.a \
-	$(WOFF2_LIBS) \
-	$(BROTLI_LIBS)
+	-lwoff2enc -lwoff2dec -lwoff2common \
+	-lbrotlienc -lbrotlidec -lbrotlicommon
 endif
 
 if USE_BUNDLED_MD5
@@ -38,7 +38,7 @@ dvisvgm_LDADD += \
 	$(FREETYPE2_LIBS) \
 	$(FONTFORGE_LIBS) \
 	$(ZLIB_LIBS) \
-	$(LIBGS_LIBS)
+	-lgs
 
 dvisvgm_DEPENDENCIES = $(noinst_LIBRARIES)
 dvisvgm_DEPENDENCIES += $(KPATHSEA_DEPEND) $(ZLIB_DEPEND) $(FREETYPE2_DEPEND)


More information about the tlbuild mailing list