Date: Sun, 17 May 2020 15:31:07 +0000 (UTC) From: Bernard Spil <brnrd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r535555 - in head/www/nextcloud: . files Message-ID: <202005171531.04HFV7oc083546@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brnrd Date: Sun May 17 15:31:07 2020 New Revision: 535555 URL: https://svnweb.freebsd.org/changeset/ports/535555 Log: www/nextcloud: Fix install issue Talk app PR: 246474 Submitted by: grembo Added: head/www/nextcloud/files/patch-Issue19433 (contents, props changed) Modified: head/www/nextcloud/Makefile Modified: head/www/nextcloud/Makefile ============================================================================== --- head/www/nextcloud/Makefile Sun May 17 15:10:44 2020 (r535554) +++ head/www/nextcloud/Makefile Sun May 17 15:31:07 2020 (r535555) @@ -2,7 +2,7 @@ PORTNAME= nextcloud DISTVERSION= 18.0.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= https://download.nextcloud.com/server/releases/ PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX} Added: head/www/nextcloud/files/patch-Issue19433 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/nextcloud/files/patch-Issue19433 Sun May 17 15:31:07 2020 (r535555) @@ -0,0 +1,36 @@ +From 3894dcb756e9c5501e063d6c44af9712f3ef44c1 Mon Sep 17 00:00:00 2001 +From: Joas Schilling <coding@schilljs.com> +Date: Fri, 14 Feb 2020 11:56:23 +0100 +Subject: [PATCH] Hardcode Talk namespace to fix install due to global route + +Signed-off-by: Joas Schilling <coding@schilljs.com> +--- + lib/private/AppFramework/App.php | 15 +++++++++++++-- + 1 file changed, 13 insertions(+), 2 deletions(-) + +diff --git a/lib/private/AppFramework/App.php b/lib/private/AppFramework/App.php +index a36e013cb68..2cbe623bb27 100644 +--- lib/private/AppFramework/App.php.orig ++++ lib/private/AppFramework/App.php +@@ -68,8 +68,19 @@ public static function buildAppNamespace(string $appId, string $topNamespace='OC + if (isset($appInfo['namespace'])) { + self::$nameSpaceCache[$appId] = trim($appInfo['namespace']); + } else { +- // if the tag is not found, fall back to uppercasing the first letter +- self::$nameSpaceCache[$appId] = ucfirst($appId); ++ if ($appId !== 'spreed') { ++ // if the tag is not found, fall back to uppercasing the first letter ++ self::$nameSpaceCache[$appId] = ucfirst($appId); ++ } else { ++ // For the Talk app (appid spreed) the above fallback doesn't work. ++ // This leads to a problem when trying to install it freshly, ++ // because the apps namespace is already registered before the ++ // app is downloaded from the appstore, because of the hackish ++ // global route index.php/call/{token} which is registered via ++ // the core/routes.php so it does not have the app namespace. ++ // @ref https://github.com/nextcloud/server/pull/19433 ++ self::$nameSpaceCache[$appId] = 'Talk'; ++ } + } + + return $topNamespace . self::$nameSpaceCache[$appId];
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202005171531.04HFV7oc083546>