Attachment #226895 for bug #257576

View | Details | Raw Unified | Return to bug 257576
Collapse All | Expand All

Lines 65-70 SHEBANG_FILES= texk/texlive/linked_scripts/accfonts/mkt1font \ Link Here

(-)b/print/texlive-base/Makefile (-1 / +19 lines)
65	texk/texlive/linked_scripts/urlbst/urlbst \	65	texk/texlive/linked_scripts/urlbst/urlbst \
66	texk/texlive/linked_scripts/yplan/yplan	66	texk/texlive/linked_scripts/yplan/yplan
67		67
		68	BINARY_ALIAS= freetype-config=true
		69
68	# during build phase gnu configure is run a lot	70	# during build phase gnu configure is run a lot
69	GNU_CONFIGURE= yes	71	GNU_CONFIGURE= yes
70	CONFIGURE_ARGS= --disable-native-texlive-build \	72	CONFIGURE_ARGS= --disable-native-texlive-build \
Lines 128-134 post-patch: Link Here
128	tl_scripts/texconfig-sys.sh \	130	tl_scripts/texconfig-sys.sh \
129	linked_scripts/texlive/updmap-sys.sh	131	linked_scripts/texlive/updmap-sys.sh
130	${REINPLACE_CMD} -e 's\|/usr/bin/python -O\|${python_CMD}\|' \	132	${REINPLACE_CMD} -e 's\|/usr/bin/python -O\|${python_CMD}\|' \
131	${WRKSRC}/texk/texlive/linked_scripts/de-macro/de-macro \	133	${WRKSRC}/texk/texlive/linked_scripts/de-macro/de-macro
		134	${REINPLACE_CMD} -e 's\|%%FREETYPE2_PORT_INCLUDES%%\|-I${LOCALBASE}/include/freetype2\|g' \
		135	${PATCH_WRKSRC}/configure
		136	${REINPLACE_CMD} -e 's\|%%FREETYPE2_PORT_LIBS%%\|-L${LOCALBASE}/lib -lfreetype\|g' \
		137	${PATCH_WRKSRC}/configure
		138	${REINPLACE_CMD} -e 's\|%%FREETYPE2_PORT_INCLUDES%%\|-I${LOCALBASE}/include/freetype2\|g' \
		139	${PATCH_WRKSRC}/texk/dvipng/configure
		140	${REINPLACE_CMD} -e 's\|%%FREETYPE2_PORT_LIBS%%\|-L${LOCALBASE}/lib -lfreetype\|g' \
		141	${PATCH_WRKSRC}/texk/dvipng/configure
		142	${REINPLACE_CMD} -e 's\|%%FREETYPE2_PORT_INCLUDES%%\|-I${LOCALBASE}/include/freetype2\|g' \
		143	${PATCH_WRKSRC}/texk/ttf2pk2/configure
		144	${REINPLACE_CMD} -e 's\|%%FREETYPE2_PORT_LIBS%%\|-L${LOCALBASE}/lib -lfreetype\|g' \
		145	${PATCH_WRKSRC}/texk/ttf2pk2/configure
		146	${REINPLACE_CMD} -e 's\|%%FREETYPE2_PORT_INCLUDES%%\|-I${LOCALBASE}/include/freetype2\|g' \
		147	${PATCH_WRKSRC}/texk/dvisvgm/configure
		148	${REINPLACE_CMD} -e 's\|%%FREETYPE2_PORT_LIBS%%\|-L${LOCALBASE}/lib -lfreetype\|g' \
		149	${PATCH_WRKSRC}/texk/dvisvgm/configure
132		150
133	post-install-fmtutil:	151	post-install-fmtutil:
134	for D in ${TEXHASHDIRS}; do \	152	for D in ${TEXHASHDIRS}; do \




--- configure.orig	2015-04-12 11:22:39 UTC
+++ configure
@@ -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

+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
 }
@@ -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
 




--- 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




--- 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




--- 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

Return to bug 257576

Lines 1-6 Link Here

