[med-svn] [Git][med-team/odil][master] Remove old patches
Anton Gladky (@gladk)
gitlab at salsa.debian.org
Fri Mar 20 06:33:03 GMT 2026
Anton Gladky pushed to branch master at Debian Med / odil
Commits:
f0398114 by Anton Gladky at 2026-03-20T07:32:45+01:00
Remove old patches
- - - - -
3 changed files:
- debian/patches/fix_boost190.patch
- debian/patches/series
- debian/patches/update-python-install-path.patch
Changes:
=====================================
debian/patches/fix_boost190.patch
=====================================
@@ -6,25 +6,30 @@ Author: Anton Gladky <gladk at debian.org>
Bug-Debian: https://bugs.debian.org/1128135
Forwarded: no
---- odil-0.13.0.orig/src/CMakeLists.txt
-+++ odil-0.13.0/src/CMakeLists.txt
+Index: odil_/src/CMakeLists.txt
+===================================================================
+--- odil_.orig/src/CMakeLists.txt
++++ odil_/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-find_package(Boost REQUIRED COMPONENTS date_time filesystem log system)
+find_package(Boost REQUIRED COMPONENTS filesystem log)
find_package(ICU REQUIRED COMPONENTS uc)
find_package(JsonCpp REQUIRED)
if(WITH_DCMTK)
---- odil-0.13.0.orig/wrappers/js/CMakeLists.txt
-+++ odil-0.13.0/wrappers/js/CMakeLists.txt
+Index: odil_/wrappers/js/CMakeLists.txt
+===================================================================
+--- odil_.orig/wrappers/js/CMakeLists.txt
++++ odil_/wrappers/js/CMakeLists.txt
@@ -1,4 +1,4 @@
-find_package(Boost REQUIRED COMPONENTS system)
+find_package(Boost REQUIRED)
if(NOT EXISTS "${CMAKE_CURRENT_BINARY_DIR}/icu/source/common")
file(
-
---- odil-0.13.0.orig/tests/code/EchoSCP.cpp
-+++ odil-0.13.0/tests/code/EchoSCP.cpp
+Index: odil_/tests/code/EchoSCP.cpp
+===================================================================
+--- odil_.orig/tests/code/EchoSCP.cpp
++++ odil_/tests/code/EchoSCP.cpp
@@ -23,7 +23,7 @@ struct Status
void run_server(Status * status)
{
@@ -34,8 +39,10 @@ Forwarded: no
try
{
---- odil-0.13.0.orig/tests/code/FindSCP.cpp
-+++ odil-0.13.0/tests/code/FindSCP.cpp
+Index: odil_/tests/code/FindSCP.cpp
+===================================================================
+--- odil_.orig/tests/code/FindSCP.cpp
++++ odil_/tests/code/FindSCP.cpp
@@ -8,6 +8,8 @@
#include <thread>
#include <vector>
@@ -54,8 +61,10 @@ Forwarded: no
try
{
---- odil-0.13.0.orig/tests/code/GetSCP.cpp
-+++ odil-0.13.0/tests/code/GetSCP.cpp
+Index: odil_/tests/code/GetSCP.cpp
+===================================================================
+--- odil_.orig/tests/code/GetSCP.cpp
++++ odil_/tests/code/GetSCP.cpp
@@ -8,6 +8,7 @@
#include <thread>
#include <vector>
@@ -73,8 +82,10 @@ Forwarded: no
try
{
---- odil-0.13.0.orig/tests/code/MoveSCP.cpp
-+++ odil-0.13.0/tests/code/MoveSCP.cpp
+Index: odil_/tests/code/MoveSCP.cpp
+===================================================================
+--- odil_.orig/tests/code/MoveSCP.cpp
++++ odil_/tests/code/MoveSCP.cpp
@@ -7,6 +7,7 @@
#include <thread>
#include <vector>
@@ -92,8 +103,10 @@ Forwarded: no
try
{
---- odil-0.13.0.orig/tests/code/NCreateSCP.cpp
-+++ odil-0.13.0/tests/code/NCreateSCP.cpp
+Index: odil_/tests/code/NCreateSCP.cpp
+===================================================================
+--- odil_.orig/tests/code/NCreateSCP.cpp
++++ odil_/tests/code/NCreateSCP.cpp
@@ -23,7 +23,7 @@ struct Status
void run_server(Status * status)
{
@@ -103,8 +116,10 @@ Forwarded: no
try
{
---- odil-0.13.0.orig/tests/code/SCPDispatcher.cpp
-+++ odil-0.13.0/tests/code/SCPDispatcher.cpp
+Index: odil_/tests/code/SCPDispatcher.cpp
+===================================================================
+--- odil_.orig/tests/code/SCPDispatcher.cpp
++++ odil_/tests/code/SCPDispatcher.cpp
@@ -5,6 +5,8 @@
#include <memory>
#include <thread>
@@ -123,12 +138,10 @@ Forwarded: no
try
{
-
-
-Index: odil-0.13.0/src/odil/Association.cpp
+Index: odil_/src/odil/Association.cpp
===================================================================
---- odil-0.13.0.orig/src/odil/Association.cpp
-+++ odil-0.13.0/src/odil/Association.cpp
+--- odil_.orig/src/odil/Association.cpp
++++ odil_/src/odil/Association.cpp
@@ -9,6 +9,7 @@
#include "Association.h"
@@ -148,10 +161,10 @@ Index: odil-0.13.0/src/odil/Association.cpp
}
Association
-Index: odil-0.13.0/src/odil/MoveSCU.cpp
+Index: odil_/src/odil/MoveSCU.cpp
===================================================================
---- odil-0.13.0.orig/src/odil/MoveSCU.cpp
-+++ odil-0.13.0/src/odil/MoveSCU.cpp
+--- odil_.orig/src/odil/MoveSCU.cpp
++++ odil_/src/odil/MoveSCU.cpp
@@ -104,7 +104,7 @@ MoveSCU
while(!done)
{
@@ -161,10 +174,10 @@ Index: odil-0.13.0/src/odil/MoveSCU.cpp
store_association.set_tcp_timeout(timeout);
store_association.set_message_timeout(timeout);
-Index: odil-0.13.0/src/odil/dul/StateMachine.cpp
+Index: odil_/src/odil/dul/StateMachine.cpp
===================================================================
---- odil-0.13.0.orig/src/odil/dul/StateMachine.cpp
-+++ odil-0.13.0/src/odil/dul/StateMachine.cpp
+--- odil_.orig/src/odil/dul/StateMachine.cpp
++++ odil_/src/odil/dul/StateMachine.cpp
@@ -38,7 +38,7 @@ namespace dul
StateMachine
@@ -192,10 +205,10 @@ Index: odil-0.13.0/src/odil/dul/StateMachine.cpp
this->_transport.get_service().poll();
// FIXME: check that the timer was aborted
/*
-Index: odil-0.13.0/src/odil/dul/StateMachine.h
+Index: odil_/src/odil/dul/StateMachine.h
===================================================================
---- odil-0.13.0.orig/src/odil/dul/StateMachine.h
-+++ odil-0.13.0/src/odil/dul/StateMachine.h
+--- odil_.orig/src/odil/dul/StateMachine.h
++++ odil_/src/odil/dul/StateMachine.h
@@ -64,7 +64,7 @@ public:
};
@@ -214,10 +227,10 @@ Index: odil-0.13.0/src/odil/dul/StateMachine.h
/// @brief Callback checking whether an association request is acceptable.
AssociationAcceptor _association_acceptor;
-Index: odil-0.13.0/src/odil/dul/Transport.cpp
+Index: odil_/src/odil/dul/Transport.cpp
===================================================================
---- odil-0.13.0.orig/src/odil/dul/Transport.cpp
-+++ odil-0.13.0/src/odil/dul/Transport.cpp
+--- odil_.orig/src/odil/dul/Transport.cpp
++++ odil_/src/odil/dul/Transport.cpp
@@ -11,8 +11,9 @@
#include <memory>
#include <string>
@@ -264,10 +277,10 @@ Index: odil-0.13.0/src/odil/dul/Transport.cpp
}
void
-Index: odil-0.13.0/src/odil/dul/Transport.h
+Index: odil_/src/odil/dul/Transport.h
===================================================================
---- odil-0.13.0.orig/src/odil/dul/Transport.h
-+++ odil-0.13.0/src/odil/dul/Transport.h
+--- odil_.orig/src/odil/dul/Transport.h
++++ odil_/src/odil/dul/Transport.h
@@ -12,8 +12,9 @@
#include <memory>
#include <string>
@@ -297,10 +310,10 @@ Index: odil-0.13.0/src/odil/dul/Transport.h
std::shared_ptr<boost::asio::ip::tcp::acceptor> _acceptor;
-Index: odil-0.13.0/wrappers/python/Association.cpp
+Index: odil_/wrappers/python/Association.cpp
===================================================================
---- odil-0.13.0.orig/wrappers/python/Association.cpp
-+++ odil-0.13.0/wrappers/python/Association.cpp
+--- odil_.orig/wrappers/python/Association.cpp
++++ odil_/wrappers/python/Association.cpp
@@ -6,8 +6,9 @@
* for details.
************************************************************************/
@@ -329,10 +342,10 @@ Index: odil-0.13.0/wrappers/python/Association.cpp
}
}
-Index: odil-0.13.0/src/odil/SCPDispatcher.cpp
+Index: odil_/src/odil/SCPDispatcher.cpp
===================================================================
---- odil-0.13.0.orig/src/odil/SCPDispatcher.cpp
-+++ odil-0.13.0/src/odil/SCPDispatcher.cpp
+--- odil_.orig/src/odil/SCPDispatcher.cpp
++++ odil_/src/odil/SCPDispatcher.cpp
@@ -12,6 +12,7 @@
#include "odil/SCPDispatcher.h"
#include "odil/Value.h"
=====================================
debian/patches/series
=====================================
@@ -5,6 +5,4 @@ remove-network-unit-tests.patch
fix-g++-13.patch
fix-boost-asio-1.87.patch
update-python-install-path.patch
-fix-deadline-timer
-fix_tests.patch
fix_boost190.patch
=====================================
debian/patches/update-python-install-path.patch
=====================================
@@ -2,10 +2,10 @@ Description: Install python in dist-packages
Author: Julien Lamy <lamy at unistra.fr>
Last-Update: 2025-08-19
Forwarded: not-needed
-Index: odil/wrappers/python/CMakeLists.txt
+Index: odil_/wrappers/python/CMakeLists.txt
===================================================================
---- odil.orig/wrappers/python/CMakeLists.txt
-+++ odil/wrappers/python/CMakeLists.txt
+--- odil_.orig/wrappers/python/CMakeLists.txt
++++ odil_/wrappers/python/CMakeLists.txt
@@ -32,7 +32,7 @@ execute_process(
COMMAND ${Python_EXECUTABLE}
-c "import os; import sysconfig; \
@@ -15,10 +15,10 @@ Index: odil/wrappers/python/CMakeLists.txt
print(path.replace(os.path.sep, '/'))"
OUTPUT_VARIABLE PYTHON_SITE_PACKAGES
OUTPUT_STRIP_TRAILING_WHITESPACE)
-Index: odil/applications/CMakeLists.txt
+Index: odil_/applications/CMakeLists.txt
===================================================================
---- odil.orig/applications/CMakeLists.txt
-+++ odil/applications/CMakeLists.txt
+--- odil_.orig/applications/CMakeLists.txt
++++ odil_/applications/CMakeLists.txt
@@ -11,7 +11,7 @@ if(BUILD_PYTHON_WRAPPERS)
COMMAND ${Python_EXECUTABLE}
-c "import os; import sysconfig; \
View it on GitLab: https://salsa.debian.org/med-team/odil/-/commit/f0398114e392d66e5f2dc173b40a874c5a9a1cf3
--
View it on GitLab: https://salsa.debian.org/med-team/odil/-/commit/f0398114e392d66e5f2dc173b40a874c5a9a1cf3
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20260320/c7dea57e/attachment-0001.htm>
More information about the debian-med-commit
mailing list