[spring] 07/28: Drop remove-ThreadPool-test.patch. Fixed upstream.
Markus Koschany
apo-guest at moszumanska.debian.org
Sat Mar 5 21:48:00 UTC 2016
This is an automated email from the git hooks/post-receive script.
apo-guest pushed a commit to branch master
in repository spring.
commit 18a2a332d56bf41d075873fd594589b4a7335a46
Author: Markus Koschany <apo at debian.org>
Date: Sat Mar 5 13:27:37 2016 +0100
Drop remove-ThreadPool-test.patch. Fixed upstream.
---
debian/patches/remove-ThreadPool-test.patch | 48 -----------------------------
debian/patches/series | 1 -
2 files changed, 49 deletions(-)
diff --git a/debian/patches/remove-ThreadPool-test.patch b/debian/patches/remove-ThreadPool-test.patch
deleted file mode 100644
index a215755..0000000
--- a/debian/patches/remove-ThreadPool-test.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From: Markus Koschany <apo at gambaru.de>
-Date: Mon, 31 Aug 2015 15:57:02 +0200
-Subject: remove ThreadPool test
-
----
- test/CMakeLists.txt | 29 -----------------------------
- 1 file changed, 29 deletions(-)
-
-diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
-index 18ffcaf..7effc62 100644
---- a/test/CMakeLists.txt
-+++ b/test/CMakeLists.txt
-@@ -294,35 +294,6 @@ Else (NOT Boost_FOUND)
- add_dependencies(test_${test_name} springcontent.sdz)
-
- ################################################################################
--### ThreadPool
-- set(test_name ThreadPool)
-- Set(test_src
-- "${CMAKE_CURRENT_SOURCE_DIR}/engine/System/testThreadPool.cpp"
-- "${ENGINE_SOURCE_DIR}/System/ThreadPool.cpp"
-- "${ENGINE_SOURCE_DIR}/System/Misc/SpringTime.cpp"
-- "${ENGINE_SOURCE_DIR}/System/UnsyncedRNG.cpp"
-- "${ENGINE_SOURCE_DIR}/System/Platform/CpuID.cpp"
-- "${ENGINE_SOURCE_DIR}/System/Platform/Threading.cpp"
--
-- ${test_Log_sources}
-- )
-- if(NOT WIN32)
-- LIST(APPEND test_src
-- "${ENGINE_SOURCE_DIR}/System/Platform/Linux/ThreadSupport.cpp")
-- endif()
-- set(test_libs
-- ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}
-- ${Boost_THREAD_LIBRARY}
-- ${Boost_CHRONO_LIBRARY_WITH_RT}
-- ${Boost_SYSTEM_LIBRARY}
-- ${WINMM_LIBRARY}
-- )
--if(NOT WIN32)
--# FIXME: sometimes fails on windows
-- add_spring_test(${test_name} "${test_src}" "${test_libs}" "-DTHREADPOOL -DUNITSYNC")
--endif()
--
--################################################################################
- ### Mutex
- set(test_name Mutex)
- Set(test_src
diff --git a/debian/patches/series b/debian/patches/series
index 7450922..dfb098a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
glShaderSource.patch
sdl-debian.patch
-remove-ThreadPool-test.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/spring.git
More information about the Pkg-games-commits
mailing list