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 3303F1382C5 for ; Tue, 17 Apr 2018 12:10:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7C264E096D; Tue, 17 Apr 2018 12:10:32 +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 4C2F1E096D for ; Tue, 17 Apr 2018 12:10:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 6FB06335C7A for ; Tue, 17 Apr 2018 12:10:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1A272291 for ; Tue, 17 Apr 2018 12:10:28 +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: <1523966542.e95ea032ebb17c6a8aeeab597c85e66fba646baf.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/avogadro2/files/, sci-chemistry/avogadro2/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-chemistry/avogadro2/avogadro2-1.90.0_p20180211.ebuild sci-chemistry/avogadro2/files/avogadro2-1.90.0_p20180211-qt-5.11b3.patch X-VCS-Directories: sci-chemistry/avogadro2/files/ sci-chemistry/avogadro2/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: e95ea032ebb17c6a8aeeab597c85e66fba646baf X-VCS-Branch: master Date: Tue, 17 Apr 2018 12:10:28 +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: 96da58a4-a5be-4257-9474-11563189092a X-Archives-Hash: d4c66968db1f6ac34cb8e49b0137c2ba commit: e95ea032ebb17c6a8aeeab597c85e66fba646baf Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Apr 17 10:00:49 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Apr 17 12:02:22 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e95ea032 sci-chemistry/avogadro2: Fix build with Qt 5.11_beta3 Package-Manager: Portage-2.3.29, Repoman-2.3.9 .../avogadro2/avogadro2-1.90.0_p20180211.ebuild | 2 ++ .../avogadro2-1.90.0_p20180211-qt-5.11b3.patch | 34 ++++++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/sci-chemistry/avogadro2/avogadro2-1.90.0_p20180211.ebuild b/sci-chemistry/avogadro2/avogadro2-1.90.0_p20180211.ebuild index 8b017684a57..8345cd9619e 100644 --- a/sci-chemistry/avogadro2/avogadro2-1.90.0_p20180211.ebuild +++ b/sci-chemistry/avogadro2/avogadro2-1.90.0_p20180211.ebuild @@ -33,6 +33,8 @@ RESTRICT="test" S="${WORKDIR}/${MY_PN}-${COMMIT}" +PATCHES=( "${FILESDIR}/${P}-qt-5.11b3.patch" ) + src_prepare() { cmake-utils_src_prepare sed -e "/LICENSE/d" -i CMakeLists.txt || die diff --git a/sci-chemistry/avogadro2/files/avogadro2-1.90.0_p20180211-qt-5.11b3.patch b/sci-chemistry/avogadro2/files/avogadro2-1.90.0_p20180211-qt-5.11b3.patch new file mode 100644 index 00000000000..1e7a23f0b54 --- /dev/null +++ b/sci-chemistry/avogadro2/files/avogadro2-1.90.0_p20180211-qt-5.11b3.patch @@ -0,0 +1,34 @@ +From 2c70d9bf7248d8da7691a5830ba6a0972fd9eea7 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Tue, 17 Apr 2018 11:57:32 +0200 +Subject: [PATCH] Fix build with Qt 5.11_beta3 (dropping qt5_use_modules) + +--- + avogadro/CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/avogadro/CMakeLists.txt b/avogadro/CMakeLists.txt +index 115b798..f564eb5 100644 +--- a/avogadro/CMakeLists.txt ++++ b/avogadro/CMakeLists.txt +@@ -16,7 +16,7 @@ if(MSVC) + endif() + + # Find the Qt components we need. +-find_package(Qt5 COMPONENTS Widgets Network REQUIRED) ++find_package(Qt5 REQUIRED COMPONENTS Concurrent Widgets Network CONFIG) + + configure_file(avogadroappconfig.h.in avogadroappconfig.h) + +@@ -88,7 +88,7 @@ endif() + + add_executable(avogadro WIN32 MACOSX_BUNDLE + ${avogadro_srcs} ${ui_srcs} ${rcc_srcs}) +-qt5_use_modules(avogadro Widgets Network Concurrent) ++target_link_libraries(avogadro Qt5::Widgets Qt5::Network Qt5::Concurrent) + if(WIN32) + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /NODEFAULTLIB:MSVCRTD") + target_link_libraries(avogadro Qt5::WinMain) +-- +2.17.0 +