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

2021-12-21 Thread Jan Steffens via arch-commits 
Date: Wednesday, December 22, 2021 @ 07:23:31
  Author: heftig
Revision: 1082758

archrelease: copy trunk to multilib-x86_64

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

---+
 PKGBUILD  |  112 
 fix-test.diff |  153 +---
 2 files changed, 179 insertions(+), 86 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2021-12-22 07:22:55 UTC (rev 1082757)
+++ PKGBUILD2021-12-22 07:23:31 UTC (rev 1082758)
@@ -1,56 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) 
-# Contributor: Biru Ionut 
-# Contributor: Pierre Schmitz 
-# Contributor: Mikko Seppälä 
-
-pkgname=lib32-pango
-pkgver=1.50.2
-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=37f22bb80ebacd834f1927e6acd7fd94aeaf1270  # tags/1.50.2^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/r&/;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/PKGBUILD (from rev 1082757, 
lib32-pango/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2021-12-22 07:23:31 UTC (rev 1082758)
@@ -0,0 +1,56 @@
+# Maintainer: Jan Alexander Steffens (heftig) 
+# Contributor: Biru Ionut 
+# Contributor: Pierre Schmitz 
+# Contributor: Mikko Seppälä 
+
+pkgname=lib32-pango
+pkgver=1.50.3
+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=26aadb2508f9022cbfc72e73b558c6791f5d46d9  # tags/1.50.3^0
+source=("git+https://gitlab.gnome.org/GNOME/pango.git#commit=$_commit;
+fix-test.diff)
+sha256sums=('SKIP'
+'c4ad17910d51832ca15d5805e5b43af4c3de4de51cbf1880e616e12dc664895f')
+
+pkgver() {
+  cd pango
+  git describe --tags | sed 's/[^-]*-g/r&/;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:

Deleted: fix-test.diff
===
--- fix-test.diff   2021-12-22 07:22:55 UTC (rev 1082757)
+++ fix-test.diff   2021-12-22 07:23:31 UTC (rev 1082758)
@@ -1,30 +0,0 @@
-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,
-

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

2021-12-16 Thread Jan Steffens via arch-commits 
Date: Thursday, December 16, 2021 @ 23:41:20
  Author: heftig
Revision: 1075528

archrelease: copy trunk to multilib-x86_64

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

---+
 PKGBUILD  |  112 
 fix-test.diff |   60 +++---
 2 files changed, 86 insertions(+), 86 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2021-12-16 23:40:53 UTC (rev 1075527)
+++ PKGBUILD2021-12-16 23:41:20 UTC (rev 1075528)
@@ -1,56 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) 
-# Contributor: Biru Ionut 
-# Contributor: Pierre Schmitz 
-# Contributor: Mikko Seppälä 
-
-pkgname=lib32-pango
-pkgver=1.50.1
-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=fd62d3ff159232c4a8e7bedb5ce4ac01f1ec8eeb  # tags/1.50.1^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/PKGBUILD (from rev 1075527, 
lib32-pango/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2021-12-16 23:41:20 UTC (rev 1075528)
@@ -0,0 +1,56 @@
+# Maintainer: Jan Alexander Steffens (heftig) 
+# Contributor: Biru Ionut 
+# Contributor: Pierre Schmitz 
+# Contributor: Mikko Seppälä 
+
+pkgname=lib32-pango
+pkgver=1.50.2
+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=37f22bb80ebacd834f1927e6acd7fd94aeaf1270  # tags/1.50.2^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/r&/;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:

Deleted: fix-test.diff
===
--- fix-test.diff   2021-12-16 23:40:53 UTC (rev 1075527)
+++ fix-test.diff   2021-12-16 23:41:20 UTC (rev 1075528)
@@ -1,30 +0,0 @@
-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"

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

2021-12-10 Thread Jan Steffens via arch-commits 
Date: Saturday, December 11, 2021 @ 04:01:51
  Author: heftig
Revision: 1068175

archrelease: copy trunk to multilib-x86_64

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

---+
 PKGBUILD  |  118 ++--
 fix-test.diff |   60 ++--
 2 files changed, 86 insertions(+), 92 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2021-12-11 04:01:26 UTC (rev 1068174)
+++ PKGBUILD2021-12-11 04:01:51 UTC (rev 1068175)
@@ -1,62 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) 
-# Contributor: Biru Ionut 
-# Contributor: Pierre Schmitz 
-# Contributor: Mikko Seppälä 
-
-pkgname=lib32-pango
-pkgver=1.50.0
-pkgrel=3
-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
-
-  # https://bugs.archlinux.org/task/72927
-  git cherry-pick -n f5fdfe4e16b7da761d918f40bb82dad52513c9ff
-
-  # https://bugs.archlinux.org/task/72939
-  git cherry-pick -n 1cf8e9b3cada dc5b1fdea7d6
-
-  # 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/PKGBUILD (from rev 1068174, 
lib32-pango/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2021-12-11 04:01:51 UTC (rev 1068175)
@@ -0,0 +1,56 @@
+# Maintainer: Jan Alexander Steffens (heftig) 
+# Contributor: Biru Ionut 
+# Contributor: Pierre Schmitz 
+# Contributor: Mikko Seppälä 
+
+pkgname=lib32-pango
+pkgver=1.50.1
+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=fd62d3ff159232c4a8e7bedb5ce4ac01f1ec8eeb  # tags/1.50.1^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:

Deleted: fix-test.diff
===
--- fix-test.diff   2021-12-11 04:01:26 UTC (rev 1068174)
+++ fix-test.diff   2021-12-11 04:01:51 UTC (rev 1068175)
@@ -1,30 +0,0 @@
-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,
-

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

2021-12-07 Thread Jan Steffens via arch-commits 
Date: Tuesday, December 7, 2021 @ 11:00:21
  Author: heftig
Revision: 1065502

archrelease: copy trunk to multilib-x86_64

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

---+
 PKGBUILD  |  121 
 fix-test.diff |   60 +--
 2 files changed, 92 insertions(+), 89 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2021-12-07 10:57:20 UTC (rev 1065501)
+++ PKGBUILD2021-12-07 11:00:21 UTC (rev 1065502)
@@ -1,59 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) 
-# Contributor: Biru Ionut 
-# Contributor: Pierre Schmitz 
-# Contributor: Mikko Seppälä 
-
-pkgname=lib32-pango
-pkgver=1.50.0
-pkgrel=2
-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
-
-  # https://bugs.archlinux.org/task/72927
-  git cherry-pick -n f5fdfe4e16b7da761d918f40bb82dad52513c9ff
-
-  # 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/PKGBUILD (from rev 1065501, 
lib32-pango/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2021-12-07 11:00:21 UTC (rev 1065502)
@@ -0,0 +1,62 @@
+# Maintainer: Jan Alexander Steffens (heftig) 
+# Contributor: Biru Ionut 
+# Contributor: Pierre Schmitz 
+# Contributor: Mikko Seppälä 
+
+pkgname=lib32-pango
+pkgver=1.50.0
+pkgrel=3
+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
+
+  # https://bugs.archlinux.org/task/72927
+  git cherry-pick -n f5fdfe4e16b7da761d918f40bb82dad52513c9ff
+
+  # https://bugs.archlinux.org/task/72939
+  git cherry-pick -n 1cf8e9b3cada dc5b1fdea7d6
+
+  # 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:

Deleted: fix-test.diff
===
--- fix-test.diff   2021-12-07 10:57:20 UTC (rev 1065501)
+++ fix-test.diff   2021-12-07 11:00:21 UTC (rev 1065502)
@@ -1,30 +0,0 @@
-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,

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

2021-12-05 Thread Jan Steffens via arch-commits 
Date: Monday, December 6, 2021 @ 02:59:53
  Author: heftig
Revision: 1065217

archrelease: copy trunk to multilib-x86_64

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

---+
 PKGBUILD  |  115 
 fix-test.diff |   60 ++---
 2 files changed, 89 insertions(+), 86 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2021-12-06 02:59:42 UTC (rev 1065216)
+++ PKGBUILD2021-12-06 02:59:53 UTC (rev 1065217)
@@ -1,56 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) 
-# Contributor: Biru Ionut 
-# Contributor: Pierre Schmitz 
-# Contributor: Mikko Seppälä 
-
-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/PKGBUILD (from rev 1065216, 
lib32-pango/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2021-12-06 02:59:53 UTC (rev 1065217)
@@ -0,0 +1,59 @@
+# Maintainer: Jan Alexander Steffens (heftig) 
+# Contributor: Biru Ionut 
+# Contributor: Pierre Schmitz 
+# Contributor: Mikko Seppälä 
+
+pkgname=lib32-pango
+pkgver=1.50.0
+pkgrel=2
+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
+
+  # https://bugs.archlinux.org/task/72927
+  git cherry-pick -n f5fdfe4e16b7da761d918f40bb82dad52513c9ff
+
+  # 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:

Deleted: fix-test.diff
===
--- fix-test.diff   2021-12-06 02:59:42 UTC (rev 1065216)
+++ fix-test.diff   2021-12-06 02:59:53 UTC (rev 1065217)
@@ -1,30 +0,0 @@
-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
-   },
-   {
-