Attachment 226895 Details for Bug 257576 – Patch for texlive-base

[patch] Patch for texlive-base

texlive-take3.patch (text/plain), 5.82 KB, created by Daniel Engberg on 2021-08-02 23:13:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Engberg

Created: 2021-08-02 23:13:17 UTC

Size: 5.82 KB

patch

obsolete

>diff --git a/print/texlive-base/Makefile b/print/texlive-base/Makefile
>index 84c45b3787a0..b94162885b16 100644
>--- a/print/texlive-base/Makefile
>+++ b/print/texlive-base/Makefile
>@@ -65,6 +65,8 @@ SHEBANG_FILES=	texk/texlive/linked_scripts/accfonts/mkt1font \
> 	texk/texlive/linked_scripts/urlbst/urlbst \
> 	texk/texlive/linked_scripts/yplan/yplan
> 
>+BINARY_ALIAS=	freetype-config=true
>+
> # during build phase gnu configure is run a lot
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS= --disable-native-texlive-build \
>@@ -128,7 +130,23 @@ post-patch:
> 	    tl_scripts/texconfig-sys.sh \
> 	    linked_scripts/texlive/updmap-sys.sh
> 	${REINPLACE_CMD} -e 's|/usr/bin/python -O|${python_CMD}|' \
>-		${WRKSRC}/texk/texlive/linked_scripts/de-macro/de-macro \
>+		${WRKSRC}/texk/texlive/linked_scripts/de-macro/de-macro
>+	${REINPLACE_CMD} -e 's|%%FREETYPE2_PORT_INCLUDES%%|-I${LOCALBASE}/include/freetype2|g' \
>+		${PATCH_WRKSRC}/configure
>+	${REINPLACE_CMD} -e 's|%%FREETYPE2_PORT_LIBS%%|-L${LOCALBASE}/lib -lfreetype|g' \
>+		${PATCH_WRKSRC}/configure
>+	${REINPLACE_CMD} -e 's|%%FREETYPE2_PORT_INCLUDES%%|-I${LOCALBASE}/include/freetype2|g' \
>+		${PATCH_WRKSRC}/texk/dvipng/configure
>+	${REINPLACE_CMD} -e 's|%%FREETYPE2_PORT_LIBS%%|-L${LOCALBASE}/lib -lfreetype|g' \
>+		${PATCH_WRKSRC}/texk/dvipng/configure
>+	${REINPLACE_CMD} -e 's|%%FREETYPE2_PORT_INCLUDES%%|-I${LOCALBASE}/include/freetype2|g' \
>+		${PATCH_WRKSRC}/texk/ttf2pk2/configure
>+	${REINPLACE_CMD} -e 's|%%FREETYPE2_PORT_LIBS%%|-L${LOCALBASE}/lib -lfreetype|g' \
>+		${PATCH_WRKSRC}/texk/ttf2pk2/configure
>+	${REINPLACE_CMD} -e 's|%%FREETYPE2_PORT_INCLUDES%%|-I${LOCALBASE}/include/freetype2|g' \
>+		${PATCH_WRKSRC}/texk/dvisvgm/configure
>+	${REINPLACE_CMD} -e 's|%%FREETYPE2_PORT_LIBS%%|-L${LOCALBASE}/lib -lfreetype|g' \
>+		${PATCH_WRKSRC}/texk/dvisvgm/configure
> 
> post-install-fmtutil:
> 	for D in ${TEXHASHDIRS}; do \
>diff --git a/print/texlive-base/files/patch-configure b/print/texlive-base/files/patch-configure
>index 429162c7401d..1131902a55bf 100644
>--- a/print/texlive-base/files/patch-configure
>+++ b/print/texlive-base/files/patch-configure
>@@ -1,6 +1,6 @@
> --- configure.orig	2015-04-12 11:22:39 UTC
> +++ configure
>-@@ -5685,6 +5685,15 @@ $as_echo "$as_me:   ->  installed \`zlib
>+@@ -5685,7 +5685,16 @@ $as_echo "$as_me:   ->  installed \`zlib' headers and 
>      as_fn_error $? "Sorry, \`--with-system-teckit' requires \`--with-system-zlib'" "$LINENO" 5
>    fi
>  fi
>@@ -8,15 +8,27 @@
> +if test "${with_teckit_includes+set}" = set; then :
> +  withval=$with_teckit_includes;
> +fi
>-+
>+ 
> +# Check whether --with-teckit-libdir was given.
> +if test "${with_teckit_libdir+set}" = set; then :
> +  withval=$with_teckit_libdir;
> +fi
>- 
>++
>  test "x$need_teckit" = xyes && {
>    need_zlib=yes
>-@@ -21284,11 +21293,12 @@ elif test "x$need_graphite2:$with_system
>+ }
>+@@ -21198,8 +21207,8 @@ else
>+   FT2_CONFIG="$ac_cv_prog_FT2_CONFIG"
>+ fi
>+ if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
>+-  FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
>+-  FREETYPE2_LIBS=`$FT2_CONFIG --libs`
>++  FREETYPE2_INCLUDES="%%FREETYPE2_PORT_INCLUDES%%"
>++  FREETYPE2_LIBS="%%FREETYPE2_PORT_LIBS%%"
>+ elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
>+   as_fn_error $? "did not find freetype-config required for system freetype2 library" "$LINENO" 5
>+ fi
>+@@ -21284,11 +21293,12 @@ elif test "x$need_graphite2:$with_system_graphite2" = 
>    as_fn_error $? "did not find graphite2" "$LINENO" 5
>  fi
>  
>diff --git a/print/texlive-base/files/patch-texk_dvipng_configure b/print/texlive-base/files/patch-texk_dvipng_configure
>new file mode 100644
>index 000000000000..18637b8ad60e
>--- /dev/null
>+++ b/print/texlive-base/files/patch-texk_dvipng_configure
>@@ -0,0 +1,13 @@
>+--- texk/dvipng/configure.orig	2021-08-02 22:16:56 UTC
>++++ texk/dvipng/configure
>+@@ -16273,8 +16273,8 @@ else
>+   FT2_CONFIG="$ac_cv_prog_FT2_CONFIG"
>+ fi
>+ if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
>+-  FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
>+-  FREETYPE2_LIBS=`$FT2_CONFIG --libs`
>++  FREETYPE2_INCLUDES="%%FREETYPE2_PORT_INCLUDES%%"
>++  FREETYPE2_LIBS="%%FREETYPE2_PORT_LIBS%%"
>+ elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
>+   as_fn_error $? "did not find freetype-config required for system freetype2 library" "$LINENO" 5
>+ fi
>diff --git a/print/texlive-base/files/patch-texk_dvisvgm_configure b/print/texlive-base/files/patch-texk_dvisvgm_configure
>new file mode 100644
>index 000000000000..77e9226ab07d
>--- /dev/null
>+++ b/print/texlive-base/files/patch-texk_dvisvgm_configure
>@@ -0,0 +1,13 @@
>+--- texk/dvisvgm/configure.orig	2021-08-02 22:17:20 UTC
>++++ texk/dvisvgm/configure
>+@@ -19748,8 +19748,8 @@ else
>+   FT2_CONFIG="$ac_cv_prog_FT2_CONFIG"
>+ fi
>+ if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
>+-  FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
>+-  FREETYPE2_LIBS=`$FT2_CONFIG --libs`
>++  FREETYPE2_INCLUDES="%%FREETYPE2_PORT_INCLUDES%%"
>++  FREETYPE2_LIBS="%%FREETYPE2_PORT_LIBS%%"
>+ elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
>+   as_fn_error $? "did not find freetype-config required for system freetype2 library" "$LINENO" 5
>+ fi
>diff --git a/print/texlive-base/files/patch-texk_ttf2pk2_configure b/print/texlive-base/files/patch-texk_ttf2pk2_configure
>new file mode 100644
>index 000000000000..96893e26d446
>--- /dev/null
>+++ b/print/texlive-base/files/patch-texk_ttf2pk2_configure
>@@ -0,0 +1,13 @@
>+--- texk/ttf2pk2/configure.orig	2021-08-02 22:17:04 UTC
>++++ texk/ttf2pk2/configure
>+@@ -15108,8 +15108,8 @@ else
>+   FT2_CONFIG="$ac_cv_prog_FT2_CONFIG"
>+ fi
>+ if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
>+-  FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
>+-  FREETYPE2_LIBS=`$FT2_CONFIG --libs`
>++  FREETYPE2_INCLUDES="%%FREETYPE2_PORT_INCLUDES%%"
>++  FREETYPE2_LIBS="%%FREETYPE2_PORT_LIBS%%"
>+ elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
>+   as_fn_error $? "did not find freetype-config required for system freetype2 library" "$LINENO" 5
>+ fi

Actions: View | Diff

Attachments on bug 257576: 226895