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 =================================================================== --- PKGBUILD 2021-12-22 07:22:55 UTC (rev 1082757) +++ PKGBUILD 2021-12-22 07:23:31 UTC (rev 1082758) @@ -1,56 +0,0 @@ -# Maintainer: Jan Alexander Steffens (heftig) <hef...@archlinux.org> -# Contributor: Biru Ionut <io...@archlinux.ro> -# Contributor: Pierre Schmitz <pie...@archlinux.de> -# Contributor: Mikko Seppälä <t-r-...@mbnet.fi> - -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) +++ PKGBUILD 2021-12-22 07:23:31 UTC (rev 1082758) @@ -0,0 +1,56 @@ +# Maintainer: Jan Alexander Steffens (heftig) <hef...@archlinux.org> +# Contributor: Biru Ionut <io...@archlinux.ro> +# Contributor: Pierre Schmitz <pie...@archlinux.de> +# Contributor: Mikko Seppälä <t-r-...@mbnet.fi> + +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, - "x-offset" : 14764, -- "y-offset" : 3506, -+ "y-offset" : 3507, - "is-cluster-start" : true, - "log-cluster" : 2 - } Copied: lib32-pango/repos/multilib-x86_64/fix-test.diff (from rev 1082757, lib32-pango/trunk/fix-test.diff) =================================================================== --- fix-test.diff (rev 0) +++ fix-test.diff 2021-12-22 07:23:31 UTC (rev 1082758) @@ -0,0 +1,123 @@ +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 + }