Accepting request 1174929 from home:DocB:Orthanc
- boost185.diff added to fix TW build issue OBS-URL: https://build.opensuse.org/request/show/1174929 OBS-URL: https://build.opensuse.org/package/show/graphics/orthanc?expand=0&rev=75
This commit is contained in:
Axel Braun
Git OBS Bridge
parent
4eac3fc0cc
commit
f9c87af6fa
57
boost185.diff
Normal file
57
boost185.diff
Normal file
@ -0,0 +1,57 @@
|
||||
# HG changeset patch
|
||||
# User Sebastien Jodogne <s.jodogne@gmail.com>
|
||||
# Date 1715887975 -7200
|
||||
# Node ID a7c88563c8cc18afdacc8e261e5d81e82301456f
|
||||
# Parent 72dcf3a8d7d526e95c8f290801a0b675a0533590
|
||||
fix build with boost 1.85.0
|
||||
|
||||
diff -r 72dcf3a8d7d5 -r a7c88563c8cc OrthancFramework/Sources/SystemToolbox.cpp
|
||||
--- a/OrthancFramework/Sources/SystemToolbox.cpp Thu May 16 15:31:31 2024 +0200
|
||||
+++ b/OrthancFramework/Sources/SystemToolbox.cpp Thu May 16 21:32:55 2024 +0200
|
||||
@@ -774,7 +774,7 @@
|
||||
|
||||
MimeType SystemToolbox::AutodetectMimeType(const std::string& path)
|
||||
{
|
||||
- std::string extension = boost::filesystem::extension(path);
|
||||
+ std::string extension = boost::filesystem::path(path).extension().string();
|
||||
Toolbox::ToLowerCase(extension);
|
||||
|
||||
// http://en.wikipedia.org/wiki/Mime_types
|
||||
diff -r 72dcf3a8d7d5 -r a7c88563c8cc OrthancServer/Plugins/Engine/PluginsManager.cpp
|
||||
--- a/OrthancServer/Plugins/Engine/PluginsManager.cpp Thu May 16 15:31:31 2024 +0200
|
||||
+++ b/OrthancServer/Plugins/Engine/PluginsManager.cpp Thu May 16 21:32:55 2024 +0200
|
||||
@@ -307,7 +307,7 @@
|
||||
}
|
||||
else
|
||||
{
|
||||
- std::string extension = boost::filesystem::extension(it->path());
|
||||
+ std::string extension = it->path().extension().string();
|
||||
Toolbox::ToLowerCase(extension);
|
||||
|
||||
if (extension == PLUGIN_EXTENSION)
|
||||
diff -r 72dcf3a8d7d5 -r a7c88563c8cc OrthancServer/Plugins/Samples/ModalityWorklists/Plugin.cpp
|
||||
--- a/OrthancServer/Plugins/Samples/ModalityWorklists/Plugin.cpp Thu May 16 15:31:31 2024 +0200
|
||||
+++ b/OrthancServer/Plugins/Samples/ModalityWorklists/Plugin.cpp Thu May 16 21:32:55 2024 +0200
|
||||
@@ -166,7 +166,7 @@
|
||||
if (type == fs::regular_file ||
|
||||
type == fs::reparse_file) // cf. BitBucket issue #11
|
||||
{
|
||||
- std::string extension = fs::extension(it->path());
|
||||
+ std::string extension = it->path().extension().string();
|
||||
std::transform(extension.begin(), extension.end(), extension.begin(), tolower); // Convert to lowercase
|
||||
|
||||
if (extension == ".wl")
|
||||
diff -r 72dcf3a8d7d5 -r a7c88563c8cc OrthancServer/Sources/OrthancConfiguration.cpp
|
||||
--- a/OrthancServer/Sources/OrthancConfiguration.cpp Thu May 16 15:31:31 2024 +0200
|
||||
+++ b/OrthancServer/Sources/OrthancConfiguration.cpp Thu May 16 21:32:55 2024 +0200
|
||||
@@ -114,7 +114,7 @@
|
||||
{
|
||||
if (!is_directory(it->status()))
|
||||
{
|
||||
- std::string extension = boost::filesystem::extension(it->path());
|
||||
+ std::string extension = it->path().extension().string();
|
||||
Toolbox::ToLowerCase(extension);
|
||||
|
||||
if (extension == ".json")
|
||||
|
||||
|
||||
@ -1,11 +1,12 @@
|
||||
# no need for old init-script:
|
||||
addFilter("suse-missing-rclink orthanc");
|
||||
# end-of-line is not really a pain:
|
||||
addFilter("wrong-file-end-of-line-encoding /usr/share/doc/packages/orthanc/Samples/CppHelpers/README.md");
|
||||
# some python files are installed under 'examples'
|
||||
# they should be adjusted
|
||||
addFilter("env-script-interpreter");
|
||||
addFilter("non-executable-script");
|
||||
# false positive
|
||||
addFilter("script-without-shebang /etc/orthanc/Configuration.json");
|
||||
addFilter("script-without-shebang /etc/orthanc/worklists.json");
|
||||
addFilter("script-without-shebang /etc/orthanc/serve-folders.json");
|
||||
# Orthanc source was all the time in /usr/src....
|
||||
addFilter("filelist-forbidden-fhs23 /usr/src/orthanc");
|
||||
|
||||
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri May 17 09:30:42 UTC 2024 - Axel Braun <axel.braun@gmx.de>
|
||||
|
||||
- boost185.diff added to fix TW build issue
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Mar 21 16:31:18 UTC 2024 - Christophe Marin <christophe@krop.fr>
|
||||
|
||||
|
||||
17
orthanc.spec
17
orthanc.spec
@ -33,12 +33,13 @@ Source5: index.html
|
||||
Source7: orthanc-rpmlintrc
|
||||
Source8: Configuration.json
|
||||
# Sources for plugin - need a defined version, so taking them from orthanc-server
|
||||
Source10: https://orthanc.osimis.io/ThirdPartyDownloads/dicom-web/bootstrap-4.3.1.zip
|
||||
Source11: https://orthanc.osimis.io/ThirdPartyDownloads/dicom-web/axios-0.19.0.tar.gz
|
||||
Source12: https://orthanc.osimis.io/ThirdPartyDownloads/jquery-3.4.1.min.js
|
||||
Source13: https://orthanc.osimis.io/ThirdPartyDownloads/dicom-web/vuejs-2.6.10.tar.gz
|
||||
Source10: https://orthanc.uclouvain.be/downloads/third-party-downloads/dicom-web/bootstrap-4.3.1.zip
|
||||
Source11: https://orthanc.uclouvain.be/downloads/third-party-downloads/dicom-web/axios-0.19.0.tar.gz
|
||||
Source12: https://orthanc.uclouvain.be/downloads/third-party-downloads/jquery-3.4.1.min.js
|
||||
Source13: https://orthanc.uclouvain.be/downloads/third-party-downloads/dicom-web/vuejs-2.6.10.tar.gz
|
||||
|
||||
Patch0: dcmtk.diff
|
||||
Patch1: boost185.diff
|
||||
BuildRequires: civetweb-devel
|
||||
BuildRequires: cmake >= 2.8.0
|
||||
BuildRequires: curl-devel
|
||||
@ -108,6 +109,7 @@ of the DICOM format and of the DICOM protocol.
|
||||
Summary: Header and source files for creating Orthanc plugins
|
||||
Group: Development/Libraries/C and C++
|
||||
Provides: orthanc-static = %{version}-%{release}
|
||||
BuildArch: noarch
|
||||
|
||||
%description -n %{name}-devel
|
||||
This package includes the header files to develop C/C++ plugins for Orthanc.
|
||||
@ -128,6 +130,7 @@ Summary: This package includes the source files for Orthanc
|
||||
Group: Development/Sources
|
||||
# DcmtkConfiguration.cmake looks for dicom.dic
|
||||
Requires: dcmtk
|
||||
BuildArch: noarch
|
||||
|
||||
%description source
|
||||
This package includes the source files for Orthanc. Use it in conjunction with the -devel package
|
||||
@ -192,12 +195,18 @@ tar --strip-components 1 -xzf %{S:0} -C %{buildroot}/usr/src/%{name}/
|
||||
#Apply dcmtk patch
|
||||
patch %{buildroot}/usr/src/%{name}/OrthancFramework/Resources/CMake/DcmtkConfiguration.cmake < %{P:0}
|
||||
|
||||
#Apply boost patch
|
||||
patch -p1 -d %{buildroot}/usr/src/%{name} < %{P:1}
|
||||
|
||||
# Do not mark Python scripts as executable
|
||||
find %{buildroot}/usr/src/%{name} -name '*.py' -exec chmod a-x "{}" +
|
||||
#...and delete dot files
|
||||
rm %{buildroot}/usr/src/%{name}/.hg*
|
||||
rm %{buildroot}/usr/src/%{name}/.travis*
|
||||
|
||||
# and patched files
|
||||
find %{buildroot}/usr/src/%{name} -iname *.orig -type f -print | xargs /bin/rm -f
|
||||
|
||||
%cmake_install
|
||||
|
||||
##move the doc into
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user