From 1dcec0a0d3411a76eb47eb72aa340ee3456a254d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 2 Jul 2015 18:45:06 +0000 Subject: [PATCH 01/54] Initial setup of the repo --- .gitignore | 0 sources | 0 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 .gitignore create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/sources b/sources new file mode 100644 index 0000000..e69de29 From 94095bc525a087af80b3e68c27ace7a3fb6e337b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0abata?= Date: Fri, 3 Jul 2015 10:30:53 +0200 Subject: [PATCH 02/54] Initial import (#1230149) --- .gitignore | 1 + sources | 1 + zathura-pdf-mupdf.spec | 77 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 79 insertions(+) create mode 100644 zathura-pdf-mupdf.spec diff --git a/.gitignore b/.gitignore index e69de29..33b0737 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/zathura-pdf-mupdf-0.2.8.tar.gz diff --git a/sources b/sources index e69de29..64db310 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +b0bf109c536bf1da131c38861cebb7e6 zathura-pdf-mupdf-0.2.8.tar.gz diff --git a/zathura-pdf-mupdf.spec b/zathura-pdf-mupdf.spec new file mode 100644 index 0000000..df651e8 --- /dev/null +++ b/zathura-pdf-mupdf.spec @@ -0,0 +1,77 @@ +Name: zathura-pdf-mupdf +Version: 0.2.8 +Release: 3%{?dist} +Summary: PDF support for zathura via mupdf +License: zlib +URL: http://pwmt.org/projects/zathura/plugins/%{name} +Source0: http://pwmt.org/projects/zathura/plugins/download/%{name}-%{version}.tar.gz +BuildRequires: binutils +BuildRequires: coreutils +BuildRequires: gcc +BuildRequires: make +BuildRequires: pkgconfig +BuildRequires: sed +BuildRequires: jbig2dec-devel +BuildRequires: libjpeg-turbo-devel +BuildRequires: mujs-static +BuildRequires: mupdf-devel +BuildRequires: openjpeg2-devel +BuildRequires: pkgconfig(zathura) +BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(girara-gtk3) +BuildRequires: pkgconfig(libcrypto) +Requires: zathura +Requires(post): %{_sbindir}/update-alternatives +Requires(post): desktop-file-utils +Requires(postun): %{_sbindir}/update-alternatives +Requires(postun): desktop-file-utils +# Ensure zathura-pdf-poppler supports alternatives +Conflicts: zathura-pdf-poppler < 0.2.5-5 + +%description +This plugin adds PDF support to zathura using the mupdf rendering engine. + +%prep +%setup -q +# Don't rebuild during install phase +sed -i 's/^install:\s*all/install:/' Makefile + +%build +CFLAGS='%{optflags}' make %{?_smp_mflags} LIBDIR=%{_libdir} debug +mv pdf-debug.so pdf.so + +%install +make DESTDIR=%{buildroot} LIBDIR=%{_libdir} install +mv %{buildroot}/%{_libdir}/zathura/pdf.so \ + %{buildroot}/%{_libdir}/zathura/pdf.so.mupdf +touch %{buildroot}/%{_libdir}/zathura/pdf.so +desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop + +%post +%{_sbindir}/update-alternatives --install \ + %{_libdir}/zathura/pdf.so %{name} %{_libdir}/zathura/pdf.so.mupdf 5 +update-desktop-database &> /dev/null || : + +%postun +if [ $1 -eq 0 ] ; then + %{_sbindir}/update-alternatives --remove \ + %{name} %{_libdir}/zathura/pdf.so.mupdf +fi +update-desktop-database &> /dev/null || : + +%files +%license LICENSE +%doc AUTHORS +%ghost %{_libdir}/zathura/pdf.so +%{_libdir}/zathura/pdf.so.mupdf +%{_datadir}/applications/%{name}.desktop + +%changelog +* Wed Jul 01 2015 Petr Šabata - 0.2.8-3 +- Handle the desktop file properly + +* Tue Jun 23 2015 Petr Šabata - 0.2.8-2 +- Correct the %%files section + +* Tue Jun 09 2015 Petr Šabata - 0.2.8-1 +- Initial packaging From acc1bd34a4f22e087b707d63ee5ebd44e9187a7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0abata?= Date: Mon, 16 Nov 2015 17:00:28 +0100 Subject: [PATCH 03/54] Rebuild with mujs-0-1.20150929git0827611 --- zathura-pdf-mupdf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zathura-pdf-mupdf.spec b/zathura-pdf-mupdf.spec index df651e8..ccac503 100644 --- a/zathura-pdf-mupdf.spec +++ b/zathura-pdf-mupdf.spec @@ -1,6 +1,6 @@ Name: zathura-pdf-mupdf Version: 0.2.8 -Release: 3%{?dist} +Release: 4%{?dist} Summary: PDF support for zathura via mupdf License: zlib URL: http://pwmt.org/projects/zathura/plugins/%{name} @@ -67,6 +67,9 @@ update-desktop-database &> /dev/null || : %{_datadir}/applications/%{name}.desktop %changelog +* Mon Nov 16 2015 Petr Šabata - 0.2.8-4 +- Rebuild with mujs-0-1.20150929git0827611 + * Wed Jul 01 2015 Petr Šabata - 0.2.8-3 - Handle the desktop file properly From 9beb906f88a1875f59ca7a4150e3f439bcea231a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 04:04:00 +0000 Subject: [PATCH 04/54] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- zathura-pdf-mupdf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zathura-pdf-mupdf.spec b/zathura-pdf-mupdf.spec index ccac503..cc1fc86 100644 --- a/zathura-pdf-mupdf.spec +++ b/zathura-pdf-mupdf.spec @@ -1,6 +1,6 @@ Name: zathura-pdf-mupdf Version: 0.2.8 -Release: 4%{?dist} +Release: 5%{?dist} Summary: PDF support for zathura via mupdf License: zlib URL: http://pwmt.org/projects/zathura/plugins/%{name} @@ -67,6 +67,9 @@ update-desktop-database &> /dev/null || : %{_datadir}/applications/%{name}.desktop %changelog +* Fri Feb 05 2016 Fedora Release Engineering - 0.2.8-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Mon Nov 16 2015 Petr Šabata - 0.2.8-4 - Rebuild with mujs-0-1.20150929git0827611 From de0dda03a84e6182b7cbc31e9c18eaafce45a17c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0abata?= Date: Fri, 26 Feb 2016 21:44:48 +0100 Subject: [PATCH 05/54] 0.3.0 bump --- .gitignore | 1 + sources | 2 +- zathura-pdf-mupdf.spec | 12 ++++++++---- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 33b0737..9533e86 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /zathura-pdf-mupdf-0.2.8.tar.gz +/zathura-pdf-mupdf-0.3.0.tar.gz diff --git a/sources b/sources index 64db310..e123891 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b0bf109c536bf1da131c38861cebb7e6 zathura-pdf-mupdf-0.2.8.tar.gz +523781d0adb8f4ddd93fc3bb6faf6e43 zathura-pdf-mupdf-0.3.0.tar.gz diff --git a/zathura-pdf-mupdf.spec b/zathura-pdf-mupdf.spec index cc1fc86..4082ac3 100644 --- a/zathura-pdf-mupdf.spec +++ b/zathura-pdf-mupdf.spec @@ -1,12 +1,13 @@ Name: zathura-pdf-mupdf -Version: 0.2.8 -Release: 5%{?dist} +Version: 0.3.0 +Release: 1%{?dist} Summary: PDF support for zathura via mupdf License: zlib URL: http://pwmt.org/projects/zathura/plugins/%{name} Source0: http://pwmt.org/projects/zathura/plugins/download/%{name}-%{version}.tar.gz BuildRequires: binutils BuildRequires: coreutils +BuildRequires: desktop-file-utils BuildRequires: gcc BuildRequires: make BuildRequires: pkgconfig @@ -16,10 +17,10 @@ BuildRequires: libjpeg-turbo-devel BuildRequires: mujs-static BuildRequires: mupdf-devel BuildRequires: openjpeg2-devel -BuildRequires: pkgconfig(zathura) -BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(girara-gtk3) +BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(libcrypto) +BuildRequires: pkgconfig(zathura) Requires: zathura Requires(post): %{_sbindir}/update-alternatives Requires(post): desktop-file-utils @@ -67,6 +68,9 @@ update-desktop-database &> /dev/null || : %{_datadir}/applications/%{name}.desktop %changelog +* Fri Feb 26 2016 Petr Šabata - 0.3.0-1 +- 0.3.0 bump + * Fri Feb 05 2016 Fedora Release Engineering - 0.2.8-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 27b5c4a026aea6a2e8f38f0b13ac1529c36b6afa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0abata?= Date: Thu, 29 Sep 2016 14:27:22 +0200 Subject: [PATCH 06/54] Rebuild against mujs-0-5.20160921git5c337af --- zathura-pdf-mupdf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zathura-pdf-mupdf.spec b/zathura-pdf-mupdf.spec index 4082ac3..8643dee 100644 --- a/zathura-pdf-mupdf.spec +++ b/zathura-pdf-mupdf.spec @@ -1,6 +1,6 @@ Name: zathura-pdf-mupdf Version: 0.3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: PDF support for zathura via mupdf License: zlib URL: http://pwmt.org/projects/zathura/plugins/%{name} @@ -68,6 +68,9 @@ update-desktop-database &> /dev/null || : %{_datadir}/applications/%{name}.desktop %changelog +* Thu Sep 29 2016 Petr Šabata - 0.3.0-2 +- Rebuild against mujs-0-5.20160921git5c337af + * Fri Feb 26 2016 Petr Šabata - 0.3.0-1 - 0.3.0 bump From b3137d76a0266f977bfeb0dffce94daf2c781679 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0abata?= Date: Wed, 16 Nov 2016 14:13:02 +0100 Subject: [PATCH 07/54] Rebuild against mujs-0-6.20161031gita0ceaf5 --- zathura-pdf-mupdf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zathura-pdf-mupdf.spec b/zathura-pdf-mupdf.spec index 8643dee..981f830 100644 --- a/zathura-pdf-mupdf.spec +++ b/zathura-pdf-mupdf.spec @@ -1,6 +1,6 @@ Name: zathura-pdf-mupdf Version: 0.3.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: PDF support for zathura via mupdf License: zlib URL: http://pwmt.org/projects/zathura/plugins/%{name} @@ -68,6 +68,9 @@ update-desktop-database &> /dev/null || : %{_datadir}/applications/%{name}.desktop %changelog +* Wed Nov 16 2016 Petr Šabata - 0.3.0-3 +- Rebuild against mujs-0-6.20161031gita0ceaf5 + * Thu Sep 29 2016 Petr Šabata - 0.3.0-2 - Rebuild against mujs-0-5.20160921git5c337af From d3c64774575f29d824cb7b76b201641cfc9f5b76 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 18:22:20 +0000 Subject: [PATCH 08/54] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- zathura-pdf-mupdf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zathura-pdf-mupdf.spec b/zathura-pdf-mupdf.spec index 981f830..707d9ff 100644 --- a/zathura-pdf-mupdf.spec +++ b/zathura-pdf-mupdf.spec @@ -1,6 +1,6 @@ Name: zathura-pdf-mupdf Version: 0.3.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: PDF support for zathura via mupdf License: zlib URL: http://pwmt.org/projects/zathura/plugins/%{name} @@ -68,6 +68,9 @@ update-desktop-database &> /dev/null || : %{_datadir}/applications/%{name}.desktop %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 0.3.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Wed Nov 16 2016 Petr Šabata - 0.3.0-3 - Rebuild against mujs-0-6.20161031gita0ceaf5 From cc0bc748c23f91428a8871025271a29fa2677b80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0abata?= Date: Tue, 4 Apr 2017 18:07:24 +0200 Subject: [PATCH 09/54] 0.3.1 bump Don't link against the no longer provided libmupdfthird, see rhbz#1438824 for more info --- .gitignore | 1 + sources | 2 +- zathura-pdf-mupdf.spec | 11 ++++++++--- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 9533e86..3b70ac7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /zathura-pdf-mupdf-0.2.8.tar.gz /zathura-pdf-mupdf-0.3.0.tar.gz +/zathura-pdf-mupdf-0.3.1.tar.gz diff --git a/sources b/sources index e123891..7b09f33 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -523781d0adb8f4ddd93fc3bb6faf6e43 zathura-pdf-mupdf-0.3.0.tar.gz +SHA512 (zathura-pdf-mupdf-0.3.1.tar.gz) = 87b5b8a750a6911be37a0195b0f4bc3304350f9d29173091b3eeece40350b10cb98b009b2722a69ae1e617b4242292f3eba17fea97d5276e485069180f2bd67d diff --git a/zathura-pdf-mupdf.spec b/zathura-pdf-mupdf.spec index 707d9ff..6cd0789 100644 --- a/zathura-pdf-mupdf.spec +++ b/zathura-pdf-mupdf.spec @@ -1,6 +1,6 @@ Name: zathura-pdf-mupdf -Version: 0.3.0 -Release: 4%{?dist} +Version: 0.3.1 +Release: 1%{?dist} Summary: PDF support for zathura via mupdf License: zlib URL: http://pwmt.org/projects/zathura/plugins/%{name} @@ -38,7 +38,7 @@ This plugin adds PDF support to zathura using the mupdf rendering engine. sed -i 's/^install:\s*all/install:/' Makefile %build -CFLAGS='%{optflags}' make %{?_smp_mflags} LIBDIR=%{_libdir} debug +CFLAGS='%{optflags}' make %{?_smp_mflags} LIBDIR=%{_libdir} MUPDF_LIB=-lmupdf debug mv pdf-debug.so pdf.so %install @@ -68,6 +68,11 @@ update-desktop-database &> /dev/null || : %{_datadir}/applications/%{name}.desktop %changelog +* Tue Apr 04 2017 Petr Šabata - 0.3.1-1 +- 0.3.1 bump +- Don't link against the no longer provided libmupdfthird, + see rhbz#1438824 for more info + * Sat Feb 11 2017 Fedora Release Engineering - 0.3.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 3d41e33825ec843de0f05b5b913ea2641e527845 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 22:40:30 +0000 Subject: [PATCH 10/54] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- zathura-pdf-mupdf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zathura-pdf-mupdf.spec b/zathura-pdf-mupdf.spec index 6cd0789..75d2a4c 100644 --- a/zathura-pdf-mupdf.spec +++ b/zathura-pdf-mupdf.spec @@ -1,6 +1,6 @@ Name: zathura-pdf-mupdf Version: 0.3.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: PDF support for zathura via mupdf License: zlib URL: http://pwmt.org/projects/zathura/plugins/%{name} @@ -68,6 +68,9 @@ update-desktop-database &> /dev/null || : %{_datadir}/applications/%{name}.desktop %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 0.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Tue Apr 04 2017 Petr Šabata - 0.3.1-1 - 0.3.1 bump - Don't link against the no longer provided libmupdfthird, From e2d687e598bd6dd040c5a86a83c18c17becdccca Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 11:08:59 +0000 Subject: [PATCH 11/54] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- zathura-pdf-mupdf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zathura-pdf-mupdf.spec b/zathura-pdf-mupdf.spec index 75d2a4c..8bd8acd 100644 --- a/zathura-pdf-mupdf.spec +++ b/zathura-pdf-mupdf.spec @@ -1,6 +1,6 @@ Name: zathura-pdf-mupdf Version: 0.3.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: PDF support for zathura via mupdf License: zlib URL: http://pwmt.org/projects/zathura/plugins/%{name} @@ -68,6 +68,9 @@ update-desktop-database &> /dev/null || : %{_datadir}/applications/%{name}.desktop %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 0.3.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 0.3.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 9bda4a1fe02c8e676ce809389f3801a1d46b7c65 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 22:24:21 +0000 Subject: [PATCH 12/54] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zathura-pdf-mupdf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zathura-pdf-mupdf.spec b/zathura-pdf-mupdf.spec index 8bd8acd..a7c6c12 100644 --- a/zathura-pdf-mupdf.spec +++ b/zathura-pdf-mupdf.spec @@ -1,6 +1,6 @@ Name: zathura-pdf-mupdf Version: 0.3.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: PDF support for zathura via mupdf License: zlib URL: http://pwmt.org/projects/zathura/plugins/%{name} @@ -68,6 +68,9 @@ update-desktop-database &> /dev/null || : %{_datadir}/applications/%{name}.desktop %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 0.3.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Aug 03 2017 Fedora Release Engineering - 0.3.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From c4bb7059f5bfa5dc3159a52bd67a64777859cb06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0abata?= Date: Tue, 10 Apr 2018 22:45:11 +0200 Subject: [PATCH 13/54] 0.3.3 bump MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Petr Šabata --- .gitignore | 1 + sources | 2 +- zathura-pdf-mupdf-0.3.3-jpeg.patch | 35 +++++++++++ zathura-pdf-mupdf-0.3.3-mupdfthird.patch | 33 ++++++++++ zathura-pdf-mupdf.spec | 78 +++++++++++------------- 5 files changed, 104 insertions(+), 45 deletions(-) create mode 100644 zathura-pdf-mupdf-0.3.3-jpeg.patch create mode 100644 zathura-pdf-mupdf-0.3.3-mupdfthird.patch diff --git a/.gitignore b/.gitignore index 3b70ac7..b652e4d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /zathura-pdf-mupdf-0.2.8.tar.gz /zathura-pdf-mupdf-0.3.0.tar.gz /zathura-pdf-mupdf-0.3.1.tar.gz +/zathura-pdf-mupdf-0.3.3.tar.xz diff --git a/sources b/sources index 7b09f33..809dfee 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zathura-pdf-mupdf-0.3.1.tar.gz) = 87b5b8a750a6911be37a0195b0f4bc3304350f9d29173091b3eeece40350b10cb98b009b2722a69ae1e617b4242292f3eba17fea97d5276e485069180f2bd67d +SHA512 (zathura-pdf-mupdf-0.3.3.tar.xz) = cac3ccf4f85c689d44095966fbee84efac76d7c72915a06a85da272663eb3f11b053baf06a24e79e2fc89a57d05fa2f3c1df199e9e1415a3bfa65f3309227faf diff --git a/zathura-pdf-mupdf-0.3.3-jpeg.patch b/zathura-pdf-mupdf-0.3.3-jpeg.patch new file mode 100644 index 0000000..4d8793e --- /dev/null +++ b/zathura-pdf-mupdf-0.3.3-jpeg.patch @@ -0,0 +1,35 @@ +From 130a5f784b2e27ff1eb959a36707cb3aff1a96d4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20=C5=A0abata?= +Date: Tue, 10 Apr 2018 21:14:12 +0200 +Subject: [PATCH] Link against jpeg +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This resolves a broken runtime dependency. + +Signed-off-by: Petr Šabata +--- + meson.build | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 6e077cf..3834bba 100644 +--- a/meson.build ++++ b/meson.build +@@ -20,8 +20,11 @@ girara = dependency('girara-gtk3') + glib = dependency('glib-2.0') + cairo = dependency('cairo') + mupdf = cc.find_library('mupdf') ++jpeg = dependency('libjpeg') ++openjpeg = dependency('libopenjp2') ++jbig2dec = cc.find_library('jbig2dec') + +-build_dependencies = [zathura, girara, glib, cairo, mupdf] ++build_dependencies = [zathura, girara, glib, cairo, mupdf, jpeg, openjpeg, jbig2dec] + + # defines + defines = [ +-- +2.17.0 + diff --git a/zathura-pdf-mupdf-0.3.3-mupdfthird.patch b/zathura-pdf-mupdf-0.3.3-mupdfthird.patch new file mode 100644 index 0000000..f713cbf --- /dev/null +++ b/zathura-pdf-mupdf-0.3.3-mupdfthird.patch @@ -0,0 +1,33 @@ +From 86e3c01cf1a113681873d4f550262c1aefa48df7 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20=C5=A0abata?= +Date: Tue, 10 Apr 2018 20:41:55 +0200 +Subject: [PATCH] Drop the mupdfthird dependency +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +It's not provided in Fedora. + +Signed-off-by: Petr Šabata +--- + meson.build | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/meson.build b/meson.build +index 3b0d7b7..6e077cf 100644 +--- a/meson.build ++++ b/meson.build +@@ -20,9 +20,8 @@ girara = dependency('girara-gtk3') + glib = dependency('glib-2.0') + cairo = dependency('cairo') + mupdf = cc.find_library('mupdf') +-mupdfthird = cc.find_library('mupdfthird') + +-build_dependencies = [zathura, girara, glib, cairo, mupdf, mupdfthird] ++build_dependencies = [zathura, girara, glib, cairo, mupdf] + + # defines + defines = [ +-- +2.17.0 + diff --git a/zathura-pdf-mupdf.spec b/zathura-pdf-mupdf.spec index a7c6c12..16cf28c 100644 --- a/zathura-pdf-mupdf.spec +++ b/zathura-pdf-mupdf.spec @@ -1,73 +1,63 @@ Name: zathura-pdf-mupdf -Version: 0.3.1 -Release: 4%{?dist} +Version: 0.3.3 +Release: 1%{?dist} Summary: PDF support for zathura via mupdf License: zlib URL: http://pwmt.org/projects/zathura/plugins/%{name} -Source0: http://pwmt.org/projects/zathura/plugins/download/%{name}-%{version}.tar.gz +Source0: http://pwmt.org/projects/zathura/plugins/download/%{name}-%{version}.tar.xz +Patch0: %{name}-0.3.3-mupdfthird.patch +Patch1: %{name}-0.3.3-jpeg.patch BuildRequires: binutils -BuildRequires: coreutils +BuildRequires: cairo-devel +# Needed to validate the desktop file BuildRequires: desktop-file-utils BuildRequires: gcc -BuildRequires: make -BuildRequires: pkgconfig -BuildRequires: sed +BuildRequires: girara-devel +BuildRequires: glib2-devel BuildRequires: jbig2dec-devel +# Needed to validate appdata +BuildRequires: libappstream-glib BuildRequires: libjpeg-turbo-devel -BuildRequires: mujs-static -BuildRequires: mupdf-devel +BuildRequires: meson >= 0.43 +BuildRequires: mupdf-static BuildRequires: openjpeg2-devel -BuildRequires: pkgconfig(girara-gtk3) -BuildRequires: pkgconfig(gtk+-3.0) -BuildRequires: pkgconfig(libcrypto) -BuildRequires: pkgconfig(zathura) -Requires: zathura -Requires(post): %{_sbindir}/update-alternatives -Requires(post): desktop-file-utils -Requires(postun): %{_sbindir}/update-alternatives -Requires(postun): desktop-file-utils -# Ensure zathura-pdf-poppler supports alternatives -Conflicts: zathura-pdf-poppler < 0.2.5-5 +BuildRequires: zathura-devel >= 0.3.9 +Requires: zathura >= 0.3.9 +# Old plugins used alternatives +Conflicts: zathura-pdf-poppler < 0.2.9 %description This plugin adds PDF support to zathura using the mupdf rendering engine. %prep %setup -q -# Don't rebuild during install phase -sed -i 's/^install:\s*all/install:/' Makefile +%patch0 -p1 +%patch1 -p1 %build -CFLAGS='%{optflags}' make %{?_smp_mflags} LIBDIR=%{_libdir} MUPDF_LIB=-lmupdf debug -mv pdf-debug.so pdf.so +%meson +%meson_build %install -make DESTDIR=%{buildroot} LIBDIR=%{_libdir} install -mv %{buildroot}/%{_libdir}/zathura/pdf.so \ - %{buildroot}/%{_libdir}/zathura/pdf.so.mupdf -touch %{buildroot}/%{_libdir}/zathura/pdf.so -desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop - -%post -%{_sbindir}/update-alternatives --install \ - %{_libdir}/zathura/pdf.so %{name} %{_libdir}/zathura/pdf.so.mupdf 5 -update-desktop-database &> /dev/null || : - -%postun -if [ $1 -eq 0 ] ; then - %{_sbindir}/update-alternatives --remove \ - %{name} %{_libdir}/zathura/pdf.so.mupdf -fi -update-desktop-database &> /dev/null || : +%meson_install +desktop-file-validate %{buildroot}/%{_datadir}/applications/*.desktop +appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.metainfo.xml + +# Clean the old alternatives link +%pre +[ -L %{_libdir}/zathura/pdf.so ] && rm -f %{_libdir}/zathura/pdf.so || : %files %license LICENSE %doc AUTHORS -%ghost %{_libdir}/zathura/pdf.so -%{_libdir}/zathura/pdf.so.mupdf -%{_datadir}/applications/%{name}.desktop +%{_libdir}/zathura/libpdf-mupdf.so +%{_datadir}/applications/org.pwmt.zathura-pdf-mupdf.desktop +%{_datadir}/metainfo/org.pwmt.zathura-pdf-mupdf.metainfo.xml %changelog +* Mon Apr 09 2018 Petr Šabata - 0.3.3-1 +- 0.3.3 bump + * Fri Feb 09 2018 Fedora Release Engineering - 0.3.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 2f215c860079aff09cfa9367e521458d73bdc8a7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 09:48:03 +0000 Subject: [PATCH 14/54] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zathura-pdf-mupdf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zathura-pdf-mupdf.spec b/zathura-pdf-mupdf.spec index 16cf28c..e495026 100644 --- a/zathura-pdf-mupdf.spec +++ b/zathura-pdf-mupdf.spec @@ -1,6 +1,6 @@ Name: zathura-pdf-mupdf Version: 0.3.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: PDF support for zathura via mupdf License: zlib URL: http://pwmt.org/projects/zathura/plugins/%{name} @@ -55,6 +55,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.metainf %{_datadir}/metainfo/org.pwmt.zathura-pdf-mupdf.metainfo.xml %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 0.3.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Mon Apr 09 2018 Petr Šabata - 0.3.3-1 - 0.3.3 bump From e8b3faaea6e80d552fecb61906878db46ae645ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0abata?= Date: Thu, 15 Nov 2018 22:04:49 +0100 Subject: [PATCH 15/54] 0.3.4 bump MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Petr Šabata --- zathura-pdf-mupdf-0.3.3-jpeg.patch | 35 ------------------------ zathura-pdf-mupdf-0.3.3-mupdfthird.patch | 33 ---------------------- zathura-pdf-mupdf.spec | 16 +++++------ 3 files changed, 8 insertions(+), 76 deletions(-) delete mode 100644 zathura-pdf-mupdf-0.3.3-jpeg.patch delete mode 100644 zathura-pdf-mupdf-0.3.3-mupdfthird.patch diff --git a/zathura-pdf-mupdf-0.3.3-jpeg.patch b/zathura-pdf-mupdf-0.3.3-jpeg.patch deleted file mode 100644 index 4d8793e..0000000 --- a/zathura-pdf-mupdf-0.3.3-jpeg.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 130a5f784b2e27ff1eb959a36707cb3aff1a96d4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20=C5=A0abata?= -Date: Tue, 10 Apr 2018 21:14:12 +0200 -Subject: [PATCH] Link against jpeg -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This resolves a broken runtime dependency. - -Signed-off-by: Petr Šabata ---- - meson.build | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 6e077cf..3834bba 100644 ---- a/meson.build -+++ b/meson.build -@@ -20,8 +20,11 @@ girara = dependency('girara-gtk3') - glib = dependency('glib-2.0') - cairo = dependency('cairo') - mupdf = cc.find_library('mupdf') -+jpeg = dependency('libjpeg') -+openjpeg = dependency('libopenjp2') -+jbig2dec = cc.find_library('jbig2dec') - --build_dependencies = [zathura, girara, glib, cairo, mupdf] -+build_dependencies = [zathura, girara, glib, cairo, mupdf, jpeg, openjpeg, jbig2dec] - - # defines - defines = [ --- -2.17.0 - diff --git a/zathura-pdf-mupdf-0.3.3-mupdfthird.patch b/zathura-pdf-mupdf-0.3.3-mupdfthird.patch deleted file mode 100644 index f713cbf..0000000 --- a/zathura-pdf-mupdf-0.3.3-mupdfthird.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 86e3c01cf1a113681873d4f550262c1aefa48df7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20=C5=A0abata?= -Date: Tue, 10 Apr 2018 20:41:55 +0200 -Subject: [PATCH] Drop the mupdfthird dependency -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -It's not provided in Fedora. - -Signed-off-by: Petr Šabata ---- - meson.build | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/meson.build b/meson.build -index 3b0d7b7..6e077cf 100644 ---- a/meson.build -+++ b/meson.build -@@ -20,9 +20,8 @@ girara = dependency('girara-gtk3') - glib = dependency('glib-2.0') - cairo = dependency('cairo') - mupdf = cc.find_library('mupdf') --mupdfthird = cc.find_library('mupdfthird') - --build_dependencies = [zathura, girara, glib, cairo, mupdf, mupdfthird] -+build_dependencies = [zathura, girara, glib, cairo, mupdf] - - # defines - defines = [ --- -2.17.0 - diff --git a/zathura-pdf-mupdf.spec b/zathura-pdf-mupdf.spec index e495026..a565abc 100644 --- a/zathura-pdf-mupdf.spec +++ b/zathura-pdf-mupdf.spec @@ -1,12 +1,10 @@ Name: zathura-pdf-mupdf -Version: 0.3.3 -Release: 2%{?dist} +Version: 0.3.4 +Release: 1%{?dist} Summary: PDF support for zathura via mupdf License: zlib URL: http://pwmt.org/projects/zathura/plugins/%{name} Source0: http://pwmt.org/projects/zathura/plugins/download/%{name}-%{version}.tar.xz -Patch0: %{name}-0.3.3-mupdfthird.patch -Patch1: %{name}-0.3.3-jpeg.patch BuildRequires: binutils BuildRequires: cairo-devel # Needed to validate the desktop file @@ -19,7 +17,7 @@ BuildRequires: jbig2dec-devel BuildRequires: libappstream-glib BuildRequires: libjpeg-turbo-devel BuildRequires: meson >= 0.43 -BuildRequires: mupdf-static +BuildRequires: mupdf-static >= 1.14 BuildRequires: openjpeg2-devel BuildRequires: zathura-devel >= 0.3.9 Requires: zathura >= 0.3.9 @@ -31,11 +29,9 @@ This plugin adds PDF support to zathura using the mupdf rendering engine. %prep %setup -q -%patch0 -p1 -%patch1 -p1 %build -%meson +%meson -Dlink-external=true %meson_build %install @@ -55,6 +51,10 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.metainf %{_datadir}/metainfo/org.pwmt.zathura-pdf-mupdf.metainfo.xml %changelog +* Thu Nov 15 2018 Petr Šabata - 0.3.4-1 +- 0.3.4 bump +- Fixes rhbz#1645552 + * Sat Jul 14 2018 Fedora Release Engineering - 0.3.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 6e03d85f3b9e35bb6b3d8b4d9c1d239b92433f46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0abata?= Date: Thu, 15 Nov 2018 22:05:25 +0100 Subject: [PATCH 16/54] Upload the 0.3.4 sources as well, duh MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Petr Šabata --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index b652e4d..7e26078 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /zathura-pdf-mupdf-0.3.0.tar.gz /zathura-pdf-mupdf-0.3.1.tar.gz /zathura-pdf-mupdf-0.3.3.tar.xz +/zathura-pdf-mupdf-0.3.4.tar.xz diff --git a/sources b/sources index 809dfee..67ecee9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zathura-pdf-mupdf-0.3.3.tar.xz) = cac3ccf4f85c689d44095966fbee84efac76d7c72915a06a85da272663eb3f11b053baf06a24e79e2fc89a57d05fa2f3c1df199e9e1415a3bfa65f3309227faf +SHA512 (zathura-pdf-mupdf-0.3.4.tar.xz) = 8a885f1faa471d413f09bd6a78b86d419fe433139b2f811dcae9a9ea180beaf693ee8c11c7fe98ed7d5303520f6d9b3efd0d8e7edf978aa5099ef580db79166a From 6a16ad3cf4303f91bb26e49bd40d7ab033cb2978 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 13:07:53 +0000 Subject: [PATCH 17/54] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zathura-pdf-mupdf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zathura-pdf-mupdf.spec b/zathura-pdf-mupdf.spec index a565abc..9da945c 100644 --- a/zathura-pdf-mupdf.spec +++ b/zathura-pdf-mupdf.spec @@ -1,6 +1,6 @@ Name: zathura-pdf-mupdf Version: 0.3.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: PDF support for zathura via mupdf License: zlib URL: http://pwmt.org/projects/zathura/plugins/%{name} @@ -51,6 +51,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.metainf %{_datadir}/metainfo/org.pwmt.zathura-pdf-mupdf.metainfo.xml %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 0.3.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Thu Nov 15 2018 Petr Šabata - 0.3.4-1 - 0.3.4 bump - Fixes rhbz#1645552 From 7211938b853f3c4b5888414a756c71a6c166eef1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 04:56:32 +0000 Subject: [PATCH 18/54] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zathura-pdf-mupdf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zathura-pdf-mupdf.spec b/zathura-pdf-mupdf.spec index 9da945c..819012f 100644 --- a/zathura-pdf-mupdf.spec +++ b/zathura-pdf-mupdf.spec @@ -1,6 +1,6 @@ Name: zathura-pdf-mupdf Version: 0.3.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: PDF support for zathura via mupdf License: zlib URL: http://pwmt.org/projects/zathura/plugins/%{name} @@ -51,6 +51,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.metainf %{_datadir}/metainfo/org.pwmt.zathura-pdf-mupdf.metainfo.xml %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 0.3.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Feb 03 2019 Fedora Release Engineering - 0.3.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 4b79619a0e3f9bd9880229198e970ff79f12b2ec Mon Sep 17 00:00:00 2001 From: "Ankur Sinha (Ankur Sinha Gmail)" Date: Thu, 21 Nov 2019 21:43:36 +0000 Subject: [PATCH 19/54] Update to 0.3.5 --- .gitignore | 1 + sources | 2 +- zathura-pdf-mupdf.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 7e26078..3bd05b0 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /zathura-pdf-mupdf-0.3.1.tar.gz /zathura-pdf-mupdf-0.3.3.tar.xz /zathura-pdf-mupdf-0.3.4.tar.xz +/zathura-pdf-mupdf-0.3.5.tar.xz diff --git a/sources b/sources index 67ecee9..1508d57 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zathura-pdf-mupdf-0.3.4.tar.xz) = 8a885f1faa471d413f09bd6a78b86d419fe433139b2f811dcae9a9ea180beaf693ee8c11c7fe98ed7d5303520f6d9b3efd0d8e7edf978aa5099ef580db79166a +SHA512 (zathura-pdf-mupdf-0.3.5.tar.xz) = e57b002c9cd3895996609d3f16e9fc6e533a1607eeeb1240c00bf28a12e3c725c3f93e37d0b1315e0fc3ea59314ea8bf35c47baa308c6c4b144a66a1cd5c7a3d diff --git a/zathura-pdf-mupdf.spec b/zathura-pdf-mupdf.spec index 819012f..1bf38e5 100644 --- a/zathura-pdf-mupdf.spec +++ b/zathura-pdf-mupdf.spec @@ -1,6 +1,6 @@ Name: zathura-pdf-mupdf -Version: 0.3.4 -Release: 3%{?dist} +Version: 0.3.5 +Release: 1%{?dist} Summary: PDF support for zathura via mupdf License: zlib URL: http://pwmt.org/projects/zathura/plugins/%{name} @@ -51,6 +51,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.metainf %{_datadir}/metainfo/org.pwmt.zathura-pdf-mupdf.metainfo.xml %changelog +* Thu Nov 21 2019 Ankur Sinha - 0.3.5-1 +- Update to 0.3.5 + * Sat Jul 27 2019 Fedora Release Engineering - 0.3.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From ee4d24477a3cabc43362c494b5302331c7752388 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 05:14:58 +0000 Subject: [PATCH 20/54] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zathura-pdf-mupdf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zathura-pdf-mupdf.spec b/zathura-pdf-mupdf.spec index 1bf38e5..278506b 100644 --- a/zathura-pdf-mupdf.spec +++ b/zathura-pdf-mupdf.spec @@ -1,6 +1,6 @@ Name: zathura-pdf-mupdf Version: 0.3.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: PDF support for zathura via mupdf License: zlib URL: http://pwmt.org/projects/zathura/plugins/%{name} @@ -51,6 +51,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.metainf %{_datadir}/metainfo/org.pwmt.zathura-pdf-mupdf.metainfo.xml %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 0.3.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Nov 21 2019 Ankur Sinha - 0.3.5-1 - Update to 0.3.5 From d190c0db62ff1697457748eb34b2f1585448183a Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Sat, 16 May 2020 20:40:45 +0200 Subject: [PATCH 21/54] Adjust to mupdf 1.17 fixes FTBFS --- 0001-Update-to-mupdf-1.17.patch | 50 +++++++++++++++++++++++++++++++++ zathura-pdf-mupdf.spec | 9 ++++-- 2 files changed, 57 insertions(+), 2 deletions(-) create mode 100644 0001-Update-to-mupdf-1.17.patch diff --git a/0001-Update-to-mupdf-1.17.patch b/0001-Update-to-mupdf-1.17.patch new file mode 100644 index 0000000..ead98d9 --- /dev/null +++ b/0001-Update-to-mupdf-1.17.patch @@ -0,0 +1,50 @@ +From c7f341addb76d5e6fd8c24c666d8fe97c451a4cb Mon Sep 17 00:00:00 2001 +Message-Id: +From: Moritz Lipp +Date: Thu, 7 May 2020 20:42:01 +0200 +Subject: [PATCH] Update to mupdf 1.17 + +Signed-off-by: Michael J Gruber +--- + zathura-pdf-mupdf/index.c | 4 +++- + zathura-pdf-mupdf/links.c | 5 +++-- + 2 files changed, 6 insertions(+), 3 deletions(-) + +diff --git a/zathura-pdf-mupdf/index.c b/zathura-pdf-mupdf/index.c +index c421f5c..cbbe978 100644 +--- a/zathura-pdf-mupdf/index.c ++++ b/zathura-pdf-mupdf/index.c +@@ -65,9 +65,11 @@ build_index(fz_context* ctx, fz_document* document, fz_outline* outline, girara_ + float x = 0; + float y = 0; + ++ fz_location location = fz_resolve_link(ctx, document, outline->uri, &x, &y); ++ + type = ZATHURA_LINK_GOTO_DEST; + target.destination_type = ZATHURA_LINK_DESTINATION_XYZ; +- target.page_number = fz_resolve_link(ctx, document, outline->uri, &x, &y); ++ target.page_number = location.page; + target.left = x; + target.top = y; + target.zoom = 0.0; +diff --git a/zathura-pdf-mupdf/links.c b/zathura-pdf-mupdf/links.c +index 99c5715..157f039 100644 +--- a/zathura-pdf-mupdf/links.c ++++ b/zathura-pdf-mupdf/links.c +@@ -54,10 +54,11 @@ pdf_page_links_get(zathura_page_t* page, void* data, zathura_error_t* error) + float x = 0; + float y = 0; + ++ fz_location location = fz_resolve_link(mupdf_document->ctx, mupdf_document->document, link->uri, &x, &y); ++ + type = ZATHURA_LINK_GOTO_DEST; + target.destination_type = ZATHURA_LINK_DESTINATION_XYZ; +- target.page_number = fz_resolve_link(mupdf_document->ctx, +- mupdf_document->document, link->uri, &x, &y); ++ target.page_number = location.page; + target.left = x; + target.top = y; + target.zoom = 0.0; +-- +2.26.2.764.g8d8fb31f15 + diff --git a/zathura-pdf-mupdf.spec b/zathura-pdf-mupdf.spec index 278506b..e0f4fc3 100644 --- a/zathura-pdf-mupdf.spec +++ b/zathura-pdf-mupdf.spec @@ -1,10 +1,11 @@ Name: zathura-pdf-mupdf Version: 0.3.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: PDF support for zathura via mupdf License: zlib URL: http://pwmt.org/projects/zathura/plugins/%{name} Source0: http://pwmt.org/projects/zathura/plugins/download/%{name}-%{version}.tar.xz +Patch1: 0001-Update-to-mupdf-1.17.patch BuildRequires: binutils BuildRequires: cairo-devel # Needed to validate the desktop file @@ -17,7 +18,7 @@ BuildRequires: jbig2dec-devel BuildRequires: libappstream-glib BuildRequires: libjpeg-turbo-devel BuildRequires: meson >= 0.43 -BuildRequires: mupdf-static >= 1.14 +BuildRequires: mupdf-static >= 1.17 BuildRequires: openjpeg2-devel BuildRequires: zathura-devel >= 0.3.9 Requires: zathura >= 0.3.9 @@ -29,6 +30,7 @@ This plugin adds PDF support to zathura using the mupdf rendering engine. %prep %setup -q +%patch1 -p1 %build %meson -Dlink-external=true @@ -51,6 +53,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.metainf %{_datadir}/metainfo/org.pwmt.zathura-pdf-mupdf.metainfo.xml %changelog +* Sat May 16 2020 Michael J Gruber - 0.3.5-3 +- Adjust to mupdf 1.17 + * Fri Jan 31 2020 Fedora Release Engineering - 0.3.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 73157a5ec599ff123c96f250fcf40fcd9cc6f2fe Mon Sep 17 00:00:00 2001 From: "Ankur Sinha (Ankur Sinha Gmail)" Date: Tue, 28 Jul 2020 09:51:37 +0100 Subject: [PATCH 22/54] Rebuild for jgib2dec --- zathura-pdf-mupdf.spec | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/zathura-pdf-mupdf.spec b/zathura-pdf-mupdf.spec index e0f4fc3..e2f186b 100644 --- a/zathura-pdf-mupdf.spec +++ b/zathura-pdf-mupdf.spec @@ -1,10 +1,16 @@ +# Desired jbig2dec header files and library version +# Apparantly, jbig2dec complains even about newer versions. +# Please update if needed. +%global jbig2dec_version 0.18 + Name: zathura-pdf-mupdf + Version: 0.3.5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: PDF support for zathura via mupdf License: zlib -URL: http://pwmt.org/projects/zathura/plugins/%{name} -Source0: http://pwmt.org/projects/zathura/plugins/download/%{name}-%{version}.tar.xz +URL: https://pwmt.org/projects/%{name}/ +Source0: %{url}/download/%{name}-%{version}.tar.xz Patch1: 0001-Update-to-mupdf-1.17.patch BuildRequires: binutils BuildRequires: cairo-devel @@ -13,7 +19,6 @@ BuildRequires: desktop-file-utils BuildRequires: gcc BuildRequires: girara-devel BuildRequires: glib2-devel -BuildRequires: jbig2dec-devel # Needed to validate appdata BuildRequires: libappstream-glib BuildRequires: libjpeg-turbo-devel @@ -22,6 +27,12 @@ BuildRequires: mupdf-static >= 1.17 BuildRequires: openjpeg2-devel BuildRequires: zathura-devel >= 0.3.9 Requires: zathura >= 0.3.9 +# Depend on exact versions like mupdf does +# https://src.fedoraproject.org/rpms/mupdf/c/02d93ee0f097415aa095ffcea4d768e5f43fac91?branch=master +BuildRequires: jbig2dec-devel = %{jbig2dec_version} +BuildRequires: jbig2dec-libs = %{jbig2dec_version} +Requires: jbig2dec-libs = %{jbig2dec_version} + # Old plugins used alternatives Conflicts: zathura-pdf-poppler < 0.2.9 @@ -53,6 +64,10 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.metainf %{_datadir}/metainfo/org.pwmt.zathura-pdf-mupdf.metainfo.xml %changelog +* Tue Jul 28 2020 Ankur Sinha - 0.3.5-4 +- Rebuild to require exact jgib2dec version +- #1860987 + * Sat May 16 2020 Michael J Gruber - 0.3.5-3 - Adjust to mupdf 1.17 From 709c2f4f3cb0d04eac1b9aeff65082f6b1384af1 Mon Sep 17 00:00:00 2001 From: "Ankur Sinha (Ankur Sinha Gmail)" Date: Mon, 7 Sep 2020 20:56:10 +0100 Subject: [PATCH 23/54] Update to 0.3.6 --- .gitignore | 1 + 0001-Update-to-mupdf-1.17.patch | 50 --------------------------------- sources | 2 +- zathura-pdf-mupdf.spec | 11 ++++---- 4 files changed, 8 insertions(+), 56 deletions(-) delete mode 100644 0001-Update-to-mupdf-1.17.patch diff --git a/.gitignore b/.gitignore index 3bd05b0..55f4469 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /zathura-pdf-mupdf-0.3.3.tar.xz /zathura-pdf-mupdf-0.3.4.tar.xz /zathura-pdf-mupdf-0.3.5.tar.xz +/zathura-pdf-mupdf-0.3.6.tar.xz diff --git a/0001-Update-to-mupdf-1.17.patch b/0001-Update-to-mupdf-1.17.patch deleted file mode 100644 index ead98d9..0000000 --- a/0001-Update-to-mupdf-1.17.patch +++ /dev/null @@ -1,50 +0,0 @@ -From c7f341addb76d5e6fd8c24c666d8fe97c451a4cb Mon Sep 17 00:00:00 2001 -Message-Id: -From: Moritz Lipp -Date: Thu, 7 May 2020 20:42:01 +0200 -Subject: [PATCH] Update to mupdf 1.17 - -Signed-off-by: Michael J Gruber ---- - zathura-pdf-mupdf/index.c | 4 +++- - zathura-pdf-mupdf/links.c | 5 +++-- - 2 files changed, 6 insertions(+), 3 deletions(-) - -diff --git a/zathura-pdf-mupdf/index.c b/zathura-pdf-mupdf/index.c -index c421f5c..cbbe978 100644 ---- a/zathura-pdf-mupdf/index.c -+++ b/zathura-pdf-mupdf/index.c -@@ -65,9 +65,11 @@ build_index(fz_context* ctx, fz_document* document, fz_outline* outline, girara_ - float x = 0; - float y = 0; - -+ fz_location location = fz_resolve_link(ctx, document, outline->uri, &x, &y); -+ - type = ZATHURA_LINK_GOTO_DEST; - target.destination_type = ZATHURA_LINK_DESTINATION_XYZ; -- target.page_number = fz_resolve_link(ctx, document, outline->uri, &x, &y); -+ target.page_number = location.page; - target.left = x; - target.top = y; - target.zoom = 0.0; -diff --git a/zathura-pdf-mupdf/links.c b/zathura-pdf-mupdf/links.c -index 99c5715..157f039 100644 ---- a/zathura-pdf-mupdf/links.c -+++ b/zathura-pdf-mupdf/links.c -@@ -54,10 +54,11 @@ pdf_page_links_get(zathura_page_t* page, void* data, zathura_error_t* error) - float x = 0; - float y = 0; - -+ fz_location location = fz_resolve_link(mupdf_document->ctx, mupdf_document->document, link->uri, &x, &y); -+ - type = ZATHURA_LINK_GOTO_DEST; - target.destination_type = ZATHURA_LINK_DESTINATION_XYZ; -- target.page_number = fz_resolve_link(mupdf_document->ctx, -- mupdf_document->document, link->uri, &x, &y); -+ target.page_number = location.page; - target.left = x; - target.top = y; - target.zoom = 0.0; --- -2.26.2.764.g8d8fb31f15 - diff --git a/sources b/sources index 1508d57..ff2a284 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zathura-pdf-mupdf-0.3.5.tar.xz) = e57b002c9cd3895996609d3f16e9fc6e533a1607eeeb1240c00bf28a12e3c725c3f93e37d0b1315e0fc3ea59314ea8bf35c47baa308c6c4b144a66a1cd5c7a3d +SHA512 (zathura-pdf-mupdf-0.3.6.tar.xz) = 417bc5c1fc141ece82c0617ca311a45354180dd786d48df577e5d68b0eb61198e9867e099216bafb6adae24e743366b4fcf128fdbb4d414db66040224fac27f5 diff --git a/zathura-pdf-mupdf.spec b/zathura-pdf-mupdf.spec index e2f186b..3b5e15b 100644 --- a/zathura-pdf-mupdf.spec +++ b/zathura-pdf-mupdf.spec @@ -5,13 +5,12 @@ Name: zathura-pdf-mupdf -Version: 0.3.5 -Release: 4%{?dist} +Version: 0.3.6 +Release: 1%{?dist} Summary: PDF support for zathura via mupdf License: zlib URL: https://pwmt.org/projects/%{name}/ Source0: %{url}/download/%{name}-%{version}.tar.xz -Patch1: 0001-Update-to-mupdf-1.17.patch BuildRequires: binutils BuildRequires: cairo-devel # Needed to validate the desktop file @@ -40,8 +39,7 @@ Conflicts: zathura-pdf-poppler < 0.2.9 This plugin adds PDF support to zathura using the mupdf rendering engine. %prep -%setup -q -%patch1 -p1 +%autosetup %build %meson -Dlink-external=true @@ -64,6 +62,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.metainf %{_datadir}/metainfo/org.pwmt.zathura-pdf-mupdf.metainfo.xml %changelog +* Mon Sep 07 2020 Ankur Sinha - 0.3.6-1 +- Update to new release + * Tue Jul 28 2020 Ankur Sinha - 0.3.5-4 - Rebuild to require exact jgib2dec version - #1860987 From ab42353e8bd9b7b95189a13766d61eaaf4dab516 Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Fri, 18 Sep 2020 23:55:48 +0200 Subject: [PATCH 24/54] rebuild with jbig2dec 0.19 --- zathura-pdf-mupdf.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/zathura-pdf-mupdf.spec b/zathura-pdf-mupdf.spec index 3b5e15b..d752c3a 100644 --- a/zathura-pdf-mupdf.spec +++ b/zathura-pdf-mupdf.spec @@ -1,12 +1,12 @@ # Desired jbig2dec header files and library version # Apparantly, jbig2dec complains even about newer versions. # Please update if needed. -%global jbig2dec_version 0.18 +%global jbig2dec_version 0.19 Name: zathura-pdf-mupdf Version: 0.3.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: PDF support for zathura via mupdf License: zlib URL: https://pwmt.org/projects/%{name}/ @@ -62,6 +62,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.metainf %{_datadir}/metainfo/org.pwmt.zathura-pdf-mupdf.metainfo.xml %changelog +* Fri Sep 18 2020 Michael J Gruber - 0.3.6-2 +- rebuild with jbig2dec 0.19 + * Mon Sep 07 2020 Ankur Sinha - 0.3.6-1 - Update to new release From b4195df664cc4060ba6609acbe25f35492aa8909 Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Thu, 8 Oct 2020 17:41:42 +0200 Subject: [PATCH 25/54] rebuild for mupdf 1.18.0 --- zathura-pdf-mupdf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zathura-pdf-mupdf.spec b/zathura-pdf-mupdf.spec index d752c3a..6929e2e 100644 --- a/zathura-pdf-mupdf.spec +++ b/zathura-pdf-mupdf.spec @@ -6,7 +6,7 @@ Name: zathura-pdf-mupdf Version: 0.3.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: PDF support for zathura via mupdf License: zlib URL: https://pwmt.org/projects/%{name}/ @@ -62,6 +62,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.metainf %{_datadir}/metainfo/org.pwmt.zathura-pdf-mupdf.metainfo.xml %changelog +* Thu Oct 08 2020 Michael J Gruber - 0.3.6-3 +- rebuild for mupdf 1.18.0 + * Fri Sep 18 2020 Michael J Gruber - 0.3.6-2 - rebuild with jbig2dec 0.19 From 857e6d16c2797390ce3b6e84d3827702ad1d1d23 Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Fri, 9 Oct 2020 13:21:46 +0200 Subject: [PATCH 26/54] link against gumbo --- 0001-link-against-gumbo-for-mupdf-1.18.patch | 33 ++++++++++++++++++++ zathura-pdf-mupdf.spec | 7 ++++- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 0001-link-against-gumbo-for-mupdf-1.18.patch diff --git a/0001-link-against-gumbo-for-mupdf-1.18.patch b/0001-link-against-gumbo-for-mupdf-1.18.patch new file mode 100644 index 0000000..7751fd5 --- /dev/null +++ b/0001-link-against-gumbo-for-mupdf-1.18.patch @@ -0,0 +1,33 @@ +From d0a99a26ab5f80334308607ba5ef9525af718f2a Mon Sep 17 00:00:00 2001 +Message-Id: +From: Michael J Gruber +Date: Fri, 9 Oct 2020 13:16:28 +0200 +Subject: [PATCH] link against gumbo for mupdf 1.18 + +Signed-off-by: Michael J Gruber +--- + meson.build | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 23cdc6a..dabcd39 100644 +--- a/meson.build ++++ b/meson.build +@@ -35,11 +35,13 @@ if get_option('link-external') + libjpeg = dependency('libjpeg') + libjbig2dec = cc.find_library('jbig2dec') + libopenjp2 = dependency('libopenjp2') ++ gumbo = dependency('gumbo') + + build_dependencies += [ + libjpeg, + libjbig2dec, +- libopenjp2 ++ libopenjp2, ++ gumbo + ] + endif + +-- +2.28.0.945.gedc4c61efd + diff --git a/zathura-pdf-mupdf.spec b/zathura-pdf-mupdf.spec index 6929e2e..5caf837 100644 --- a/zathura-pdf-mupdf.spec +++ b/zathura-pdf-mupdf.spec @@ -6,11 +6,12 @@ Name: zathura-pdf-mupdf Version: 0.3.6 -Release: 3%{?dist} +Release: 4%{?dist} Summary: PDF support for zathura via mupdf License: zlib URL: https://pwmt.org/projects/%{name}/ Source0: %{url}/download/%{name}-%{version}.tar.xz +Patch0: 0001-link-against-gumbo-for-mupdf-1.18.patch BuildRequires: binutils BuildRequires: cairo-devel # Needed to validate the desktop file @@ -25,6 +26,7 @@ BuildRequires: meson >= 0.43 BuildRequires: mupdf-static >= 1.17 BuildRequires: openjpeg2-devel BuildRequires: zathura-devel >= 0.3.9 +BuildRequires: gumbo-parser-devel Requires: zathura >= 0.3.9 # Depend on exact versions like mupdf does # https://src.fedoraproject.org/rpms/mupdf/c/02d93ee0f097415aa095ffcea4d768e5f43fac91?branch=master @@ -62,6 +64,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.metainf %{_datadir}/metainfo/org.pwmt.zathura-pdf-mupdf.metainfo.xml %changelog +* Fri Oct 09 2020 Michael J Gruber - 0.3.6-4 +- link against gumbo + * Thu Oct 08 2020 Michael J Gruber - 0.3.6-3 - rebuild for mupdf 1.18.0 From 9f93d611c4da8b760c9f52bee5775667e179f38d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 28 Jan 2021 00:38:55 +0000 Subject: [PATCH 27/54] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zathura-pdf-mupdf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zathura-pdf-mupdf.spec b/zathura-pdf-mupdf.spec index 5caf837..2106f9a 100644 --- a/zathura-pdf-mupdf.spec +++ b/zathura-pdf-mupdf.spec @@ -6,7 +6,7 @@ Name: zathura-pdf-mupdf Version: 0.3.6 -Release: 4%{?dist} +Release: 5%{?dist} Summary: PDF support for zathura via mupdf License: zlib URL: https://pwmt.org/projects/%{name}/ @@ -64,6 +64,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.metainf %{_datadir}/metainfo/org.pwmt.zathura-pdf-mupdf.metainfo.xml %changelog +* Thu Jan 28 2021 Fedora Release Engineering - 0.3.6-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Fri Oct 09 2020 Michael J Gruber - 0.3.6-4 - link against gumbo From 7406da3a1f17e12c73d5e9d13c570ac9272da9f2 Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Wed, 24 Feb 2021 12:34:55 +0100 Subject: [PATCH 28/54] rebuild for mupdf CVE-2021-3407 --- zathura-pdf-mupdf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zathura-pdf-mupdf.spec b/zathura-pdf-mupdf.spec index 2106f9a..bc359e0 100644 --- a/zathura-pdf-mupdf.spec +++ b/zathura-pdf-mupdf.spec @@ -6,7 +6,7 @@ Name: zathura-pdf-mupdf Version: 0.3.6 -Release: 5%{?dist} +Release: 6%{?dist} Summary: PDF support for zathura via mupdf License: zlib URL: https://pwmt.org/projects/%{name}/ @@ -64,6 +64,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.metainf %{_datadir}/metainfo/org.pwmt.zathura-pdf-mupdf.metainfo.xml %changelog +* Wed Feb 24 2021 Michael J Gruber - 0.3.6-6 +- rebuild for mupdf CVE-2021-3407 + * Thu Jan 28 2021 Fedora Release Engineering - 0.3.6-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From c908b84a583d6a823433171c0cba758a045c2ffd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 22:14:30 +0000 Subject: [PATCH 29/54] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zathura-pdf-mupdf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zathura-pdf-mupdf.spec b/zathura-pdf-mupdf.spec index bc359e0..0200e3c 100644 --- a/zathura-pdf-mupdf.spec +++ b/zathura-pdf-mupdf.spec @@ -6,7 +6,7 @@ Name: zathura-pdf-mupdf Version: 0.3.6 -Release: 6%{?dist} +Release: 7%{?dist} Summary: PDF support for zathura via mupdf License: zlib URL: https://pwmt.org/projects/%{name}/ @@ -64,6 +64,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.metainf %{_datadir}/metainfo/org.pwmt.zathura-pdf-mupdf.metainfo.xml %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 0.3.6-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed Feb 24 2021 Michael J Gruber - 0.3.6-6 - rebuild for mupdf CVE-2021-3407 From 1b8b388b1367be92060a0edc3ef04f74c5b74a12 Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Wed, 14 Jul 2021 22:13:41 +0200 Subject: [PATCH 30/54] Update to 0.3.7 bz #1982324 --- .gitignore | 1 + 0001-link-against-gumbo-for-mupdf-1.18.patch | 33 -------------------- sources | 2 +- zathura-pdf-mupdf.spec | 10 ++++-- 4 files changed, 9 insertions(+), 37 deletions(-) delete mode 100644 0001-link-against-gumbo-for-mupdf-1.18.patch diff --git a/.gitignore b/.gitignore index 55f4469..b40dfa7 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /zathura-pdf-mupdf-0.3.4.tar.xz /zathura-pdf-mupdf-0.3.5.tar.xz /zathura-pdf-mupdf-0.3.6.tar.xz +/zathura-pdf-mupdf-0.3.7.tar.xz diff --git a/0001-link-against-gumbo-for-mupdf-1.18.patch b/0001-link-against-gumbo-for-mupdf-1.18.patch deleted file mode 100644 index 7751fd5..0000000 --- a/0001-link-against-gumbo-for-mupdf-1.18.patch +++ /dev/null @@ -1,33 +0,0 @@ -From d0a99a26ab5f80334308607ba5ef9525af718f2a Mon Sep 17 00:00:00 2001 -Message-Id: -From: Michael J Gruber -Date: Fri, 9 Oct 2020 13:16:28 +0200 -Subject: [PATCH] link against gumbo for mupdf 1.18 - -Signed-off-by: Michael J Gruber ---- - meson.build | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 23cdc6a..dabcd39 100644 ---- a/meson.build -+++ b/meson.build -@@ -35,11 +35,13 @@ if get_option('link-external') - libjpeg = dependency('libjpeg') - libjbig2dec = cc.find_library('jbig2dec') - libopenjp2 = dependency('libopenjp2') -+ gumbo = dependency('gumbo') - - build_dependencies += [ - libjpeg, - libjbig2dec, -- libopenjp2 -+ libopenjp2, -+ gumbo - ] - endif - --- -2.28.0.945.gedc4c61efd - diff --git a/sources b/sources index ff2a284..a3b3815 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zathura-pdf-mupdf-0.3.6.tar.xz) = 417bc5c1fc141ece82c0617ca311a45354180dd786d48df577e5d68b0eb61198e9867e099216bafb6adae24e743366b4fcf128fdbb4d414db66040224fac27f5 +SHA512 (zathura-pdf-mupdf-0.3.7.tar.xz) = 709c34b1478e22f7da6a10bc8c59aa5bd1cbffd221caa38154d2e3efbea58dd2930fef3932687acac5d5ebccbd884303d81008a138a6276057f335aed0d570c0 diff --git a/zathura-pdf-mupdf.spec b/zathura-pdf-mupdf.spec index 0200e3c..020144d 100644 --- a/zathura-pdf-mupdf.spec +++ b/zathura-pdf-mupdf.spec @@ -5,13 +5,12 @@ Name: zathura-pdf-mupdf -Version: 0.3.6 -Release: 7%{?dist} +Version: 0.3.7 +Release: 1%{?dist} Summary: PDF support for zathura via mupdf License: zlib URL: https://pwmt.org/projects/%{name}/ Source0: %{url}/download/%{name}-%{version}.tar.xz -Patch0: 0001-link-against-gumbo-for-mupdf-1.18.patch BuildRequires: binutils BuildRequires: cairo-devel # Needed to validate the desktop file @@ -64,6 +63,11 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.metainf %{_datadir}/metainfo/org.pwmt.zathura-pdf-mupdf.metainfo.xml %changelog +* Sat Aug 28 2021 Ankur Sinha - 0.3.7-1 +- merge PR from @mjg manually: https://src.fedoraproject.org/rpms/zathura-pdf-mupdf/pull-request/10# +- Update to 0.3.7 (bz #1982324) +- Remove upstreamed patch + * Fri Jul 23 2021 Fedora Release Engineering - 0.3.6-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 8de659cbb4bf5141993de34761eaccffbd9c8083 Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Tue, 12 Oct 2021 11:43:17 +0200 Subject: [PATCH 31/54] rebuild for mupdf 1.19.0 Also, enable OCR with the leptonica/tesseract engine. --- ...tesseract-leptonica-for-mupdf-1.19.0.patch | 36 +++++++++++++++++++ zathura-pdf-mupdf.spec | 10 ++++-- 2 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 0001-link-against-tesseract-leptonica-for-mupdf-1.19.0.patch diff --git a/0001-link-against-tesseract-leptonica-for-mupdf-1.19.0.patch b/0001-link-against-tesseract-leptonica-for-mupdf-1.19.0.patch new file mode 100644 index 0000000..57bd731 --- /dev/null +++ b/0001-link-against-tesseract-leptonica-for-mupdf-1.19.0.patch @@ -0,0 +1,36 @@ +From 3547a91391e7c96145d752ffcd3c3dd7655fef21 Mon Sep 17 00:00:00 2001 +Message-Id: <3547a91391e7c96145d752ffcd3c3dd7655fef21.1635089223.git.mjg@fedoraproject.org> +From: Michael J Gruber +Date: Sun, 24 Oct 2021 17:15:12 +0200 +Subject: [PATCH] link against tesseract/leptonica for mupdf 1.19.0 + +Signed-off-by: Michael J Gruber +--- + meson.build | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 28373c4..d60cb76 100644 +--- a/meson.build ++++ b/meson.build +@@ -36,12 +36,16 @@ if get_option('link-external') + libjbig2dec = cc.find_library('jbig2dec') + libopenjp2 = dependency('libopenjp2') + gumbo = dependency('gumbo') ++ tesseract = dependency('tesseract') ++ leptonica = dependency('lept') + + build_dependencies += [ + libjpeg, + libjbig2dec, + libopenjp2, +- gumbo ++ gumbo, ++ tesseract, ++ leptonica + ] + endif + +-- +2.33.1.1061.g4ab8308fcf + diff --git a/zathura-pdf-mupdf.spec b/zathura-pdf-mupdf.spec index 020144d..c994dd6 100644 --- a/zathura-pdf-mupdf.spec +++ b/zathura-pdf-mupdf.spec @@ -6,11 +6,12 @@ Name: zathura-pdf-mupdf Version: 0.3.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: PDF support for zathura via mupdf License: zlib URL: https://pwmt.org/projects/%{name}/ Source0: %{url}/download/%{name}-%{version}.tar.xz +Patch1: 0001-link-against-tesseract-leptonica-for-mupdf-1.19.0.patch BuildRequires: binutils BuildRequires: cairo-devel # Needed to validate the desktop file @@ -26,6 +27,8 @@ BuildRequires: mupdf-static >= 1.17 BuildRequires: openjpeg2-devel BuildRequires: zathura-devel >= 0.3.9 BuildRequires: gumbo-parser-devel +BuildRequires: leptonica-devel +BuildRequires: tesseract-devel Requires: zathura >= 0.3.9 # Depend on exact versions like mupdf does # https://src.fedoraproject.org/rpms/mupdf/c/02d93ee0f097415aa095ffcea4d768e5f43fac91?branch=master @@ -40,7 +43,7 @@ Conflicts: zathura-pdf-poppler < 0.2.9 This plugin adds PDF support to zathura using the mupdf rendering engine. %prep -%autosetup +%autosetup -p1 %build %meson -Dlink-external=true @@ -63,6 +66,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.metainf %{_datadir}/metainfo/org.pwmt.zathura-pdf-mupdf.metainfo.xml %changelog +* Tue Oct 12 2021 Michael J Gruber - 0.3.7-2 +- rebuild for mupdf 1.19.0 + * Sat Aug 28 2021 Ankur Sinha - 0.3.7-1 - merge PR from @mjg manually: https://src.fedoraproject.org/rpms/zathura-pdf-mupdf/pull-request/10# - Update to 0.3.7 (bz #1982324) From 32b17c250f906389b565657aa706c0d8fc1aec7a Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 14 Dec 2021 14:44:06 +0100 Subject: [PATCH 32/54] Rebuild (tesseract) --- zathura-pdf-mupdf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zathura-pdf-mupdf.spec b/zathura-pdf-mupdf.spec index c994dd6..7089e5f 100644 --- a/zathura-pdf-mupdf.spec +++ b/zathura-pdf-mupdf.spec @@ -6,7 +6,7 @@ Name: zathura-pdf-mupdf Version: 0.3.7 -Release: 2%{?dist} +Release: 3%{?dist} Summary: PDF support for zathura via mupdf License: zlib URL: https://pwmt.org/projects/%{name}/ @@ -66,6 +66,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.metainf %{_datadir}/metainfo/org.pwmt.zathura-pdf-mupdf.metainfo.xml %changelog +* Tue Dec 14 2021 Sandro Mani - 0.3.7-3 +- Rebuild (tesseract) + * Tue Oct 12 2021 Michael J Gruber - 0.3.7-2 - rebuild for mupdf 1.19.0 From a8e3c52e221d2fe456265409d1a7b2c3e9ca775b Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sun, 19 Dec 2021 18:59:07 +0100 Subject: [PATCH 33/54] Rebuild (tesseract) --- zathura-pdf-mupdf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zathura-pdf-mupdf.spec b/zathura-pdf-mupdf.spec index 7089e5f..74fe38a 100644 --- a/zathura-pdf-mupdf.spec +++ b/zathura-pdf-mupdf.spec @@ -6,7 +6,7 @@ Name: zathura-pdf-mupdf Version: 0.3.7 -Release: 3%{?dist} +Release: 4%{?dist} Summary: PDF support for zathura via mupdf License: zlib URL: https://pwmt.org/projects/%{name}/ @@ -66,6 +66,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.metainf %{_datadir}/metainfo/org.pwmt.zathura-pdf-mupdf.metainfo.xml %changelog +* Sun Dec 19 2021 Sandro Mani - 0.3.7-4 +- Rebuild (tesseract) + * Tue Dec 14 2021 Sandro Mani - 0.3.7-3 - Rebuild (tesseract) From ddc4b5fc0d03b0c9316b054afcb2e601e7e84491 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 05:48:08 +0000 Subject: [PATCH 34/54] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zathura-pdf-mupdf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zathura-pdf-mupdf.spec b/zathura-pdf-mupdf.spec index 74fe38a..839a732 100644 --- a/zathura-pdf-mupdf.spec +++ b/zathura-pdf-mupdf.spec @@ -6,7 +6,7 @@ Name: zathura-pdf-mupdf Version: 0.3.7 -Release: 4%{?dist} +Release: 5%{?dist} Summary: PDF support for zathura via mupdf License: zlib URL: https://pwmt.org/projects/%{name}/ @@ -66,6 +66,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.metainf %{_datadir}/metainfo/org.pwmt.zathura-pdf-mupdf.metainfo.xml %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 0.3.7-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Sun Dec 19 2021 Sandro Mani - 0.3.7-4 - Rebuild (tesseract) From 2d8a656033ab685dd21c1cff1c201cc29654b51f Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Sun, 13 Feb 2022 20:55:28 +0100 Subject: [PATCH 35/54] Update to 0.3.8 (bz #2053985) --- .gitignore | 1 + 0001-Revert-Rework-detection-of-mupdf.patch | 84 +++++++++++++++++++ ...tesseract-leptonica-for-mupdf-1.19.0.patch | 36 -------- sources | 2 +- zathura-pdf-mupdf.spec | 11 ++- 5 files changed, 94 insertions(+), 40 deletions(-) create mode 100644 0001-Revert-Rework-detection-of-mupdf.patch delete mode 100644 0001-link-against-tesseract-leptonica-for-mupdf-1.19.0.patch diff --git a/.gitignore b/.gitignore index b40dfa7..f8e7c42 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /zathura-pdf-mupdf-0.3.5.tar.xz /zathura-pdf-mupdf-0.3.6.tar.xz /zathura-pdf-mupdf-0.3.7.tar.xz +/zathura-pdf-mupdf-0.3.8.tar.xz diff --git a/0001-Revert-Rework-detection-of-mupdf.patch b/0001-Revert-Rework-detection-of-mupdf.patch new file mode 100644 index 0000000..9133fec --- /dev/null +++ b/0001-Revert-Rework-detection-of-mupdf.patch @@ -0,0 +1,84 @@ +From 10c8edffbf9b814bb95e74b04a6a1d7fb729b4b4 Mon Sep 17 00:00:00 2001 +Message-Id: <10c8edffbf9b814bb95e74b04a6a1d7fb729b4b4.1644786121.git.mjg@fedoraproject.org> +From: Michael J Gruber +Date: Sun, 13 Feb 2022 22:00:59 +0100 +Subject: [PATCH] Revert "Rework detection of mupdf" + +This reverts commit 49a85efb915bfed933d251f6074b807d0e1ef385. + +On Fedora, neither pkconfig nor cmake find mupdf the way meson looks for +it. Also, we don't mujs since mupdf builds against the in-tree copy. + +Signed-off-by: Michael J Gruber +--- + meson.build | 17 +++++------------ + meson_options.txt | 6 ++++++ + 2 files changed, 11 insertions(+), 12 deletions(-) + +diff --git a/meson.build b/meson.build +index c8c19dc..07abdf5 100644 +--- a/meson.build ++++ b/meson.build +@@ -19,7 +19,7 @@ zathura = dependency('zathura', version: '>=0.3.9') + girara = dependency('girara-gtk3') + glib = dependency('glib-2.0') + cairo = dependency('cairo') +-mupdf = dependency('mupdf', required: false) ++mupdf = cc.find_library('mupdf') + mupdfthird = cc.find_library('mupdf-third') + + build_dependencies = [ +@@ -27,23 +27,17 @@ build_dependencies = [ + girara, + glib, + cairo, ++ mupdf, ++ mupdfthird + ] + +-if not mupdf.found() +- # normal build of mupdf +- mupdf = cc.find_library('mupdf') +- build_dependencies += [mupdf, mupdfthird] +-else +- # build from Debian's libmupdf-dev +- build_dependencies += [mupdf, mupdfthird] +- ++if get_option('link-external') + libjpeg = dependency('libjpeg') + libjbig2dec = cc.find_library('jbig2dec') + libopenjp2 = dependency('libopenjp2') + gumbo = dependency('gumbo') + tesseract = dependency('tesseract') + leptonica = dependency('lept') +- mujs = dependency('mujs') + + build_dependencies += [ + libjpeg, +@@ -51,8 +45,7 @@ else + libopenjp2, + gumbo, + tesseract, +- leptonica, +- mujs ++ leptonica + ] + endif + +diff --git a/meson_options.txt b/meson_options.txt +index c8df610..db9d0c5 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -1,3 +1,9 @@ ++option('link-external', ++ type: 'boolean', ++ value: false, ++ description: 'Link external libraries required by mupdf.' ++) ++ + option('plugindir', + type: 'string', + value: '', +-- +2.35.1.306.ga00bde9711 + diff --git a/0001-link-against-tesseract-leptonica-for-mupdf-1.19.0.patch b/0001-link-against-tesseract-leptonica-for-mupdf-1.19.0.patch deleted file mode 100644 index 57bd731..0000000 --- a/0001-link-against-tesseract-leptonica-for-mupdf-1.19.0.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 3547a91391e7c96145d752ffcd3c3dd7655fef21 Mon Sep 17 00:00:00 2001 -Message-Id: <3547a91391e7c96145d752ffcd3c3dd7655fef21.1635089223.git.mjg@fedoraproject.org> -From: Michael J Gruber -Date: Sun, 24 Oct 2021 17:15:12 +0200 -Subject: [PATCH] link against tesseract/leptonica for mupdf 1.19.0 - -Signed-off-by: Michael J Gruber ---- - meson.build | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 28373c4..d60cb76 100644 ---- a/meson.build -+++ b/meson.build -@@ -36,12 +36,16 @@ if get_option('link-external') - libjbig2dec = cc.find_library('jbig2dec') - libopenjp2 = dependency('libopenjp2') - gumbo = dependency('gumbo') -+ tesseract = dependency('tesseract') -+ leptonica = dependency('lept') - - build_dependencies += [ - libjpeg, - libjbig2dec, - libopenjp2, -- gumbo -+ gumbo, -+ tesseract, -+ leptonica - ] - endif - --- -2.33.1.1061.g4ab8308fcf - diff --git a/sources b/sources index a3b3815..279dae4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zathura-pdf-mupdf-0.3.7.tar.xz) = 709c34b1478e22f7da6a10bc8c59aa5bd1cbffd221caa38154d2e3efbea58dd2930fef3932687acac5d5ebccbd884303d81008a138a6276057f335aed0d570c0 +SHA512 (zathura-pdf-mupdf-0.3.8.tar.xz) = c2ec4a204446822eb3771673e99ddc42d6ffdfbbb9fc079e09442f0b5a6e2397190d2a8079a92f2d08d5824199760a90d192cb517c9f17676102f3ed69edd5a0 diff --git a/zathura-pdf-mupdf.spec b/zathura-pdf-mupdf.spec index 839a732..a5f1216 100644 --- a/zathura-pdf-mupdf.spec +++ b/zathura-pdf-mupdf.spec @@ -5,13 +5,13 @@ Name: zathura-pdf-mupdf -Version: 0.3.7 -Release: 5%{?dist} +Version: 0.3.8 +Release: 1%{?dist} Summary: PDF support for zathura via mupdf License: zlib URL: https://pwmt.org/projects/%{name}/ Source0: %{url}/download/%{name}-%{version}.tar.xz -Patch1: 0001-link-against-tesseract-leptonica-for-mupdf-1.19.0.patch +Patch1: 0001-Revert-Rework-detection-of-mupdf.patch BuildRequires: binutils BuildRequires: cairo-devel # Needed to validate the desktop file @@ -66,6 +66,11 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.metainf %{_datadir}/metainfo/org.pwmt.zathura-pdf-mupdf.metainfo.xml %changelog +* Sun Feb 13 2022 Michael J Gruber - 0.3.8-1 +- Update to 0.3.8 (bz #2053985) +- Remove upstreamed patch +- Restore build with external libraries + * Sat Jan 22 2022 Fedora Release Engineering - 0.3.7-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From d5e51a4d067ff68552166acef235f0d6ff463820 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Fri, 25 Feb 2022 12:10:16 +0100 Subject: [PATCH 36/54] Rebuild (leptonica) --- zathura-pdf-mupdf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zathura-pdf-mupdf.spec b/zathura-pdf-mupdf.spec index 839a732..97998ef 100644 --- a/zathura-pdf-mupdf.spec +++ b/zathura-pdf-mupdf.spec @@ -6,7 +6,7 @@ Name: zathura-pdf-mupdf Version: 0.3.7 -Release: 5%{?dist} +Release: 6%{?dist} Summary: PDF support for zathura via mupdf License: zlib URL: https://pwmt.org/projects/%{name}/ @@ -66,6 +66,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.metainf %{_datadir}/metainfo/org.pwmt.zathura-pdf-mupdf.metainfo.xml %changelog +* Fri Feb 25 2022 Sandro Mani - 0.3.7-6 +- Rebuild (leptonica) + * Sat Jan 22 2022 Fedora Release Engineering - 0.3.7-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From f5ae4c731eb96c46926a8ffec89c4ebdb68fd428 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Thu, 10 Mar 2022 14:00:15 +0100 Subject: [PATCH 37/54] Rebuild for tesseract-5.1.0 --- zathura-pdf-mupdf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zathura-pdf-mupdf.spec b/zathura-pdf-mupdf.spec index 97998ef..3722d30 100644 --- a/zathura-pdf-mupdf.spec +++ b/zathura-pdf-mupdf.spec @@ -6,7 +6,7 @@ Name: zathura-pdf-mupdf Version: 0.3.7 -Release: 6%{?dist} +Release: 7%{?dist} Summary: PDF support for zathura via mupdf License: zlib URL: https://pwmt.org/projects/%{name}/ @@ -66,6 +66,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.metainf %{_datadir}/metainfo/org.pwmt.zathura-pdf-mupdf.metainfo.xml %changelog +* Thu Mar 10 2022 Sandro Mani - 0.3.7-7 +- Rebuild for tesseract 5.1.0 + * Fri Feb 25 2022 Sandro Mani - 0.3.7-6 - Rebuild (leptonica) From de48d704d95fa153972712d36974325d3cf7a9cb Mon Sep 17 00:00:00 2001 From: "Ankur Sinha (Ankur Sinha Gmail)" Date: Sat, 2 Apr 2022 21:51:52 +0100 Subject: [PATCH 38/54] feat: to 0.3.8 (fixes rhbz#2053985) --- .gitignore | 1 + ...tesseract-leptonica-for-mupdf-1.19.0.patch | 36 ------------------- sources | 2 +- zathura-pdf-mupdf.spec | 12 ++++--- 4 files changed, 9 insertions(+), 42 deletions(-) delete mode 100644 0001-link-against-tesseract-leptonica-for-mupdf-1.19.0.patch diff --git a/.gitignore b/.gitignore index b40dfa7..f8e7c42 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /zathura-pdf-mupdf-0.3.5.tar.xz /zathura-pdf-mupdf-0.3.6.tar.xz /zathura-pdf-mupdf-0.3.7.tar.xz +/zathura-pdf-mupdf-0.3.8.tar.xz diff --git a/0001-link-against-tesseract-leptonica-for-mupdf-1.19.0.patch b/0001-link-against-tesseract-leptonica-for-mupdf-1.19.0.patch deleted file mode 100644 index 57bd731..0000000 --- a/0001-link-against-tesseract-leptonica-for-mupdf-1.19.0.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 3547a91391e7c96145d752ffcd3c3dd7655fef21 Mon Sep 17 00:00:00 2001 -Message-Id: <3547a91391e7c96145d752ffcd3c3dd7655fef21.1635089223.git.mjg@fedoraproject.org> -From: Michael J Gruber -Date: Sun, 24 Oct 2021 17:15:12 +0200 -Subject: [PATCH] link against tesseract/leptonica for mupdf 1.19.0 - -Signed-off-by: Michael J Gruber ---- - meson.build | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 28373c4..d60cb76 100644 ---- a/meson.build -+++ b/meson.build -@@ -36,12 +36,16 @@ if get_option('link-external') - libjbig2dec = cc.find_library('jbig2dec') - libopenjp2 = dependency('libopenjp2') - gumbo = dependency('gumbo') -+ tesseract = dependency('tesseract') -+ leptonica = dependency('lept') - - build_dependencies += [ - libjpeg, - libjbig2dec, - libopenjp2, -- gumbo -+ gumbo, -+ tesseract, -+ leptonica - ] - endif - --- -2.33.1.1061.g4ab8308fcf - diff --git a/sources b/sources index a3b3815..279dae4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zathura-pdf-mupdf-0.3.7.tar.xz) = 709c34b1478e22f7da6a10bc8c59aa5bd1cbffd221caa38154d2e3efbea58dd2930fef3932687acac5d5ebccbd884303d81008a138a6276057f335aed0d570c0 +SHA512 (zathura-pdf-mupdf-0.3.8.tar.xz) = c2ec4a204446822eb3771673e99ddc42d6ffdfbbb9fc079e09442f0b5a6e2397190d2a8079a92f2d08d5824199760a90d192cb517c9f17676102f3ed69edd5a0 diff --git a/zathura-pdf-mupdf.spec b/zathura-pdf-mupdf.spec index 3722d30..9270d7b 100644 --- a/zathura-pdf-mupdf.spec +++ b/zathura-pdf-mupdf.spec @@ -5,13 +5,12 @@ Name: zathura-pdf-mupdf -Version: 0.3.7 -Release: 7%{?dist} +Version: 0.3.8 +Release: 1%{?dist} Summary: PDF support for zathura via mupdf License: zlib URL: https://pwmt.org/projects/%{name}/ Source0: %{url}/download/%{name}-%{version}.tar.xz -Patch1: 0001-link-against-tesseract-leptonica-for-mupdf-1.19.0.patch BuildRequires: binutils BuildRequires: cairo-devel # Needed to validate the desktop file @@ -43,10 +42,10 @@ Conflicts: zathura-pdf-poppler < 0.2.9 This plugin adds PDF support to zathura using the mupdf rendering engine. %prep -%autosetup -p1 +%autosetup %build -%meson -Dlink-external=true +%meson %meson_build %install @@ -66,6 +65,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.metainf %{_datadir}/metainfo/org.pwmt.zathura-pdf-mupdf.metainfo.xml %changelog +* Sat Apr 02 2022 Ankur Sinha - 0.3.8-1 +- update to latest release + * Thu Mar 10 2022 Sandro Mani - 0.3.7-7 - Rebuild for tesseract 5.1.0 From 3889fb62b45106fabe86d12e087c0d71e211ac49 Mon Sep 17 00:00:00 2001 From: "Ankur Sinha (Ankur Sinha Gmail)" Date: Wed, 20 Apr 2022 14:10:19 +0100 Subject: [PATCH 39/54] fix: correct patch application and build options These were missed out in the merge --- zathura-pdf-mupdf.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/zathura-pdf-mupdf.spec b/zathura-pdf-mupdf.spec index 59b472b..299c75a 100644 --- a/zathura-pdf-mupdf.spec +++ b/zathura-pdf-mupdf.spec @@ -6,7 +6,7 @@ Name: zathura-pdf-mupdf Version: 0.3.8 -Release: 2%{?dist} +Release: 3%{?dist} Summary: PDF support for zathura via mupdf License: zlib URL: https://pwmt.org/projects/%{name}/ @@ -18,6 +18,7 @@ BuildRequires: cairo-devel # Needed to validate the desktop file BuildRequires: desktop-file-utils BuildRequires: gcc +BuildRequires: git-core BuildRequires: girara-devel BuildRequires: glib2-devel # Needed to validate appdata @@ -44,10 +45,10 @@ Conflicts: zathura-pdf-poppler < 0.2.9 This plugin adds PDF support to zathura using the mupdf rendering engine. %prep -%autosetup +%autosetup -S git -p1 %build -%meson +%meson -Dlink-external=true %meson_build %install From 5dae82de28e41d815293aa667dfbac79a809845d Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sat, 21 May 2022 00:17:36 +0200 Subject: [PATCH 40/54] Rebuild for gdal-3.5.0 and/or openjpeg-2.5.0 --- zathura-pdf-mupdf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zathura-pdf-mupdf.spec b/zathura-pdf-mupdf.spec index 299c75a..04f29fb 100644 --- a/zathura-pdf-mupdf.spec +++ b/zathura-pdf-mupdf.spec @@ -6,7 +6,7 @@ Name: zathura-pdf-mupdf Version: 0.3.8 -Release: 3%{?dist} +Release: 4%{?dist} Summary: PDF support for zathura via mupdf License: zlib URL: https://pwmt.org/projects/%{name}/ @@ -68,6 +68,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.metainf %{_datadir}/metainfo/org.pwmt.zathura-pdf-mupdf.metainfo.xml %changelog +* Fri May 20 2022 Sandro Mani - 0.3.8-4 +- Rebuild for gdal-3.5.0 and/or openjpeg-2.5.0 + * Wed Apr 13 2022 Ankur Sinha - 0.3.8-2 - merge https://src.fedoraproject.org/rpms/zathura-pdf-mupdf/pull-request/12 - Remove upstreamed patch From a8da3bc9367d2f91ec21667327812fb7392ae84e Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Sun, 15 May 2022 21:56:18 +0200 Subject: [PATCH 41/54] build against mupdf 1.20.0 --- 0001-adapt-to-mupdf-1.20.patch | 27 +++++++++++++++++++++++++++ zathura-pdf-mupdf.spec | 6 +++++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 0001-adapt-to-mupdf-1.20.patch diff --git a/0001-adapt-to-mupdf-1.20.patch b/0001-adapt-to-mupdf-1.20.patch new file mode 100644 index 0000000..ccee108 --- /dev/null +++ b/0001-adapt-to-mupdf-1.20.patch @@ -0,0 +1,27 @@ +From 89851522051ffdc171c6e63c82d07205b0683aea Mon Sep 17 00:00:00 2001 +Message-Id: <89851522051ffdc171c6e63c82d07205b0683aea.1652644338.git.mjg@fedoraproject.org> +From: Michael J Gruber +Date: Sun, 15 May 2022 21:52:07 +0200 +Subject: [PATCH] adapt to mupdf 1.20 + +Signed-off-by: Michael J Gruber +--- + zathura-pdf-mupdf/search.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/zathura-pdf-mupdf/search.c b/zathura-pdf-mupdf/search.c +index f84dea0..419e5f4 100644 +--- a/zathura-pdf-mupdf/search.c ++++ b/zathura-pdf-mupdf/search.c +@@ -41,7 +41,7 @@ pdf_page_search_text(zathura_page_t* page, void* data, const char* text, zathura + + fz_quad* hit_bbox = fz_malloc_array(mupdf_page->ctx, N_SEARCH_RESULTS, fz_quad); + int num_results = fz_search_stext_page(mupdf_page->ctx, mupdf_page->text, +- text, hit_bbox, N_SEARCH_RESULTS); ++ text, NULL, hit_bbox, N_SEARCH_RESULTS); + + fz_rect r; + for (int i = 0; i < num_results; i++) { +-- +2.36.1.165.g85e47b7606 + diff --git a/zathura-pdf-mupdf.spec b/zathura-pdf-mupdf.spec index 04f29fb..8f31b0a 100644 --- a/zathura-pdf-mupdf.spec +++ b/zathura-pdf-mupdf.spec @@ -6,12 +6,13 @@ Name: zathura-pdf-mupdf Version: 0.3.8 -Release: 4%{?dist} +Release: 5%{?dist} Summary: PDF support for zathura via mupdf License: zlib URL: https://pwmt.org/projects/%{name}/ Source0: %{url}/download/%{name}-%{version}.tar.xz Patch1: 0001-Revert-Rework-detection-of-mupdf.patch +Patch2: 0001-adapt-to-mupdf-1.20.patch BuildRequires: binutils BuildRequires: cairo-devel @@ -68,6 +69,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.metainf %{_datadir}/metainfo/org.pwmt.zathura-pdf-mupdf.metainfo.xml %changelog +* Wed Jun 15 2022 Michael J Gruber - 0.3.8-5 +- build against mupdf 1.20.0 + * Fri May 20 2022 Sandro Mani - 0.3.8-4 - Rebuild for gdal-3.5.0 and/or openjpeg-2.5.0 From 3937db2da8d34e8187e1f94ed8f35d50c57a1f6f Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Fri, 8 Jul 2022 10:51:09 +0200 Subject: [PATCH 42/54] Rebuild (tesseract) --- zathura-pdf-mupdf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zathura-pdf-mupdf.spec b/zathura-pdf-mupdf.spec index 8f31b0a..899a334 100644 --- a/zathura-pdf-mupdf.spec +++ b/zathura-pdf-mupdf.spec @@ -6,7 +6,7 @@ Name: zathura-pdf-mupdf Version: 0.3.8 -Release: 5%{?dist} +Release: 6%{?dist} Summary: PDF support for zathura via mupdf License: zlib URL: https://pwmt.org/projects/%{name}/ @@ -69,6 +69,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.metainf %{_datadir}/metainfo/org.pwmt.zathura-pdf-mupdf.metainfo.xml %changelog +* Fri Jul 08 2022 Sandro Mani - 0.3.8-6 +- Rebuild (tesseract) + * Wed Jun 15 2022 Michael J Gruber - 0.3.8-5 - build against mupdf 1.20.0 From 91dd30adcb7e46430f3d8df7f442d65ea137f975 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 13:51:22 +0000 Subject: [PATCH 43/54] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zathura-pdf-mupdf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zathura-pdf-mupdf.spec b/zathura-pdf-mupdf.spec index 899a334..2a0d8e4 100644 --- a/zathura-pdf-mupdf.spec +++ b/zathura-pdf-mupdf.spec @@ -6,7 +6,7 @@ Name: zathura-pdf-mupdf Version: 0.3.8 -Release: 6%{?dist} +Release: 7%{?dist} Summary: PDF support for zathura via mupdf License: zlib URL: https://pwmt.org/projects/%{name}/ @@ -69,6 +69,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.metainf %{_datadir}/metainfo/org.pwmt.zathura-pdf-mupdf.metainfo.xml %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 0.3.8-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Fri Jul 08 2022 Sandro Mani - 0.3.8-6 - Rebuild (tesseract) From a94d471e7f7fe976477ccd6fb7bb4525cf305b2e Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Fri, 12 Aug 2022 21:40:50 +0200 Subject: [PATCH 44/54] build against mupdf 1.20.3 --- zathura-pdf-mupdf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zathura-pdf-mupdf.spec b/zathura-pdf-mupdf.spec index 2a0d8e4..2c5c6a6 100644 --- a/zathura-pdf-mupdf.spec +++ b/zathura-pdf-mupdf.spec @@ -6,7 +6,7 @@ Name: zathura-pdf-mupdf Version: 0.3.8 -Release: 7%{?dist} +Release: 8%{?dist} Summary: PDF support for zathura via mupdf License: zlib URL: https://pwmt.org/projects/%{name}/ @@ -69,6 +69,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.metainf %{_datadir}/metainfo/org.pwmt.zathura-pdf-mupdf.metainfo.xml %changelog +* Fri Aug 12 2022 Michael J Gruber - 0.3.8-8 +- build against mupdf 1.20.3 + * Sat Jul 23 2022 Fedora Release Engineering - 0.3.8-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 952c1c3b757219289e9677b98211f65c315e6b46 Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Tue, 23 Aug 2022 10:03:22 +0200 Subject: [PATCH 45/54] Update to 0.3.9 (rhbz#2120429) Upstream now incorporates the patch we carried for mupdf 1.20.0 already. --- .gitignore | 1 + 0001-adapt-to-mupdf-1.20.patch | 27 --------------------------- sources | 2 +- zathura-pdf-mupdf.spec | 10 ++++++---- 4 files changed, 8 insertions(+), 32 deletions(-) delete mode 100644 0001-adapt-to-mupdf-1.20.patch diff --git a/.gitignore b/.gitignore index f8e7c42..256828e 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /zathura-pdf-mupdf-0.3.6.tar.xz /zathura-pdf-mupdf-0.3.7.tar.xz /zathura-pdf-mupdf-0.3.8.tar.xz +/zathura-pdf-mupdf-0.3.9.tar.xz diff --git a/0001-adapt-to-mupdf-1.20.patch b/0001-adapt-to-mupdf-1.20.patch deleted file mode 100644 index ccee108..0000000 --- a/0001-adapt-to-mupdf-1.20.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 89851522051ffdc171c6e63c82d07205b0683aea Mon Sep 17 00:00:00 2001 -Message-Id: <89851522051ffdc171c6e63c82d07205b0683aea.1652644338.git.mjg@fedoraproject.org> -From: Michael J Gruber -Date: Sun, 15 May 2022 21:52:07 +0200 -Subject: [PATCH] adapt to mupdf 1.20 - -Signed-off-by: Michael J Gruber ---- - zathura-pdf-mupdf/search.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/zathura-pdf-mupdf/search.c b/zathura-pdf-mupdf/search.c -index f84dea0..419e5f4 100644 ---- a/zathura-pdf-mupdf/search.c -+++ b/zathura-pdf-mupdf/search.c -@@ -41,7 +41,7 @@ pdf_page_search_text(zathura_page_t* page, void* data, const char* text, zathura - - fz_quad* hit_bbox = fz_malloc_array(mupdf_page->ctx, N_SEARCH_RESULTS, fz_quad); - int num_results = fz_search_stext_page(mupdf_page->ctx, mupdf_page->text, -- text, hit_bbox, N_SEARCH_RESULTS); -+ text, NULL, hit_bbox, N_SEARCH_RESULTS); - - fz_rect r; - for (int i = 0; i < num_results; i++) { --- -2.36.1.165.g85e47b7606 - diff --git a/sources b/sources index 279dae4..22b3ccf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zathura-pdf-mupdf-0.3.8.tar.xz) = c2ec4a204446822eb3771673e99ddc42d6ffdfbbb9fc079e09442f0b5a6e2397190d2a8079a92f2d08d5824199760a90d192cb517c9f17676102f3ed69edd5a0 +SHA512 (zathura-pdf-mupdf-0.3.9.tar.xz) = 6a81e562965a0d6a2a25e301b0cc20ee70ada43ed7261f5d4ef6c132de1136f0222ebee0088d80cc2e0d1d60595e335cb1a1a914cb761aad36b487d7c16ac034 diff --git a/zathura-pdf-mupdf.spec b/zathura-pdf-mupdf.spec index 2c5c6a6..2e4e00c 100644 --- a/zathura-pdf-mupdf.spec +++ b/zathura-pdf-mupdf.spec @@ -5,14 +5,13 @@ Name: zathura-pdf-mupdf -Version: 0.3.8 -Release: 8%{?dist} +Version: 0.3.9 +Release: 1%{?dist} Summary: PDF support for zathura via mupdf License: zlib URL: https://pwmt.org/projects/%{name}/ Source0: %{url}/download/%{name}-%{version}.tar.xz Patch1: 0001-Revert-Rework-detection-of-mupdf.patch -Patch2: 0001-adapt-to-mupdf-1.20.patch BuildRequires: binutils BuildRequires: cairo-devel @@ -26,7 +25,7 @@ BuildRequires: glib2-devel BuildRequires: libappstream-glib BuildRequires: libjpeg-turbo-devel BuildRequires: meson >= 0.43 -BuildRequires: mupdf-static >= 1.17 +BuildRequires: mupdf-static >= 1.20 BuildRequires: openjpeg2-devel BuildRequires: zathura-devel >= 0.3.9 BuildRequires: gumbo-parser-devel @@ -69,6 +68,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.metainf %{_datadir}/metainfo/org.pwmt.zathura-pdf-mupdf.metainfo.xml %changelog +* Tue Aug 23 2022 Michael J Gruber - 0.3.9-1 +- Update to 0.3.9 (rhbz#2120429) + * Fri Aug 12 2022 Michael J Gruber - 0.3.8-8 - build against mupdf 1.20.3 From e202a8c0b351f19790ff86fda37069606fd5a29a Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Wed, 7 Dec 2022 15:16:21 +0100 Subject: [PATCH 46/54] build against mupdf 1.21.0 --- zathura-pdf-mupdf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zathura-pdf-mupdf.spec b/zathura-pdf-mupdf.spec index 2e4e00c..f6cf669 100644 --- a/zathura-pdf-mupdf.spec +++ b/zathura-pdf-mupdf.spec @@ -6,7 +6,7 @@ Name: zathura-pdf-mupdf Version: 0.3.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: PDF support for zathura via mupdf License: zlib URL: https://pwmt.org/projects/%{name}/ @@ -68,6 +68,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.metainf %{_datadir}/metainfo/org.pwmt.zathura-pdf-mupdf.metainfo.xml %changelog +* Mon Nov 28 2022 Michael J Gruber - 0.3.9-2 +- build against mupdf 1.21.0 + * Tue Aug 23 2022 Michael J Gruber - 0.3.9-1 - Update to 0.3.9 (rhbz#2120429) From 1a2d9a684f28d60a02375e551e5996ec0cee2486 Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Mon, 28 Nov 2022 17:08:07 +0100 Subject: [PATCH 47/54] Update to 0.4.0 (rhbz#2148751) --- .gitignore | 1 + sources | 2 +- zathura-pdf-mupdf.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 256828e..9a6e21f 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /zathura-pdf-mupdf-0.3.7.tar.xz /zathura-pdf-mupdf-0.3.8.tar.xz /zathura-pdf-mupdf-0.3.9.tar.xz +/zathura-pdf-mupdf-0.4.0.tar.xz diff --git a/sources b/sources index 22b3ccf..940de81 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zathura-pdf-mupdf-0.3.9.tar.xz) = 6a81e562965a0d6a2a25e301b0cc20ee70ada43ed7261f5d4ef6c132de1136f0222ebee0088d80cc2e0d1d60595e335cb1a1a914cb761aad36b487d7c16ac034 +SHA512 (zathura-pdf-mupdf-0.4.0.tar.xz) = 63e50b76b017d0fc22b0ab0f1a20350a81a63a77b07621ed0d28a40d1c2a5b037d236671cdd2db01d1b289d4cdbd66934b1d2753c3f136fed493cdd069c0efeb diff --git a/zathura-pdf-mupdf.spec b/zathura-pdf-mupdf.spec index f6cf669..e812744 100644 --- a/zathura-pdf-mupdf.spec +++ b/zathura-pdf-mupdf.spec @@ -5,8 +5,8 @@ Name: zathura-pdf-mupdf -Version: 0.3.9 -Release: 2%{?dist} +Version: 0.4.0 +Release: 1%{?dist} Summary: PDF support for zathura via mupdf License: zlib URL: https://pwmt.org/projects/%{name}/ @@ -68,6 +68,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.metainf %{_datadir}/metainfo/org.pwmt.zathura-pdf-mupdf.metainfo.xml %changelog +* Mon Nov 28 2022 Michael J Gruber - 0.4.0-1 +- Update to 0.4.0 (rhbz#2148751) + * Mon Nov 28 2022 Michael J Gruber - 0.3.9-2 - build against mupdf 1.21.0 From 6226f910c7315351b01505b2fc3b42d7480d07bc Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 21 Dec 2022 15:45:12 +0100 Subject: [PATCH 48/54] Rebuild (leptonica) --- zathura-pdf-mupdf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zathura-pdf-mupdf.spec b/zathura-pdf-mupdf.spec index e812744..1449723 100644 --- a/zathura-pdf-mupdf.spec +++ b/zathura-pdf-mupdf.spec @@ -6,7 +6,7 @@ Name: zathura-pdf-mupdf Version: 0.4.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: PDF support for zathura via mupdf License: zlib URL: https://pwmt.org/projects/%{name}/ @@ -68,6 +68,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.metainf %{_datadir}/metainfo/org.pwmt.zathura-pdf-mupdf.metainfo.xml %changelog +* Wed Dec 21 2022 Sandro Mani - 0.4.0-2 +- Rebuild (leptonica) + * Mon Nov 28 2022 Michael J Gruber - 0.4.0-1 - Update to 0.4.0 (rhbz#2148751) From e2f3df0c8bd077cce534a0a9d2093af9ae4b1d51 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Fri, 23 Dec 2022 22:01:17 +0100 Subject: [PATCH 49/54] Rebuild (tesseract) --- zathura-pdf-mupdf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zathura-pdf-mupdf.spec b/zathura-pdf-mupdf.spec index 1449723..482abd8 100644 --- a/zathura-pdf-mupdf.spec +++ b/zathura-pdf-mupdf.spec @@ -6,7 +6,7 @@ Name: zathura-pdf-mupdf Version: 0.4.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: PDF support for zathura via mupdf License: zlib URL: https://pwmt.org/projects/%{name}/ @@ -68,6 +68,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.metainf %{_datadir}/metainfo/org.pwmt.zathura-pdf-mupdf.metainfo.xml %changelog +* Fri Dec 23 2022 Sandro Mani - 0.4.0-3 +- Rebuild (tesseract) + * Wed Dec 21 2022 Sandro Mani - 0.4.0-2 - Rebuild (leptonica) From 0d9665b5e165408eb3001c203ce2f501e619f3bd Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Sat, 17 Dec 2022 12:39:17 +0100 Subject: [PATCH 50/54] SPDX migration --- zathura-pdf-mupdf.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/zathura-pdf-mupdf.spec b/zathura-pdf-mupdf.spec index 482abd8..b20efcd 100644 --- a/zathura-pdf-mupdf.spec +++ b/zathura-pdf-mupdf.spec @@ -6,9 +6,9 @@ Name: zathura-pdf-mupdf Version: 0.4.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: PDF support for zathura via mupdf -License: zlib +License: Zlib URL: https://pwmt.org/projects/%{name}/ Source0: %{url}/download/%{name}-%{version}.tar.xz Patch1: 0001-Revert-Rework-detection-of-mupdf.patch @@ -68,6 +68,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.metainf %{_datadir}/metainfo/org.pwmt.zathura-pdf-mupdf.metainfo.xml %changelog +* Sat Dec 24 2022 Michael J Gruber - 0.4.0-4 +- SPDX migration + * Fri Dec 23 2022 Sandro Mani - 0.4.0-3 - Rebuild (tesseract) From d2cd03cc09ae1237a979ec3335d9c46fb8301307 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 08:11:57 +0000 Subject: [PATCH 51/54] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zathura-pdf-mupdf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zathura-pdf-mupdf.spec b/zathura-pdf-mupdf.spec index b20efcd..63968e1 100644 --- a/zathura-pdf-mupdf.spec +++ b/zathura-pdf-mupdf.spec @@ -6,7 +6,7 @@ Name: zathura-pdf-mupdf Version: 0.4.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: PDF support for zathura via mupdf License: Zlib URL: https://pwmt.org/projects/%{name}/ @@ -68,6 +68,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.metainf %{_datadir}/metainfo/org.pwmt.zathura-pdf-mupdf.metainfo.xml %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 0.4.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Dec 24 2022 Michael J Gruber - 0.4.0-4 - SPDX migration From 1fac56ad9c8bf4f0e8faf76d7fbb3379796e0566 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Thu, 6 Apr 2023 23:31:26 +0200 Subject: [PATCH 52/54] Rebuild (tesseract) --- zathura-pdf-mupdf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zathura-pdf-mupdf.spec b/zathura-pdf-mupdf.spec index 63968e1..06f454c 100644 --- a/zathura-pdf-mupdf.spec +++ b/zathura-pdf-mupdf.spec @@ -6,7 +6,7 @@ Name: zathura-pdf-mupdf Version: 0.4.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: PDF support for zathura via mupdf License: Zlib URL: https://pwmt.org/projects/%{name}/ @@ -68,6 +68,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.metainf %{_datadir}/metainfo/org.pwmt.zathura-pdf-mupdf.metainfo.xml %changelog +* Thu Apr 06 2023 Sandro Mani - 0.4.0-6 +- Rebuild (tesseract) + * Sat Jan 21 2023 Fedora Release Engineering - 0.4.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From cedc7dae0ec873b25777bf088d957f283d99696c Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Sat, 15 Apr 2023 14:13:05 +0200 Subject: [PATCH 53/54] build against mupdf 1.22.0 --- zathura-pdf-mupdf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zathura-pdf-mupdf.spec b/zathura-pdf-mupdf.spec index 06f454c..60531f7 100644 --- a/zathura-pdf-mupdf.spec +++ b/zathura-pdf-mupdf.spec @@ -6,7 +6,7 @@ Name: zathura-pdf-mupdf Version: 0.4.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: PDF support for zathura via mupdf License: Zlib URL: https://pwmt.org/projects/%{name}/ @@ -68,6 +68,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.metainf %{_datadir}/metainfo/org.pwmt.zathura-pdf-mupdf.metainfo.xml %changelog +* Sat Apr 15 2023 Michael J Gruber - 0.4.0-7 +- build against mupdf 1.22.0 + * Thu Apr 06 2023 Sandro Mani - 0.4.0-6 - Rebuild (tesseract) From 5f1b10ef9dba7c1c498e7bdca5a2e2d9c22f9dc5 Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Thu, 11 May 2023 21:32:49 +0200 Subject: [PATCH 54/54] build against mupdf 1.22.1 --- zathura-pdf-mupdf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zathura-pdf-mupdf.spec b/zathura-pdf-mupdf.spec index 60531f7..a49e0f4 100644 --- a/zathura-pdf-mupdf.spec +++ b/zathura-pdf-mupdf.spec @@ -6,7 +6,7 @@ Name: zathura-pdf-mupdf Version: 0.4.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: PDF support for zathura via mupdf License: Zlib URL: https://pwmt.org/projects/%{name}/ @@ -68,6 +68,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.metainf %{_datadir}/metainfo/org.pwmt.zathura-pdf-mupdf.metainfo.xml %changelog +* Thu May 11 2023 Michael J Gruber - 0.4.0-8 +- build against mupdf 1.22.1 + * Sat Apr 15 2023 Michael J Gruber - 0.4.0-7 - build against mupdf 1.22.0