[arch-commits] Commit in poppler/trunk (PKGBUILD gtk-doc.patch)

[Jan de Groot]

    Date: Friday, December 15, 2017 @ 23:06:29
  Author: jgc
Revision: 312938

Fix build with new gtk-doc

Added:
  poppler/trunk/gtk-doc.patch
Modified:
  poppler/trunk/PKGBUILD

---------------+
 PKGBUILD      |    9 +++++++--
 gtk-doc.patch |   24 ++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-12-15 22:58:11 UTC (rev 312937)
+++ PKGBUILD	2017-12-15 23:06:29 UTC (rev 312938)
@@ -14,14 +14,19 @@
 options=('!emptydirs')
 url="https://poppler.freedesktop.org/"
 source=(https://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.xz
-        test::git+https://anongit.freedesktop.org/git/poppler/test/#commit=0d2bfd4)
+        test::git+https://anongit.freedesktop.org/git/poppler/test/#commit=0d2bfd4
+        gtk-doc.patch)
 sha256sums=('1266096343f5163c1a585124e9a6d44474e1345de5cdfe55dc7b47357bcfcda9'
-            'SKIP')
+            'SKIP'
+            '4032a01456e2372e8f7c805f18634437285ce703fbcfe0fc9a3884ac39edc9ee')
 
 prepare() {
   mkdir build
   cd ${pkgbase}-${pkgver}
   sed -i -e "s:python:python2:" make-glib-api-docs
+
+  # https://bugzilla.gnome.org/show_bug.cgi?id=789800#c10
+  patch -Np1 -i ../gtk-doc.patch
 }
 
 build() {

Added: gtk-doc.patch
===================================================================
--- gtk-doc.patch	                        (rev 0)
+++ gtk-doc.patch	2017-12-15 23:06:29 UTC (rev 312938)
@@ -0,0 +1,24 @@
+--- a/gtkdoc.py
++++ b/gtkdoc.py
+@@ -319,9 +319,9 @@ class GTKDoc(object):
+             ldflags = ' "-L%s" %s ' % (self.library_path, additional_ldflags) +
+ ldflags
+             current_ld_library_path = env.get('LD_LIBRARY_PATH')
+             if current_ld_library_path:
+-                env['RUN'] = 'LD_LIBRARY_PATH="%s:%s" ' % (self.library_path, current_ld_library_path)
++                env['LD_LIBRARY_PATH'] = '%s:%s' % (self.library_path, current_ld_library_path)
+             else:
+-                env['RUN'] = 'LD_LIBRARY_PATH="%s" ' % self.library_path
++                env['LD_LIBRARY_PATH'] = self.library_path
+ 
+         if ldflags:
+             env['LDFLAGS'] = '%s %s' % (ldflags, env.get('LDFLAGS', ''))
+@@ -332,8 +332,6 @@ class GTKDoc(object):
+             self.logger.debug('CFLAGS=%s', env['CFLAGS'])
+         if 'LDFLAGS' in env:
+             self.logger.debug('LDFLAGS %s', env['LDFLAGS'])
+-        if 'RUN' in env:
+-            self.logger.debug('RUN=%s', env['RUN'])
+         self._run_command(['gtkdoc-scangobj', '--module=%s' % self.module_name],
+                           env=env, cwd=self.output_dir)
+