Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 17 Jan 2024 08:52:44 GMT
From:      Fernando =?utf-8?Q?Apestegu=C3=ADa?= <fernape@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 963ccdb8eb50 - main - print/pdfmixtool: Fix build after ImageMagick7 7.1.1 update.
Message-ID:  <202401170852.40H8qiL7003321@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by fernape:

URL: https://cgit.FreeBSD.org/ports/commit/?id=963ccdb8eb509e7fe171b63d6e1fd8ee4c664108

commit 963ccdb8eb509e7fe171b63d6e1fd8ee4c664108
Author:     Florian Walpen <dev@submerge.ch>
AuthorDate: 2024-01-17 08:30:10 +0000
Commit:     Fernando ApesteguĂ­a <fernape@FreeBSD.org>
CommitDate: 2024-01-17 08:52:25 +0000

    print/pdfmixtool: Fix build after ImageMagick7 7.1.1 update.
    
    iAfter the update to ImageMagick7 7.1.1, build would fail and complain about
    MAGICKCORE_HDRI_ENABLE not being defined. While pkgconf clearly propagates these
    additional CFLAGS, the CMakeLists.txt of pdfmixtool does not use them.
    
    PR:             276362
    Reported by:    dev@submerge.ch (maintainer)
---
 print/pdfmixtool/Makefile                   |  2 +-
 print/pdfmixtool/files/patch-CMakeLists.txt | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/print/pdfmixtool/Makefile b/print/pdfmixtool/Makefile
index f5e3b38488e9..7b78798aec08 100644
--- a/print/pdfmixtool/Makefile
+++ b/print/pdfmixtool/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	pdfmixtool
 DISTVERSION=	1.1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	print graphics editors
 PKGNAMESUFFIX=	-${FLAVOR}
 
diff --git a/print/pdfmixtool/files/patch-CMakeLists.txt b/print/pdfmixtool/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..9229066a2c84
--- /dev/null
+++ b/print/pdfmixtool/files/patch-CMakeLists.txt
@@ -0,0 +1,15 @@
+--- CMakeLists.txt.orig	2024-01-16 00:28:44 UTC
++++ CMakeLists.txt
+@@ -142,6 +142,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)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202401170852.40H8qiL7003321>