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

pango: bump version.

Browse Source
This commit is contained in:
Jerome Duval
2015-06-01 21:40:12 +00:00
parent 99c02ef728
commit d4970f25ed
3 changed files with 53 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
x11-libs/pango/pango-1.36.8.recipe → x11-libs/pango/pango-1.37.0.recipe
View File

@@ -21,8 +21,8 @@ COPYRIGHT="
LICENSE="
GNU LGPL v2.1
"
SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/pango/1.36/pango-$portVersion.tar.xz"
CHECKSUM_SHA256="18dbb51b8ae12bae0ab7a958e7cf3317c9acfc8a1e1103ec2f147164a0fc2d07"
SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/pango/1.37/pango-$portVersion.tar.xz"
CHECKSUM_SHA256="932e6c2410de378222e195edc46376dc0a82bf91038c8211c47bf859e2d20f0e"
PATCHES="pango-$portVersion.patchset"
REVISION="1"
ARCHITECTURES="x86 x86_64"
@@ -37,9 +37,9 @@ PROVIDES="
pango$secondaryArchSuffix = $portVersion compat >= 1
cmd:pango_querymodules$secondaryArchSuffix
cmd:pango_view$secondaryArchSuffix
lib:libpango_1.0$secondaryArchSuffix = 0.3600.8 compat >= 0
lib:libpangocairo_1.0$secondaryArchSuffix = 0.3600.8 compat >= 0
lib:libpangoft2_1.0$secondaryArchSuffix = 0.3600.8 compat >= 0
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
"
REQUIRES="
haiku$secondaryArchSuffix
@@ -122,9 +122,9 @@ TEST()
PROVIDES_devel="
pango${secondaryArchSuffix}_devel = $portVersion compat >= 1
devel:libpango_1.0$secondaryArchSuffix = 0.3600.8 compat >= 0
devel:libpangocairo_1.0$secondaryArchSuffix = 0.3600.8 compat >= 0
devel:libpangoft2_1.0$secondaryArchSuffix = 0.3600.8 compat >= 0
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
"
REQUIRES_devel="
pango$secondaryArchSuffix == $portVersion base

27
x11-libs/pango/patches/pango-1.36.8.patchset
View File

@@ -1,27 +0,0 @@
From 89d8edabf98747fa30d6a6f7989d0a66e189a302 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@gmail.com>
Date: Mon, 20 Apr 2015 18:16:55 +0200
Subject: Pretend we are cross-compiling
Workarounds some library path and libtool mixups.
diff --git a/modules/Makefile.am b/modules/Makefile.am
index 73b42f4..ede826d 100644
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -14,12 +14,7 @@ EXTRA_DIST = \
CLEANFILES = \
pango.modules
-if CROSS_COMPILING
RUN_QUERY_MODULES_TEST=false
-else
-RUN_QUERY_MODULES_TEST=true
-all-local: pango.modules
-endif
install-data-local: $(top_builddir)/pango/pango-querymodules$(EXEEXT)
@if $(RUN_QUERY_MODULES_TEST) && test -z "$(DESTDIR)" ; then \
--
2.2.2

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

@@ -0,0 +1,45 @@
From a23567639c3b2bff340989ef0145423fe7e73cd9 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
diff --git a/tests/testattributes.c b/tests/testattributes.c
index 8da0dfb..b506d19 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 (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