[scram] 01/05: Remove the path for GUI static builds

Olzhas Rakhimov rakhimov-guest at moszumanska.debian.org
Sat Aug 5 22:16:02 UTC 2017


This is an automated email from the git hooks/post-receive script.

rakhimov-guest pushed a commit to branch master
in repository scram.

commit 9550161a5b60fb44a2cd08b2eec6dae3a10f0f1d
Author: rakhimov <ol.rakhimov at gmail.com>
Date:   Sat Aug 5 14:19:31 2017 -0700

    Remove the path for GUI static builds
---
 debian/patches/0001-GUI-Fix-the-static-build.patch | 35 ----------------------
 debian/patches/series                              |  1 -
 2 files changed, 36 deletions(-)

diff --git a/debian/patches/0001-GUI-Fix-the-static-build.patch b/debian/patches/0001-GUI-Fix-the-static-build.patch
deleted file mode 100644
index 91833c0..0000000
--- a/debian/patches/0001-GUI-Fix-the-static-build.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 39d4b1b9dbec907e942d770008c28b379c1fa03a Mon Sep 17 00:00:00 2001
-From: rakhimov <ol.rakhimov at gmail.com>
-Date: Tue, 1 Aug 2017 15:46:59 -0700
-Subject: [PATCH] GUI: Fix the static build
-
----
- gui/CMakeLists.txt | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt
-index 5f93c72..baad8a4 100644
---- a/gui/CMakeLists.txt
-+++ b/gui/CMakeLists.txt
-@@ -72,12 +72,16 @@ set(GUI_DEP_LIBS  # TODO: Link with shared libraries on Windows instead.
-   ${LIBS} scramcore
-   Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Svg Qt5::OpenGL Qt5::PrintSupport Qt5::Concurrent)
- 
-+if(WIN32)
-+  target_link_libraries(scramgui PRIVATE ${GUI_DEP_LIBS})  # TODO: Remove.
-+else()
-+  target_link_libraries(scramgui ${GUI_DEP_LIBS})  # TODO: Make default.
-+endif()
-+
- if(INSTALL_LIBS)
-   if(WIN32)
--    target_link_libraries(scramgui PRIVATE ${GUI_DEP_LIBS})  # TODO: Remove.
-     install(TARGETS scramgui RUNTIME DESTINATION bin COMPONENT gui)
-   else()
--    target_link_libraries(scramgui ${GUI_DEP_LIBS})  # TODO: Make default.
-     set_target_properties(scramgui
-       PROPERTIES
-       INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib/scram"
--- 
-2.7.4
-
diff --git a/debian/patches/series b/debian/patches/series
index 61e217f..c24afcf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-0001-GUI-Fix-the-static-build.patch
 0001-GUI-Update-.desktop-with-URL-and-Keywords.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/scram.git



More information about the debian-science-commits mailing list