From owner-dev-commits-ports-all@freebsd.org Fri Aug 6 09:22:33 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 13FA7652811; Fri, 6 Aug 2021 09:22:33 +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 4Gh0PN75KYz3nW6; Fri, 6 Aug 2021 09:22:32 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 DB3AE2FE1; Fri, 6 Aug 2021 09:22:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1769MWSj034961; Fri, 6 Aug 2021 09:22:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1769MWLn034960; Fri, 6 Aug 2021 09:22:32 GMT (envelope-from git) Date: Fri, 6 Aug 2021 09:22:32 GMT Message-Id: <202108060922.1769MWLn034960@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Tobias C. Berner" Subject: git: 9b85ac05288b - main - astro/phd2: fix build after ef8f58197aaa874dc087fe0d9f7942a2f12922fd MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tcberner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9b85ac05288b10c354d70fd4548407f6e445deac Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Aug 2021 09:22:33 -0000 The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=9b85ac05288b10c354d70fd4548407f6e445deac commit 9b85ac05288b10c354d70fd4548407f6e445deac Author: Tobias C. Berner AuthorDate: 2021-08-06 09:20:28 +0000 Commit: Tobias C. Berner CommitDate: 2021-08-06 09:20:28 +0000 astro/phd2: fix build after ef8f58197aaa874dc087fe0d9f7942a2f12922fd - This was failure detected during the freetype2 exp-run but is unrelated to freetype. PR: 251512 --- astro/phd2/files/patch-thirdparty_thirdparty.cmake | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/astro/phd2/files/patch-thirdparty_thirdparty.cmake b/astro/phd2/files/patch-thirdparty_thirdparty.cmake new file mode 100644 index 000000000000..27dee2b08db2 --- /dev/null +++ b/astro/phd2/files/patch-thirdparty_thirdparty.cmake @@ -0,0 +1,20 @@ +Fix compilation against libidngi 1.9.1 + +In file included from /wrkdirs/usr/ports/astro/phd2/work/phd2-2.6.9dev5/stepguider_sxao_indi.cpp:40: +In file included from /wrkdirs/usr/ports/astro/phd2/work/phd2-2.6.9dev5/phdindiclient.h:37: +/usr/local/include/libindi/baseclient.h:27:10: error: 'indimacros.h' file not found with include; use "quotes" instead +#include + ^ +1 warning and 1 error generated. + +--- thirdparty/thirdparty.cmake.orig 2021-08-06 09:18:28 UTC ++++ thirdparty/thirdparty.cmake +@@ -660,7 +660,7 @@ else() + find_package(INDI 0.9 REQUIRED) + # source files include so we need the libindi parent directory in the include directories + get_filename_component(INDI_INCLUDE_PARENT_DIR ${INDI_INCLUDE_DIR} DIRECTORY) +- include_directories(${INDI_INCLUDE_PARENT_DIR}) ++ include_directories(${INDI_INCLUDE_PARENT_DIR} ${INDI_INCLUDE_DIR}) + if(INDI_VERSION VERSION_LESS "1.4") + set(PHD_LINK_EXTERNAL ${PHD_LINK_EXTERNAL} ${INDI_CLIENT_LIBRARIES} ${INDI_LIBRARIES}) + else(INDI_VERSION VERSION_LESS "1.4")