From e80409fae40fafa1fc1303b4b9b5b61b51b61128 Mon Sep 17 00:00:00 2001 From: Leonardo Valeri Manera Date: Wed, 7 May 2008 17:53:59 +0200 Subject: [PATCH] media-libs/fontconfig: add libtool 2.2 breakage patch. --- media-libs/fontconfig/Manifest | 3 +- .../files/fontconfig-2.5.0-libtool-2.2.patch | 76 ++++++++++++++++++++++ media-libs/fontconfig/fontconfig-2.5.0-r1.ebuild | 1 + 3 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 media-libs/fontconfig/files/fontconfig-2.5.0-libtool-2.2.patch diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest index 787ed61..59150e5 100644 --- a/media-libs/fontconfig/Manifest +++ b/media-libs/fontconfig/Manifest @@ -1,8 +1,9 @@ AUX 30-replace-bitmap-fonts.conf 998 RMD160 c139179350c58236ed7b1f0e9f322dfc81210805 SHA1 81f7ab70683de6497d5f62d95d47d11b5d237482 SHA256 de987090fe743b23637d5319f6987e4b3e264626d9d35c6ea5a08daa75aaf10f AUX fontconfig-2.3.2-docbook.patch 506 RMD160 c205d99ecc19866da8d0ac4ef7172dcef98a6299 SHA1 1054f38cef09c93baf34f08253345ca2ae638e4a SHA256 c6480dcf19fec22126a9205fa3d9b317e5a97613f86218cf1926a2a07848afd5 +AUX fontconfig-2.5.0-libtool-2.2.patch 2589 RMD160 36a07e0161c6b2a970de19a090db4f750a519bea SHA1 e0267a4f29c670425861211cf960745021c22b6d SHA256 fce47ca38e8cff70ef7be40493b02b99ff2387a6e141a0e322ec8bfedee5b1a9 AUX fontconfig-2.5.0-ubuntu-3.diff 10753 RMD160 9602f755d319b194e5b0f3f28ca7a15c8ef78ee9 SHA1 f1a731acdee659bb48e8529273ca8b61ebdfd66f SHA256 cc4bf942365426ae614161cd74c3ea59541867fe3c7984c9bfa9d7c79da27d97 AUX fontconfig-hinting-and-alising-confs.patch 2522 RMD160 880821e76889c06920b70b17df9f1133c67e3fc1 SHA1 db3727d0b37f848fa201204eb9719fec636074fa SHA256 a8d3563ac0fa67ee2134534f6be498e788c044960e79264f56f7ef1bf99d07ff AUX fontconfig-lcd-filtering.patch 4687 RMD160 33e66a441c709954f494c8f074a4f42b28a28953 SHA1 a61ab4948cd107214ac88ab9aed4dae503e535dc SHA256 fa78d74e110759b44ca8dd7710bbc010b5a69f8c56a7ef8ba41571c0703e3de0 AUX fontconfig-monospace-lcd-filtering.patch 779 RMD160 a9cc6d358eff28dbf8c70afcaae1a60da07a6429 SHA1 7bd28a6b3b204d8720c7c7f0a30116b99b1b566b SHA256 ee37c48fc2cd015b5dd536905acf472d74011ee11673f459d99e330f9e3a1a13 DIST fontconfig-2.5.0.tar.gz 1385058 RMD160 2c61ba3adc49aa5dd4eb081e13a849cc1d62d9da SHA1 9ffad5f5eb2c5dd277bfed1cafc6e62aa0172842 SHA256 34c6badb4cb7eb496779d30616903de400fa244838ea39c2a7f63eaa5fdf0efe -EBUILD fontconfig-2.5.0-r1.ebuild 3197 RMD160 1634704aa1d0960a2127a505278b2be2f1239e47 SHA1 c7b8dafc5adafd202ad7c8de1e44a59002a9688c SHA256 f5f06dc79ef581ad77a3afd7713b0a7be4fad7d3ca2bdb93a5ac7372910c1ef5 +EBUILD fontconfig-2.5.0-r1.ebuild 3274 RMD160 3935cdada8c9ee8ba702e9cca2933e78cd388385 SHA1 5f8bccff536e23d82cac66ac47416d3f21169959 SHA256 dc8ad3dd230a1d87cf0e85974e7a63f5e5f52789fc1be68121a9327ba60d40f8 diff --git a/media-libs/fontconfig/files/fontconfig-2.5.0-libtool-2.2.patch b/media-libs/fontconfig/files/fontconfig-2.5.0-libtool-2.2.patch new file mode 100644 index 0000000..0da2b30 --- /dev/null +++ b/media-libs/fontconfig/files/fontconfig-2.5.0-libtool-2.2.patch @@ -0,0 +1,76 @@ +From: Keith Packard +Date: Sun, 4 May 2008 03:23:37 +0000 (-0700) +Subject: Deal with libtool 2.2 which doesn't let us use LT_ variables. (bug 15692) +X-Git-Tag: 2.5.92 +X-Git-Url: http://gitweb.freedesktop.org/?p=fontconfig;a=commitdiff;h=19d124dc4f9a68e1c9ddce58bf79a5e11d2ccbfd + +Deal with libtool 2.2 which doesn't let us use LT_ variables. (bug 15692) + +Libtool-2.2 introduces new restrictions. So now it does not allow LT_* +variables as it includes marcros: + +m4_pattern_forbid([^_?LT_[A-Z_]+$]) + +Rename the LT_ variables to LIBT_ to work around this restriction. +--- + +--- a/configure.in ++++ b/configure.in +@@ -41,17 +41,17 @@ dnl libtool versioning + dnl bump revision when fixing bugs + dnl bump current and age, reset revision to zero when adding APIs + dnl bump current, leave age, reset revision to zero when changing/removing APIS +-LT_CURRENT=4 +-LT_REVISION=0 +-AC_SUBST(LT_CURRENT) +-AC_SUBST(LT_REVISION) +-LT_AGE=3 ++LIBT_CURRENT=4 ++LIBT_REVISION=0 ++AC_SUBST(LIBT_CURRENT) ++AC_SUBST(LIBT_REVISION) ++LIBT_AGE=3 + +-LT_VERSION_INFO="$LT_CURRENT:$LT_REVISION:$LT_AGE" +-AC_SUBST(LT_VERSION_INFO) ++LIBT_VERSION_INFO="$LIBT_CURRENT:$LIBT_REVISION:$LIBT_AGE" ++AC_SUBST(LIBT_VERSION_INFO) + +-LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE` +-AC_SUBST(LT_CURRENT_MINUS_AGE) ++LIBT_CURRENT_MINUS_AGE=`expr $LIBT_CURRENT - $LIBT_AGE` ++AC_SUBST(LIBT_CURRENT_MINUS_AGE) + + dnl ========================================================================== + +--- a/fontconfig-zip.in ++++ b/fontconfig-zip.in +@@ -10,7 +10,7 @@ DEVZIP=/tmp/fontconfig-dev-@VERSION@.zip + cd @prefix@ + rm -f $ZIP + zip $ZIP -@ <$@ ++ echo LIBRARY libfontconfig-@LIBT_CURRENT_MINUS_AGE@.dll; \ ++ echo VERSION @LIBT_CURRENT@.@LIBT_REVISION@) >$@ + @ ! grep -q FcERROR $@ || ($(RM) $@; false) diff --git a/media-libs/fontconfig/fontconfig-2.5.0-r1.ebuild b/media-libs/fontconfig/fontconfig-2.5.0-r1.ebuild index e48696a..7bc3fa9 100644 --- a/media-libs/fontconfig/fontconfig-2.5.0-r1.ebuild +++ b/media-libs/fontconfig/fontconfig-2.5.0-r1.ebuild @@ -37,6 +37,7 @@ src_unpack() { cd "${S}" # add docbook switch so we can disable it epatch "${FILESDIR}"/${PN}-2.3.2-docbook.patch + epatch "${FILESDIR}"/${P}-libtool-2.2.patch #213831 Fix libtool-2.2 brekage # Enable control over freetype's sub-pixel configuration; currently, this # only has an effect on cairo, and only if it contains the patch from -- 2.11.4.GIT