Revert "Update to freetype-2.13.2."

This reverts commit 5ad1e5f6054dd1e44ecb955b9326c1198ef17ff0.

configure runs make and crashes on a stack overflow in make.
This commit is contained in:
Jonas 'Sortie' Termansen 2024-01-24 14:18:00 +01:00
parent 13a79d908b
commit abdfa77ba8
2 changed files with 12 additions and 47 deletions

View File

@ -1,59 +1,24 @@
diff -Paur --no-dereference -- libfreetype.upstream/builds/unix/configure libfreetype/builds/unix/configure
--- libfreetype.upstream/builds/unix/configure
+++ libfreetype/builds/unix/configure
@@ -14363,56 +14363,8 @@
@@ -14377,21 +14377,8 @@
libpng_libsstaticconf="$LIBPNG_LIBS"
have_libpng="yes (LIBPNG_CFLAGS and LIBPNG_LIBS)"
else
- # fall back to config script
- # Extract the first word of "libpng-config", so it can be a program name with args.
-set dummy libpng-config; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_have_libpng+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
- if test -n "$have_libpng"; then
- ac_cv_prog_have_libpng="$have_libpng" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
- ac_cv_prog_have_libpng="yes (libpng-config)"
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- test -z "$ac_cv_prog_have_libpng" && ac_cv_prog_have_libpng="no"
-fi
-fi
-have_libpng=$ac_cv_prog_have_libpng
-if test -n "$have_libpng"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $have_libpng" >&5
-printf "%s\n" "$have_libpng" >&6; }
-else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-
- if test "$have_libpng" != no; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libpng-config" >&5
-printf %s "checking for libpng-config... " >&6; }
- if which libpng-config > /dev/null 2>&1; then
- LIBPNG_CFLAGS=`libpng-config --cflags`
- LIBPNG_LIBS=`libpng-config --ldflags`
- libpng_libspriv=`libpng-config --static --ldflags`
- libpng_libsstaticconf="$libpng_libspriv"
- have_libpng="yes (libpng-config)"
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
- else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
- fi
+ # PATCH: libpng-config should never be used.
+ :

View File

@ -1,10 +1,10 @@
NAME=libfreetype
BUILD_LIBRARIES='libz libbz2? libpng? libbrotli? libharfbuzz? librsvg?'
VERSION=2.13.2
VERSION=2.12.1
DISTNAME=freetype-$VERSION
COMPRESSION=tar.xz
ARCHIVE=$DISTNAME.$COMPRESSION
SHA256SUM=12991c4e55c506dd7f9b765933e62fd2be2e06d421505d7950a132e4f1bb484d
SHA256SUM=4766f20157cc4cf0cd292f80bf917f92d1c439b243ac3018debf6b9140c41a7f
UPSTREAM_SITE=https://download.savannah.gnu.org/releases/freetype
UPSTREAM_ARCHIVE=$ARCHIVE
LICENSE='FTL OR GPL-2.0-or-later'