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

[Andreas Radke]

    Date: Tuesday, March 20, 2018 @ 10:00:44
  Author: andyrtr
Revision: 319679

upgpkg: poppler 0.63.0-1

upstream update 0.63.0

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

---------------+
 PKGBUILD      |   17 +++++------------
 gtk-doc.patch |   24 ------------------------
 2 files changed, 5 insertions(+), 36 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-03-20 09:17:35 UTC (rev 319678)
+++ PKGBUILD	2018-03-20 10:00:44 UTC (rev 319679)
@@ -4,29 +4,22 @@
 
 pkgbase=poppler
 pkgname=('poppler' 'poppler-glib' 'poppler-qt5')
-pkgver=0.62.0
+pkgver=0.63.0
 pkgrel=1
 arch=(x86_64)
 license=('GPL')
 makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg2' 'gtk3' 'pkgconfig' 'lcms2' 
              'gobject-introspection' 'icu' 'qt5-base' 'git' 'nss' 'gtk-doc' 'curl' 'poppler-data'
-             'cmake' 'python2') # python2 just for make-glib-api-docs/gtkdoc.py
+             'cmake' 'python') 
 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
-        gtk-doc.patch)
-sha256sums=('5b9a73dfd4d6f61d165ada1e4f0abd2d420494bf9d0b1c15d0db3f7b83a729c6'
-            'SKIP'
-            '4032a01456e2372e8f7c805f18634437285ce703fbcfe0fc9a3884ac39edc9ee')
+        test::git+https://anongit.freedesktop.org/git/poppler/test/#commit=0d2bfd4)
+sha256sums=('27cc8addafc791e1a26ce6acc2b490926ea73a4f89196dd8a7742cff7cf8a111'
+            'SKIP')
 
 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() {

Deleted: gtk-doc.patch
===================================================================
--- gtk-doc.patch	2018-03-20 09:17:35 UTC (rev 319678)
+++ gtk-doc.patch	2018-03-20 10:00:44 UTC (rev 319679)
@@ -1,24 +0,0 @@
---- 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)
-