* [gentoo-commits] proj/kde:master commit in: kde-apps/kalzium/, kde-apps/kalzium/files/
@ 2019-01-17 11:00 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2019-01-17 11:00 UTC (permalink / raw
To: gentoo-commits
commit: 9435dc751a4bf19e97571f08fe0ae4844387fa0d
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 17 10:13:23 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jan 17 10:32:23 2019 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=9435dc75
kde-apps/kalzium: Add missing avogadro[qt5] USE, fix cmake
Package-Manager: Portage-2.3.56, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-apps/kalzium/files/kalzium-18.12.1-deps.patch | 79 +++++++++++++++++++++++
kde-apps/kalzium/kalzium-18.12.49.9999.ebuild | 6 +-
kde-apps/kalzium/kalzium-9999.ebuild | 4 +-
3 files changed, 85 insertions(+), 4 deletions(-)
diff --git a/kde-apps/kalzium/files/kalzium-18.12.1-deps.patch b/kde-apps/kalzium/files/kalzium-18.12.1-deps.patch
new file mode 100644
index 0000000000..f0a1a834bc
--- /dev/null
+++ b/kde-apps/kalzium/files/kalzium-18.12.1-deps.patch
@@ -0,0 +1,79 @@
+From dd38aba1dfbc18c8e094fce2f8b167d0e12e93fb Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Thu, 17 Jan 2019 10:45:42 +0100
+Subject: [PATCH] Qt5OpenGL is only required in optional compoundviewer
+
+Add missing search for Qt5Xml
+Add missing Qt5Widgets to compoundviewer target_link_libraries
+Remove Qt5OpenGL from libscience target_link_libraries, not used
+---
+ CMakeLists.txt | 7 ++++---
+ compoundviewer/CMakeLists.txt | 3 ++-
+ libscience/CMakeLists.txt | 2 +-
+ 3 files changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a48c9046..9c55aafe 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -42,12 +42,12 @@ configure_file(
+ include_directories(${AvogadroLibs_INCLUDE_DIRS})
+
+ find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS
+- Widgets
+- Script
+ Core
+ Gui
+- OpenGL
++ Script
+ Svg
++ Widgets
++ Xml
+ )
+
+ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
+@@ -92,6 +92,7 @@ add_definitions(-DUSING_DYNAMIC_LIBS)
+ endif(MSVC)
+
+ if (OPENBABEL2_FOUND AND AvogadroLibs_FOUND AND EIGEN3_FOUND)
++ find_package(Qt5OpenGL ${QT_MIN_VERSION} REQUIRED)
+ find_package(KF5NewStuff REQUIRED)
+ # avoid compilerwarnings about redefinitions
+ # todo: use check_function_exits() ?
+diff --git a/compoundviewer/CMakeLists.txt b/compoundviewer/CMakeLists.txt
+index d6f6f4ab..54734a02 100644
+--- a/compoundviewer/CMakeLists.txt
++++ b/compoundviewer/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ include_directories(
+ ${CMAKE_CURRENT_BINARY_DIR}/..
+ ${EIGEN3_INCLUDE_DIR}
+- ${OPENBABEL2_INCLUDE_DIR} ${OPENGL_INCLUDE_DIRS}
++ ${OPENBABEL2_INCLUDE_DIR}
+ ${AvogadroLibs_INCLUDE_DIRS}
+ ${PROJECT_SOURCE_DIR}/compoundviewer
+ )
+@@ -21,6 +21,7 @@ target_link_libraries(compoundviewer
+ KF5::CoreAddons
+ Qt5::OpenGL
+ Qt5::Gui
++ Qt5::Widgets
+ ${OPENBABEL2_LIBRARIES}
+ AvogadroQtGui
+ AvogadroQtOpenGL
+diff --git a/libscience/CMakeLists.txt b/libscience/CMakeLists.txt
+index f25e4090..4d4d6979 100644
+--- a/libscience/CMakeLists.txt
++++ b/libscience/CMakeLists.txt
+@@ -16,7 +16,7 @@ set(science_LIB_SRCS
+
+ add_library(science SHARED ${science_LIB_SRCS})
+
+-target_link_libraries(science Qt5::OpenGL Qt5::Xml KF5::UnitConversion KF5::WidgetsAddons KF5::KDELibs4Support)
++target_link_libraries(science Qt5::Xml KF5::UnitConversion KF5::WidgetsAddons KF5::KDELibs4Support)
+ set_target_properties(science PROPERTIES VERSION ${KALZIUMLIB_VERSION} SOVERSION ${KALZIUMLIB_SOVERSION} )
+ install(TARGETS science ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+--
+2.20.1
+
diff --git a/kde-apps/kalzium/kalzium-18.12.49.9999.ebuild b/kde-apps/kalzium/kalzium-18.12.49.9999.ebuild
index 8f7a77abdd..9c23c0364b 100644
--- a/kde-apps/kalzium/kalzium-18.12.49.9999.ebuild
+++ b/kde-apps/kalzium/kalzium-18.12.49.9999.ebuild
@@ -32,11 +32,11 @@ DEPEND="
$(add_qt_dep qtwidgets)
$(add_qt_dep qtxml)
editor? (
- $(add_qt_dep qtopengl)
$(add_frameworks_dep knewstuff)
+ $(add_qt_dep qtopengl)
dev-cpp/eigen:3
sci-chemistry/openbabel
- sci-libs/avogadrolibs
+ sci-libs/avogadrolibs[qt5]
)
solver? ( dev-ml/facile[ocamlopt] )
"
@@ -44,6 +44,8 @@ RDEPEND="${DEPEND}
sci-chemistry/chemical-mime-data
"
+PATCHES=( "${FILESDIR}/${PN}-18.12.1-deps.patch" )
+
src_configure(){
# Fix missing finite()
[[ ${CHOST} == *-solaris* ]] && append-cppflags -DHAVE_IEEEFP_H
diff --git a/kde-apps/kalzium/kalzium-9999.ebuild b/kde-apps/kalzium/kalzium-9999.ebuild
index 28937b357e..fed5a19256 100644
--- a/kde-apps/kalzium/kalzium-9999.ebuild
+++ b/kde-apps/kalzium/kalzium-9999.ebuild
@@ -31,11 +31,11 @@ DEPEND="
$(add_qt_dep qtwidgets)
$(add_qt_dep qtxml)
editor? (
- $(add_qt_dep qtopengl)
$(add_frameworks_dep knewstuff)
+ $(add_qt_dep qtopengl)
dev-cpp/eigen:3
sci-chemistry/openbabel
- sci-libs/avogadrolibs
+ sci-libs/avogadrolibs[qt5]
)
solver? ( dev-ml/facile[ocamlopt] )
"
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/kalzium/, kde-apps/kalzium/files/
@ 2021-04-11 22:21 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2021-04-11 22:21 UTC (permalink / raw
To: gentoo-commits
commit: 92eaab68e5a29344f52f10a77b332a08b543448f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 11 21:41:34 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 11 22:21:15 2021 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=92eaab68
kde-apps/kalzium: Add sci-chemistry/openbabel slot op
Upstream commit 2b9ebd854d85fa1e092c766e149e16ac18019496
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../kalzium/files/kalzium-21.03.90-cmake.patch | 28 ++++++++++++++++++++++
kde-apps/kalzium/kalzium-9999.ebuild | 5 +++-
2 files changed, 32 insertions(+), 1 deletion(-)
diff --git a/kde-apps/kalzium/files/kalzium-21.03.90-cmake.patch b/kde-apps/kalzium/files/kalzium-21.03.90-cmake.patch
new file mode 100644
index 0000000000..4339fbf0ce
--- /dev/null
+++ b/kde-apps/kalzium/files/kalzium-21.03.90-cmake.patch
@@ -0,0 +1,28 @@
+From 137a209512e632ccc7b297355a6b54301657c9ff Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 12 Apr 2021 00:02:48 +0200
+Subject: [PATCH] Drop brackets around OpenBabel3_FOUND
+
+It breaks when cmake is run with -DCMAKE_DISABLE_FIND_PACKAGE_OpenBabel3=ON.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index abc8120b..a370e5da 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -27,7 +27,7 @@ find_package(Gettext REQUIRED)
+ find_package(PythonInterp REQUIRED)
+ find_package(PkgConfig)
+ find_package(OpenBabel3 3.1)
+-if(NOT ${OpenBabel3_FOUND})
++if(NOT OpenBabel3_FOUND)
+ find_package(OpenBabel2)
+ endif()
+ find_package(AvogadroLibs)
+--
+2.31.1
+
diff --git a/kde-apps/kalzium/kalzium-9999.ebuild b/kde-apps/kalzium/kalzium-9999.ebuild
index 21fe0cb039..598c5eb557 100644
--- a/kde-apps/kalzium/kalzium-9999.ebuild
+++ b/kde-apps/kalzium/kalzium-9999.ebuild
@@ -39,7 +39,7 @@ DEPEND="
dev-cpp/eigen:3
>=dev-qt/qtopengl-${QTMIN}:5
>=kde-frameworks/knewstuff-${KFMIN}:5
- sci-chemistry/openbabel
+ sci-chemistry/openbabel:=
>=sci-libs/avogadrolibs-1.93[qt5]
)
solver? ( dev-ml/facile[ocamlopt] )
@@ -48,11 +48,14 @@ RDEPEND="${DEPEND}
sci-chemistry/chemical-mime-data
"
+PATCHES=( "${FILESDIR}/${PN}-21.03.90-cmake.patch" )
+
src_configure(){
# Fix missing finite()
[[ ${CHOST} == *-solaris* ]] && append-cppflags -DHAVE_IEEEFP_H
local mycmakeargs=(
+ -DCMAKE_DISABLE_FIND_PACKAGE_OpenBabel3=ON # TODO: not packaged yet
$(cmake_use_find_package editor Eigen3)
$(cmake_use_find_package editor AvogadroLibs)
$(cmake_use_find_package editor OpenBabel2)
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-04-11 22:21 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-04-11 22:21 [gentoo-commits] proj/kde:master commit in: kde-apps/kalzium/, kde-apps/kalzium/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2019-01-17 11:00 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox