Date: Mon, 4 May 2020 18:16:37 +0000 (UTC) From: Adam Weinberger <adamw@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r533935 - in head/www/gitea: . files Message-ID: <202005041816.044IGbwv071282@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adamw Date: Mon May 4 18:16:37 2020 New Revision: 533935 URL: https://svnweb.freebsd.org/changeset/ports/533935 Log: gitea: Fix wiki page display From the PR: Right now, the version of gitea shipped in ports fails to display wiki pages. Any wiki page opened results in the following error: template: repo/wiki/view:48:14: executing "repo/wiki/view" at <(not $.DisableHTTP) (and (not $.DisableSSH) (or $.IsSigned $.ExposeAnonSSH))>: can't give argument to non-function not $.DisableHTTP This is due to extra parentheses in templates/repo/wiki/view.tmpl and has already been fixed upstream in [1], [2]. I've pulled the single line template fix from upstream and added the patch to our port. As a workaround, users can also fix the problem by placing the corrected template in /usr/local/etc/gitea/templates/repo/wiki/view.tmpl. Cheers, Sascha [1] https://github.com/go-gitea/gitea/issues/10552 [2] https://github.com/zeripath/gitea/commit/1830d0ed5f4a67e3360ecbb55933b5540b6affce PR: 246020 Submitted by: Sascha Biberhofer Approved by: maintainer Added: head/www/gitea/files/patch-templates_repo_wiki_view.tmpl (contents, props changed) Modified: head/www/gitea/Makefile Modified: head/www/gitea/Makefile ============================================================================== --- head/www/gitea/Makefile Mon May 4 18:13:57 2020 (r533934) +++ head/www/gitea/Makefile Mon May 4 18:16:37 2020 (r533935) @@ -3,6 +3,7 @@ PORTNAME= gitea DISTVERSIONPREFIX= v DISTVERSION= 1.11.4 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= https://github.com/go-gitea/gitea/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/ DISTNAME= gitea-src-${DISTVERSION} Added: head/www/gitea/files/patch-templates_repo_wiki_view.tmpl ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/gitea/files/patch-templates_repo_wiki_view.tmpl Mon May 4 18:16:37 2020 (r533935) @@ -0,0 +1,11 @@ +--- templates/repo/wiki/view.tmpl.orig 2020-04-29 07:06:03 UTC ++++ templates/repo/wiki/view.tmpl +@@ -45,7 +45,7 @@ + {{else if and (not $.DisableSSH) (or $.IsSigned $.ExposeAnonSSH)}} + <input id="repo-clone-url" value="{{$.WikiCloneLink.SSH}}" readonly> + {{end}} +- {{if or ((not $.DisableHTTP) (and (not $.DisableSSH) (or $.IsSigned $.ExposeAnonSSH)))}} ++ {{if or (not $.DisableHTTP) (and (not $.DisableSSH) (or $.IsSigned $.ExposeAnonSSH))}} + <button class="ui basic icon button poping up clipboard" id="clipboard-btn" data-original="{{.i18n.Tr "repo.copy_link"}}" data-success="{{.i18n.Tr "repo.copy_link_success"}}" data-error="{{.i18n.Tr "repo.copy_link_error"}}" data-content="{{.i18n.Tr "repo.copy_link"}}" data-variation="inverted tiny" data-clipboard-target="#repo-clone-url"> + <i class="octicon octicon-clippy"></i> + </button>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202005041816.044IGbwv071282>