[arch-commits] Commit in lib32-pango/repos/multilib-x86_64 (3 files)
Jan Steffens
heftig at gemini.archlinux.org
Wed Feb 9 21:15:14 UTC 2022
Date: Wednesday, February 9, 2022 @ 21:15:14
Author: heftig
Revision: 1130417
archrelease: copy trunk to multilib-x86_64
Added:
lib32-pango/repos/multilib-x86_64/PKGBUILD
(from rev 1130416, lib32-pango/trunk/PKGBUILD)
Deleted:
lib32-pango/repos/multilib-x86_64/PKGBUILD
lib32-pango/repos/multilib-x86_64/fix-test.diff
---------------+
PKGBUILD | 107 +++++++++++++++++++++++-------------------------
fix-test.diff | 123 --------------------------------------------------------
2 files changed, 51 insertions(+), 179 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-02-09 21:14:52 UTC (rev 1130416)
+++ PKGBUILD 2022-02-09 21:15:14 UTC (rev 1130417)
@@ -1,56 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
-# Contributor: Biru Ionut <ionut at archlinux.ro>
-# Contributor: Pierre Schmitz <pierre at archlinux.de>
-# Contributor: Mikko Seppälä <t-r-a-y at 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:
Copied: lib32-pango/repos/multilib-x86_64/PKGBUILD (from rev 1130416, lib32-pango/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-02-09 21:15:14 UTC (rev 1130417)
@@ -0,0 +1,51 @@
+# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
+# Contributor: Biru Ionut <ionut at archlinux.ro>
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
+# Contributor: Mikko Seppälä <t-r-a-y at mbnet.fi>
+
+pkgname=lib32-pango
+pkgver=1.50.4
+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=bcf61fc3a0c30da173c8629d1458fe3440288878 # tags/1.50.4^0
+source=("git+https://gitlab.gnome.org/GNOME/pango.git#commit=$_commit")
+sha256sums=('SKIP')
+
+pkgver() {
+ cd pango
+ git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
+}
+
+prepare() {
+ cd pango
+}
+
+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 2022-02-09 21:14:52 UTC (rev 1130416)
+++ fix-test.diff 2022-02-09 21:15:14 UTC (rev 1130417)
@@ -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
- }
More information about the arch-commits
mailing list