* [gentoo-commits] repo/gentoo:master commit in: kde-apps/kalzium/files/, kde-apps/kalzium/
@ 2017-08-03 17:09 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2017-08-03 17:09 UTC (permalink / raw
To: gentoo-commits
commit: 014ae925f9faf8770ed787dc2246e71d61c5a509
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 3 16:59:00 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Aug 3 17:07:58 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=014ae925
kde-apps/kalzium: Fix build with dev-lang/ocaml-4.04.0
See also: https://bugs.kde.org/show_bug.cgi?id=372671
Gentoo-bug: 603050
Package-Manager: Portage-2.3.6, Repoman-2.3.1
.../kalzium/files/kalzium-17.04.3-ocaml404.patch | 29 ++++++++++++++++++++++
kde-apps/kalzium/kalzium-17.04.3.ebuild | 2 ++
2 files changed, 31 insertions(+)
diff --git a/kde-apps/kalzium/files/kalzium-17.04.3-ocaml404.patch b/kde-apps/kalzium/files/kalzium-17.04.3-ocaml404.patch
new file mode 100644
index 00000000000..b2c315702a7
--- /dev/null
+++ b/kde-apps/kalzium/files/kalzium-17.04.3-ocaml404.patch
@@ -0,0 +1,29 @@
+From 447d0ca4cc757f79ad02ca52ab5e086b78dfdfb1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jos=C3=A9=20Manuel=20Santamar=C3=ADa=20Lema?=
+ <panfaust@gmail.com>
+Date: Thu, 3 Aug 2017 18:10:53 +0200
+Subject: Fix build with ocaml 4.04
+
+BUG: 372671
+FIXED-IN: 17.08
+
+Differential Revision: https://phabricator.kde.org/D6752
+---
+ src/CMakeOCamlInstructions.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/CMakeOCamlInstructions.cmake b/src/CMakeOCamlInstructions.cmake
+index 483d003..da703b1 100644
+--- a/src/CMakeOCamlInstructions.cmake
++++ b/src/CMakeOCamlInstructions.cmake
+@@ -58,7 +58,7 @@ ocaml_ml_to_cmx(${CMAKE_CURRENT_BINARY_DIR}/lexer.cmx ${CMAKE_CURRENT_SOURCE_DIR
+ # object files
+
+ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/modwrap.o
+- COMMAND ${OCAML_OCAMLOPT_EXECUTABLE} -I ${LIBFACILE_INCLUDE_DIR} -c ${CMAKE_CURRENT_SOURCE_DIR}/solver/modwrap.c -o ${CMAKE_CURRENT_BINARY_DIR}/modwrap.o
++ COMMAND ${OCAML_OCAMLOPT_EXECUTABLE} -I ${LIBFACILE_INCLUDE_DIR} -c ${CMAKE_CURRENT_SOURCE_DIR}/solver/modwrap.c
+ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/solver/modwrap.c ${CMAKE_CURRENT_BINARY_DIR}/solver.o
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+ set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES ${CMAKE_CURRENT_BINARY_DIR}/modwrap.o)
+--
+cgit v0.11.2
diff --git a/kde-apps/kalzium/kalzium-17.04.3.ebuild b/kde-apps/kalzium/kalzium-17.04.3.ebuild
index 9245d7e29c7..caeb6d64fc0 100644
--- a/kde-apps/kalzium/kalzium-17.04.3.ebuild
+++ b/kde-apps/kalzium/kalzium-17.04.3.ebuild
@@ -43,6 +43,8 @@ RDEPEND="${DEPEND}
sci-chemistry/chemical-mime-data
"
+PATCHES=( "${FILESDIR}/${P}-ocaml404.patch" ) # bug 603050
+
src_configure(){
# Fix missing finite()
[[ ${CHOST} == *-solaris* ]] && append-cppflags -DHAVE_IEEEFP_H
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-apps/kalzium/files/, kde-apps/kalzium/
@ 2019-01-18 11:01 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2019-01-18 11:01 UTC (permalink / raw
To: gentoo-commits
commit: 46111e1999ba8aef000edb69e7ea110922cff989
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 17 10:33:58 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jan 18 11:00:56 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46111e19
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.1-r1.ebuild | 62 ++++++++++++++++++
2 files changed, 141 insertions(+)
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 00000000000..f0a1a834bc5
--- /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.1-r1.ebuild b/kde-apps/kalzium/kalzium-18.12.1-r1.ebuild
new file mode 100644
index 00000000000..aac0fcfa4cc
--- /dev/null
+++ b/kde-apps/kalzium/kalzium-18.12.1-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5 flag-o-matic
+
+DESCRIPTION="Periodic table of the elements"
+HOMEPAGE="https://www.kde.org/applications/education/kalzium https://edu.kde.org/kalzium/"
+KEYWORDS="~amd64 ~x86"
+IUSE="editor solver"
+
+DEPEND="
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdelibs4support)
+ $(add_frameworks_dep khtml)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kitemviews)
+ $(add_frameworks_dep kplotting)
+ $(add_frameworks_dep ktextwidgets)
+ $(add_frameworks_dep kunitconversion)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kxmlgui)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtscript)
+ $(add_qt_dep qtsvg)
+ $(add_qt_dep qtwidgets)
+ $(add_qt_dep qtxml)
+ editor? (
+ $(add_qt_dep qtopengl)
+ $(add_frameworks_dep knewstuff)
+ dev-cpp/eigen:3
+ sci-chemistry/openbabel
+ sci-libs/avogadrolibs
+ )
+ solver? ( dev-ml/facile[ocamlopt] )
+"
+RDEPEND="${DEPEND}
+ sci-chemistry/chemical-mime-data
+"
+
+PATCHES=( "${FILESDIR}/${P}-deps.patch" )
+
+src_configure() {
+ # Fix missing finite()
+ [[ ${CHOST} == *-solaris* ]] && append-cppflags -DHAVE_IEEEFP_H
+
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package editor Eigen3)
+ $(cmake-utils_use_find_package editor AvogadroLibs)
+ $(cmake-utils_use_find_package editor OpenBabel2)
+ $(cmake-utils_use_find_package solver OCaml)
+ $(cmake-utils_use_find_package solver Libfacile)
+ )
+
+ kde5_src_configure
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-apps/kalzium/files/, kde-apps/kalzium/
@ 2016-03-25 14:48 Michael Palimaka
0 siblings, 0 replies; 3+ messages in thread
From: Michael Palimaka @ 2016-03-25 14:48 UTC (permalink / raw
To: gentoo-commits
commit: 19b3e9cf70fee6f2c335138da31ff3f4b5f6f483
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Mar 20 17:15:30 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Mar 25 14:47:48 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19b3e9cf
kde-apps/kalzium: Re-add USE=+plasma, fix DEPENDs
Package-Manager: portage-2.2.27
.../kalzium/files/kalzium-15.12.3-plasmoids.patch | 23 +++++++++++
kde-apps/kalzium/kalzium-15.12.3-r2.ebuild | 47 ++++++++++++++++++++++
2 files changed, 70 insertions(+)
diff --git a/kde-apps/kalzium/files/kalzium-15.12.3-plasmoids.patch b/kde-apps/kalzium/files/kalzium-15.12.3-plasmoids.patch
new file mode 100644
index 0000000..686a6ef
--- /dev/null
+++ b/kde-apps/kalzium/files/kalzium-15.12.3-plasmoids.patch
@@ -0,0 +1,23 @@
+commit 456205fc98f4eb2762c11fac2abedf618e0deb8f
+Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Fri Mar 25 13:38:55 2016 +0100
+
+ Make plasmoids optional
+
+ They are not useable in a Plasma-5 workspace.
+
+ REVIEW: 127491
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f4ab27b..93ae845 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -50,7 +50,7 @@ endif (OPENBABEL2_FOUND AND Avogadro_FOUND AND EIGEN3_FOUND)
+ add_subdirectory(doc)
+ add_subdirectory(src)
+ add_subdirectory(data)
+-add_subdirectory(plasmoid)
++macro_optional_add_subdirectory(plasmoid)
+ add_subdirectory(libscience)
+ add_subdirectory(qml)
+
diff --git a/kde-apps/kalzium/kalzium-15.12.3-r2.ebuild b/kde-apps/kalzium/kalzium-15.12.3-r2.ebuild
new file mode 100644
index 0000000..3019590
--- /dev/null
+++ b/kde-apps/kalzium/kalzium-15.12.3-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+CPPUNIT_REQUIRED="optional"
+OPENGL_REQUIRED="always"
+inherit kde4-base flag-o-matic
+
+DESCRIPTION="KDE: periodic table of the elements"
+HOMEPAGE="https://www.kde.org/applications/education/kalzium
+https://edu.kde.org/kalzium"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="debug editor +plasma solver"
+
+DEPEND="
+ editor? (
+ dev-cpp/eigen:3
+ sci-chemistry/avogadro
+ >=sci-chemistry/openbabel-2.2
+ dev-qt/qtopengl:4
+ )
+ solver? ( dev-ml/facile[ocamlopt] )
+"
+RDEPEND="${DEPEND}
+ sci-chemistry/chemical-mime-data
+"
+
+PATCHES=( "${FILESDIR}/${PN}-15.12.3-plasmoids.patch" )
+
+src_configure(){
+ # Fix missing finite()
+ [[ ${CHOST} == *-solaris* ]] && append-cppflags -DHAVE_IEEEFP_H
+
+ local mycmakeargs=(
+ $(cmake-utils_use_build plasma plasmoid)
+ $(cmake-utils_use_with editor Eigen3)
+ $(cmake-utils_use_with editor Avogadro)
+ $(cmake-utils_use_with editor OpenBabel2)
+ $(cmake-utils_use_with solver OCaml)
+ $(cmake-utils_use_with solver Libfacile)
+ )
+
+ kde4-base_src_configure
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-01-18 11:01 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-08-03 17:09 [gentoo-commits] repo/gentoo:master commit in: kde-apps/kalzium/files/, kde-apps/kalzium/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2019-01-18 11:01 Andreas Sturmlechner
2016-03-25 14:48 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox