community/nextcloud: upgrade to 12.0.0

- Move some larger apps into subpkgs in order to shrink main pkg size
- Install php-fileinfo in order to suppress a warning
- Cosmetic APKBUILD fixes

1 files changed, 44 insertions, 35 deletions

diff --git a/community/nextcloud/APKBUILD b/community/nextcloud/APKBUILD
index bd427e08e7..c52aab40dc 100644
--- a/community/nextcloud/APKBUILD
+++ b/community/nextcloud/APKBUILD
@@ -1,29 +1,31 @@
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=nextcloud
-pkgver=11.0.3
-pkgrel=4
+pkgver=12.0.0
+pkgrel=0
 pkgdesc="A safe home for all your data"
 url="http://nextcloud.com"
 arch="noarch"
 license="AGPL"
 _php=php7
-depends="$_php $_php-ctype $_php-curl $_php-dom $_php-gd $_php-iconv
-	$_php-json $_php-mbstring $_php-openssl $_php-session $_php-simplexml
-	$_php-xml $_php-xmlreader $_php-xmlwriter $_php-zlib $_php-zip
+depends="$_php $_php-ctype $_php-curl $_php-dom $_php-gd $_php-fileinfo
+	$_php-iconv $_php-json $_php-mbstring $_php-openssl
+	$_php-session $_php-simplexml $_php-xml $_php-xmlreader
+	$_php-xmlwriter $_php-zlib $_php-zip
 	"
 makedepends="$depends_dev"
 options="!check"
-subpackages="$pkgname-doc $pkgname-activity $pkgname-firstrunwizard $pkgname-gallery
-	$pkgname-mysql $pkgname-notifications $pkgname-pdfviewer $pkgname-pgsql
-	$pkgname-sqlite $pkgname-templateeditor $pkgname-texteditor
-	$pkgname-videoplayer"
+subpackages="$pkgname-doc $pkgname-activity $pkgname-encryption
+	$pkgname-firstrunwizard $pkgname-gallery $pkgname-ldap
+	$pkgname-logreader $pkgname-mysql $pkgname-notifications
+	$pkgname-password_policy $pkgname-pdfviewer $pkgname-pgsql
+	$pkgname-sqlite $pkgname-texteditor $pkgname-videoplayer
+	"
 
 source="https://download.nextcloud.com/server/releases/$pkgname-$pkgver.zip
 	nextcloud10-dont-chmod-config.patch
 	nextcloud.logrotate
 	"
 pkggroups="www-data"
-
 builddir="$srcdir"/$pkgname
 
 _ncbasedir="/var/lib/$pkgname"
@@ -32,16 +34,6 @@ _ncwwwdir="/usr/share/webapps/$pkgname"
 _ncappsdir="$_ncbasedir/apps"
 _ncconfdir="/etc/$pkgname"
 
