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

[Jan Steffens]

    Date: Wednesday, February 9, 2022 @ 21:14:52
  Author: heftig
Revision: 1130416

1.50.4-1

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-02-09 20:52:25 UTC (rev 1130415)
+++ PKGBUILD	2022-02-09 21:14:52 UTC (rev 1130416)
@@ -4,7 +4,7 @@
 # Contributor: Mikko Seppälä <t-r-a-y at mbnet.fi>
 
 pkgname=lib32-pango
-pkgver=1.50.3
+pkgver=1.50.4
 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)
 provides=(libpango{,cairo,ft2,xft}-1.0.so)
-_commit=26aadb2508f9022cbfc72e73b558c6791f5d46d9  # tags/1.50.3^0
-source=("git+https://gitlab.gnome.org/GNOME/pango.git#commit=$_commit"
-        fix-test.diff)
-sha256sums=('SKIP'
-            'c4ad17910d51832ca15d5805e5b43af4c3de4de51cbf1880e616e12dc664895f')
+_commit=bcf61fc3a0c30da173c8629d1458fe3440288878  # tags/1.50.4^0
+source=("git+https://gitlab.gnome.org/GNOME/pango.git#commit=$_commit")
+sha256sums=('SKIP')
 
 pkgver() {
   cd pango
@@ -28,9 +26,6 @@
 
 prepare() {
   cd pango
-
-  # Fix tests... seems to be a rounding error
-  git apply -3 ../fix-test.diff
 }
 
 build() {

Deleted: fix-test.diff
===================================================================
--- fix-test.diff	2022-02-09 20:52:25 UTC (rev 1130415)
+++ fix-test.diff	2022-02-09 21:14:52 UTC (rev 1130416)
@@ -1,123 +0,0 @@
-diff --git i/tests/layouts/valid-20.layout w/tests/layouts/valid-20.layout
-index 93b8a1b1..db692b73 100644
---- i/tests/layouts/valid-20.layout
-+++ w/tests/layouts/valid-20.layout
-@@ -140,23 +140,23 @@
-                 "glyph" : 244,
-                 "width" : 15360,
-                 "x-offset" : 14764,
--                "y-offset" : 3844,
-+                "y-offset" : 3845,
-                 "is-cluster-start" : true,
-                 "log-cluster" : 0
-               },
-               {
-                 "glyph" : 272,
-                 "width" : 15360,
-                 "x-offset" : 14764,
-                 "y-offset" : 4280,
-                 "is-cluster-start" : true,
-                 "log-cluster" : 1
-               },
-               {
-                 "glyph" : 273,
-                 "width" : 15360,
-                 "x-offset" : 14764,
--                "y-offset" : 3506,
-+                "y-offset" : 3507,
-                 "is-cluster-start" : true,
-                 "log-cluster" : 2
-               }
-diff --git i/tests/layouts/vertical.layout w/tests/layouts/vertical.layout
-index e8619bfb..a7f65068 100644
---- i/tests/layouts/vertical.layout
-+++ w/tests/layouts/vertical.layout
-@@ -128,24 +128,24 @@
-               {
-                 "glyph" : 1,
-                 "width" : 32768,
--                "x-offset" : 28835,
-+                "x-offset" : 28836,
-                 "y-offset" : 9945,
-                 "is-cluster-start" : true,
-                 "log-cluster" : 0
-               },
-               {
-                 "glyph" : 2,
-                 "width" : 32768,
--                "x-offset" : 28835,
-+                "x-offset" : 28836,
-                 "y-offset" : 10764,
-                 "is-cluster-start" : true,
-                 "log-cluster" : 1
-               },
-               {
-                 "glyph" : 3,
-                 "width" : 32768,
--                "x-offset" : 28835,
--                "y-offset" : 10452,
-+                "x-offset" : 28836,
-+                "y-offset" : 10453,
-                 "is-cluster-start" : true,
-                 "log-cluster" : 2
-               }
-@@ -179,24 +179,24 @@
-               {
-                 "glyph" : 4,
-                 "width" : 32768,
--                "x-offset" : 28835,
--                "y-offset" : 16383,
-+                "x-offset" : 28836,
-+                "y-offset" : 16384,
-                 "is-cluster-start" : true,
-                 "log-cluster" : 0
-               },
-               {
-                 "glyph" : 5,
-                 "width" : 32768,
--                "x-offset" : 28835,
--                "y-offset" : 16383,
-+                "x-offset" : 28836,
-+                "y-offset" : 16384,
-                 "is-cluster-start" : true,
-                 "log-cluster" : 3
-               },
-               {
-                 "glyph" : 7,
-                 "width" : 32768,
--                "x-offset" : 28835,
--                "y-offset" : 16383,
-+                "x-offset" : 28836,
-+                "y-offset" : 16384,
-                 "is-cluster-start" : true,
-                 "log-cluster" : 6
-               }
-@@ -230,24 +230,24 @@
-               {
-                 "glyph" : 1,
-                 "width" : 32768,
--                "x-offset" : 28835,
-+                "x-offset" : 28836,
-                 "y-offset" : 9945,
-                 "is-cluster-start" : true,
-                 "log-cluster" : 0
-               },
-               {
-                 "glyph" : 2,
-                 "width" : 32768,
--                "x-offset" : 28835,
-+                "x-offset" : 28836,
-                 "y-offset" : 10764,
-                 "is-cluster-start" : true,
-                 "log-cluster" : 1
-               },
-               {
-                 "glyph" : 3,
-                 "width" : 32768,
--                "x-offset" : 28835,
--                "y-offset" : 10452,
-+                "x-offset" : 28836,
-+                "y-offset" : 10453,
-                 "is-cluster-start" : true,
-                 "log-cluster" : 2
-               }