diff --git a/39f783103e99b954991183cea2b5ccbd9add2a1a.patch b/39f783103e99b954991183cea2b5ccbd9add2a1a.patch new file mode 100644 index 0000000..4501184 --- /dev/null +++ b/39f783103e99b954991183cea2b5ccbd9add2a1a.patch @@ -0,0 +1,45 @@ +From 39f783103e99b954991183cea2b5ccbd9add2a1a Mon Sep 17 00:00:00 2001 +From: Alberto Garcia +Date: Wed, 16 Nov 2022 10:05:42 +0100 +Subject: [PATCH] Use the WebKitGTK 4.1 API builds when available + +These use soup3 instead of soup2 internally but the API is the same. +--- + src/CMakeLists.txt | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 457f576..cd12d9b 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -18,14 +18,20 @@ FIND_PACKAGE(PkgConfig) + PKG_CHECK_MODULES(FREETYPE2 freetype2 REQUIRED) + PKG_CHECK_MODULES(GTK gtk+-3.0) + PKG_CHECK_MODULES(GLIB2 glib-2.0 REQUIRED) +-PKG_CHECK_MODULES(WEBKIT webkit2gtk-4.0 REQUIRED) ++PKG_CHECK_MODULES(LIBXML libxml-2.0 REQUIRED) ++PKG_CHECK_MODULES(WEBKIT webkit2gtk-4.1) ++if (NOT WEBKIT_FOUND) ++ PKG_CHECK_MODULES(WEBKIT webkit2gtk-4.0 REQUIRED) ++endif() + INCLUDE_DIRECTORIES(${FREETYPE2_INCLUDE_DIRS} + ${GTK_INCLUDE_DIRS} + ${GLIB2_INCLUDE_DIRS} ++ ${LIBXML_INCLUDE_DIRS} + ${WEBKIT_INCLUDE_DIRS}) + LINK_DIRECTORIES(${FREETYPE2_LIBRARY_DIRS} + ${GTK_LIBRARY_DIRS} + ${GLIB2_LIBRARY_DIRS} ++ ${LIBXML_LIBRARY_DIRS} + ${WEBKIT_LIBRARY_DIRS}) + + IF (WIN32) +@@ -116,7 +122,7 @@ TARGET_LINK_LIBRARIES(apvlv + ${GTHREAD2_LIBRARIES} + ${WEBKIT_LIBRARIES} + "-lepub" +- "-lxml2" ++ ${LIBXML_LIBRARIES} + ${APVLV_REQ_LIBRARIES}) + + IF (WIN32) diff --git a/apvlv.spec b/apvlv.spec index 7594318..4475bd3 100644 --- a/apvlv.spec +++ b/apvlv.spec @@ -2,13 +2,14 @@ Name: apvlv Version: 0.4.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: PDF viewer which behaves like Vim License: GPLv2+ URL: https://github.com/naihe2010/apvlv Source0: https://github.com/downloads/naihe2010/apvlv/apvlv-%{version}.tar.gz Source1: %{name}.desktop +Patch0: 39f783103e99b954991183cea2b5ccbd9add2a1a.patch BuildRequires: cmake BuildRequires: desktop-file-utils @@ -54,6 +55,9 @@ desktop-file-install --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \ %config(noreplace)%{_sysconfdir}/apvlvrc %changelog +* Sat May 06 2023 Filipe Rosset - 0.4.0-3 +- Fix FTBFS on Fedora 39+ + * Wed Jan 18 2023 Fedora Release Engineering - 0.4.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild