Use HTTPS urls

upgpkg: awesome-way-cooler-git 4.3.r333.g3b4f3640-1

upgpkg: way-cooler-git 10.8.0.r661.ge50ffca0-1

1 files changed, 38 insertions, 27 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 3a3c6dfbcdec..ae4f29c548bf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,48 +14,59 @@ pkgname=$_pkgname-git
 pkgver=4.3.r333.g3b4f3640
 pkgrel=1
 pkgdesc='Highly configurable framework window manager (wayland compatible fork using way-cooler)'
-arch=('i686' 'x86_64')
-url='https://github.com/way-cooler/awesome'
+arch=('x86_64' 'i686')
+url="https://github.com/way-cooler/$_pkgbase"
 license=('GPL2')
-depends=('cairo' 'dbus' 'gdk-pixbuf2' 'libxdg-basedir' 'libxkbcommon-x11'
-         'lua' 'lua-lgi' 'pango' 'startup-notification' 'xcb-util-cursor'
-         'xcb-util-keysyms' 'xcb-util-wm' 'xcb-util-xrm' 'libxfixes' 'way-cooler')
-makedepends=('asciidoc' 'cmake' 'docbook-xsl' 'git' 'imagemagick' 'ldoc'
+depends=('cairo'
+         'dbus'
+         'gdk-pixbuf2'
+         'libxdg-basedir'
+         'libxkbcommon-x11'
+         'lua'
+         'lua-lgi'
+         'pango'
+         'startup-notification'
+         'xcb-util-cursor'
+         'xcb-util-keysyms'
+         'xcb-util-wm'
+         'xcb-util-xrm'
+         'libxfixes'
+         'way-cooler')
+makedepends=('asciidoc'
+             'cmake'
+             'docbook-xsl'
+             'git'
+             'imagemagick'
+             'ldoc'
              'xmlto')
 optdepends=('rlwrap: readline support for awesome-client'
             'dex: autostart your desktop files'
             'xcb-util-errors: for pretty-printing of X11 errors'
-            'librsvg: for displaying SVG files without scaling artifacts'
-)
+            'librsvg: for displaying SVG files without scaling artifacts')
 provides=('notification-daemon' "$_pkgbase" "$_pkgname")
 conflicts=("$_pkgbase")
 backup=("etc/xdg/$_pkgbase/rc.lua")
-source=("$pkgname::git+https://github.com/way-cooler/$_pkgbase.git")
+source=("$pkgname::git+$url.git")
 sha256sums=('SKIP')
 
 pkgver() {
-  cd "$pkgname"
-  git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
-}
-
-prepare() {
-  mkdir -p build
+    cd "$pkgname"
+    git describe --long --tags --abrev=7 |
+        sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 build() {
-  cd build
-  cmake ../"$pkgname" \
-    -DCMAKE_BUILD_TYPE=RELEASE \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DSYSCONFDIR=/etc \
-    -DLUA_LIBRARY=/usr/lib/liblua.so.5.3
-  make
+    cd "$pkgname"
+    cmake -S . -B build \
+        -DCMAKE_BUILD_TYPE=RELEASE \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DSYSCONFDIR=/etc \
+        -DLUA_LIBRARY=/usr/lib/liblua.so.5.3
+    make -C build
 }
 
 package() {
-  cd build
-  make DESTDIR="$pkgdir" install
-
-  install -Dm644 "$srcdir"/"$pkgname"/awesome.desktop \
-    "$pkgdir/usr/share/xsessions/awesome.desktop"
+    cd "$pkgname"
+    make -C build DESTDIR="$pkgdir" install
+    install -Dm644 -t "$srcdir/$pkgname/" "$pkgdir/usr/share/xsessions/awesome.desktop"
 }