Patches for aports can be sent to this list

1

[alpine-aports] [PATCH] community/nextcloud: fix php-related depends

Valery Kartel
Details
Message ID
<20170504102919.28147-1-valery.kartel@gmail.com>
Sender timestamp
1493893759
DKIM signature
missing
Download raw message
Patch: +7 -7
from https://docs.nextcloud.com/server/11/admin_manual/installation/source_installation.html#prerequisites

- add all php extensions from 'Required' and 'Recommended' sections

- set database-specific depends to those pointed in 'Database
  connectors' section
---
 community/nextcloud/APKBUILD | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/community/nextcloud/APKBUILD b/community/nextcloud/APKBUILD
index 78a559af78..00cb31f5e8 100644
--- a/community/nextcloud/APKBUILD
+++ b/community/nextcloud/APKBUILD
@@ -1,15 +1,15 @@
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=nextcloud
 pkgver=11.0.3
-pkgrel=1
+pkgrel=2
 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}-openssl ${_php}-xml ${_php}-xmlreader
-	${_php}-zlib ${_php}-zip
+depends="$_php $_php-bz2 $_php-ctype $_php-curl $_php-fileinfo $_php-dom $_php-gd
+	$_php-iconv $_php-intl $_php-json $_php-mbstring $_php-mcrypt $_php-openssl
+	$_php-posix $_php-xml $_php-xmlreader $_php-xmlwriter $_php-zlib $_php-zip
 	"
 depends_dev=
 makedepends="$depends_dev"
@@ -79,19 +79,19 @@ doc() {
 
 pgsql() {
 	pkgdesc="Nextcloud PostgreSQL support"
-	depends="nextcloud ${_php}-pgsql ${_php}-pdo_pgsql ${_php}-pear-mdb2_driver_pgsql"
+	depends="nextcloud $_php-pgsql"
 	mkdir -p "$subpkgdir"${_ncwwwdir}
 }
 
 sqlite() {
 	pkgdesc="Nextcloud SQLite support"
-	depends="nextcloud ${_php}-sqlite3 ${_php}-pdo_sqlite"
+	depends="nextcloud $_php-sqlite3"
 	mkdir -p "$subpkgdir"${_ncwwwdir}
 }
 
 mysql() {
 	pkgdesc="Nextcloud MySQL support"
-	depends="nextcloud ${_php}-mysql ${_php}-pdo_mysql ${_php}-pear-mdb2_driver_mysql"
+	depends="nextcloud $_php-pdo_mysql"
 	mkdir -p "$subpkgdir"${_ncwwwdir}
 }
 
-- 
2.12.2



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---
Leonardo Arena
Details
Message ID
<915ec38a-7de1-4f36-4e64-13fe0c59fb25@gmail.com>
In-Reply-To
<20170504102919.28147-1-valery.kartel@gmail.com> (view parent)
Sender timestamp
1494409418
DKIM signature
missing
Download raw message
Hi,


On 05/04/2017 12:29 PM, Valery Kartel wrote:
> from https://docs.nextcloud.com/server/11/admin_manual/installation/source_installation.html#prerequisites
>
> - add all php extensions from 'Required' and 'Recommended' sections
>
> - set database-specific depends to those pointed in 'Database
>    connectors' section
> ---
>   community/nextcloud/APKBUILD | 14 +++++++-------
>   1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/community/nextcloud/APKBUILD b/community/nextcloud/APKBUILD
> index 78a559af78..00cb31f5e8 100644
> --- a/community/nextcloud/APKBUILD
> +++ b/community/nextcloud/APKBUILD
> @@ -1,15 +1,15 @@
>   # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
>   pkgname=nextcloud
>   pkgver=11.0.3
> -pkgrel=1
> +pkgrel=2
>   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}-openssl ${_php}-xml ${_php}-xmlreader
> -	${_php}-zlib ${_php}-zip
> +depends="$_php $_php-bz2 $_php-ctype $_php-curl $_php-fileinfo $_php-dom $_php-gd
> +	$_php-iconv $_php-intl $_php-json $_php-mbstring $_php-mcrypt $_php-openssl
> +	$_php-posix $_php-xml $_php-xmlreader $_php-xmlwriter $_php-zlib $_php-zip

I pushed a variation of this, since not all depends are strictly needed. 
They can always be added manually. For example you don't need mcrypt if 
you don't use encryption.


>   	"
>   depends_dev=
>   makedepends="$depends_dev"
> @@ -79,19 +79,19 @@ doc() {
>   
>   pgsql() {
>   	pkgdesc="Nextcloud PostgreSQL support"
> -	depends="nextcloud ${_php}-pgsql ${_php}-pdo_pgsql ${_php}-pear-mdb2_driver_pgsql"
> +	depends="nextcloud $_php-pgsql"
>   	mkdir -p "$subpkgdir"${_ncwwwdir}
>   }
>   
>   sqlite() {
>   	pkgdesc="Nextcloud SQLite support"
> -	depends="nextcloud ${_php}-sqlite3 ${_php}-pdo_sqlite"
> +	depends="nextcloud $_php-sqlite3"
>   	mkdir -p "$subpkgdir"${_ncwwwdir}
>   }
>   
>   mysql() {
>   	pkgdesc="Nextcloud MySQL support"
> -	depends="nextcloud ${_php}-mysql ${_php}-pdo_mysql ${_php}-pear-mdb2_driver_mysql"
> +	depends="nextcloud $_php-pdo_mysql"
>   	mkdir -p "$subpkgdir"${_ncwwwdir}
>   }
>   

This has been fully merged. Probably they were legacy depends of 
owncloud package.

Thanks!

- leo


---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---