From ac1e7fef7794d0d3fee2baaff7442c499fa74c96 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 1 Mar 2021 07:45:14 -0500
Subject: [PATCH] pekwm: update to 0.1.18.

---
 srcpkgs/pekwm/patches/sysconfdir.patch | 29 +++++++++++++++++++
 srcpkgs/pekwm/template                 | 40 +++++++-------------------
 srcpkgs/pekwm/update                   |  1 +
 3 files changed, 41 insertions(+), 29 deletions(-)
 create mode 100644 srcpkgs/pekwm/patches/sysconfdir.patch
 create mode 100644 srcpkgs/pekwm/update

diff --git a/srcpkgs/pekwm/patches/sysconfdir.patch b/srcpkgs/pekwm/patches/sysconfdir.patch
new file mode 100644
index 00000000000..91a6da3d8e5
--- /dev/null
+++ b/srcpkgs/pekwm/patches/sysconfdir.patch
@@ -0,0 +1,29 @@
+--- CMakeLists.txt	2021-03-01 07:37:20.447294425 -0500
++++ CMakeLists.txt	2021-03-01 07:39:40.222030571 -0500
+@@ -10,6 +10,9 @@
+ set(pekwm_VERSION_PATCH 18)
+ set(pekwm_VERSION "${pekwm_VERSION_MAJOR}.${pekwm_VERSION_MINOR}.${pekwm_VERSION_PATCH}")
+ 
++set(PEKWM_CONF_DIR "${CMAKE_INSTALL_PREFIX}/etc/pekwm"
++  CACHE STRING "Path to pekwm system configuration files")
++
+ # Check for C++11
+ check_cxx_compiler_flag(-std=c++11 HAS_CXX11)
+ if (HAS_CXX11)
+@@ -94,7 +97,7 @@
+ add_definitions(-DVERSION="${pekwm_VERSION}"
+   -DFEATURES="${pekwm_FEATURES}"
+   -DDATADIR="${CMAKE_INSTALL_PREFIX}/share"
+-  -DSYSCONFDIR="${CMAKE_INSTALL_PREFIX}/etc/pekwm")
++  -DSYSCONFDIR="${PEKWM_CONF_DIR}")
+ set(CMAKE_INSTALL_RPATH_USE_LINK_PATH True)
+ 
+ # Subdirectories
+--- data/CMakeLists.txt.orig	2021-03-01 07:39:48.323015276 -0500
++++ data/CMakeLists.txt	2021-03-01 07:40:19.475956467 -0500
+@@ -16,4 +16,4 @@
+   mouse_sloppy
+   start
+   vars
+-  DESTINATION etc/pekwm/)
++  DESTINATION "${PEKWM_CONF_DIR}")
diff --git a/srcpkgs/pekwm/template b/srcpkgs/pekwm/template
index 19fdb952d03..367691f8cb7 100644
--- a/srcpkgs/pekwm/template
+++ b/srcpkgs/pekwm/template
@@ -1,35 +1,17 @@
 # Template file for 'pekwm'
 pkgname=pekwm
-version=0.1.17
-revision=4
-build_style=gnu-configure
-configure_args="--with-pkg-exec-prefix=/usr
- ac_cv_lib_X11_XOpenDisplay=yes ac_cv_lib_Xft_XftFontOpen=yes
- ac_cv_lib_Xrender_XRenderCreatePicture=yes ac_cv_lib_Xpm_XpmReadFileToPixmap=yes
- ac_cv_lib_Xinerama_XineramaQueryScreens=yes ac_cv_lib_Xext_XShapeCombineShape=yes
- ac_cv_lib_Xrandr_XRRQueryExtension=yes ac_cv_lib_fribidi_fribidi_version_info=yes"
+version=0.1.18
+revision=1
+wrksrc="${pkgname}-release-${version}"
+build_style=cmake
+configure_args="-DPEKWM_CONF_DIR=/etc/pekwm"
 hostmakedepends="pkg-config"
-makedepends="libjpeg-turbo-devel libpng-devel libXinerama-devel
- libSM-devel libXft-devel libXrender-devel fontconfig-devel libXpm-devel libXrandr-devel"
+makedepends="libjpeg-turbo-devel libpng-devel libXpm-devel
+ libXft-devel fontconfig-devel libXinerama-devel libXrandr-devel"
 short_desc="Window manager based on aewm++"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="https://www.pekwm.org/projects/pekwm"
-distfiles="${DEBIAN_SITE}/main/p/pekwm/pekwm_${version}.orig.tar.bz2"
-checksum=8a1fd3bf9f38e8c7bb2b2864c090f986b60cec2281ecf1bba462d120fb327d00
-
-conf_files="
-	/etc/pekwm/vars
-	/etc/pekwm/mouse
-	/etc/pekwm/menu
-	/etc/pekwm/start
-	/etc/pekwm/keys
-	/etc/pekwm/autoproperties_typerules
-	/etc/pekwm/config
-	/etc/pekwm/autoproperties
-	/etc/pekwm/mouse_system
-	/etc/pekwm/mouse_sloppy
-	/etc/pekwm/mouse_click
-	/etc/pekwm/config_system"
-
-CXXFLAGS="-Wno-narrowing"
+homepage="https://www.pekwm.se/"
+distfiles="https://github.com/pekdon/pekwm/archive/release-${version}.tar.gz"
+checksum=e04e14ab7b212ec7c3a36e4c24b6228383df4ca3768f9fea7ba22dcd107d5d5a
+conf_files="/etc/pekwm/*"
diff --git a/srcpkgs/pekwm/update b/srcpkgs/pekwm/update
new file mode 100644
index 00000000000..75b937ad487
--- /dev/null
+++ b/srcpkgs/pekwm/update
@@ -0,0 +1 @@
+pattern="release-\K[0-9.]+(?=.tar.gz)"