1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-05 01:55:52 +00:00

www/nextcloud: Update to 19.0.0

This commit is contained in:
Bernard Spil 2020-06-03 17:13:42 +00:00
parent 66f7022919
commit f1fdab8a3c
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=537623
5 changed files with 901 additions and 170 deletions

View File

@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= nextcloud
DISTVERSION= 18.0.4
PORTREVISION= 2
DISTVERSION= 19.0.0
CATEGORIES= www
MASTER_SITES= https://download.nextcloud.com/server/releases/
PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX}

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1587635411
SHA256 (nextcloud-18.0.4.tar.bz2) = fad8e12632b352247ffc5ae181d4e414d732b9072caa0401774cfdb93a714329
SIZE (nextcloud-18.0.4.tar.bz2) = 86677670
TIMESTAMP = 1590487132
SHA256 (nextcloud-19.0.0.tar.bz2) = d23d429657c5e3476d7e73af1eafc70e42a81cfe2ed65b20655a005724fe0aae
SIZE (nextcloud-19.0.0.tar.bz2) = 90077143

View File

@ -1,36 +0,0 @@
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];

View File

@ -1,14 +1,14 @@
--- config/config.documented.php.orig 2018-03-13 18:47:31 UTC
--- config/config.documented.php.orig 2020-05-26 10:01:24 UTC
+++ config/config.documented.php
@@ -818,6 +818,11 @@ $CONFIG = array(
@@ -927,6 +927,11 @@ $CONFIG = [
'url' => '/apps',
'writable' => true,
),
+ array(
+ 'path'=> '/var/www/nextcloud/apps-pkg',
],
+ [
+ 'path'=> '/usr/local/www/nextcloud/apps-pkg',
+ 'url' => '/apps-pkg',
+ 'writable' => false,
+ ),
),
+ ],
],
/**

File diff suppressed because it is too large Load Diff