From 04e4d2d91175f90f86171648623f8c55d04e7529 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Fri, 10 Jan 2014 10:41:51 +0000 Subject: build system: Fix freetype2 dependencies git-svn-id: svn://tug.org/texlive/trunk@32625 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/libs/gd/configure | 4 ++-- Build/source/libs/harfbuzz/configure | 4 ++-- Build/source/m4/ChangeLog | 4 ++++ Build/source/m4/kpse-freetype2-flags.m4 | 4 ++-- Build/source/texk/dvipdfm-x/configure | 4 ++-- Build/source/texk/dvipng/configure | 4 ++-- Build/source/texk/dvisvgm/configure | 4 ++-- Build/source/texk/ttf2pk2/configure | 4 ++-- Build/source/texk/web2c/configure | 4 ++-- Build/source/texk/web2c/omegaware/ChangeLog | 4 ++++ Build/source/texk/web2c/omegaware/opl2ofm.up | 8 ++++---- Build/source/texk/web2c/omegaware/ovp2ovf.up | 14 +++++++------- Build/source/texk/xdvik/configure | 4 ++-- 13 files changed, 37 insertions(+), 29 deletions(-) (limited to 'Build/source') diff --git a/Build/source/libs/gd/configure b/Build/source/libs/gd/configure index 898937d9869..c25c958e5ba 100755 --- a/Build/source/libs/gd/configure +++ b/Build/source/libs/gd/configure @@ -5844,9 +5844,9 @@ else FREETYPE2_LIBS="$kpse_BLD/libs/freetype2/libfreetype.a" FREETYPE2_DEPEND='${top_builddir}/../../libs/freetype2/libfreetype.a' FREETYPE2_RULE='# Rebuild libfreetype -$(FREETYPE2_DEPEND): ${top_builddir}/../../libs/freetype2/ft2build.h +$(FREETYPE2_DEPEND): ${top_builddir}/../../libs/freetype2/freetype2/ft2build.h cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS) rebuild -${top_builddir}/../../libs/freetype2/ft2build.h: +${top_builddir}/../../libs/freetype2/freetype2/ft2build.h: cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS) rebuild' fi diff --git a/Build/source/libs/harfbuzz/configure b/Build/source/libs/harfbuzz/configure index c995533c8cb..5026c2f4a05 100755 --- a/Build/source/libs/harfbuzz/configure +++ b/Build/source/libs/harfbuzz/configure @@ -5567,9 +5567,9 @@ else FREETYPE2_LIBS="$kpse_BLD/libs/freetype2/libfreetype.a" FREETYPE2_DEPEND='${top_builddir}/../../libs/freetype2/libfreetype.a' FREETYPE2_RULE='# Rebuild libfreetype -$(FREETYPE2_DEPEND): ${top_builddir}/../../libs/freetype2/ft2build.h +$(FREETYPE2_DEPEND): ${top_builddir}/../../libs/freetype2/freetype2/ft2build.h cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS) rebuild -${top_builddir}/../../libs/freetype2/ft2build.h: +${top_builddir}/../../libs/freetype2/freetype2/ft2build.h: cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS) rebuild' fi diff --git a/Build/source/m4/ChangeLog b/Build/source/m4/ChangeLog index c33ea7c8892..3d088b9f4ba 100644 --- a/Build/source/m4/ChangeLog +++ b/Build/source/m4/ChangeLog @@ -1,3 +1,7 @@ +2014-01-10 Peter Breitenlohner + + * kpse-freetype2-flags.m4: Correct location of ft2build.h. + 2013-12-20 Peter Breitenlohner * kpse-pkgs.m4 (kpse_utils_pkgs): Add songs. diff --git a/Build/source/m4/kpse-freetype2-flags.m4 b/Build/source/m4/kpse-freetype2-flags.m4 index 69f60bc599e..9c83475bb9c 100644 --- a/Build/source/m4/kpse-freetype2-flags.m4 +++ b/Build/source/m4/kpse-freetype2-flags.m4 @@ -1,5 +1,5 @@ # Public macros for the TeX Live (TL) tree. -# Copyright (C) 2009-2013 Peter Breitenlohner +# Copyright (C) 2009-2014 Peter Breitenlohner # # This file is free software; the copyright holder # gives unlimited permission to copy and/or distribute it, @@ -16,7 +16,7 @@ AC_REQUIRE([KPSE_ZLIB_FLAGS])[]dnl _KPSE_LIB_FLAGS([freetype2], [freetype], [], [-IBLD/libs/freetype2/freetype2], [BLD/libs/freetype2/libfreetype.a], [], - [], [${top_builddir}/../../libs/freetype2/ft2build.h])[]dnl + [], [${top_builddir}/../../libs/freetype2/freetype2/ft2build.h])[]dnl ]) # KPSE_FREETYPE2_FLAGS # KPSE_FREETYPE2_OPTIONS([WITH-SYSTEM]) diff --git a/Build/source/texk/dvipdfm-x/configure b/Build/source/texk/dvipdfm-x/configure index 34cd12a70d2..2236507c430 100755 --- a/Build/source/texk/dvipdfm-x/configure +++ b/Build/source/texk/dvipdfm-x/configure @@ -15619,9 +15619,9 @@ else FREETYPE2_LIBS="$kpse_BLD/libs/freetype2/libfreetype.a" FREETYPE2_DEPEND='${top_builddir}/../../libs/freetype2/libfreetype.a' FREETYPE2_RULE='# Rebuild libfreetype -$(FREETYPE2_DEPEND): ${top_builddir}/../../libs/freetype2/ft2build.h +$(FREETYPE2_DEPEND): ${top_builddir}/../../libs/freetype2/freetype2/ft2build.h cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS) rebuild -${top_builddir}/../../libs/freetype2/ft2build.h: +${top_builddir}/../../libs/freetype2/freetype2/ft2build.h: cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS) rebuild' fi diff --git a/Build/source/texk/dvipng/configure b/Build/source/texk/dvipng/configure index affb7932a53..2d5439e897b 100755 --- a/Build/source/texk/dvipng/configure +++ b/Build/source/texk/dvipng/configure @@ -16285,9 +16285,9 @@ else FREETYPE2_LIBS="$kpse_BLD/libs/freetype2/libfreetype.a" FREETYPE2_DEPEND='${top_builddir}/../../libs/freetype2/libfreetype.a' FREETYPE2_RULE='# Rebuild libfreetype -$(FREETYPE2_DEPEND): ${top_builddir}/../../libs/freetype2/ft2build.h +$(FREETYPE2_DEPEND): ${top_builddir}/../../libs/freetype2/freetype2/ft2build.h cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS) rebuild -${top_builddir}/../../libs/freetype2/ft2build.h: +${top_builddir}/../../libs/freetype2/freetype2/ft2build.h: cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS) rebuild' fi diff --git a/Build/source/texk/dvisvgm/configure b/Build/source/texk/dvisvgm/configure index 3bcebe7a342..2522eb205f7 100755 --- a/Build/source/texk/dvisvgm/configure +++ b/Build/source/texk/dvisvgm/configure @@ -19249,9 +19249,9 @@ else FREETYPE2_LIBS="$kpse_BLD/libs/freetype2/libfreetype.a" FREETYPE2_DEPEND='${top_builddir}/../../libs/freetype2/libfreetype.a' FREETYPE2_RULE='# Rebuild libfreetype -$(FREETYPE2_DEPEND): ${top_builddir}/../../libs/freetype2/ft2build.h +$(FREETYPE2_DEPEND): ${top_builddir}/../../libs/freetype2/freetype2/ft2build.h cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS) rebuild -${top_builddir}/../../libs/freetype2/ft2build.h: +${top_builddir}/../../libs/freetype2/freetype2/ft2build.h: cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS) rebuild' fi diff --git a/Build/source/texk/ttf2pk2/configure b/Build/source/texk/ttf2pk2/configure index d0328b72998..691859f424f 100755 --- a/Build/source/texk/ttf2pk2/configure +++ b/Build/source/texk/ttf2pk2/configure @@ -14627,9 +14627,9 @@ else FREETYPE2_LIBS="$kpse_BLD/libs/freetype2/libfreetype.a" FREETYPE2_DEPEND='${top_builddir}/../../libs/freetype2/libfreetype.a' FREETYPE2_RULE='# Rebuild libfreetype -$(FREETYPE2_DEPEND): ${top_builddir}/../../libs/freetype2/ft2build.h +$(FREETYPE2_DEPEND): ${top_builddir}/../../libs/freetype2/freetype2/ft2build.h cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS) rebuild -${top_builddir}/../../libs/freetype2/ft2build.h: +${top_builddir}/../../libs/freetype2/freetype2/ft2build.h: cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS) rebuild' fi diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure index 53209b8ceb1..a0792ce0688 100755 --- a/Build/source/texk/web2c/configure +++ b/Build/source/texk/web2c/configure @@ -23211,9 +23211,9 @@ else FREETYPE2_LIBS="$kpse_BLD/libs/freetype2/libfreetype.a" FREETYPE2_DEPEND='${top_builddir}/../../libs/freetype2/libfreetype.a' FREETYPE2_RULE='# Rebuild libfreetype -$(FREETYPE2_DEPEND): ${top_builddir}/../../libs/freetype2/ft2build.h +$(FREETYPE2_DEPEND): ${top_builddir}/../../libs/freetype2/freetype2/ft2build.h cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS) rebuild -${top_builddir}/../../libs/freetype2/ft2build.h: +${top_builddir}/../../libs/freetype2/freetype2/ft2build.h: cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS) rebuild' fi diff --git a/Build/source/texk/web2c/omegaware/ChangeLog b/Build/source/texk/web2c/omegaware/ChangeLog index 6c627f84dd6..a49d65479c9 100644 --- a/Build/source/texk/web2c/omegaware/ChangeLog +++ b/Build/source/texk/web2c/omegaware/ChangeLog @@ -1,3 +1,7 @@ +2014-01-10 Peter Breitenlohner + + * opl2ofm.up, ovp2ovf.up: Update module numbers. + 2014-01-09 Peter Breitenlohner Version 1.13 (January 2014) of OFM2OPL & Co. diff --git a/Build/source/texk/web2c/omegaware/opl2ofm.up b/Build/source/texk/web2c/omegaware/opl2ofm.up index cedd3badb91..f697ab42ba7 100644 --- a/Build/source/texk/web2c/omegaware/opl2ofm.up +++ b/Build/source/texk/web2c/omegaware/opl2ofm.up @@ -48,13 +48,13 @@ get_byte:=acc; begin skip_error('This value shouldn''t exceed "10FFFF'); @z -@x [??] +@x [98] else begin backup; c:=get_byte; @y else begin backup; c:=get_char_code; @z -@x [??] +@x [106] @ @= begin c:=get_byte; @y @@ -62,13 +62,13 @@ begin c:=get_byte; begin c:=get_char_code; @z -@x [??] +@x [116] c:=get_byte; {read the character code that is being specified} @y c:=get_char_code; {read the character code that is being specified} @z -@x [??] +@x [119] c:=get_byte; {read the character code that is being specified} @y c:=get_char_code; {read the character code that is being specified} diff --git a/Build/source/texk/web2c/omegaware/ovp2ovf.up b/Build/source/texk/web2c/omegaware/ovp2ovf.up index 58388680154..9e13ad91d99 100644 --- a/Build/source/texk/web2c/omegaware/ovp2ovf.up +++ b/Build/source/texk/web2c/omegaware/ovp2ovf.up @@ -53,20 +53,20 @@ get_byte:=acc; begin skip_error('This value shouldn''t exceed "10FFFF'); @z -@x [??] +@x [80] for k:=256 to max_char do packet_length[k]:=3; @y for k:=256 to @"FFFF do packet_length[k]:=3; for k:=@"10000 to max_char do packet_length[k]:=4; @z -@x [??] +@x [112] else begin backup; c:=get_byte; @y else begin backup; c:=get_char_code; @z -@x [??] +@x [120] @ @= begin c:=get_byte; @y @@ -74,25 +74,25 @@ begin c:=get_byte; begin c:=get_char_code; @z -@x [??] +@x [130] c:=get_byte; {read the character code that is being specified} @y c:=get_char_code; {read the character code that is being specified} @z -@x [??] +@x [133] c:=get_byte; {read the character code that is being specified} @y c:=get_char_code; {read the character code that is being specified} @z -@x [152] +@x [148] procedure read_packet(@!c:byte); @y procedure read_packet(@!c:integer); @z -@x [156] +@x [151] else begin cc:=get_byte; @y else begin cc:=get_char_code; diff --git a/Build/source/texk/xdvik/configure b/Build/source/texk/xdvik/configure index 48f7fa86bec..b854bcad84f 100755 --- a/Build/source/texk/xdvik/configure +++ b/Build/source/texk/xdvik/configure @@ -18350,9 +18350,9 @@ else FREETYPE2_LIBS="$kpse_BLD/libs/freetype2/libfreetype.a" FREETYPE2_DEPEND='${top_builddir}/../../libs/freetype2/libfreetype.a' FREETYPE2_RULE='# Rebuild libfreetype -$(FREETYPE2_DEPEND): ${top_builddir}/../../libs/freetype2/ft2build.h +$(FREETYPE2_DEPEND): ${top_builddir}/../../libs/freetype2/freetype2/ft2build.h cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS) rebuild -${top_builddir}/../../libs/freetype2/ft2build.h: +${top_builddir}/../../libs/freetype2/freetype2/ft2build.h: cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS) rebuild' fi -- cgit v1.2.3