FreeBSD Bugzilla – Attachment 246896 Details for
Bug 275623
science/orthanc-mysql: Update to 5.1
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch science/orthanc-mysql to 5.1
science_orthanc-mysql-5.1.diff (text/plain), 4.74 KB, created by
Frank Scholl
on 2023-12-08 07:25:25 UTC
(
hide
)
Description:
Patch science/orthanc-mysql to 5.1
Filename:
MIME Type:
Creator:
Frank Scholl
Created:
2023-12-08 07:25:25 UTC
Size:
4.74 KB
patch
obsolete
>diff --git a/science/orthanc-mysql/Makefile b/science/orthanc-mysql/Makefile >index 3d677d837f89..68105b42f05d 100644 >--- a/science/orthanc-mysql/Makefile >+++ b/science/orthanc-mysql/Makefile >@@ -1,12 +1,11 @@ > PORTNAME= orthanc-mysql >-DISTVERSION= 4.3 >-PORTREVISION= 6 >+DISTVERSION= 5.1 > CATEGORIES= science >-MASTER_SITES= https://www.orthanc-server.com/downloads/get.php?path=/plugin-mysql/: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-mysql/:main \ >+ https://orthanc.uclouvain.be/downloads/sources/orthanc/:framework \ >+ https://orthanc.uclouvain.be/downloads/third-party-downloads/:thirdparty > DISTFILES= OrthancMySQL-${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= OrthancMySQL-${PORTVERSION}.tar.gz >@@ -32,7 +31,7 @@ USE_LDCONFIG= yes > > WRKSRC= ${WRKDIR}/OrthancMySQL-${PORTVERSION} > >-CMAKE_ARGS= -DORTHANC_FRAMEWORK_ROOT=${WRKSRC}/MySQL/ThirdPartyDownloads/Orthanc-1.9.3/OrthancFramework/Sources \ >+CMAKE_ARGS= -DORTHANC_FRAMEWORK_ROOT=${WRKSRC}/MySQL/ThirdPartyDownloads/Orthanc-1.12.1/OrthancFramework/Sources \ > -DORTHANC_FRAMEWORK_SOURCE=path > CMAKE_OFF= DBUILD_UNIT_TESTS USE_SYSTEM_ORTHANC_SDK USE_SYSTEM_UUID > CMAKE_SOURCE_PATH= ${WRKSRC}/MySQL >@@ -45,7 +44,7 @@ PLIST_SUB= DISTVERSION=${DISTVERSION} > post-extract: > ${MKDIR} ${WRKSRC}/MySQL/ThirdPartyDownloads > ${CP} ${DISTDIR}/${DIST_SUBDIR}/e2fsprogs-1.44.5.tar.gz ${WRKSRC}/MySQL/ThirdPartyDownloads >- ${CP} ${DISTDIR}/${DIST_SUBDIR}/Orthanc-1.9.3.tar.gz ${WRKSRC}/MySQL/ThirdPartyDownloads >- ${TAR} -C ${WRKSRC}/MySQL/ThirdPartyDownloads -xf ${WRKSRC}/MySQL/ThirdPartyDownloads/Orthanc-1.9.3.tar.gz >+ ${CP} ${DISTDIR}/${DIST_SUBDIR}/Orthanc-1.12.1.tar.gz ${WRKSRC}/MySQL/ThirdPartyDownloads >+ ${TAR} -C ${WRKSRC}/MySQL/ThirdPartyDownloads -xf ${WRKSRC}/MySQL/ThirdPartyDownloads/Orthanc-1.12.1.tar.gz > > .include <bsd.port.mk> >diff --git a/science/orthanc-mysql/distinfo b/science/orthanc-mysql/distinfo >index f73c567cbf40..43a75f94c898 100644 >--- a/science/orthanc-mysql/distinfo >+++ b/science/orthanc-mysql/distinfo >@@ -1,7 +1,7 @@ >-TIMESTAMP = 1629969268 >-SHA256 (orthanc/OrthancMySQL-4.3.tar.gz) = 7a22cbb482809bc1f6732e3e582cbbf4449e9205f297453ad4c7b7792956efba >-SIZE (orthanc/OrthancMySQL-4.3.tar.gz) = 321585 >-SHA256 (orthanc/Orthanc-1.9.3.tar.gz) = 41cc35a3d15ecb0d7b834e8e28a740cc4ffa1f333c019a764228d60e96608960 >-SIZE (orthanc/Orthanc-1.9.3.tar.gz) = 1818313 >+TIMESTAMP = 1701854261 >+SHA256 (orthanc/OrthancMySQL-5.1.tar.gz) = d1298d01dab48ca551daabe6ed2894eaa1e72989adef95c01810b8c18ca39c07 >+SIZE (orthanc/OrthancMySQL-5.1.tar.gz) = 402971 >+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-mysql/files/patch-Orthanc-1.12.1_OrthancFramework_Resources_CMake_ProtobufConfiguration.cmake b/science/orthanc-mysql/files/patch-Orthanc-1.12.1_OrthancFramework_Resources_CMake_ProtobufConfiguration.cmake >new file mode 100644 >index 000000000000..5690fe47cda8 >--- /dev/null >+++ b/science/orthanc-mysql/files/patch-Orthanc-1.12.1_OrthancFramework_Resources_CMake_ProtobufConfiguration.cmake >@@ -0,0 +1,39 @@ >+--- MySQL/ThirdPartyDownloads/Orthanc-1.12.1/OrthancFramework/Resources/CMake/ProtobufConfiguration.cmake.orig 2023-12-06 09:05:27 UTC >++++ MySQL/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()
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Flags:
maintainer.freebsd
:
maintainer-approval+
Actions:
View
|
Diff
Attachments on
bug 275623
: 246896