From c87dcaea0a72af5e0ee2f22d08737d1b885f8038 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Tue, 6 Oct 2015 20:18:36 +0000 Subject: [PATCH] freetype: bump version. --- .../{freetype-2.6.recipe => freetype-2.6.1.recipe} | 14 ++++---------- ...eetype-2.6.patchset => freetype-2.6.1.patchset} | 0 2 files changed, 4 insertions(+), 10 deletions(-) rename media-libs/freetype/{freetype-2.6.recipe => freetype-2.6.1.recipe} (81%) rename media-libs/freetype/patches/{freetype-2.6.patchset => freetype-2.6.1.patchset} (100%) diff --git a/media-libs/freetype/freetype-2.6.recipe b/media-libs/freetype/freetype-2.6.1.recipe similarity index 81% rename from media-libs/freetype/freetype-2.6.recipe rename to media-libs/freetype/freetype-2.6.1.recipe index 90606def9..4afc6dd7e 100644 --- a/media-libs/freetype/freetype-2.6.recipe +++ b/media-libs/freetype/freetype-2.6.1.recipe @@ -6,8 +6,8 @@ HOMEPAGE="http://www.freetype.org" LICENSE="FreeType" COPYRIGHT="1996-2013 David Turner, Robert Wilhelm, Werner Lemberg, et al." SOURCE_URI="http://download.savannah.gnu.org/releases/freetype/freetype-$portVersion.tar.bz2" -CHECKSUM_SHA256="8469fb8124764f85029cc8247c31e132a2c5e51084ddce2a44ea32ee4ae8347e" -REVISION="2" +CHECKSUM_SHA256="2f6e9a7de3ae8e85bdd2fe237e27d868d3ba7a27495e65906455c27722dd1a17" +REVISION="1" ARCHITECTURES="x86_gcc2 x86 x86_64 arm" SECONDARY_ARCHITECTURES="x86_gcc2 x86" @@ -16,12 +16,12 @@ SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" freetype$secondaryArchSuffix = $portVersion - lib:libfreetype$secondaryArchSuffix = 6.12.0 compat >= 6 + lib:libfreetype$secondaryArchSuffix = 6.12.1 compat >= 6 " PROVIDES_devel=" freetype${secondaryArchSuffix}_devel = $portVersion cmd:freetype_config${secondaryArchSuffix} = $portVersion - devel:libfreetype${secondaryArchSuffix} = 6.12.0 compat >= 6 + devel:libfreetype${secondaryArchSuffix} = 6.12.1 compat >= 6 " REQUIRES=" haiku$secondaryArchSuffix @@ -66,12 +66,6 @@ INSTALL() prepareInstalledDevelLibs libfreetype fixPkgconfig - # Freetype headers are in a freetype2 subdirectory, but fixPkgconfig removes - # that from the pkg-config file, making it difficult for other ports to use - # freetype with pkg-config. - sed -i -e "s,^includedir=.*,includedir=$prefix/$relativeIncludeDir/freetype2," \ - $developLibDir/pkgconfig/freetype2.pc - # The libtool files reference other libraries using the wrong paths, which # creates a lot of confusion. Fix them so correct paths are used. local develPackageName="${portName}_devel-$portFullVersion" diff --git a/media-libs/freetype/patches/freetype-2.6.patchset b/media-libs/freetype/patches/freetype-2.6.1.patchset similarity index 100% rename from media-libs/freetype/patches/freetype-2.6.patchset rename to media-libs/freetype/patches/freetype-2.6.1.patchset