* [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/avogadro2/files/, sci-chemistry/avogadro2/
@ 2018-04-17 12:10 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2018-04-17 12:10 UTC (permalink / raw
To: gentoo-commits
commit: e95ea032ebb17c6a8aeeab597c85e66fba646baf
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 17 10:00:49 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> 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 <asturm@gentoo.org>
+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
+
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/avogadro2/files/, sci-chemistry/avogadro2/
@ 2025-03-24 18:04 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2025-03-24 18:04 UTC (permalink / raw
To: gentoo-commits
commit: de218af1cd735f9a16d89b4d62ae1e07efc5bc1a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 24 15:52:22 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Mar 24 18:03:36 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de218af1
sci-chemistry/avogadro2: drop 1.97.0-r1
Closes: https://bugs.gentoo.org/926352
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-chemistry/avogadro2/Manifest | 2 -
sci-chemistry/avogadro2/avogadro2-1.97.0-r1.ebuild | 82 ----------------------
.../avogadro2/files/avogadro2-1.95.1-qttest.patch | 15 ----
sci-chemistry/avogadro2/metadata.xml | 1 -
4 files changed, 100 deletions(-)
diff --git a/sci-chemistry/avogadro2/Manifest b/sci-chemistry/avogadro2/Manifest
index c2c2e751f346..05e6e819a014 100644
--- a/sci-chemistry/avogadro2/Manifest
+++ b/sci-chemistry/avogadro2/Manifest
@@ -1,4 +1,2 @@
DIST avogadro2-1.100.0-i18n.tar.gz 1225588 BLAKE2B a548952828764c3bbb2b487ecdfa649dd290473e3b241fcdb85c0fcf21e2b163e47e2007de2eb62845c2cfc368a2d8a115698c8988113d802504895a3ea5419d SHA512 261a1c3c165529731107346eca1b423fad6e64e790bf694dde64245e640cb3164735535574efac895d17f2b3ff1e236eb64535bf29de7d55ad4f008854e45164
DIST avogadro2-1.100.0.tar.gz 3079141 BLAKE2B f9ddd73b9c85099db8594300976fcb64d9b74ac8349a611c536efacaf57aa7f10b7f5b2325b6a9cc8f64354768bbb4af9bc280784a9042c9226af68d06e519c7 SHA512 689999bad26d575c879bf3e64a32afb3a2b95ece26b7338b417a4f8a552ef97908c75cf4aa09880b657b74255ead18e9025b0faf46dfb6e3329e00647ce12c48
-DIST avogadro2-1.97.0-i18n.tar.gz 990218 BLAKE2B e76b2d69b74f2a2964383564018e61ff0248e53c62a4a2abb1033100bd7fadaefbc261e64bf9e809d6e12ef851bd1ca3661d78b70d07728476586f6564e44e63 SHA512 6a01a05d4a62f83a75ae13100229f2ac6f9e697412868a75f5a9fde6025fc4e886c7ac80704fe5b8390a2af437c7848b0dce19897a6f9da1c5cf4c83418523db
-DIST avogadro2-1.97.0.tar.gz 2931223 BLAKE2B b2f2146ebe94ef25f4f684b13f9b9c5fbba933978208524ee197c8971f96c733f687ec68e566d032381a5f45cf22defb2bf909bd738becdd70da0abccebc0755 SHA512 19a0bcf01a840da29c4bab6eed55c879c10d773ee5dcfab613e6666708916bfd8398e44237c18de4e5bb3247d3c4bed3844cac47cf7f3a94dc96d7df8eb13579
diff --git a/sci-chemistry/avogadro2/avogadro2-1.97.0-r1.ebuild b/sci-chemistry/avogadro2/avogadro2-1.97.0-r1.ebuild
deleted file mode 100644
index adc3168ffaf1..000000000000
--- a/sci-chemistry/avogadro2/avogadro2-1.97.0-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-MY_PN=avogadroapp
-
-DOCS_BUILDER="doxygen"
-DOCS_DEPEND="media-gfx/graphviz"
-DOCS_DIR="${WORKDIR}/${MY_PN}-${PV}_build/docs"
-# docs/CMakeLists.txt overwrites docs.eclass outdir if we do not set this
-DOCS_OUTDIR="${DOCS_DIR}/html"
-DOCS_CONFIG_NAME="doxyfile"
-inherit desktop docs cmake xdg
-
-I18N_COMMIT="13c4286102373658cea48a33b86536ab5793da66"
-
-DESCRIPTION="Advanced molecule editor and visualizer 2"
-HOMEPAGE="https://www.openchemistry.org/"
-SRC_URI="
- https://github.com/OpenChemistry/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
- https://github.com/OpenChemistry/avogadro-i18n/archive/${I18N_COMMIT}.tar.gz -> ${P}-i18n.tar.gz
-"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-SLOT="0"
-LICENSE="BSD GPL-2+"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="rpc test vtk"
-
-RDEPEND="
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- >=sci-libs/avogadrolibs-${PV}[qt5(-),vtk?]
- sci-libs/hdf5:=
- rpc? ( sci-chemistry/molequeue )
-"
-DEPEND="${RDEPEND}
- dev-cpp/eigen:3
- test? ( dev-qt/qttest:5 )
-"
-
-RESTRICT="test"
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.95.1-qttest.patch"
-)
-
-src_unpack() {
- default
- mv "${WORKDIR}/avogadro-i18n-${I18N_COMMIT}" "${WORKDIR}/avogadro-i18n" || die
-}
-
-src_prepare() {
- cmake_src_prepare
- sed -e "/LICENSE/d" -i CMakeLists.txt || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -DINSTALL_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
- -DBUILD_DOCUMENTATION=$(usex doc)
- -DAvogadro_ENABLE_RPC=$(usex rpc)
- -DENABLE_TESTING=$(usex test)
- -DUSE_VTK=$(usex vtk)
- )
- # Need this to prevent overwriting the documentation OUTDIR
- use doc && mycmakeargs+=( -DChemData_BINARY_DIR="${DOCS_OUTDIR}" )
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile
- docs_compile
-}
-
-src_install() {
- cmake_src_install
- for size in 64 128 256 512; do
- newicon -s "${size}" avogadro/icons/"${PN}"_"${size}".png "${PN}".png
- done
-}
diff --git a/sci-chemistry/avogadro2/files/avogadro2-1.95.1-qttest.patch b/sci-chemistry/avogadro2/files/avogadro2-1.95.1-qttest.patch
deleted file mode 100644
index ed12da21e3f6..000000000000
--- a/sci-chemistry/avogadro2/files/avogadro2-1.95.1-qttest.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/avogadro/CMakeLists.txt b/avogadro/CMakeLists.txt
-index d2245ff..fe1857c 100644
---- a/avogadro/CMakeLists.txt
-+++ b/avogadro/CMakeLists.txt
-@@ -80,8 +80,8 @@ endif()
-
- if(ENABLE_TESTING)
- find_package(Qt5 COMPONENTS Test REQUIRED)
-- find_package(QtTesting REQUIRED NO_MODULE)
-- include_directories(${QtTesting_INCLUDE_DIRS})
-+ find_package(Qt5Test REQUIRED NO_MODULE)
-+ include_directories(${Qt5Test_INCLUDE_DIRS})
- link_directories(${QtTesting_LIBRARY_DIR})
- add_definitions(-DQTTESTING)
- endif()
diff --git a/sci-chemistry/avogadro2/metadata.xml b/sci-chemistry/avogadro2/metadata.xml
index b669d7480d2e..f14bff47877c 100644
--- a/sci-chemistry/avogadro2/metadata.xml
+++ b/sci-chemistry/avogadro2/metadata.xml
@@ -6,7 +6,6 @@
<name>Gentoo Chemistry Project</name>
</maintainer>
<use>
- <flag name="rpc">Enable RPC server</flag>
<flag name="vtk">include vtk support</flag>
</use>
<upstream>
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/avogadro2/files/, sci-chemistry/avogadro2/
@ 2017-09-24 6:45 Michael Palimaka
0 siblings, 0 replies; 3+ messages in thread
From: Michael Palimaka @ 2017-09-24 6:45 UTC (permalink / raw
To: gentoo-commits
commit: 045a85e5bd2ead2a7919c92c1737962d8df4ca10
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 24 06:31:10 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Sep 24 06:45:13 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=045a85e5
sci-chemistry/avogadro2: remove old
Package-Manager: Portage-2.3.8, Repoman-2.3.3
sci-chemistry/avogadro2/Manifest | 2 -
sci-chemistry/avogadro2/avogadro2-0.7.2.ebuild | 47 -------
sci-chemistry/avogadro2/avogadro2-0.8.0.ebuild | 57 ---------
.../avogadro2/files/avogadro2-0.8.0-desktop.patch | 16 ---
.../avogadro2/files/avogadro2-0.8.0-vtk.patch | 142 ---------------------
5 files changed, 264 deletions(-)
diff --git a/sci-chemistry/avogadro2/Manifest b/sci-chemistry/avogadro2/Manifest
index e02dad7d155..159b507489e 100644
--- a/sci-chemistry/avogadro2/Manifest
+++ b/sci-chemistry/avogadro2/Manifest
@@ -1,3 +1 @@
DIST avogadro2-0.9.0.tar.gz 1096442 SHA256 3af7faf0cc534953f40f4d77d9a5b6bdf1699d8c8bce9fb72834aaef10deddd1 SHA512 bc780b1f45822ffc6cef82cf5fbe04cfbab035e553037959965eb0cad2c3f87e53bc71a574c7154cae5909377c74d14708550070c1794bdd5d83d738846b03ba WHIRLPOOL a7633bec714f1decc339d8a9a131f047b733fc2e30d80f2ed9ff904b89e03091bed4c242452e222e441ecbea02fe95c06a6ef9faed354a565b1a89d9d00bc049
-DIST avogadroapp-0.7.2.tar.gz 523935 SHA256 f29db2f04aea8d9dfa0ab73bfa0c45fba18f45fba968a249f618024e8ab8fe63 SHA512 fb798931b66827b0b0e27295b528483d258e15612dba729219874b6171be3e981bd18337add41eb93613d90653286d8d8aa0dbe5fb11577c5ee22ba25b65443b WHIRLPOOL bce0a6c8e0e10bedb332b68c08935ecaf2abe8fbc53cfb7eb53f206da89014f99e0f9ccd95c2ad6c876bb97090939b0807e0d10c7e62f58ebb3a3cc3254fd2a6
-DIST avogadroapp-0.8.0.tar.gz 1105596 SHA256 d79840f0395c11c2081262ba9c1bc6d944c089bac162b434b94a3080bc90c221 SHA512 cc8c6c1620f603b3ed48a45c13968dc451382d3c3947b743fc65c547d6af92ae1f7f1764ffba84e602a2b54a5be075473e58cb49b8061b9e41b728eadba1a5de WHIRLPOOL dc04714b0f830bf826b5253ceb1738500f48aed5e1c922bd2096d2273c88264bbcf27a796418eec80c4483c5905d6c46e8ad4af22e011ab1b451c70d0c087a38
diff --git a/sci-chemistry/avogadro2/avogadro2-0.7.2.ebuild b/sci-chemistry/avogadro2/avogadro2-0.7.2.ebuild
deleted file mode 100644
index 352cba90785..00000000000
--- a/sci-chemistry/avogadro2/avogadro2-0.7.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-MY_PN=avogadroapp
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Advanced molecule editor and visualizer 2"
-HOMEPAGE="http://www.openchemistry.org/"
-SRC_URI="mirror://sourceforge/project/avogadro/avogadro2/${PV}/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD GPL-2+"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc rpc test"
-
-RDEPEND="
- >=dev-cpp/eigen-3.2.0-r1
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- dev-qt/qtopengl:4
- ~sci-libs/avogadrolibs-${PV}[qt4,opengl]
- sci-libs/hdf5
- rpc? ( sci-chemistry/molequeue )
-"
-DEPEND="${DEPEND}"
-
-RESTRICT=test
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
- sed '/COPYING/d' -i CMakeLists.txt || die
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_build doc DOCUMENTATION)
- $(cmake-utils_use rpc Avogadro_ENABLE_RPC)
- $(cmake-utils_use_enable test TESTING)
- )
- cmake-utils_src_configure
-}
diff --git a/sci-chemistry/avogadro2/avogadro2-0.8.0.ebuild b/sci-chemistry/avogadro2/avogadro2-0.8.0.ebuild
deleted file mode 100644
index d98ef8d5bd4..00000000000
--- a/sci-chemistry/avogadro2/avogadro2-0.8.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-MY_PN=avogadroapp
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Advanced molecule editor and visualizer 2"
-HOMEPAGE="http://www.openchemistry.org/"
-SRC_URI="mirror://sourceforge/project/avogadro/avogadro2/${PV}/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD GPL-2+"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc rpc test vtk"
-
-RDEPEND="
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtopengl:5
- dev-qt/qtwidgets:5
- ~sci-libs/avogadrolibs-${PV}[qt5,opengl]
- sci-libs/hdf5
- rpc? ( sci-chemistry/molequeue )
-"
-DEPEND="${DEPEND}
- >=dev-cpp/eigen-3.2.0-r1
- test? ( dev-qt/qttest:5 )"
-
-RESTRICT=test
-
-S="${WORKDIR}"/${MY_P}
-
-PATCHES=(
- "${FILESDIR}"/${P}-desktop.patch
- "${FILESDIR}"/${P}-vtk.patch
-)
-
-src_prepare() {
- sed '/COPYING/d' -i CMakeLists.txt || die
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_build doc DOCUMENTATION)
- $(cmake-utils_use rpc Avogadro_ENABLE_RPC)
- $(cmake-utils_use_enable test TESTING)
- $(cmake-utils_use_use vtk)
- )
- cmake-utils_src_configure
-}
diff --git a/sci-chemistry/avogadro2/files/avogadro2-0.8.0-desktop.patch b/sci-chemistry/avogadro2/files/avogadro2-0.8.0-desktop.patch
deleted file mode 100644
index 24738fb5453..00000000000
--- a/sci-chemistry/avogadro2/files/avogadro2-0.8.0-desktop.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- avogadro/icons/avogadro2.desktop | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/avogadro/icons/avogadro2.desktop b/avogadro/icons/avogadro2.desktop
-index 940a21b..a88c5fb 100644
---- a/avogadro/icons/avogadro2.desktop
-+++ b/avogadro/icons/avogadro2.desktop
-@@ -6,6 +6,6 @@ Exec=avogadro2 %f
- Icon=avogadro2
- Terminal=false
- Type=Application
--Categories=Qt;Science;Chemistry;Physics;Education;
-+Categories=Qt;Science;Chemistry;Physics;
- StartupNotify=true
--MimeType=chemical/x-cml;chemical/x-xyz
-+MimeType=chemical/x-cml;chemical/x-xyz;
diff --git a/sci-chemistry/avogadro2/files/avogadro2-0.8.0-vtk.patch b/sci-chemistry/avogadro2/files/avogadro2-0.8.0-vtk.patch
deleted file mode 100644
index fd872cef013..00000000000
--- a/sci-chemistry/avogadro2/files/avogadro2-0.8.0-vtk.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-commit 23a9474aad8eba503bcfe54584fd7cad106bda17
-Author: Marcus D. Hanwell <marcus.hanwell@kitware.com>
-Date: Mon Sep 21 12:03:07 2015 -0400
-
- Made VTK truly optional for Avogadro application
-
-diff --git a/avogadro/CMakeLists.txt b/avogadro/CMakeLists.txt
-index 90534ea..24bdd46 100644
---- a/avogadro/CMakeLists.txt
-+++ b/avogadro/CMakeLists.txt
-@@ -8,6 +8,7 @@ option(USE_VTK "Build with VTK support" OFF)
- if(USE_VTK)
- find_package(VTK COMPONENTS vtkGUISupportQt vtkRenderingOpenGL REQUIRED)
- include(${VTK_USE_FILE})
-+ add_definitions(-DAVO_USE_VTK)
- endif()
-
- if(MSVC)
-diff --git a/avogadro/mainwindow.cpp b/avogadro/mainwindow.cpp
-index a1c09e8..8fe3038 100644
---- a/avogadro/mainwindow.cpp
-+++ b/avogadro/mainwindow.cpp
-@@ -81,7 +81,9 @@
- # include <molequeue/client/client.h>
- #endif // Avogadro_ENABLE_RPC
-
--#include <avogadro/vtk/vtkglwidget.h>
-+#ifdef AVO_USE_VTK
-+# include <avogadro/vtk/vtkglwidget.h>
-+#endif
-
- namespace Avogadro {
-
-@@ -198,8 +200,10 @@ using QtGui::ToolPluginFactory;
- using QtGui::ExtensionPlugin;
- using QtGui::ExtensionPluginFactory;
- using QtOpenGL::GLWidget;
--using VTK::vtkGLWidget;
- using QtPlugins::PluginManager;
-+#ifdef AVO_USE_VTK
-+using VTK::vtkGLWidget;
-+#endif
-
- MainWindow::MainWindow(const QStringList &fileNames, bool disableSettings)
- : m_molecule(NULL),
-@@ -434,9 +438,11 @@ void MainWindow::setMolecule(Molecule *mol)
- if (GLWidget *glWidget = qobject_cast<QtOpenGL::GLWidget *>(w)) {
- setWidgetMolecule(glWidget, mol);
- }
-+#ifdef AVO_USE_VTK
- else if (vtkGLWidget *vtkWidget = qobject_cast<vtkGLWidget *>(w)) {
- setWidgetMolecule(vtkWidget, mol);
- }
-+#endif
- }
-
- void MainWindow::markMoleculeDirty()
-@@ -831,6 +837,7 @@ void MainWindow::viewActivated(QWidget *widget)
- m_moleculeModel->setActiveMolecule(m_molecule);
- }
- }
-+#ifdef AVO_USE_VTK
- else if (vtkGLWidget *vtkWidget = qobject_cast<vtkGLWidget*>(widget)) {
- bool firstRun = populatePluginModel(vtkWidget->sceneModel());
- m_sceneTreeView->setModel(&vtkWidget->sceneModel());
-@@ -851,6 +858,7 @@ void MainWindow::viewActivated(QWidget *widget)
- m_moleculeModel->setActiveMolecule(m_molecule);
- }
- }
-+#endif
- updateWindowTitle();
- activeMoleculeEdited();
- }
-@@ -1194,14 +1202,18 @@ void MainWindow::setActiveDisplayTypes(QStringList displayTypes)
- {
- ScenePluginModel *scenePluginModel(NULL);
- GLWidget *glWidget(NULL);
-+#ifdef AVO_USE_VTK
- VTK::vtkGLWidget *vtkWidget(NULL);
-+#endif
- if ((glWidget = qobject_cast<GLWidget *>(m_multiViewWidget->activeWidget()))) {
- scenePluginModel = &glWidget->sceneModel();
- }
-+#ifdef AVO_USE_VTK
- else if ((vtkWidget =
- qobject_cast<VTK::vtkGLWidget *>(m_multiViewWidget->activeWidget()))) {
- scenePluginModel = &vtkWidget->sceneModel();
- }
-+#endif
-
- foreach (ScenePlugin *scene, scenePluginModel->scenePlugins())
- scene->setEnabled(false);
-@@ -1211,8 +1223,10 @@ void MainWindow::setActiveDisplayTypes(QStringList displayTypes)
- scene->setEnabled(true);
- if (glWidget)
- glWidget->updateScene();
-+#ifdef AVO_USE_VTK
- else if (vtkWidget)
- vtkWidget->updateScene();
-+#endif
- }
-
- void MainWindow::undoEdit()
-diff --git a/avogadro/viewfactory.cpp b/avogadro/viewfactory.cpp
-index 28009be..15c6a44 100644
---- a/avogadro/viewfactory.cpp
-+++ b/avogadro/viewfactory.cpp
-@@ -17,7 +17,9 @@
- #include "viewfactory.h"
-
- #include <avogadro/qtopengl/glwidget.h>
--#include <avogadro/vtk/vtkglwidget.h>
-+#ifdef AVO_USE_VTK
-+# include <avogadro/vtk/vtkglwidget.h>
-+#endif
-
- namespace Avogadro {
-
-@@ -31,15 +33,22 @@ ViewFactory::~ViewFactory()
-
- QStringList ViewFactory::views() const
- {
-- return QStringList() << "3D View" << "VTK";
-+ QStringList views;
-+ views << "3D View";
-+#ifdef AVO_USE_VTK
-+ views << "VTK";
-+#endif
-+ return views;
- }
-
- QWidget * ViewFactory::createView(const QString &view)
- {
- if (view == "3D View")
- return new QtOpenGL::GLWidget;
-+#ifdef AVO_USE_VTK
- else if (view == "VTK")
- return new VTK::vtkGLWidget;
-+#endif
- return NULL;
- }
-
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-03-24 18:04 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-04-17 12:10 [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/avogadro2/files/, sci-chemistry/avogadro2/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2025-03-24 18:04 Andreas Sturmlechner
2017-09-24 6:45 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox