George Hu pushed to branch main at Arch Linux / Packaging / Packages / pdfmixtool
Commits: a1cdb947 by George Hu at 2025-09-22T21:50:30+08:00 Remove redundant patches - - - - - 2 changed files: - − ImageMagick-7.1.1.patch - − qpdf-12.0.0.patch Changes: ===================================== ImageMagick-7.1.1.patch deleted ===================================== @@ -1,35 +0,0 @@ -From 268291317ccd1805dc1c801ff88641ba06c6a7f0 Mon Sep 17 00:00:00 2001 -From: Florian Walpen <d...@submerge.ch> -Date: Sat, 20 Jan 2024 23:06:14 +0100 -Subject: [PATCH] cmake: Use all pkgconf cflags for ImageMagick - -Build fails with ImageMagick 7.1.1: - -`# error "you should set MAGICKCORE_HDRI_ENABLE"` - -The missing build flags are available from `pkgconf --cflags-only-other` -and as `${MAGICK_CFLAGS_OTHER}` in CMake. Add them to the build. ---- - CMakeLists.txt | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 64a7b32..52bce6f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -141,6 +141,12 @@ target_link_libraries ( - ${QT_LIBRARIES} - ) - -+target_compile_options( -+ pdfmixtool -+ PUBLIC -+ ${MAGICK_CFLAGS_OTHER} -+) -+ - INSTALL(TARGETS pdfmixtool RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) - INSTALL(FILES resources/eu.scarpetta.PDFMixTool.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications) - INSTALL(FILES resources/eu.scarpetta.PDFMixTool.appdata.xml DESTINATION ${CMAKE_INSTALL_DATADIR}/metainfo) --- -GitLab - ===================================== qpdf-12.0.0.patch deleted ===================================== @@ -1,10 +0,0 @@ ---- pdfmixtool-v1.1.1/src/operations/extract_images.cpp 2025-03-10 21:39:18.310348406 +0100 -+++ pdfmixtool-v1.1.1/src/operations/extract_images.cpp.new 2025-03-10 21:39:52.054069316 +0100 -@@ -22,6 +22,7 @@ - #include <QLabel> - #include <QFileDialog> - #include <qpdf/QPDF.hh> -+#include <qpdf/PointerHolder.hh> - #include <Magick++/Blob.h> - #include <Magick++/Image.h> - #include <fstream> View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/pdfmixtool/-/commit/a1cdb947797aeb7d338fb132ad944aaaa51eba3a -- View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/pdfmixtool/-/commit/a1cdb947797aeb7d338fb132ad944aaaa51eba3a You're receiving this email because of your account on gitlab.archlinux.org.