git: a179d5fb0a94 - main - x11-wm/pekwm: update to 0.3.0

From: Fernando Apesteguía <fernape_at_FreeBSD.org>
Date: Sat, 04 Feb 2023 18:51:00 UTC
The branch main has been updated by fernape:

URL: https://cgit.FreeBSD.org/ports/commit/?id=a179d5fb0a945424cc4a2ab78ef64f611c66c525

commit a179d5fb0a945424cc4a2ab78ef64f611c66c525
Author:     Natacha Porté <natbsd@instinctive.eu>
AuthorDate: 2023-02-03 15:39:25 +0000
Commit:     Fernando Apesteguía <fernape@FreeBSD.org>
CommitDate: 2023-02-04 18:46:39 +0000

    x11-wm/pekwm: update to 0.3.0
    
    ChangeLog: https://github.com/pekwm/pekwm/releases/tag/release-0.3.0
    
     * Pango font support (both Cairo and Xft)
     * Automatic font type selection
     * Various updated and improvements to pekwm_panel including a systray widget
     * Xresources can be used in themes and configuration files as variables.
     * New default theme named Winter
    
    PR:             269281
    Reported by:    natbsd@instinctive.eu (maintainer)
---
 x11-wm/pekwm/Makefile                            | 23 +++++++++++++++++++++--
 x11-wm/pekwm/distinfo                            |  6 +++---
 x11-wm/pekwm/files/patch-doc__CMakeLists.txt     |  8 --------
 x11-wm/pekwm/files/patch-src__CfgParserSource.cc | 11 +++++++++++
 x11-wm/pekwm/pkg-plist                           | 24 ++++++++++++++++++++++++
 5 files changed, 59 insertions(+), 13 deletions(-)

diff --git a/x11-wm/pekwm/Makefile b/x11-wm/pekwm/Makefile
index 259f2b296151..57f91d340b86 100644
--- a/x11-wm/pekwm/Makefile
+++ b/x11-wm/pekwm/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	pekwm
 DISTVERSIONPREFIX=	release-
-DISTVERSION=	0.2.0
+DISTVERSION=	0.3.0
 PORTEPOCH=	1
 CATEGORIES=	x11-wm
 
@@ -20,6 +20,25 @@ USES=		cmake compiler jpeg \
 		localbase pkgconfig tar:bzip2 xorg
 USE_XORG=	xft xpm x11 sm ice xext xinerama xrandr
 USE_GITHUB=	yes
-GH_ACCOUNT=	pekdon
+GH_ACCOUNT=	pekwm
+
+CMAKE_ARGS=	-DCMAKE_INSTALL_MANDIR=${PREFIX}/man
+
+OPTIONS_DEFINE=	PANGO
+OPTIONS_DEFAULT=PANGO
+
+PANGO_DESC=	Use Pango font support (both Cairo and Xft)
+
+PANGO_LIB_DEPENDS= libpangocairo-1.0.so:x11-toolkits/pango \
+		libfontconfig.so:x11-fonts/fontconfig \
+		libharfbuzz.so:print/harfbuzz
+PANGO_USES=	gnome gettext-runtime
+PANGO_CMAKE_BOOL=ENABLE_PANGO
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MPANGO}
+USE_GNOME=	glib20 cairo
+.endif
 
 .include <bsd.port.mk>
