From 74204cd04aa5b62cff3e6bf30919cf6a06644c8e Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Mon, 16 Jun 2014 18:50:45 +0200 Subject: [PATCH] - updated to 3.04 - updated fontdirs patch - added install patch to actually install the new tools (pdftohtml and pdftopng) - enabled CMYK support --- xpdf-fontdirs.patch | 11 +++++++---- xpdf-install.patch | 26 ++++++++++++++++++++++++++ xpdf.spec | 21 ++++++++++++++------- 3 files changed, 47 insertions(+), 11 deletions(-) create mode 100644 xpdf-install.patch diff --git a/xpdf-fontdirs.patch b/xpdf-fontdirs.patch index 7bec196..50966f8 100644 --- a/xpdf-fontdirs.patch +++ b/xpdf-fontdirs.patch @@ -1,6 +1,6 @@ ---- xpdf-3.03/xpdf/GlobalParams.cc.orig 2011-08-15 23:08:53.000000000 +0200 -+++ xpdf-3.03/xpdf/GlobalParams.cc 2011-08-21 08:31:54.652749969 +0200 -@@ -110,11 +110,7 @@ +--- xpdf-3.04/xpdf/GlobalParams.cc.orig 2014-06-15 21:53:49.566112173 +0200 ++++ xpdf-3.04/xpdf/GlobalParams.cc 2014-06-15 22:01:33.869435829 +0200 +@@ -120,14 +120,7 @@ }; #else static const char *displayFontDirs[] = { @@ -9,7 +9,10 @@ - "/usr/share/fonts/default/Type1", - "/usr/share/fonts/default/ghostscript", - "/usr/share/fonts/type1/gsfonts", -+ "/usr/share/fonts/Type1", +-#if defined(__sun) && defined(__SVR4) +- "/usr/sfw/share/ghostscript/fonts", +-#endif +++ "/usr/share/fonts/Type1", NULL }; #endif diff --git a/xpdf-install.patch b/xpdf-install.patch new file mode 100644 index 0000000..6dd46d6 --- /dev/null +++ b/xpdf-install.patch @@ -0,0 +1,26 @@ +--- xpdf-3.04/Makefile.in.orig 2014-05-28 20:50:50.000000000 +0200 ++++ xpdf-3.04/Makefile.in 2014-06-16 18:42:11.004550995 +0200 +@@ -86,19 +86,23 @@ + @X@ $(INSTALL_PROGRAM) xpdf/xpdf$(EXE) $(DESTDIR)@bindir@/xpdf$(EXE) + $(INSTALL_PROGRAM) xpdf/pdftops$(EXE) $(DESTDIR)@bindir@/pdftops$(EXE) + $(INSTALL_PROGRAM) xpdf/pdftotext$(EXE) $(DESTDIR)@bindir@/pdftotext$(EXE) ++ $(INSTALL_PROGRAM) xpdf/pdftohtml$(EXE) $(DESTDIR)@bindir@/pdftohtml$(EXE) + $(INSTALL_PROGRAM) xpdf/pdfinfo$(EXE) $(DESTDIR)@bindir@/pdfinfo$(EXE) + $(INSTALL_PROGRAM) xpdf/pdffonts$(EXE) $(DESTDIR)@bindir@/pdffonts$(EXE) + $(INSTALL_PROGRAM) xpdf/pdfdetach$(EXE) $(DESTDIR)@bindir@/pdfdetach$(EXE) + @X@ $(INSTALL_PROGRAM) xpdf/pdftoppm$(EXE) $(DESTDIR)@bindir@/pdftoppm$(EXE) ++@X@ $(INSTALL_PROGRAM) xpdf/pdftopng$(EXE) $(DESTDIR)@bindir@/pdftopng$(EXE) + $(INSTALL_PROGRAM) xpdf/pdfimages$(EXE) $(DESTDIR)@bindir@/pdfimages$(EXE) + -mkdir -p $(DESTDIR)@mandir@/man1 + @X@ $(INSTALL_DATA) $(srcdir)/doc/xpdf.1 $(DESTDIR)@mandir@/man1/xpdf.1 + $(INSTALL_DATA) $(srcdir)/doc/pdftops.1 $(DESTDIR)@mandir@/man1/pdftops.1 + $(INSTALL_DATA) $(srcdir)/doc/pdftotext.1 $(DESTDIR)@mandir@/man1/pdftotext.1 ++ $(INSTALL_DATA) $(srcdir)/doc/pdftohtml.1 $(DESTDIR)@mandir@/man1/pdftohtml.1 + $(INSTALL_DATA) $(srcdir)/doc/pdfinfo.1 $(DESTDIR)@mandir@/man1/pdfinfo.1 + $(INSTALL_DATA) $(srcdir)/doc/pdffonts.1 $(DESTDIR)@mandir@/man1/pdffonts.1 + $(INSTALL_DATA) $(srcdir)/doc/pdfdetach.1 $(DESTDIR)@mandir@/man1/pdfdetach.1 + @X@ $(INSTALL_DATA) $(srcdir)/doc/pdftoppm.1 $(DESTDIR)@mandir@/man1/pdftoppm.1 ++@X@ $(INSTALL_DATA) $(srcdir)/doc/pdftopng.1 $(DESTDIR)@mandir@/man1/pdftopng.1 + $(INSTALL_DATA) $(srcdir)/doc/pdfimages.1 $(DESTDIR)@mandir@/man1/pdfimages.1 + -mkdir -p $(DESTDIR)@mandir@/man5 + $(INSTALL_DATA) $(srcdir)/doc/xpdfrc.5 $(DESTDIR)@mandir@/man5/xpdfrc.5 diff --git a/xpdf.spec b/xpdf.spec index e526c21..8f810c3 100644 --- a/xpdf.spec +++ b/xpdf.spec @@ -16,30 +16,33 @@ Summary(pt_BR.UTF-8): Visualizador de arquivos PDF Summary(ru.UTF-8): Программа для просмотра PDF файлов Summary(uk.UTF-8): Програма для перегляду PDF файлів Name: xpdf -Version: 3.03 -Release: 2 +Version: 3.04 +Release: 1 License: GPL v2 or GPL v3 Group: Applications/Publishing Source0: ftp://ftp.foolabs.com/pub/xpdf/%{name}-%{version}.tar.gz -# Source0-md5: af75f772bee0e5ae4a811ff9d03eac5a +# Source0-md5: 3bc86c69c8ff444db52461270bef3f44 Source1: %{name}.desktop Source2: %{name}.png Source3: %{name}rc Patch0: %{name}-remove_protections.patch Patch1: %{name}-fontdirs.patch +Patch2: %{name}-install.patch URL: http://www.foolabs.com/xpdf/ -BuildRequires: autoconf +BuildRequires: autoconf >= 2.57 BuildRequires: freetype-devel >= 2.1.0 BuildRequires: libpaper-devel +BuildRequires: libpng-devel BuildRequires: libstdc++-devel %{?with_x:BuildRequires: motif-devel >= 2.2} BuildRequires: rpmbuild(macros) >= 1.596 %{?with_x:BuildRequires: xorg-lib-libX11-devel} +%{?with_x:BuildRequires: xorg-lib-libXpm-devel} +%{?with_x:BuildRequires: xorg-lib-libXt-devel} Requires: desktop-file-utils Suggests: ghostscript-fonts-std BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _noautoreqdep libXm.so.1 libXm.so.2 %define specflags_ia32 -fomit-frame-pointer %description @@ -106,6 +109,7 @@ pdftops, pdftotext). %setup -q %{!?with_protections:%patch0 -p1} %patch1 -p1 +%patch2 -p1 %build %{__autoconf} @@ -113,10 +117,9 @@ pdftops, pdftotext). CXXFLAGS="%{rpmcflags} -fno-exceptions -fno-rtti" %configure \ --enable-a4-paper \ - --enable-freetype2 \ + --enable-cmyk \ --enable-multithreaded \ --enable-opi \ - --enable-wordlist \ --with-freetype2-includes=/usr/include/freetype2 %{__make} @@ -159,6 +162,8 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_bindir}/pdffonts %attr(755,root,root) %{_bindir}/pdfimages %attr(755,root,root) %{_bindir}/pdfinfo +%attr(755,root,root) %{_bindir}/pdftohtml +%attr(755,root,root) %{_bindir}/pdftopng %attr(755,root,root) %{_bindir}/pdftoppm %attr(755,root,root) %{_bindir}/pdftops %attr(755,root,root) %{_bindir}/pdftotext @@ -166,6 +171,8 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/pdffonts.1* %{_mandir}/man1/pdfimages.1* %{_mandir}/man1/pdfinfo.1* +%{_mandir}/man1/pdftohtml.1* +%{_mandir}/man1/pdftopng.1* %{_mandir}/man1/pdftoppm.1* %{_mandir}/man1/pdftops.1* %{_mandir}/man1/pdftotext.1* -- 2.44.0