From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3A149138350 for ; Thu, 9 Apr 2020 22:18:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3F70AE08CE; Thu, 9 Apr 2020 22:18:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1C79BE08CE for ; Thu, 9 Apr 2020 22:18:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 76A4F34EF79 for ; Thu, 9 Apr 2020 22:18:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 237562B for ; Thu, 9 Apr 2020 22:18:01 +0000 (UTC) From: "Jimi Huotari" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jimi Huotari" Message-ID: <1586470535.e86f6c527e9371790330a0f6aac4fa5c2baecf44.chiitoo@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtplugininfo/, dev-qt/qdoc/, dev-qt/qtdiag/, dev-qt/pixeltool/, ... X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/designer/designer-5.15.0_beta3.ebuild dev-qt/designer/designer-5.15.9999.ebuild dev-qt/linguist-tools/linguist-tools-5.15.0_beta3.ebuild dev-qt/linguist-tools/linguist-tools-5.15.9999.ebuild dev-qt/pixeltool/pixeltool-5.15.0_beta3.ebuild dev-qt/pixeltool/pixeltool-5.15.9999.ebuild dev-qt/qdoc/qdoc-5.15.0_beta3.ebuild dev-qt/qdoc/qdoc-5.15.9999.ebuild dev-qt/qtdiag/qtdiag-5.15.0_beta3.ebuild dev-qt/qtdiag/qtdiag-5.15.9999.ebuild dev-qt/qtpaths/qtpaths-5.15.0_beta3.ebuild dev-qt/qtpaths/qtpaths-5.15.9999.ebuild dev-qt/qtplugininfo/qtplugininfo-5.15.0_beta3.ebuild dev-qt/qtplugininfo/qtplugininfo-5.15.9999.ebuild X-VCS-Directories: dev-qt/designer/ dev-qt/linguist-tools/ dev-qt/qtpaths/ dev-qt/qtplugininfo/ dev-qt/pixeltool/ dev-qt/qtdiag/ dev-qt/qdoc/ X-VCS-Committer: chiitoo X-VCS-Committer-Name: Jimi Huotari X-VCS-Revision: e86f6c527e9371790330a0f6aac4fa5c2baecf44 X-VCS-Branch: master Date: Thu, 9 Apr 2020 22:18:01 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: cab6973d-a12f-4e06-a539-c47373054aec X-Archives-Hash: f4c95df9ffca7f462657b2560b83fbb4 commit: e86f6c527e9371790330a0f6aac4fa5c2baecf44 Author: Jimi Huotari gentoo org> AuthorDate: Tue Apr 7 12:37:04 2020 +0000 Commit: Jimi Huotari gentoo org> CommitDate: Thu Apr 9 22:15:35 2020 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=e86f6c52 dev-qt: fix 5.15 configure for qttools modules Upstream added configure features for more qttools [1], which requires similar workarounds for out-of-source builds that have been used for some of the modules for a time already. 1. https://code.qt.io/cgit/qt/qttools.git/commit/?h=5.15&id=50ef2ac2 Bug: https://bugs.gentoo.org/633776 Bug: https://bugs.gentoo.org/676948 Closes: https://bugs.gentoo.org/716514 Package-Manager: Portage-2.3.96, Repoman-2.3.22 Signed-off-by: Jimi Huotari gentoo.org> dev-qt/designer/designer-5.15.0_beta3.ebuild | 10 ++++++++++ dev-qt/designer/designer-5.15.9999.ebuild | 10 ++++++++++ dev-qt/linguist-tools/linguist-tools-5.15.0_beta3.ebuild | 10 ++++++++++ dev-qt/linguist-tools/linguist-tools-5.15.9999.ebuild | 10 ++++++++++ dev-qt/pixeltool/pixeltool-5.15.0_beta3.ebuild | 10 ++++++++++ dev-qt/pixeltool/pixeltool-5.15.9999.ebuild | 10 ++++++++++ dev-qt/qdoc/qdoc-5.15.0_beta3.ebuild | 1 + dev-qt/qdoc/qdoc-5.15.9999.ebuild | 1 + dev-qt/qtdiag/qtdiag-5.15.0_beta3.ebuild | 10 ++++++++++ dev-qt/qtdiag/qtdiag-5.15.9999.ebuild | 10 ++++++++++ dev-qt/qtpaths/qtpaths-5.15.0_beta3.ebuild | 10 ++++++++++ dev-qt/qtpaths/qtpaths-5.15.9999.ebuild | 10 ++++++++++ dev-qt/qtplugininfo/qtplugininfo-5.15.0_beta3.ebuild | 10 ++++++++++ dev-qt/qtplugininfo/qtplugininfo-5.15.9999.ebuild | 10 ++++++++++ 14 files changed, 122 insertions(+) diff --git a/dev-qt/designer/designer-5.15.0_beta3.ebuild b/dev-qt/designer/designer-5.15.0_beta3.ebuild index 8e394f7f..a8446a05 100644 --- a/dev-qt/designer/designer-5.15.0_beta3.ebuild +++ b/dev-qt/designer/designer-5.15.0_beta3.ebuild @@ -39,6 +39,16 @@ src_prepare() { qt5-build_src_prepare } +src_configure() { + # Most of qttools require files that are only generated when qmake is + # run in the root directory. + # Related bugs: 633776, 676948, and 716514. + mkdir -p "${QT5_BUILD_DIR}" || die + qt5_qmake "${QT_BUILD_DIR}" + cp "${S}"/qttools-config.pri "${QT5_BUILD_DIR}" || die + qt5-build_src_configure +} + src_install() { qt5-build_src_install diff --git a/dev-qt/designer/designer-5.15.9999.ebuild b/dev-qt/designer/designer-5.15.9999.ebuild index 8e394f7f..a8446a05 100644 --- a/dev-qt/designer/designer-5.15.9999.ebuild +++ b/dev-qt/designer/designer-5.15.9999.ebuild @@ -39,6 +39,16 @@ src_prepare() { qt5-build_src_prepare } +src_configure() { + # Most of qttools require files that are only generated when qmake is + # run in the root directory. + # Related bugs: 633776, 676948, and 716514. + mkdir -p "${QT5_BUILD_DIR}" || die + qt5_qmake "${QT_BUILD_DIR}" + cp "${S}"/qttools-config.pri "${QT5_BUILD_DIR}" || die + qt5-build_src_configure +} + src_install() { qt5-build_src_install diff --git a/dev-qt/linguist-tools/linguist-tools-5.15.0_beta3.ebuild b/dev-qt/linguist-tools/linguist-tools-5.15.0_beta3.ebuild index c038a48e..1f62623c 100644 --- a/dev-qt/linguist-tools/linguist-tools-5.15.0_beta3.ebuild +++ b/dev-qt/linguist-tools/linguist-tools-5.15.0_beta3.ebuild @@ -33,3 +33,13 @@ src_prepare() { qt5-build_src_prepare } + +src_configure() { + # Most of qttools require files that are only generated when qmake is + # run in the root directory. + # Related bugs: 633776, 676948, and 716514. + mkdir -p "${QT5_BUILD_DIR}" || die + qt5_qmake "${QT_BUILD_DIR}" + cp "${S}"/qttools-config.pri "${QT5_BUILD_DIR}" || die + qt5-build_src_configure +} diff --git a/dev-qt/linguist-tools/linguist-tools-5.15.9999.ebuild b/dev-qt/linguist-tools/linguist-tools-5.15.9999.ebuild index c038a48e..1f62623c 100644 --- a/dev-qt/linguist-tools/linguist-tools-5.15.9999.ebuild +++ b/dev-qt/linguist-tools/linguist-tools-5.15.9999.ebuild @@ -33,3 +33,13 @@ src_prepare() { qt5-build_src_prepare } + +src_configure() { + # Most of qttools require files that are only generated when qmake is + # run in the root directory. + # Related bugs: 633776, 676948, and 716514. + mkdir -p "${QT5_BUILD_DIR}" || die + qt5_qmake "${QT_BUILD_DIR}" + cp "${S}"/qttools-config.pri "${QT5_BUILD_DIR}" || die + qt5-build_src_configure +} diff --git a/dev-qt/pixeltool/pixeltool-5.15.0_beta3.ebuild b/dev-qt/pixeltool/pixeltool-5.15.0_beta3.ebuild index 2b5bd193..6e644ada 100644 --- a/dev-qt/pixeltool/pixeltool-5.15.0_beta3.ebuild +++ b/dev-qt/pixeltool/pixeltool-5.15.0_beta3.ebuild @@ -23,3 +23,13 @@ RDEPEND="${DEPEND}" QT5_TARGET_SUBDIRS=( src/pixeltool ) + +src_configure() { + # Most of qttools require files that are only generated when qmake is + # run in the root directory. + # Related bugs: 633776, 676948, and 716514. + mkdir -p "${QT5_BUILD_DIR}" || die + qt5_qmake "${QT_BUILD_DIR}" + cp "${S}"/qttools-config.pri "${QT5_BUILD_DIR}" || die + qt5-build_src_configure +} diff --git a/dev-qt/pixeltool/pixeltool-5.15.9999.ebuild b/dev-qt/pixeltool/pixeltool-5.15.9999.ebuild index 2b5bd193..6e644ada 100644 --- a/dev-qt/pixeltool/pixeltool-5.15.9999.ebuild +++ b/dev-qt/pixeltool/pixeltool-5.15.9999.ebuild @@ -23,3 +23,13 @@ RDEPEND="${DEPEND}" QT5_TARGET_SUBDIRS=( src/pixeltool ) + +src_configure() { + # Most of qttools require files that are only generated when qmake is + # run in the root directory. + # Related bugs: 633776, 676948, and 716514. + mkdir -p "${QT5_BUILD_DIR}" || die + qt5_qmake "${QT_BUILD_DIR}" + cp "${S}"/qttools-config.pri "${QT5_BUILD_DIR}" || die + qt5-build_src_configure +} diff --git a/dev-qt/qdoc/qdoc-5.15.0_beta3.ebuild b/dev-qt/qdoc/qdoc-5.15.0_beta3.ebuild index 0d486e0a..dddcd583 100644 --- a/dev-qt/qdoc/qdoc-5.15.0_beta3.ebuild +++ b/dev-qt/qdoc/qdoc-5.15.0_beta3.ebuild @@ -36,5 +36,6 @@ src_configure() { # run in the root directory. bug 676948; same fix as bug 633776 mkdir -p "${QT5_BUILD_DIR}"/src/qdoc || die qt5_qmake "${QT5_BUILD_DIR}" + cp src/qdoc/qtqdoc-config.pri "${QT5_BUILD_DIR}"/src/qdoc || die qt5-build_src_configure } diff --git a/dev-qt/qdoc/qdoc-5.15.9999.ebuild b/dev-qt/qdoc/qdoc-5.15.9999.ebuild index 0d486e0a..dddcd583 100644 --- a/dev-qt/qdoc/qdoc-5.15.9999.ebuild +++ b/dev-qt/qdoc/qdoc-5.15.9999.ebuild @@ -36,5 +36,6 @@ src_configure() { # run in the root directory. bug 676948; same fix as bug 633776 mkdir -p "${QT5_BUILD_DIR}"/src/qdoc || die qt5_qmake "${QT5_BUILD_DIR}" + cp src/qdoc/qtqdoc-config.pri "${QT5_BUILD_DIR}"/src/qdoc || die qt5-build_src_configure } diff --git a/dev-qt/qtdiag/qtdiag-5.15.0_beta3.ebuild b/dev-qt/qtdiag/qtdiag-5.15.0_beta3.ebuild index 9f86c552..94e64960 100644 --- a/dev-qt/qtdiag/qtdiag-5.15.0_beta3.ebuild +++ b/dev-qt/qtdiag/qtdiag-5.15.0_beta3.ebuild @@ -34,3 +34,13 @@ src_prepare() { qt5-build_src_prepare } + +src_configure() { + # Most of qttools require files that are only generated when qmake is + # run in the root directory. + # Related bugs: 633776, 676948, and 716514. + mkdir -p "${QT5_BUILD_DIR}" || die + qt5_qmake "${QT_BUILD_DIR}" + cp "${S}"/qttools-config.pri "${QT5_BUILD_DIR}" || die + qt5-build_src_configure +} diff --git a/dev-qt/qtdiag/qtdiag-5.15.9999.ebuild b/dev-qt/qtdiag/qtdiag-5.15.9999.ebuild index 9f86c552..94e64960 100644 --- a/dev-qt/qtdiag/qtdiag-5.15.9999.ebuild +++ b/dev-qt/qtdiag/qtdiag-5.15.9999.ebuild @@ -34,3 +34,13 @@ src_prepare() { qt5-build_src_prepare } + +src_configure() { + # Most of qttools require files that are only generated when qmake is + # run in the root directory. + # Related bugs: 633776, 676948, and 716514. + mkdir -p "${QT5_BUILD_DIR}" || die + qt5_qmake "${QT_BUILD_DIR}" + cp "${S}"/qttools-config.pri "${QT5_BUILD_DIR}" || die + qt5-build_src_configure +} diff --git a/dev-qt/qtpaths/qtpaths-5.15.0_beta3.ebuild b/dev-qt/qtpaths/qtpaths-5.15.0_beta3.ebuild index 7e77477f..6999dd88 100644 --- a/dev-qt/qtpaths/qtpaths-5.15.0_beta3.ebuild +++ b/dev-qt/qtpaths/qtpaths-5.15.0_beta3.ebuild @@ -21,3 +21,13 @@ RDEPEND="${DEPEND}" QT5_TARGET_SUBDIRS=( src/qtpaths ) + +src_configure() { + # Most of qttools require files that are only generated when qmake is + # run in the root directory. + # Related bugs: 633776, 676948, and 716514. + mkdir -p "${QT5_BUILD_DIR}" || die + qt5_qmake "${QT_BUILD_DIR}" + cp "${S}"/qttools-config.pri "${QT5_BUILD_DIR}" || die + qt5-build_src_configure +} diff --git a/dev-qt/qtpaths/qtpaths-5.15.9999.ebuild b/dev-qt/qtpaths/qtpaths-5.15.9999.ebuild index ec3e1e7d..7cbdff0f 100644 --- a/dev-qt/qtpaths/qtpaths-5.15.9999.ebuild +++ b/dev-qt/qtpaths/qtpaths-5.15.9999.ebuild @@ -21,3 +21,13 @@ RDEPEND="${DEPEND}" QT5_TARGET_SUBDIRS=( src/qtpaths ) + +src_configure() { + # Most of qttools require files that are only generated when qmake is + # run in the root directory. + # Related bugs: 633776, 676948, and 716514. + mkdir -p "${QT5_BUILD_DIR}" || die + qt5_qmake "${QT_BUILD_DIR}" + cp "${S}"/qttools-config.pri "${QT5_BUILD_DIR}" || die + qt5-build_src_configure +} diff --git a/dev-qt/qtplugininfo/qtplugininfo-5.15.0_beta3.ebuild b/dev-qt/qtplugininfo/qtplugininfo-5.15.0_beta3.ebuild index 20db4ecf..44e33e18 100644 --- a/dev-qt/qtplugininfo/qtplugininfo-5.15.0_beta3.ebuild +++ b/dev-qt/qtplugininfo/qtplugininfo-5.15.0_beta3.ebuild @@ -21,3 +21,13 @@ RDEPEND="${DEPEND}" QT5_TARGET_SUBDIRS=( src/qtplugininfo ) + +src_configure() { + # Most of qttools require files that are only generated when qmake is + # run in the root directory. + # Related bugs: 633776, 676948, and 716514. + mkdir -p "${QT5_BUILD_DIR}" || die + qt5_qmake "${QT_BUILD_DIR}" + cp "${S}"/qttools-config.pri "${QT5_BUILD_DIR}" || die + qt5-build_src_configure +} diff --git a/dev-qt/qtplugininfo/qtplugininfo-5.15.9999.ebuild b/dev-qt/qtplugininfo/qtplugininfo-5.15.9999.ebuild index 85a22f17..2e2bcc16 100644 --- a/dev-qt/qtplugininfo/qtplugininfo-5.15.9999.ebuild +++ b/dev-qt/qtplugininfo/qtplugininfo-5.15.9999.ebuild @@ -21,3 +21,13 @@ RDEPEND="${DEPEND}" QT5_TARGET_SUBDIRS=( src/qtplugininfo ) + +src_configure() { + # Most of qttools require files that are only generated when qmake is + # run in the root directory. + # Related bugs: 633776, 676948, and 716514. + mkdir -p "${QT5_BUILD_DIR}" || die + qt5_qmake "${QT_BUILD_DIR}" + cp "${S}"/qttools-config.pri "${QT5_BUILD_DIR}" || die + qt5-build_src_configure +}