diff --git a/x11-libs/pango/pango-1.40.14.recipe b/x11-libs/pango/pango-1.42.4.recipe similarity index 73% rename from x11-libs/pango/pango-1.40.14.recipe rename to x11-libs/pango/pango-1.42.4.recipe index 6757501e8..a42b2aa26 100644 --- a/x11-libs/pango/pango-1.40.14.recipe +++ b/x11-libs/pango/pango-1.42.4.recipe @@ -15,9 +15,9 @@ COPYRIGHT="1999-2007,2010 Red Hat Software 2001 Alexander Larsson 2000 SuSE Linux Ltd" LICENSE="GNU LGPL v2.1" -REVISION="2" -SOURCE_URI="http://ftp.gnome.org/pub/GNOME/sources/pango/1.40/pango-$portVersion.tar.xz" -CHECKSUM_SHA256="90af1beaa7bf9e4c52db29ec251ec4fd0a8f2cc185d521ad1f88d01b3a6a17e3" +REVISION="1" +SOURCE_URI="http://ftp.gnome.org/pub/GNOME/sources/pango/${portVersion%.*}/pango-$portVersion.tar.xz" +CHECKSUM_SHA256="1d2b74cd63e8bd41961f2f8d952355aa0f9be6002b52c8aa7699d9f5da597c9d" PATCHES="pango-$portVersion.patchset" ARCHITECTURES="!x86_gcc2 x86 x86_64" @@ -25,16 +25,18 @@ SECONDARY_ARCHITECTURES="!x86_gcc2 x86" PROVIDES=" pango$secondaryArchSuffix = $portVersion compat >= 1 + cmd:pango_list$secondaryArchSuffix cmd:pango_view$secondaryArchSuffix - lib:libpango_1.0$secondaryArchSuffix = 0.4000.14 compat >= 0 - lib:libpangocairo_1.0$secondaryArchSuffix = 0.4000.14 compat >= 0 - lib:libpangoft2_1.0$secondaryArchSuffix = 0.4000.14 compat >= 0 + lib:libpango_1.0$secondaryArchSuffix = 0.4200.4 compat >= 0 + lib:libpangocairo_1.0$secondaryArchSuffix = 0.4200.4 compat >= 0 + lib:libpangoft2_1.0$secondaryArchSuffix = 0.4200.4 compat >= 0 " REQUIRES=" haiku$secondaryArchSuffix lib:libcairo$secondaryArchSuffix lib:libfontconfig$secondaryArchSuffix lib:libfreetype$secondaryArchSuffix + lib:libfribidi$secondaryArchSuffix lib:libglib_2.0$secondaryArchSuffix lib:libharfbuzz$secondaryArchSuffix lib:libiconv$secondaryArchSuffix @@ -43,9 +45,9 @@ REQUIRES=" PROVIDES_devel=" pango${secondaryArchSuffix}_devel = $portVersion compat >= 1 - devel:libpango_1.0$secondaryArchSuffix = 0.4000.14 compat >= 0 - devel:libpangocairo_1.0$secondaryArchSuffix = 0.4000.14 compat >= 0 - devel:libpangoft2_1.0$secondaryArchSuffix = 0.4000.14 compat >= 0 + devel:libpango_1.0$secondaryArchSuffix = 0.4200.4 compat >= 0 + devel:libpangocairo_1.0$secondaryArchSuffix = 0.4200.4 compat >= 0 + devel:libpangoft2_1.0$secondaryArchSuffix = 0.4200.4 compat >= 0 " REQUIRES_devel=" pango$secondaryArchSuffix == $portVersion base @@ -55,14 +57,12 @@ REQUIRES_devel=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libcairo$secondaryArchSuffix + devel:libfribidi$secondaryArchSuffix devel:libglib_2.0$secondaryArchSuffix devel:libgraphite2$secondaryArchSuffix devel:libharfbuzz$secondaryArchSuffix " BUILD_PREREQUIRES=" - cmd:aclocal - cmd:autoconf - cmd:automake cmd:find cmd:gcc$secondaryArchSuffix cmd:gtkdocize @@ -74,8 +74,6 @@ BUILD_PREREQUIRES=" BUILD() { - libtoolize --force --copy --install - autoreconf -fi runConfigure ./configure make $jobArgs } diff --git a/x11-libs/pango/patches/pango-1.40.14.patchset b/x11-libs/pango/patches/pango-1.42.4.patchset similarity index 100% rename from x11-libs/pango/patches/pango-1.40.14.patchset rename to x11-libs/pango/patches/pango-1.42.4.patchset