[med-svn] [Git][med-team/ctk][master] 5 commits: update changelog
Fernando Hueso (@ferdymercury)
gitlab at salsa.debian.org
Sun Aug 30 23:18:06 BST 2026
Fernando Hueso pushed to branch master at Debian Med / ctk
Commits:
62e3d58f by Fernando Hueso at 2026-08-31T00:04:09+02:00
update changelog
- - - - -
cdf9e91b by Fernando Hueso at 2026-08-31T00:10:28+02:00
remove non DFSG compliant optional files
- - - - -
78a44852 by Fernando Hueso at 2026-08-31T00:12:47+02:00
rm no longer needed license from copyright
- - - - -
c76f7183 by Fernando Hueso at 2026-08-31T00:14:09+02:00
update patch since removed files
- - - - -
11bc244a by Fernando Hueso at 2026-08-31T00:17:49+02:00
fix changelog
- - - - -
6 changed files:
- − Libs/Core/ctkBinaryFileDescriptor.cpp
- − Libs/Core/ctkBinaryFileDescriptor.h
- debian/changelog
- debian/copyright
- + debian/patches/bfd_removal.diff
- debian/patches/series
Changes:
=====================================
Libs/Core/ctkBinaryFileDescriptor.cpp deleted
=====================================
@@ -1,214 +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.
-
-=========================================================================*/
-/*=========================================================================
-
- Portions (c) Copyright Brigham and Women's Hospital (BWH)
- All Rights Reserved.
-
- See http://www.slicer.org/copyright/copyright.txt for details.
-
- Program: Module Description Parser
-
-=========================================================================*/
-
-// CTK includes
-#include "ctkBinaryFileDescriptor.h"
-#include "ctkPimpl.h"
-
-// BinUtils includes
-#include <bfd.h>
-
-// STD includes
-#include <cstdlib>
-#include <utility>
-#include <vector>
-
-//-----------------------------------------------------------------------------
-class ctkBinaryFileDescriptorPrivate
-{
-public:
- // Convenient typedefs
- typedef std::pair<asection*, void* > MemorySectionType;
- typedef std::vector<MemorySectionType> MemorySectionContainer;
-
- ctkBinaryFileDescriptorPrivate();
-
- /// Resolves a symbol
- void* resolve(const char * symbol);
-
- MemorySectionContainer Sections;
- bfd * BFD;
-
- QString FileName;
-};
-
-// --------------------------------------------------------------------------
-// ctkBinaryFileDescriptorPrivate methods
-
-// --------------------------------------------------------------------------
-ctkBinaryFileDescriptorPrivate::ctkBinaryFileDescriptorPrivate()
-{
- this->BFD = 0;
-}
-
-// --------------------------------------------------------------------------
-void* ctkBinaryFileDescriptorPrivate::resolve(const char * symbol)
-{
- if (!this->BFD)
- {
- return 0;
- }
-
- void *addr = 0;
-
- // Get the symbol table
- long storageNeeded = bfd_get_symtab_upper_bound(this->BFD);
- asymbol ** symbolTable = reinterpret_cast<asymbol **>(malloc(storageNeeded));
-
- long numberOfSymbols = bfd_canonicalize_symtab(this->BFD, symbolTable);
-
- // Run through the symbol table, looking for the requested symbol
- for (int i = 0; i < numberOfSymbols; i++)
- {
- if (strcmp(symbol, symbolTable[i]->name) == 0)
- {
- // Found the symbol, get the section pointer
- asection *p = bfd_get_section(symbolTable[i]);
-
- // Do we have this section already?
- MemorySectionContainer::iterator sit;
- for (sit = this->Sections.begin(); sit != this->Sections.end(); ++sit)
- {
- if ((*sit).first == p)
- {
- break;
- }
- }
-
- PTR mem;
- if (sit == this->Sections.end())
- {
- // Get the contents of the section
- bfd_size_type sz = bfd_get_section_size (p);
- mem = malloc (sz);
- if (bfd_get_section_contents(this->BFD, p, mem, static_cast<file_ptr>(0), sz))
- {
- this->Sections.push_back( MemorySectionType(p, mem) );
- }
- else
- {
- // Error reading section
- free(mem);
- break;
- }
- }
- else
- {
- // pull the start of the section block from the cache
- mem = const_cast<void*>((*sit).second);
- }
-
- // determine the address of this section
- addr = reinterpret_cast<char *>(mem)
- + (bfd_asymbol_value(symbolTable[i]) - bfd_asymbol_base(symbolTable[i]));
- break;
- }
- }
-
- // cleanup. just delete the outer vector for the symbol table
- free(symbolTable);
-
- return addr;
-}
-
-// --------------------------------------------------------------------------
-// ctkBinaryFileDescriptor methods
-
-// --------------------------------------------------------------------------
-ctkBinaryFileDescriptor::ctkBinaryFileDescriptor(): d_ptr(new ctkBinaryFileDescriptorPrivate)
-{
-}
-
-// --------------------------------------------------------------------------
-ctkBinaryFileDescriptor::ctkBinaryFileDescriptor(const QString& _fileName):
- d_ptr(new ctkBinaryFileDescriptorPrivate)
-{
- Q_D(ctkBinaryFileDescriptor);
- d->FileName = _fileName;
-}
-
-// --------------------------------------------------------------------------
-ctkBinaryFileDescriptor::~ctkBinaryFileDescriptor()
-{
-}
-
-// --------------------------------------------------------------------------
-CTK_GET_CPP(ctkBinaryFileDescriptor, QString, fileName, FileName);
-CTK_SET_CPP(ctkBinaryFileDescriptor, const QString&, setFileName, FileName);
-
-// --------------------------------------------------------------------------
-bool ctkBinaryFileDescriptor::isLoaded() const
-{
- Q_D(const ctkBinaryFileDescriptor);
- return (d->BFD != 0);
-}
-
-// --------------------------------------------------------------------------
-bool ctkBinaryFileDescriptor::load()
-{
- Q_D(ctkBinaryFileDescriptor);
-
- bfd_init();
- bfd * abfd = bfd_openr(d->FileName.toUtf8(), NULL);
- if (!abfd)
- {
- return false;
- }
-
- /* make sure it's an object file */
- if (!bfd_check_format (abfd, bfd_object))
- {
- bfd_close(abfd);
- return false;
- }
-
- d->BFD = abfd;
- return true;
-}
-
-// --------------------------------------------------------------------------
-bool ctkBinaryFileDescriptor::unload()
-{
- Q_D(ctkBinaryFileDescriptor);
-
- if (d->BFD)
- {
- bfd_close(d->BFD);
- d->BFD = 0;
- }
- return true;
-}
-
-// --------------------------------------------------------------------------
-void* ctkBinaryFileDescriptor::resolve(const char * symbol)
-{
- Q_D(ctkBinaryFileDescriptor);
- return d->resolve(symbol);
-}
=====================================
Libs/Core/ctkBinaryFileDescriptor.h deleted
=====================================
@@ -1,76 +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.
-
-=========================================================================*/
-/*=========================================================================
-
- Portions (c) Copyright Brigham and Women's Hospital (BWH)
- All Rights Reserved.
-
- See http://www.slicer.org/copyright/copyright.txt for details.
-
- Program: Module Description Parser
-
-=========================================================================*/
-
-#ifndef __ctkBinaryFileDescriptor_h
-#define __ctkBinaryFileDescriptor_h
-
-// Qt includes
-#include <QString>
-#include <QScopedPointer>
-
-#include "ctkCoreExport.h"
-
-
-class ctkBinaryFileDescriptorPrivate;
-
-/// \ingroup Core
-/// Allows to resolve global symbols contained into an executable.
-/// Implementation valid only for unix-like systems (Linux, Mac, ...)
-class CTK_CORE_EXPORT ctkBinaryFileDescriptor
-{
-public:
- ctkBinaryFileDescriptor();
- ctkBinaryFileDescriptor(const QString& _fileName);
- virtual ~ctkBinaryFileDescriptor();
-
- QString fileName()const;
- void setFileName(const QString& _fileName);
-
- /// Load the object file containing the symbols
- bool load();
-
- /// Unload / close the object file
- bool unload();
-
- bool isLoaded() const;
-
- /// Get the address of a symbol in memory
- void* resolve(const char * symbol);
-
-protected:
- QScopedPointer<ctkBinaryFileDescriptorPrivate> d_ptr;
-
-private:
- Q_DECLARE_PRIVATE(ctkBinaryFileDescriptor);
- Q_DISABLE_COPY(ctkBinaryFileDescriptor);
-
-};
-
-#endif
=====================================
debian/changelog
=====================================
@@ -1,3 +1,21 @@
+ctk (2026.08.06-2) UNRELEASED; urgency=medium
+
+ [ Andreas Tille ]
+ * Remove unneeded docs file
+
+ [ Fernando Hueso ]
+ * Copy-paste DSTC license
+ * add BSL license of original code
+ * multiple name for B3C
+ * add DCMTK license for one file
+ * Formatting fixes
+ * another spelt variant
+ * remove non DFSG compliant optional files
+ * rm no longer needed license from copyright
+ * update patch since removed files
+
+ -- Fernando Hueso <Fernando.Hueso at uv.es> Mon, 31 Aug 2026 00:16:23 +0200
+
ctk (2026.08.06-1) unstable; urgency=medium
[ Andreas Tille ]
=====================================
debian/copyright
=====================================
@@ -18,14 +18,6 @@ Copyright:
Mint Medical GmbH
License: Apache-2.0
-Files:
- Libs/Core/ctkBinaryFileDescriptor.cpp
- Libs/Core/ctkBinaryFileDescriptor.h
-Copyright:
- Brigham and Women's Hospital (BWH)
- Kitware Inc.
-License: Apache-2.0 or 3D-Slicer-1.0
-
Files:
Libs/Core/ctkBackTrace.cpp
Copyright:
@@ -312,198 +304,6 @@ License: ParaView-1.2
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
OF SUCH DAMAGE.
-License: 3D-Slicer-1.0
- 3D Slicer Contribution and Software License Agreement ("Agreement")
- Version 1.0 (December 20, 2005)
- .
- This Agreement covers contributions to and downloads from the 3D
- Slicer project ("Slicer") maintained by The Brigham and Women's
- Hospital, Inc. ("Brigham"). Part A of this Agreement applies to
- contributions of software and/or data to Slicer (including making
- revisions of or additions to code and/or data already in Slicer). Part
- B of this Agreement applies to downloads of software and/or data from
- Slicer. Part C of this Agreement applies to all transactions with
- Slicer. If you distribute Software (as defined below) downloaded from
- Slicer, all of the paragraphs of Part B of this Agreement must be
- included with and apply to such Software.
- .
- Your contribution of software and/or data to Slicer (including prior
- to the date of the first publication of this Agreement, each a
- "Contribution") and/or downloading, copying, modifying, displaying,
- distributing or use of any software and/or data from Slicer
- (collectively, the "Software") constitutes acceptance of all of the
- terms and conditions of this Agreement. If you do not agree to such
- terms and conditions, you have no right to contribute your
- Contribution, or to download, copy, modify, display, distribute or use
- the Software.
- .
- PART A. CONTRIBUTION AGREEMENT - License to Brigham with Right to
- Sublicense ("Contribution Agreement").
- .
- 1. As used in this Contribution Agreement, "you" means the individual
- contributing the Contribution to Slicer and the institution or
- entity which employs or is otherwise affiliated with such
- individual in connection with such Contribution.
- .
- 2. This Contribution Agreement applies to all Contributions made to
- Slicer, including without limitation Contributions made prior to
- the date of first publication of this Agreement. If at any time you
- make a Contribution to Slicer, you represent that (i) you are
- legally authorized and entitled to make such Contribution and to
- grant all licenses granted in this Contribution Agreement with
- respect to such Contribution; (ii) if your Contribution includes
- any patient data, all such data is de-identified in accordance with
- U.S. confidentiality and security laws and requirements, including
- but not limited to the Health Insurance Portability and
- Accountability Act (HIPAA) and its regulations, and your disclosure
- of such data for the purposes contemplated by this Agreement is
- properly authorized and in compliance with all applicable laws and
- regulations; and (iii) you have preserved in the Contribution all
- applicable attributions, copyright notices and licenses for any
- third party software or data included in the Contribution.
- .
- 3. Except for the licenses granted in this Agreement, you reserve all
- right, title and interest in your Contribution.
- .
- 4. You hereby grant to Brigham, with the right to sublicense, a
- perpetual, worldwide, non-exclusive, no charge, royalty-free,
- irrevocable license to use, reproduce, make derivative works of,
- display and distribute the Contribution. If your Contribution is
- protected by patent, you hereby grant to Brigham, with the right to
- sublicense, a perpetual, worldwide, non-exclusive, no-charge,
- royalty-free, irrevocable license under your interest in patent
- rights covering the Contribution, to make, have made, use, sell and
- otherwise transfer your Contribution, alone or in combination with
- any other code.
- .
- 5. You acknowledge and agree that Brigham may incorporate your
- Contribution into Slicer and may make Slicer available to members
- of the public on an open source basis under terms substantially in
- accordance with the Software License set forth in Part B of this
- Agreement. You further acknowledge and agree that Brigham shall
- have no liability arising in connection with claims resulting from
- your breach of any of the terms of this Agreement.
- .
- 6. YOU WARRANT THAT TO THE BEST OF YOUR KNOWLEDGE YOUR CONTRIBUTION
- DOES NOT CONTAIN ANY CODE THAT REQURES OR PRESCRIBES AN "OPEN
- SOURCE LICENSE" FOR DERIVATIVE WORKS (by way of non-limiting
- example, the GNU General Public License or other so-called
- "reciprocal" license that requires any derived work to be licensed
- under the GNU General Public License or other "open source
- license").
- .
- PART B. DOWNLOADING AGREEMENT - License from Brigham with Right to
- Sublicense ("Software License").
- .
- 1. As used in this Software License, "you" means the individual
- downloading and/or using, reproducing, modifying, displaying and/or
- distributing the Software and the institution or entity which
- employs or is otherwise affiliated with such individual in
- connection therewith. The Brigham and Women?s Hospital,
- Inc. ("Brigham") hereby grants you, with right to sublicense, with
- respect to Brigham's rights in the software, and data, if any,
- which is the subject of this Software License (collectively, the
- "Software"), a royalty-free, non-exclusive license to use,
- reproduce, make derivative works of, display and distribute the
- Software, provided that:
- .
- (a) you accept and adhere to all of the terms and conditions of this
- Software License;
- .
- (b) in connection with any copy of or sublicense of all or any portion
- of the Software, all of the terms and conditions in this Software
- License shall appear in and shall apply to such copy and such
- sublicense, including without limitation all source and executable
- forms and on any user documentation, prefaced with the following
- words: "All or portions of this licensed product (such portions are
- the "Software") have been obtained under license from The Brigham and
- Women's Hospital, Inc. and are subject to the following terms and
- conditions:"
- .
- (c) you preserve and maintain all applicable attributions, copyright
- notices and licenses included in or applicable to the Software;
- .
- (d) modified versions of the Software must be clearly identified and
- marked as such, and must not be misrepresented as being the original
- Software; and
- .
- (e) you consider making, but are under no obligation to make, the
- source code of any of your modifications to the Software freely
- available to others on an open source basis.
- .
- 2. The license granted in this Software License includes without
- limitation the right to (i) incorporate the Software into
- proprietary programs (subject to any restrictions applicable to
- such programs), (ii) add your own copyright statement to your
- modifications of the Software, and (iii) provide additional or
- different license terms and conditions in your sublicenses of
- modifications of the Software; provided that in each case your use,
- reproduction or distribution of such modifications otherwise
- complies with the conditions stated in this Software License.
- .
- 3. This Software License does not grant any rights with respect to
- third party software, except those rights that Brigham has been
- authorized by a third party to grant to you, and accordingly you
- are solely responsible for (i) obtaining any permissions from third
- parties that you need to use, reproduce, make derivative works of,
- display and distribute the Software, and (ii) informing your
- sublicensees, including without limitation your end-users, of their
- obligations to secure any such required permissions.
- .
- 4. The Software has been designed for research purposes only and has
- not been reviewed or approved by the Food and Drug Administration
- or by any other agency. YOU ACKNOWLEDGE AND AGREE THAT CLINICAL
- APPLICATIONS ARE NEITHER RECOMMENDED NOR ADVISED. Any
- commercialization of the Software is at the sole risk of the party
- or parties engaged in such commercialization. You further agree to
- use, reproduce, make derivative works of, display and distribute
- the Software in compliance with all applicable governmental laws,
- regulations and orders, including without limitation those relating
- to export and import control.
- .
- 5. The Software is provided "AS IS" and neither Brigham nor any
- contributor to the software (each a "Contributor") shall have any
- obligation to provide maintenance, support, updates, enhancements
- or modifications thereto. BRIGHAM AND ALL CONTRIBUTORS SPECIFICALLY
- DISCLAIM ALL EXPRESS AND IMPLIED WARRANTIES OF ANY KIND INCLUDING,
- BUT NOT LIMITED TO, ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR
- A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
- BRIGHAM OR ANY CONTRIBUTOR BE LIABLE TO ANY PARTY FOR DIRECT,
- INDIRECT, SPECIAL, INCIDENTAL, EXEMPLARY OR CONSEQUENTIAL DAMAGES
- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY ARISING IN ANY WAY
- RELATED TO THE SOFTWARE, EVEN IF BRIGHAM OR ANY CONTRIBUTOR HAS
- BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. TO THE MAXIMUM
- EXTENT NOT PROHIBITED BY LAW OR REGULATION, YOU FURTHER ASSUME ALL
- LIABILITY FOR YOUR USE, REPRODUCTION, MAKING OF DERIVATIVE WORKS,
- DISPLAY, LICENSE OR DISTRIBUTION OF THE SOFTWARE AND AGREE TO
- INDEMNIFY AND HOLD HARMLESS BRIGHAM AND ALL CONTRIBUTORS FROM AND
- AGAINST ANY AND ALL CLAIMS, SUITS, ACTIONS, DEMANDS AND JUDGMENTS
- ARISING THEREFROM.
- .
- 6. None of the names, logos or trademarks of Brigham or any of
- Brigham's affiliates or any of the Contributors, or any funding
- agency, may be used to endorse or promote products produced in
- whole or in part by operation of the Software or derived from or
- based on the Software without specific prior written permission
- from the applicable party.
- .
- 7. Any use, reproduction or distribution of the Software which is not
- in accordance with this Software License shall automatically revoke
- all rights granted to you under this Software License and render
- Paragraphs 1 and 2 of this Software License null and void.
- .
- 8. This Software License does not grant any rights in or to any
- intellectual property owned by Brigham or any Contributor except
- those rights expressly granted hereunder.
- .
- PART C. MISCELLANEOUS
- .
- This Agreement shall be governed by and construed in accordance with
- the laws of The Commonwealth of Massachusetts without regard to
- principles of conflicts of law. This Agreement shall supercede and
- replace any license terms that you may have agreed to previously with
- respect to Slicer.
-
License: DSTC
DSTC Public License (DPL)
.
=====================================
debian/patches/bfd_removal.diff
=====================================
@@ -0,0 +1,406 @@
+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,2 +1,3 @@
qt6svg_1453.patch
oflist.patch
+bfd_removal.diff
View it on GitLab: https://salsa.debian.org/med-team/ctk/-/compare/6ddc84e79172cf158a2dd2ae7d12701b3d7caa3c...11bc244a98987deccecb1a17b628e3bb1dbbb24e
--
View it on GitLab: https://salsa.debian.org/med-team/ctk/-/compare/6ddc84e79172cf158a2dd2ae7d12701b3d7caa3c...11bc244a98987deccecb1a17b628e3bb1dbbb24e
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/20260830/67a19ed6/attachment-0001.htm>
More information about the debian-med-commit
mailing list