From fa1ebec2266cd6933e9317d244311bc7fedc8982 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Thu, 25 Dec 2025 22:09:51 -0500 Subject: [PATCH 1/4] Use webkit2gtk-4.0 on EPEL 9 --- xreader.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/xreader.spec b/xreader.spec index 3ea7806..fdfb013 100644 --- a/xreader.spec +++ b/xreader.spec @@ -38,7 +38,11 @@ BuildRequires: pkgconfig(poppler-glib) BuildRequires: pkgconfig(sm) BuildRequires: pkgconfig(xapp) >= 1.4.0 BuildRequires: pkgconfig(zlib) +%if 0%{?fedora} || 0%{?rhel} >= 10 BuildRequires: pkgconfig(webkit2gtk-4.1) +%else +BuildRequires: pkgconfig(webkit2gtk-4.0) +%endif BuildRequires: texlive BuildRequires: t1lib-devel BuildRequires: yelp-tools From 8478eec5c2d9834b7c9071652bd0fd708f2b7e2d Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Tue, 19 May 2026 21:38:35 +0100 Subject: [PATCH 2/4] Add patch --- ...2eaa91c3c750c51c245799e3747495feeece.patch | 63 +++++++++++++++++++ xreader.spec | 6 +- 2 files changed, 68 insertions(+), 1 deletion(-) create mode 100644 50052eaa91c3c750c51c245799e3747495feeece.patch diff --git a/50052eaa91c3c750c51c245799e3747495feeece.patch b/50052eaa91c3c750c51c245799e3747495feeece.patch new file mode 100644 index 0000000..dfc4a4e --- /dev/null +++ b/50052eaa91c3c750c51c245799e3747495feeece.patch @@ -0,0 +1,63 @@ +From 50052eaa91c3c750c51c245799e3747495feeece Mon Sep 17 00:00:00 2001 +From: Victor Kareh +Date: Thu, 14 May 2026 21:56:38 -0400 +Subject: [PATCH] ev-application: Quote user-supplied strings in ev_spawn + command line + +When spawning a new xreader instance for cross-document links, the +destination and search parameters from the document were interpolated +directly into the command line without shell quoting. Values containing +spaces or special characters could be split into separate arguments by +the shell parser, potentially being interpreted as unintended flags by +the child process. + +Apply shell quoting to page label, named destination, and search string +values before appending them to the command line. +--- + shell/ev-application.c | 20 +++++++++++++------- + 1 file changed, 13 insertions(+), 7 deletions(-) + +diff --git a/shell/ev-application.c b/shell/ev-application.c +index a430f9e0..148cfaf8 100644 +--- a/shell/ev-application.c ++++ b/shell/ev-application.c +@@ -235,18 +235,22 @@ ev_spawn (const char *uri, + /* Page label or index */ + if (dest) { + switch (ev_link_dest_get_dest_type (dest)) { +- case EV_LINK_DEST_TYPE_PAGE_LABEL: +- g_string_append_printf (cmd, " --page-label=%s", +- ev_link_dest_get_page_label (dest)); ++ case EV_LINK_DEST_TYPE_PAGE_LABEL: { ++ gchar *quoted = g_shell_quote (ev_link_dest_get_page_label (dest)); ++ g_string_append_printf (cmd, " --page-label=%s", quoted); ++ g_free (quoted); + break; ++ } + case EV_LINK_DEST_TYPE_PAGE: + g_string_append_printf (cmd, " --page-index=%d", + ev_link_dest_get_page (dest) + 1); + break; +- case EV_LINK_DEST_TYPE_NAMED: +- g_string_append_printf (cmd, " --named-dest=%s", +- ev_link_dest_get_named_dest (dest)); ++ case EV_LINK_DEST_TYPE_NAMED: { ++ gchar *quoted = g_shell_quote (ev_link_dest_get_named_dest (dest)); ++ g_string_append_printf (cmd, " --named-dest=%s", quoted); ++ g_free (quoted); + break; ++ } + default: + break; + } +@@ -254,7 +258,9 @@ ev_spawn (const char *uri, + + /* Find string */ + if (search_string) { +- g_string_append_printf (cmd, " --find=%s", search_string); ++ gchar *quoted = g_shell_quote (search_string); ++ g_string_append_printf (cmd, " --find=%s", quoted); ++ g_free (quoted); + } + + /* Mode */ diff --git a/xreader.spec b/xreader.spec index fdfb013..4237acd 100644 --- a/xreader.spec +++ b/xreader.spec @@ -3,12 +3,13 @@ Name: xreader Version: 3.8.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Simple document viewer License: GPLv2+ URL: https://github.com/linuxmint/%{name} Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz +Patch0: %{url}/commit/50052eaa91c3c750c51c245799e3747495feeece.patch ExcludeArch: %{ix86} @@ -172,6 +173,9 @@ LDFLAGS+=' -lX11 -lICE -lSM' %doc %{_datadir}/doc/%{name}* %changelog +* Tue May 19 2026 Leigh Scott - 3.8.4-2 +- Add patch + * Tue Dec 05 2023 Leigh Scott - 3.8.4-1 - Update to 3.8.4 release From 567d502b059fe588ff7230a488634363cdcf677d Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Fri, 12 Jun 2026 08:53:09 +0100 Subject: [PATCH 3/4] package dropped, no longer maintained for RHEL 8, The fedora epel-packagers-sig ignore bugs --- .gitignore | 4 - ...2eaa91c3c750c51c245799e3747495feeece.patch | 63 --- dead.package | 1 + sources | 1 - xreader.spec | 401 ------------------ 5 files changed, 1 insertion(+), 469 deletions(-) delete mode 100644 .gitignore delete mode 100644 50052eaa91c3c750c51c245799e3747495feeece.patch create mode 100644 dead.package delete mode 100644 sources delete mode 100644 xreader.spec diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 4a406bf..0000000 --- a/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -*~ -*.rpm -*.tar* -results_*/ diff --git a/50052eaa91c3c750c51c245799e3747495feeece.patch b/50052eaa91c3c750c51c245799e3747495feeece.patch deleted file mode 100644 index dfc4a4e..0000000 --- a/50052eaa91c3c750c51c245799e3747495feeece.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 50052eaa91c3c750c51c245799e3747495feeece Mon Sep 17 00:00:00 2001 -From: Victor Kareh -Date: Thu, 14 May 2026 21:56:38 -0400 -Subject: [PATCH] ev-application: Quote user-supplied strings in ev_spawn - command line - -When spawning a new xreader instance for cross-document links, the -destination and search parameters from the document were interpolated -directly into the command line without shell quoting. Values containing -spaces or special characters could be split into separate arguments by -the shell parser, potentially being interpreted as unintended flags by -the child process. - -Apply shell quoting to page label, named destination, and search string -values before appending them to the command line. ---- - shell/ev-application.c | 20 +++++++++++++------- - 1 file changed, 13 insertions(+), 7 deletions(-) - -diff --git a/shell/ev-application.c b/shell/ev-application.c -index a430f9e0..148cfaf8 100644 ---- a/shell/ev-application.c -+++ b/shell/ev-application.c -@@ -235,18 +235,22 @@ ev_spawn (const char *uri, - /* Page label or index */ - if (dest) { - switch (ev_link_dest_get_dest_type (dest)) { -- case EV_LINK_DEST_TYPE_PAGE_LABEL: -- g_string_append_printf (cmd, " --page-label=%s", -- ev_link_dest_get_page_label (dest)); -+ case EV_LINK_DEST_TYPE_PAGE_LABEL: { -+ gchar *quoted = g_shell_quote (ev_link_dest_get_page_label (dest)); -+ g_string_append_printf (cmd, " --page-label=%s", quoted); -+ g_free (quoted); - break; -+ } - case EV_LINK_DEST_TYPE_PAGE: - g_string_append_printf (cmd, " --page-index=%d", - ev_link_dest_get_page (dest) + 1); - break; -- case EV_LINK_DEST_TYPE_NAMED: -- g_string_append_printf (cmd, " --named-dest=%s", -- ev_link_dest_get_named_dest (dest)); -+ case EV_LINK_DEST_TYPE_NAMED: { -+ gchar *quoted = g_shell_quote (ev_link_dest_get_named_dest (dest)); -+ g_string_append_printf (cmd, " --named-dest=%s", quoted); -+ g_free (quoted); - break; -+ } - default: - break; - } -@@ -254,7 +258,9 @@ ev_spawn (const char *uri, - - /* Find string */ - if (search_string) { -- g_string_append_printf (cmd, " --find=%s", search_string); -+ gchar *quoted = g_shell_quote (search_string); -+ g_string_append_printf (cmd, " --find=%s", quoted); -+ g_free (quoted); - } - - /* Mode */ diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..1c08395 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +package dropped, no longer maintained for RHEL 8, The fedora epel-packagers-sig ignore bugs diff --git a/sources b/sources deleted file mode 100644 index f7566a3..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (xreader-3.8.4.tar.gz) = 21e4427db4b6a87bf1715d1cc6f4c4836ec538d5533f0eda05ac066c40b914f2d3f019d4fc7945222ee2ee8a58755bc9e212a65dad8421fd2b85b06b56e8ea8f diff --git a/xreader.spec b/xreader.spec deleted file mode 100644 index 4237acd..0000000 --- a/xreader.spec +++ /dev/null @@ -1,401 +0,0 @@ -# Filter provides from plugins. -%global __provides_exclude_from ^%{_libdir}/%{name}/.*$ - -Name: xreader -Version: 3.8.4 -Release: 2%{?dist} -Summary: Simple document viewer - -License: GPLv2+ -URL: https://github.com/linuxmint/%{name} -Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz -Patch0: %{url}/commit/50052eaa91c3c750c51c245799e3747495feeece.patch - -ExcludeArch: %{ix86} - -BuildRequires: cmake -BuildRequires: gcc-c++ -BuildRequires: meson -BuildRequires: mathjax -BuildRequires: gtk-doc -BuildRequires: intltool -BuildRequires: itstool -BuildRequires: libappstream-glib -BuildRequires: pkgconfig(ddjvuapi) -BuildRequires: pkgconfig(gail-3.0) -BuildRequires: pkgconfig(glib-2.0) -BuildRequires: pkgconfig(gio-2.0) -BuildRequires: pkgconfig(gobject-introspection-1.0) -BuildRequires: pkgconfig(gthread-2.0) -BuildRequires: pkgconfig(gtk+-3.0) -BuildRequires: pkgconfig(gtk+-unix-print-3.0) -BuildRequires: pkgconfig(kpathsea) -BuildRequires: pkgconfig(libgxps) -BuildRequires: pkgconfig(libsecret-1) -BuildRequires: pkgconfig(libspectre) -BuildRequires: pkgconfig(libtiff-4) -BuildRequires: pkgconfig(libxml-2.0) -BuildRequires: pkgconfig(poppler-glib) -BuildRequires: pkgconfig(sm) -BuildRequires: pkgconfig(xapp) >= 1.4.0 -BuildRequires: pkgconfig(zlib) -%if 0%{?fedora} || 0%{?rhel} >= 10 -BuildRequires: pkgconfig(webkit2gtk-4.1) -%else -BuildRequires: pkgconfig(webkit2gtk-4.0) -%endif -BuildRequires: texlive -BuildRequires: t1lib-devel -BuildRequires: yelp-tools - -Requires: shared-mime-info%{?_isa} -Requires: gsettings-desktop-schemas%{?_isa} -Requires: xapps%{?_isa} -Requires: %{name}-libs%{?_isa} = %{version}-%{release} - -Recommends: yelp%{?_isa} - -%description -X-Apps Document Reader is a document viewer capable of displaying -multiple and single page document formats like PDF and PostScript. - -%package libs -Summary: xreader document viewer libraries -Requires: %{name}-data = %{version}-%{release} - -%description libs -This package contains the shared library files for %{name}. - -%package devel -Summary: Development files for %{name} -Requires: %{name}-libs%{?_isa} = %{version}-%{release} - -%description devel -This package contains the development files for %{name}. - - -%package doc -Summary: Documentation files for %{name} -BuildArch: noarch - -%description doc -This package contains the documentation files for %{name}. - -%package data -Summary: Support files for the %{name} document viewer -BuildArch: noarch - -%description data -This package contains icons and other support files used by the -%{name} application and libraries. - -%package thumbnailer -Summary: System thumbnailer using %{name} libraries -Requires: %{name}-libs%{?_isa} = %{version}-%{release} - -%description thumbnailer -This package adds configuration to use %{name} as a thumbnailer. - - -%prep -%autosetup -p1 - -%build -LDFLAGS+=' -lX11 -lICE -lSM' -%meson \ - -Ddeprecated_warnings=false \ - -Ddjvu=true \ - -Ddvi=true \ - -Dt1lib=true \ - -Dpixbuf=true \ - -Dcomics=true \ - -Dintrospection=true \ - -Dhelp_files=true - -%meson_build - -%install -%meson_install - -%{__sed} -i -e '/.*.*/d' \ - %{buildroot}%{_metainfodir}/%{name}.appdata.xml - -%find_lang %{name} - -%check -# Validate desktop-files. -%{_bindir}/desktop-file-validate \ - %{buildroot}%{_datadir}/applications/%{name}.desktop - -# Validate AppData-files. -%{_bindir}/appstream-util validate-relax --nonet \ - %{buildroot}%{_metainfodir}/%{name}.appdata.xml - -%ldconfig_scriptlets - -%files -f %{name}.lang -%license AUTHORS COPYING debian/copyright -%doc ChangeLog README.md debian/changelog -%{_bindir}/%{name} -%{_bindir}/%{name}-previewer -%{_datadir}/applications/%{name}.desktop -%{_metainfodir}/%{name}.appdata.xml -%{_datadir}/dbus-1/services/* -%{_datadir}/glib-2.0/schemas/* -%{_datadir}/help/*/%{name}/ -%{_datadir}/icons/hicolor/*/*/* -%{_libexecdir}/xreaderd -%{_mandir}/man1/%{name}.1* -%{_mandir}/man1/%{name}-previewer.1* - -%files libs -%{_libdir}/girepository-1.0/* -%{_libdir}/*.so.* -%{_libdir}/%{name}/ - -%files data -%{_datadir}/%{name}/ - -%files thumbnailer -%{_bindir}/%{name}-thumbnailer -%{_datadir}/thumbnailers/%{name}.thumbnailer -%{_mandir}/man1/%{name}-thumbnailer.1* - -%files devel -%{_datadir}/gir-1.0/* -%{_includedir}/%{name}/ -%{_libdir}/*.so -%{_libdir}/pkgconfig/xreader-document-1.5.pc -%{_libdir}/pkgconfig/xreader-view-1.5.pc - -%files doc -%license %{_datadir}/licenses/%{name}* -%doc %{_datadir}/doc/%{name}* - -%changelog -* Tue May 19 2026 Leigh Scott - 3.8.4-2 -- Add patch - -* Tue Dec 05 2023 Leigh Scott - 3.8.4-1 -- Update to 3.8.4 release - -* Thu Nov 30 2023 Leigh Scott - 3.8.3-1 -- Update to 3.8.3 release - -* Fri Aug 04 2023 Leigh Scott - 3.8.2-1 -- Update to 3.8.2 release - -* Sat Jul 22 2023 Fedora Release Engineering - 3.8.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Thu Jun 08 2023 Leigh Scott - 3.8.1-1 -- Update to 3.8.1 release - -* Thu Jun 01 2023 Leigh Scott - 3.8.0-1 -- Update to 3.8.0 release - -* Thu May 11 2023 Leigh Scott - 3.6.3-2 -- Switch to webkit2gtk-4.1 - -* Sun Feb 05 2023 Jonathan Wright - 3.6.3-1 -- Update to 3.6.3 rhbz#2160519 - -* Sat Jan 21 2023 Fedora Release Engineering - 3.6.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Fri Nov 18 2022 Leigh Scott - 3.6.0-1 -- Update to 3.6.0 release - -* Sun Aug 21 2022 Leigh Scott - 3.4.5-1 -- Update to 3.4.5 release - -* Sun Jul 24 2022 Leigh Scott - 3.4.3-1 -- Update to 3.4.3 release - -* Sat Jul 23 2022 Fedora Release Engineering - 3.4.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Wed Jul 20 2022 Leigh Scott - 3.4.2-1 -- Update to 3.4.2 release - -* Sun Jul 17 2022 Leigh Scott - 3.4.1-1 -- Update to 3.4.1 release - -* Sat Jan 22 2022 Fedora Release Engineering - 3.2.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Mon Dec 06 2021 Leigh Scott - 3.2.2-1 -- Update to 3.2.2 release - -* Mon Nov 29 2021 Leigh Scott - 3.2.1-1 -- Update to 3.2.1 release - -* Wed Nov 24 2021 Leigh Scott - 3.2.0-1 -- Update to 3.2.0 release - -* Fri Jul 23 2021 Fedora Release Engineering - 3.0.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Fri Jun 25 2021 Leigh Scott - 3.0.2-1 -- Update to 3.0.2 release - -* Thu Jun 10 2021 Leigh Scott - 3.0.1-1 -- Update to 3.0.1 release - -* Tue Jun 01 2021 Leigh Scott - 3.0.0-1 -- Update to 3.0.0 release - -* Sun Feb 28 2021 FeRD (Frank Dana) - 2.8.3-3 -- Create subpackages for libs, data, and thumbnailer (rhbz#1933895) - -* Thu Jan 28 2021 Fedora Release Engineering - 2.8.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jan 13 2021 Leigh Scott - 2.8.3-1 -- Update to 2.8.3 release - -* Sat Jan 2 2021 Leigh Scott - 2.8.2-1 -- Update to 2.8.2 release - -* Thu Dec 10 2020 Leigh Scott - 2.8.1-1 -- Update to 2.8.1 release - -* Wed Dec 2 2020 Leigh Scott - 2.8.0-1 -- Update to 2.8.0 release - -* Wed Jul 29 2020 Fedora Release Engineering - 2.6.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue Jul 14 2020 Leigh Scott - 2.6.4-1 -- Update to 2.6.4 release - -* Sat Jun 06 2020 Leigh Scott - 2.6.2-1 -- Update to 2.6.2 release - -* Sat May 23 2020 Leigh Scott - 2.6.1-1 -- Update to 2.6.1 release - -* Tue May 12 2020 Leigh Scott - 2.6.0-1 -- Update to 2.6.0 release - -* Fri Jan 31 2020 Fedora Release Engineering - 2.4.4-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Fri Jan 17 2020 Marek Kasik - 2.4.4-3 -- Rebuild for poppler-0.84.0 - -* Fri Jan 10 2020 Leigh Scott - 2.4.4-2 -- Add build requires t1lib-devel - -* Fri Jan 10 2020 Leigh Scott - 2.4.4-1 -- Update to 2.4.4 release - -* Wed Dec 11 2019 Leigh Scott - 2.4.3-1 -- Update to 2.4.3 release - -* Thu Nov 28 2019 Leigh Scott - 2.4.2-1 -- Update to 2.4.2 release - -* Tue Nov 26 2019 Leigh Scott - 2.4.1-1 -- Update to 2.4.1 release - -* Fri Nov 22 2019 Leigh Scott - 2.4.0-1 -- Update to 2.4.0 release - -* Tue Sep 10 2019 Florian Weimer - 2.2.3-2 -- Fix building in C99 mode - -* Wed Jul 31 2019 Leigh Scott - 2.2.3-1 -- Update to 2.2.3 release - -* Sat Jul 27 2019 Fedora Release Engineering - 2.2.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Jul 14 2019 Leigh Scott - 2.2.2-1 -- Update to 2.2.2 release - -* Sun Jun 30 2019 Leigh Scott - 2.2.1-1 -- Update to 2.2.1 release - -* Sat Jun 29 2019 Leigh Scott - 2.2.0-1 -- Update to 2.2.0 release - -* Sun Feb 03 2019 Fedora Release Engineering - 2.0.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sun Dec 16 2018 Leigh Scott - 2.0.2-1 -- Update to 2.0.2 release - -* Wed Nov 28 2018 Leigh Scott - 2.0.1-1 -- Update to 2.0.1 release - -* Mon Nov 19 2018 Leigh Scott - 2.0.0-1 -- Update to 2.0.0 release - -* Wed Aug 15 2018 Leigh Scott - 1.8.5-1 -- Update to 1.8.5 release - -* Mon Jul 16 2018 Leigh Scott - 1.8.4-1 -- Update to 1.8.4 release -- Add BuildRequires gcc-c++ - -* Sat Jul 14 2018 Fedora Release Engineering - 1.8.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Thu May 10 2018 Leigh Scott - 1.8.1-1 -- Update to 1.8.1 release - -* Fri Feb 09 2018 Fedora Release Engineering - 1.6.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Mon Dec 18 2017 Leigh Scott - 1.6.2-1 -- New upstream release - -* Tue Dec 12 2017 Leigh Scott - 1.6.1-1 -- New upstream release -- Fix typelib version - -* Thu Nov 16 2017 Björn Esser - 1.6.0-3 -- Redistributable build on EPEL7 - -* Thu Nov 16 2017 Björn Esser - 1.6.0-2 -- Bootstrapping on EPEL7 - -* Sat Nov 04 2017 Leigh Scott - 1.6.0-1 -- Update to 1.6.0 release - -* Fri Sep 01 2017 Björn Esser - 1.4.4-6 -- Some more fixes for EPEL - -* Fri Sep 01 2017 Björn Esser - 1.4.4-5 -- Some more fixes for EPEL - -* Fri Sep 01 2017 Björn Esser - 1.4.4-4 -- Adjustments for EPEL - -* Thu Aug 03 2017 Fedora Release Engineering - 1.4.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 1.4.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Wed Jun 28 2017 Björn Esser - 1.4.4-1 -- New upstream release (rhbz#1462726) - -* Wed May 24 2017 Björn Esser - 1.4.2-1 -- New upstream release (rhbz#1454986) - -* Mon May 08 2017 Björn Esser - 1.4.1-2 -- Add patch to fix build without Caja-extension - -* Mon May 08 2017 Björn Esser - 1.4.1-1 -- New upstream release (rhbz#1448921) - -* Mon May 08 2017 Björn Esser - 1.4.0-2 -- Disable Caja-extension for Fedora <= 25 - -* Mon May 08 2017 Björn Esser - 1.4.0-1 -- Initial import (rhbz#1424832) - -* Sat May 06 2017 Björn Esser - 1.4.0-0.1 -- Initial rpm-release (rhbz#1424832) From 40c2da712691c5edf713042ab5c0e0695daea275 Mon Sep 17 00:00:00 2001 From: releng-bot Date: Mon, 13 Jul 2026 00:02:48 +0000 Subject: [PATCH 4/4] Unretirement request: https://pagure.io/releng/fedora-scm-requests/issue/84524 --- .gitignore | 4 + ...2eaa91c3c750c51c245799e3747495feeece.patch | 63 +++ dead.package | 1 - sources | 1 + xreader.spec | 401 ++++++++++++++++++ 5 files changed, 469 insertions(+), 1 deletion(-) create mode 100644 .gitignore create mode 100644 50052eaa91c3c750c51c245799e3747495feeece.patch delete mode 100644 dead.package create mode 100644 sources create mode 100644 xreader.spec diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..4a406bf --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +*~ +*.rpm +*.tar* +results_*/ diff --git a/50052eaa91c3c750c51c245799e3747495feeece.patch b/50052eaa91c3c750c51c245799e3747495feeece.patch new file mode 100644 index 0000000..dfc4a4e --- /dev/null +++ b/50052eaa91c3c750c51c245799e3747495feeece.patch @@ -0,0 +1,63 @@ +From 50052eaa91c3c750c51c245799e3747495feeece Mon Sep 17 00:00:00 2001 +From: Victor Kareh +Date: Thu, 14 May 2026 21:56:38 -0400 +Subject: [PATCH] ev-application: Quote user-supplied strings in ev_spawn + command line + +When spawning a new xreader instance for cross-document links, the +destination and search parameters from the document were interpolated +directly into the command line without shell quoting. Values containing +spaces or special characters could be split into separate arguments by +the shell parser, potentially being interpreted as unintended flags by +the child process. + +Apply shell quoting to page label, named destination, and search string +values before appending them to the command line. +--- + shell/ev-application.c | 20 +++++++++++++------- + 1 file changed, 13 insertions(+), 7 deletions(-) + +diff --git a/shell/ev-application.c b/shell/ev-application.c +index a430f9e0..148cfaf8 100644 +--- a/shell/ev-application.c ++++ b/shell/ev-application.c +@@ -235,18 +235,22 @@ ev_spawn (const char *uri, + /* Page label or index */ + if (dest) { + switch (ev_link_dest_get_dest_type (dest)) { +- case EV_LINK_DEST_TYPE_PAGE_LABEL: +- g_string_append_printf (cmd, " --page-label=%s", +- ev_link_dest_get_page_label (dest)); ++ case EV_LINK_DEST_TYPE_PAGE_LABEL: { ++ gchar *quoted = g_shell_quote (ev_link_dest_get_page_label (dest)); ++ g_string_append_printf (cmd, " --page-label=%s", quoted); ++ g_free (quoted); + break; ++ } + case EV_LINK_DEST_TYPE_PAGE: + g_string_append_printf (cmd, " --page-index=%d", + ev_link_dest_get_page (dest) + 1); + break; +- case EV_LINK_DEST_TYPE_NAMED: +- g_string_append_printf (cmd, " --named-dest=%s", +- ev_link_dest_get_named_dest (dest)); ++ case EV_LINK_DEST_TYPE_NAMED: { ++ gchar *quoted = g_shell_quote (ev_link_dest_get_named_dest (dest)); ++ g_string_append_printf (cmd, " --named-dest=%s", quoted); ++ g_free (quoted); + break; ++ } + default: + break; + } +@@ -254,7 +258,9 @@ ev_spawn (const char *uri, + + /* Find string */ + if (search_string) { +- g_string_append_printf (cmd, " --find=%s", search_string); ++ gchar *quoted = g_shell_quote (search_string); ++ g_string_append_printf (cmd, " --find=%s", quoted); ++ g_free (quoted); + } + + /* Mode */ diff --git a/dead.package b/dead.package deleted file mode 100644 index 1c08395..0000000 --- a/dead.package +++ /dev/null @@ -1 +0,0 @@ -package dropped, no longer maintained for RHEL 8, The fedora epel-packagers-sig ignore bugs diff --git a/sources b/sources new file mode 100644 index 0000000..f7566a3 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (xreader-3.8.4.tar.gz) = 21e4427db4b6a87bf1715d1cc6f4c4836ec538d5533f0eda05ac066c40b914f2d3f019d4fc7945222ee2ee8a58755bc9e212a65dad8421fd2b85b06b56e8ea8f diff --git a/xreader.spec b/xreader.spec new file mode 100644 index 0000000..4237acd --- /dev/null +++ b/xreader.spec @@ -0,0 +1,401 @@ +# Filter provides from plugins. +%global __provides_exclude_from ^%{_libdir}/%{name}/.*$ + +Name: xreader +Version: 3.8.4 +Release: 2%{?dist} +Summary: Simple document viewer + +License: GPLv2+ +URL: https://github.com/linuxmint/%{name} +Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz +Patch0: %{url}/commit/50052eaa91c3c750c51c245799e3747495feeece.patch + +ExcludeArch: %{ix86} + +BuildRequires: cmake +BuildRequires: gcc-c++ +BuildRequires: meson +BuildRequires: mathjax +BuildRequires: gtk-doc +BuildRequires: intltool +BuildRequires: itstool +BuildRequires: libappstream-glib +BuildRequires: pkgconfig(ddjvuapi) +BuildRequires: pkgconfig(gail-3.0) +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(gio-2.0) +BuildRequires: pkgconfig(gobject-introspection-1.0) +BuildRequires: pkgconfig(gthread-2.0) +BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(gtk+-unix-print-3.0) +BuildRequires: pkgconfig(kpathsea) +BuildRequires: pkgconfig(libgxps) +BuildRequires: pkgconfig(libsecret-1) +BuildRequires: pkgconfig(libspectre) +BuildRequires: pkgconfig(libtiff-4) +BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(poppler-glib) +BuildRequires: pkgconfig(sm) +BuildRequires: pkgconfig(xapp) >= 1.4.0 +BuildRequires: pkgconfig(zlib) +%if 0%{?fedora} || 0%{?rhel} >= 10 +BuildRequires: pkgconfig(webkit2gtk-4.1) +%else +BuildRequires: pkgconfig(webkit2gtk-4.0) +%endif +BuildRequires: texlive +BuildRequires: t1lib-devel +BuildRequires: yelp-tools + +Requires: shared-mime-info%{?_isa} +Requires: gsettings-desktop-schemas%{?_isa} +Requires: xapps%{?_isa} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} + +Recommends: yelp%{?_isa} + +%description +X-Apps Document Reader is a document viewer capable of displaying +multiple and single page document formats like PDF and PostScript. + +%package libs +Summary: xreader document viewer libraries +Requires: %{name}-data = %{version}-%{release} + +%description libs +This package contains the shared library files for %{name}. + +%package devel +Summary: Development files for %{name} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} + +%description devel +This package contains the development files for %{name}. + + +%package doc +Summary: Documentation files for %{name} +BuildArch: noarch + +%description doc +This package contains the documentation files for %{name}. + +%package data +Summary: Support files for the %{name} document viewer +BuildArch: noarch + +%description data +This package contains icons and other support files used by the +%{name} application and libraries. + +%package thumbnailer +Summary: System thumbnailer using %{name} libraries +Requires: %{name}-libs%{?_isa} = %{version}-%{release} + +%description thumbnailer +This package adds configuration to use %{name} as a thumbnailer. + + +%prep +%autosetup -p1 + +%build +LDFLAGS+=' -lX11 -lICE -lSM' +%meson \ + -Ddeprecated_warnings=false \ + -Ddjvu=true \ + -Ddvi=true \ + -Dt1lib=true \ + -Dpixbuf=true \ + -Dcomics=true \ + -Dintrospection=true \ + -Dhelp_files=true + +%meson_build + +%install +%meson_install + +%{__sed} -i -e '/.*.*/d' \ + %{buildroot}%{_metainfodir}/%{name}.appdata.xml + +%find_lang %{name} + +%check +# Validate desktop-files. +%{_bindir}/desktop-file-validate \ + %{buildroot}%{_datadir}/applications/%{name}.desktop + +# Validate AppData-files. +%{_bindir}/appstream-util validate-relax --nonet \ + %{buildroot}%{_metainfodir}/%{name}.appdata.xml + +%ldconfig_scriptlets + +%files -f %{name}.lang +%license AUTHORS COPYING debian/copyright +%doc ChangeLog README.md debian/changelog +%{_bindir}/%{name} +%{_bindir}/%{name}-previewer +%{_datadir}/applications/%{name}.desktop +%{_metainfodir}/%{name}.appdata.xml +%{_datadir}/dbus-1/services/* +%{_datadir}/glib-2.0/schemas/* +%{_datadir}/help/*/%{name}/ +%{_datadir}/icons/hicolor/*/*/* +%{_libexecdir}/xreaderd +%{_mandir}/man1/%{name}.1* +%{_mandir}/man1/%{name}-previewer.1* + +%files libs +%{_libdir}/girepository-1.0/* +%{_libdir}/*.so.* +%{_libdir}/%{name}/ + +%files data +%{_datadir}/%{name}/ + +%files thumbnailer +%{_bindir}/%{name}-thumbnailer +%{_datadir}/thumbnailers/%{name}.thumbnailer +%{_mandir}/man1/%{name}-thumbnailer.1* + +%files devel +%{_datadir}/gir-1.0/* +%{_includedir}/%{name}/ +%{_libdir}/*.so +%{_libdir}/pkgconfig/xreader-document-1.5.pc +%{_libdir}/pkgconfig/xreader-view-1.5.pc + +%files doc +%license %{_datadir}/licenses/%{name}* +%doc %{_datadir}/doc/%{name}* + +%changelog +* Tue May 19 2026 Leigh Scott - 3.8.4-2 +- Add patch + +* Tue Dec 05 2023 Leigh Scott - 3.8.4-1 +- Update to 3.8.4 release + +* Thu Nov 30 2023 Leigh Scott - 3.8.3-1 +- Update to 3.8.3 release + +* Fri Aug 04 2023 Leigh Scott - 3.8.2-1 +- Update to 3.8.2 release + +* Sat Jul 22 2023 Fedora Release Engineering - 3.8.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jun 08 2023 Leigh Scott - 3.8.1-1 +- Update to 3.8.1 release + +* Thu Jun 01 2023 Leigh Scott - 3.8.0-1 +- Update to 3.8.0 release + +* Thu May 11 2023 Leigh Scott - 3.6.3-2 +- Switch to webkit2gtk-4.1 + +* Sun Feb 05 2023 Jonathan Wright - 3.6.3-1 +- Update to 3.6.3 rhbz#2160519 + +* Sat Jan 21 2023 Fedora Release Engineering - 3.6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Fri Nov 18 2022 Leigh Scott - 3.6.0-1 +- Update to 3.6.0 release + +* Sun Aug 21 2022 Leigh Scott - 3.4.5-1 +- Update to 3.4.5 release + +* Sun Jul 24 2022 Leigh Scott - 3.4.3-1 +- Update to 3.4.3 release + +* Sat Jul 23 2022 Fedora Release Engineering - 3.4.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Wed Jul 20 2022 Leigh Scott - 3.4.2-1 +- Update to 3.4.2 release + +* Sun Jul 17 2022 Leigh Scott - 3.4.1-1 +- Update to 3.4.1 release + +* Sat Jan 22 2022 Fedora Release Engineering - 3.2.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Mon Dec 06 2021 Leigh Scott - 3.2.2-1 +- Update to 3.2.2 release + +* Mon Nov 29 2021 Leigh Scott - 3.2.1-1 +- Update to 3.2.1 release + +* Wed Nov 24 2021 Leigh Scott - 3.2.0-1 +- Update to 3.2.0 release + +* Fri Jul 23 2021 Fedora Release Engineering - 3.0.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri Jun 25 2021 Leigh Scott - 3.0.2-1 +- Update to 3.0.2 release + +* Thu Jun 10 2021 Leigh Scott - 3.0.1-1 +- Update to 3.0.1 release + +* Tue Jun 01 2021 Leigh Scott - 3.0.0-1 +- Update to 3.0.0 release + +* Sun Feb 28 2021 FeRD (Frank Dana) - 2.8.3-3 +- Create subpackages for libs, data, and thumbnailer (rhbz#1933895) + +* Thu Jan 28 2021 Fedora Release Engineering - 2.8.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jan 13 2021 Leigh Scott - 2.8.3-1 +- Update to 2.8.3 release + +* Sat Jan 2 2021 Leigh Scott - 2.8.2-1 +- Update to 2.8.2 release + +* Thu Dec 10 2020 Leigh Scott - 2.8.1-1 +- Update to 2.8.1 release + +* Wed Dec 2 2020 Leigh Scott - 2.8.0-1 +- Update to 2.8.0 release + +* Wed Jul 29 2020 Fedora Release Engineering - 2.6.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jul 14 2020 Leigh Scott - 2.6.4-1 +- Update to 2.6.4 release + +* Sat Jun 06 2020 Leigh Scott - 2.6.2-1 +- Update to 2.6.2 release + +* Sat May 23 2020 Leigh Scott - 2.6.1-1 +- Update to 2.6.1 release + +* Tue May 12 2020 Leigh Scott - 2.6.0-1 +- Update to 2.6.0 release + +* Fri Jan 31 2020 Fedora Release Engineering - 2.4.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Fri Jan 17 2020 Marek Kasik - 2.4.4-3 +- Rebuild for poppler-0.84.0 + +* Fri Jan 10 2020 Leigh Scott - 2.4.4-2 +- Add build requires t1lib-devel + +* Fri Jan 10 2020 Leigh Scott - 2.4.4-1 +- Update to 2.4.4 release + +* Wed Dec 11 2019 Leigh Scott - 2.4.3-1 +- Update to 2.4.3 release + +* Thu Nov 28 2019 Leigh Scott - 2.4.2-1 +- Update to 2.4.2 release + +* Tue Nov 26 2019 Leigh Scott - 2.4.1-1 +- Update to 2.4.1 release + +* Fri Nov 22 2019 Leigh Scott - 2.4.0-1 +- Update to 2.4.0 release + +* Tue Sep 10 2019 Florian Weimer - 2.2.3-2 +- Fix building in C99 mode + +* Wed Jul 31 2019 Leigh Scott - 2.2.3-1 +- Update to 2.2.3 release + +* Sat Jul 27 2019 Fedora Release Engineering - 2.2.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Jul 14 2019 Leigh Scott - 2.2.2-1 +- Update to 2.2.2 release + +* Sun Jun 30 2019 Leigh Scott - 2.2.1-1 +- Update to 2.2.1 release + +* Sat Jun 29 2019 Leigh Scott - 2.2.0-1 +- Update to 2.2.0 release + +* Sun Feb 03 2019 Fedora Release Engineering - 2.0.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sun Dec 16 2018 Leigh Scott - 2.0.2-1 +- Update to 2.0.2 release + +* Wed Nov 28 2018 Leigh Scott - 2.0.1-1 +- Update to 2.0.1 release + +* Mon Nov 19 2018 Leigh Scott - 2.0.0-1 +- Update to 2.0.0 release + +* Wed Aug 15 2018 Leigh Scott - 1.8.5-1 +- Update to 1.8.5 release + +* Mon Jul 16 2018 Leigh Scott - 1.8.4-1 +- Update to 1.8.4 release +- Add BuildRequires gcc-c++ + +* Sat Jul 14 2018 Fedora Release Engineering - 1.8.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Thu May 10 2018 Leigh Scott - 1.8.1-1 +- Update to 1.8.1 release + +* Fri Feb 09 2018 Fedora Release Engineering - 1.6.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Mon Dec 18 2017 Leigh Scott - 1.6.2-1 +- New upstream release + +* Tue Dec 12 2017 Leigh Scott - 1.6.1-1 +- New upstream release +- Fix typelib version + +* Thu Nov 16 2017 Björn Esser - 1.6.0-3 +- Redistributable build on EPEL7 + +* Thu Nov 16 2017 Björn Esser - 1.6.0-2 +- Bootstrapping on EPEL7 + +* Sat Nov 04 2017 Leigh Scott - 1.6.0-1 +- Update to 1.6.0 release + +* Fri Sep 01 2017 Björn Esser - 1.4.4-6 +- Some more fixes for EPEL + +* Fri Sep 01 2017 Björn Esser - 1.4.4-5 +- Some more fixes for EPEL + +* Fri Sep 01 2017 Björn Esser - 1.4.4-4 +- Adjustments for EPEL + +* Thu Aug 03 2017 Fedora Release Engineering - 1.4.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 1.4.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Wed Jun 28 2017 Björn Esser - 1.4.4-1 +- New upstream release (rhbz#1462726) + +* Wed May 24 2017 Björn Esser - 1.4.2-1 +- New upstream release (rhbz#1454986) + +* Mon May 08 2017 Björn Esser - 1.4.1-2 +- Add patch to fix build without Caja-extension + +* Mon May 08 2017 Björn Esser - 1.4.1-1 +- New upstream release (rhbz#1448921) + +* Mon May 08 2017 Björn Esser - 1.4.0-2 +- Disable Caja-extension for Fedora <= 25 + +* Mon May 08 2017 Björn Esser - 1.4.0-1 +- Initial import (rhbz#1424832) + +* Sat May 06 2017 Björn Esser - 1.4.0-0.1 +- Initial rpm-release (rhbz#1424832)