4f75cf25fd
```sh
git grep -l '^patch_args=-Np0' "srcpkgs/$1*/template" |
while read template; do
for p in ${template%/template}/patches/*; do
sed -i '
\,^[+-][+-][+-] /dev/null,b
/^[*-]\+ [0-9]\+\(,[0-9]\+\)\? [*-]\+$/b
s,^[*][*][*] ,&a/,
/^--- /{
s,\(^--- \)\(./\)*,\1a/,
s,[.-][Oo][Rr][Ii][Gg]\([ /]\),\1,
s/[.-][Oo][Rr][Ii][Gg]$//
s/[.]patched[.]\([^.]\)/.\1/
h
}
/^+++ -/{
g
s/^--- a/+++ b/
b
}
s,\(^+++ \)\(./\)*,\1b/,
' "$p"
done
sed -i '/^patch_args=/d' $template
done
```
102 lines
4.3 KiB
Diff
102 lines
4.3 KiB
Diff
Disables the use of freetype2-config. Does some weird stuff on
|
|
i686, armv5tel, ppc*, etc. No harm caused by disabling it
|
|
everywhere.
|
|
|
|
--- a/texk/dvipng/configure 2020-06-08 10:00:42.953000000 +1000
|
|
+++ b/texk/dvipng/configure 2020-06-08 10:00:57.069000000 +1000
|
|
@@ -16432,10 +16432,7 @@
|
|
else
|
|
PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
|
|
fi
|
|
-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
|
|
+if $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
|
|
--- a/configure 2020-06-08 10:03:04.785000000 +1000
|
|
+++ b/configure 2020-06-08 10:01:47.902000000 +1000
|
|
@@ -21471,10 +21471,7 @@
|
|
else
|
|
PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
|
|
fi
|
|
-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
|
|
+if $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
|
|
--- a/libs/gd/configure 2019-03-26 04:27:50.000000000 +1100
|
|
+++ b/libs/gd/configure 2020-06-08 10:06:28.481000000 +1000
|
|
@@ -5933,10 +5933,7 @@
|
|
else
|
|
PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
|
|
fi
|
|
-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
|
|
+if $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
|
|
--- a/texk/dvisvgm/configure 2020-03-22 09:04:56.000000000 +1100
|
|
+++ b/texk/dvisvgm/configure 2020-06-08 10:08:15.384000000 +1000
|
|
@@ -21794,10 +21794,7 @@
|
|
else
|
|
PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
|
|
fi
|
|
-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
|
|
+if $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
|
|
--- a/texk/xdvik/configure 2020-03-02 06:07:53.000000000 +1100
|
|
+++ b/texk/xdvik/configure 2020-06-08 10:08:15.731000000 +1000
|
|
@@ -19055,10 +19055,7 @@
|
|
else
|
|
PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
|
|
fi
|
|
-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
|
|
+if $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
|
|
--- a/texk/web2c/configure 2020-01-17 09:02:50.000000000 +1100
|
|
+++ b/texk/web2c/configure 2020-06-08 10:08:15.533000000 +1000
|
|
@@ -25346,10 +25346,7 @@
|
|
else
|
|
PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
|
|
fi
|
|
-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
|
|
+if $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
|
|
--- a/texk/ttf2pk2/configure 2019-03-26 04:27:50.000000000 +1100
|
|
+++ b/texk/ttf2pk2/configure 2020-06-08 10:08:15.656000000 +1000
|
|
@@ -15265,10 +15265,7 @@
|
|
else
|
|
PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
|
|
fi
|
|
-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
|
|
+if $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
|