haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 12:10:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

pango: bump version.

Browse Source
This commit is contained in:
Jerome Duval
2015-10-15 00:34:16 +00:00
parent f40cfd64bd
commit 1834897342
2 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
x11-libs/pango/pango-1.37.0.recipe → x11-libs/pango/pango-1.38.1.recipe
View File

@@ -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

12
x11-libs/pango/patches/pango-1.37.0.patchset → x11-libs/pango/patches/pango-1.38.1.patchset
View File

@@ -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 <jerome.duval@gmail.com>
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