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

2020-08-20 Thread Jan Steffens via arch-commits 
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.patch2020-08-20 20:48:39 UTC (rev 
685684)
+++ 0001-Use-shape-flags-for-tab-width.patch2020-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)" 
-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, >analysis, glyphs);
-+  pango_shape_with_flags ("", 8, "", 8, >analysis, 
glyphs, shape_flags);
- 
-   pango_item_free (item);
-   g_list_free (items);
--- 
-2.25.0
-

Deleted: PKGBUILD
===
--- PKGBUILD2020-08-20 20:48:39 UTC (rev 685684)
+++ PKGBUILD2020-08-20 20:55:45 UTC (rev 685685)
@@ -1,47 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) 
-# Contributor: Biru Ionut 
-# Contributor: Pierre Schmitz 
-# Contributor: Mikko Seppälä 
-
-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)
+++ PKGBUILD2020-08-20 20:55:45 UTC (rev 685685)
@@ -0,0 +1,47 @@
+# Maintainer: Jan Alexander Steffens (heftig) 
+# Contributor: Biru Ionut 
+# Contributor: Pierre Schmitz 
+# Contributor: Mikko Seppälä 
+
+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
+}
+

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

2016-10-21 Thread Felix Yan 
Date: Friday, October 21, 2016 @ 10:10:21
  Author: felixonmars
Revision: 192847

archrelease: copy trunk to multilib-x86_64

Added:
  lib32-pango/repos/multilib-x86_64/PKGBUILD
(from rev 192846, lib32-pango/trunk/PKGBUILD)
Deleted:
  lib32-pango/repos/multilib-x86_64/PKGBUILD
  lib32-pango/repos/multilib-x86_64/pango.install

---+
 PKGBUILD  |   97 +++-
 pango.install |   19 --
 2 files changed, 48 insertions(+), 68 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2016-10-21 10:09:00 UTC (rev 192846)
+++ PKGBUILD2016-10-21 10:10:21 UTC (rev 192847)
@@ -1,49 +0,0 @@
-# $Id$
-# Contributor: Pierre Schmitz 
-# Contributor: Mikko Seppälä 
-# Maintainer: Biru Ionut 
-
-_pkgbasename=pango
-pkgname=lib32-$_pkgbasename
-pkgver=1.40.1
-pkgrel=1
-pkgdesc="A library for layout and rendering of text (32-bit)"
-arch=('x86_64')
-license=('LGPL')
-depends=('lib32-libthai' 'lib32-libgl' 'lib32-cairo' 'lib32-libxft'
- $_pkgbasename)
-makedepends=('gcc-multilib' 'lib32-mesa-libgl')
-options=('!emptydirs')
-install=pango.install
-source=(https://download.gnome.org/sources/${_pkgbasename}/${pkgver:0:4}/${_pkgbasename}-${pkgver}.tar.xz)
-url="http://www.pango.org/;
-sha256sums=('e27af54172c72b3ac6be53c9a4c67053e16c905e02addcf3a603ceb2005c1a40')
-
-prepare() {
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-
-  sed -i 's#"pango.modules"#"pango.modules-32"#' pango/modules.c
-}
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-
-  ./configure --prefix=/usr --libdir=/usr/lib32 --sysconfdir=/etc \
-  --localstatedir=/var --with-included-modules=basic-fc \
-  
--with-dynamic-modules=arabic-fc,arabic-lang,basic-fc,basic-win32,basic-x,basic-atsui,hangul-fc,hebrew-fc,indic-fc,indic-lang,khmer-fc,syriac-fc,tibetan-fc
 \
-  --disable-introspection
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-  make
-}
-
-package() {
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-  rm -rf "$pkgdir"/etc
-  rm -rf "$pkgdir"/usr/{bin/pango-view,share,include}
-}

Copied: lib32-pango/repos/multilib-x86_64/PKGBUILD (from rev 192846, 
lib32-pango/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2016-10-21 10:10:21 UTC (rev 192847)
@@ -0,0 +1,48 @@
+# $Id$
+# Contributor: Pierre Schmitz 
+# Contributor: Mikko Seppälä 
+# Maintainer: Biru Ionut 
+
+_pkgbasename=pango
+pkgname=lib32-$_pkgbasename
+pkgver=1.40.3
+pkgrel=1
+pkgdesc="A library for layout and rendering of text (32-bit)"
+arch=('x86_64')
+license=('LGPL')
+depends=('lib32-libthai' 'lib32-libgl' 'lib32-cairo' 'lib32-libxft'
+ $_pkgbasename)
+makedepends=('gcc-multilib' 'lib32-mesa-libgl')
+options=('!emptydirs')
+source=(https://download.gnome.org/sources/${_pkgbasename}/${pkgver:0:4}/${_pkgbasename}-${pkgver}.tar.xz)
+url="http://www.pango.org/;
+sha256sums=('abba8b5ce728520c3a0f1535eab19eac3c14aeef7faa5aded90017ceac2711d3')
+
+prepare() {
+  cd "${srcdir}/${_pkgbasename}-${pkgver}"
+
+  sed -i 's#"pango.modules"#"pango.modules-32"#' pango/modules.c
+}
+
+build() {
+  export CC="gcc -m32"
+  export CXX="g++ -m32"
+  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+
+  cd "${srcdir}/${_pkgbasename}-${pkgver}"
+
+  ./configure --prefix=/usr --libdir=/usr/lib32 --sysconfdir=/etc \
+  --localstatedir=/var \
+  
--with-dynamic-modules=arabic-fc,arabic-lang,basic-fc,basic-win32,basic-x,basic-atsui,hangul-fc,hebrew-fc,indic-fc,indic-lang,khmer-fc,syriac-fc,tibetan-fc
 \
+  --disable-introspection
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+  make
+}
+
+package() {
+  cd "${srcdir}/${_pkgbasename}-${pkgver}"
+
+  make DESTDIR="${pkgdir}" install
+  rm -rf "$pkgdir"/etc
+  rm -rf "$pkgdir"/usr/{bin/pango-view,share,include}
+}

Deleted: pango.install
===
--- pango.install   2016-10-21 10:09:00 UTC (rev 192846)
+++ pango.install   2016-10-21 10:10:21 UTC (rev 192847)
@@ -1,19 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-   # we need to ldconfig first, in case xfree86's libs aren't
-   # in ld.so.cache yet
-   sbin/ldconfig -r .
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-   if [ -f etc/pango/pango.modules-32 ]; then
-   rm etc/pango/pango.modules-32
-   fi
-}
-
-# arg 1:  the old package version
-pre_remove() {
-   post_upgrade
-}