diff options
| -rw-r--r-- | .SRCINFO | 31 | ||||
| -rw-r--r-- | PKGBUILD | 52 | ||||
| -rw-r--r-- | ksshaskpass.install | 5 | ||||
| -rw-r--r-- | ksshaskpass.sh | 2 |
4 files changed, 45 insertions, 45 deletions
@@ -1,22 +1,25 @@ pkgbase = ksshaskpass-git - pkgdesc = ssh-add helper that uses kwallet and kpassworddialog - pkgver = r30.d44b1e0 + pkgdesc = ssh-add helper that uses kwallet-git and kpassworddialog + pkgver = 6.0.80_r331.g63ecb6d pkgrel = 1 - url = https://projects.kde.org/projects/kde/workspace/ksshaskpass - arch = i686 + url = https://kde.org/plasma-desktop/ arch = x86_64 - license = LGPL - makedepends = extra-cmake-modules + groups = plasma-git + license = GPL-2.0-or-later makedepends = git - makedepends = python - makedepends = kdoctools - depends = kwallet + makedepends = extra-cmake-modules-git + makedepends = kdoctools-git + depends = gcc-libs + depends = glibc + depends = kcoreaddons-git + depends = ki18n-git + depends = kwallet-git + depends = kwidgetsaddons-git + depends = qt6-base provides = ksshaskpass + provides = x11-ssh-askpass conflicts = ksshaskpass - source = git://anongit.kde.org/ksshaskpass.git - source = ksshaskpass.sh - md5sums = SKIP - md5sums = aef2815fb704c98737f23eead3b4e894 + source = git+https://github.com/KDE/ksshaskpass.git + sha256sums = SKIP pkgname = ksshaskpass-git - @@ -1,41 +1,35 @@ -# Maintainer: Antonio Rojas <arojas@archlinux.org> +# Merged with official ABS ksshaskpass PKGBUILD by João, 2021/02/01 (all respective contributors apply herein) +# Maintainer: João Figueiredo & chaotic-aur <islandc0der@chaotic.cx> +# Contributor: Antonio Rojas <arojas@archlinux.org> pkgname=ksshaskpass-git -pkgver=r30.d44b1e0 +pkgver=6.0.80_r331.g63ecb6d pkgrel=1 -pkgdesc='ssh-add helper that uses kwallet and kpassworddialog' -arch=(i686 x86_64) -url='https://projects.kde.org/projects/kde/workspace/ksshaskpass' -license=(LGPL) -depends=(kwallet) -makedepends=(extra-cmake-modules git python kdoctools) -conflicts=(ksshaskpass) -provides=(ksshaskpass) -source=('git://anongit.kde.org/ksshaskpass.git' 'ksshaskpass.sh') -md5sums=('SKIP' - 'aef2815fb704c98737f23eead3b4e894') +pkgdesc='ssh-add helper that uses kwallet-git and kpassworddialog' +url='https://kde.org/plasma-desktop/' +license=(GPL-2.0-or-later) +depends=(gcc-libs glibc kcoreaddons-git ki18n-git kwallet-git kwidgetsaddons-git qt6-base) +makedepends=(git extra-cmake-modules-git kdoctools-git) +arch=($CARCH) +conflicts=(${pkgname%-git}) +provides=(${pkgname%-git} x11-ssh-askpass) +groups=(plasma-git) +source=("git+https://github.com/KDE/${pkgname%-git}.git") +sha256sums=('SKIP') pkgver() { - cd ksshaskpass - printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" -} - -prepare() { - mkdir -p build + cd ${pkgname%-git} + _ver="$(grep -m1 'set(PROJECT_VERSION' CMakeLists.txt | cut -d '"' -f2 | tr - .)" + echo "${_ver}_r$(git rev-list --count HEAD).g$(git rev-parse --short HEAD)" } build() { - cd build - cmake ../ksshaskpass \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DKDE_INSTALL_USE_QT_SYS_PATHS=ON - make + cmake -B build -S ${pkgname%-git} \ + -DQT_MAJOR_VERSION=6 \ + -DBUILD_TESTING=OFF + cmake --build build } package() { - cd build - make DESTDIR="$pkgdir" install - - install -Dm 755 "$srcdir"/ksshaskpass.sh "$pkgdir"/etc/profile.d/ksshaskpass.sh + DESTDIR="$pkgdir" cmake --install build } diff --git a/ksshaskpass.install b/ksshaskpass.install new file mode 100644 index 000000000000..8f976438e829 --- /dev/null +++ b/ksshaskpass.install @@ -0,0 +1,5 @@ +post_upgrade() { + if [[ $(vercmp 5.5.2-2 "$2") -eq 1 ]]; then + echo "The SSH_ASKPASS environment variable is not exported by default anymore. Set it in /etc/profile to revert to the previous behavior" + fi +} diff --git a/ksshaskpass.sh b/ksshaskpass.sh deleted file mode 100644 index 29af895b600f..000000000000 --- a/ksshaskpass.sh +++ /dev/null @@ -1,2 +0,0 @@ -export SSH_ASKPASS="/usr/bin/ksshaskpass" - |