[packages/xpdf] Up to 4.06; drop qt5 support

arekm arekm at pld-linux.org
Sat Mar 14 21:31:36 CET 2026


commit 80cb4e3564742ea89b5cb018bd8c1c7693b2b66f
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sat Mar 14 21:31:28 2026 +0100

    Up to 4.06; drop qt5 support

 dynamic_private.patch | 20 +++++---------------
 xpdf-fontdirs.patch   | 16 ++++++++--------
 xpdf.spec             | 32 +++++++++++++-------------------
 3 files changed, 26 insertions(+), 42 deletions(-)
---
diff --git a/xpdf.spec b/xpdf.spec
index ec687db..8e9af09 100644
--- a/xpdf.spec
+++ b/xpdf.spec
@@ -1,7 +1,6 @@
 #
 # Conditional build:
 %bcond_with	protections	# protections against fair use (printing and copying)
-%bcond_without	qt5		# Qt5 instead of Qt4
 %bcond_without	x		# X-based browser
 
 Summary:	Portable Document Format (PDF) file viewer
@@ -12,13 +11,13 @@ Summary(pt_BR.UTF-8):	Visualizador de arquivos PDF
 Summary(ru.UTF-8):	Программа для просмотра PDF файлов
 Summary(uk.UTF-8):	Програма для перегляду PDF файлів
 Name:		xpdf
-Version:	4.02
+Version:	4.06
 Release:	1
 License:	GPL v2+
 Group:		Applications/Publishing
 #Source0Download: http://www.xpdfreader.com/download.html
-Source0:	https://xpdfreader-dl.s3.amazonaws.com/%{name}-%{version}.tar.gz
-# Source0-md5:	22e0d7940e62c538ccdd75f75dca0acf
+Source0:	https://dl.xpdfreader.com/%{name}-%{version}.tar.gz
+# Source0-md5:	ec37e6afba962ccfb9a8e1d8fe83b67f
 Source1:	%{name}.desktop
 Source2:	%{name}.png
 Source3:	%{name}rc
@@ -26,7 +25,7 @@ Patch0:		%{name}-remove_protections.patch
 Patch1:		%{name}-fontdirs.patch
 Patch2:		dynamic_private.patch
 Patch3:		%{name}-link.patch
-URL:		http://www.xpdfreader.com/
+URL:		https://www.xpdfreader.com/
 BuildRequires:	cmake >= 2.8.8
 %{?with_x:BuildRequires:	cups-devel}
 BuildRequires:	freetype-devel >= 2.1.0
@@ -36,18 +35,10 @@ BuildRequires:	libstdc++-devel
 BuildRequires:	rpmbuild(macros) >= 1.605
 BuildRequires:	zlib-devel
 %if %{with x}
-%if %{with qt5}
-BuildRequires:	Qt5Core-devel >= 5
-BuildRequires:	Qt5Network-devel >= 5
-BuildRequires:	Qt5PrintSupport-devel >= 5
-BuildRequires:	Qt5Widgets-devel >= 5
-BuildRequires:	qt5-qmake >= 5
-%else
-BuildRequires:	QtCore-devel >= 4
-BuildRequires:	QtGui-devel >= 4
-BuildRequires:	QtNetwork-devel >= 4
-BuildRequires:	qt4-qmake >= 4
-%endif
+BuildRequires:	Qt6Concurrent-devel >= 6
+BuildRequires:	Qt6Network-devel >= 6
+BuildRequires:	Qt6PrintSupport-devel >= 6
+BuildRequires:	Qt6Widgets-devel >= 6
 %endif
 Requires:	%{name}-common = %{version}-%{release}
 Requires:	desktop-file-utils
@@ -131,7 +122,7 @@ pdftops, pdftotext).
 
 %prep
 %setup -q
-%{!?with_protections:%patch0 -p1}
+%{!?with_protections:%patch 0 -p1}
 %patch -P1 -p1
 %patch -P2 -p1
 %patch -P3 -p1
