Date: Monday, August 10, 2020 @ 19:13:13 Author: heftig Revision: 674067
1.46.0-1 Modified: lib32-pango/trunk/PKGBUILD Deleted: lib32-pango/trunk/test.diff -----------+ PKGBUILD | 23 +++++++---------------- test.diff | 31 ------------------------------- 2 files changed, 7 insertions(+), 47 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-08-10 19:11:08 UTC (rev 674066) +++ PKGBUILD 2020-08-10 19:13:13 UTC (rev 674067) @@ -1,9 +1,10 @@ +# 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.44.7+11+g73b46b04 +pkgver=1.46.0 pkgrel=1 epoch=1 pkgdesc="A library for layout and rendering of text (32-bit)" @@ -12,15 +13,11 @@ license=(LGPL) depends=(lib32-libthai lib32-cairo lib32-libxft lib32-harfbuzz lib32-fribidi pango) makedepends=(git meson) -checkdepends=(ttf-dejavu cantarell-fonts) +checkdepends=(ttf-dejavu cantarell-fonts noto-fonts) provides=(libpango{,cairo,ft2,xft}-1.0.so) -_commit=73b46b04c724335ad73534cc69955baa2388b861 # pango-1-44 -source=("git+https://gitlab.gnome.org/GNOME/pango.git#commit=$_commit" - 0001-Use-shape-flags-for-tab-width.patch - test.diff) -sha256sums=('SKIP' - 'd87bf1bb8dcd7edba0d8f49ddc7fd6bd9965f21a38f186fbfb297828ad53f4d1' - '401b51f3aee44510fc94878b5549ff4a4a6d79584b5d6df2dd7e0978b9d574ce') +_commit=3eaff0ed87763e3a7d1e36541cbc0fdd7df58269 # tags/1.46.0^0 +source=("git+https://gitlab.gnome.org/GNOME/pango.git#commit=$_commit") +sha256sums=('SKIP') pkgver() { cd pango @@ -29,12 +26,6 @@ prepare() { cd pango - - # https://bugs.archlinux.org/task/63914 - git apply -3 ../0001-Use-shape-flags-for-tab-width.patch - - # Harmless test case failure; could be from Cantarell update - git apply -3 ../test.diff } build() { @@ -43,7 +34,7 @@ export PKG_CONFIG="i686-pc-linux-gnu-pkg-config" arch-meson pango build --libdir=/usr/lib32 -D introspection=false - ninja -C build + meson compile -C build } check() { Deleted: test.diff =================================================================== --- test.diff 2020-08-10 19:11:08 UTC (rev 674066) +++ test.diff 2020-08-10 19:13:13 UTC (rev 674067) @@ -1,31 +0,0 @@ -diff --git i/tests/layouts/valid-4.expected w/tests/layouts/valid-4.expected -index 09f143f3..495f6b43 100644 ---- i/tests/layouts/valid-4.expected -+++ w/tests/layouts/valid-4.expected -@@ -16,21 +16,21 @@ range 0 2147483647 - i=1, index=0, paragraph-start=1, dir=ltr 'This paragraph should actual' - i=2, index=32, paragraph-start=0, dir=ltr 'ly have multiple lines, unlike ' - i=3, index=63, paragraph-start=0, dir=ltr 'all the other wannabe äöü pa' --i=4, index=96, paragraph-start=0, dir=ltr 'ragraph tests in this ugh ' --i=5, index=124, paragraph-start=0, dir=ltr 'test-case. Grow some lines! -+i=4, index=96, paragraph-start=0, dir=ltr 'ragraph tests in this ugh test-' -+i=5, index=129, paragraph-start=0, dir=ltr 'case. Grow some lines! - ' - i=6, index=152, paragraph-start=1, dir=ltr '' - - --- runs - - i=1, index=0, chars=30, level=0, gravity=south, flags=4, font=OMITTED, script=latin, language=en-us, 'This paragraph should actual' - i=2, index=32, no run, line end - i=3, index=32, chars=31, level=0, gravity=south, flags=0, font=OMITTED, script=latin, language=en-us, 'ly have multiple lines, unlike ' - i=4, index=63, no run, line end - i=5, index=63, chars=29, level=0, gravity=south, flags=4, font=OMITTED, script=latin, language=en-us, 'all the other wannabe äöü pa' - i=6, index=96, no run, line end --i=7, index=96, chars=27, level=0, gravity=south, flags=0, font=OMITTED, script=latin, language=en-us, 'ragraph tests in this ugh ' --i=8, index=124, no run, line end --i=9, index=124, chars=27, level=0, gravity=south, flags=0, font=OMITTED, script=latin, language=en-us, 'test-case. Grow some lines!' -+i=7, index=96, chars=32, level=0, gravity=south, flags=0, font=OMITTED, script=latin, language=en-us, 'ragraph tests in this ugh test-' -+i=8, index=129, no run, line end -+i=9, index=129, chars=22, level=0, gravity=south, flags=0, font=OMITTED, script=latin, language=en-us, 'case. Grow some lines!' - i=10, index=151, no run, line end - i=11, index=152, no run, line end