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

[Jan Steffens]

    Date: Thursday, August 20, 2020 @ 20:55:45
  Author: heftig
Revision: 685685

archrelease: copy trunk to multilib-x86_64

Added:
  lib32-pango/repos/multilib-x86_64/PKGBUILD
    (from rev 685684, lib32-pango/trunk/PKGBUILD)
Deleted:
  lib32-pango/repos/multilib-x86_64/0001-Use-shape-flags-for-tab-width.patch
  lib32-pango/repos/multilib-x86_64/PKGBUILD

------------------------------------------+
 0001-Use-shape-flags-for-tab-width.patch |   41 ------------
 PKGBUILD                                 |   94 ++++++++++++++---------------
 2 files changed, 47 insertions(+), 88 deletions(-)

Deleted: 0001-Use-shape-flags-for-tab-width.patch
===================================================================
--- 0001-Use-shape-flags-for-tab-width.patch	2020-08-20 20:48:39 UTC (rev 685684)
+++ 0001-Use-shape-flags-for-tab-width.patch	2020-08-20 20:55:45 UTC (rev 685685)
@@ -1,41 +0,0 @@
-From 8a0d057212a307fdb4612b52a0becf678d726d33 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
-Date: Tue, 11 Feb 2020 03:51:19 +0100
-Subject: [PATCH] Use shape flags for tab width
-
-We need to apply the right shape flags to the tab width calculation,
-otherwise (when glyph positions get rounded, which is the default) our
-tab width will be slightly off from what 8 spaces normally produce.
-
-https://gitlab.gnome.org/GNOME/pango/issues/425
----
- pango/pango-layout.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/pango/pango-layout.c b/pango/pango-layout.c
-index 44d59367..643f5623 100644
---- a/pango/pango-layout.c
-+++ b/pango/pango-layout.c
-@@ -3061,6 +3061,10 @@ ensure_tab_width (PangoLayout *layout)
-       PangoAttrIterator *iter;
-       PangoFontDescription *font_desc = pango_font_description_copy_static (pango_context_get_font_description (layout->context));
-       PangoLanguage *language;
-+      PangoShapeFlags shape_flags = PANGO_SHAPE_NONE;
-+
-+      if (pango_context_get_round_glyph_positions (layout->context))
-+        shape_flags |= PANGO_SHAPE_ROUND_POSITIONS;
- 
-       layout_attrs = pango_layout_get_effective_attributes (layout);
-       iter = pango_attr_list_get_iterator (layout_attrs);
-@@ -3089,7 +3093,7 @@ ensure_tab_width (PangoLayout *layout)
-       pango_attr_list_unref (tmp_attrs);
- 
-       item = items->data;
--      pango_shape ("        ", 8, &item->analysis, glyphs);
-+      pango_shape_with_flags ("        ", 8, "        ", 8, &item->analysis, glyphs, shape_flags);
- 
-       pango_item_free (item);
-       g_list_free (items);
--- 
-2.25.0
-

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-08-20 20:48:39 UTC (rev 685684)
+++ PKGBUILD	2020-08-20 20:55:45 UTC (rev 685685)
@@ -1,47 +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.46.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 noto-fonts)
-provides=(libpango{,cairo,ft2,xft}-1.0.so)
-_commit=3eaff0ed87763e3a7d1e36541cbc0fdd7df58269  # tags/1.46.0^0
-source=("git+https://gitlab.gnome.org/GNOME/pango.git#commit=$_commit")
-sha256sums=('SKIP')
-
-pkgver() {
-  cd pango
-  git describe --tags | sed '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=false
-  meson compile -C build
-}
-
-check() {
-  meson test -C build --print-errorlogs
-}
-
-package() {
-  DESTDIR="$pkgdir" meson install -C build
-  rm -r "$pkgdir"/usr/{bin,include}
-}

Copied: lib32-pango/repos/multilib-x86_64/PKGBUILD (from rev 685684, lib32-pango/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-08-20 20:55:45 UTC (rev 685685)
@@ -0,0 +1,47 @@
+# 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.46.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 noto-fonts)
+provides=(libpango{,cairo,ft2,xft}-1.0.so)
+_commit=265c4e50d29d58c0e07c0db26805220c7b878f5c  # tags/1.46.1^0
+source=("git+https://gitlab.gnome.org/GNOME/pango.git#commit=$_commit")
+sha256sums=('SKIP')
+
+pkgver() {
+  cd pango
+  git describe --tags | sed '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=false
+  meson compile -C build
+}
+
+check() {
+  meson test -C build --print-errorlogs
+}
+
+package() {
+  DESTDIR="$pkgdir" meson install -C build
+  rm -r "$pkgdir"/usr/{bin,include}
+}