summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonne Haß2019-02-13 19:28:36 +0100
committerJonne Haß2019-02-13 19:28:36 +0100
commit28318731377481a2a5db4e8ead5a6a6207700ad8 (patch)
treeabf92a2362a20956434b25d17da3416ea81df657
parent6012e21f637f0b928f82683f62c7ea742bc743c8 (diff)
downloadaur-28318731377481a2a5db4e8ead5a6a6207700ad8.tar.gz
diaspora: update to ruby2.4
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD14
2 files changed, 10 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c841fb6186f..782869d23da 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -8,8 +8,9 @@ pkgbase = diaspora-postgresql-git
arch = x86_64
license = AGPL3
makedepends = nodejs
- depends = ruby2.3
- depends = ruby2.3-bundler
+ makedepends = git
+ depends = ruby2.4
+ depends = ruby2.4-bundler
depends = redis
depends = imagemagick
depends = libxslt
diff --git a/PKGBUILD b/PKGBUILD
index 0ab07acb3a7..005cde7957d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,9 +6,9 @@ pkgdesc="A distributed privacy aware social network (development head) (PostgreS
arch=('i686' 'x86_64')
url="https://diasporafoundation.org"
license=('AGPL3')
-depends=('ruby2.3' 'ruby2.3-bundler' 'redis' 'imagemagick' 'libxslt' 'net-tools' 'gsfonts' 'libtirpc' 'postgresql-libs')
+depends=('ruby2.4' 'ruby2.4-bundler' 'redis' 'imagemagick' 'libxslt' 'net-tools' 'gsfonts' 'libtirpc' 'postgresql-libs')
optdepends=('jemalloc: lower memory consumption' 'postgresql: Database server')
-makedepends=('nodejs')
+makedepends=('nodejs' 'git')
conflicts=('diaspora-mysql' 'diaspora-postgresql' 'diaspora-mysql-git')
options=(!strip)
backup=("etc/webapps/diaspora/diaspora.yml"
@@ -50,9 +50,9 @@ _reset_ruby() {
}
build() {
- _bundle=bundle-2.3
- _ruby=ruby-2.3
- _rake=rake-2.3
+ _bundle=bundle-2.4
+ _ruby=ruby-2.4
+ _rake=rake-2.4
_builddir=$srcdir/build
_reset_ruby
@@ -95,8 +95,8 @@ build() {
}
package() {
- _bundle=bundle-2.3
- _ruby=ruby-2.3
+ _bundle=bundle-2.4
+ _ruby=ruby-2.4
_builddir=$srcdir/build
msg "Copy contents to package directory"