Dependencies fixed

This commit is contained in:
SanskritFritz
2021-02-07 16:28:10 +01:00
parent 6c9aab5734
commit 22d1b14d95
2 changed files with 35 additions and 15 deletions

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.1.0.r242.gcebfaa778 pkgver = 3.1.2.r2055.gc633ce7e7
pkgrel = 1 pkgrel = 1
epoch = 2 epoch = 2
url = http://fishshell.com url = http://fishshell.com
@@ -9,12 +9,19 @@ pkgbase = fish-git
arch = x86_64 arch = x86_64
arch = arm arch = arm
license = GPL2 license = GPL2
checkdepends = expect
makedepends = cmake makedepends = cmake
makedepends = python-sphinx makedepends = python-sphinx
makedepends = git makedepends = git
depends = glibc
depends = gcc-libs
depends = ncurses depends = ncurses
optdepends = python: fish_update_completions and other tools depends = pcre2
optdepends = python: man page completion parser / web config tool
optdepends = pkgfile: command-not-found hook
optdepends = wl-clipboard: clipboard integration
optdepends = xsel: clipboard integration optdepends = xsel: clipboard integration
optdepends = xclip: clipboard integration
provides = fish provides = fish
provides = fish-shell provides = fish-shell
conflicts = fish conflicts = fish

View File

@@ -2,21 +2,26 @@
# Contributor: Eric Belanger <eric@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org>
# Contributor: Jan Fader <jan.fader@web.de> # Contributor: Jan Fader <jan.fader@web.de>
# Contributor: Stephen Drodge <stephen.drodge@gmail.com> # Contributor: Stephen Drodge <stephen.drodge@gmail.com>
# Contributor: akiirui (AUR)
# Maintainer: SanskritFritz (gmail) # Maintainer: SanskritFritz (gmail)
pkgname=fish-git pkgname=fish-git
_gitname="fish-shell" _gitname="fish-shell"
pkgver=3.1.0.r242.gcebfaa778 pkgver=3.1.2.r2055.gc633ce7e7
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."
arch=('i686' 'x86_64' 'arm') arch=('i686' 'x86_64' 'arm')
url="http://fishshell.com" url="http://fishshell.com"
license=("GPL2") license=("GPL2")
depends=('ncurses') depends=('glibc' 'gcc-libs' 'ncurses' 'pcre2')
optdepends=('python: fish_update_completions and other tools' optdepends=('python: man page completion parser / web config tool'
'xsel: clipboard integration') 'pkgfile: command-not-found hook'
'wl-clipboard: clipboard integration'
'xsel: clipboard integration'
'xclip: clipboard integration')
makedepends=('cmake' 'python-sphinx' 'git') makedepends=('cmake' 'python-sphinx' 'git')
checkdepends=('expect')
provides=('fish' 'fish-shell') provides=('fish' 'fish-shell')
conflicts=('fish' 'fish-shell') conflicts=('fish' 'fish-shell')
install='fish.install' install='fish.install'
@@ -28,17 +33,25 @@ pkgver() {
git describe --long | sed -r 's/([^-]*-g)/r\1/;s/-/./g' git describe --long | sed -r 's/([^-]*-g)/r\1/;s/-/./g'
} }
build() { check() {
cd "$srcdir/$_gitname" cd "$_gitname"
mkdir -p build make -C build test
cd build }
cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_SYSCONFDIR=/etc -DCMAKE_BUILD_TYPE=Release ..
make
build() {
cd "$_gitname"
export CXXFLAGS+=" ${CPPFLAGS}"
cmake \
-B build \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_SYSCONFDIR=/etc \
-DCMAKE_BUILD_TYPE=None \
-DBUILD_DOCS=True \
-Wno-dev
make -C build
} }
package() { package() {
cd "$srcdir/$_gitname/build" cd "$_gitname"
make DESTDIR="$pkgdir" install make -C build DESTDIR="$pkgdir" install
} }