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

pango: bump version.

Browse Source
This commit is contained in:
Jerome Duval
2017-11-20 18:34:24 +01:00
parent a19b5a8839
commit 8697af4d25
3 changed files with 52 additions and 1041 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
x11-libs/pango/pango-1.40.13.recipe → x11-libs/pango/pango-1.40.14.recipe
View File

@@ -17,7 +17,7 @@ COPYRIGHT="1999-2007,2010 Red Hat Software
LICENSE="GNU LGPL v2.1"
REVISION="1"
SOURCE_URI="http://ftp.gnome.org/pub/GNOME/sources/pango/1.40/pango-$portVersion.tar.xz"
CHECKSUM_SHA256="f84e98db1078772ff4935b40a1629ff82ef0dfdd08d2cbcc0130c8c437857196"
CHECKSUM_SHA256="90af1beaa7bf9e4c52db29ec251ec4fd0a8f2cc185d521ad1f88d01b3a6a17e3"
PATCHES="pango-$portVersion.patchset"
ARCHITECTURES="!x86_gcc2 x86 x86_64"
@@ -26,9 +26,9 @@ SECONDARY_ARCHITECTURES="!x86_gcc2 x86"
PROVIDES="
pango$secondaryArchSuffix = $portVersion compat >= 1
cmd:pango_view$secondaryArchSuffix
lib:libpango_1.0$secondaryArchSuffix = 0.4000.13 compat >= 0
lib:libpangocairo_1.0$secondaryArchSuffix = 0.4000.13 compat >= 0
lib:libpangoft2_1.0$secondaryArchSuffix = 0.4000.13 compat >= 0
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
"
REQUIRES="
haiku$secondaryArchSuffix
@@ -43,9 +43,9 @@ REQUIRES="
PROVIDES_devel="
pango${secondaryArchSuffix}_devel = $portVersion compat >= 1
devel:libpango_1.0$secondaryArchSuffix = 0.4000.13 compat >= 0
devel:libpangocairo_1.0$secondaryArchSuffix = 0.4000.13 compat >= 0
devel:libpangoft2_1.0$secondaryArchSuffix = 0.4000.13 compat >= 0
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
"
REQUIRES_devel="
pango$secondaryArchSuffix == $portVersion base

1034
x11-libs/pango/patches/pango-1.40.13.patchset
View File

File diff suppressed because it is too large Load Diff

45
x11-libs/pango/patches/pango-1.40.14.patchset Normal file
View File

@@ -0,0 +1,45 @@
From 88c1e88b8635d53c0662e2bbca6c1e36abdb2941 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Mon, 12 Oct 2015 22:19:59 +0000
Subject: Haiku patch
diff --git a/tests/testattributes.c b/tests/testattributes.c
index f4c33f1..52d3b67 100644
--- a/tests/testattributes.c
+++ b/tests/testattributes.c
@@ -343,7 +343,7 @@ test_list_filter (void)
g_assert_null (out);
out = pango_attr_list_filter (list, just_weight, NULL);
- g_assert_nonnull (out);
+ g_assert (out != NULL);
s = g_string_new ("");
print_attributes (attr_list_to_list (list), s);
@@ -436,11 +436,11 @@ test_iter_get (void)
iter = pango_attr_list_get_iterator (list);
pango_attr_iterator_next (iter);
attr = pango_attr_iterator_get (iter, PANGO_ATTR_SIZE);
- g_assert_nonnull (attr);
+ g_assert (attr != NULL);
g_assert_cmpuint (attr->start_index, ==, 0);
g_assert_cmpuint (attr->end_index, ==, G_MAXUINT);
attr = pango_attr_iterator_get (iter, PANGO_ATTR_STRETCH);
- g_assert_nonnull (attr);
+ g_assert (attr != NULL);
g_assert_cmpuint (attr->start_index, ==, 10);
g_assert_cmpuint (attr->end_index, ==, 30);
attr = pango_attr_iterator_get (iter, PANGO_ATTR_WEIGHT);
@@ -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_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);
--
2.14.2