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 CE6591382C5 for ; Tue, 17 Apr 2018 13:30:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C1B33E094E; Tue, 17 Apr 2018 13:30:56 +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 9207EE094E for ; Tue, 17 Apr 2018 13:30:56 +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 5524E335C0A for ; Tue, 17 Apr 2018 13:30:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BE5D9254 for ; Tue, 17 Apr 2018 13:30:53 +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: <1523971838.8eb6b1584b942c1d81ecedc7e87868e14a85f280.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/avogadrolibs/, sci-libs/avogadrolibs/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180415.ebuild sci-libs/avogadrolibs/files/avogadrolibs-1.91.0_pre20180415-qt-5.11b3.patch X-VCS-Directories: sci-libs/avogadrolibs/files/ sci-libs/avogadrolibs/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 8eb6b1584b942c1d81ecedc7e87868e14a85f280 X-VCS-Branch: master Date: Tue, 17 Apr 2018 13:30:53 +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: 13de968c-09c5-4926-ab03-f4a04f0dd822 X-Archives-Hash: 0fe9e8f0ea3168928b1964066fcd78e7 commit: 8eb6b1584b942c1d81ecedc7e87868e14a85f280 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Apr 17 13:30:08 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Apr 17 13:30:38 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8eb6b158 sci-libs/avogadrolibs: Update patch after review, drop unused DEPEND Package-Manager: Portage-2.3.29, Repoman-2.3.9 .../avogadrolibs/avogadrolibs-1.91.0_pre20180415.ebuild | 5 +---- .../avogadrolibs-1.91.0_pre20180415-qt-5.11b3.patch | 17 +++++------------ 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180415.ebuild b/sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180415.ebuild index df8f4182395..0936e94a44c 100644 --- a/sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180415.ebuild +++ b/sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180415.ebuild @@ -39,10 +39,7 @@ RDEPEND=" " DEPEND="${RDEPEND} dev-cpp/eigen:3 - qt5? ( - dev-qt/linguist-tools:5 - dev-qt/qtopengl:5 - ) + qt5? ( dev-qt/linguist-tools:5 ) test? ( dev-cpp/gtest )" S="${WORKDIR}/${PN}-${COMMIT}" diff --git a/sci-libs/avogadrolibs/files/avogadrolibs-1.91.0_pre20180415-qt-5.11b3.patch b/sci-libs/avogadrolibs/files/avogadrolibs-1.91.0_pre20180415-qt-5.11b3.patch index 2aacee8e5b7..11816e438c2 100644 --- a/sci-libs/avogadrolibs/files/avogadrolibs-1.91.0_pre20180415-qt-5.11b3.patch +++ b/sci-libs/avogadrolibs/files/avogadrolibs-1.91.0_pre20180415-qt-5.11b3.patch @@ -1,4 +1,4 @@ -From fdac6931c24986d377e06d77dbc607bb3c1654dd Mon Sep 17 00:00:00 2001 +From 03dd55beb878b5e15d891535a3c8b7ffa6133c92 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Tue, 17 Apr 2018 11:31:22 +0200 Subject: [PATCH] Fix build with Qt 5.11_beta3 (dropping qt5_use_modules) @@ -9,8 +9,8 @@ Subject: [PATCH] Fix build with Qt 5.11_beta3 (dropping qt5_use_modules) avogadro/qtopengl/CMakeLists.txt | 3 +-- avogadro/vtk/CMakeLists.txt | 3 +-- tests/qtgui/CMakeLists.txt | 3 +-- - tests/qtopengl/CMakeLists.txt | 5 ++--- - 6 files changed, 7 insertions(+), 13 deletions(-) + tests/qtopengl/CMakeLists.txt | 2 -- + 6 files changed, 5 insertions(+), 12 deletions(-) diff --git a/avogadro/molequeue/CMakeLists.txt b/avogadro/molequeue/CMakeLists.txt index 43a9195..37431cd 100644 @@ -76,10 +76,10 @@ index 1cfd51a..da08078 100644 # Now add all of the tests, using the gtest_filter argument so that only those # cases are run in each test invocation. diff --git a/tests/qtopengl/CMakeLists.txt b/tests/qtopengl/CMakeLists.txt -index 370f28f..5843a38 100644 +index 370f28f..60fc5ae 100644 --- a/tests/qtopengl/CMakeLists.txt +++ b/tests/qtopengl/CMakeLists.txt -@@ -44,13 +44,12 @@ create_test_sourcelist(testDriver qtopengltests.cpp ${testSrcs}) +@@ -44,8 +44,6 @@ create_test_sourcelist(testDriver qtopengltests.cpp ${testSrcs}) add_executable(AvogadroQtOpenGLTests ${testDriver}) @@ -88,13 +88,6 @@ index 370f28f..5843a38 100644 target_link_libraries(AvogadroQtOpenGLTests AvogadroQtOpenGL vtkImagingCore - vtkIOImage -- vtkRenderingQt) -+ vtkRenderingQt -+ Qt5::OpenGL) - - foreach(test ${tests}) - string(TOLOWER ${test} testname) -- 2.17.0