Package/fish-git
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upstream switched to cmake

Browse Source
This commit is contained in:
SanskritFritz
2019-03-03 23:55:04 +01:00
parent 8da1e112d3
commit 6ee39eeeb6
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.SRCINFO
View File

@@ -1,6 +1,6 @@
pkgbase = fish-git pkgbase = fish-git
pkgdesc = User friendly shell intended mostly for interactive use. pkgdesc = User friendly shell intended mostly for interactive use.
pkgver = 3.0.0.r164.g455959ae pkgver = 3.0.2.r546.ge11c3f352
pkgrel = 1 pkgrel = 1
epoch = 2 epoch = 2
url = http://fishshell.com url = http://fishshell.com
@@ -9,6 +9,7 @@ pkgbase = fish-git
arch = x86_64 arch = x86_64
arch = arm arch = arm
license = GPL2 license = GPL2
makedepends = cmake
makedepends = doxygen makedepends = doxygen
makedepends = git makedepends = git
makedepends = ncurses makedepends = ncurses

17
PKGBUILD
View File

@@ -6,7 +6,7 @@
pkgname=fish-git pkgname=fish-git
_gitname="fish-shell" _gitname="fish-shell"
pkgver=3.0.0.r164.g455959ae pkgver=3.0.2.r546.ge11c3f352
pkgrel=1 pkgrel=1
epoch=2 epoch=2
pkgdesc="User friendly shell intended mostly for interactive use." pkgdesc="User friendly shell intended mostly for interactive use."
@@ -16,7 +16,7 @@ license=("GPL2")
depends=('ncurses') depends=('ncurses')
optdepends=('python: fish_update_completions and other tools' optdepends=('python: fish_update_completions and other tools'
'xsel: clipboard integration') 'xsel: clipboard integration')
makedepends=('doxygen' 'git' 'ncurses') makedepends=('cmake' 'doxygen' 'git' 'ncurses')
provides=('fish' 'fish-shell') provides=('fish' 'fish-shell')
conflicts=('fish' 'fish-shell') conflicts=('fish' 'fish-shell')
install='fish.install' install='fish.install'
@@ -31,13 +31,18 @@ pkgver() {
build() { build() {
cd "$srcdir/$_gitname" cd "$srcdir/$_gitname"
mkdir -p build
autoreconf --no-recursive cd build
./configure --prefix=/usr --sysconfdir=/etc --docdir=/usr/share/doc/fish --without-included-pcre2 cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release ..
make make
} }
package() { package() {
cd "$srcdir/$_gitname" cd "$srcdir/$_gitname/build"
make DESTDIR="$pkgdir" install make DESTDIR="$pkgdir" install
# https://github.com/fish-shell/fish-shell/issues/5719
mv "$pkgdir/usr/local/share/fish/"* "$pkgdir/usr/share/fish"
rmdir "$pkgdir/usr/local/share/fish" "$pkgdir/usr/local/share" "$pkgdir/usr/local"
} }