From nobody Wed Jan 17 08:52:44 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TFKQN4sp7z57MCK; Wed, 17 Jan 2024 08:52:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TFKQN4L8vz4NSj; Wed, 17 Jan 2024 08:52:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705481564; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/oG6TdnnLSpee/acERTEaf0GVcd2cWEP5UX5fh59hQg=; b=PexVA1P6CG95pBn3X7axAPvJcqKGv1Be7sPkJO3PJD0D3ZUd0sQkWFleCGGCsPuzW2nmCw ZnedpMpwbWaiPSFKkGGZxzxOFcheEpO/BgB9s8TQPEPvxfBS2/EDf212h0lSp94zpsleUV l4IaZ6xAWuYzNHTFHIYV+KvL0QPZMtwN5Re88SpAy4XtOfXj9SBnlyV2O32M+rlcs2iOxe OTo9DyJ48FGWnNCxFRJ9TLmIDB+LLgLsFqp9Q18PXgfp6FRmvfe0Am94dISRgikZMUSD43 Jyil/QZLGNj3Q223yrlgxcyLrrwyEu4BDoNxNvE113Z+Q6LbhReyGyPfFFT8+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705481564; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/oG6TdnnLSpee/acERTEaf0GVcd2cWEP5UX5fh59hQg=; b=UQjrFFc+7otXJjHZLYG8NL955RR/nr1jyVY7HpfpJUsjT+DfeXvH1St8j313qLOGF6ApXV WbBczH1ADek4JLmUXcqipi+9yJGycEzGzFUhQaUkF6ZBTqoK7FlC/lH+ItZmLS9qYr9BMA GojbbSDiDES1JxWcJCuiq+BahVIiC0BWc5EfZBbHzqUu2Sda8wtSHisvdyqY08NZ95GQgU jLjZCoCFFH/aTKuze2CuGvGlo3ufy4I6QHVSy+ze5hUWhAUVFZIA6Bal5MqjpnwwESivZa Cv5FKcP0Vsk+wnYVkzD2HstOz4JGX0+//lowPqe3i2kQFZwFe4afh+rHM/QGKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705481564; a=rsa-sha256; cv=none; b=WysN1FECgYiTvjcHLfB0B+brd39+gP8o6LCgf4RT3smXWSNbnfwIJm0znqdMtY2qa/sBVk kP8zoBQB5XwJZHTjMR4d+ya4eLDpHyP4lBeu/UicfMyjguiSGt8vOuLAb0QbNTGwfLlixy nErZmhAkbCzfNI/UHMilmJS+TPpe15gGwWIU273Ha0+17K+FSclnDxeUjU/UcRboMlnuGq Ydd2Kj1jxRZwartBvRYYYYYem27VqhAh9eNmU9ArVpLaiHpJSU6gXoQlUS2LeKfY5V3ghZ h34OK0reAPZ+DqwBGeabR/fho0tXjyfIawJYqrCLWFgR3rsi7YQZURlvPluFnw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TFKQN3PYNzHJX; Wed, 17 Jan 2024 08:52:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40H8qi1W003324; Wed, 17 Jan 2024 08:52:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40H8qiL7003321; Wed, 17 Jan 2024 08:52:44 GMT (envelope-from git) Date: Wed, 17 Jan 2024 08:52:44 GMT Message-Id: <202401170852.40H8qiL7003321@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Fernando =?utf-8?Q?Apestegu=C3=ADa?= Subject: git: 963ccdb8eb50 - main - print/pdfmixtool: Fix build after ImageMagick7 7.1.1 update. List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 963ccdb8eb509e7fe171b63d6e1fd8ee4c664108 Auto-Submitted: auto-generated The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=963ccdb8eb509e7fe171b63d6e1fd8ee4c664108 commit 963ccdb8eb509e7fe171b63d6e1fd8ee4c664108 Author: Florian Walpen AuthorDate: 2024-01-17 08:30:10 +0000 Commit: Fernando Apesteguía 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)