[arch-commits] Commit in pango/repos/extra-x86_64 (PKGBUILD PKGBUILD fix-test.diff)

[Jan Steffens]

    Date: Wednesday, June 30, 2021 @ 02:15:56
  Author: heftig
Revision: 418787

archrelease: copy trunk to extra-x86_64

Added:
  pango/repos/extra-x86_64/PKGBUILD
    (from rev 418786, pango/trunk/PKGBUILD)
  pango/repos/extra-x86_64/fix-test.diff
    (from rev 418786, pango/trunk/fix-test.diff)
Deleted:
  pango/repos/extra-x86_64/PKGBUILD

---------------+
 PKGBUILD      |  113 +++++++++++++++++++++++++++++---------------------------
 fix-test.diff |   55 +++++++++++++++++++++++++++
 2 files changed, 114 insertions(+), 54 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-06-30 02:15:34 UTC (rev 418786)
+++ PKGBUILD	2021-06-30 02:15:56 UTC (rev 418787)
@@ -1,54 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
-# Contributor: Jan de Groot <jgc at archlinux.org>
-
-pkgbase=pango
-pkgname=(pango pango-docs)
-pkgver=1.48.5
-pkgrel=1
-epoch=1
-pkgdesc="A library for layout and rendering of text"
-url="https://www.pango.org/"
-arch=(x86_64)
-license=(LGPL)
-depends=(libthai cairo libxft harfbuzz fribidi)
-makedepends=(gobject-introspection help2man git meson gi-docgen)
-checkdepends=(ttf-dejavu cantarell-fonts noto-fonts noto-fonts-emoji)
-_commit=3940a1714e84b076d04d4638c88df3dba7d8014e  # tags/1.48.5^0
-source=("git+https://gitlab.gnome.org/GNOME/pango.git#commit=$_commit")
-sha256sums=('SKIP')
-
-pkgver() {
-  cd pango
-  git describe --tags | sed 's/-/+/g'
-}
-
-prepare() {
-  cd pango
-}
-
-build() {
-  arch-meson pango build -D gtk_doc=true
-  meson compile -C build
-}
-
-check() {
-  meson test -C build --print-errorlogs
-}
-
-package_pango() {
-  provides=(libpango{,cairo,ft2,xft}-1.0.so)
-
-  meson install -C build --destdir "$pkgdir"
-
-  mkdir -p doc/usr/share
-  mv {"$pkgdir",doc}/usr/share/doc
-}
-
-package_pango-docs() {
-  pkgdesc+=" (documentation)"
-  depends=()
-
-  mv doc/* "$pkgdir"
-}
-
-# vim:set sw=2 et:

Copied: pango/repos/extra-x86_64/PKGBUILD (from rev 418786, pango/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-06-30 02:15:56 UTC (rev 418787)
@@ -0,0 +1,59 @@
+# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
+# Contributor: Jan de Groot <jgc at archlinux.org>
+
+pkgbase=pango
+pkgname=(pango pango-docs)
+pkgver=1.48.6
+pkgrel=1
+epoch=1
+pkgdesc="A library for layout and rendering of text"
+url="https://www.pango.org/"
+arch=(x86_64)
+license=(LGPL)
+depends=(libthai cairo libxft harfbuzz fribidi)
+makedepends=(gobject-introspection help2man git meson gi-docgen)
+checkdepends=(ttf-dejavu cantarell-fonts noto-fonts noto-fonts-emoji)
+_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
+  git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+  cd pango
+
+  # Test assumes no bitmap fonts?
+  git apply -3 ../fix-test.diff
+}
+
+build() {
+  arch-meson pango build -D gtk_doc=true
+  meson compile -C build
+}
+
+check() {
+  meson test -C build --print-errorlogs
+}
+
+package_pango() {
+  provides=(libpango{,cairo,ft2,xft}-1.0.so)
+
+  meson install -C build --destdir "$pkgdir"
+
+  mkdir -p doc/usr/share
+  mv {"$pkgdir",doc}/usr/share/doc
+}
+
+package_pango-docs() {
+  pkgdesc+=" (documentation)"
+  depends=()
+
+  mv doc/* "$pkgdir"
+}
+
+# vim:set sw=2 et:

Copied: pango/repos/extra-x86_64/fix-test.diff (from rev 418786, pango/trunk/fix-test.diff)
===================================================================
--- fix-test.diff	                        (rev 0)
+++ fix-test.diff	2021-06-30 02:15:56 UTC (rev 418787)
@@ -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);
+         }