[arch-commits] Commit in pangox-compat/repos (6 files)

Jan de Groot jgc at archlinux.org
Sun Feb 19 08:01:42 UTC 2017


    Date: Sunday, February 19, 2017 @ 08:01:41
  Author: jgc
Revision: 289239

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  pangox-compat/repos/extra-i686/0001-Re-add-pango_x_get_shaper_map-it-is-still-used-in-th.patch
    (from rev 289238, pangox-compat/trunk/0001-Re-add-pango_x_get_shaper_map-it-is-still-used-in-th.patch)
  pangox-compat/repos/extra-i686/PKGBUILD
    (from rev 289238, pangox-compat/trunk/PKGBUILD)
  pangox-compat/repos/extra-x86_64/0001-Re-add-pango_x_get_shaper_map-it-is-still-used-in-th.patch
    (from rev 289238, pangox-compat/trunk/0001-Re-add-pango_x_get_shaper_map-it-is-still-used-in-th.patch)
  pangox-compat/repos/extra-x86_64/PKGBUILD
    (from rev 289238, pangox-compat/trunk/PKGBUILD)
Deleted:
  pangox-compat/repos/extra-i686/PKGBUILD
  pangox-compat/repos/extra-x86_64/PKGBUILD

------------------------------------------------------------------------------+
 /PKGBUILD                                                                    |   84 ++++++++++
 extra-i686/0001-Re-add-pango_x_get_shaper_map-it-is-still-used-in-th.patch   |   39 ++++
 extra-i686/PKGBUILD                                                          |   39 ----
 extra-x86_64/0001-Re-add-pango_x_get_shaper_map-it-is-still-used-in-th.patch |   39 ++++
 extra-x86_64/PKGBUILD                                                        |   39 ----
 5 files changed, 162 insertions(+), 78 deletions(-)

Copied: pangox-compat/repos/extra-i686/0001-Re-add-pango_x_get_shaper_map-it-is-still-used-in-th.patch (from rev 289238, pangox-compat/trunk/0001-Re-add-pango_x_get_shaper_map-it-is-still-used-in-th.patch)
===================================================================
--- extra-i686/0001-Re-add-pango_x_get_shaper_map-it-is-still-used-in-th.patch	                        (rev 0)
+++ extra-i686/0001-Re-add-pango_x_get_shaper_map-it-is-still-used-in-th.patch	2017-02-19 08:01:41 UTC (rev 289239)
@@ -0,0 +1,39 @@
+From bd0fcfbd2f8f493e96955c1edd8a791de1e6568a Mon Sep 17 00:00:00 2001
+From: Jan de Groot <jgc at archlinux.org>
+Date: Sun, 19 Feb 2017 07:57:57 +0000
+Subject: [PATCH] Re-add pango_x_get_shaper_map, it is still used in the
+ fallback code
+
+---
+ pangox.c | 15 +++++++++++++++
+ 1 file changed, 15 insertions(+)
+
+diff --git a/pangox.c b/pangox.c
+index 0a66cc9..1e6efc6 100644
+--- a/pangox.c
++++ b/pangox.c
+@@ -1344,6 +1344,21 @@ pango_x_font_describe (PangoFont *font)
+     return NULL;
+ }
+ 
++PangoMap *
++pango_x_get_shaper_map (PangoLanguage *language)
++{
++  static guint engine_type_id = 0;
++  static guint render_type_id = 0;
++
++  if (engine_type_id == 0)
++    {
++      engine_type_id = g_quark_from_static_string (PANGO_ENGINE_TYPE_SHAPE);
++      render_type_id = g_quark_from_static_string (PANGO_RENDER_TYPE_X);
++    }
++
++  return pango_find_map (language, engine_type_id, render_type_id);
++}
++
+ static PangoCoverage *
+ pango_x_font_get_coverage (PangoFont     *font,
+ 			   PangoLanguage *language)
+-- 
+2.11.1
+

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2017-02-19 08:01:34 UTC (rev 289238)
+++ extra-i686/PKGBUILD	2017-02-19 08:01:41 UTC (rev 289239)
@@ -1,39 +0,0 @@
-# $Id$ 
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-
-pkgname=pangox-compat
-pkgver=0.0.2+2+gedb9e09
-pkgrel=1
-pkgdesc="X Window System font support for Pango"
-arch=('i686' 'x86_64')
-license=('LGPL')
-depends=('pango')
-makedepends=(git)
-_commit=edb9e0904d04d1da02bba7b78601a2aba05aaa47  # master
-source=("git+https://git.gnome.org/browse/pangox-compat#commit=$_commit")
-url="http://www.pango.org/"
-sha256sums=('SKIP')
-
-pkgver() {
-  cd $pkgname
-  git describe --tags | sed 's/-/+/g'
-}
-
-prepare() {
-  cd $pkgname
-  NOCONFIGURE=1 ./autogen.sh
-}
-
-build() {
-  cd $pkgname
-
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --disable-static
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-  make
-}
-
-package() {
-  cd $pkgname
-  make -j1 DESTDIR="${pkgdir}" install
-}

