[packages/poppler] patch to fix build with gtk-doc 1.27

atler atler at pld-linux.org
Wed Feb 14 00:32:43 CET 2018


commit 3ae1ae124bbf472cd8f0b4cd76e02e2f1e21defe
Author: Jan Palus <atler at pld-linux.org>
Date:   Wed Feb 14 00:30:32 2018 +0100

    patch to fix build with gtk-doc 1.27

 poppler-gtkdoc1_27.patch | 14 ++++++++++++++
 poppler.spec             |  2 ++
 2 files changed, 16 insertions(+)
---
diff --git a/poppler.spec b/poppler.spec
index 89ec395..f011916 100644
--- a/poppler.spec
+++ b/poppler.spec
@@ -18,6 +18,7 @@ Group:		Libraries
 Source0:	https://poppler.freedesktop.org/%{name}-%{version}.tar.xz
 # Source0-md5:	42b801f2defaccb6b6cf1bf783ee1552
 Patch0:		%{name}-gtkdocdir.patch
+Patch1:		%{name}-gtkdoc1_27.patch
 URL:		https://poppler.freedesktop.org/
 %{?with_qt5:BuildRequires:	Qt5Core-devel >= %{qt5_ver}}
 %{?with_qt5:BuildRequires:	Qt5Gui-devel >= %{qt5_ver}}
@@ -223,6 +224,7 @@ Pakiet zawiera zestaw narzędzi do plików PDF. Programy te umożliwiają
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 install -d build
diff --git a/poppler-gtkdoc1_27.patch b/poppler-gtkdoc1_27.patch
new file mode 100644
index 0000000..d2db778
--- /dev/null
+++ b/poppler-gtkdoc1_27.patch
@@ -0,0 +1,14 @@
+--- poppler-0.62.0/gtkdoc.py.orig	2018-02-14 00:01:33.698649806 +0100
++++ poppler-0.62.0/gtkdoc.py	2018-02-14 00:02:06.508409173 +0100
+@@ -319,9 +319,9 @@
+             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['LIBRARY_PATH'] = 'LD_LIBRARY_PATH="%s:%s" ' % (self.library_path, current_ld_library_path)
+             else:
+-                env['RUN'] = 'LD_LIBRARY_PATH="%s" ' % self.library_path
++                env['LIBRARY_PATH'] = 'LD_LIBRARY_PATH="%s" ' % self.library_path
+ 
+         if ldflags:
+             env['LDFLAGS'] = '%s %s' % (ldflags, env.get('LDFLAGS', ''))
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/poppler.git/commitdiff/6a04f0ad8a134019e4e5e7111ad636374a542dbb



More information about the pld-cvs-commit mailing list