diff --git a/x11-libs/pango/pango-1.50.7.recipe b/x11-libs/pango/pango-1.50.14.recipe similarity index 80% rename from x11-libs/pango/pango-1.50.7.recipe rename to x11-libs/pango/pango-1.50.14.recipe index 9361cd2c6..7784730c0 100644 --- a/x11-libs/pango/pango-1.50.7.recipe +++ b/x11-libs/pango/pango-1.50.14.recipe @@ -15,9 +15,9 @@ COPYRIGHT="1999-2021 Red Hat Software 2001 Alexander Larsson 2000 SuSE Linux Ltd" LICENSE="GNU LGPL v2.1" -REVISION="2" +REVISION="1" SOURCE_URI="http://ftp.gnome.org/pub/GNOME/sources/pango/${portVersion%.*}/pango-$portVersion.tar.xz" -CHECKSUM_SHA256="0477f369a3d4c695df7299a6989dc004756a7f4de27eecac405c6790b7e3ad33" +CHECKSUM_SHA256="1d67f205bfc318c27a29cfdfb6828568df566795df0cb51d2189cde7f2d581e8" PATCHES="pango-$portVersion.patchset" ARCHITECTURES="all !x86_gcc2" @@ -41,11 +41,11 @@ REQUIRES=" lib:libfontconfig$secondaryArchSuffix lib:libfreetype$secondaryArchSuffix lib:libfribidi$secondaryArchSuffix - lib:libgirepository_1.0$secondaryArchSuffix + lib:libgio_2.0$secondaryArchSuffix lib:libglib_2.0$secondaryArchSuffix + lib:libgobject_2.0$secondaryArchSuffix lib:libharfbuzz$secondaryArchSuffix - lib:libiconv$secondaryArchSuffix - lib:libintl$secondaryArchSuffix +# lib:libharfbuzz_gobject$secondaryArchSuffix " PROVIDES_devel=" @@ -60,26 +60,31 @@ REQUIRES_devel=" devel:libfontconfig$secondaryArchSuffix devel:libfreetype$secondaryArchSuffix devel:libfribidi$secondaryArchSuffix - devel:libgirepository_1.0$secondaryArchSuffix + devel:libgio_2.0$secondaryArchSuffix devel:libglib_2.0$secondaryArchSuffix + devel:libgobject_2.0$secondaryArchSuffix devel:libharfbuzz$secondaryArchSuffix - devel:libiconv$secondaryArchSuffix - devel:libintl$secondaryArchSuffix + devel:libharfbuzz_gobject$secondaryArchSuffix " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libcairo$secondaryArchSuffix devel:libfribidi$secondaryArchSuffix + devel:libfontconfig$secondaryArchSuffix + devel:libgio_2.0$secondaryArchSuffix devel:libgirepository_1.0$secondaryArchSuffix devel:libglib_2.0$secondaryArchSuffix - devel:libgraphite2$secondaryArchSuffix + devel:libgobject_2.0$secondaryArchSuffix devel:libharfbuzz$secondaryArchSuffix + devel:libharfbuzz_gobject$secondaryArchSuffix " BUILD_PREREQUIRES=" + cmd:cmake cmd:find cmd:gcc$secondaryArchSuffix cmd:gtkdocize + cmd:help2man cmd:ld$secondaryArchSuffix cmd:meson cmd:pkg_config$secondaryArchSuffix @@ -100,18 +105,20 @@ BUILD() INSTALL() { - ninja install -C build + ninja -C build install prepareInstalledDevelLibs libpango-1.0 \ - libpangocairo-1.0 libpangoft2-1.0 + libpangocairo-1.0 \ + libpangoft2-1.0 fixPkgconfig # devel package packageEntries devel \ - $developDir + $developDir \ + $dataDir/gir-1.0 } TEST() { - ninja test -C build + ninja -C build test } diff --git a/x11-libs/pango/patches/pango-1.50.7.patchset b/x11-libs/pango/patches/pango-1.50.14.patchset similarity index 95% rename from x11-libs/pango/patches/pango-1.50.7.patchset rename to x11-libs/pango/patches/pango-1.50.14.patchset index e282decbe..dbb3b89b1 100644 --- a/x11-libs/pango/patches/pango-1.50.7.patchset +++ b/x11-libs/pango/patches/pango-1.50.14.patchset @@ -1,4 +1,4 @@ -From 7498ea544053ccd757af8ea805dd88f4b139d4f4 Mon Sep 17 00:00:00 2001 +From 46625e1a9d7eb644a8e57145a5d9cabba5e79d5b Mon Sep 17 00:00:00 2001 From: Ken Mays Date: Fri, 24 Dec 2021 15:06:02 +0000 Subject: Fix Pango 1.50 unit tests for Haiku @@ -92,10 +92,10 @@ index 1aa9094..903bfab 100644 pango_layout_line_index_to_x (line, index, 0, &x); pango_layout_line_x_to_index (line, x, &index2, &trailing); diff --git a/tests/testserialize.c b/tests/testserialize.c -index e480da3..d0ddf07 100644 +index 0021ffe..e7fb20e 100644 --- a/tests/testserialize.c +++ b/tests/testserialize.c -@@ -62,7 +62,7 @@ test_serialize_attr_list (void) +@@ -72,7 +72,7 @@ test_serialize_attr_list (void) char *str; attrs = pango_attr_list_from_string (valid[i]); @@ -104,7 +104,7 @@ index e480da3..d0ddf07 100644 str = pango_attr_list_to_string (attrs); g_assert_cmpstr (str, ==, roundtripped[i]); g_free (str); -@@ -113,7 +113,7 @@ test_serialize_tab_array (void) +@@ -123,7 +123,7 @@ test_serialize_tab_array (void) char *str; tabs = pango_tab_array_from_string (valid[i]); @@ -113,7 +113,7 @@ index e480da3..d0ddf07 100644 str = pango_tab_array_to_string (tabs); g_assert_cmpstr (str, ==, roundtripped[i]); g_free (str); -@@ -165,7 +165,7 @@ test_serialize_font (void) +@@ -175,7 +175,7 @@ test_serialize_font (void) font2 = pango_font_deserialize (context, bytes, &error); g_assert_no_error (error); @@ -122,7 +122,7 @@ index e480da3..d0ddf07 100644 bytes2 = pango_font_serialize (font2); g_assert_true (g_bytes_equal (bytes2, bytes)); -@@ -286,9 +286,9 @@ test_serialize_layout_valid (void) +@@ -296,9 +296,9 @@ test_serialize_layout_valid (void) g_assert_no_error (error); g_assert_true (PANGO_IS_LAYOUT (layout)); g_assert_cmpstr (pango_layout_get_text (layout), ==, "Some fun with layouts!"); @@ -134,7 +134,7 @@ index e480da3..d0ddf07 100644 pango_tab_array_free (tabs); s = pango_font_description_to_string (pango_layout_get_font_description (layout)); g_assert_cmpstr (s, ==, "Sans Bold 32"); -@@ -421,7 +421,7 @@ test_serialize_layout_invalid (void) +@@ -431,7 +431,7 @@ test_serialize_layout_invalid (void) if (test[i].expected_error) g_assert_error (error, PANGO_LAYOUT_DESERIALIZE_ERROR, test[i].expected_error); else @@ -144,10 +144,10 @@ index e480da3..d0ddf07 100644 g_clear_error (&error); } -- -2.30.2 +2.42.0 -From c37c7f4bd20c05a32f8291e9683f21397e119974 Mon Sep 17 00:00:00 2001 +From 47a3999ee004515447277234e42be173f3fa06fc Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Mon, 12 Oct 2015 22:19:59 +0000 Subject: Haiku patch for testattributes unit test @@ -231,5 +231,5 @@ index 5d3334e..a32641d 100644 g_assert_null (attrs); pango_font_description_free (desc); -- -2.30.2 +2.42.0