(-)b/print/texlive-base/files/patch-configure (-4 / +16 lines)
1	--- configure.orig 2015-04-12 11:22:39 UTC	1	--- configure.orig 2015-04-12 11:22:39 UTC
2	+++ configure	2	+++ configure
3	@@ -5685,6 +5685,15 @@ $as_echo "$as_me: -> installed \`zlib	3	@@ -5685,7 +5685,16 @@ $as_echo "$as_me: -> installed \`zlib' headers and
4	as_fn_error $? "Sorry, \`--with-system-teckit' requires \`--with-system-zlib'" "$LINENO" 5	4	as_fn_error $? "Sorry, \`--with-system-teckit' requires \`--with-system-zlib'" "$LINENO" 5
5	fi	5	fi
6	fi	6	fi
Lines 8-22 Link Here
8	+if test "${with_teckit_includes+set}" = set; then :	8	+if test "${with_teckit_includes+set}" = set; then :
9	+ withval=$with_teckit_includes;	9	+ withval=$with_teckit_includes;
10	+fi	10	+fi
11	+	11
12	+# Check whether --with-teckit-libdir was given.	12	+# Check whether --with-teckit-libdir was given.
13	+if test "${with_teckit_libdir+set}" = set; then :	13	+if test "${with_teckit_libdir+set}" = set; then :
14	+ withval=$with_teckit_libdir;	14	+ withval=$with_teckit_libdir;
15	+fi	15	+fi
16		16	+
17	test "x$need_teckit" = xyes && {	17	test "x$need_teckit" = xyes && {
18	need_zlib=yes	18	need_zlib=yes
19	@@ -21284,11 +21293,12 @@ elif test "x$need_graphite2:$with_system	19	}
		20	@@ -21198,8 +21207,8 @@ else
		21	FT2_CONFIG="$ac_cv_prog_FT2_CONFIG"
		22	fi
		23	if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
		24	- FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
		25	- FREETYPE2_LIBS=`$FT2_CONFIG --libs`
		26	+ FREETYPE2_INCLUDES="%%FREETYPE2_PORT_INCLUDES%%"
		27	+ FREETYPE2_LIBS="%%FREETYPE2_PORT_LIBS%%"
		28	elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
		29	as_fn_error $? "did not find freetype-config required for system freetype2 library" "$LINENO" 5
		30	fi
		31	@@ -21284,11 +21293,12 @@ elif test "x$need_graphite2:$with_system_graphite2" =
20	as_fn_error $? "did not find graphite2" "$LINENO" 5	32	as_fn_error $? "did not find graphite2" "$LINENO" 5
21	fi	33	fi
22		34

Added Link Here

(-)b/print/texlive-base/files/patch-texk_dvipng_configure (+13 lines)
1	--- texk/dvipng/configure.orig 2021-08-02 22:16:56 UTC
2	+++ texk/dvipng/configure
3	@@ -16273,8 +16273,8 @@ else
4	FT2_CONFIG="$ac_cv_prog_FT2_CONFIG"
5	fi
6	if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
7	- FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
8	- FREETYPE2_LIBS=`$FT2_CONFIG --libs`
9	+ FREETYPE2_INCLUDES="%%FREETYPE2_PORT_INCLUDES%%"
10	+ FREETYPE2_LIBS="%%FREETYPE2_PORT_LIBS%%"
11	elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
12	as_fn_error $? "did not find freetype-config required for system freetype2 library" "$LINENO" 5
13	fi

Added Link Here

(-)b/print/texlive-base/files/patch-texk_dvisvgm_configure (+13 lines)
1	--- texk/dvisvgm/configure.orig 2021-08-02 22:17:20 UTC
2	+++ texk/dvisvgm/configure
3	@@ -19748,8 +19748,8 @@ else
4	FT2_CONFIG="$ac_cv_prog_FT2_CONFIG"
5	fi
6	if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
7	- FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
8	- FREETYPE2_LIBS=`$FT2_CONFIG --libs`
9	+ FREETYPE2_INCLUDES="%%FREETYPE2_PORT_INCLUDES%%"
10	+ FREETYPE2_LIBS="%%FREETYPE2_PORT_LIBS%%"
11	elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
12	as_fn_error $? "did not find freetype-config required for system freetype2 library" "$LINENO" 5
13	fi

Added Link Here

(-)b/print/texlive-base/files/patch-texk_ttf2pk2_configure (+13 lines)
1	--- texk/ttf2pk2/configure.orig 2021-08-02 22:17:04 UTC
2	+++ texk/ttf2pk2/configure
3	@@ -15108,8 +15108,8 @@ else
4	FT2_CONFIG="$ac_cv_prog_FT2_CONFIG"
5	fi
6	if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
7	- FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
8	- FREETYPE2_LIBS=`$FT2_CONFIG --libs`
9	+ FREETYPE2_INCLUDES="%%FREETYPE2_PORT_INCLUDES%%"
10	+ FREETYPE2_LIBS="%%FREETYPE2_PORT_LIBS%%"
11	elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
12	as_fn_error $? "did not find freetype-config required for system freetype2 library" "$LINENO" 5
13	fi