diff --git a/atril.spec b/atril.spec index 7aef005ffdd30c5c0c826b19c0d7834d3086f1af..8eea432e4e64430ded3fd8a5eb648a374e13fe55 100644 --- a/atril.spec +++ b/atril.spec @@ -14,7 +14,7 @@ Name: atril Version: %{branch}.3 -Release: 5 +Release: 6 Summary: Document viewer License: GPLv2+ and LGPLv2+ and MIT URL: http://mate-desktop.org @@ -28,6 +28,7 @@ Patch01: CVE-2023-52076.patch #fix from https://gitee.com/link?target=https%3A%2F%2Fgithub.com%2Fmate-desktop%2Fatril%2Fcommit%2Fce41df6467521ff9fd4f16514ae7d6ebb62eb1ed Patch02: CVE-2023-51698.patch Patch03: fix-build-error-check-aclocal-version.patch +Patch04: backport-use-webkit2gtk-4.1.patch BuildRequires: gcc-c++ BuildRequires: gtk3-devel @@ -53,7 +54,7 @@ BuildRequires: texlive-lib-devel # for the djvu back-end BuildRequires: djvulibre-devel # for epub back-end -BuildRequires: webkit2gtk3-devel +BuildRequires: pkgconfig(webkit2gtk-4.1) Requires: %{name}-libs%{?_isa} = %{version}-%{release} # fix (#974791) @@ -92,7 +93,7 @@ mate-document-viewer back-ends development. %endif %if 0%{?rel_build} -#NOCONFIGURE=1 ./autogen.sh +NOCONFIGURE=1 ./autogen.sh %else # 0%{?rel_build} # needed for git snapshots NOCONFIGURE=1 ./autogen.sh @@ -115,16 +116,15 @@ NOCONFIGURE=1 ./autogen.sh # remove unused-direct-shlib-dependency sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool -make %{?_smp_mflags} V=1 +%make_build %install %{make_install} +%delete_la %find_lang %{name} --with-gnome --all-name -find $RPM_BUILD_ROOT -name '*.la' -exec rm -fv {} ';' - %check desktop-file-validate ${RPM_BUILD_ROOT}%{_datadir}/applications/atril.desktop @@ -168,6 +168,9 @@ desktop-file-validate ${RPM_BUILD_ROOT}%{_datadir}/applications/atril.desktop %changelog +* Thu Dec 26 2024 Funda Wang - 1.22.3-6 +- use webkitgtk-4.1 + * Thu Aug 15 2024 zhangxianting - 1.22.3-5 - fix build error, check aclocal version diff --git a/backport-use-webkit2gtk-4.1.patch b/backport-use-webkit2gtk-4.1.patch new file mode 100644 index 0000000000000000000000000000000000000000..10d8b06b7b0317dae7dad3fbf3f6ac7e0c8a2b18 --- /dev/null +++ b/backport-use-webkit2gtk-4.1.patch @@ -0,0 +1,25 @@ +From 92f7d054d2a534bb08f92821e910625ecc0a3760 Mon Sep 17 00:00:00 2001 +From: raveit65 +Date: Thu, 4 May 2023 13:13:22 +0200 +Subject: use webkit2gtk-4.1 + +- fixes https://github.com/mate-desktop/atril/issues/582 +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index dbdf2b47..9783c8aa 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -622,7 +622,7 @@ AC_ARG_ENABLE(epub, + + have_webkit="no" + if test "x$enable_epub" = "xyes"; then +- PKG_CHECK_MODULES(EPUB, webkit2gtk-4.0 >= $WEBKIT_REQUIRED \ ++ PKG_CHECK_MODULES(EPUB, webkit2gtk-4.1 >= $WEBKIT_REQUIRED \ + libxml-2.0 >= $LIBXML_REQUIRED zlib,have_webkit=yes,have_webkit=no) + if test "x$have_webkit" = "xno"; then + AC_MSG_NOTICE([Webkit2 4.0 not found, trying 3.0]) +-- +cgit v1.2.1