Attachment 249667 Details for Bug 278110 – Modified patch for upgrade of devel/root

[patch] Modified patch for upgrade of devel/root

devel_root02.diff (text/plain), 6.55 KB, created by Erik Jensen on 2024-04-02 16:55:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Erik Jensen

Created: 2024-04-02 16:55:21 UTC

Size: 6.55 KB

patch

obsolete

>diff --git a/devel/root/Makefile b/devel/root/Makefile
>index fb7f875369d5..d4dbec2fa513 100644
>--- a/devel/root/Makefile
>+++ b/devel/root/Makefile
>@@ -1,6 +1,5 @@
> PORTNAME=	root
>-DISTVERSION=	6.30.02
>-PORTREVISION=	1
>+DISTVERSION=	6.30.04
> CATEGORIES=	devel science math parallel python
> MASTER_SITES=	https://root.cern/download/
> DISTFILES=	${PORTNAME}_v${DISTVERSION}.source${EXTRACT_SUFX}
>@@ -30,13 +29,29 @@ LIB_DEPENDS=	libcfitsio.so:astro/cfitsio \
> RUN_DEPENDS=	${BUILD_AND_RUN_DEPENDS}
> 
> USES=		cmake compiler:c++17-lang desktop-file-utils \
>-		gnome iconv shebangfix ssl
>+		gnome iconv llvm:min=14,max=16 shebangfix ssl
> USE_GNOME=	libxml2
> 
>-SHEBANG_FILES=	config/rootssh etc/dictpch/makepch.py etc/proof/utils/circle.sh \
>-		etc/proof/utils/crypt etc/proof/utils/pps \
>-		etc/proof/utils/proofctl.sh etc/proof/utils/proofinstall.sh \
>+SHEBANG_FILES=	main/python/rootbrowse.py \
>+		main/python/rootcp.py \
>+		main/python/rootdrawtree.py \
>+		main/python/rooteventselector.py \
>+		main/python/rootls.py \
>+		main/python/rootmkdir.py \
>+		main/python/rootmv.py \
>+		main/python/rootprint.py \
>+		main/python/rootrm.py \
>+		main/python/rootslimtree.py \
>+		config/rootssh \
>+		etc/dictpch/makepch.py \
>+		etc/proof/utils/circle.sh \
>+		etc/proof/utils/crypt \
>+		etc/proof/utils/pps \
>+		etc/proof/utils/proofctl.sh \
>+		etc/proof/utils/proofinstall.sh \
> 		etc/pdg_table_update.py
>+# add a port-specific shebang to be replaced
>+python_OLD_CMD+=	"/usr/bin/env @python@"
> 
> # Flags and environment variables for building
> CMAKE_ARGS=	-DCMAKE_CXX_STANDARD=17
>@@ -52,6 +67,7 @@ OPTIONS_SUB=	yes
> 
> # Option: MYSQL
> MYSQL_DESC=		Enable MySQL bindings
>+MYSQL_LIB_DEPENDS=	libunwind.so:devel/libunwind
> MYSQL_USES=		mysql
> MYSQL_CMAKE_BOOL=	mysql
> 
>@@ -95,12 +111,19 @@ PLIST_SUB+=	SHLIB_SHVER="${DISTVERSION:R}" \
> 		SHLIB_VER="${DISTVERSION}"
> 
> # Some .modulemap, .pcm and .idx files are not installed on aarch64, a few .pcm files are exclusive to aarch64 and files LIBRARY.pcm are renamed libLIBRARY_rdict.pcm on aarch64
>-.if ${ARCH} == "aarch64"
>+.if ${OPSYS} == FreeBSD && ${ARCH} == "aarch64"
> PLIST_SUB+=	NOT_INSTALLED_ON_AARCH64="@comment " ONLY_INSTALLED_ON_AARCH64="" AARCH64_PCM_PREFIX="lib" AARCH64_PCM_SUFFIX="_rdict"
> .else
> PLIST_SUB+=	NOT_INSTALLED_ON_AARCH64="" ONLY_INSTALLED_ON_AARCH64="@comment " AARCH64_PCM_PREFIX="" AARCH64_PCM_SUFFIX=""
> .endif
> 
>+# std_config.pcm exclusive to FreeBSD 14+
>+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1400000
>+PLIST_SUB+=	NOT_INSTALLED_ON_FBSD13="@comment "
>+.else
>+PLIST_SUB+=	NOT_INSTALLED_ON_FBSD13=""
>+.endif
>+
> # The following two files should not be staged. This happens even when PYROOT option is OFF.
> post-install:
> 	${RM} ${STAGEDIR}${PREFIX}/lib/root/__pycache__/cmdLineUtils.cpython-39.pyc
>diff --git a/devel/root/distinfo b/devel/root/distinfo
>index e5b446340bd5..cb2e1e7f711d 100644
>--- a/devel/root/distinfo
>+++ b/devel/root/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1702064317
>-SHA256 (root_v6.30.02.source.tar.gz) = 7965a456d1ad1ee0d5fe4769bf5a8fec291af684ed93db0f3080a9c362435183
>-SIZE (root_v6.30.02.source.tar.gz) = 184758362
>+TIMESTAMP = 1711984351
>+SHA256 (root_v6.30.04.source.tar.gz) = 2b4180b698f39cc65d91084d833a884515b325bc5f673c8e39abe818b025d8cc
>+SIZE (root_v6.30.04.source.tar.gz) = 184768143
>diff --git a/devel/root/files/patch-interpreter_llvm-project_clang_lib_Serialization_ASTWriter.cpp b/devel/root/files/patch-interpreter_llvm-project_clang_lib_Serialization_ASTWriter.cpp
>index 556a68a289ab..78e9d109f54b 100644
>--- a/devel/root/files/patch-interpreter_llvm-project_clang_lib_Serialization_ASTWriter.cpp
>+++ b/devel/root/files/patch-interpreter_llvm-project_clang_lib_Serialization_ASTWriter.cpp
>@@ -1,13 +1,20 @@
>---- interpreter/llvm-project/clang/lib/Serialization/ASTWriter.cpp.orig	2024-01-11 19:51:52 UTC
>+--- interpreter/llvm-project/clang/lib/Serialization/ASTWriter.cpp.orig	2024-04-01 14:40:54 UTC
> +++ interpreter/llvm-project/clang/lib/Serialization/ASTWriter.cpp
>-@@ -2498,8 +2498,10 @@ unsigned ASTWriter::getSubmoduleID(Module *Mod) {
>+@@ -2498,8 +2498,15 @@ unsigned ASTWriter::getSubmoduleID(Module *Mod) {
>    // did not result in us loading a module file for that submodule. For
>    // instance, a cross-top-level-module 'conflict' declaration will hit this.
>    unsigned ID = getLocalOrImportedSubmoduleID(Mod);
>+-  assert((ID || !Mod) &&
>+-         "asked for module ID for non-local, non-imported module");
>++
> +  /*
>-   assert((ID || !Mod) &&
>-          "asked for module ID for non-local, non-imported module");
>++   * FreeBSD port maintainer note: CMake option 'asserts' is enabled, when building ROOT with debug symbols.
>++   *                               Building then fails on this one assertion. We hack out the assertion, building
>++   *                               succeeds once again, and we pray that everything will be fine.
> +   */
>++
>++  //assert((ID || !Mod) &&
>++  //       "asked for module ID for non-local, non-imported module");
>    return ID;
>  }
>  
>diff --git a/devel/root/pkg-plist b/devel/root/pkg-plist
>index 856f58b5a8fd..fd77e14c701d 100644
>--- a/devel/root/pkg-plist
>+++ b/devel/root/pkg-plist
>@@ -3147,9 +3147,6 @@ include/root/TXMLNode.h
> include/root/TXMLParser.h
> include/root/TXMLPlayer.h
> include/root/TXMLSetup.h
>-include/root/TXNetFile.h
>-include/root/TXNetFileStager.h
>-include/root/TXNetSystem.h
> include/root/TXTRU.h
> include/root/TZIPFile.h
> include/root/ThreadLocalStorage.h
>@@ -3322,7 +3319,6 @@ lib/root/%%AARCH64_PCM_PREFIX%%Minuit%%AARCH64_PCM_SUFFIX%%.pcm
> lib/root/%%AARCH64_PCM_PREFIX%%Minuit2%%AARCH64_PCM_SUFFIX%%.pcm
> %%NOT_INSTALLED_ON_AARCH64%%lib/root/MultiProc.pcm
> lib/root/%%AARCH64_PCM_PREFIX%%Net%%AARCH64_PCM_SUFFIX%%.pcm
>-lib/root/%%AARCH64_PCM_PREFIX%%Netx%%AARCH64_PCM_SUFFIX%%.pcm
> lib/root/%%AARCH64_PCM_PREFIX%%NetxNG%%AARCH64_PCM_SUFFIX%%.pcm
> %%PGSQL%%lib/root/%%AARCH64_PCM_PREFIX%%PgSQL%%AARCH64_PCM_SUFFIX%%.pcm
> lib/root/%%AARCH64_PCM_PREFIX%%Physics%%AARCH64_PCM_SUFFIX%%.pcm
>@@ -3832,9 +3828,6 @@ lib/root/libNet.so
> lib/root/libNet.so.%%SHLIB_SHVER%%
> lib/root/libNet.so.%%SHLIB_VER%%
> %%ONLY_INSTALLED_ON_AARCH64%%lib/root/libNetx.rootmap
>-lib/root/libNetx.so
>-lib/root/libNetx.so.%%SHLIB_SHVER%%
>-lib/root/libNetx.so.%%SHLIB_VER%%
> %%ONLY_INSTALLED_ON_AARCH64%%lib/root/libNetxNG.rootmap
> lib/root/libNetxNG.so
> lib/root/libNetxNG.so.%%SHLIB_SHVER%%
>@@ -4217,6 +4210,7 @@ lib/root/libvectorDict.so.%%SHLIB_SHVER%%
> lib/root/libvectorDict.so.%%SHLIB_VER%%
> %%NOT_INSTALLED_ON_AARCH64%%lib/root/modules.idx
> %%NOT_INSTALLED_ON_AARCH64%%lib/root/std.pcm
>+%%NOT_INSTALLED_ON_FBSD13%%lib/root/std_config.pcm
> %%PORTDOCS%%%%DOCSDIR%%/CREDITS
> %%PORTDOCS%%%%DOCSDIR%%/DEVELOPMENT.md
> %%PORTDOCS%%%%DOCSDIR%%/INSTALL

Flags:

erik: maintainer-approval+

Actions: View | Diff

Attachments on bug 278110: 249644 | 249667 | 250724 | 250832 | 250896 | 250934 | 251095