diff --git a/x11-wm/pekwm/distinfo b/x11-wm/pekwm/distinfo
index e257cbb09fda..707ef96863c7 100644
--- a/x11-wm/pekwm/distinfo
+++ b/x11-wm/pekwm/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1636193572
-SHA256 (pekdon-pekwm-release-0.2.0_GH0.tar.gz) = 143df0021665a7a1e06c22540f45ca3392235cb3dd2e0be70f9e00fd988fc9f9
-SIZE (pekdon-pekwm-release-0.2.0_GH0.tar.gz) = 941616
+TIMESTAMP = 1675191806
+SHA256 (pekwm-pekwm-release-0.3.0_GH0.tar.gz) = 8c501dba954395b558afb6776cbda7732da023d75ca18f4b04c22cf49a2e7507
+SIZE (pekwm-pekwm-release-0.3.0_GH0.tar.gz) = 1210392
diff --git a/x11-wm/pekwm/files/patch-doc__CMakeLists.txt b/x11-wm/pekwm/files/patch-doc__CMakeLists.txt
deleted file mode 100644
index 10f85ed99ba8..000000000000
--- a/x11-wm/pekwm/files/patch-doc__CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
---- doc/CMakeLists.txt.orig	2021-11-06 11:24:56.636609000 +0100
-+++ doc/CMakeLists.txt	2021-11-06 11:25:10.749968000 +0100
-@@ -13,4 +13,4 @@
-
- install(FILES
-   ${manpages}
--  DESTINATION share/man/man1)
-+  DESTINATION man/man1)
diff --git a/x11-wm/pekwm/files/patch-src__CfgParserSource.cc b/x11-wm/pekwm/files/patch-src__CfgParserSource.cc
new file mode 100644
index 000000000000..0914232c870a
--- /dev/null
+++ b/x11-wm/pekwm/files/patch-src__CfgParserSource.cc
@@ -0,0 +1,11 @@
+--- ./src/CfgParserSource.cc.orig	2023-01-31 19:52:25.779184000 +0100
++++ ./src/CfgParserSource.cc	2023-01-31 19:53:09.043407000 +0100
+@@ -144,7 +144,7 @@
+ 		std::string path(Util::getEnv("PATH"));
+ 		path = _command_path + ":" + path;
+ 		env.override("PATH", path);
+-		execle(PEKWM_SH, PEKWM_SH, "-c", _name.c_str(), nullptr,
++		execle(PEKWM_SH, PEKWM_SH, "-c", _name.c_str(), NULL,
+ 		       env.getCEnv());
+ 
+ 		::close (STDOUT_FILENO);
diff --git a/x11-wm/pekwm/pkg-plist b/x11-wm/pekwm/pkg-plist
index 5455f86cda4e..c81a05cfd45e 100644
--- a/x11-wm/pekwm/pkg-plist
+++ b/x11-wm/pekwm/pkg-plist
@@ -46,6 +46,30 @@
 %%DATADIR%%/themes/default/top-right-no-buttons.png
 %%DATADIR%%/themes/default/top-right.png
 %%DATADIR%%/themes/default/top-right_unfocus.png
+%%DATADIR%%/themes/winter/backgrounds/background-2560x1440.jpg
+%%DATADIR%%/themes/winter/bd-b-un.png
+%%DATADIR%%/themes/winter/bd-b.png
+%%DATADIR%%/themes/winter/bd-bl-un.png
+%%DATADIR%%/themes/winter/bd-bl.png
+%%DATADIR%%/themes/winter/bd-br-un.png
+%%DATADIR%%/themes/winter/bd-br.png
+%%DATADIR%%/themes/winter/bd-lr-un.png
+%%DATADIR%%/themes/winter/bd-lr.png
+%%DATADIR%%/themes/winter/bd-t-un.png
+%%DATADIR%%/themes/winter/bd-t.png
+%%DATADIR%%/themes/winter/bd-tl-un.png
+%%DATADIR%%/themes/winter/bd-tl.png
+%%DATADIR%%/themes/winter/bd-tr-un.png
+%%DATADIR%%/themes/winter/bd-tr.png
+%%DATADIR%%/themes/winter/panel-sep.png
+%%DATADIR%%/themes/winter/panel.png
+%%DATADIR%%/themes/winter/sep-un.png
+%%DATADIR%%/themes/winter/sep.png
+%%DATADIR%%/themes/winter/theme
+%%DATADIR%%/themes/winter/title-fo.png
+%%DATADIR%%/themes/winter/title-sel-un.png
+%%DATADIR%%/themes/winter/title-sel.png
+%%DATADIR%%/themes/winter/title-un.png
 bin/pekwm
 bin/pekwm_bg
 bin/pekwm_ctrl