commit c179549671277888a8a8eb992fb7fd26390cde90 Author: Marcin Krol <h...@tld-linux.org> Date: Sun Dec 3 17:27:16 2023 +0100
- updated autoconf stuff freetype-autoconf.patch | 173 +++++++++++++++++++++++++++++++++++++++++++----- freetype1-link.patch | 10 --- 2 files changed, 158 insertions(+), 25 deletions(-) --- diff --git a/freetype-autoconf.patch b/freetype-autoconf.patch index c6c44e6..5f37d3c 100644 --- a/freetype-autoconf.patch +++ b/freetype-autoconf.patch @@ -1,16 +1,27 @@ diff -urN freetype-1.3.1.org/configure.in freetype-1.3.1/configure.in ---- freetype-1.3.1.org/configure.in Fri Apr 12 13:38:29 2002 -+++ freetype-1.3.1/configure.in Fri Apr 12 13:38:43 2002 -@@ -4,6 +4,8 @@ +--- freetype-1.3.1.org/configure.in 1999-09-03 15:09:55.000000000 +0200 ++++ freetype-1.3.1/configure.in 2023-12-03 15:53:38.966698165 +0100 +@@ -2,14 +2,16 @@ + dnl + dnl Process this file with autoconf to produce a configure script. - AC_INIT(lib/freetype.h) - -+AM_INIT_AUTOMAKE(freetype, 1.3.1) +-AC_INIT(lib/freetype.h) ++AC_INIT([freetype],[1.3.1]) + ++AM_INIT_AUTOMAKE + dnl Due to a bug in autoconf we must set $srcdir explicitly to an absolute dnl path. srcdir=`cd $srcdir; pwd` -@@ -17,11 +19,6 @@ + +-AM_DISABLE_STATIC +-AM_PROG_LIBTOOL ++AC_DISABLE_STATIC([]) ++LT_INIT + + dnl FreeType version + freetype_version='1.2.0' +@@ -17,14 +19,6 @@ dnl libttf.so version version_info='4:0:2' @@ -19,10 +30,21 @@ diff -urN freetype-1.3.1.org/configure.in freetype-1.3.1/configure.in - USE_NLS=no, USE_NLS=yes) -AC_SUBST(USE_NLS) - - dnl Checks for system type. - AC_CANONICAL_SYSTEM +-dnl Checks for system type. +-AC_CANONICAL_SYSTEM +- + dnl Checks for programs. + AC_PROG_CC + AC_PROG_CPP +@@ -44,6 +38,7 @@ + esac + fi + AC_SUBST(XX_CFLAGS) ++AC_SUBST(LDFLAGS) -@@ -57,100 +54,8 @@ + dnl at least Digital UNIX 4.0d needs this due to a strange make program + +@@ -57,100 +52,8 @@ AC_SUBST(freetype_version) AC_SUBST(version_info) @@ -121,11 +143,23 @@ diff -urN freetype-1.3.1.org/configure.in freetype-1.3.1/configure.in -fi - +ALL_LINGUAS="cs de es fr nl" -+AM_GNU_GETTEXT ++AM_GNU_GETTEXT([external]) AC_CHECK_PROG(RM, rm, rm) AC_CHECK_PROG(RMDIR, rmdir, rmdir) -@@ -194,8 +99,7 @@ +@@ -184,18 +87,18 @@ + + AC_CHECK_FUNCS(memcpy memmove) + +-AC_CONFIG_HEADER(ft_conf.h) ++AC_CONFIG_HEADERS([ft_conf.h]) + + dnl Another bug: to make --srcdir work correctly we have to create the + dnl directory hierarchy first since autoconf only uses mkdir. + $srcdir/mkinstalldirs lib/arch/unix test/arch/unix + +-AC_OUTPUT(Makefile ++AC_CONFIG_FILES([Makefile MakeSub lib/arch/unix/Makefile test/arch/unix/Makefile @@ -133,12 +167,121 @@ diff -urN freetype-1.3.1.org/configure.in freetype-1.3.1/configure.in - [sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile]) - + po/Makefile.in -+ intl/Makefile) ++ ]) ++AC_OUTPUT + + dnl end of configure.in +diff -urN freetype-1.3.1.org/contrib/ttf2bdf/configure.in freetype-1.3.1/contrib/ttf2bdf/configure.in +--- freetype-1.3.1.org/contrib/ttf2bdf/configure.in 1998-01-14 22:45:26.000000000 +0100 ++++ freetype-1.3.1/contrib/ttf2bdf/configure.in 2023-12-03 17:03:19.985312018 +0100 +@@ -1,7 +1,8 @@ + dnl $Id: configure.in,v 1.1 1998/01/14 21:45:26 mleisher Exp $ + dnl Process this file with autoconf to produce a configure script. + +-AC_INIT(../../lib/freetype.h) ++AC_INIT ++AC_CONFIG_SRCDIR([../../lib/freetype.h]) + + AC_PROG_CC + +@@ -31,10 +32,13 @@ + AC_CHECK_PROG(RM, rm, rm) + + dnl Checks for header files. +-AC_HEADER_STDC ++AC_CHECK_INCLUDES_DEFAULT ++AC_PROG_EGREP ++ + AC_CHECK_HEADERS(unistd.h) + + dnl Checks for library functions. + AC_FUNC_MEMCMP + +-AC_OUTPUT(Makefile) ++AC_CONFIG_FILES([Makefile]) ++AC_OUTPUT +diff -urN freetype-1.3.1.org/contrib/ttf2pfb/configure.in freetype-1.3.1/contrib/ttf2pfb/configure.in +--- freetype-1.3.1.org/contrib/ttf2pfb/configure.in 1999-03-02 18:34:16.000000000 +0100 ++++ freetype-1.3.1/contrib/ttf2pfb/configure.in 2023-12-03 17:03:29.788431544 +0100 +@@ -1,8 +1,9 @@ + dnl Process this file with autoconf to produce a configure script. + +-AC_INIT(../../lib/freetype.h) ++AC_INIT ++AC_CONFIG_SRCDIR([../../lib/freetype.h]) + +-AC_CANONICAL_SYSTEM ++AC_CANONICAL_TARGET + + AC_PROG_CC + AC_PROG_CPP +@@ -37,9 +38,12 @@ + AC_STRUCT_TM + + dnl Checks for header files. +-AC_HEADER_STDC ++AC_CHECK_INCLUDES_DEFAULT ++AC_PROG_EGREP ++ + AC_CHECK_HEADERS(unistd.h) + +-AC_OUTPUT(Makefile) ++AC_CONFIG_FILES([Makefile]) ++AC_OUTPUT + + dnl end of configure.in +diff -urN freetype-1.3.1.org/contrib/ttf2pk/configure.in freetype-1.3.1/contrib/ttf2pk/configure.in +--- freetype-1.3.1.org/contrib/ttf2pk/configure.in 1999-06-10 23:51:36.000000000 +0200 ++++ freetype-1.3.1/contrib/ttf2pk/configure.in 2023-12-03 17:01:47.867188847 +0100 +@@ -5,9 +5,10 @@ + dnl Some tests are omitted since we assume that you've built the + dnl FreeType library successfully. + +-AC_INIT(../../lib/freetype.h) ++AC_INIT ++AC_CONFIG_SRCDIR([../../lib/freetype.h]) + +-AC_CANONICAL_SYSTEM ++AC_CANONICAL_TARGET + + AC_PROG_CC + AC_PROG_CPP +@@ -82,6 +83,7 @@ + ]) + fi + +-AC_OUTPUT(Makefile MakeSub) ++AC_CONFIG_FILES([Makefile MakeSub]) ++AC_OUTPUT + + dnl end of configure.in +diff -urN freetype-1.3.1.org/contrib/ttfbanner/configure.in freetype-1.3.1/contrib/ttfbanner/configure.in +--- freetype-1.3.1.org/contrib/ttfbanner/configure.in 1998-12-30 18:54:37.000000000 +0100 ++++ freetype-1.3.1/contrib/ttfbanner/configure.in 2023-12-03 16:59:03.894189572 +0100 +@@ -1,8 +1,9 @@ + dnl Process this file with autoconf to produce a configure script. + +-AC_INIT(../../lib/freetype.h) ++AC_INIT ++AC_CONFIG_SRCDIR([../../lib/freetype.h]) + +-AC_CANONICAL_SYSTEM ++AC_CANONICAL_TARGET + + AC_PROG_CC + AC_PROG_CPP +@@ -33,6 +34,7 @@ + AC_CHECK_PROG(RM, rm, rm) + AC_PROG_INSTALL + +-AC_OUTPUT(Makefile) ++AC_CONFIG_FILES([Makefile]) ++AC_OUTPUT dnl end of configure.in diff -urN freetype-1.3.1.org/lib/arch/unix/Makefile.in freetype-1.3.1/lib/arch/unix/Makefile.in ---- freetype-1.3.1.org/lib/arch/unix/Makefile.in Fri Apr 12 13:38:30 2002 -+++ freetype-1.3.1/lib/arch/unix/Makefile.in Fri Apr 12 13:42:10 2002 +--- freetype-1.3.1.org/lib/arch/unix/Makefile.in 2023-12-03 15:58:46.892394657 +0100 ++++ freetype-1.3.1/lib/arch/unix/Makefile.in 2023-12-03 15:59:03.767597237 +0100 @@ -132,7 +132,7 @@ FT_LIBS = @LIBS@ diff --git a/freetype1-link.patch b/freetype1-link.patch index 30c4ee7..d9a2b79 100644 --- a/freetype1-link.patch +++ b/freetype1-link.patch @@ -40,13 +40,3 @@ #PROCESS = $(CC) $(FT_CFLAGS) LIBTTF = $(top_builddir)/lib/libttf.la ---- freetype-1.3.1/configure.in.orig 2009-10-08 16:52:50.204105629 +0200 -+++ freetype-1.3.1/configure.in 2009-10-08 17:00:45.140723630 +0200 -@@ -41,6 +41,7 @@ else - esac - fi - AC_SUBST(XX_CFLAGS) -+AC_SUBST(LDFLAGS) - - dnl at least Digital UNIX 4.0d needs this due to a strange make program - ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/freetype1.git/commitdiff/718cdb2118cd27e1be686d0d51a11f34226370a8 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit