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 EF0C5138334 for ; Tue, 21 Aug 2018 21:36:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D061EE0897; Tue, 21 Aug 2018 21:36:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 A7AD9E0897 for ; Tue, 21 Aug 2018 21:36:13 +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 E4F1F335D11 for ; Tue, 21 Aug 2018 21:36:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 66CE83A2 for ; Tue, 21 Aug 2018 21:36:10 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1534887285.56904c25cf34e1dcc2098b34c1a516f88f3776a3.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/, media-sound/musescore/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/musescore/files/musescore-2.1.0-pch.patch media-sound/musescore/musescore-2.1.0-r1.ebuild X-VCS-Directories: media-sound/musescore/ media-sound/musescore/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 56904c25cf34e1dcc2098b34c1a516f88f3776a3 X-VCS-Branch: master Date: Tue, 21 Aug 2018 21:36:10 +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-Archives-Salt: 9cc47a61-722a-445a-acad-093618c31419 X-Archives-Hash: fdcf8583f1f198740d7388e4071fed78 commit: 56904c25cf34e1dcc2098b34c1a516f88f3776a3 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Aug 21 21:34:45 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Aug 21 21:34:45 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56904c25 media-sound/musescore: Fix cmake (missing all.h) Closes: https://bugs.gentoo.org/626618 Package-Manager: Portage-2.3.48, Repoman-2.3.10 .../musescore/files/musescore-2.1.0-pch.patch | 31 ++++++++++++++++++++++ media-sound/musescore/musescore-2.1.0-r1.ebuild | 1 + 2 files changed, 32 insertions(+) diff --git a/media-sound/musescore/files/musescore-2.1.0-pch.patch b/media-sound/musescore/files/musescore-2.1.0-pch.patch new file mode 100644 index 00000000000..d69d1cd2f65 --- /dev/null +++ b/media-sound/musescore/files/musescore-2.1.0-pch.patch @@ -0,0 +1,31 @@ +From 5e8024c683891be677075d74cedfbf424e36bc31 Mon Sep 17 00:00:00 2001 +From: mirabilos +Date: Sun, 4 Mar 2018 16:38:21 +0100 +Subject: [PATCH] Fix numerous reports of missing all.h during compilation + +When disabling PCH, the all.h copying code is no longer run before +AUTOMOC=caused *_autogen targets, so we must run it earlier. + +From Debian +--- + CMakeLists.txt | 7 ++----- + 1 file changed, 2 insertions(+), 5 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 66b0ddfce8..7fdfffcc9b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -553,11 +553,8 @@ endif (NOT MINGW AND NOT APPLE) + # + + # all.h is expected in PROJECT_BINARY_DIR by subdirs +-add_custom_command( +- OUTPUT ${PROJECT_BINARY_DIR}/all.h +- COMMAND ${CMAKE_COMMAND} +- ARGS -E copy ${PROJECT_SOURCE_DIR}/all.h ${PROJECT_BINARY_DIR}/all.h +- DEPENDS ${PROJECT_SOURCE_DIR}/all.h ++execute_process( ++ COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_SOURCE_DIR}/all.h ${PROJECT_BINARY_DIR}/all.h + WORKING_DIRECTORY ${PROJECT_BINARY_DIR} + ) + \ No newline at end of file diff --git a/media-sound/musescore/musescore-2.1.0-r1.ebuild b/media-sound/musescore/musescore-2.1.0-r1.ebuild index 6abacb371c4..60cdd985217 100644 --- a/media-sound/musescore/musescore-2.1.0-r1.ebuild +++ b/media-sound/musescore/musescore-2.1.0-r1.ebuild @@ -50,6 +50,7 @@ PATCHES=( "${WORKDIR}/${P}-fix-buildsystem.patch" "${FILESDIR}/${P}-qt-5.11.patch" "${FILESDIR}/${P}-qtsingleapplication.patch" + "${FILESDIR}/${P}-pch.patch" ) S="${WORKDIR}/MuseScore-${PV}"