diff options
| author | Ha The Tung | 2018-06-18 11:01:06 +0800 |
|---|---|---|
| committer | William Gathoye | 2018-07-02 14:59:46 +0200 |
| commit | dc2b1e7faf314e797e8ec914f9f3473da10a5602 (patch) | |
| tree | af18e72616c94b68837ea7d43bf046303ba92720 /freetype2.patch | |
| parent | 4f8e6f11a97673afe06d8d6c369cd9f9d4ef92d3 (diff) | |
| download | aur-dc2b1e7faf314e797e8ec914f9f3473da10a5602.tar.gz | |
patch freetype2 using pkg-config instead of freetype-config
Diffstat (limited to 'freetype2.patch')
| -rw-r--r-- | freetype2.patch | 100 |
1 files changed, 100 insertions, 0 deletions
diff --git a/freetype2.patch b/freetype2.patch new file mode 100644 index 000000000000..dfaf7a138db9 --- /dev/null +++ b/freetype2.patch @@ -0,0 +1,100 @@ +--- a/configure.orig ++++ b/configure +@@ -34202,23 +34202,36 @@ $as_echo "If configure fails try --with-xpm-dir=<DIR>" >&6; } + done + + if test -z "$FREETYPE2_DIR"; then +- as_fn_error $? "freetype-config not found." "$LINENO" 5 ++ for i in $PHP_FREETYPE_DIR /usr/local /usr; do ++ if test -f "$i/bin/pkg-config"; then ++ PKGCONFIG_DIR=$i ++ PKGCONFIG_CONFIG="$i/bin/pkg-config" ++ break ++ fi ++ done ++ if test -z "$PKGCONFIG_DIR"; then ++ as_fn_error $? "freetype-config and pkg-config not found." "$LINENO" 5 ++ else ++ FREETYPE2_CFLAGS=`$PKGCONFIG_CONFIG --cflags freetype2` ++ FREETYPE2_LIBS=`$PKGCONFIG_CONFIG --libs freetype2` ++ fi ++ else ++ FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags` ++ FREETYPE2_LIBS=`$FREETYPE2_CONFIG --libs` + fi + +- FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags` +- FREETYPE2_LIBS=`$FREETYPE2_CONFIG --libs` + + +- for ac_i in $FREETYPE2_CFLAGS; do +- case $ac_i in +- -I*) +- ac_ii=`echo $ac_i|cut -c 3-` ++ for ac_i in $FREETYPE2_CFLAGS; do ++ case $ac_i in ++ -I*) ++ ac_ii=`echo $ac_i|cut -c 3-` + +- if test "$ac_ii" != "/usr/include"; then ++ if test "$ac_ii" != "/usr/include"; then + +- if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then +- ai_p=$ac_ii +- else ++ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then ++ ai_p=$ac_ii ++ else + + ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'` + +--- a/configure.orig ++++ b/configure +@@ -35890,23 +35890,34 @@ $as_echo "If configure fails try --with-xpm-dir=<DIR>" >&6; } + done + + if test -z "$FREETYPE2_DIR"; then +- as_fn_error $? "freetype-config not found." "$LINENO" 5 ++ for i in $PHP_FREETYPE_DIR /usr/local /usr; do ++ if test -f "$i/bin/pkg-config"; then ++ PKGCONFIG_DIR=$i ++ PKGCONFIG_CONFIG="$i/bin/pkg-config" ++ break ++ fi ++ done ++ if test -z "$PKGCONFIG_DIR"; then ++ as_fn_error $? "freetype-config and pkg-config not found." "$LINENO" 5 ++ else ++ FREETYPE2_CFLAGS=`$PKGCONFIG_CONFIG --cflags freetype2` ++ FREETYPE2_LIBS=`$PKGCONFIG_CONFIG --libs freetype2` ++ fi ++ else ++ FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags` ++ FREETYPE2_LIBS=`$FREETYPE2_CONFIG --libs` + fi + +- FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags` +- FREETYPE2_LIBS=`$FREETYPE2_CONFIG --libs` ++ for ac_i in $FREETYPE2_CFLAGS; do ++ case $ac_i in ++ -I*) ++ ac_ii=`echo $ac_i|cut -c 3-` + ++ if test "$ac_ii" != "/usr/include"; then + +- for ac_i in $FREETYPE2_CFLAGS; do +- case $ac_i in +- -I*) +- ac_ii=`echo $ac_i|cut -c 3-` +- +- if test "$ac_ii" != "/usr/include"; then +- +- if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then +- ai_p=$ac_ii +- else ++ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then ++ ai_p=$ac_ii ++ else + + ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'` + |