Attachment 246897 Details for Bug 275624 – Patch science/orthanc-postgresql to 5.1

[patch] Patch science/orthanc-postgresql to 5.1

science_orthanc-postgresql-5.1.diff (text/plain), 5.79 KB, created by Frank Scholl on 2023-12-08 07:28:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Frank Scholl

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

Size: 5.79 KB

patch

obsolete

>diff --git a/science/orthanc-postgresql/Makefile b/science/orthanc-postgresql/Makefile
>index 3d94a72a373e..7a68dd7868a4 100644
>--- a/science/orthanc-postgresql/Makefile
>+++ b/science/orthanc-postgresql/Makefile
>@@ -1,12 +1,11 @@
> PORTNAME=	orthanc-postgresql
>-DISTVERSION=	4.0
>-PORTREVISION=	6
>+DISTVERSION=	5.1
> CATEGORIES=	science
>-MASTER_SITES=	https://www.orthanc-server.com/downloads/get.php?path=/plugin-postgresql/:main \
>-		https://www.orthanc-server.com/downloads/get.php?path=/orthanc/:framework \
>-		https://orthanc.osimis.io/ThirdPartyDownloads/:thirdparty
>+MASTER_SITES=	https://orthanc.uclouvain.be/downloads/sources/orthanc-postgresql/:main \
>+		https://orthanc.uclouvain.be/downloads/sources/orthanc/:framework \
>+		https://orthanc.uclouvain.be/downloads/third-party-downloads/:thirdparty
> DISTFILES=	OrthancPostgreSQL-${PORTVERSION}.tar.gz:main \
>-		Orthanc-1.9.3.tar.gz:framework \
>+		Orthanc-1.12.1.tar.gz:framework \
> 		e2fsprogs-1.44.5.tar.gz:thirdparty
> DIST_SUBDIR=	orthanc
> EXTRACT_ONLY=	OrthancPostgreSQL-${PORTVERSION}.tar.gz
>@@ -32,7 +31,7 @@ WRKSRC=		${WRKDIR}/OrthancPostgreSQL-${PORTVERSION}
> 
> CMAKE_SOURCE_PATH=	${WRKSRC}/PostgreSQL
> CMAKE_OFF=	BUILD_UNIT_TESTS USE_SYSTEM_ORTHANC_SDK USE_SYSTEM_UUID
>-CMAKE_ARGS=	-DORTHANC_FRAMEWORK_ROOT=${WRKSRC}/PostgreSQL/ThirdPartyDownloads/Orthanc-1.9.3/OrthancFramework/Sources \
>+CMAKE_ARGS=	-DORTHANC_FRAMEWORK_ROOT=${WRKSRC}/PostgreSQL/ThirdPartyDownloads/Orthanc-1.12.1/OrthancFramework/Sources \
> 		-DORTHANC_FRAMEWORK_SOURCE=path
> CXXFLAGS+=	-I${LOCALBASE}/include -DNDEBUG
> LDFLAGS+=	-L${LOCALBASE}/lib
>@@ -41,9 +40,10 @@ CFLAGS+=	-DORTHANC_ENABLE_LOGGING_PLUGIN -DNDEBUG
> PLIST_SUB=	DISTVERSION=${DISTVERSION}
> 
> post-extract:
>+		${MV} ${WRKDIR}/OrthancPostgresql-${PORTVERSION} ${WRKSRC}
> 		${MKDIR} ${WRKSRC}/PostgreSQL/ThirdPartyDownloads
> 		${CP} ${DISTDIR}/${DIST_SUBDIR}/e2fsprogs-1.44.5.tar.gz ${WRKSRC}/PostgreSQL/ThirdPartyDownloads
>-		${CP} ${DISTDIR}/${DIST_SUBDIR}/Orthanc-1.9.3.tar.gz ${WRKSRC}/PostgreSQL/ThirdPartyDownloads
>-		${TAR} -C ${WRKSRC}/PostgreSQL/ThirdPartyDownloads -xf ${WRKSRC}/PostgreSQL/ThirdPartyDownloads/Orthanc-1.9.3.tar.gz
>+		${CP} ${DISTDIR}/${DIST_SUBDIR}/Orthanc-1.12.1.tar.gz ${WRKSRC}/PostgreSQL/ThirdPartyDownloads
>+		${TAR} -C ${WRKSRC}/PostgreSQL/ThirdPartyDownloads -xf ${WRKSRC}/PostgreSQL/ThirdPartyDownloads/Orthanc-1.12.1.tar.gz
> 
> .include <bsd.port.mk>
>diff --git a/science/orthanc-postgresql/distinfo b/science/orthanc-postgresql/distinfo
>index a438656c3e1d..5c8bb3d9a3ce 100644
>--- a/science/orthanc-postgresql/distinfo
>+++ b/science/orthanc-postgresql/distinfo
>@@ -1,7 +1,7 @@
>-TIMESTAMP = 1620906912
>-SHA256 (orthanc/OrthancPostgreSQL-4.0.tar.gz) = a5049ed8a5d6bb8b6529636cf1d9f631d1b61f6e0bbfdc6accae45aded42bac5
>-SIZE (orthanc/OrthancPostgreSQL-4.0.tar.gz) = 318047
>-SHA256 (orthanc/Orthanc-1.9.3.tar.gz) = 41cc35a3d15ecb0d7b834e8e28a740cc4ffa1f333c019a764228d60e96608960
>-SIZE (orthanc/Orthanc-1.9.3.tar.gz) = 1818313
>+TIMESTAMP = 1701795693
>+SHA256 (orthanc/OrthancPostgreSQL-5.1.tar.gz) = c5f97c7ca145f9748720a18ebcf829c552cfcac9ad52b6d704fc125a8fc24764
>+SIZE (orthanc/OrthancPostgreSQL-5.1.tar.gz) = 404767
>+SHA256 (orthanc/Orthanc-1.12.1.tar.gz) = 2e8bfe1f56a4cf9a281eb3975549122ee13f2f4057279d88bb0dd09b006e6189
>+SIZE (orthanc/Orthanc-1.12.1.tar.gz) = 1991159
> SHA256 (orthanc/e2fsprogs-1.44.5.tar.gz) = 2e211fae27ef74d5af4a4e40b10b8df7f87c655933bd171aab4889bfc4e6d1cc
> SIZE (orthanc/e2fsprogs-1.44.5.tar.gz) = 7619237
>diff --git a/science/orthanc-postgresql/files/patch-Orthanc-1.12.1_OrthancFramework_Resources_CMake_ProtobufConfiguration.cmake b/science/orthanc-postgresql/files/patch-Orthanc-1.12.1_OrthancFramework_Resources_CMake_ProtobufConfiguration.cmake
>new file mode 100644
>index 000000000000..632fad47ecf8
>--- /dev/null
>+++ b/science/orthanc-postgresql/files/patch-Orthanc-1.12.1_OrthancFramework_Resources_CMake_ProtobufConfiguration.cmake
>@@ -0,0 +1,39 @@
>+--- PostgreSQL/ThirdPartyDownloads/Orthanc-1.12.1/OrthancFramework/Resources/CMake/ProtobufConfiguration.cmake.orig	2023-12-06 09:05:27 UTC
>++++ PostgreSQL/ThirdPartyDownloads/Orthanc-1.12.1/OrthancFramework/Resources/CMake/ProtobufConfiguration.cmake
>+@@ -64,22 +64,27 @@ 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")
>+-  endif()
>++  "  HAVE_PROTOBUF_LIB)
>++    if (NOT HAVE_PROTOBUF_LIB)
>++      message(FATAL_ERROR "Cannot find the protobuf library")
>++    endif()
>+   
>+-  unset(CMAKE_REQUIRED_LIBRARIES)
>++    unset(CMAKE_REQUIRED_LIBRARIES)
>++  endif()
>+ 
>+   link_libraries(protobuf)
>+ endif()
>diff --git a/science/orthanc-postgresql/files/patch-PostgreSQL_CMakeLists.txt b/science/orthanc-postgresql/files/patch-PostgreSQL_CMakeLists.txt
>index 389ee26f4b28..db8782cf942a 100644
>--- a/science/orthanc-postgresql/files/patch-PostgreSQL_CMakeLists.txt
>+++ b/science/orthanc-postgresql/files/patch-PostgreSQL_CMakeLists.txt
>@@ -1,6 +1,6 @@
>---- PostgreSQL/CMakeLists.txt.orig	2021-05-17 12:24:06 UTC
>+--- PostgreSQL/CMakeLists.txt.orig	2023-06-27 13:34:05 UTC
> +++ PostgreSQL/CMakeLists.txt
>-@@ -23,6 +23,9 @@ set(OPENSSL_STATIC_VERSION "1.1.1" CACHE STRING "Force
>+@@ -43,6 +43,9 @@ set(OPENSSL_STATIC_VERSION "3.0" CACHE STRING "Force t
>  
>  include(${CMAKE_SOURCE_DIR}/../Resources/CMake/DatabasesPluginConfiguration.cmake)
>

Flags:

maintainer.freebsd: maintainer-approval+

Actions: View | Diff

Attachments on bug 275624: 246897