[arch-commits] Commit in lib32-pango/repos/multilib-x86_64 (3 files)

[Jan Steffens]

    Date: Friday, December 3, 2021 @ 14:17:37
  Author: heftig
Revision: 1064797

archrelease: copy trunk to multilib-x86_64

Added:
  lib32-pango/repos/multilib-x86_64/PKGBUILD
    (from rev 1064796, lib32-pango/trunk/PKGBUILD)
  lib32-pango/repos/multilib-x86_64/fix-test.diff
    (from rev 1064796, lib32-pango/trunk/fix-test.diff)
Deleted:
  lib32-pango/repos/multilib-x86_64/PKGBUILD

---------------+
 PKGBUILD      |  107 +++++++++++++++++++++++++++++---------------------------
 fix-test.diff |   30 +++++++++++++++
 2 files changed, 86 insertions(+), 51 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-12-03 14:17:20 UTC (rev 1064796)
+++ PKGBUILD	2021-12-03 14:17:37 UTC (rev 1064797)
@@ -1,51 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
-# Contributor: Biru Ionut <ionut at archlinux.ro>
-# Contributor: Pierre Schmitz <pierre at archlinux.de>
-# Contributor: Mikko Seppälä <t-r-a-y at mbnet.fi>
-
-pkgname=lib32-pango
-pkgver=1.48.10
-pkgrel=1
-epoch=1
-pkgdesc="A library for layout and rendering of text (32-bit)"
-url="https://www.pango.org/"
-arch=(x86_64)
-license=(LGPL)
-depends=(lib32-libthai lib32-cairo lib32-libxft lib32-harfbuzz lib32-fribidi pango)
-makedepends=(git meson)
-checkdepends=(ttf-dejavu cantarell-fonts noto-fonts noto-fonts-emoji)
-provides=(libpango{,cairo,ft2,xft}-1.0.so)
-_commit=dc5bde2a20cbb025c9d0ed29ed687740a4d027da  # tags/1.48.10^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() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG="i686-pc-linux-gnu-pkg-config"
-
-  arch-meson pango build \
-    --libdir=/usr/lib32 \
-    -D introspection=disabled
-  meson compile -C build
-}
-
-check() {
-  meson test -C build --print-errorlogs
-}
-
-package() {
-  meson install -C build --destdir "$pkgdir"
-  rm -r "$pkgdir"/usr/{bin,include}
-}
-
-# vim:set sw=2 et:

Copied: lib32-pango/repos/multilib-x86_64/PKGBUILD (from rev 1064796, lib32-pango/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-12-03 14:17:37 UTC (rev 1064797)
@@ -0,0 +1,56 @@
+# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
+# Contributor: Biru Ionut <ionut at archlinux.ro>
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
+# Contributor: Mikko Seppälä <t-r-a-y at mbnet.fi>
+
+pkgname=lib32-pango
+pkgver=1.50.0
+pkgrel=1
+epoch=1
+pkgdesc="A library for layout and rendering of text (32-bit)"
+url="https://www.pango.org/"
+arch=(x86_64)
+license=(LGPL)
+depends=(lib32-libthai lib32-cairo lib32-libxft lib32-harfbuzz lib32-fribidi pango)
+makedepends=(git meson)
+checkdepends=(ttf-dejavu cantarell-fonts)
+provides=(libpango{,cairo,ft2,xft}-1.0.so)
+_commit=e80e224baabc7bf22971d0a97c8b31d32fa8ca1c  # tags/1.50.0^0
+source=("git+https://gitlab.gnome.org/GNOME/pango.git#commit=$_commit"
+        fix-test.diff)
+sha256sums=('SKIP'
+            'e1c0638305c0f46653bd60b5dee0b3445dd6a6b9aff8cee70be7759c21ba1037')
+
+pkgver() {
+  cd pango
+  git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+  cd pango
+
+  # Fix tests... seems to be a rounding error
+  git apply -3 ../fix-test.diff
+}
+
+build() {
+  export CC="gcc -m32"
+  export CXX="g++ -m32"
+  export PKG_CONFIG="i686-pc-linux-gnu-pkg-config"
+
+  arch-meson pango build \
+    --libdir=/usr/lib32 \
+    -D introspection=disabled
+  meson compile -C build
+}
+
+check() {
+  meson test -C build --print-errorlogs
+}
+
+package() {
+  meson install -C build --destdir "$pkgdir"
+  rm -r "$pkgdir"/usr/{bin,include}
+}
+
+# vim:set sw=2 et:

Copied: lib32-pango/repos/multilib-x86_64/fix-test.diff (from rev 1064796, lib32-pango/trunk/fix-test.diff)
===================================================================
--- fix-test.diff	                        (rev 0)
+++ fix-test.diff	2021-12-03 14:17:37 UTC (rev 1064797)
@@ -0,0 +1,30 @@
+diff --git i/tests/layouts/valid-20.layout w/tests/layouts/valid-20.layout
+index 8217b28b..6e81507f 100644
+--- i/tests/layouts/valid-20.layout
++++ w/tests/layouts/valid-20.layout
+@@ -140,23 +140,23 @@
+                 "glyph" : 244,
+                 "width" : 19456,
+                 "x-offset" : 14764,
+-                "y-offset" : 3844,
++                "y-offset" : 3845,
+                 "is-cluster-start" : true,
+                 "log-cluster" : 0
+               },
+               {
+                 "glyph" : 272,
+                 "width" : 19456,
+                 "x-offset" : 14764,
+                 "y-offset" : 4280,
+                 "is-cluster-start" : true,
+                 "log-cluster" : 1
+               },
+               {
+                 "glyph" : 273,
+                 "width" : 19456,
+                 "x-offset" : 14764,
+-                "y-offset" : 3506,
++                "y-offset" : 3507,
+                 "is-cluster-start" : true,
+                 "log-cluster" : 2
+               }