[med-svn] [Git][med-team/ctk][master] 2 commits: New upstream version (2026.09.02)
Fernando Hueso (@ferdymercury)
gitlab at salsa.debian.org
Thu Sep 3 08:24:27 BST 2026
Fernando Hueso pushed to branch master at Debian Med / ctk
Commits:
908e2e6d by Fernando Hueso at 2026-09-03T07:05:45+00:00
New upstream version (2026.09.02)
- - - - -
f368e900 by Fernando Hueso at 2026-09-03T07:06:39+00:00
d/changelog
- - - - -
12 changed files:
- − Libs/Core/CMake/TestBFD/CMakeLists.txt
- − Libs/Core/CMake/TestBFD/TestBFD.cpp
- − Libs/Core/CMake/ctkMacroBFDCheck.cmake
- Libs/Core/CMakeLists.txt
- Libs/Core/Testing/Cpp/CMakeLists.txt
- − Libs/Core/Testing/Cpp/ctkBinaryFileDescriptorTest1.cpp
- − Libs/Core/Testing/Cpp/ctkBinaryFileDescriptorTestHelper.cpp
- − Libs/Core/ctk_library_options.cmake
- Libs/Core/target_libraries.cmake
- debian/changelog
- − debian/patches/bfd_removal.diff
- debian/patches/series
Changes:
=====================================
Libs/Core/CMake/TestBFD/CMakeLists.txt deleted
=====================================
@@ -1,14 +0,0 @@
-cmake_minimum_required(VERSION 3.20.6)
-
-project(TestBFD)
-
-# Sanity checks
-if("${BFD_LIBRARY_NAME}" STREQUAL "")
- message(FATAL_ERROR "error: ${v} variable is an empty string !")
-endif()
-
-unset(BFD_LIBRARY CACHE)
-find_library(BFD_LIBRARY ${BFD_LIBRARY_NAME})
-
-ctk_add_executable_utf8(TestBFD TestBFD.cpp)
-target_link_libraries(TestBFD ${BFD_LIBRARY})
=====================================
Libs/Core/CMake/TestBFD/TestBFD.cpp deleted
=====================================
@@ -1,19 +0,0 @@
-
-#include <bfd.h>
-
-// STD includes
-#include <cstdlib>
-
-int main(int /*argc*/, char * /*argv*/[])
-{
- bfd *abfd = 0;
- asymbol *symbol = 0;
- asection *p = 0;
- bfd_init();
- abfd = bfd_openr("/path/to/library", 0);
- if (!abfd)
- {
- return false;
- }
- return EXIT_SUCCESS;
-}
=====================================
Libs/Core/CMake/ctkMacroBFDCheck.cmake deleted
=====================================
@@ -1,83 +0,0 @@
-#
-# ctkMacroBFDCheck.cmake - After this file is included into your main CMake script,
-# HAVE_BFD will be defined if libbfd is available.
-#
-
-if(CTK_LIB_Core_WITH_BFD_STATIC AND CTK_LIB_Core_WITH_BFD_SHARED)
- message(FATAL_ERROR "error: Options WITH_BFD_STATIC and WITH_BFD_SHARED are mutually exclusive ! "
- "hint: Enable either WITH_BFD_STATIC or WITH_BFD_SHARED.")
-endif()
-
-if(NOT CTK_BUILD_SHARED_LIBS AND CTK_LIB_Core_WITH_BFD_SHARED)
- message(FATAL_ERROR "error: Options CTK_BUILD_SHARED_LIBS and WITH_BFD_STATIC are mutually exclusive ! "
- "hint: Disable WITH_BFD_SHARED and enable WITH_BFD_STATIC if needed.")
-endif()
-
-set(BFD_LIBRARIES)
-unset(HAVE_BFD CACHE)
-
-set(TestBFD_BUILD_LOG "${CMAKE_CURRENT_BINARY_DIR}/CMake/TestBFD-build-log.txt")
-
-if(CTK_LIB_Core_WITH_BFD_STATIC OR CTK_LIB_Core_WITH_BFD_SHARED)
- if(WIN32)
- message(FATAL_ERROR "error: Options WITH_BFD_STATIC or WITH_BFD_SHARED are not support on Windows !")
- endif()
-
- if(NOT WIN32)
- include(CheckIncludeFile)
- CHECK_INCLUDE_file(bfd.h HAVE_BFD_HEADER)
- if(NOT HAVE_BFD_HEADER)
- file(WRITE ${TestBFD_BUILD_LOG} "Could *NOT* find the required header file: bfd.h")
- endif()
-
- set(BFD_LIBRARY_NAME libbfd.a)
- set(TestBFD_LIBRARY_MODE STATIC)
- if(CTK_LIB_Core_WITH_BFD_SHARED)
- set(BFD_LIBRARY_NAME libbfd${CMAKE_SHARED_LIBRARY_SUFFIX})
- set(TestBFD_LIBRARY_MODE SHARED)
- endif()
- unset(BFD_LIBRARY CACHE)
- find_library(BFD_LIBRARY ${BFD_LIBRARY_NAME})
- if(NOT BFD_LIBRARY)
- file(WRITE ${TestBFD_BUILD_LOG} "Could *NOT* find the required bfd library: ${BFD_LIBRARY_NAME}")
- endif()
-
- if(HAVE_BFD_HEADER AND BFD_LIBRARY)
- # make sure we can build with libbfd
- #message(STATUS "Checking libbfd")
- try_compile(HAVE_BFD
- ${CMAKE_CURRENT_BINARY_DIR}/CMake/TestBFD
- ${CMAKE_CURRENT_SOURCE_DIR}/CMake/TestBFD
- TestBFD
- CMAKE_FLAGS
- -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}
- -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
- -DBFD_LIBRARY_NAME:STRING=${BFD_LIBRARY_NAME}
- OUTPUT_VARIABLE OUTPUT)
- file(WRITE ${TestBFD_BUILD_LOG} ${OUTPUT})
- #message(${OUTPUT})
-
- if(HAVE_BFD)
- set(BFD_LIBRARIES ${BFD_LIBRARY})
- endif()
- endif()
- endif()
-
-endif()
-
-if(CTK_LIB_Core_WITH_BFD_SHARED AND NOT HAVE_BFD)
- message(WARNING "warning: CTKCore: Failed to enable BFD support. Disabling CTKCore WITH_BFD_SHARED library option. "
- "See ${TestBFD_BUILD_LOG} for more details.")
- set(CTK_LIB_Core_WITH_BFD_SHARED OFF CACHE BOOL "Enable CTKCore Library WITH_BFD_SHARED option" FORCE)
-endif()
-if(CTK_LIB_Core_WITH_BFD_STATIC AND NOT HAVE_BFD)
- message(WARNING "warning: CTKCore: Failed to enable BFD support. Disabling CTKCore WITH_BFD_STATIC library option. "
- "See ${TestBFD_BUILD_LOG} for more details.")
- set(CTK_LIB_Core_WITH_BFD_STATIC OFF CACHE BOOL "Enable CTKCore Library WITH_BFD_STATIC option" FORCE)
-endif()
-
-if(HAVE_BFD)
- message(STATUS "CTKCore: BFD support enabled [${BFD_LIBRARIES}]")
-else()
- message(STATUS "CTKCore: BFD support disabled")
-endif()
=====================================
Libs/Core/CMakeLists.txt
=====================================
@@ -7,9 +7,6 @@ project(CTKCore)
# CMake modules
set(CMAKE_MODULE_PATH ${CTKCore_SOURCE_DIR}/CMake ${CMAKE_MODULE_PATH})
-# CMake Macros
-include(CMake/ctkMacroBFDCheck.cmake) # HAVE_BFD will be set to True if it applies
-
#
# See CTK/CMake/ctkMacroBuildLib.cmake for details
#
@@ -97,13 +94,6 @@ set(KIT_SRCS
ctkSetName.h
)
-if(HAVE_BFD)
- list(APPEND KIT_SRCS
- ctkBinaryFileDescriptor.cpp
- ctkBinaryFileDescriptor.h
- )
-endif()
-
# Abstract class should not be wrapped !
set_source_files_properties(
ctkAbstractJob.h
=====================================
Libs/Core/Testing/Cpp/CMakeLists.txt
=====================================
@@ -53,11 +53,6 @@ set(KITTests_SRCS
ctkWorkflowTest2.cpp
ctkWorkflowTest3.cpp
)
-if(HAVE_BFD)
- list(APPEND KITTests_SRCS
- ctkBinaryFileDescriptorTest1.cpp
- )
-endif()
include_directories(
${CMAKE_SOURCE_DIR}/Libs/Testing
@@ -87,10 +82,6 @@ set(Tests_Helpers_SRCS
ctkSingletonTestHelper.h
)
-if(HAVE_BFD)
- ctk_add_executable_utf8(ctkBinaryFileDescriptorTestHelper ctkBinaryFileDescriptorTestHelper.cpp)
-endif()
-
if(MSVC)
add_definitions( /D _CRT_SECURE_NO_WARNINGS)
endif()
@@ -131,9 +122,6 @@ SIMPLE_TEST( ctkAbstractQObjectFactoryTest1 )
if(CMAKE_BUILD_TYPE MATCHES "Debug")
SIMPLE_TEST( ctkBackTraceTest )
endif()
-if(HAVE_BFD)
- SIMPLE_TEST( ctkBinaryFileDescriptorTest1 $<TARGET_FILE:ctkBinaryFileDescriptorTestHelper> )
-endif()
SIMPLE_TEST( ctkBooleanMapperTest )
SIMPLE_TEST( ctkCallbackTest1 )
SIMPLE_TEST( ctkCommandLineParserTest1 )
=====================================
Libs/Core/Testing/Cpp/ctkBinaryFileDescriptorTest1.cpp deleted
=====================================
@@ -1,119 +0,0 @@
-/*=========================================================================
-
- Library: CTK
-
- Copyright (c) Kitware Inc.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0.txt
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
-=========================================================================*/
-
-// Qt includes
-#include <QFile>
-
-// CTK includes
-#include "ctkBinaryFileDescriptor.h"
-
-// STD includes
-#include <cstdlib>
-#include <iostream>
-
-//-----------------------------------------------------------------------------
-int ctkBinaryFileDescriptorTest1(int argc, char * argv[])
-{
- if (argc <= 1)
- {
- std::cerr << "Missing argument" << std::endl;
- return EXIT_FAILURE;
- }
- QString filePath(argv[1]);
-
- if (!QFile::exists(filePath))
- {
- std::cerr << "Line " << __LINE__ << " - "
- << "filePath [" << qPrintable(filePath)
- << "] do *NOT* exist" << std::endl;
- return EXIT_FAILURE;
- }
-
- ctkBinaryFileDescriptor bfd;
- if (bfd.load())
- {
- // Should fail to load without any valid filename
- std::cerr << "Line " << __LINE__ << " - "
- << "Problem with load() method" << std::endl;
- return EXIT_FAILURE;
- }
- if (!bfd.unload())
- {
- // Unload inconditionnally return True
- std::cerr << "Line " << __LINE__ << " - "
- << "Problem with unload() method" << std::endl;
- return EXIT_FAILURE;
- }
- if (bfd.isLoaded())
- {
- std::cerr << "Line " << __LINE__ << " - "
- << "Problem with isLoaded() method" << std::endl;
- return EXIT_FAILURE;
- }
- if (!bfd.fileName().isEmpty())
- {
- std::cerr << "Line " << __LINE__ << " - "
- << "Problem with fileName() method" << std::endl;
- return EXIT_FAILURE;
- }
-
- bfd.setFileName(filePath);
-
- if (bfd.fileName() != filePath)
- {
- std::cerr << "Line " << __LINE__ << " - "
- << "Problem with fileName() method" << std::endl;
- return EXIT_FAILURE;
- }
-
- if (!bfd.load())
- {
- // Should succeed since a valid filename is provided
- std::cerr << "Line " << __LINE__ << " - "
- << "Problem with load() method" << std::endl;
- return EXIT_FAILURE;
- }
-
- void * main_pointer = bfd.resolve("main");
- if (!main_pointer)
- {
- std::cerr << "Line " << __LINE__ << " - "
- << "Problem with resolve() method - "
- << "Failed to revolve 'main' symbol !" << std::endl;
- return EXIT_FAILURE;
- }
-
- void * mtBlancElevationInMeters_pointer = bfd.resolve("MtBlancElevationInMeters");
- int * mtBlancElevationInMeters = reinterpret_cast<int*>(mtBlancElevationInMeters_pointer);
- if (!mtBlancElevationInMeters)
- {
- std::cerr << "Line " << __LINE__ << " - "
- << "Failed to case 'mtBlancElevationInMeters' pointer !" << std::endl;
- return EXIT_FAILURE;
- }
- if (*mtBlancElevationInMeters != 4810)
- {
- std::cerr << "Line " << __LINE__ << " - "
- << "Failed to invoke function associated with symbol 'MtBlancElevationInMeters' !" << std::endl;
- return EXIT_FAILURE;
- }
-
- return EXIT_SUCCESS;
-}
=====================================
Libs/Core/Testing/Cpp/ctkBinaryFileDescriptorTestHelper.cpp deleted
=====================================
@@ -1,41 +0,0 @@
-/*=========================================================================
-
- Library: CTK
-
- Copyright (c) Kitware Inc.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0.txt
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
-=========================================================================*/
-
-// STD includes
-#include <iostream>
-#include <cstdlib>
-
-#ifdef WIN32
-# define BFD_TEST_HELPER_EXPORT __declspec(dllexport)
-#else
-# define BFD_TEST_HELPER_EXPORT
-#endif
-
-extern "C" {
-
- BFD_TEST_HELPER_EXPORT int MtBlancElevationInMeters = 4810;
-}
-
-int main(int /*argc*/, char* /*argv*/[])
-{
- std::cout << "Mt Blanc elevation is " << MtBlancElevationInMeters
- << " meters" << std::endl;
- return EXIT_SUCCESS;
-}
=====================================
Libs/Core/ctk_library_options.cmake deleted
=====================================
@@ -1,14 +0,0 @@
-#
-# See CMake/ctkMacroAddCtkLibraryOptions.cmake
-#
-# This file should list of options available for considered CTK library
-# For example: MYOPT1:OFF MYOPT2:ON
-#
-
-# Note: Options WITH_BFD_SHARED and WITH_BFD_STATIC are mutually exclusive.
-# Enabling both options will trigger a configuration error.
-
-set(ctk_library_options
- WITH_BFD_SHARED:OFF
- WITH_BFD_STATIC:OFF
- )
=====================================
Libs/Core/target_libraries.cmake
=====================================
@@ -5,5 +5,4 @@
#
set(target_libraries
- BFD_LIBRARIES
)
=====================================
debian/changelog
=====================================
@@ -1,4 +1,4 @@
-ctk (2026.08.06-2) UNRELEASED; urgency=medium
+ctk (2026.09.02-1) UNRELEASED; urgency=medium
[ Andreas Tille ]
* Remove unneeded docs file
@@ -13,8 +13,9 @@ ctk (2026.08.06-2) UNRELEASED; urgency=medium
* remove non DFSG compliant optional files
* rm no longer needed license from copyright
* update patch since removed files
+ * New upstream version (2026.09.02)
- -- Fernando Hueso <Fernando.Hueso at uv.es> Mon, 31 Aug 2026 00:16:23 +0200
+ -- Fernando Hueso <Fernando.Hueso at uv.es> Thu, 03 Sep 2026 07:05:58 +0000
ctk (2026.08.06-1) unstable; urgency=medium
=====================================
debian/patches/bfd_removal.diff deleted
=====================================
@@ -1,406 +0,0 @@
-Description: Remove non DFSG-complaint classes
-Origin: https://github.com/commontk/CTK/pull/1454
-Last-Update: 2026-08-30
-
-diff --git a/Libs/Core/CMake/TestBFD/CMakeLists.txt b/Libs/Core/CMake/TestBFD/CMakeLists.txt
-deleted file mode 100644
-index 85b9585b79..0000000000
---- a/Libs/Core/CMake/TestBFD/CMakeLists.txt
-+++ /dev/null
-@@ -1,14 +0,0 @@
--cmake_minimum_required(VERSION 3.20.6)
--
--project(TestBFD)
--
--# Sanity checks
--if("${BFD_LIBRARY_NAME}" STREQUAL "")
-- message(FATAL_ERROR "error: ${v} variable is an empty string !")
--endif()
--
--unset(BFD_LIBRARY CACHE)
--find_library(BFD_LIBRARY ${BFD_LIBRARY_NAME})
--
--ctk_add_executable_utf8(TestBFD TestBFD.cpp)
--target_link_libraries(TestBFD ${BFD_LIBRARY})
-diff --git a/Libs/Core/CMake/TestBFD/TestBFD.cpp b/Libs/Core/CMake/TestBFD/TestBFD.cpp
-deleted file mode 100644
-index 9fe7e99a95..0000000000
---- a/Libs/Core/CMake/TestBFD/TestBFD.cpp
-+++ /dev/null
-@@ -1,19 +0,0 @@
--
--#include <bfd.h>
--
--// STD includes
--#include <cstdlib>
--
--int main(int /*argc*/, char * /*argv*/[])
--{
-- bfd *abfd = 0;
-- asymbol *symbol = 0;
-- asection *p = 0;
-- bfd_init();
-- abfd = bfd_openr("/path/to/library", 0);
-- if (!abfd)
-- {
-- return false;
-- }
-- return EXIT_SUCCESS;
--}
-diff --git a/Libs/Core/CMake/ctkMacroBFDCheck.cmake b/Libs/Core/CMake/ctkMacroBFDCheck.cmake
-deleted file mode 100644
-index dc5aa8842f..0000000000
---- a/Libs/Core/CMake/ctkMacroBFDCheck.cmake
-+++ /dev/null
-@@ -1,83 +0,0 @@
--#
--# ctkMacroBFDCheck.cmake - After this file is included into your main CMake script,
--# HAVE_BFD will be defined if libbfd is available.
--#
--
--if(CTK_LIB_Core_WITH_BFD_STATIC AND CTK_LIB_Core_WITH_BFD_SHARED)
-- message(FATAL_ERROR "error: Options WITH_BFD_STATIC and WITH_BFD_SHARED are mutually exclusive ! "
-- "hint: Enable either WITH_BFD_STATIC or WITH_BFD_SHARED.")
--endif()
--
--if(NOT CTK_BUILD_SHARED_LIBS AND CTK_LIB_Core_WITH_BFD_SHARED)
-- message(FATAL_ERROR "error: Options CTK_BUILD_SHARED_LIBS and WITH_BFD_STATIC are mutually exclusive ! "
-- "hint: Disable WITH_BFD_SHARED and enable WITH_BFD_STATIC if needed.")
--endif()
--
--set(BFD_LIBRARIES)
--unset(HAVE_BFD CACHE)
--
--set(TestBFD_BUILD_LOG "${CMAKE_CURRENT_BINARY_DIR}/CMake/TestBFD-build-log.txt")
--
--if(CTK_LIB_Core_WITH_BFD_STATIC OR CTK_LIB_Core_WITH_BFD_SHARED)
-- if(WIN32)
-- message(FATAL_ERROR "error: Options WITH_BFD_STATIC or WITH_BFD_SHARED are not support on Windows !")
-- endif()
--
-- if(NOT WIN32)
-- include(CheckIncludeFile)
-- CHECK_INCLUDE_file(bfd.h HAVE_BFD_HEADER)
-- if(NOT HAVE_BFD_HEADER)
-- file(WRITE ${TestBFD_BUILD_LOG} "Could *NOT* find the required header file: bfd.h")
-- endif()
--
-- set(BFD_LIBRARY_NAME libbfd.a)
-- set(TestBFD_LIBRARY_MODE STATIC)
-- if(CTK_LIB_Core_WITH_BFD_SHARED)
-- set(BFD_LIBRARY_NAME libbfd${CMAKE_SHARED_LIBRARY_SUFFIX})
-- set(TestBFD_LIBRARY_MODE SHARED)
-- endif()
-- unset(BFD_LIBRARY CACHE)
-- find_library(BFD_LIBRARY ${BFD_LIBRARY_NAME})
-- if(NOT BFD_LIBRARY)
-- file(WRITE ${TestBFD_BUILD_LOG} "Could *NOT* find the required bfd library: ${BFD_LIBRARY_NAME}")
-- endif()
--
-- if(HAVE_BFD_HEADER AND BFD_LIBRARY)
-- # make sure we can build with libbfd
-- #message(STATUS "Checking libbfd")
-- try_compile(HAVE_BFD
-- ${CMAKE_CURRENT_BINARY_DIR}/CMake/TestBFD
-- ${CMAKE_CURRENT_SOURCE_DIR}/CMake/TestBFD
-- TestBFD
-- CMAKE_FLAGS
-- -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}
-- -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-- -DBFD_LIBRARY_NAME:STRING=${BFD_LIBRARY_NAME}
-- OUTPUT_VARIABLE OUTPUT)
-- file(WRITE ${TestBFD_BUILD_LOG} ${OUTPUT})
-- #message(${OUTPUT})
--
-- if(HAVE_BFD)
-- set(BFD_LIBRARIES ${BFD_LIBRARY})
-- endif()
-- endif()
-- endif()
--
--endif()
--
--if(CTK_LIB_Core_WITH_BFD_SHARED AND NOT HAVE_BFD)
-- message(WARNING "warning: CTKCore: Failed to enable BFD support. Disabling CTKCore WITH_BFD_SHARED library option. "
-- "See ${TestBFD_BUILD_LOG} for more details.")
-- set(CTK_LIB_Core_WITH_BFD_SHARED OFF CACHE BOOL "Enable CTKCore Library WITH_BFD_SHARED option" FORCE)
--endif()
--if(CTK_LIB_Core_WITH_BFD_STATIC AND NOT HAVE_BFD)
-- message(WARNING "warning: CTKCore: Failed to enable BFD support. Disabling CTKCore WITH_BFD_STATIC library option. "
-- "See ${TestBFD_BUILD_LOG} for more details.")
-- set(CTK_LIB_Core_WITH_BFD_STATIC OFF CACHE BOOL "Enable CTKCore Library WITH_BFD_STATIC option" FORCE)
--endif()
--
--if(HAVE_BFD)
-- message(STATUS "CTKCore: BFD support enabled [${BFD_LIBRARIES}]")
--else()
-- message(STATUS "CTKCore: BFD support disabled")
--endif()
-diff --git a/Libs/Core/CMakeLists.txt b/Libs/Core/CMakeLists.txt
-index cb953402e3..a94c74fef4 100644
---- a/Libs/Core/CMakeLists.txt
-+++ b/Libs/Core/CMakeLists.txt
-@@ -7,9 +7,6 @@ project(CTKCore)
- # CMake modules
- set(CMAKE_MODULE_PATH ${CTKCore_SOURCE_DIR}/CMake ${CMAKE_MODULE_PATH})
-
--# CMake Macros
--include(CMake/ctkMacroBFDCheck.cmake) # HAVE_BFD will be set to True if it applies
--
- #
- # See CTK/CMake/ctkMacroBuildLib.cmake for details
- #
-@@ -97,13 +94,6 @@ set(KIT_SRCS
- ctkSetName.h
- )
-
--if(HAVE_BFD)
-- list(APPEND KIT_SRCS
-- ctkBinaryFileDescriptor.cpp
-- ctkBinaryFileDescriptor.h
-- )
--endif()
--
- # Abstract class should not be wrapped !
- set_source_files_properties(
- ctkAbstractJob.h
-diff --git a/Libs/Core/Testing/Cpp/CMakeLists.txt b/Libs/Core/Testing/Cpp/CMakeLists.txt
-index 043ef258e1..aa411776f6 100644
---- a/Libs/Core/Testing/Cpp/CMakeLists.txt
-+++ b/Libs/Core/Testing/Cpp/CMakeLists.txt
-@@ -53,11 +53,6 @@ set(KITTests_SRCS
- ctkWorkflowTest2.cpp
- ctkWorkflowTest3.cpp
- )
--if(HAVE_BFD)
-- list(APPEND KITTests_SRCS
-- ctkBinaryFileDescriptorTest1.cpp
-- )
--endif()
-
- include_directories(
- ${CMAKE_SOURCE_DIR}/Libs/Testing
-@@ -87,10 +82,6 @@ set(Tests_Helpers_SRCS
- ctkSingletonTestHelper.h
- )
-
--if(HAVE_BFD)
-- ctk_add_executable_utf8(ctkBinaryFileDescriptorTestHelper ctkBinaryFileDescriptorTestHelper.cpp)
--endif()
--
- if(MSVC)
- add_definitions( /D _CRT_SECURE_NO_WARNINGS)
- endif()
-@@ -131,9 +122,6 @@ SIMPLE_TEST( ctkAbstractQObjectFactoryTest1 )
- if(CMAKE_BUILD_TYPE MATCHES "Debug")
- SIMPLE_TEST( ctkBackTraceTest )
- endif()
--if(HAVE_BFD)
-- SIMPLE_TEST( ctkBinaryFileDescriptorTest1 $<TARGET_FILE:ctkBinaryFileDescriptorTestHelper> )
--endif()
- SIMPLE_TEST( ctkBooleanMapperTest )
- SIMPLE_TEST( ctkCallbackTest1 )
- SIMPLE_TEST( ctkCommandLineParserTest1 )
-diff --git a/Libs/Core/Testing/Cpp/ctkBinaryFileDescriptorTest1.cpp b/Libs/Core/Testing/Cpp/ctkBinaryFileDescriptorTest1.cpp
-deleted file mode 100644
-index b6d2ebd60b..0000000000
---- a/Libs/Core/Testing/Cpp/ctkBinaryFileDescriptorTest1.cpp
-+++ /dev/null
-@@ -1,119 +0,0 @@
--/*=========================================================================
--
-- Library: CTK
--
-- Copyright (c) Kitware Inc.
--
-- Licensed under the Apache License, Version 2.0 (the "License");
-- you may not use this file except in compliance with the License.
-- You may obtain a copy of the License at
--
-- http://www.apache.org/licenses/LICENSE-2.0.txt
--
-- Unless required by applicable law or agreed to in writing, software
-- distributed under the License is distributed on an "AS IS" BASIS,
-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-- See the License for the specific language governing permissions and
-- limitations under the License.
--
--=========================================================================*/
--
--// Qt includes
--#include <QFile>
--
--// CTK includes
--#include "ctkBinaryFileDescriptor.h"
--
--// STD includes
--#include <cstdlib>
--#include <iostream>
--
--//-----------------------------------------------------------------------------
--int ctkBinaryFileDescriptorTest1(int argc, char * argv[])
--{
-- if (argc <= 1)
-- {
-- std::cerr << "Missing argument" << std::endl;
-- return EXIT_FAILURE;
-- }
-- QString filePath(argv[1]);
--
-- if (!QFile::exists(filePath))
-- {
-- std::cerr << "Line " << __LINE__ << " - "
-- << "filePath [" << qPrintable(filePath)
-- << "] do *NOT* exist" << std::endl;
-- return EXIT_FAILURE;
-- }
--
-- ctkBinaryFileDescriptor bfd;
-- if (bfd.load())
-- {
-- // Should fail to load without any valid filename
-- std::cerr << "Line " << __LINE__ << " - "
-- << "Problem with load() method" << std::endl;
-- return EXIT_FAILURE;
-- }
-- if (!bfd.unload())
-- {
-- // Unload inconditionnally return True
-- std::cerr << "Line " << __LINE__ << " - "
-- << "Problem with unload() method" << std::endl;
-- return EXIT_FAILURE;
-- }
-- if (bfd.isLoaded())
-- {
-- std::cerr << "Line " << __LINE__ << " - "
-- << "Problem with isLoaded() method" << std::endl;
-- return EXIT_FAILURE;
-- }
-- if (!bfd.fileName().isEmpty())
-- {
-- std::cerr << "Line " << __LINE__ << " - "
-- << "Problem with fileName() method" << std::endl;
-- return EXIT_FAILURE;
-- }
--
-- bfd.setFileName(filePath);
--
-- if (bfd.fileName() != filePath)
-- {
-- std::cerr << "Line " << __LINE__ << " - "
-- << "Problem with fileName() method" << std::endl;
-- return EXIT_FAILURE;
-- }
--
-- if (!bfd.load())
-- {
-- // Should succeed since a valid filename is provided
-- std::cerr << "Line " << __LINE__ << " - "
-- << "Problem with load() method" << std::endl;
-- return EXIT_FAILURE;
-- }
--
-- void * main_pointer = bfd.resolve("main");
-- if (!main_pointer)
-- {
-- std::cerr << "Line " << __LINE__ << " - "
-- << "Problem with resolve() method - "
-- << "Failed to revolve 'main' symbol !" << std::endl;
-- return EXIT_FAILURE;
-- }
--
-- void * mtBlancElevationInMeters_pointer = bfd.resolve("MtBlancElevationInMeters");
-- int * mtBlancElevationInMeters = reinterpret_cast<int*>(mtBlancElevationInMeters_pointer);
-- if (!mtBlancElevationInMeters)
-- {
-- std::cerr << "Line " << __LINE__ << " - "
-- << "Failed to case 'mtBlancElevationInMeters' pointer !" << std::endl;
-- return EXIT_FAILURE;
-- }
-- if (*mtBlancElevationInMeters != 4810)
-- {
-- std::cerr << "Line " << __LINE__ << " - "
-- << "Failed to invoke function associated with symbol 'MtBlancElevationInMeters' !" << std::endl;
-- return EXIT_FAILURE;
-- }
--
-- return EXIT_SUCCESS;
--}
-diff --git a/Libs/Core/Testing/Cpp/ctkBinaryFileDescriptorTestHelper.cpp b/Libs/Core/Testing/Cpp/ctkBinaryFileDescriptorTestHelper.cpp
-deleted file mode 100644
-index 40eff2abea..0000000000
---- a/Libs/Core/Testing/Cpp/ctkBinaryFileDescriptorTestHelper.cpp
-+++ /dev/null
-@@ -1,41 +0,0 @@
--/*=========================================================================
--
-- Library: CTK
--
-- Copyright (c) Kitware Inc.
--
-- Licensed under the Apache License, Version 2.0 (the "License");
-- you may not use this file except in compliance with the License.
-- You may obtain a copy of the License at
--
-- http://www.apache.org/licenses/LICENSE-2.0.txt
--
-- Unless required by applicable law or agreed to in writing, software
-- distributed under the License is distributed on an "AS IS" BASIS,
-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-- See the License for the specific language governing permissions and
-- limitations under the License.
--
--=========================================================================*/
--
--// STD includes
--#include <iostream>
--#include <cstdlib>
--
--#ifdef WIN32
--# define BFD_TEST_HELPER_EXPORT __declspec(dllexport)
--#else
--# define BFD_TEST_HELPER_EXPORT
--#endif
--
--extern "C" {
--
-- BFD_TEST_HELPER_EXPORT int MtBlancElevationInMeters = 4810;
--}
--
--int main(int /*argc*/, char* /*argv*/[])
--{
-- std::cout << "Mt Blanc elevation is " << MtBlancElevationInMeters
-- << " meters" << std::endl;
-- return EXIT_SUCCESS;
--}
-diff --git a/Libs/Core/ctk_library_options.cmake b/Libs/Core/ctk_library_options.cmake
-deleted file mode 100644
-index d824971c3f..0000000000
---- a/Libs/Core/ctk_library_options.cmake
-+++ /dev/null
-@@ -1,14 +0,0 @@
--#
--# See CMake/ctkMacroAddCtkLibraryOptions.cmake
--#
--# This file should list of options available for considered CTK library
--# For example: MYOPT1:OFF MYOPT2:ON
--#
--
--# Note: Options WITH_BFD_SHARED and WITH_BFD_STATIC are mutually exclusive.
--# Enabling both options will trigger a configuration error.
--
--set(ctk_library_options
-- WITH_BFD_SHARED:OFF
-- WITH_BFD_STATIC:OFF
-- )
-diff --git a/Libs/Core/target_libraries.cmake b/Libs/Core/target_libraries.cmake
-index bd6d821595..55d7641630 100644
---- a/Libs/Core/target_libraries.cmake
-+++ b/Libs/Core/target_libraries.cmake
-@@ -5,5 +5,4 @@
- #
-
- set(target_libraries
-- BFD_LIBRARIES
- )
-
=====================================
debian/patches/series
=====================================
@@ -1,3 +1,2 @@
qt6svg_1453.patch
oflist.patch
-bfd_removal.diff
View it on GitLab: https://salsa.debian.org/med-team/ctk/-/compare/11bc244a98987deccecb1a17b628e3bb1dbbb24e...f368e900a9df728a58ebd9b2cb7cedb33afbb130
--
View it on GitLab: https://salsa.debian.org/med-team/ctk/-/compare/11bc244a98987deccecb1a17b628e3bb1dbbb24e...f368e900a9df728a58ebd9b2cb7cedb33afbb130
You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20260903/7bf9e909/attachment-0001.htm>
More information about the debian-med-commit
mailing list