* [gentoo-commits] repo/gentoo:master commit in: sci-libs/avogadrolibs/, sci-libs/avogadrolibs/files/
@ 2015-12-29 10:44 Justin Lecher
0 siblings, 0 replies; 7+ messages in thread
From: Justin Lecher @ 2015-12-29 10:44 UTC (permalink / raw
To: gentoo-commits
commit: a339afeb7a5fa0b9a1353875b2792eb56b94c565
Author: Ted Tanberry <ted.tanberry <AT> gmail <DOT> com>
AuthorDate: Mon Dec 28 22:08:53 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Dec 28 22:10:22 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a339afeb
sci-libs/avogadrolibs: Add patch to fix underlinking with -Wl,--no-undefined.
Package-Manager: portage-2.2.26
sci-libs/avogadrolibs/avogadrolibs-0.8.0.ebuild | 2 +-
.../files/avogadrolibs-0.8.0-underlinking.patch | 34 ++++++++++++++++++++++
2 files changed, 35 insertions(+), 1 deletion(-)
diff --git a/sci-libs/avogadrolibs/avogadrolibs-0.8.0.ebuild b/sci-libs/avogadrolibs/avogadrolibs-0.8.0.ebuild
index 2472a69..f2a19da 100644
--- a/sci-libs/avogadrolibs/avogadrolibs-0.8.0.ebuild
+++ b/sci-libs/avogadrolibs/avogadrolibs-0.8.0.ebuild
@@ -38,7 +38,7 @@ DEPEND="${DEPEND}
dev-cpp/eigen:3
test? ( dev-cpp/gtest )"
-PATCHES=( "${FILESDIR}"/${PN}-0.7.2-6464.patch )
+PATCHES=( "${FILESDIR}"/${PN}-0.7.2-6464.patch "${FILESDIR}/"${P}-underlinking.patch )
src_configure() {
local mycmakeargs=(
diff --git a/sci-libs/avogadrolibs/files/avogadrolibs-0.8.0-underlinking.patch b/sci-libs/avogadrolibs/files/avogadrolibs-0.8.0-underlinking.patch
new file mode 100644
index 0000000..b29f3af
--- /dev/null
+++ b/sci-libs/avogadrolibs/files/avogadrolibs-0.8.0-underlinking.patch
@@ -0,0 +1,34 @@
+Fix underlinking problems in shared libraries.
+
+--- avogadrolibs-0.8.0/avogadro/qtplugins/apbs/CMakeLists.txt
++++ avogadrolibs-0.8.0/avogadro/qtplugins/apbs/CMakeLists.txt
+@@ -23,4 +23,4 @@
+ "${apbs_uis}"
+ )
+
+-target_link_libraries(apbs LINK_PRIVATE AvogadroIO MoleQueueClient)
++target_link_libraries(apbs LINK_PRIVATE AvogadroIO MoleQueueClient AvogadroMoleQueue)
+--- avogadrolibs-0.8.0/avogadro/qtplugins/playertool/CMakeLists.txt
++++ avogadrolibs-0.8.0/avogadro/qtplugins/playertool/CMakeLists.txt
+@@ -7,3 +7,5 @@
+ ""
+ playertool.qrc
+ )
++
++target_link_libraries(PlayerTool LINK_PRIVATE Qt5OpenGL)
+--- avogadrolibs-0.8.0/avogadro/qtplugins/povray/CMakeLists.txt
++++ avogadrolibs-0.8.0/avogadro/qtplugins/povray/CMakeLists.txt
+@@ -8,3 +8,5 @@
+ "povray.cpp"
+ ""
+ )
++
++target_link_libraries(POVRay LINK_PRIVATE AvogadroRendering)
+--- avogadrolibs-0.8.0/avogadro/qtplugins/qtaim/CMakeLists.txt
++++ avogadrolibs-0.8.0/avogadro/qtplugins/qtaim/CMakeLists.txt
+@@ -34,3 +34,5 @@
+
+ target_link_libraries(QTAIMScenePlugin
+ LINK_PRIVATE AvogadroRendering ${Qt5Concurrent_LIBRARIES})
++target_link_libraries(QTAIMExtension
++ LINK_PRIVATE ${Qt5Concurrent_LIBRARIES})
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/avogadrolibs/, sci-libs/avogadrolibs/files/
@ 2018-04-08 9:55 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2018-04-08 9:55 UTC (permalink / raw
To: gentoo-commits
commit: 9a80747f1a93efa92be9944ba77feafd4650c7ea
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 7 19:01:22 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 8 09:53:52 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a80747f
sci-libs/avogadrolibs: Add 1.91.0_p20180406 snapshot
Closes: https://bugs.gentoo.org/645248
Closes: https://bugs.gentoo.org/649862
Closes: https://bugs.gentoo.org/588706
Closes: https://bugs.gentoo.org/577214
Package-Manager: Portage-2.3.28, Repoman-2.3.9
sci-libs/avogadrolibs/Manifest | 1 +
.../avogadrolibs-1.91.0_pre20180406.ebuild | 71 ++++++++++++++++++++++
...gadrolibs-1.91.0_pre20180406-underlinking.patch | 18 ++++++
sci-libs/avogadrolibs/metadata.xml | 3 +-
4 files changed, 92 insertions(+), 1 deletion(-)
diff --git a/sci-libs/avogadrolibs/Manifest b/sci-libs/avogadrolibs/Manifest
index 1d04e63cc1b..bbf158508b8 100644
--- a/sci-libs/avogadrolibs/Manifest
+++ b/sci-libs/avogadrolibs/Manifest
@@ -1 +1,2 @@
DIST avogadrolibs-0.9.0.tar.gz 742370 BLAKE2B cd104cea48b82a1ac86fdb9e93717e2647f57a0d713673d8b340d259f73d6d9985decf0c4e4d83f13d54d12ae2aefee8e75b5d04861f8ab67b9b42690c3c74f7 SHA512 7cb000cd6399f33483c38b4f8a9c4a4688f5054cba35e101bed0f2371cea614ace6b3fc65c3ed1418976afef4462a09be868500435a5ae9c98a7ac496c10c36f
+DIST avogadrolibs-1.91.0_pre20180406.tar.gz 857345 BLAKE2B 8e5c6b0a838a2a6b7dc925c1b544ab4d4de8b7769b1fe8d787127a1014b1243da89a2a6f6cfc871181f81a443c3ee63d758369f003afaf591c9373c9d5122ee3 SHA512 1814b2105615aabc1df78b14c581e78fea20a1e4ace8979bb2ad123ab0994d90c3935e37f0cc58b60d3307ffe682599a93d8cadddc22b4ba524caaec1a2c5319
diff --git a/sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180406.ebuild b/sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180406.ebuild
new file mode 100644
index 00000000000..6671ed518ff
--- /dev/null
+++ b/sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180406.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+COMMIT=f414794a168712f72884cdcfba818def5f42e721
+inherit cmake-utils
+
+DESCRIPTION="Advanced molecule editor and visualizer 2 - libraries"
+HOMEPAGE="https://www.openchemistry.org/"
+SRC_URI="https://github.com/OpenChemistry/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD GPL-2+"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="archive doc hdf5 qt5 static-plugins test vtk"
+
+# TODO: Not yet packaged:
+# sci-libs/libmsym (https://github.com/mcodev31/libmsym)
+# sci-libs/spglib (https://atztogo.github.io/spglib/)
+RDEPEND="
+ >=sci-chemistry/molequeue-0.7
+ archive? ( app-arch/libarchive )
+ hdf5? ( sci-libs/hdf5:= )
+ qt5? (
+ dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtwidgets:5
+ media-libs/glew:0=
+ )
+ vtk? ( sci-libs/vtk )
+"
+DEPEND="${RDEPEND}
+ dev-cpp/eigen:3
+ test? ( dev-cpp/gtest )"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.7.2-6464.patch
+ "${FILESDIR}/"${P}-underlinking.patch
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DUSE_PROTOCALL=OFF
+ -DBUILD_GPL_PLUGINS=ON
+ -DUSE_MOLEQUEUE=ON
+ -DUSE_LIBMSYM=OFF
+ -DUSE_LIBSPG=OFF
+ -DUSE_PYTHON=OFF
+ -DUSE_LIBARCHIVE=$(usex archive)
+ -DBUILD_DOCUMENTATION=$(usex doc)
+ -DUSE_HDF5=$(usex hdf5)
+ -DUSE_OPENGL=$(usex qt5)
+ -DUSE_QT=$(usex qt5)
+ -DBUILD_STATIC_PLUGINS=$(usex static-plugins)
+ -DENABLE_TESTING=$(usex test)
+ -DUSE_VTK=$(usex vtk)
+ )
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ # TODO: bundles jsoncpp
+ rm "${ED%/}"/usr/lib64/libjsoncpp.a || die
+}
diff --git a/sci-libs/avogadrolibs/files/avogadrolibs-1.91.0_pre20180406-underlinking.patch b/sci-libs/avogadrolibs/files/avogadrolibs-1.91.0_pre20180406-underlinking.patch
new file mode 100644
index 00000000000..f6f39c9e6b7
--- /dev/null
+++ b/sci-libs/avogadrolibs/files/avogadrolibs-1.91.0_pre20180406-underlinking.patch
@@ -0,0 +1,18 @@
+Fix underlinking problems in shared libraries.
+
+--- a/avogadro/qtplugins/playertool/CMakeLists.txt
++++ b/avogadro/qtplugins/playertool/CMakeLists.txt
+@@ -7,3 +7,5 @@
+ ""
+ playertool.qrc
+ )
++
++target_link_libraries(PlayerTool LINK_PRIVATE Qt5OpenGL)
+--- a/avogadro/qtplugins/qtaim/CMakeLists.txt
++++ b/avogadro/qtplugins/qtaim/CMakeLists.txt
+@@ -34,3 +34,5 @@
+
+ target_link_libraries(QTAIMScenePlugin
+ LINK_PRIVATE AvogadroRendering ${Qt5Concurrent_LIBRARIES})
++target_link_libraries(QTAIMExtension
++ LINK_PRIVATE ${Qt5Concurrent_LIBRARIES})
diff --git a/sci-libs/avogadrolibs/metadata.xml b/sci-libs/avogadrolibs/metadata.xml
index ea8e4fdee06..ff1789dfa77 100644
--- a/sci-libs/avogadrolibs/metadata.xml
+++ b/sci-libs/avogadrolibs/metadata.xml
@@ -6,8 +6,9 @@
<name>Gentoo Chemistry Project</name>
</maintainer>
<use>
+ <flag name="archive">Enable archive support using <pkg>app-arch/libarchive</pkg></flag>
<flag name="static-plugins">Build all plugins statically into main plugin modules</flag>
- <flag name="vtk">include vtk support</flag>
+ <flag name="vtk">Enable <pkg>sci-libs/vtk</pkg> support</flag>
</use>
<upstream>
<remote-id type="github">OpenChemistry/avogadrolibs</remote-id>
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/avogadrolibs/, sci-libs/avogadrolibs/files/
@ 2018-04-10 20:09 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2018-04-10 20:09 UTC (permalink / raw
To: gentoo-commits
commit: 19116434ada2eeffdf6470d941acd374609b1cfe
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 10 19:48:24 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Apr 10 20:09:27 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19116434
sci-libs/avogadrolibs: Fix build with Qt-5.11
Package-Manager: Portage-2.3.28, Repoman-2.3.9
...d => avogadrolibs-1.91.0_pre20180406-r1.ebuild} | 1 +
.../avogadrolibs-1.91.0_pre20180406-qt-5.11.patch | 29 ++++++++++++++++++++++
2 files changed, 30 insertions(+)
diff --git a/sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180406.ebuild b/sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180406-r1.ebuild
similarity index 98%
rename from sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180406.ebuild
rename to sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180406-r1.ebuild
index f7417ab49bf..bd5274cca9b 100644
--- a/sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180406.ebuild
+++ b/sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180406-r1.ebuild
@@ -48,6 +48,7 @@ PATCHES=(
"${FILESDIR}/"${P}-underlinking.patch
"${FILESDIR}/"${P}-unbundle-jsoncpp.patch
"${FILESDIR}/"${P}-bundled-genxrdpattern.patch
+ "${FILESDIR}/"${P}-qt-5.11.patch
)
src_unpack() {
diff --git a/sci-libs/avogadrolibs/files/avogadrolibs-1.91.0_pre20180406-qt-5.11.patch b/sci-libs/avogadrolibs/files/avogadrolibs-1.91.0_pre20180406-qt-5.11.patch
new file mode 100644
index 00000000000..437b1e755af
--- /dev/null
+++ b/sci-libs/avogadrolibs/files/avogadrolibs-1.91.0_pre20180406-qt-5.11.patch
@@ -0,0 +1,29 @@
+From 5d70cd5ec5ac8460ff5d3d6b0b47b9c60e1f3ca2 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Tue, 10 Apr 2018 21:59:32 +0200
+Subject: [PATCH] Fix build with Qt-5.11
+
+---
+ avogadro/qtplugins/gamessinput/gamessinput.cpp | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/avogadro/qtplugins/gamessinput/gamessinput.cpp b/avogadro/qtplugins/gamessinput/gamessinput.cpp
+index 779d2d4..0b2e106 100644
+--- a/avogadro/qtplugins/gamessinput/gamessinput.cpp
++++ b/avogadro/qtplugins/gamessinput/gamessinput.cpp
+@@ -24,9 +24,9 @@
+
+ #include <molequeue/client/jobobject.h>
+
+-#include <QtCore/QDebug>
+-
+-#include <QtWidgets/QMessageBox>
++#include <QAction>
++#include <QDebug>
++#include <QMessageBox>
+
+ namespace Avogadro {
+ namespace Core {
+--
+2.17.0
+
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/avogadrolibs/, sci-libs/avogadrolibs/files/
@ 2018-04-17 13:30 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2018-04-17 13:30 UTC (permalink / raw
To: gentoo-commits
commit: 8eb6b1584b942c1d81ecedc7e87868e14a85f280
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 17 13:30:08 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> 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 <asturm@gentoo.org>
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
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/avogadrolibs/, sci-libs/avogadrolibs/files/
@ 2021-01-17 11:52 David Seifert
0 siblings, 0 replies; 7+ messages in thread
From: David Seifert @ 2021-01-17 11:52 UTC (permalink / raw
To: gentoo-commits
commit: 36581d60d80d37c288b32c6568a1f748f50e47df
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Sun Jan 17 11:51:35 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Jan 17 11:51:35 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36581d60
sci-libs/avogadrolibs: Remove old
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: David Seifert <soap <AT> gentoo.org>
sci-libs/avogadrolibs/Manifest | 2 -
.../avogadrolibs-1.91.0_pre20180415.ebuild | 86 -------------
.../files/avogadrolibs-0.7.2-6464.patch | 16 ---
...olibs-1.91.0_pre20180406-unbundle-jsoncpp.patch | 143 ---------------------
...gadrolibs-1.91.0_pre20180406-underlinking.patch | 18 ---
...avogadrolibs-1.91.0_pre20180415-qt-5.11b3.patch | 93 --------------
sci-libs/avogadrolibs/metadata.xml | 1 -
7 files changed, 359 deletions(-)
diff --git a/sci-libs/avogadrolibs/Manifest b/sci-libs/avogadrolibs/Manifest
index e7bc6b930bc..9de9f0dac5a 100644
--- a/sci-libs/avogadrolibs/Manifest
+++ b/sci-libs/avogadrolibs/Manifest
@@ -1,4 +1,2 @@
-DIST avogadrolibs-1.91.0_pre20180415.tar.gz 2541101 BLAKE2B 526d2135af123d31220c8dd87351a35464e3dfd6b8d411d6dc9a6b3e74693090adfa3b61198a6a296eac99e6bbd67623f7aeda6a1752a09e3e3bcaa3df4d5008 SHA512 1cc646368f70523fcf20c6cf598025234162e0c81da64a3b5375c1691a6743f2aceb1f13230937bf9da045e725a23c1c89c8121e07b31ef9e2c7987b1feafccc
DIST avogadrolibs-1.93.0.tar.gz 2735862 BLAKE2B b5d696f23aeeab27358ee390a30b2cf146e7119185a0d2e8d71b34d2744e534cd8b50b36d12928b5aa723118db470272b6428514593d64770d172c4bde730cf6 SHA512 1af220e5614cbd96656679c2879cb7f7c46acd135b4e6f2e5f8d0ba98601ce004e78f019a0a71c643f005451309bd194eb73eb9f66707685e5855b47e95f7eae
-DIST linux64-genXrdPattern 7480152 BLAKE2B dca8285c41aadfaa20c72f337e0f02db8ee07ce30c11ae84bf3aa7bd0b2220273d33f484d63f761d41a8946c6a0b77a0fb27906c480bcae01ae49b1531ae5cbb SHA512 538bde12e1e52600a21640d5907f43fcc853c6f3c111880f39eb238093e3d1358ccdfa1f45e944ec8b8e5ee3c2dff269cefe5334db5d73300e6ca327c95520b8
DIST linux64-genXrdPattern-avogadrolibs-1.93.0 7480152 BLAKE2B dca8285c41aadfaa20c72f337e0f02db8ee07ce30c11ae84bf3aa7bd0b2220273d33f484d63f761d41a8946c6a0b77a0fb27906c480bcae01ae49b1531ae5cbb SHA512 538bde12e1e52600a21640d5907f43fcc853c6f3c111880f39eb238093e3d1358ccdfa1f45e944ec8b8e5ee3c2dff269cefe5334db5d73300e6ca327c95520b8
diff --git a/sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180415.ebuild b/sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180415.ebuild
deleted file mode 100644
index f27d9ea8207..00000000000
--- a/sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180415.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-COMMIT=606debb5d7c2c4020478264c609f895584fc5e38
-inherit cmake-utils
-
-DESCRIPTION="Advanced molecule editor and visualizer 2 - libraries"
-HOMEPAGE="https://www.openchemistry.org/"
-SRC_URI="https://github.com/OpenChemistry/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz
- vtk? ( https://github.com/psavery/genXrdPattern/releases/download/1.0-static/linux64-genXrdPattern )"
-
-SLOT="0"
-LICENSE="BSD GPL-2+"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="archive doc hdf5 qt5 static-plugins test vtk"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="vtk? ( qt5 )"
-
-# TODO: Not yet packaged:
-# sci-libs/libmsym (https://github.com/mcodev31/libmsym)
-# sci-libs/spglib (https://atztogo.github.io/spglib/)
-RDEPEND="
- dev-libs/jsoncpp:=
- >=sci-chemistry/molequeue-0.7
- archive? ( app-arch/libarchive )
- hdf5? ( sci-libs/hdf5:= )
- qt5? (
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtwidgets:5
- media-libs/glew:0=
- virtual/opengl
- )
- vtk? ( sci-libs/vtk[qt5,views] )
-"
-DEPEND="${RDEPEND}
- dev-cpp/eigen:3
- qt5? ( dev-qt/linguist-tools:5 )
- test? ( dev-cpp/gtest )"
-
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.7.2-6464.patch
- "${FILESDIR}/"${PN}-1.91.0_pre20180406-underlinking.patch
- "${FILESDIR}/"${PN}-1.91.0_pre20180406-unbundle-jsoncpp.patch
- "${FILESDIR}/"${PN}-1.91.0_pre20180406-bundled-genxrdpattern.patch
- "${FILESDIR}/"${P}-qt-5.11b3.patch
-)
-
-src_unpack() {
- unpack ${P}.tar.gz
- if use vtk; then
- cp "${DISTDIR}"/linux64-genXrdPattern "${WORKDIR}/genXrdPattern" || die
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- -DUSE_PROTOCALL=OFF
- -DBUILD_GPL_PLUGINS=ON
- -DUSE_MOLEQUEUE=ON
- -DUSE_LIBMSYM=OFF
- -DUSE_LIBSPG=OFF
- -DUSE_PYTHON=OFF
- -DUSE_LIBARCHIVE=$(usex archive)
- -DBUILD_DOCUMENTATION=$(usex doc)
- -DUSE_HDF5=$(usex hdf5)
- -DENABLE_TRANSLATIONS=$(usex qt5)
- -DUSE_OPENGL=$(usex qt5)
- -DUSE_QT=$(usex qt5)
- -DBUILD_STATIC_PLUGINS=$(usex static-plugins)
- -DENABLE_TESTING=$(usex test)
- -DUSE_VTK=$(usex vtk)
- )
- use vtk && mycmakeargs+=(
- -DBUNDLED_GENXRDPATTERN="${WORKDIR}/genXrdPattern"
- )
-
- cmake-utils_src_configure
-}
diff --git a/sci-libs/avogadrolibs/files/avogadrolibs-0.7.2-6464.patch b/sci-libs/avogadrolibs/files/avogadrolibs-0.7.2-6464.patch
deleted file mode 100644
index f763c242cc4..00000000000
--- a/sci-libs/avogadrolibs/files/avogadrolibs-0.7.2-6464.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- cmake/AvogadroLibsConfig.cmake.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cmake/AvogadroLibsConfig.cmake.in b/cmake/AvogadroLibsConfig.cmake.in
-index ad57195..8a63400 100644
---- a/cmake/AvogadroLibsConfig.cmake.in
-+++ b/cmake/AvogadroLibsConfig.cmake.in
-@@ -10,7 +10,7 @@ set(AvogadroLibs_VERSION "${AvogadroLibs_VERSION_MAJOR}.${AvogadroLibs_V
-
- set(AvogadroLibs_INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@")
- set(AvogadroLibs_INCLUDE_DIRS "${AvogadroLibs_INSTALL_PREFIX}/@INSTALL_INCLUDE_DIR@")
--set(AvogadroLibs_LIBRARY_DIR "${AvogadroLibs_INSTALL_PREFIX}/@INSTALL_LIBRARY_DIR@@LIB_SUFFIX@")
-+set(AvogadroLibs_LIBRARY_DIR "${AvogadroLibs_INSTALL_PREFIX}/@INSTALL_LIBRARY_DIR@")
- set(AvogadroLibs_RUNTIME_DIR "${AvogadroLibs_INSTALL_PREFIX}/@INSTALL_RUNTIME_DIR@")
- set(AvogadroLibs_CMAKE_DIR "${AvogadroLibs_LIBRARY_DIR}/cmake/avogadrolibs")
-
diff --git a/sci-libs/avogadrolibs/files/avogadrolibs-1.91.0_pre20180406-unbundle-jsoncpp.patch b/sci-libs/avogadrolibs/files/avogadrolibs-1.91.0_pre20180406-unbundle-jsoncpp.patch
deleted file mode 100644
index 3b5280cdc47..00000000000
--- a/sci-libs/avogadrolibs/files/avogadrolibs-1.91.0_pre20180406-unbundle-jsoncpp.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-From 7e01a11dde25af75b21090fdaa2ca574ef703e53 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sun, 8 Apr 2018 01:48:27 +0200
-Subject: [PATCH 1/2] Drop bogus jsoncpp.cpp include from spectra.cpp
-
----
- avogadro/qtplugins/spectra/spectra.cpp | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/avogadro/qtplugins/spectra/spectra.cpp b/avogadro/qtplugins/spectra/spectra.cpp
-index 043b52e..aa9c641 100644
---- a/avogadro/qtplugins/spectra/spectra.cpp
-+++ b/avogadro/qtplugins/spectra/spectra.cpp
-@@ -26,8 +26,6 @@
- #include <QtWidgets/QFileDialog>
- #include <avogadro/qtgui/molecule.h>
-
--#include <jsoncpp.cpp>
--
- namespace Avogadro {
- namespace QtPlugins {
-
---
-2.17.0
-
-
-From 52cd35662aa2094db77ab4002b7c44f3dab2802d Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sun, 8 Apr 2018 02:00:30 +0200
-Subject: [PATCH 2/2] Use pkgconfig to find system-jsoncpp
-
----
- CMakeLists.txt | 5 ++++-
- avogadro/io/CMakeLists.txt | 4 ++--
- avogadro/qtplugins/importpqr/CMakeLists.txt | 4 ++--
- avogadro/qtplugins/plugindownloader/CMakeLists.txt | 4 ++--
- avogadro/qtplugins/spectra/CMakeLists.txt | 2 +-
- avogadro/quantumio/CMakeLists.txt | 4 ++--
- 6 files changed, 13 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7574fa0..7ce80b0 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -52,8 +52,11 @@ option(USE_PROTOCALL "Enable libraries that use ProtoCall" OFF)
- option(USE_MOLEQUEUE "Enable the MoleQueue dependent functionality" ON)
- option(USE_PYTHON "Use Python to wrap some of our API" OFF)
-
-+find_package(PkgConfig REQUIRED)
-+pkg_check_modules(JSONCPP jsoncpp)
-+
- add_subdirectory(utilities)
--add_subdirectory(thirdparty)
-+# add_subdirectory(thirdparty)
- add_subdirectory(avogadro)
-
- if(ENABLE_TESTING)
-diff --git a/avogadro/io/CMakeLists.txt b/avogadro/io/CMakeLists.txt
-index 1dd7967..10ddbb6 100644
---- a/avogadro/io/CMakeLists.txt
-+++ b/avogadro/io/CMakeLists.txt
-@@ -15,7 +15,7 @@ endif()
- # compilers that support that notion.
- include_directories(SYSTEM "${EIGEN3_INCLUDE_DIR}"
- "${AvogadroLibs_SOURCE_DIR}/thirdparty/pugixml"
-- "${AvogadroLibs_SOURCE_DIR}/thirdparty/jsoncpp")
-+ "${JSONCPP_INCLUDE_DIRS}")
-
- if(DEFINED AvogadroLibs_MEMORY_INCLUDE_DIRS)
- # The smart pointer classes just require headers.
-@@ -51,7 +51,7 @@ endif()
-
- avogadro_add_library(AvogadroIO ${HEADERS} ${SOURCES})
-
--target_link_libraries(AvogadroIO LINK_PUBLIC AvogadroCore LINK_PRIVATE jsoncpp)
-+target_link_libraries(AvogadroIO LINK_PUBLIC AvogadroCore LINK_PRIVATE ${JSONCPP_LIBRARIES})
- if(USE_HDF5)
- target_link_libraries(AvogadroIO LINK_PRIVATE ${HDF5_LIBRARIES})
- endif()
-diff --git a/avogadro/qtplugins/importpqr/CMakeLists.txt b/avogadro/qtplugins/importpqr/CMakeLists.txt
-index ee27da9..365c51a 100644
---- a/avogadro/qtplugins/importpqr/CMakeLists.txt
-+++ b/avogadro/qtplugins/importpqr/CMakeLists.txt
-@@ -1,4 +1,4 @@
--include_directories(SYSTEM "${AvogadroLibs_SOURCE_DIR}/thirdparty/jsoncpp")
-+include_directories(SYSTEM ${JSONCPP_INCLUDE_DIRS})
-
- # Extension
- set(importpqr_srcs
-@@ -17,4 +17,4 @@ avogadro_plugin(ImportPQR
- ""
- )
-
--target_link_libraries(ImportPQR LINK_PRIVATE ${Qt5Network_LIBRARIES} jsoncpp)
-+target_link_libraries(ImportPQR LINK_PRIVATE ${Qt5Network_LIBRARIES} ${JSONCPP_LIBRARIES})
-diff --git a/avogadro/qtplugins/plugindownloader/CMakeLists.txt b/avogadro/qtplugins/plugindownloader/CMakeLists.txt
-index 4b07a53..ab4c661 100644
---- a/avogadro/qtplugins/plugindownloader/CMakeLists.txt
-+++ b/avogadro/qtplugins/plugindownloader/CMakeLists.txt
-@@ -1,4 +1,4 @@
--include_directories(SYSTEM "${AvogadroLibs_SOURCE_DIR}/thirdparty/jsoncpp")
-+include_directories(SYSTEM ${JSONCPP_INCLUDE_DIRS})
-
- find_package(LibArchive REQUIRED)
- include_directories(SYSTEM ${LIBARCHIVE_INCLUDE_DIRS})
-@@ -20,4 +20,4 @@ avogadro_plugin(PluginDownloader
- )
-
- target_link_libraries(PluginDownloader LINK_PRIVATE ${Qt5Network_LIBRARIES}
-- ${LIBARCHIVE_LIBRARIES} jsoncpp)
-+ ${LIBARCHIVE_LIBRARIES} ${JSONCPP_LIBRARIES})
-diff --git a/avogadro/qtplugins/spectra/CMakeLists.txt b/avogadro/qtplugins/spectra/CMakeLists.txt
-index a2216b8..09d8fc9 100644
---- a/avogadro/qtplugins/spectra/CMakeLists.txt
-+++ b/avogadro/qtplugins/spectra/CMakeLists.txt
-@@ -1,4 +1,4 @@
--include_directories(SYSTEM "${AvogadroLibs_SOURCE_DIR}/thirdparty/jsoncpp")
-+include_directories(SYSTEM ${JSONCPP_INCLUDE_DIRS})
-
- set(plugin_srcs
- vibrationdialog.cpp
-diff --git a/avogadro/quantumio/CMakeLists.txt b/avogadro/quantumio/CMakeLists.txt
-index 15073e8..35fc766 100644
---- a/avogadro/quantumio/CMakeLists.txt
-+++ b/avogadro/quantumio/CMakeLists.txt
-@@ -2,7 +2,7 @@ find_package(Eigen3 REQUIRED)
- # Add as "system headers" to avoid warnings generated by them with
- # compilers that support that notion.
- include_directories(SYSTEM "${EIGEN3_INCLUDE_DIR}"
-- "${AvogadroLibs_SOURCE_DIR}/thirdparty/jsoncpp")
-+ ${JSONCPP_INCLUDE_DIRS})
-
- include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
-@@ -30,4 +30,4 @@ set(SOURCES
- )
-
- avogadro_add_library(AvogadroQuantumIO ${HEADERS} ${SOURCES})
--target_link_libraries(AvogadroQuantumIO LINK_PUBLIC AvogadroIO LINK_PRIVATE jsoncpp)
-+target_link_libraries(AvogadroQuantumIO LINK_PUBLIC AvogadroIO LINK_PRIVATE ${JSONCPP_LIBRARIES})
---
-2.17.0
-
diff --git a/sci-libs/avogadrolibs/files/avogadrolibs-1.91.0_pre20180406-underlinking.patch b/sci-libs/avogadrolibs/files/avogadrolibs-1.91.0_pre20180406-underlinking.patch
deleted file mode 100644
index f6f39c9e6b7..00000000000
--- a/sci-libs/avogadrolibs/files/avogadrolibs-1.91.0_pre20180406-underlinking.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Fix underlinking problems in shared libraries.
-
---- a/avogadro/qtplugins/playertool/CMakeLists.txt
-+++ b/avogadro/qtplugins/playertool/CMakeLists.txt
-@@ -7,3 +7,5 @@
- ""
- playertool.qrc
- )
-+
-+target_link_libraries(PlayerTool LINK_PRIVATE Qt5OpenGL)
---- a/avogadro/qtplugins/qtaim/CMakeLists.txt
-+++ b/avogadro/qtplugins/qtaim/CMakeLists.txt
-@@ -34,3 +34,5 @@
-
- target_link_libraries(QTAIMScenePlugin
- LINK_PRIVATE AvogadroRendering ${Qt5Concurrent_LIBRARIES})
-+target_link_libraries(QTAIMExtension
-+ LINK_PRIVATE ${Qt5Concurrent_LIBRARIES})
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
deleted file mode 100644
index 11816e438c2..00000000000
--- a/sci-libs/avogadrolibs/files/avogadrolibs-1.91.0_pre20180415-qt-5.11b3.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From 03dd55beb878b5e15d891535a3c8b7ffa6133c92 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Tue, 17 Apr 2018 11:31:22 +0200
-Subject: [PATCH] Fix build with Qt 5.11_beta3 (dropping qt5_use_modules)
-
----
- avogadro/molequeue/CMakeLists.txt | 3 +--
- avogadro/qtgui/CMakeLists.txt | 3 +--
- avogadro/qtopengl/CMakeLists.txt | 3 +--
- avogadro/vtk/CMakeLists.txt | 3 +--
- tests/qtgui/CMakeLists.txt | 3 +--
- 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
---- a/avogadro/molequeue/CMakeLists.txt
-+++ b/avogadro/molequeue/CMakeLists.txt
-@@ -41,6 +41,5 @@ qt5_wrap_ui(UI_SOURCES ${UIS})
- list(APPEND SOURCES ${UI_SOURCES})
-
- avogadro_add_library(AvogadroMoleQueue ${HEADERS} ${SOURCES})
--qt5_use_modules(AvogadroMoleQueue Widgets Network)
- set_target_properties(AvogadroMoleQueue PROPERTIES AUTOMOC TRUE)
--target_link_libraries(AvogadroMoleQueue AvogadroQtGui MoleQueueClient)
-+target_link_libraries(AvogadroMoleQueue AvogadroQtGui MoleQueueClient Qt5::Widgets Qt5::Network)
-diff --git a/avogadro/qtgui/CMakeLists.txt b/avogadro/qtgui/CMakeLists.txt
-index e6cf8d3..3365261 100644
---- a/avogadro/qtgui/CMakeLists.txt
-+++ b/avogadro/qtgui/CMakeLists.txt
-@@ -99,5 +99,4 @@ qt5_add_resources(RC_SOURCES ${RCS})
- list(APPEND SOURCES ${RC_SOURCES})
-
- avogadro_add_library(AvogadroQtGui ${HEADERS} ${SOURCES})
--qt5_use_modules(AvogadroQtGui Widgets)
--target_link_libraries(AvogadroQtGui AvogadroIO)
-+target_link_libraries(AvogadroQtGui AvogadroIO Qt5::Widgets)
-diff --git a/avogadro/qtopengl/CMakeLists.txt b/avogadro/qtopengl/CMakeLists.txt
-index 354638c..28a473e 100644
---- a/avogadro/qtopengl/CMakeLists.txt
-+++ b/avogadro/qtopengl/CMakeLists.txt
-@@ -16,5 +16,4 @@ set(SOURCES
- )
-
- avogadro_add_library(AvogadroQtOpenGL ${HEADERS} ${SOURCES})
--qt5_use_modules(AvogadroQtOpenGL Widgets)
--target_link_libraries(AvogadroQtOpenGL AvogadroRendering AvogadroQtGui)
-+target_link_libraries(AvogadroQtOpenGL AvogadroRendering AvogadroQtGui Qt5::Widgets)
-diff --git a/avogadro/vtk/CMakeLists.txt b/avogadro/vtk/CMakeLists.txt
-index abac5a1..498529c 100644
---- a/avogadro/vtk/CMakeLists.txt
-+++ b/avogadro/vtk/CMakeLists.txt
-@@ -30,8 +30,7 @@ set(SOURCES
- )
-
- avogadro_add_library(AvogadroVtk ${HEADERS} ${SOURCES})
--qt5_use_modules(AvogadroVtk Widgets)
- set_target_properties(AvogadroVtk PROPERTIES AUTOMOC TRUE)
- target_link_libraries(AvogadroVtk AvogadroRendering AvogadroQtGui
- vtkRenderingOpenGL2 vtkGUISupportQt vtkRenderingVolumeOpenGL2
-- vtkRenderingFreeType vtkInteractionStyle)
-+ vtkRenderingFreeType vtkInteractionStyle Qt5::Widgets)
-diff --git a/tests/qtgui/CMakeLists.txt b/tests/qtgui/CMakeLists.txt
-index 1cfd51a..da08078 100644
---- a/tests/qtgui/CMakeLists.txt
-+++ b/tests/qtgui/CMakeLists.txt
-@@ -49,9 +49,8 @@ endforeach()
-
- # Add a single executable for all of our tests.
- add_executable(AvogadroQtGuiTests ${testSrcs})
--qt5_use_modules(AvogadroQtGuiTests Widgets Test)
- target_link_libraries(AvogadroQtGuiTests AvogadroQtGui AvogadroMoleQueue
-- MoleQueueClient ${GTEST_BOTH_LIBRARIES} ${EXTRA_LINK_LIB})
-+ MoleQueueClient ${GTEST_BOTH_LIBRARIES} ${EXTRA_LINK_LIB} Qt5::Widgets Qt5::Test)
-
- # 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..60fc5ae 100644
---- a/tests/qtopengl/CMakeLists.txt
-+++ b/tests/qtopengl/CMakeLists.txt
-@@ -44,8 +44,6 @@ create_test_sourcelist(testDriver qtopengltests.cpp ${testSrcs})
-
- add_executable(AvogadroQtOpenGLTests ${testDriver})
-
--qt5_use_modules(AvogadroQtOpenGLTests OpenGL)
--
- target_link_libraries(AvogadroQtOpenGLTests
- AvogadroQtOpenGL
- vtkImagingCore
---
-2.17.0
-
diff --git a/sci-libs/avogadrolibs/metadata.xml b/sci-libs/avogadrolibs/metadata.xml
index ff1789dfa77..8e2ba3ed664 100644
--- a/sci-libs/avogadrolibs/metadata.xml
+++ b/sci-libs/avogadrolibs/metadata.xml
@@ -7,7 +7,6 @@
</maintainer>
<use>
<flag name="archive">Enable archive support using <pkg>app-arch/libarchive</pkg></flag>
- <flag name="static-plugins">Build all plugins statically into main plugin modules</flag>
<flag name="vtk">Enable <pkg>sci-libs/vtk</pkg> support</flag>
</use>
<upstream>
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/avogadrolibs/, sci-libs/avogadrolibs/files/
@ 2022-09-07 9:55 Andrew Ammerlaan
0 siblings, 0 replies; 7+ messages in thread
From: Andrew Ammerlaan @ 2022-09-07 9:55 UTC (permalink / raw
To: gentoo-commits
commit: 99722c1e15796d7b5b60d59a43b1bc73f0657eea
Author: Aritz Erkiaga <aerkiaga3 <AT> gmail <DOT> com>
AuthorDate: Sat Sep 3 15:57:03 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed Sep 7 09:54:55 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99722c1e
Backport critical fixes to sci-libs/avogadrolibs
Signed-off-by: Aritz Erkiaga <aerkiaga3 <AT> gmail.com>
Closes: https://bugs.gentoo.org/868132
Closes: https://github.com/gentoo/gentoo/pull/27128
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
...1.95.1.ebuild => avogadrolibs-1.95.1-r1.ebuild} | 1 +
.../avogadrolibs-1.95.1-usability_backport.patch | 81 ++++++++++++++++++++++
2 files changed, 82 insertions(+)
diff --git a/sci-libs/avogadrolibs/avogadrolibs-1.95.1.ebuild b/sci-libs/avogadrolibs/avogadrolibs-1.95.1-r1.ebuild
similarity index 97%
rename from sci-libs/avogadrolibs/avogadrolibs-1.95.1.ebuild
rename to sci-libs/avogadrolibs/avogadrolibs-1.95.1-r1.ebuild
index 2a3a1c7cdb9b..ea0659f222d9 100644
--- a/sci-libs/avogadrolibs/avogadrolibs-1.95.1.ebuild
+++ b/sci-libs/avogadrolibs/avogadrolibs-1.95.1-r1.ebuild
@@ -47,6 +47,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}/"${PN}-1.91.0_pre20180406-bundled-genxrdpattern.patch
"${FILESDIR}/"${PN}-1.95.1-tests.patch
+ "${FILESDIR}/"${PN}-1.95.1-usability_backport.patch
)
src_unpack() {
diff --git a/sci-libs/avogadrolibs/files/avogadrolibs-1.95.1-usability_backport.patch b/sci-libs/avogadrolibs/files/avogadrolibs-1.95.1-usability_backport.patch
new file mode 100644
index 000000000000..07a32023600e
--- /dev/null
+++ b/sci-libs/avogadrolibs/files/avogadrolibs-1.95.1-usability_backport.patch
@@ -0,0 +1,81 @@
+From 56c67fff7dd7ec84b2f2b5c2e5beaec13981e408 Mon Sep 17 00:00:00 2001
+From: Aritz Erkiaga <aerkiaga3@gmail.com>
+Date: Sat, 3 Sep 2022 16:54:55 +0200
+Subject: [PATCH 1/3] Fix erratic editing behavior
+
+Signed-off-by: Aritz Erkiaga <aerkiaga3@gmail.com>
+---
+ avogadro/qtgui/rwmolecule_undo.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/avogadro/qtgui/rwmolecule_undo.h b/avogadro/qtgui/rwmolecule_undo.h
+index de5bdd33..20768066 100644
+--- a/avogadro/qtgui/rwmolecule_undo.h
++++ b/avogadro/qtgui/rwmolecule_undo.h
+@@ -89,7 +89,7 @@ public:
+ {
+ assert(m_molecule.atomCount() == m_atomId);
+ if (m_usingPositions)
+- m_molecule.addAtom(m_atomicNumber, Vector3::Zero(), m_atomId);
++ m_molecule.addAtom(m_atomicNumber, Vector3::Zero(), m_atomUid);
+ else
+ m_molecule.addAtom(m_atomicNumber, m_atomUid);
+ m_molecule.layer().addAtom(m_layer, m_atomId);
+--
+2.34.1
+
+
+From 5159ea1a9629ad82130670767cc25c5065f9627c Mon Sep 17 00:00:00 2001
+From: Aritz Erkiaga <aerkiaga3@gmail.com>
+Date: Sat, 3 Sep 2022 16:55:26 +0200
+Subject: [PATCH 2/3] Fix Manipulator Tool not working at all
+
+Signed-off-by: Aritz Erkiaga <aerkiaga3@gmail.com>
+---
+ avogadro/qtplugins/manipulator/manipulator.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/avogadro/qtplugins/manipulator/manipulator.cpp b/avogadro/qtplugins/manipulator/manipulator.cpp
+index 19dc51ac..29559dd0 100644
+--- a/avogadro/qtplugins/manipulator/manipulator.cpp
++++ b/avogadro/qtplugins/manipulator/manipulator.cpp
+@@ -129,7 +129,7 @@ QUndoCommand* Manipulator::mouseMoveEvent(QMouseEvent* e)
+ Vector2f windowPos(e->localPos().x(), e->localPos().y());
+
+ if (mol->isSelectionEmpty() && m_object.type == Rendering::AtomType &&
+- m_object.molecule == mol) {
++ m_object.molecule == &m_molecule->molecule()) {
+ // translate single atom position
+ RWAtom atom = m_molecule->atom(m_object.index);
+ Vector3f oldPos(atom.position3d().cast<float>());
+--
+2.34.1
+
+
+From f38bfbc88f0722a66ab298ff26073874b5f73634 Mon Sep 17 00:00:00 2001
+From: Aritz Erkiaga <aerkiaga3@gmail.com>
+Date: Sat, 3 Sep 2022 16:55:59 +0200
+Subject: [PATCH 3/3] Fix Bond Centric Tool not working at all
+
+Signed-off-by: Aritz Erkiaga <aerkiaga3@gmail.com>
+---
+ avogadro/qtplugins/bondcentrictool/bondcentrictool.cpp | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/avogadro/qtplugins/bondcentrictool/bondcentrictool.cpp b/avogadro/qtplugins/bondcentrictool/bondcentrictool.cpp
+index 79112899..3a853057 100644
+--- a/avogadro/qtplugins/bondcentrictool/bondcentrictool.cpp
++++ b/avogadro/qtplugins/bondcentrictool/bondcentrictool.cpp
+@@ -342,8 +342,7 @@ QUndoCommand* BondCentricTool::mousePressEvent(QMouseEvent* e)
+ Rendering::Identifier ident = m_renderer->hit(e->pos().x(), e->pos().y());
+
+ // If no hits, return. Also ensure that the hit molecule is the one we expect.
+- const Core::Molecule* mol = &m_molecule->molecule();
+- if (!ident.isValid() || ident.molecule != mol)
++ if (!ident.isValid() || ident.molecule != &m_molecule->molecule())
+ return nullptr;
+
+ // If the hit is a left click on a bond, make it the selected bond and map
+--
+2.34.1
+
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/avogadrolibs/, sci-libs/avogadrolibs/files/
@ 2024-11-25 15:32 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2024-11-25 15:32 UTC (permalink / raw
To: gentoo-commits
commit: be58a2e3da86e00b7b6f7b665e4ce41c91069613
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 24 19:04:14 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Nov 25 15:29:59 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be58a2e3
sci-libs/avogadrolibs: drop 1.95.1-r1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-libs/avogadrolibs/Manifest | 2 -
.../avogadrolibs/avogadrolibs-1.95.1-r1.ebuild | 94 ----------------------
.../avogadrolibs-1.95.1-usability_backport.patch | 81 -------------------
3 files changed, 177 deletions(-)
diff --git a/sci-libs/avogadrolibs/Manifest b/sci-libs/avogadrolibs/Manifest
index 5f4bfd4d93d3..af9a44e3a35f 100644
--- a/sci-libs/avogadrolibs/Manifest
+++ b/sci-libs/avogadrolibs/Manifest
@@ -1,6 +1,4 @@
-DIST avogadrolibs-1.95.1.tar.gz 11015910 BLAKE2B 27cb43a22e489c0279e1ed912b1e81f3c850983f367ffb89bef3a63d11204cbf761f2bce6501988ed5ef9b21b44cc5194dad4367da3ae6af65efd0cec5e7d711 SHA512 b4734c732b1686eba74055c4834fef2f9fb66d4a67cd1199c84e81965c3f6e783911e7c7c8d09386c4ff9f1322bab91fe490d3606784ae49acf5531a65a58beb
DIST avogadrolibs-1.97.0.tar.gz 11456702 BLAKE2B 2f9229a0525dc151ef636c4c101ea21d3713efb033f6a007c43689bfd078b07081d695bb3ec32715c3ccf9d67e7bb85a617a08eeb0e6fc8c80e479a3cb3f1553 SHA512 a0ad3ba294db5f0fff35087ff0f616fdcaefc7b4abfa470c9fd26326ad14f73e3584c18a7111b671998d8a23a50091307520f01f79295fc7ea52ae2d78716c7e
DIST avogadrolibs-crystals-1.0.1.tar.gz 151829 BLAKE2B 0a1353392a4c087977452f50ffb7db0b2976a2993651b6f7e0df7a9ce6fa8f7960223cac2916dd9f667d37518b85606d73d05e86f7489193a6a609700fc60223 SHA512 c5d6500d8472807b8d2e62888e4a09279c6aeafec81bc4981edaa74e36724b1e7f0381250c79ad297f9f0331bcb5cd8a45fce3f13ad65b9870e901a6424c0650
DIST avogadrolibs-molecules-1.0.0.tar.gz 206924 BLAKE2B 70eea3d5eb440ab2c7f29c56111f2b8cf780cc84983aa145bc4f2fe144c981978218333ba3c33cf1f620dd3180cca706dfa4e94ffaee6167f89bd3e372172218 SHA512 06891ea7ad3e65c5b0c0ad73ea01916478fcd13fd9ff0d6905d28159678a50371ba9fa2c1f68ef32604dee0c2165de29bd5d50ffbc345bfe752ef0bcb13126f2
-DIST linux64-genXrdPattern-avogadrolibs-1.95.1 7480152 BLAKE2B dca8285c41aadfaa20c72f337e0f02db8ee07ce30c11ae84bf3aa7bd0b2220273d33f484d63f761d41a8946c6a0b77a0fb27906c480bcae01ae49b1531ae5cbb SHA512 538bde12e1e52600a21640d5907f43fcc853c6f3c111880f39eb238093e3d1358ccdfa1f45e944ec8b8e5ee3c2dff269cefe5334db5d73300e6ca327c95520b8
DIST linux64-genXrdPattern-avogadrolibs-1.97.0 7480152 BLAKE2B dca8285c41aadfaa20c72f337e0f02db8ee07ce30c11ae84bf3aa7bd0b2220273d33f484d63f761d41a8946c6a0b77a0fb27906c480bcae01ae49b1531ae5cbb SHA512 538bde12e1e52600a21640d5907f43fcc853c6f3c111880f39eb238093e3d1358ccdfa1f45e944ec8b8e5ee3c2dff269cefe5334db5d73300e6ca327c95520b8
diff --git a/sci-libs/avogadrolibs/avogadrolibs-1.95.1-r1.ebuild b/sci-libs/avogadrolibs/avogadrolibs-1.95.1-r1.ebuild
deleted file mode 100644
index 330bb74633f7..000000000000
--- a/sci-libs/avogadrolibs/avogadrolibs-1.95.1-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Advanced molecule editor and visualizer 2 - libraries"
-HOMEPAGE="https://www.openchemistry.org/ https://github.com/OpenChemistry/avogadrolibs"
-SRC_URI="
- https://github.com/OpenChemistry/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
- https://github.com/OpenChemistry/molecules/archive/refs/tags/1.0.0.tar.gz -> ${PN}-molecules-1.0.0.tar.gz
- https://github.com/OpenChemistry/crystals/archive/refs/tags/1.0.1.tar.gz -> ${PN}-crystals-1.0.1.tar.gz
- vtk? ( https://github.com/psavery/genXrdPattern/releases/download/1.0-static/linux64-genXrdPattern -> linux64-genXrdPattern-${P} )"
-
-LICENSE="BSD GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="archive doc hdf5 qt5 test vtk"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="vtk? ( qt5 )"
-
-# TODO: Not yet packaged:
-# sci-libs/libmsym (https://github.com/mcodev31/libmsym)
-RDEPEND="
- >=sci-chemistry/molequeue-0.7
- archive? ( app-arch/libarchive:= )
- hdf5? ( sci-libs/hdf5:= )
- qt5? (
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5
- media-libs/glew:0=
- virtual/opengl
- )
- vtk? ( sci-libs/vtk[qt5,views] )"
-DEPEND="${RDEPEND}
- dev-cpp/eigen:3
- test? ( dev-cpp/gtest )"
-BDEPEND="
- doc? ( app-text/doxygen )
- qt5? ( dev-qt/linguist-tools:5 )"
-
-PATCHES=(
- "${FILESDIR}/"${PN}-1.91.0_pre20180406-bundled-genxrdpattern.patch
- "${FILESDIR}/"${PN}-1.95.1-tests.patch
- "${FILESDIR}/"${PN}-1.95.1-usability_backport.patch
-)
-
-src_unpack() {
- default
-
- if use vtk; then
- cp "${DISTDIR}"/linux64-genXrdPattern-${P} "${WORKDIR}/genXrdPattern" || die
- fi
-
- # hardcoded assumptions in
- # avogadro/qtplugins/insertfragment/CMakeLists.txt
- mv crystals-1.0.1 crystals || die
- mv molecules-1.0.0 molecules || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -DUSE_LIBARCHIVE=$(usex archive)
- -DBUILD_DOCUMENTATION=$(usex doc)
- -DUSE_HDF5=$(usex hdf5)
- -DENABLE_TRANSLATIONS=$(usex qt5)
- -DUSE_OPENGL=$(usex qt5)
- -DUSE_QT=$(usex qt5)
- -DENABLE_TESTING=$(usex test)
- -DUSE_VTK=$(usex vtk)
- # disabled libraries
- -DUSE_PYTHON=OFF
- -DUSE_PROTOCALL=OFF
- -DUSE_MMTF=OFF
- -DUSE_LIBMSYM=OFF
- # find_package(Spglib) completely broken
- -DUSE_SPGLIB=OFF
- )
- use qt5 && mycmakeargs+=(
- -DBUILD_GPL_PLUGINS=ON
- -DBUILD_STATIC_PLUGINS=ON
- -DOpenGL_GL_PREFERENCE=GLVND
- )
- use vtk && mycmakeargs+=(
- -DBUNDLED_GENXRDPATTERN="${WORKDIR}/genXrdPattern"
- )
-
- cmake_src_configure
-}
diff --git a/sci-libs/avogadrolibs/files/avogadrolibs-1.95.1-usability_backport.patch b/sci-libs/avogadrolibs/files/avogadrolibs-1.95.1-usability_backport.patch
deleted file mode 100644
index 07a32023600e..000000000000
--- a/sci-libs/avogadrolibs/files/avogadrolibs-1.95.1-usability_backport.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 56c67fff7dd7ec84b2f2b5c2e5beaec13981e408 Mon Sep 17 00:00:00 2001
-From: Aritz Erkiaga <aerkiaga3@gmail.com>
-Date: Sat, 3 Sep 2022 16:54:55 +0200
-Subject: [PATCH 1/3] Fix erratic editing behavior
-
-Signed-off-by: Aritz Erkiaga <aerkiaga3@gmail.com>
----
- avogadro/qtgui/rwmolecule_undo.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/avogadro/qtgui/rwmolecule_undo.h b/avogadro/qtgui/rwmolecule_undo.h
-index de5bdd33..20768066 100644
---- a/avogadro/qtgui/rwmolecule_undo.h
-+++ b/avogadro/qtgui/rwmolecule_undo.h
-@@ -89,7 +89,7 @@ public:
- {
- assert(m_molecule.atomCount() == m_atomId);
- if (m_usingPositions)
-- m_molecule.addAtom(m_atomicNumber, Vector3::Zero(), m_atomId);
-+ m_molecule.addAtom(m_atomicNumber, Vector3::Zero(), m_atomUid);
- else
- m_molecule.addAtom(m_atomicNumber, m_atomUid);
- m_molecule.layer().addAtom(m_layer, m_atomId);
---
-2.34.1
-
-
-From 5159ea1a9629ad82130670767cc25c5065f9627c Mon Sep 17 00:00:00 2001
-From: Aritz Erkiaga <aerkiaga3@gmail.com>
-Date: Sat, 3 Sep 2022 16:55:26 +0200
-Subject: [PATCH 2/3] Fix Manipulator Tool not working at all
-
-Signed-off-by: Aritz Erkiaga <aerkiaga3@gmail.com>
----
- avogadro/qtplugins/manipulator/manipulator.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/avogadro/qtplugins/manipulator/manipulator.cpp b/avogadro/qtplugins/manipulator/manipulator.cpp
-index 19dc51ac..29559dd0 100644
---- a/avogadro/qtplugins/manipulator/manipulator.cpp
-+++ b/avogadro/qtplugins/manipulator/manipulator.cpp
-@@ -129,7 +129,7 @@ QUndoCommand* Manipulator::mouseMoveEvent(QMouseEvent* e)
- Vector2f windowPos(e->localPos().x(), e->localPos().y());
-
- if (mol->isSelectionEmpty() && m_object.type == Rendering::AtomType &&
-- m_object.molecule == mol) {
-+ m_object.molecule == &m_molecule->molecule()) {
- // translate single atom position
- RWAtom atom = m_molecule->atom(m_object.index);
- Vector3f oldPos(atom.position3d().cast<float>());
---
-2.34.1
-
-
-From f38bfbc88f0722a66ab298ff26073874b5f73634 Mon Sep 17 00:00:00 2001
-From: Aritz Erkiaga <aerkiaga3@gmail.com>
-Date: Sat, 3 Sep 2022 16:55:59 +0200
-Subject: [PATCH 3/3] Fix Bond Centric Tool not working at all
-
-Signed-off-by: Aritz Erkiaga <aerkiaga3@gmail.com>
----
- avogadro/qtplugins/bondcentrictool/bondcentrictool.cpp | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/avogadro/qtplugins/bondcentrictool/bondcentrictool.cpp b/avogadro/qtplugins/bondcentrictool/bondcentrictool.cpp
-index 79112899..3a853057 100644
---- a/avogadro/qtplugins/bondcentrictool/bondcentrictool.cpp
-+++ b/avogadro/qtplugins/bondcentrictool/bondcentrictool.cpp
-@@ -342,8 +342,7 @@ QUndoCommand* BondCentricTool::mousePressEvent(QMouseEvent* e)
- Rendering::Identifier ident = m_renderer->hit(e->pos().x(), e->pos().y());
-
- // If no hits, return. Also ensure that the hit molecule is the one we expect.
-- const Core::Molecule* mol = &m_molecule->molecule();
-- if (!ident.isValid() || ident.molecule != mol)
-+ if (!ident.isValid() || ident.molecule != &m_molecule->molecule())
- return nullptr;
-
- // If the hit is a left click on a bond, make it the selected bond and map
---
-2.34.1
-
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2024-11-25 15:32 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-04-08 9:55 [gentoo-commits] repo/gentoo:master commit in: sci-libs/avogadrolibs/, sci-libs/avogadrolibs/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2024-11-25 15:32 Andreas Sturmlechner
2022-09-07 9:55 Andrew Ammerlaan
2021-01-17 11:52 David Seifert
2018-04-17 13:30 Andreas Sturmlechner
2018-04-10 20:09 Andreas Sturmlechner
2015-12-29 10:44 Justin Lecher
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox