Attachment 246894 Details for Bug 275621 – Patch science/orthanc to 1.12.1

[patch] Patch science/orthanc to 1.12.1

science_orthanc-1.12.1.diff (text/plain), 3.19 KB, created by Frank Scholl on 2023-12-08 07:17:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Frank Scholl

Created: 2023-12-08 07:17:43 UTC

Size: 3.19 KB

patch

obsolete

>diff --git a/science/orthanc/Makefile b/science/orthanc/Makefile
>index 579ca9054910..a7424a3415cd 100644
>--- a/science/orthanc/Makefile
>+++ b/science/orthanc/Makefile
>@@ -1,8 +1,9 @@
>+# Created by: maintainer.freebsd@xpoundit.com
>+
> PORTNAME=	orthanc
>-DISTVERSION=	1.11.0
>-PORTREVISION=	11
>+DISTVERSION=	1.12.1
> CATEGORIES=	science
>-MASTER_SITES=	https://www.orthanc-server.com/downloads/get.php?path=/orthanc/
>+MASTER_SITES=	https://orthanc.uclouvain.be/downloads/sources/orthanc/
> DISTNAME=	Orthanc-${PORTVERSION}
> 
> MAINTAINER=	maintainer.freebsd@xpoundit.com
>@@ -12,6 +13,8 @@ WWW=		https://www.orthanc-server.com/
> LICENSE=	GPLv3
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>+BUILD_DEPENDS=	protoc:devel/protobuf
>+
> LIB_DEPENDS=	libboost_atomic.so:devel/boost-libs \
> 		libcivetweb.so:www/civetweb \
> 		libcurl.so:ftp/curl \
>@@ -20,9 +23,10 @@ LIB_DEPENDS=	libboost_atomic.so:devel/boost-libs \
> 		libicuuc.so:devel/icu \
> 		libjsoncpp.so:devel/jsoncpp \
> 		libpng16.so:graphics/png \
>+		libprotobuf.so:devel/protobuf \
> 		libpugixml.so:textproc/pugixml \
> 		libtiff.so:graphics/tiff \
>-		libuuid.so:misc/e2fsprogs-libuuid
>+		libuuid.so:misc/e2fsprogs-libuuid \
> 
> USES=		cmake gnome iconv jpeg lua python:build sqlite ssl
> USE_GNOME=	libxml2
>diff --git a/science/orthanc/distinfo b/science/orthanc/distinfo
>index f28286e4fad0..cb1283d66b9d 100644
>--- a/science/orthanc/distinfo
>+++ b/science/orthanc/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1652266484
>-SHA256 (Orthanc-1.11.0.tar.gz) = 23949a70562487fd6e79d6f3f13c71a0fc90aa25e492fb3a99575fee0722c5af
>-SIZE (Orthanc-1.11.0.tar.gz) = 1899829
>+TIMESTAMP = 1701766389
>+SHA256 (Orthanc-1.12.1.tar.gz) = 2e8bfe1f56a4cf9a281eb3975549122ee13f2f4057279d88bb0dd09b006e6189
>+SIZE (Orthanc-1.12.1.tar.gz) = 1991159
>diff --git a/science/orthanc/files/patch-OrthancFramework_Resources_CMake_ProtobufConfiguration.cmake b/science/orthanc/files/patch-OrthancFramework_Resources_CMake_ProtobufConfiguration.cmake
>new file mode 100644
>index 000000000000..e6d9c8ff88cf
>--- /dev/null
>+++ b/science/orthanc/files/patch-OrthancFramework_Resources_CMake_ProtobufConfiguration.cmake
>@@ -0,0 +1,37 @@
>+--- OrthancFramework/Resources/CMake/ProtobufConfiguration.cmake.orig	2023-12-05 11:17:50 UTC
>++++ OrthancFramework/Resources/CMake/ProtobufConfiguration.cmake
>+@@ -64,22 +64,26 @@ else()
>+     message(FATAL_ERROR "Please install the libprotobuf-dev package")
>+   endif()
>+ 
>+-  set(CMAKE_REQUIRED_LIBRARIES "protobuf")
>++  if (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
>++    find_package(Protobuf REQUIRED)
>++  else()
>++    set(CMAKE_REQUIRED_LIBRARIES "protobuf")
>+ 
>+-  include(CheckCXXSourceCompiles) 
>+-  check_cxx_source_compiles(
>+-    "
>++    include(CheckCXXSourceCompiles) 
>++    check_cxx_source_compiles(
>++      "
>+ #include <google/protobuf/descriptor.h>
>+ int main()
>+ {
>+   google::protobuf::FieldDescriptor::TypeName(google::protobuf::FieldDescriptor::TYPE_FLOAT);
>+ }
>+ "  HAVE_PROTOBUF_LIB)
>+-  if (NOT HAVE_PROTOBUF_LIB)
>+-    message(FATAL_ERROR "Cannot find the protobuf library")
>++    if (NOT HAVE_PROTOBUF_LIB)
>++      message(FATAL_ERROR "Cannot find the protobuf library")
>++    endif()
>++
>++    unset(CMAKE_REQUIRED_LIBRARIES)
>+   endif()
>+-  
>+-  unset(CMAKE_REQUIRED_LIBRARIES)
>+ 
>+   link_libraries(protobuf)
>+ endif()

Flags:

maintainer.freebsd: maintainer-approval+

Actions: View | Diff

Attachments on bug 275621: 246894