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

[Jan Steffens via arch-commits]

    Date: Saturday, July 3, 2021 @ 22:55:04
  Author: heftig
Revision: 971976

1.48.7-1

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

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

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

Deleted: fix-test.diff
===================================================================
--- fix-test.diff       2021-07-03 20:08:03 UTC (rev 971975)
+++ fix-test.diff       2021-07-03 22:55:04 UTC (rev 971976)
@@ -1,55 +0,0 @@
-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);
-         }