[arch-commits] Commit in lib32-pango/trunk (PKGBUILD fix-test.diff)

[Jan Steffens]

    Date: Wednesday, June 30, 2021 @ 02:15:36
  Author: heftig
Revision: 967907

1.48.6-1

Added:
  lib32-pango/trunk/fix-test.diff
Modified:
  lib32-pango/trunk/PKGBUILD

---------------+
 PKGBUILD      |   13 +++++++++----
 fix-test.diff |   55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 64 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-06-30 02:12:26 UTC (rev 967906)
+++ PKGBUILD	2021-06-30 02:15:36 UTC (rev 967907)
@@ -4,7 +4,7 @@
 # Contributor: Mikko Seppälä <t-r-a-y at mbnet.fi>
 
 pkgname=lib32-pango
-pkgver=1.48.5
+pkgver=1.48.6
 pkgrel=1
 epoch=1
 pkgdesc="A library for layout and rendering of text (32-bit)"
@@ -15,9 +15,11 @@
 makedepends=(git meson)
 checkdepends=(ttf-dejavu cantarell-fonts noto-fonts noto-fonts-emoji)
 provides=(libpango{,cairo,ft2,xft}-1.0.so)
-_commit=3940a1714e84b076d04d4638c88df3dba7d8014e  # tags/1.48.5^0
-source=("git+https://gitlab.gnome.org/GNOME/pango.git#commit=$_commit")
-sha256sums=('SKIP')
+_commit=61763238b548d717d0772f31467ad7e9b6a557ae  # tags/1.48.6^0
+source=("git+https://gitlab.gnome.org/GNOME/pango.git#commit=$_commit"
+        fix-test.diff)
+sha256sums=('SKIP'
+            'd74df5b325007d02c3054a9e2a623327d0d195adf18d0ee41689672c27657cdb')
 
 pkgver() {
   cd pango
@@ -26,6 +28,9 @@
 
 prepare() {
   cd pango
+
+  # Test assumes no bitmap fonts?
+  git apply -3 ../fix-test.diff
 }
 
 build() {

Added: fix-test.diff
===================================================================
--- fix-test.diff	                        (rev 0)
+++ fix-test.diff	2021-06-30 02:15:36 UTC (rev 967907)
@@ -0,0 +1,55 @@
+diff --git i/tests/test-common.c w/tests/test-common.c
+index a6339415..3b8880e3 100644
+--- i/tests/test-common.c
++++ w/tests/test-common.c
+@@ -225,23 +225,23 @@ attribute_from_string (const char *string)
+ {
+   char *s, *p;
+   PangoAttribute *attr;
+-  long start, end;
++  long long start, end;
+   GEnumClass *class;
+   int i;
+   PangoColor color;
+ 
+   s = string;
+   g_assert (*s == '[');
+ 
+   s++;
+-  start = strtol (s, &p, 10);
++  start = strtoll (s, &p, 10);
+   g_assert (p > s);
+   g_assert (*p == ',');
+   s = p + 1;
+ 
+   g_assert (start >= 0);
+ 
+-  end = strtol (s, &p, 10);
++  end = strtoll (s, &p, 10);
+   g_assert (p > s);
+   g_assert (*p == ']');
+   s = p + 1;
+diff --git i/tests/test-font.c w/tests/test-font.c
+index e2147485..34689d5f 100644
+--- i/tests/test-font.c
++++ w/tests/test-font.c
+@@ -346,9 +346,16 @@ test_font_models (void)
+           g_assert_true (pango_font_face_get_family (PANGO_FONT_FACE (obj2)) == (PangoFontFamily *)obj);
+ 
+           pango_font_face_list_sizes (PANGO_FONT_FACE (obj2), &sizes, &n_sizes);
+-          /* no more bitmap fonts */
+-          g_assert_null (sizes);
+-          g_assert_cmpint (n_sizes, ==, 0);
++
++          if (n_sizes == 0)
++            {
++              g_assert_null (sizes);
++            }
++          else
++            {
++              g_assert_nonnull (sizes);
++              g_free (sizes);
++            }
+ 
+           g_object_unref (obj2);
+         }