Hello community, here is the log from the commit of package xpdf-poppler for openSUSE:Factory checked in at Thu Sep 22 16:57:34 CEST 2011.
-------- --- xpdf-poppler/xpdf-poppler.changes 2011-09-20 17:42:50.000000000 +0200 +++ /mounts/work_src_done/STABLE/xpdf-poppler/xpdf-poppler.changes 2011-09-22 15:52:29.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Sep 22 13:47:52 UTC 2011 - [email protected] + +- switch to Rogério Brito's branch, see + https://github.com/rbrito/xpdf-poppler +- upstreamed or obsoleted almost all our patches + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- xpdf-3.02-poppler-20071121.tar.bz2 xpdf-poppler-add-and-subtract-key-binding.patch xpdf-poppler-autohinting-as-option.patch xpdf-poppler-crash-in-japanese-locale.patch xpdf-poppler-cut-and-paste-default-output-encoding.patch xpdf-poppler-cxx-flags.patch xpdf-poppler-getCMap-arguments.patch xpdf-poppler-i18n.patch xpdf-poppler-no-copy-dt-needed-entries.patch xpdf-poppler-no-goto-when-fullscreen.patch xpdf-poppler-pimage-null.patch xpdf-poppler-poppler-0.10.0.patch xpdf-poppler-poppler-0.16.0.patch xpdf-poppler-private-textpage-destructor.patch xpdf-poppler-search-non-ascii.patch xpdf-poppler-set-icon.patch xpdf-poppler-settitle.patch xpdf-poppler-xpdfrc.5-reference.patch xpdf.desktop xpdfrc New: ---- xpdf-poppler.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xpdf-poppler.spec ++++++ --- /var/tmp/diff_new_pack.gvO2Xw/_old 2011-09-22 16:57:28.000000000 +0200 +++ /var/tmp/diff_new_pack.gvO2Xw/_new 2011-09-22 16:57:28.000000000 +0200 @@ -15,120 +15,56 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild -%define releasedate 20071121 Name: xpdf-poppler BuildRequires: gcc-c++ ghostscript-fonts-std libpoppler-devel openmotif-devel update-desktop-files xorg-x11 License: GPLv2 Group: Productivity/Publishing/PDF -Version: 3.02 +Version: 3.02.20110922 Release: 18 -AutoReqProv: on Requires: ghostscript-fonts-std Summary: A PDF File Viewer for the X Window System -Source0: xpdf-%{version}-poppler-%{releasedate}.tar.bz2 -Source1: xpdf.desktop -Source2: xpdf.png -Source3: xpdfrc -# PATCH-FEATURE-UPSTREAM xpdf-poppler-i18n.patch [email protected] -Patch0: %{name}-i18n.patch -Patch1: %{name}-settitle.patch -# PATCH-FEATURE-UPSTREAM xpdf-poppler-search-non-ascii.patch [email protected] -Patch2: %{name}-search-non-ascii.patch -# PATCH-FEATURE-UPSTREAM xpdf-poppler-cut-and-paste-default-output-encoding.patch [email protected] -Patch3: %{name}-cut-and-paste-default-output-encoding.patch -# PATCH-FIX-OPENSUSE xpdf-poppler-crash-in-japanese-locale.patch [email protected] -Patch4: %{name}-crash-in-japanese-locale.patch -# PATCH-FEATURE-UPSTREAM xpdf-poppler-add-and-subtract-key-binding.patch [email protected] -Patch5: %{name}-add-and-subtract-key-binding.patch -# PATCH-FIX-UPSTREAM xpdf-poppler-poppler-0.10.0.patch [email protected] -Patch6: %{name}-poppler-0.10.0.patch -# PATCH-FIX-UPSTREAM xpdf-poppler-cxx-flags.patch [email protected] -Patch7: %{name}-cxx-flags.patch -# PATCH-FIX-OPENSUSE xpdf-poppler-xpdfrc.5-reference.patch [email protected] -Patch8: %{name}-xpdfrc.5-reference.patch -# PATCH-FIX-UPSTREAM xpdf-poppler-disable-autohinting.patch -Patch9: %{name}-autohinting-as-option.patch -# PATCH-FIX-UPSTREAM xpdf-poppler-private-textpage-destructor.patch [email protected] -Patch10: %{name}-private-textpage-destructor.patch -# PATCH-FIX-UPSTREAM xpdf-poppler-getCMap-arguments.patch [email protected] -Patch11: %{name}-getCMap-arguments.patch -Patch12: %{name}-set-icon.patch -Patch13: %{name}-no-goto-when-fullscreen.patch -Patch14: %{name}-pimage-null.patch -Patch15: %{name}-poppler-0.16.0.patch -Patch16: %{name}-no-copy-dt-needed-entries.patch -# PATCH-FIX-OPENSUSE xpdf-poppler-poppler-0.18.0.patch [email protected] -- Fix build with poppler 0.18; note that we remove the build of ImageOutputDev.o since poppler uses libjpeg directly. Cannot be sent upstream until we update the package to latest upstream code. -Patch17: %{name}-poppler-0.18.0.patch +Source0: xpdf-poppler.tar.bz2 +Source1: xpdf.png +Patch0: %{name}-poppler-0.18.0.patch Url: http://www.foolabs.com/xpdf/ BuildRoot: %{_tmppath}/%{name}-%{version}-build -Obsoletes: xpdf -Provides: xpdf +Obsoletes: xpdf <= 3.02 +Provides: xpdf = %{version} %description This tool is used for viewing PDF (Portable Document Format) files. It is designed to be small and efficient. - - -Authors: --------- - Derek B. Noonburg <[email protected]> - %prep -%setup -q -n xpdf-%{version}-poppler -%patch0 -p2 -#%patch1 -p2 -- seems not to be needed -%patch2 -p2 -%patch3 -p2 -%patch4 -p2 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -%patch9 -%patch10 -%patch11 -%patch12 -p1 -%patch13 -%patch14 -p1 -%patch15 -p1 -%patch16 -p1 +%setup -q -n xpdf-poppler %if 0%{?suse_version} > 1140 -%patch17 -p1 +%patch0 -p1 %endif %build -export CXXFLAGS="$RPM_OPT_FLAGS -DSYSTEM_XPDFRC=\\\"/etc/xpdfrc\\\"" +export CXXFLAGS="$RPM_OPT_FLAGS" export CFLAGS="$RPM_OPT_FLAGS" -mv parseargs.c parseargs.cc +./autogen.sh +%configure --docdir=%{_docdir}/%{name} make %install -mkdir -p %{buildroot}%{_bindir} -install -m 755 xpdf %{buildroot}%{_bindir} -mkdir -p %{buildroot}%{_mandir}/man1 -install -m 644 xpdf.1 %{buildroot}%{_mandir}/man1 -mkdir -p %{buildroot}%{_datadir}/applications/ -install -m 644 %{S:1} %{buildroot}%{_datadir}/applications/ -mkdir -p %{buildroot}%{_datadir}/pixmaps/ -install -m 644 %{S:2} %{buildroot}%{_datadir}/pixmaps/ -mkdir %{buildroot}/etc -install -m 644 %{S:3} %{buildroot}/etc -%suse_update_desktop_file -i xpdf Office Viewer - -%clean -rm -rf %{buildroot} +%makeinstall +mkdir -p %{buildroot}%{_docdir}/%{name} +mv LICENSE README.md %{buildroot}%{_docdir}/%{name} +ln -s %{_bindir}/xpdf-poppler %{buildroot}%{_bindir}/xpdf +%suse_update_desktop_file -i %{name} Office Viewer %files %defattr(-,root,root) -%doc ANNOUNCE README CHANGES -%{_bindir}/xpdf -%{_datadir}/applications/*.desktop -%{_datadir}/pixmaps/* -%doc %{_mandir}/man1/xpdf.1* -%config(noreplace) /etc/xpdfrc +%{_bindir}/* +%{_datadir}/applications/%{name}.desktop +%{_datadir}/pixmaps/*.png +%{_docdir}/%{name} +%doc %{_mandir}/man?/* +%dir %{_sysconfdir}/%{name} +%config(noreplace) %{_sysconfdir}/%{name}/%{name}-rc %changelog ++++++ xpdf-poppler-poppler-0.18.0.patch ++++++ --- /var/tmp/diff_new_pack.gvO2Xw/_old 2011-09-22 16:57:28.000000000 +0200 +++ /var/tmp/diff_new_pack.gvO2Xw/_new 2011-09-22 16:57:28.000000000 +0200 @@ -1,26 +1,13 @@ -Index: xpdf-3.02-poppler/CoreOutputDev.cc +Index: xpdf-poppler/CoreOutputDev.cc =================================================================== ---- xpdf-3.02-poppler.orig/CoreOutputDev.cc -+++ xpdf-3.02-poppler/CoreOutputDev.cc -@@ -32,7 +32,7 @@ CoreOutputDev::CoreOutputDev(SplashColor - redrawCbk = redrawCbkA; - redrawCbkData = redrawCbkDataA; - +--- xpdf-poppler.orig/CoreOutputDev.cc ++++ xpdf-poppler/CoreOutputDev.cc +@@ -30,7 +30,7 @@ CoreOutputDev::CoreOutputDev(SplashColor + incrementalUpdate(incrementalUpdateA), redrawCbk(redrawCbkA), + redrawCbkData(redrawCbkDataA) + { - setFreeTypeHinting(globalParamsGUI->getEnableFreeTypeHinting()); + setFreeTypeHinting(globalParamsGUI->getEnableFreeTypeHinting(), gFalse); } CoreOutputDev::~CoreOutputDev() { -Index: xpdf-3.02-poppler/Makefile -=================================================================== ---- xpdf-3.02-poppler.orig/Makefile -+++ xpdf-3.02-poppler/Makefile -@@ -4,7 +4,7 @@ INCLUDES=$(POPPLERBASE) $(POPPLERBASE)/g - - CPPFLAGS+= $(INCLUDES) -DHAVE_DIRENT_H -DHAVE_X11_XPM_H - --xpdf: CoreOutputDev.o GlobalParamsGUI.o ImageOutputDev.o PDFCore.o XPDFApp.o XPDFCore.o XPDFTree.o XPDFViewer.o parseargs.o xpdf.o -+xpdf: CoreOutputDev.o GlobalParamsGUI.o PDFCore.o XPDFApp.o XPDFCore.o XPDFTree.o XPDFViewer.o parseargs.o xpdf.o - $(CXX) $(CXXFLAGS) $(LDFLAGS) -o xpdf *.o $(LIBS) - - clean: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
