diff --git a/x11-libs/pango/pango-1.37.0.recipe b/x11-libs/pango/pango-1.38.1.recipe similarity index 82% rename from x11-libs/pango/pango-1.37.0.recipe rename to x11-libs/pango/pango-1.38.1.recipe index e18be38d0..a46b5dd89 100644 --- a/x11-libs/pango/pango-1.37.0.recipe +++ b/x11-libs/pango/pango-1.38.1.recipe @@ -21,8 +21,8 @@ COPYRIGHT=" LICENSE=" GNU LGPL v2.1 " -SOURCE_URI="http://ftp.gnome.org/pub/GNOME/sources/pango/1.37/pango-$portVersion.tar.xz" -CHECKSUM_SHA256="932e6c2410de378222e195edc46376dc0a82bf91038c8211c47bf859e2d20f0e" +SOURCE_URI="http://ftp.gnome.org/pub/GNOME/sources/pango/1.38/pango-$portVersion.tar.xz" +CHECKSUM_SHA256="1320569f6c6d75d6b66172b2d28e59c56ee864ee9df202b76799c4506a214eb7" PATCHES="pango-$portVersion.patchset" REVISION="1" ARCHITECTURES="!x86_gcc2 x86 x86_64" @@ -32,9 +32,9 @@ PROVIDES=" pango$secondaryArchSuffix = $portVersion compat >= 1 cmd:pango_querymodules$secondaryArchSuffix cmd:pango_view$secondaryArchSuffix - lib:libpango_1.0$secondaryArchSuffix = 0.3700.0 compat >= 0 - lib:libpangocairo_1.0$secondaryArchSuffix = 0.3700.0 compat >= 0 - lib:libpangoft2_1.0$secondaryArchSuffix = 0.3700.0 compat >= 0 + lib:libpango_1.0$secondaryArchSuffix = 0.3800.1 compat >= 0 + lib:libpangocairo_1.0$secondaryArchSuffix = 0.3800.1 compat >= 0 + lib:libpangoft2_1.0$secondaryArchSuffix = 0.3800.1 compat >= 0 " REQUIRES=" haiku$secondaryArchSuffix @@ -97,6 +97,9 @@ BUILD() INSTALL() { make install + + # remove libtool library files + rm $libDir/lib*.la prepareInstalledDevelLibs libpango-1.0 \ libpangocairo-1.0 libpangoft2-1.0 @@ -116,9 +119,9 @@ TEST() PROVIDES_devel=" pango${secondaryArchSuffix}_devel = $portVersion compat >= 1 - devel:libpango_1.0$secondaryArchSuffix = 0.3700.0 compat >= 0 - devel:libpangocairo_1.0$secondaryArchSuffix = 0.3700.0 compat >= 0 - devel:libpangoft2_1.0$secondaryArchSuffix = 0.3700.0 compat >= 0 + devel:libpango_1.0$secondaryArchSuffix = 0.3800.1 compat >= 0 + devel:libpangocairo_1.0$secondaryArchSuffix = 0.3800.1 compat >= 0 + devel:libpangoft2_1.0$secondaryArchSuffix = 0.3800.1 compat >= 0 " REQUIRES_devel=" pango$secondaryArchSuffix == $portVersion base diff --git a/x11-libs/pango/patches/pango-1.37.0.patchset b/x11-libs/pango/patches/pango-1.38.1.patchset similarity index 84% rename from x11-libs/pango/patches/pango-1.37.0.patchset rename to x11-libs/pango/patches/pango-1.38.1.patchset index cfa1c8f48..c40b0f0e5 100644 --- a/x11-libs/pango/patches/pango-1.37.0.patchset +++ b/x11-libs/pango/patches/pango-1.38.1.patchset @@ -1,11 +1,11 @@ -From a23567639c3b2bff340989ef0145423fe7e73cd9 Mon Sep 17 00:00:00 2001 +From 9448ecaaebab4f4fed512101b27a2c697552d803 Mon Sep 17 00:00:00 2001 From: Jerome Duval -Date: Mon, 1 Jun 2015 21:29:57 +0000 -Subject: g_assert_nonnull isn't yet available in glib 2.38 +Date: Mon, 12 Oct 2015 22:19:59 +0000 +Subject: Haiku patch diff --git a/tests/testattributes.c b/tests/testattributes.c -index 8da0dfb..b506d19 100644 +index f4c33f1..52d3b67 100644 --- a/tests/testattributes.c +++ b/tests/testattributes.c @@ -343,7 +343,7 @@ test_list_filter (void) @@ -34,12 +34,12 @@ index 8da0dfb..b506d19 100644 @@ -499,7 +499,7 @@ test_iter_get_font (void) pango_attr_iterator_get_font (iter, desc, &lang, &attrs); desc2 = pango_font_description_from_string ("Times Condensed 10"); - g_assert (pango_font_description_equal (desc, desc2)); + g_assert_true (pango_font_description_equal (desc, desc2)); - g_assert_nonnull (lang); + g_assert (lang != NULL); g_assert_cmpstr (pango_language_to_string (lang), ==, "ja-jp"); g_assert_null (attrs); pango_font_description_free (desc); -- -1.8.3.4 +2.2.2