summaryrefslogtreecommitdiff
path: root/kde-apps/kalzium/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-08-02 19:14:55 +0100
committerV3n3RiX <venerix@redcorelinux.org>2019-08-02 19:14:55 +0100
commitb24bd25253fe093f722ab576d29fdc41d04cb1ee (patch)
tree0fcf2afd9f852c4d4c291cf8afaa2c244d598105 /kde-apps/kalzium/files
parent121ed4eec41fbf03e1998d09eede1bf449da63b9 (diff)
gentoo resync : 02.08.2019
Diffstat (limited to 'kde-apps/kalzium/files')
-rw-r--r--kde-apps/kalzium/files/kalzium-18.12.1-deps.patch79
1 files changed, 0 insertions, 79 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
deleted file mode 100644
index f0a1a834bc55..000000000000
--- a/kde-apps/kalzium/files/kalzium-18.12.1-deps.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-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
-