Attachment 238333 Details for Bug 267984 – Git diff of changes.

[patch] Git diff of changes.

nim-1.6.10.diff (text/plain), 3.12 KB, created by Neal Nelson on 2022-11-25 10:19:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Neal Nelson

Created: 2022-11-25 10:19:29 UTC

Size: 3.12 KB

patch

obsolete

>diff --git a/lang/nim/Makefile b/lang/nim/Makefile
>index 93aeac2d05aa..23f48739a638 100644
>--- a/lang/nim/Makefile
>+++ b/lang/nim/Makefile
>@@ -1,5 +1,5 @@
> PORTNAME=	nim
>-DISTVERSION=	1.6.8
>+DISTVERSION=	1.6.10
> CATEGORIES=	lang
> MASTER_SITES=	https://nim-lang.org/download/
> 
>@@ -46,6 +46,14 @@ post-patch:
> 	@${REINPLACE_CMD} -e s/%%GCC_DEFAULT%%/${GCC_DEFAULT}/ \
> 		${WRKSRC}/build.sh ${WRKSRC}/config/nim.cfg
> .endif
>+	# Make a fake nimdoc.css so that we can change the expected target
>+	# to where it should be, instead of where the nim project hard
>+	# code it to be.
>+	${MKDIR} -p ${WRKSRC}/share/doc/nim
>+	${LN} -s ${WRKSRC}/doc/nimdoc.css ${WRKSRC}/share/doc/nim/nimdoc.css
>+	${MKDIR} -p ${WRKSRC}/share/nim
>+	${LN} -s ${WRKSRC}/tools/dochack ${WRKSRC}/share/nim/dochack
>+
> 
> do-build:
> 	cd ${WRKSRC} && ${SETENV} CC="${CC}" LINKER="${CC}" \
>@@ -93,6 +101,10 @@ do-install-TOOLS-on:
> .for t in ${TLIST}
> 	${INSTALL_PROGRAM} ${WRKSRC}/bin/${t} ${STAGEDIR}${PREFIX}/bin
> .endfor
>+	${MKDIR} -p ${STAGEDIR}${PREFIX}/share/nim/dochack
>+	${INSTALL_SCRIPT} ${WRKSRC}/tools/dochack/dochack.nim ${STAGEDIR}${PREFIX}/share/nim/dochack
>+	${INSTALL_SCRIPT} ${WRKSRC}/tools/dochack/dochack.js ${STAGEDIR}${PREFIX}/share/nim/dochack
>+	${INSTALL_SCRIPT} ${WRKSRC}/tools/dochack/fuzzysearch.nim ${STAGEDIR}${PREFIX}/share/nim/dochack
> 
> do-test:
> 	cd ${WRKSRC} && ${SETENV} ./koch test all -d:release \
>diff --git a/lang/nim/distinfo b/lang/nim/distinfo
>index 942a5b88c6cc..35a292cdb088 100644
>--- a/lang/nim/distinfo
>+++ b/lang/nim/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1664352984
>-SHA256 (nim-1.6.8.tar.xz) = 0f5b65cdb60f78af41cb075c238983689a1e1f7e25c819f179862c18a484cf57
>-SIZE (nim-1.6.8.tar.xz) = 5219880
>+TIMESTAMP = 1669300700
>+SHA256 (nim-1.6.10.tar.xz) = 13d7702f8b57087babe8cd051c13bc56a3171418ba867b49c6bbd09b29d24fea
>+SIZE (nim-1.6.10.tar.xz) = 5216284
>diff --git a/lang/nim/files/patch-compiler_nimpaths.nim b/lang/nim/files/patch-compiler_nimpaths.nim
>new file mode 100644
>index 000000000000..40ee13ff8f4e
>--- /dev/null
>+++ b/lang/nim/files/patch-compiler_nimpaths.nim
>@@ -0,0 +1,13 @@
>+--- compiler/nimpaths.nim.orig	2022-11-21 01:04:21 UTC
>++++ compiler/nimpaths.nim
>+@@ -20,8 +20,8 @@ Unstable API
>+ import os, strutils
>+ 
>+ const
>+-  docCss* = "$nimr/doc/nimdoc.css"
>+-  docHackNim* = "$nimr/tools/dochack/dochack.nim"
>++  docCss* = "$nimr/share/doc/nim/nimdoc.css"
>++  docHackNim* = "$nimr/share/nim/dochack/dochack.nim"
>+   docHackJs* = docHackNim.changeFileExt("js")
>+   docHackJsFname* = docHackJs.lastPathPart
>+   theindexFname* = "theindex.html"
>diff --git a/lang/nim/pkg-plist b/lang/nim/pkg-plist
>index 26ae9d3fdea0..0825e65e7569 100644
>--- a/lang/nim/pkg-plist
>+++ b/lang/nim/pkg-plist
>@@ -495,6 +495,9 @@ lib/nim/wrappers/pcre.nim
> lib/nim/wrappers/postgres.nim
> lib/nim/wrappers/sqlite3.nim
> lib/nim/wrappers/tinyc.nim
>+share/nim/dochack/dochack.nim
>+share/nim/dochack/dochack.js
>+share/nim/dochack/fuzzysearch.nim
> %%PORTDOCS%%%%DOCSDIR%%/advopt.txt
> %%PORTDOCS%%%%DOCSDIR%%/apis.rst
> %%PORTDOCS%%%%DOCSDIR%%/astspec.txt
>@@ -917,3 +920,4 @@ lib/nim/wrappers/tinyc.nim
> %%PORTDOCS%%%%DOCSDIR%%/tut1.rst
> %%PORTDOCS%%%%DOCSDIR%%/tut2.rst
> %%PORTDOCS%%%%DOCSDIR%%/tut3.rst
>+

Actions: View | Diff

Attachments on bug 267984: 238333