uppkg

1 files changed, 26 insertions, 28 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 9ba46b1be626..3e88b2e99af3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,21 +5,21 @@
 # Contributor: Sickhate
 # Contributor: KittyKatt <kittykatt AT silverirc.com>
 # Contributor: UnCO <undercooled AT lavabit com>
-pkgname='pekwm-git'
-_pkgname='pekwm'
+pkgname=pekwm-git
+_pkgname=pekwm
 epoch=1
-pkgver=0.1.17.r146.g24f9f9b
+pkgver=0.2.0.r57.gac6a637
 pkgrel=1
-pkgdesc='Small, fast, functional, and flexible window manager'
-arch=('x86_64' 'i686')
-license=('GPL')
-url='http://www.pekwm.org/'
-depends=('libjpeg' 'libxft' 'libxinerama' 'libxpm' 'libxrandr')
-makedepends=('gendesk>=0.6' 'git')
+pkgdesc='Tabbed X11 window manager'
+arch=(x86_64 i686)
+license=(GPL)
+url='https://github.com/pekdon/pekwm'
+makedepends=(cmake gendesk git ninja)
+depends=(libjpeg libpng libxft libxinerama libxpm libxrandr bash)
 optdepends=('lxappearance: feature-rich GTK+ theme switcher'
             'nitrogen: background browser and setter'
             'tint2: basic, good-looking task manager')
-provides=("$_pkgname")
+provides=("${_pkgname}=${pkgver%%.r*}-${pkgrel}")
 conflicts=("$_pkgname")
 backup=(etc/pekwm/autoproperties
         etc/pekwm/autoproperties_typerules
@@ -31,6 +31,7 @@ backup=(etc/pekwm/autoproperties
         etc/pekwm/mouse_click
         etc/pekwm/mouse_sloppy
         etc/pekwm/mouse_system
+        etc/pekwm/panel
         etc/pekwm/start
         etc/pekwm/vars)
 source=("$pkgname::git+https://github.com/pekdon/pekwm.git"
@@ -44,33 +45,30 @@ pkgver() {
 }
 
 prepare() {
-  gendesk -f -n --pkgname "$_pkgname" --pkgdesc "$pkgdesc" --name PekWM
-  gendesk -f -wm --pkgname "${_pkgname}_kdm" --exec "$_pkgname" --name PekWM
+  gendesk -f -n --pkgname $_pkgname --pkgdesc "$pkgdesc" --name PekWM
+  gendesk -f -n -wm --pkgname ${_pkgname}_kdm --exec $_pkgname --name PekWM
   # Harbour without border
   cd $pkgname
   patch -p1 -i "$srcdir"/harbour-no-border.patch
 }
 
 build() {
-  cd $pkgname
-  sed -i 's/libpng12/libpng/g' configure.ac
-  ./autogen.sh
-  # Default settings:
-  #    --enable-shape --enable-menus \
-  #    --disable-pcre --disable-debug  \
-  #    --enable-xft --enable-image-xpm --enable-image-jpeg \
-  #    --enable-image-png --enable-xrandr
-  ./configure --prefix=/usr --sysconfdir=/etc
-  make
+  cmake \
+    -B build \
+    -D CMAKE_BUILD_TYPE=Release \
+    -D CMAKE_INSTALL_PREFIX=/usr \
+    -D CMAKE_INSTALL_LIBDIR=lib \
+    -G Ninja \
+    -S $pkgname
+  ninja -C build
 }
 
 package() {
-  cd $pkgname
-  make DESTDIR="${pkgdir}" install
-  install -Dm644 "$srcdir/${_pkgname}.desktop" \
-    "$pkgdir/usr/share/xsessions/${_pkgname}.desktop"
-  install -Dm644 "$srcdir/${_pkgname}_kdm.desktop" \
-    "$pkgdir/usr/share/apps/kdm/sessions/${_pkgname}_kdm.desktop"
+  DESTDIR="$pkgdir" ninja -C build install
+  install -Dm644 $_pkgname.desktop \
+    "$pkgdir"/usr/share/xsessions/$_pkgname.desktop
+  install -Dm644 ${_pkgname}_kdm.desktop \
+    "$pkgdir"/usr/share/apps/kdm/sessions/$_pkgname.desktop
 }
 
 # vim: ts=2 sw=2 et