From: Jan Palus Date: Tue, 13 Feb 2018 23:30:32 +0000 (+0100) Subject: patch to fix build with gtk-doc 1.27 X-Git-Tag: auto/th/poppler-0.65.0-1~3 X-Git-Url: https://git.pld-linux.org/?p=packages%2Fpoppler.git;a=commitdiff_plain;h=3ae1ae124bbf472cd8f0b4cd76e02e2f1e21defe patch to fix build with gtk-doc 1.27 --- 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', '')) 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