0.0.2+2+gedb9e09-3: Modernised the PKGBUILD

4 files changed, 111 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 65b3ec82f80..8564204e19c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,22 @@
 pkgbase = lib32-pangox-compat
-	pkgdesc = X Window System font support for Pango (32 bit)
-	pkgver = 0.0.2
-	pkgrel = 2
+	pkgdesc = X Window System font support for Pango (32bit)
+	pkgver = 0.0.2+2+gedb9e09
+	pkgrel = 3
 	url = http://www.pango.org/
 	arch = x86_64
 	license = LGPL
+	makedepends = git
 	makedepends = gcc-multilib
 	makedepends = pkgconf
+	depends = pango
 	depends = lib32-pango
 	depends = pangox-compat
-	options = !libtool
-	source = http://ftp.gnome.org/pub/gnome/sources/pangox-compat/0.0/pangox-compat-0.0.2.tar.xz
-	sha256sums = 552092b3b6c23f47f4beee05495d0f9a153781f62a1c4b7ec53857a37dfce046
+	source = git+https://gitlab.gnome.org/Archive/pangox-compat#commit=edb9e0904d04d1da02bba7b78601a2aba05aaa47
+	source = 0001-Re-add-pango_x_get_shaper_map-it-is-still-used-in-th.patch
+	source = 0002-disable-shaper.patch
+	md5sums = SKIP
+	md5sums = e4ab908c4501116d492c7cc0b70ab305
+	md5sums = 8d78182e9747b425b223fa8a2b82d210
 
 pkgname = lib32-pangox-compat
 
diff --git a/0001-Re-add-pango_x_get_shaper_map-it-is-still-used-in-th.patch b/0001-Re-add-pango_x_get_shaper_map-it-is-still-used-in-th.patch
new file mode 100644
index 00000000000..de85c1719dd
--- /dev/null
+++ b/0001-Re-add-pango_x_get_shaper_map-it-is-still-used-in-th.patch
@@ -0,0 +1,39 @@
+From bd0fcfbd2f8f493e96955c1edd8a791de1e6568a Mon Sep 17 00:00:00 2001
+From: Jan de Groot <jgc@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
+
diff --git a/0002-disable-shaper.patch b/0002-disable-shaper.patch
new file mode 100644
index 00000000000..87f4598e39e
--- /dev/null
+++ b/0002-disable-shaper.patch
@@ -0,0 +1,15 @@
+--- pangox-compat/pangox.c.orig	2020-05-04 18:31:53.421197064 -0400
++++ pangox-compat/pangox.c	2020-05-04 18:32:41.251146923 -0400
+@@ -277,11 +277,11 @@ pango_x_font_class_init (PangoXFontClass
+   object_class->finalize = pango_x_font_finalize;
+   object_class->dispose = pango_x_font_dispose;
+ 
+   font_class->describe = pango_x_font_describe;
+   font_class->get_coverage = pango_x_font_get_coverage;
+-  font_class->find_shaper = pango_x_font_find_shaper;
++  /* font_class->find_shaper = pango_x_font_find_shaper; */
+   font_class->get_glyph_extents = pango_x_font_get_glyph_extents;
+   font_class->get_metrics = pango_x_font_get_metrics;
+   font_class->get_font_map = pango_x_font_get_font_map;
+ }
+ 
diff --git a/PKGBUILD b/PKGBUILD
index b8a9ea138cf..51e14afb41c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,32 +1,58 @@
-# Maintainer: drrossum <d.r.vanrossum ag gmx.de>
+# Maintainer: GordonGR <ntheo1979@gmail.com>
+# Contributor: drrossum <d.r.vanrossum ag gmx.de>
 # Contributor: josephgbr <rafael.f.f1@gmail.com>
 
-_pkgbase=pangox-compat
-pkgname=lib32-${_pkgbase}
-pkgver=0.0.2
-_pkgver=0.0
-pkgrel=2
-pkgdesc="X Window System font support for Pango (32 bit)"
+_pkgname='pangox-compat'
+pkgname=lib32-${_pkgname}
+pkgver='0.0.2+2+gedb9e09'
+pkgrel=3
+pkgdesc='X Window System font support for Pango (32bit)'
 arch=('x86_64')
+url='http://www.pango.org/'
 license=('LGPL')
-depends=('lib32-pango' "${_pkgbase}")
-makedepends=('gcc-multilib' 'pkgconf')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/${_pkgbase}/${_pkgver}/${_pkgbase}-${pkgver}.tar.xz)
-url="http://www.pango.org/"
-sha256sums=('552092b3b6c23f47f4beee05495d0f9a153781f62a1c4b7ec53857a37dfce046')
+depends=('pango' 'lib32-pango' "${_pkgname}")
+makedepends=('git' 'gcc-multilib' 'pkgconf')
+source=("git+https://gitlab.gnome.org/Archive/pangox-compat"
+		'0001-Re-add-pango_x_get_shaper_map-it-is-still-used-in-th.patch'
+		'0002-disable-shaper.patch')
+source[0]+='#commit=edb9e0904d04d1da02bba7b78601a2aba05aaa47'  # master
+md5sums=('SKIP'
+         'e4ab908c4501116d492c7cc0b70ab305'
+         '8d78182e9747b425b223fa8a2b82d210')
+
+prepare() {
+  cd ${_pkgname}
+  patch -Nup1 -i '../0001-Re-add-pango_x_get_shaper_map-it-is-still-used-in-th.patch'
+  # diff -pNau5 pangox-compat/pangox.c{.orig,} > '0002-disable-shaper.patch'
+  patch -Nup1 -i '../0002-disable-shaper.patch'
+}
 
 build() {
-  export CC='gcc -m32'
-  export PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
-  
-  cd ${_pkgbase}-${pkgver}
+export CC='gcc -m32'
+export CXX="g++ -m32"
+export PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
+cd ${_pkgname}
+
+if [ ! -s 'Makefile' ]; then
+  NOCONFIGURE=1 ./autogen.sh
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --disable-static --libdir=/usr/lib32
-  make
+    --disable-static --libdir=/usr/lib32 --libexecdir=/usr/lib32
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+fi
+make
 }
 
 package() {
-  make -j1 -C ${_pkgbase}-${pkgver} DESTDIR="${pkgdir}" install
+  cd ${_pkgname}
+  make -j1 DESTDIR="${pkgdir}" install
   rm -rf "${pkgdir}"/{etc,usr/include}
 }
+
+
+
+
+
+
+
+
+