upgpkg: cgrep-clang-git r143.a6c42a8-2

1 files changed, 20 insertions, 19 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 3ea7e0aff720..798a099216af 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,20 +3,24 @@
 # All my PKGBUILDs are managed at https://github.com/schra/pkgbuilds
 
 _name=cgrep-clang
-pkgname="$_name-git"
-pkgver=r110.b21ebb0
-pkgrel=1
+pkgname=$_name-git
+pkgver=r143.a6c42a8
+_mainfolder=$_name
+pkgrel=2
 pkgdesc='grep for C/C++ source files'
-arch=('any')
-url='https://github.com/bloodstalker/cgrep'
-license=('GPL3')
-depends=('llvm' 'clang')
-makedepends=('git')
-source=("$_name::git+$url" "git+https://github.com/bloodstalker/cfe-extra" dont-precompile-header.patch)
-sha256sums=('SKIP' 'SKIP' 'e356a34c71aab5ce49c94cf20a48392c19a26c006f1e11bed323b6535c7fb65a')
+arch=(any)
+url=https://github.com/bloodstalker/cgrep
+license=(GPL3)
+depends=(llvm clang)
+makedepends=(git)
+source=($_name::git+$url git+https://github.com/bloodstalker/cfe-extra)
+sha256sums=('SKIP'
+            'SKIP')
+conflicts=($_name)
+provides=($_name)
 
 pkgver() {
-  cd "$srcdir/$_name"
+  cd "$srcdir/$_mainfolder"
 
   # from https://wiki.archlinux.org/index.php/VCS_package_guidelines#Git
   ( set -o pipefail
@@ -26,7 +30,7 @@ pkgver() {
 }
 
 prepare() {
-  cd "$srcdir/$_name"
+  cd "$srcdir/$_mainfolder"
 
   git submodule init
   git config submodule.cfe-extra.url "$srcdir"/cfe-extra
@@ -34,15 +38,12 @@ prepare() {
 }
 
 package() {
-  cd "$srcdir/$_name"
-
-  # For me compilation fails with enabled precompiled headers
-  patch -p1 -i "${srcdir}/dont-precompile-header.patch"
+  cd "$srcdir/$_mainfolder"
 
   make
 
   # `make install` isn't provided, so we have to manually copy the files
-  install -dm755 "${pkgdir}"/{usr/bin,usr/share/licenses/${pkgname}}
-  install -m 755 cgrep "${pkgdir}/usr/bin"
-  install -m 644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE.md
+  install -dm755 "$pkgdir"/{usr/bin,usr/share/licenses/$_name}
+  install -m 755 cgrep "$pkgdir/usr/bin"
+  install -m 644 LICENSE "$pkgdir"/usr/share/licenses/$_name/LICENSE.md
 }