Date: Tuesday, December 7, 2021 @ 11:00:21
Author: heftig
Revision: 430774
archrelease: copy trunk to extra-x86_64
Added:
pango/repos/extra-x86_64/PKGBUILD
(from rev 430773, pango/trunk/PKGBUILD)
pango/repos/extra-x86_64/fix-test.diff
(from rev 430773, pango/trunk/fix-test.diff)
Deleted:
pango/repos/extra-x86_64/PKGBUILD
pango/repos/extra-x86_64/fix-test.diff
---------------+
PKGBUILD | 127 ++++++++++++++++++++++++++++----------------------------
fix-test.diff | 60 +++++++++++++-------------
2 files changed, 95 insertions(+), 92 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-12-07 10:57:18 UTC (rev 430773)
+++ PKGBUILD 2021-12-07 11:00:21 UTC (rev 430774)
@@ -1,62 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <hef...@archlinux.org>
-# Contributor: Jan de Groot <j...@archlinux.org>
-
-pkgbase=pango
-pkgname=(pango pango-docs)
-pkgver=1.50.0
-pkgrel=2
-epoch=1
-pkgdesc="A library for layout and rendering of text"
-url="https://www.pango.org/";
-arch=(x86_64)
-license=(LGPL)
-depends=(libthai cairo libxft harfbuzz fribidi)
-makedepends=(gobject-introspection help2man git meson gi-docgen)
-checkdepends=(ttf-dejavu cantarell-fonts)
-_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() {
- arch-meson pango build -D gtk_doc=true
- meson compile -C build
-}
-
-check() {
- meson test -C build --print-errorlogs
-}
-
-package_pango() {
- provides=(libpango{,cairo,ft2,xft}-1.0.so)
-
- meson install -C build --destdir "$pkgdir"
-
- mkdir -p doc/usr/share
- mv {"$pkgdir",doc}/usr/share/doc
-}
-
-package_pango-docs() {
- pkgdesc+=" (documentation)"
- depends=()
-
- mv doc/* "$pkgdir"
-}
-
-# vim:set sw=2 et:
Copied: pango/repos/extra-x86_64/PKGBUILD (from rev 430773,
pango/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-12-07 11:00:21 UTC (rev 430774)
@@ -0,0 +1,65 @@
+# Maintainer: Jan Alexander Steffens (heftig) <hef...@archlinux.org>
+# Contributor: Jan de Groot <j...@archlinux.org>
+
+pkgbase=pango
+pkgname=(pango pango-docs)
+pkgver=1.50.0
+pkgrel=3
+epoch=1
+pkgdesc="A library for layout and rendering of text"
+url="https://www.pango.org/";
+arch=(x86_64)
+license=(LGPL)
+depends=(libthai cairo libxft harfbuzz fribidi)
+makedepends=(gobject-introspection help2man git meson gi-docgen)
+checkdepends=(ttf-dejavu cantarell-fonts)
+_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() {
+ arch-meson pango build -D gtk_doc=true
+ meson compile -C build
+}
+
+check() {
+ meson test -C build --print-errorlogs
+}
+
+package_pango() {
+ provides=(libpango{,cairo,ft2,xft}-1.0.so)
+
+ meson install -C build --destdir "$pkgdir"
+
+ mkdir -p doc/usr/share
+ mv {"$pkgdir",doc}/usr/share/doc
+}
+
+package_pango-docs() {
+ pkgdesc+=" (documentation)"
+ depends=()
+
+ mv doc/* "$pkgdir"
+}
+
+# vim:set sw=2 et:
Deleted: fix-test.diff
===================================================================
--- fix-test.diff 2021-12-07 10:57:18 UTC (rev 430773)
+++ fix-test.diff 2021-12-07 11:00:21 UTC (rev 430774)
@@ -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: pango/repos/extra-x86_64/fix-test.diff (from rev 430773,
pango/trunk/fix-test.diff)
===================================================================
--- fix-test.diff (rev 0)
+++ fix-test.diff 2021-12-07 11:00:21 UTC (rev 430774)
@@ -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
+ }
