From nobody Sun Feb 06 17:52:21 2022 X-Original-To: dev-commits-ports-main@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 313F219A35E1; Sun, 6 Feb 2022 17:52:22 +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 4JsH0j5vDKz3NHV; Sun, 6 Feb 2022 17:52:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644169941; 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=DYusg2Mx4kt2aexm5a15vRs8TonKOm12led2UCu8axg=; b=LT8vQIIbyaFZYhsbxBJJ+gPfnCcJhYD63knt2ucbpKXkHPrUJPQrotOVVcS7TDacBdePk9 z+Sg54Y4f+iHQiKTaJtcgQfWuG37UcsnpgYLxnn9jBUswKdrvch0ArTp/NJwnKUsodxBcT X1gBatRpEO+OWJib9QWRNeChC81uWWlc1JIwCV4OixFgY3xG/7VW/I6MMDH0XzLtk+MbN6 98k0kgjj55jDMUG/o0K0BSQoTpLER79k9kqTe0umMzfScCaHuyrvp4/aHIZ0dUyXiSUgmB fVdWnUj3hdOb/FEaPF2KVOzdi8h+7xU0sNp9IFvIKLFEj/gkDLMXUYqeWZKemA== 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 955D716D50; Sun, 6 Feb 2022 17:52:21 +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 216HqLib082899; Sun, 6 Feb 2022 17:52:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 216HqLlW082898; Sun, 6 Feb 2022 17:52:21 GMT (envelope-from git) Date: Sun, 6 Feb 2022 17:52:21 GMT Message-Id: <202202061752.216HqLlW082898@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Adriaan de Groot Subject: git: 2c9a938c5b69 - main - devel/qt5-qdoc: fix CMake Config file for doctools List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adridg X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2c9a938c5b69e6d6fb88cf33f6ad32394b9966a2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644169941; 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=DYusg2Mx4kt2aexm5a15vRs8TonKOm12led2UCu8axg=; b=JBcP9DQn8GVcuCz2/riNPW/iS//RrZA+3QtKMip30WvdbMMsHgmyjafZta8nd6OtP+QSAU ROfCyP2svCSJ3kLzJXr7pqWDsspLBQqvxfHGfPhsOYixUOxN0VIlqEekZ2EB5TOdOG8B90 pig7Lc8il3Jb7T299vhNUx0FS9X+4g+Buynr+yimyDXFUMkdHeIaVCFYqlocgw/64wJh9v +f3w3TADWL73FzKBDxefEHUehGRysL5rcTmYSL1m/Hxizzw0wMjaj2tXk8awWAtiWIKWK4 Oi0JuZ7qESL7WPKWSR3aMSwqxdMGdz6ltjkzO4iKFePvwBRJ/KfQw0x6MDh/kw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644169941; a=rsa-sha256; cv=none; b=pWHeguZsamxLMXd8E1JLD5V4NBbdXDp3tLNe7BBcIM0GjpBSkCKKs1Ruh9RcOmQhC27svl TF3pFBgvT0ZI19jM9Oeephgqv3Nh8HDTsQKTNZSpRIMjmYdUmc1EJ1ZYBn/+VZ8sYvK2lW chkiAkivKmXHU2gvIhB84YjW9qdrmYuf5P5/fdrrqvmps28sqGtK7tne9iiKAhnC7XuaqN aGc9TOXOepe6yX54IE07wspa7fgx9AQA6AtYTJXNR4zEM7zkJmIagJ5ysy6dbIbtxyfliN kOG9KqNh8H+DjF7vKNkTd5ba5lLK/F71MBWQq4LpvFPg3lttyHKrW5WzHEoEkw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by adridg: URL: https://cgit.FreeBSD.org/ports/commit/?id=2c9a938c5b69e6d6fb88cf33f6ad32394b9966a2 commit 2c9a938c5b69e6d6fb88cf33f6ad32394b9966a2 Author: Adriaan de Groot AuthorDate: 2022-02-06 17:43:50 +0000 Commit: Adriaan de Groot CommitDate: 2022-02-06 17:52:19 +0000 devel/qt5-qdoc: fix CMake Config file for doctools We patch Qt to install into $LOCALBASE/lib/qt5, but the CMake bits of Qt go into $LOCALBASE; this mismatch of installation- prefixes means that the CMake Config files are generated with an incorrect number of "../" components, and end up looking in the wrong prefix. Symptom is this: The package "Qt5DocTools" references the file "/usr/lib/qt5/bin/qdoc" The logic to use the correct path is there, but not selected when writing out the Config file. Delete all the ones we don't want, rather than letting qmake / whatever text-substitution tool is in the build do it. Suggested by: tcberner --- devel/qt5-qdoc/Makefile | 1 + .../patch-src_qdoc_Qt5DocToolsConfig.cmake.in | 32 ++++++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/devel/qt5-qdoc/Makefile b/devel/qt5-qdoc/Makefile index f954b602e778..dd9057daeb82 100644 --- a/devel/qt5-qdoc/Makefile +++ b/devel/qt5-qdoc/Makefile @@ -1,5 +1,6 @@ PORTNAME= qdoc PORTVERSION= ${QT5_VERSION}${QT5_KDE_PATCH} +PORTREVISION= 1 CATEGORIES= devel textproc PKGNAMEPREFIX= qt5- diff --git a/devel/qt5-qdoc/files/patch-src_qdoc_Qt5DocToolsConfig.cmake.in b/devel/qt5-qdoc/files/patch-src_qdoc_Qt5DocToolsConfig.cmake.in new file mode 100644 index 000000000000..2f3e727b074c --- /dev/null +++ b/devel/qt5-qdoc/files/patch-src_qdoc_Qt5DocToolsConfig.cmake.in @@ -0,0 +1,32 @@ +--- src/qdoc/Qt5DocToolsConfig.cmake.in.orig 2022-02-06 16:38:55 UTC ++++ src/qdoc/Qt5DocToolsConfig.cmake.in +@@ -2,29 +2,7 @@ if (CMAKE_VERSION VERSION_LESS 2.8.3) + message(FATAL_ERROR \"Qt 5 requires at least CMake version 2.8.3\") + endif() + +-!!IF !isEmpty(CMAKE_USR_MOVE_WORKAROUND) +-!!IF !isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) + set(_qt5_qdoctools_install_prefix \"$$[QT_INSTALL_PREFIX]\") +-!!ELSE +-get_filename_component(_IMPORT_PREFIX \"${CMAKE_CURRENT_LIST_FILE}\" PATH) +-# Use original install prefix when loaded through a +-# cross-prefix symbolic link such as /lib -> /usr/lib. +-get_filename_component(_realCurr \"${_IMPORT_PREFIX}\" REALPATH) +-get_filename_component(_realOrig \"$$CMAKE_INSTALL_LIBS_DIR/cmake/Qt5DocTools\" REALPATH) +-if(_realCurr STREQUAL _realOrig) +- get_filename_component(_qt5_qdoctools_install_prefix \"$$CMAKE_INSTALL_LIBS_DIR/$${CMAKE_RELATIVE_INSTALL_LIBS_DIR}\" ABSOLUTE) +-else() +- get_filename_component(_qt5_qdoctools_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE) +-endif() +-unset(_realOrig) +-unset(_realCurr) +-unset(_IMPORT_PREFIX) +-!!ENDIF +-!!ELIF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +-get_filename_component(_qt5_qdoctools_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE) +-!!ELSE +-set(_qt5_qdoctools_install_prefix \"$$[QT_INSTALL_PREFIX]\") +-!!ENDIF + + macro(_qt5_DocTools_check_file_exists file) + if(NOT EXISTS \"${file}\" )