@@ -142,7 +133,10 @@ cd build
 %cmake .. \
 	-DA4_PAPER=ON \
 	-DCMAKE_CXX_FLAGS="%{rpmcxxflags}" \
-	%{!?with_qt5:-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Widgets=1} \
+	-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Widgets=1 \
+	-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Network=1 \
+	-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Concurrent=1 \
+	-DCMAKE_DISABLE_FIND_PACKAGE_Qt5PrintSupport=1 \
 	-DCMAKE_EXE_LINKER_FLAGS="-lpaper %{rpmldflags}" \
 	-DCMAKE_INSTALL_RPATH="%{_libdir}/%{name}" \
 	-DOPI_SUPPORT=ON \
diff --git a/dynamic_private.patch b/dynamic_private.patch
index 980c363..c906ea6 100644
--- a/dynamic_private.patch
+++ b/dynamic_private.patch
@@ -1,20 +1,10 @@
---- xpdf-4.01.01/xpdf-qt/CMakeLists.txt.orig	2019-03-14 22:01:02.000000000 +0100
-+++ xpdf-4.01.01/xpdf-qt/CMakeLists.txt	2019-05-19 07:34:41.876234349 +0200
-@@ -65,9 +65,6 @@
-   endif ()
- 
-   add_executable(xpdf
--    $<TARGET_OBJECTS:goo_objs>
--    $<TARGET_OBJECTS:fofi_objs>
--    $<TARGET_OBJECTS:splash_objs>
-     $<TARGET_OBJECTS:xpdf_objs>
-     $<TARGET_OBJECTS:xpdf_widget_objs>
-     ${XPDFWIDGET_PRINT_MODULES}
-@@ -83,6 +80,7 @@
-     ${XPDF_ICONS}
+--- xpdf-4.06/xpdf-qt/CMakeLists.txt.orig
++++ xpdf-4.06/xpdf-qt/CMakeLists.txt
+@@ -92,6 +92,7 @@
+     ${XPDF_MANIFEST}
    )
    target_link_libraries(xpdf ${QT_LIBRARIES} ${EXTRA_QT_LIBRARIES}
 +                        goo fofi splash
                          ${PAPER_LIBRARY}
                          ${FREETYPE_LIBRARY} ${FREETYPE_OTHER_LIBS}
-                         ${DTYPE_LIBRARY} ${LCMS_LIBRARY}
+                         ${DTYPE_LIBRARY}
diff --git a/xpdf-fontdirs.patch b/xpdf-fontdirs.patch
index 50966f8..b2776e3 100644
--- a/xpdf-fontdirs.patch
+++ b/xpdf-fontdirs.patch
@@ -1,9 +1,9 @@
---- xpdf-3.04/xpdf/GlobalParams.cc.orig	2014-06-15 21:53:49.566112173 +0200
-+++ xpdf-3.04/xpdf/GlobalParams.cc	2014-06-15 22:01:33.869435829 +0200
-@@ -120,14 +120,7 @@
- };
- #else
- static const char *displayFontDirs[] = {
+--- xpdf-4.06/xpdf/GlobalParams.cc.orig
++++ xpdf-4.06/xpdf/GlobalParams.cc
+@@ -192,14 +192,7 @@
+   "c:/windows/fonts",
+   "c:/winnt/fonts",
+ #else // _WIN32
 -  "/usr/share/ghostscript/fonts",
 -  "/usr/local/share/ghostscript/fonts",
 -  "/usr/share/fonts/default/Type1",
@@ -12,7 +12,7 @@
 -#if defined(__sun) && defined(__SVR4)
 -  "/usr/sfw/share/ghostscript/fonts",
 -#endif
-++  "/usr/share/fonts/Type1",
++  "/usr/share/fonts/Type1",
+ #endif // _WIN32
    NULL
  };
- #endif
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xpdf.git/commitdiff/80cb4e3564742ea89b5cb018bd8c1c7693b2b66f



More information about the pld-cvs-commit mailing list