summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorPiotr Gorski2020-06-10 15:18:16 +0200
committerPiotr Gorski2020-06-10 15:18:16 +0200
commit07c300a2dfa4a3e8748c525bf034c47685c32189 (patch)
tree1a8f3f7501b78fb3f489c510569c3ecc98b20a27
parent53243c218ef8584301d2b43efff408f7bfc72775 (diff)
downloadaur-07c300a2dfa4a3e8748c525bf034c47685c32189.tar.gz
Smoothing
Signed-off-by: Piotr Gorski <lucjan.lucjanov@gmail.com>
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD17
2 files changed, 6 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0d9d1cd576ec..ddeb9920f7ce 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = sddm-git
pkgdesc = The Simple Desktop Display Manager
pkgver = 0.18.1.1.g5342323
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/sddm/sddm
arch = x86_64
license = GPL
diff --git a/PKGBUILD b/PKGBUILD
index a019a6728d0f..2e33fa92907d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
_pkgbase="sddm"
pkgname="$_pkgbase-git"
pkgver=0.18.1.1.g5342323
-pkgrel=1
+pkgrel=2
pkgdesc="The Simple Desktop Display Manager"
arch=("x86_64")
url="https://github.com/sddm/sddm"
@@ -24,32 +24,25 @@ sha256sums=('SKIP'
'9fce66f325d170c61caed57816f4bc72e9591df083e89da114a3bb16b0a0e60f'
'db625f2a3649d6d203e1e1b187a054d5c6263cadf7edd824774d8ace52219677')
-
pkgver() {
- cd "$srcdir/$_pkgbase"
+ cd $_pkgbase
#_ver="$(cat CMakeLists.txt | grep -m3 -e _VERSION_MAJOR -e _VERSION_MINOR -e _VERSION_PATCH | grep -o "[[:digit:]]*" | paste -sd'.')"
#echo "${_ver}.r$(git rev-list --count HEAD).g$(git rev-parse --short HEAD)"
git describe --tags --long | sed 's/^v//;s/-/./g'
}
-prepare() {
- mkdir -p build
-}
-
build() {
- cd build
- cmake "$srcdir/$_pkgbase" \
+ cmake -B build -S $_pkgbase \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBEXECDIR=/usr/lib/sddm \
-DDBUS_CONFIG_DIR=/usr/share/dbus-1/system.d \
-DDBUS_CONFIG_FILENAME=sddm_org.freedesktop.DisplayManager.conf \
-DBUILD_MAN_PAGES=ON
- make
+ cmake --build build
}
package() {
- cd build
- make DESTDIR="${pkgdir}" install
+ DESTDIR="$pkgdir" cmake --install build
install -Dm644 "$srcdir"/sddm.sysusers "$pkgdir"/usr/lib/sysusers.d/sddm.conf
install -Dm644 "$srcdir"/sddm.tmpfiles "$pkgdir"/usr/lib/tmpfiles.d/sddm.conf