summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD34
2 files changed, 19 insertions, 23 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b83a578e2bd2..f0ae7eb1f842 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,15 @@
pkgbase = editorconfig-core-c-git
pkgdesc = EditorConfig core library written in C (for use by plugins supporting EditorConfig parsing)
- pkgver = 0.12.1.r16.g6f3c40d
- pkgrel = 2
+ pkgver = 0.12.3.r38.ge70d90d
+ pkgrel = 1
url = https://github.com/editorconfig/editorconfig-core-c
arch = i686
arch = x86_64
license = BSD
makedepends = git
- makedepends = cmake>=2.8.7
+ makedepends = cmake
depends = glibc
- depends = pcre
+ depends = pcre2
provides = editorconfig-core-c
conflicts = editorconfig-core-c
source = git+https://github.com/editorconfig/editorconfig-core-c.git
diff --git a/PKGBUILD b/PKGBUILD
index eb7d4d538982..5b05cf417630 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,26 +1,20 @@
# Maintainer: Chocobo1 <chocobo1 AT archlinux DOT net>
pkgname=editorconfig-core-c-git
-pkgver=0.12.1.r16.g6f3c40d
-pkgrel=2
+pkgver=0.12.3.r38.ge70d90d
+pkgrel=1
pkgdesc="EditorConfig core library written in C (for use by plugins supporting EditorConfig parsing)"
arch=('i686' 'x86_64')
url="https://github.com/editorconfig/editorconfig-core-c"
license=('BSD')
-depends=('glibc' 'pcre')
-makedepends=('git' 'cmake>=2.8.7')
+depends=('glibc' 'pcre2')
+makedepends=('git' 'cmake')
provides=('editorconfig-core-c')
conflicts=('editorconfig-core-c')
source=('git+https://github.com/editorconfig/editorconfig-core-c.git')
sha256sums=('SKIP')
-prepare() {
- cd "editorconfig-core-c"
-
- mkdir -p "_build"
-}
-
pkgver() {
cd "editorconfig-core-c"
@@ -28,19 +22,21 @@ pkgver() {
}
build() {
- cd "editorconfig-core-c/_build"
+ cd "editorconfig-core-c"
- cmake -DCMAKE_INSTALL_PREFIX="/usr" -DCMAKE_INSTALL_LIBDIR="lib" -DCMAKE_BUILD_TYPE=Release -DINSTALL_HTML_DOC=ON ../
+ mkdir -p "_build" && cd "_build"
+ cmake \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX="/usr" \
+ -DCMAKE_INSTALL_LIBDIR="lib" \
+ -DINSTALL_HTML_DOC=ON \
+ "../"
make
}
package() {
- cd "editorconfig-core-c/_build"
-
- make DESTDIR="$pkgdir" install
- install -Dm644 "../LICENSE" "$pkgdir/usr/share/licenses/editorconfig-core-c/LICENSE"
+ cd "editorconfig-core-c"
- # name clash with python-editorconfig
- # https://bugs.archlinux.org/task/53365
- rm "$pkgdir/usr/bin/editorconfig"
+ make -C "_build" DESTDIR="$pkgdir" install
+ install -Dm644 "LICENSE" -t "$pkgdir/usr/share/licenses/editorconfig-core-c"
}