Compare commits

..

No commits in common. "rawhide" and "f22" have entirely different histories.
rawhide ... f22

5 changed files with 24 additions and 258 deletions

14
.gitignore vendored
View File

@ -3,17 +3,3 @@ pdf2djvu_0.7.3.tar.gz
/pdf2djvu_0.7.16.tar.gz
/pdf2djvu_0.7.17.tar.gz
/pdf2djvu-0.7.21.tar.xz
/pdf2djvu-0.9.4.tar.xz
/pdf2djvu-0.9.5.tar.xz
/pdf2djvu-0.9.8.tar.xz
/pdf2djvu-0.9.9.tar.xz
/pdf2djvu-0.9.10.tar.xz
/pdf2djvu-0.9.11.tar.xz
/pdf2djvu-0.9.13.tar.xz
/pdf2djvu-0.9.15.tar.xz
/pdf2djvu-0.9.17.tar.xz
/pdf2djvu-0.9.17.1.tar.xz
/pdf2djvu-0.9.18.tar.xz
/pdf2djvu-0.9.18.1.tar.xz
/pdf2djvu-0.9.18.2.tar.xz
/pdf2djvu-0.9.19.tar.xz

View File

@ -1,28 +0,0 @@
From 81b635e014ebd0240a8719cc39b6a1b759cc6a98 Mon Sep 17 00:00:00 2001
From: Jakub Wilk <jwilk@jwilk.net>
Date: Wed, 16 Feb 2022 09:10:28 +0000
Subject: main: use pdf::link::Destination copy constructor.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Fixes:
main.cc: In function int get_page_for_goto_link(pdf::link::GoTo*, pdf::Catalog*):
main.cc:92:27: error: const Destination {aka const class LinkDest} has no member named copy
https://cgit.freedesktop.org/poppler/poppler/commit/?id=7a429c3cf9fba67e
diff --git a/main.cc b/main.cc
index 2b42d16..bb5fd57 100644
--- a/pdf2djvu.cc
+++ b/pdf2djvu.cc
@@ -89,7 +89,7 @@ static int get_page_for_goto_link(pdf::link::GoTo *goto_link, pdf::Catalog *cata
#endif
}
else
- dest.reset(orig_dest->copy());
+ dest.reset(new pdf::link::Destination(*orig_dest));
if (dest.get() != nullptr)
{
int page;

View File

@ -1,23 +0,0 @@
From dca43e8182174bc04e107eaefcafcfdfdf9bcd61 Mon Sep 17 00:00:00 2001
From: Jakub Wilk <jwilk@jwilk.net>
Date: Wed, 2 Mar 2022 10:40:37 +0000
Subject: pdf-backend: simplify Poppler 22.03 compat code.
diff --git a/pdf-backend.cc b/pdf-backend.cc
index ba85da2..8fab764 100644
--- a/pdf-backend.cc
+++ b/pdf-backend.cc
@@ -129,7 +129,11 @@ void pdf::Environment::set_antialias(bool value)
*/
pdf::Document::Document(const std::string &file_name)
-: ::PDFDoc(new pdf::String(file_name.c_str()), nullptr, nullptr)
+#if POPPLER_VERSION >= 220300
+: ::PDFDoc(std::make_unique<pdf::String>(file_name.c_str()))
+#else
+: ::PDFDoc(new pdf::String(file_name.c_str()))
+#endif
{
if (!this->isOk())
throw LoadError();

View File

@ -1,22 +1,21 @@
%global _hardened_build 1
Name: pdf2djvu
Version: 0.9.19
Version: 0.7.21
Release: 1%{?dist}
Summary: PDF to DjVu converter
Group: Applications/Publishing
License: GPLv2+
URL: http://jwilk.net/software/pdf2djvu
Source0: https://github.com/jwilk/%{name}/releases/download/%{version}/%{name}-%{version}.tar.xz
# both patches are included in 0.9.19 release, remove these lines next commit
# Patch0: pdf2djvu-PDFDoc-constructor.patch
# Patch1: pdf2djvu-Destination-copy-constructor.patch
BuildRequires: make
BuildRequires: gcc-c++
Source0: https://bitbucket.org/jwilk/pdf2djvu/downloads/%{name}-%{version}.tar.xz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: djvulibre-devel djvulibre
BuildRequires: libjpeg-devel
BuildRequires: pkgconfig
BuildRequires: poppler-devel
BuildRequires: pstreams-devel
BuildRequires: fontconfig-devel
BuildRequires: GraphicsMagick-c++-devel
BuildRequires: exiv2-devel libuuid-devel
Requires: djvulibre
%description
@ -25,202 +24,34 @@ graphics, text layer, hyperlinks, document outline (bookmarks) and
metadata.
%prep
%autosetup
%setup -q
%build
export CXXFLAGS="-std=c++17 $RPM_OPT_FLAGS"
%configure
%make_build
make %{?_smp_mflags}
%install
%make_install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" install
install -p -m 644 -D {doc,%{buildroot}%{_mandir}/man1}/%{name}.1
%find_lang %{name}
%clean
rm -rf $RPM_BUILD_ROOT
%files -f %{name}.lang
%doc doc/changelog
%license doc/COPYING
%defattr(-,root,root,-)
%{_bindir}/%{name}
%{_mandir}/man1/%{name}.1*
%{_mandir}/de/man1/%{name}.1*
%{_mandir}/fr/man1/%{name}.1*
%{_mandir}/pl/man1/%{name}.1*
%{_mandir}/pt/man1/%{name}.1*
%{_mandir}/ru/man1/%{name}.1*
%{_mandir}/man1/%{name}.1.gz
%{_mandir}/de/man1/%{name}.1.gz
%{_mandir}/fr/man1/%{name}.1.gz
%{_mandir}/pl/man1/%{name}.1.gz
%{_mandir}/pt/man1/%{name}.1.gz
%{_mandir}/ru/man1/%{name}.1.gz
%{_mandir}/uk/man1/%{name}.1.gz
%changelog
* Thu Aug 25 2022 Filipe Rosset <rosset.filipe@gmail.com> - 0.9.19-1
- Updated to 0.9.19 fixes rhbz#2113575 and rhbz#2117084
* Mon Aug 08 2022 Marek Kasik <mkasik@redhat.com> - 0.9.18.2-5
- Rebuild for poppler-22.08.0
- Remove requirement of pstrams-devel as they are not supported
- and has been removed from Fedora
- Backport 2 commits from upstream to build with current poppler
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.18.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.18.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Tue Jan 18 2022 Marek Kasik <mkasik@redhat.com> - 0.9.18.2-2
- Rebuild for poppler-22.01.0
- Switch to C++17 because it is needed by poppler now
* Mon Nov 22 2021 Filipe Rosset <rosset.filipe@gmail.com> - 0.9.18.2-1
- Update to 0.9.18.2 fixes rhbz#2025677
* Mon Oct 18 2021 Filipe Rosset <rosset.filipe@gmail.com> - 0.9.18.1-1
- Update to 0.9.18.1 fixes rhbz#2013685
* Thu Oct 07 2021 Filipe Rosset <rosset.filipe@gmail.com> - 0.9.18-1
- Update to 0.9.18 fixes rhbz#1969290
* Thu Aug 05 2021 Marek Kasik <mkasik@redhat.com> - 0.9.17.1-5
- Rebuild for poppler-21.08.0
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.17.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.17.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Jan 19 2021 Marek Kasik <mkasik@redhat.com> - 0.9.17.1-2
- Rebuild for poppler-21.01.0
* Fri Jan 1 2021 Filipe Rosset <rosset.filipe@gmail.com> - 0.9.17.1-1
- Update to 0.9.17.1 fixes rhbz#1805167
* Wed Aug 19 2020 Jeff Law <law@redhat.com> - 0.9.17-4
- Force C++14 as this code is not C++17 ready
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.17-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Mon Jul 20 2020 Marek Kasik <mkasik@redhat.com> - 0.9.17-2
- Rebuild for poppler-0.90.0
* Sun Mar 15 2020 Filipe Rosset <rosset.filipe@gmail.com> - 0.9.17-1
- Update to 0.9.17 fixes rhbz#1805167
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.15-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Mon Jan 20 2020 Filipe Rosset <rosset.filipe@gmail.com> - 0.9.15-1
- Update to 0.9.15 fixes rhbz#1766275
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.13-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Tue Jun 11 2019 Filipe Rosset <rosset.filipe@gmail.com> - 0.9.13-1
- update to new 0.9.13 upstream release, fixes rhbz #1719015
- removed upstreamed patch
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.11-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Wed Jan 30 2019 Rex Dieter <rdieter@fedoraproject.org> - 0.9.11-3
- rebuild (exiv2)
* Fri Jan 25 2019 Marek Kasik <mkasik@redhat.com> - 0.9.11-2
- Rebuild for poppler-0.73.0
* Sat Oct 27 2018 Filipe Rosset <rosset.filipe@gmail.com> - 0.9.11-1
- Rebuilt for new upstream release 0.9.11
- Upstream changelog https://github.com/jwilk/pdf2djvu/blob/master/doc/changelog
* Sun Sep 09 2018 Filipe Rosset <rosset.filipe@gmail.com> - 0.9.10-1
- Rebuilt for new upstream release 0.9.10, fixes rhbz #1609442
* Tue Aug 14 2018 Marek Kasik <mkasik@redhat.com> - 0.9.9-3
- Rebuild for poppler-0.67.0
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.9-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Sat Apr 21 2018 Filipe Rosset <rosset.filipe@gmail.com> - 0.9.9-1
- Rebuilt for new upstream release 0.9.9, fixes rhbz #1569280
- Remove upstreamed patches, spec cleanup
* Fri Mar 23 2018 Marek Kasik <mkasik@redhat.com> - 0.9.8-4
- Rebuild for poppler-0.63.0
* Wed Feb 14 2018 David Tardon <dtardon@redhat.com> - 0.9.8-3
- rebuild for poppler 0.62.0
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.8-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Fri Jan 19 2018 Filipe Rosset <rosset.filipe@gmail.com> - 0.9.8-1
- Rebuilt for new upstream release 0.9.8, fixes rhbz #1488273
- Remove upstreamed patches, spec cleanup
- Fix source URL
* Wed Nov 08 2017 David Tardon <dtardon@redhat.com> - 0.9.5-11
- rebuild for poppler 0.61.0
* Fri Oct 06 2017 David Tardon <dtardon@redhat.com> - 0.9.5-10
- rebuild for poppler 0.60.1
* Fri Sep 08 2017 David Tardon <dtardon@redhat.com> - 0.9.5-9
- rebuild for poppler 0.59.0
* Sat Aug 05 2017 Björn Esser <besser82@fedoraproject.org> - 0.9.5-8
- Add patch to remove '-std=gnu++98', fixing build with new poppler
- Add %%license and %%doc
- Add BR: GraphicsMagick-c++-devel exiv2-devel libuuid-devel
- Adapt spec to recent guidelines
* Thu Aug 03 2017 David Tardon <dtardon@redhat.com> - 0.9.5-7
- rebuild for poppler 0.57.0
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.5-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.5-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Tue Mar 28 2017 David Tardon <dtardon@redhat.com> - 0.9.5-4
- rebuild for poppler 0.53.0
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.5-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Fri Dec 16 2016 David Tardon <dtardon@redhat.com> - 0.9.5-2
- rebuild for poppler 0.50.0
* Thu Dec 15 2016 Filipe Rosset <rosset.filipe@gmail.com> - 0.9.5-1
- Rebuilt for new upstream release 0.9.5, fixes rhbz #1405026
* Thu Nov 24 2016 Orion Poplawski <orion@cora.nwra.com> - 0.9.4-6
- Rebuild for poppler 0.49.0
* Fri Oct 21 2016 Marek Kasik <mkasik@redhat.com> - 0.9.4-5
- Rebuild for poppler-0.48.0
* Mon Jul 18 2016 Marek Kasik <mkasik@redhat.com> - 0.9.4-4
- Rebuild for poppler-0.45.0
* Tue May 17 2016 Filipe Rosset <rosset.filipe@gmail.com> - 0.9.4-3
- Spec clean-up
* Tue May 3 2016 Marek Kasik <mkasik@redhat.com> - 0.9.4-2
- Rebuild for poppler-0.43.0
* Mon Mar 28 2016 François Cami <fcami@fedoraproject.org> - 0.9.4-1
- Update to latest upstream.
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.21-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Fri Jan 22 2016 Marek Kasik <mkasik@redhat.com> - 0.7.21-3
- Rebuild for poppler-0.40.0
* Wed Jul 22 2015 Marek Kasik <mkasik@redhat.com> - 0.7.21-2
- Rebuild (poppler-0.34.0)
* Tue Jul 07 2015 François Cami <fcami@fedoraproject.org> - 0.7.21-1
- Update to latest upstream.

View File

@ -1 +1 @@
SHA512 (pdf2djvu-0.9.19.tar.xz) = 14d6b217345da6ae8fb9f0fccfb79b86f4448d30d1de1bd2eb537c4eb129f0bdac64ed58c59119f31a837df143490be77050a4b92362a548e08bf8991a03ec41
1efee113c9985d4102c09ab997fc795d pdf2djvu-0.7.21.tar.xz