[gentoo-commits] repo/gentoo:master commit in: kde-apps/kalzium/files/

[gentoo-commits] repo/gentoo:master commit in: kde-apps/kalzium/files/

[Andreas Sturmlechner]

commit:     f5787699a860b0f42ee8eb059e8fbf469fe425d4
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sat Dec  2 08:14:31 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec  2 08:34:50 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5787699

kde-apps/kalzium: remove unused patch

 .../kalzium/files/kalzium-17.04.3-ocaml404.patch   | 29 ----------------------
 1 file changed, 29 deletions(-)

diff --git a/kde-apps/kalzium/files/kalzium-17.04.3-ocaml404.patch b/kde-apps/kalzium/files/kalzium-17.04.3-ocaml404.patch
deleted file mode 100644
index b2c315702a7..00000000000
--- a/kde-apps/kalzium/files/kalzium-17.04.3-ocaml404.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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

[gentoo-commits] repo/gentoo:master commit in: kde-apps/kalzium/files/

[Andreas Sturmlechner]

commit:     72373df1fdfab6c5601fb5676dabb23dcac480fe
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sat Apr 21 08:11:16 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr 21 09:12:28 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72373df1

kde-apps/kalzium: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/8091

 .../files/kalzium-18.03.90-missing-header.patch    | 24 ----------------------
 1 file changed, 24 deletions(-)

diff --git a/kde-apps/kalzium/files/kalzium-18.03.90-missing-header.patch b/kde-apps/kalzium/files/kalzium-18.03.90-missing-header.patch
deleted file mode 100644
index 8d1eee5720b..00000000000
--- a/kde-apps/kalzium/files/kalzium-18.03.90-missing-header.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From a56c48890a21f0d9556474e3edae9c11be898243 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sun, 8 Apr 2018 02:35:14 +0200
-Subject: [PATCH] Add missing header when building with AvogadroLibs support
-
----
- src/kalzium.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/kalzium.cpp b/src/kalzium.cpp
-index d7c9b4c6..4636308c 100644
---- a/src/kalzium.cpp
-+++ b/src/kalzium.cpp
-@@ -42,6 +42,7 @@
- #ifdef HAVE_OPENBABEL2
- #if defined(HAVE_EIGEN) && defined(HAVE_AVOGADRO)
- #include "tools/moleculeview.h"
-+#include <QGLFormat>
- #endif
- #include "tools/obconverter.h"
- #endif
--- 
-2.17.0
-