diff options
| author | prash | 2018-11-23 17:01:39 +0530 |
|---|---|---|
| committer | prash | 2018-11-23 17:01:39 +0530 |
| commit | dfa77396e44096dd6aab61e3cb4beb50a98331d8 (patch) | |
| tree | 91ee07c120b89061593ced6053d89734338668c6 | |
| parent | 59d9645298605cc81196d7690810a0c37d77a18e (diff) | |
| download | aur-dfa77396e44096dd6aab61e3cb4beb50a98331d8.tar.gz | |
Upstream calls the latest version 1.7.90, and builds with KF5
| -rw-r--r-- | .SRCINFO | 7 | ||||
| -rw-r--r-- | PKGBUILD | 13 |
2 files changed, 10 insertions, 10 deletions
@@ -1,8 +1,8 @@ pkgbase = kdiff3-kf5-git pkgdesc = A KDE file comparator/merge tool - pkgver = 20160423_2b7e23a + pkgver = 1.7.90_3029480 pkgrel = 1 - url = https://quickgit.kde.org/?p=scratch%2Fthomasfischer%2Fkdiff3.git + url = https://cgit.kde.org/kdiff3.git arch = i686 arch = x86_64 license = GPL @@ -11,11 +11,12 @@ pkgbase = kdiff3-kf5-git makedepends = git makedepends = kdoctools depends = kparts + depends = hicolor-icon-theme conflicts = kdiff3 conflicts = kdiff3-git conflicts = kdiff3-kf5 conflicts = kdiff3-qt - source = git://anongit.kde.org/scratch/thomasfischer/kdiff3.git#branch=kf5 + source = git+https://github.com/KDE/kdiff3.git sha512sums = SKIP pkgname = kdiff3-kf5-git @@ -3,21 +3,21 @@ _basename=kdiff3 _gitbranch=kf5 pkgname=${_basename}-${_gitbranch}-git -pkgver=20160423_2b7e23a +pkgver=1.7.90_3029480 pkgrel=1 pkgdesc="A KDE file comparator/merge tool" arch=('i686' 'x86_64') -url="https://quickgit.kde.org/?p=scratch%2Fthomasfischer%2Fkdiff3.git" +url="https://cgit.kde.org/kdiff3.git" license=('GPL') -depends=('kparts') +depends=('kparts' 'hicolor-icon-theme') conflicts=("$_basename" "${_basename}-git" "${_basename}-${_gitbranch}" "${_basename}-qt") makedepends=('cmake' 'extra-cmake-modules' 'git' 'kdoctools') -source=("git://anongit.kde.org/scratch/thomasfischer/${_basename}.git#branch=${_gitbranch}") +source=("git+https://github.com/KDE/kdiff3.git") sha512sums=('SKIP') pkgver() { cd "$srcdir/$_basename" - echo "$(git log -1 --format="%cd" --date=short | sed 's|-||g')_$(git rev-parse --short HEAD)" + git describe --always | sed "s/-/./g" | sed "s/^/1.7.90_/g" } prepare() { @@ -26,8 +26,7 @@ prepare() { build() { cd "$srcdir/build" - # Strange source directory structure upstream, so "$srcdir/$_basename/$_basename" *is* correct - cmake "$srcdir/$_basename/$_basename" \ + cmake "$srcdir/$_basename" \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ |