Control: tag -1 + patch
Hi,
Quoting fulvio ciriaco (2021-07-24 17:24:37)
> steps to reproduce:
> 1. select new -> campaign
> 2. move the mouse to select the campaign
> vcmi aborts immediately with the following message:
>
> Initializing VCMI_Lib: 313 ms
> Screen handler: 8 ms
> Main graphics: 103 ms
> Message handler: 1 ms
> Initialization of VCMI (together): 1126 ms
> corrupted double-linked list
>
> it happens on different computers, motherboards and graphic cards.
> as a workaround, it is possible to select a campaign opening vcmi in valgrind
> (very
> slow), saving the first day and reopening normally.
thank you for your bugreport! I can reproduce the problem and the attached
patch fixes it.
Thanks!
cheers, joschdiff -Nru vcmi-0.99+dfsg+git20190113.f06c8a87/debian/changelog vcmi-0.99+dfsg+git20190113.f06c8a87/debian/changelog
--- vcmi-0.99+dfsg+git20190113.f06c8a87/debian/changelog 2021-08-06 19:58:17.0 +0200
+++ vcmi-0.99+dfsg+git20190113.f06c8a87/debian/changelog 2020-06-03 12:44:51.0 +0200
@@ -1,10 +1,3 @@
-vcmi (0.99+dfsg+git20190113.f06c8a87-2.1) UNRELEASED; urgency=medium
-
- * Non-maintainer upload.
- *
-
- -- Johannes Schauer Marin Rodrigues Fri, 06 Aug 2021 19:58:17 +0200
-
vcmi (0.99+dfsg+git20190113.f06c8a87-2) unstable; urgency=medium
* Add patch "Fix build with Boost version >= 1.70"
diff -Nru vcmi-0.99+dfsg+git20190113.f06c8a87/debian/control vcmi-0.99+dfsg+git20190113.f06c8a87/debian/control
--- vcmi-0.99+dfsg+git20190113.f06c8a87/debian/control 2021-08-06 19:58:17.0 +0200
+++ vcmi-0.99+dfsg+git20190113.f06c8a87/debian/control 2020-06-03 12:44:51.0 +0200
@@ -26,8 +26,7 @@
help2man,
tex4ht,
texlive-latex-base,
- texlive-latex-extra,
- libtbb-dev
+ texlive-latex-extra
Standards-Version: 4.1.4
Vcs-Browser: https://salsa.debian.org/games-team/vcmi
Vcs-Git: https://salsa.debian.org/games-team/vcmi.git
diff -Nru vcmi-0.99+dfsg+git20190113.f06c8a87/debian/patches/link_with_tbb vcmi-0.99+dfsg+git20190113.f06c8a87/debian/patches/link_with_tbb
--- vcmi-0.99+dfsg+git20190113.f06c8a87/debian/patches/link_with_tbb 2021-08-06 19:58:06.0 +0200
+++ vcmi-0.99+dfsg+git20190113.f06c8a87/debian/patches/link_with_tbb 1970-01-01 01:00:00.0 +0100
@@ -1,558 +0,0 @@
a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -223,6 +223,7 @@ find_package(SDL2 REQUIRED)
- find_package(SDL2_image REQUIRED)
- find_package(SDL2_mixer REQUIRED)
- find_package(SDL2_ttf REQUIRED)
-+find_package(TBB REQUIRED)
-
- if(ENABLE_LAUNCHER)
- # Widgets finds its own dependencies (QtGui and QtCore).
a/client/CMakeLists.txt
-+++ b/client/CMakeLists.txt
-@@ -176,6 +176,7 @@ endif()
- target_link_libraries(vcmiclient vcmi ${Boost_LIBRARIES}
- ${SDL2_LIBRARY} ${SDL2_IMAGE_LIBRARY} ${SDL2_MIXER_LIBRARY} ${SDL2_TTF_LIBRARY}
- ${ZLIB_LIBRARIES} ${FFMPEG_LIBRARIES} ${FFMPEG_EXTRA_LINKING_OPTIONS} ${SYSTEM_LIBS}
-+ ${TBB_LIBRARIES}
- )
-
- target_include_directories(vcmi
/dev/null
-+++ b/cmake_modules/FindTBB.cmake
-@@ -0,0 +1,534 @@
-+#.rst:
-+# FindTBB
-+# ---
-+#
-+# Find Intel's Threading Building Blocks (TBB) include path and libraries.
-+#
-+# This module reads hints about search locations from variables:
-+#
-+# ::
-+#
-+#TBB_ROOT - Root directory of pre-built TBB package.
-+# Can be an environment variable instead. It is
-+# derived from the found TBB_INCLUDE_DIR if unset.
-+#TBB_ARCH_PLATFORM- Environment variable which can be used to specify
-+# architecture and platform specific library path
-+# suffix (excluding "/lib/" suffix or prefix).
-+# For MSVC, the appropriate link library path of the
-+# official pre-built download package from the TBB
-+# web site is chosen by this module. The path suffix
-+# derived from this variable takes precedence.
-+#
-+# This module considers the following CMake variables set by find_package:
-+#
-+# ::
-+#
-+#TBB_FIND_COMPONENTS - Case-insensitive names of requested libraries:
-+# tbb, [tbb]malloc, [tbb]malloc_proxy
-+#TBB_FIND_REQUIRED_- Whether TBB library component is required.
-+# TBB is considered to be not found when at least
-+# one required library or its include path is missing.
-+# When no TBB_FIND_COMPONENTS are specified, only the
-+# threading library "tbb" is required.
-+#TBB_FIND_REQUIRED- Raise FATAL_ERROR when required components not found.
-+#TBB_FIND_QUIETLY - Suppress all other (status
