From 6da36c71e23daf9577d3e674cac3cf9b8812a96b Mon Sep 17 00:00:00 2001 From: Alexander Golubev Date: Thu, 9 Jul 2026 03:22:40 +0300 Subject: [PATCH] media-gfx/pdf4qt: add 1.6.0.0, drop 1.5.1.0-r1 Signed-off-by: Alexander Golubev --- media-gfx/pdf4qt/Manifest | 2 +- ...-extention-from-Icon-endtry-in-a-des.patch | 26 ---------- .../pdf4qt-1.5.1.0-Minimal-cmake-fixes.patch | 47 ------------------- ....5.1.0-r1.ebuild => pdf4qt-1.6.0.0.ebuild} | 19 +++----- 4 files changed, 8 insertions(+), 86 deletions(-) delete mode 100644 media-gfx/pdf4qt/files/pdf4qt-1.4.0.0-minor-fix-remove-extention-from-Icon-endtry-in-a-des.patch delete mode 100644 media-gfx/pdf4qt/files/pdf4qt-1.5.1.0-Minimal-cmake-fixes.patch rename media-gfx/pdf4qt/{pdf4qt-1.5.1.0-r1.ebuild => pdf4qt-1.6.0.0.ebuild} (69%) diff --git a/media-gfx/pdf4qt/Manifest b/media-gfx/pdf4qt/Manifest index 5e71be57e5..7a76d9efe7 100644 --- a/media-gfx/pdf4qt/Manifest +++ b/media-gfx/pdf4qt/Manifest @@ -1,2 +1,2 @@ -DIST PDF4QT-1.5.1.0.tar.gz 4560158 BLAKE2B ac479bae1dbae3e3b065ded2e9991c5cd4c2a86f172110c50adf2dd3c04e3cc55b963764a569e8e3770172e6a5c3a1d5cead4b288db4a7dbe4bc009bf67bcbd9 SHA512 483980223e1dd365cb850ac09de10deb8a9ef676a642028ce55bd2c4f315619eb0b4721ad217476c8ff95ab53bbbe49bb7db2c2aae1e8ac4d8f3bfbac9519abc DIST PDF4QT-1.5.3.1.tar.gz 7346956 BLAKE2B 1ac79d545e505105431b74978d60ff77d09f81db91a1514136225de19121b8d78e331b83bd0cd3c463f9a1e30c3c04b27427ab8d55960de049ab31aa3a41000a SHA512 efbebf031104aced080624f59bc42c1a2d53f32a2d69d1e031015c51dca22dd85e84692a8dee7fbacc87a413e20fb572a9e51e26afcc77c13af2fd1d0a609e33 +DIST PDF4QT-1.6.0.0.tar.gz 7895904 BLAKE2B 5af90d24dfaa766ba96d728315ee29dc0118d391acadfba403e84a7db96d1876930268fa9afd164d6dd1ff4bfe2413386f31b5c42d06653c65fa53ee83234299 SHA512 cf7fa69772a80931efc5d4fa8c3e4bda9801240ec03bed7dc1302f64ec732e49fb1916ee45ffb2005ea1192d6f27e1ca20a4ebd6fac890aff17220f7e6028879 diff --git a/media-gfx/pdf4qt/files/pdf4qt-1.4.0.0-minor-fix-remove-extention-from-Icon-endtry-in-a-des.patch b/media-gfx/pdf4qt/files/pdf4qt-1.4.0.0-minor-fix-remove-extention-from-Icon-endtry-in-a-des.patch deleted file mode 100644 index d70da88e33..0000000000 --- a/media-gfx/pdf4qt/files/pdf4qt-1.4.0.0-minor-fix-remove-extention-from-Icon-endtry-in-a-des.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 18b4543b2a5d294c220e5dc4b558c52d2a36eeb0 Mon Sep 17 00:00:00 2001 -From: Golubev Alexander -Date: Sat, 9 Nov 2024 00:36:30 +0300 -Subject: [PATCH] minor fix: remove extention from Icon endtry in a desktop - file - ---- - Desktop/io.github.JakubMelka.Pdf4qt.Pdf4QtEditor.desktop | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Desktop/io.github.JakubMelka.Pdf4qt.Pdf4QtEditor.desktop b/Desktop/io.github.JakubMelka.Pdf4qt.Pdf4QtEditor.desktop -index 62009ba..f604504 100644 ---- a/Desktop/io.github.JakubMelka.Pdf4qt.Pdf4QtEditor.desktop -+++ b/Desktop/io.github.JakubMelka.Pdf4qt.Pdf4QtEditor.desktop -@@ -4,7 +4,7 @@ Type=Application - Name=PDF4QT Editor - Comment=Edit and modify PDF files - Exec=Pdf4QtEditor --Icon=io.github.JakubMelka.Pdf4qt.Pdf4QtEditor.svg -+Icon=io.github.JakubMelka.Pdf4qt.Pdf4QtEditor - Terminal=false - Categories=Office; - MimeType=application/pdf; --- -2.45.2 - diff --git a/media-gfx/pdf4qt/files/pdf4qt-1.5.1.0-Minimal-cmake-fixes.patch b/media-gfx/pdf4qt/files/pdf4qt-1.5.1.0-Minimal-cmake-fixes.patch deleted file mode 100644 index 96269bf4a3..0000000000 --- a/media-gfx/pdf4qt/files/pdf4qt-1.5.1.0-Minimal-cmake-fixes.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 42887fb8136b362637db318907b78128b13c251a Mon Sep 17 00:00:00 2001 -From: Alexander Golubev -Date: Fri, 8 Nov 2024 23:07:36 +0300 -Subject: [PATCH 1/5] Minimal cmake fixes - ---- - CMakeLists.txt | 3 +-- - Pdf4QtLibCore/CMakeLists.txt | 2 +- - 2 files changed, 2 insertions(+), 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b943d3f..fed05c6 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -62,7 +62,6 @@ endif() - qt_standard_project_setup(I18N_TRANSLATED_LANGUAGES en de cs es ko) - - find_package(OpenSSL REQUIRED) --find_package(lcms2 REQUIRED) - find_package(ZLIB REQUIRED) - find_package(Freetype REQUIRED) - find_package(OpenJPEG CONFIG REQUIRED) -@@ -99,7 +98,7 @@ endif() - option(PDF4QT_INSTALL_TO_USR "Install to usr directory" ON) - - if(PDF4QT_LINUX) -- set(PDF4QT_INSTALL_LIB_DIR_IMPL lib) -+ set(PDF4QT_INSTALL_LIB_DIR_IMPL ${CMAKE_INSTALL_LIBDIR}) - set(PDF4QT_INSTALL_BIN_DIR_IMPL bin) - - # Check if VCPKG_OVERLAY_PORTS is set as an environment variable or a CMake argument -diff --git a/Pdf4QtLibCore/CMakeLists.txt b/Pdf4QtLibCore/CMakeLists.txt -index f3436e0..7c719ce 100644 ---- a/Pdf4QtLibCore/CMakeLists.txt -+++ b/Pdf4QtLibCore/CMakeLists.txt -@@ -170,7 +170,7 @@ GENERATE_EXPORT_HEADER(Pdf4QtLibCore - EXPORT_FILE_NAME "${CMAKE_BINARY_DIR}/${INSTALL_INCLUDEDIR}/pdf4qtlibcore_export.h") - - target_link_libraries(Pdf4QtLibCore PRIVATE Qt6::Core Qt6::Gui Qt6::Xml Qt6::Svg) --target_link_libraries(Pdf4QtLibCore PRIVATE lcms2::lcms2) -+target_link_libraries(Pdf4QtLibCore PRIVATE lcms2) - target_link_libraries(Pdf4QtLibCore PRIVATE OpenSSL::SSL OpenSSL::Crypto) - target_link_libraries(Pdf4QtLibCore PRIVATE ZLIB::ZLIB) - target_link_libraries(Pdf4QtLibCore PRIVATE Freetype::Freetype) --- -2.49.1 - diff --git a/media-gfx/pdf4qt/pdf4qt-1.5.1.0-r1.ebuild b/media-gfx/pdf4qt/pdf4qt-1.6.0.0.ebuild similarity index 69% rename from media-gfx/pdf4qt/pdf4qt-1.5.1.0-r1.ebuild rename to media-gfx/pdf4qt/pdf4qt-1.6.0.0.ebuild index 1b6705d02a..5e325b1c43 100644 --- a/media-gfx/pdf4qt/pdf4qt-1.5.1.0-r1.ebuild +++ b/media-gfx/pdf4qt/pdf4qt-1.6.0.0.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit cmake xdg +inherit cmake flag-o-matic xdg DESCRIPTION="Open source PDF WYSIWYG editor based on Qt" HOMEPAGE="https://jakubmelka.github.io/" @@ -20,16 +20,16 @@ fi LICENSE="MIT" SLOT="0" -IUSE="test" +IUSE="debug test" RESTRICT="!test? ( test )" RDEPEND=" dev-cpp/tbb:= dev-libs/openssl:= - dev-qt/qtbase:6[gui,widgets,xml] + dev-qt/qtbase:6[concurrent,gui,widgets,xml] dev-qt/qtspeech:6 dev-qt/qtsvg:6 - =media-libs/blend2d-0.20:= media-libs/freetype media-libs/lcms:2 media-libs/libjpeg-turbo:= @@ -41,20 +41,15 @@ DEPEND="$RDEPEND " DOCS=( NOTES.txt README.md RELEASES.txt ) -PATCHES=( - "${FILESDIR}/${PN}-1.4.0.0-minor-fix-remove-extention-from-Icon-endtry-in-a-des.patch" - "${FILESDIR}/${P}-Minimal-cmake-fixes.patch" - "${FILESDIR}/${P}-Make-building-of-tests-optional.patch" - "${FILESDIR}/${P}-Make-runtime-respect-cmake-s-plugin-dir-settings.patch" - "${FILESDIR}/${P}-Fix-translation-install-path-on-nix.patch" -) src_configure() { + # without NDEBUG it shows annoying warning about keyboard accelerators reuse + use debug || append-cxxflags -DNDEBUG + local mycmakeargs=( -DPDF4QT_INSTALL_DEPENDENCIES=OFF -DPDF4QT_INSTALL_TO_USR=OFF -DPDF4QT_BUILD_TESTS="$(usex test)" - -DVCPKG_OVERLAY_PORTS="" # suppress a warning ) cmake_src_configure }