Copied: pangox-compat/repos/extra-i686/PKGBUILD (from rev 289238, pangox-compat/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2017-02-19 08:01:41 UTC (rev 289239)
@@ -0,0 +1,42 @@
+# $Id$ 
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+
+pkgname=pangox-compat
+pkgver=0.0.2+2+gedb9e09
+pkgrel=2
+pkgdesc="X Window System font support for Pango"
+arch=('i686' 'x86_64')
+license=('LGPL')
+depends=('pango')
+makedepends=(git)
+_commit=edb9e0904d04d1da02bba7b78601a2aba05aaa47  # master
+source=("git+https://git.gnome.org/browse/pangox-compat#commit=$_commit"
+        0001-Re-add-pango_x_get_shaper_map-it-is-still-used-in-th.patch)
+url="http://www.pango.org/"
+sha256sums=('SKIP'
+            'd5aad903439ede05b866c9a2962f293bec4897f07d5a7b07ebc5aa99eeb27e48')
+
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+  cd $pkgname
+  patch -Np1 -i ../0001-Re-add-pango_x_get_shaper_map-it-is-still-used-in-th.patch
+  NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+  cd $pkgname
+
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+    --disable-static
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+  make
+}
+
+package() {
+  cd $pkgname
+  make -j1 DESTDIR="${pkgdir}" install
+}

Copied: pangox-compat/repos/extra-x86_64/0001-Re-add-pango_x_get_shaper_map-it-is-still-used-in-th.patch (from rev 289238, pangox-compat/trunk/0001-Re-add-pango_x_get_shaper_map-it-is-still-used-in-th.patch)
===================================================================
--- extra-x86_64/0001-Re-add-pango_x_get_shaper_map-it-is-still-used-in-th.patch	                        (rev 0)
+++ extra-x86_64/0001-Re-add-pango_x_get_shaper_map-it-is-still-used-in-th.patch	2017-02-19 08:01:41 UTC (rev 289239)
@@ -0,0 +1,39 @@
+From bd0fcfbd2f8f493e96955c1edd8a791de1e6568a Mon Sep 17 00:00:00 2001
+From: Jan de Groot <jgc at archlinux.org>
+Date: Sun, 19 Feb 2017 07:57:57 +0000
+Subject: [PATCH] Re-add pango_x_get_shaper_map, it is still used in the
+ fallback code
+
+---
+ pangox.c | 15 +++++++++++++++
+ 1 file changed, 15 insertions(+)
+
+diff --git a/pangox.c b/pangox.c
+index 0a66cc9..1e6efc6 100644
+--- a/pangox.c
++++ b/pangox.c
+@@ -1344,6 +1344,21 @@ pango_x_font_describe (PangoFont *font)
+     return NULL;
+ }
+ 
++PangoMap *
++pango_x_get_shaper_map (PangoLanguage *language)
++{
++  static guint engine_type_id = 0;
++  static guint render_type_id = 0;
++
++  if (engine_type_id == 0)
++    {
++      engine_type_id = g_quark_from_static_string (PANGO_ENGINE_TYPE_SHAPE);
++      render_type_id = g_quark_from_static_string (PANGO_RENDER_TYPE_X);
++    }
++
++  return pango_find_map (language, engine_type_id, render_type_id);
++}
++
+ static PangoCoverage *
+ pango_x_font_get_coverage (PangoFont     *font,
+ 			   PangoLanguage *language)
+-- 
+2.11.1
+

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2017-02-19 08:01:34 UTC (rev 289238)
+++ extra-x86_64/PKGBUILD	2017-02-19 08:01:41 UTC (rev 289239)
@@ -1,39 +0,0 @@
-# $Id$ 
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-
-pkgname=pangox-compat
-pkgver=0.0.2+2+gedb9e09
-pkgrel=1
-pkgdesc="X Window System font support for Pango"
-arch=('i686' 'x86_64')
-license=('LGPL')
-depends=('pango')
-makedepends=(git)
-_commit=edb9e0904d04d1da02bba7b78601a2aba05aaa47  # master
-source=("git+https://git.gnome.org/browse/pangox-compat#commit=$_commit")
-url="http://www.pango.org/"
-sha256sums=('SKIP')
-
-pkgver() {
-  cd $pkgname
-  git describe --tags | sed 's/-/+/g'
-}
-
-prepare() {
-  cd $pkgname
-  NOCONFIGURE=1 ./autogen.sh
-}
-
-build() {
-  cd $pkgname
-
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --disable-static
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-  make
-}
-
-package() {
-  cd $pkgname
-  make -j1 DESTDIR="${pkgdir}" install
-}

Copied: pangox-compat/repos/extra-x86_64/PKGBUILD (from rev 289238, pangox-compat/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2017-02-19 08:01:41 UTC (rev 289239)
@@ -0,0 +1,42 @@
+# $Id$ 
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+
+pkgname=pangox-compat
+pkgver=0.0.2+2+gedb9e09
+pkgrel=2
+pkgdesc="X Window System font support for Pango"
+arch=('i686' 'x86_64')
+license=('LGPL')
+depends=('pango')
+makedepends=(git)
+_commit=edb9e0904d04d1da02bba7b78601a2aba05aaa47  # master
+source=("git+https://git.gnome.org/browse/pangox-compat#commit=$_commit"
+        0001-Re-add-pango_x_get_shaper_map-it-is-still-used-in-th.patch)
+url="http://www.pango.org/"
+sha256sums=('SKIP'
+            'd5aad903439ede05b866c9a2962f293bec4897f07d5a7b07ebc5aa99eeb27e48')
+
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+  cd $pkgname
+  patch -Np1 -i ../0001-Re-add-pango_x_get_shaper_map-it-is-still-used-in-th.patch
+  NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+  cd $pkgname
+
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+    --disable-static
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+  make
+}
+
+package() {
+  cd $pkgname
+  make -j1 DESTDIR="${pkgdir}" install
+}



More information about the arch-commits mailing list