- upstream fix for podofo 0.10 detection

diff --git a/podofo-0.10.patch b/podofo-0.10.patch
new file mode 100644 (file)
index 0000000..9cf8f87
--- /dev/null
+++ b/podofo-0.10.patch
@@ -0,0 +1,41 @@
+From bd70705c05bd383d1a9b3ab12224988ff8475722 Mon Sep 17 00:00:00 2001
+From: Craig Bradney <mrb@scribus.info>
+Date: Sun, 4 Jun 2023 17:00:34 +0000
+Subject: [PATCH] Update CMake PoDoFo finder to allow for PoDoFo 0.10.0
+ podofo-config.h location
+
+git-svn-id: svn://scribus.net/trunk/Scribus@25493 11d20701-8431-0410-a711-e3c959e3b870
+---
+ cmake/modules/FindLIBPODOFO.cmake | 11 ++++++++++-
+ 1 file changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/cmake/modules/FindLIBPODOFO.cmake b/cmake/modules/FindLIBPODOFO.cmake
+index 954c89c92e..a05ac25a82 100644
+--- a/cmake/modules/FindLIBPODOFO.cmake
++++ b/cmake/modules/FindLIBPODOFO.cmake
+@@ -32,7 +32,14 @@ find_library(LIBPODOFO_LIBRARY
+ 
+ if(LIBPODOFO_INCLUDE_DIR AND LIBPODOFO_LIBRARY)
+       if(NOT LIBPODOFO_CONFIG_H)
+-              set(LIBPODOFO_CONFIG_H "${LIBPODOFO_INCLUDE_DIR}/podofo/base/podofo_config.h" CACHE FILEPATH "Alternative place of podofo_config.h")
++              #PoDoFo before 0.10.0
++              if (EXISTS "${LIBPODOFO_INCLUDE_DIR}/podofo/base/podofo_config.h")
++                      set(LIBPODOFO_CONFIG_H "${LIBPODOFO_INCLUDE_DIR}/podofo/base/podofo_config.h" CACHE FILEPATH "Alternative place of podofo_config.h. PoDoFo <=0.10.0")
++              endif()
++              #PoDoFo 0.10.0 or higher
++              if (EXISTS "${LIBPODOFO_INCLUDE_DIR}/podofo/auxiliary/podofo_config.h")
++                      set(LIBPODOFO_CONFIG_H "${LIBPODOFO_INCLUDE_DIR}/podofo/auxiliary/podofo_config.h" CACHE FILEPATH "Alternative place of podofo_config.h. PoDoFo >=0.10.0")
++              endif()
+       endif()
+ 
+       file(STRINGS "${LIBPODOFO_CONFIG_H}" PODOFO_MAJOR_VER_LINE REGEX "^#define[ \t]+PODOFO_VERSION_MAJOR[ \t]+[0-9]+$")
+@@ -79,4 +86,6 @@ if(NOT LIBPODOFO_FIND_QUIETLY)
+               message("podofo lib: not found")
+       endif(LIBPODOFO_LIBRARY)
+       message("PoDoFo cflags: ${useshared}")
++      message("PoDoFo config file ${LIBPODOFO_CONFIG_H}")
++      message("PoDoFo version ${LIBPODOFO_VERSION}")
+ endif(NOT LIBPODOFO_FIND_QUIETLY)
+-- 
+GitLab
+

diff --git a/scribus.spec b/scribus.spec
index b9d2b6a2dd70ebf93d930ed8ff3878bd807b6fc4..93f0ce14e5fe423053dee03a65a28b590a59c939 100644 (file)
--- a/scribus.spec
+++ b/scribus.spec
@@ -20,6 +20,7 @@ Source0:      https://downloads.sourceforge.net/scribus/%{name}-%{version}.tar.xz
 Patch0:                %{name}-docs.patch
 Patch1:                %{name}-poppler.patch
 Patch2:                %{name}-poppler-22.09.0.patch
+Patch3:                podofo-0.10.patch
 URL:           https://www.scribus.net/
 BuildRequires: GraphicsMagick-devel
 BuildRequires: Qt5Core-devel >= %{qt_ver}
@@ -157,6 +158,7 @@ Domyślne szablony dokumentów dostarczane wraz ze Scribusem.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %cmake -B build \