-
-prepare() {
-	cd "$builddir"
-        for i in $source; do
-                case $i in
-                *.patch) msg "Applying patch $i"; patch -p1 -i "$srcdir"/$i || return 1;;
-                esac
-        done
-}
-
 build() {
 	cd "$builddir"
 	return 0
@@ -71,7 +63,7 @@ package() {
 
 doc() {
 	pkgdesc="Nextcloud documentation"
-	depends="nextcloud"
+	depends="$pkgname"
 	mkdir -p "$subpkgdir"/usr/share/doc/nextcloud/core
 	mv "$pkgdir"/usr/share/webapps/nextcloud/core/doc \
 	 "$subpkgdir"/usr/share/doc/nextcloud/core
@@ -79,19 +71,19 @@ doc() {
 
 pgsql() {
 	pkgdesc="Nextcloud PostgreSQL support"
-	depends="nextcloud $_php-pgsql $_php-pdo_pgsql"
+	depends="$pkgname $_php-pgsql $_php-pdo_pgsql"
 	mkdir -p "$subpkgdir"${_ncwwwdir}
 }
 
 sqlite() {
 	pkgdesc="Nextcloud SQLite support"
-	depends="nextcloud $_php-sqlite3 $_php-pdo_sqlite"
+	depends="$pkgname $_php-sqlite3 $_php-pdo_sqlite"
 	mkdir -p "$subpkgdir"${_ncwwwdir}
 }
 
 mysql() {
 	pkgdesc="Nextcloud MySQL support"
-	depends="nextcloud $_php-pdo_mysql"
+	depends="$pkgname $_php-pdo_mysql"
 	mkdir -p "$subpkgdir"${_ncwwwdir}
 }
 
@@ -113,6 +105,12 @@ activity() {
 	_mv_app pkg activity
 }
 
+encryption() {
+	pkgdesc="Nextcloud Encryption app"
+	depends="$pkgname $_php-mcrypt"
+	_mv_app pkg encryption
+}
+
 firstrunwizard() {
 	pkgdesc="Nextcloud Firstrunwizard app"
 	depends="$pkgname"
@@ -120,43 +118,54 @@ firstrunwizard() {
 }
 
 gallery() {
-	pkgdesc="Nextcloud integrated gallery application"
-	depends="nextcloud"
+	pkgdesc="Nextcloud Gallery app"
+	depends="$pkgname"
 	_mv_app pkg gallery
 }
 
+ldap() {
+	pkgdesc="Nextcloud LDAP auth backend support"
+	depends="$pkgname"
+	_mv_app pkg user_ldap
+}
+
+logreader() {
+	pkgdesc="Nextcloud Log Reader app"
+	depends="$pkgname"
+	_mv_app pkg logreader
+}
+
 notifications() {
 	pkgdesc="Nextcloud Email notification support"
 	depends="$pkgname"
 	_mv_app pkg notifications
 }
 
-
-templateeditor() {
-        pkgdesc="Nextcloud Email template editor app"
+password_policy() {
+        pkgdesc="Nextcloud Password Policy app"
 	depends="$pkgname"
-	_mv_app pkg templateeditor
+	_mv_app pkg password_policy
 }
 
 pdfviewer() {
         pkgdesc="Nextcloud integrated PDF viewer"
-	depends="nextcloud"
+	depends="$pkgname"
 	_mv_app pkg files_pdfviewer
 }
 
 texteditor() {
-	pkgdesc="Nextcloud integrated text editor"
-	depends="nextcloud"
+	pkgdesc="Nextcloud Text Editor app"
+	depends="$pkgname"
 	_mv_app pkg files_texteditor
 }
 
 videoplayer() {
-	pkgdesc="Nextcloud integrated video viewer"
+	pkgdesc="Nextcloud Video Viewer app"
 	depends="nextcloud"
 	provides="$pkgname-videoviewer"
 	_mv_app pkg files_videoplayer
 }
 
-sha512sums="f4277fe2b66286a1fedf1642df6dd546f32e60bfdbc08a67e1881a2f8ff888516694645bdd3cd5da2074c8f56a1dfe7c955e1fcbf6e93ca99a7c82309c05017c  nextcloud-11.0.3.zip
+sha512sums="0e409eedbcc0f4e1652085c3e384db373858b0cc116c70361a4d066a08afbd6e75792332f95d08773cbed78c1520532886268249d514f2da70acb3ba120420d5  nextcloud-12.0.0.zip
 a12a73a38bc009d3307ce97bb32fc62ac93e125a77a3d36b31c9d2212953fa17bd5c31f819e0759a0645b1c285817b067143b0b9c3673ce4ab3043fae426a67c  nextcloud10-dont-chmod-config.patch
 80b94b04507502fa80f3473e4ce8041c2e1f832da8a44408f2f1beda4319dddfc55c9e79d80e8e5a5bfecb770820109870f888d2a3eed9ab5981abcd89f0a812  nextcloud.logrotate"