summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO11
-rw-r--r--PKGBUILD27
-rw-r--r--php-language-server2
3 files changed, 25 insertions, 15 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5cdbedc10873..eb5b9c60bf1f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,17 @@
pkgbase = php-language-server
pkgdesc = PHP language server implementation
pkgver = 5.4.6
- pkgrel = 1
+ pkgrel = 4
url = https://github.com/felixfbecker/php-language-server
arch = x86_64
license = ISC
makedepends = composer
- depends = php>=7
+ depends = php74
source = php-language-server-5.4.6.tar.gz::https://github.com/felixfbecker/php-language-server/archive/v5.4.6.tar.gz
+ source = exception.patch::https://github.com/felixfbecker/php-language-server/commit/d5bbffb30db1d117184518713a4bea191fc6ab22.diff
source = php-language-server
- md5sums = 3934a16509185f1def5040099710fbc9
- md5sums = cb882eef5bc51ae553fdc7c43d181544
+ sha256sums = 289873a9d2f42b829eb66ff5251476e611de3102bca2b52f9fefd7d4f98e7357
+ sha256sums = eff140afa56f5f2bcda7b6da6e599ef86e9de4692a357ff06c4aaf9dfed36000
+ sha256sums = b4cfc545e3edb8c8e9a664b8d853f378fe4ed11960a721318d04d9388c2d5fcd
pkgname = php-language-server
-
diff --git a/PKGBUILD b/PKGBUILD
index c665d0b1ad59..32ee9c40cb02 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,31 +1,40 @@
# Maintainer: Jan-Jaap Korpershoek <jjkorpershoek96 at gmail dot com>
pkgname=php-language-server
pkgver=5.4.6
-pkgrel=1
+pkgrel=4
pkgdesc="PHP language server implementation"
arch=('x86_64')
url="https://github.com/felixfbecker/php-language-server"
license=('ISC')
-depends=('php>=7')
+depends=('php74')
makedepends=('composer')
source=(
"$pkgname-$pkgver.tar.gz::https://github.com/felixfbecker/$pkgname/archive/v$pkgver.tar.gz"
+ "exception.patch::https://github.com/felixfbecker/$pkgname/commit/d5bbffb30db1d117184518713a4bea191fc6ab22.diff"
"php-language-server"
)
-md5sums=('3934a16509185f1def5040099710fbc9'
- 'cb882eef5bc51ae553fdc7c43d181544')
+sha256sums=('289873a9d2f42b829eb66ff5251476e611de3102bca2b52f9fefd7d4f98e7357'
+ 'eff140afa56f5f2bcda7b6da6e599ef86e9de4692a357ff06c4aaf9dfed36000'
+ 'b4cfc545e3edb8c8e9a664b8d853f378fe4ed11960a721318d04d9388c2d5fcd')
+
+prepare() {
+ cd "$srcdir/$pkgname-$pkgver"
+ # Avoid a crash due to badly catched exception.
+ # See https://github.com/felixfbecker/php-language-server/pull/756
+ patch -p1 -i ../exception.patch
+}
build() {
- cd "$srcdir/$pkgname-$pkgver"
- composer install
- composer run-script parse-stubs
+ cd "$srcdir/$pkgname-$pkgver"
+ php7 /usr/bin/composer install
+ php7 /usr/bin/composer run-script parse-stubs
}
package() {
- path=$pkgdir/usr/share/php/$pkgname
+ path="$pkgdir/usr/share/php7/$pkgname"
mkdir -p $path
mkdir -p "$pkgdir/usr/bin"
install -Dm755 php-language-server "$pkgdir/usr/bin/"
- cd "$srcdir/$pkgname-$pkgver"
+ cd "$srcdir/$pkgname-$pkgver"
cp -dr --no-preserve=ownership . "$path"
}
diff --git a/php-language-server b/php-language-server
index 3fbc1f4de56c..1b5f92d1f2b6 100644
--- a/php-language-server
+++ b/php-language-server
@@ -1,2 +1,2 @@
#!/bin/bash
-php /usr/share/php/php-language-server/bin/php-language-server.php
+php7 /usr/share/php7/php-language-server/bin/php-language-server.php