Omar Polo <o...@omarpolo.com> writes:
> Timo Myyrä <timo.my...@bittivirhe.fi> writes:
>
>> Hi,
>
> Hello :)
>
>> Another attempt at updating pekwm.
>
> packages and works fine; I'm typing this mail from pekwm (using the
> default configuration thought.) portcheck and make
> port-lib-depends-check are happy too.
>
>> I noticed the pekwm_theme script picked up wrong copies of sed and awk
>> commands so pass in configure flags to fix them. The script could be
>> patched so that can use 'ftp' for fetching themes.
>
> Yep, the CMakeLists.txt uses find_program and search into /usr/local/bin
> before /usr/bin and /bin, so it may pick up gsed or GNU awk instead of
> base one. -DSH=/bin/sh is probably redundant, from a quick pkglocate I
> don't see any port that installs a /usr/local/bin/sh but since we're
> there it's probably best to set that too.
>
> We could just as well enable the tests, here are all passing!
>
>> Timo
>
> Cheers,
>
> Omar Polo
Now with 100% more patches! (forgot to cvs add...)
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/x11/pekwm/Makefile,v
retrieving revision 1.37
diff -u -p -r1.37 Makefile
--- Makefile 26 Aug 2021 04:23:03 -0000 1.37
+++ Makefile 19 Nov 2021 14:51:05 -0000
@@ -3,7 +3,7 @@
COMMENT= aewm++ based pretty themable window manager
DISTNAME= pekwm-${V}
-V= 0.1.18
+V= 0.2.0
CATEGORIES= x11
HOMEPAGE= https://www.pekwm.se/
@@ -14,26 +14,22 @@ MAINTAINER= Timo Myyra <timo.myyra@bitti
PERMIT_PACKAGE= Yes
# uses pledge()
-WANTLIB += ICE SM X11 Xext Xft Xinerama Xpm Xrandr c iconv jpeg m png z
+WANTLIB += ICE SM X11 Xext Xft Xinerama Xpm Xrandr c freetype jpeg m png
WANTLIB += ${COMPILER_LIBCXX}
-COMPILER = base-clang ports-gcc base-gcc
+COMPILER = base-clang ports-gcc base-gcc
MASTER_SITES= https://github.com/pekdon/pekwm/releases/download/release-${V}/
-LIB_DEPENDS= converters/libiconv \
- graphics/jpeg \
+LIB_DEPENDS= graphics/jpeg \
graphics/png
-NO_TEST= Yes
+MODULES= devel/cmake
-USE_GMAKE= Yes
-
-CONFIGURE_STYLE=autoconf
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS= --enable-xinerama
-
-AUTOCONF_VERSION= 2.69
+CONFIGURE_ARGS= -DCMAKE_INSTALL_SYSCONFDIR=${SYSCONFDIR} \
+ -DAWK=/usr/bin/awk \
+ -DSED=/usr/bin/sed \
+ -DSH=/bin/sh \
+ -DTESTS=ON
post-install:
@mv ${WRKINST}/etc/pekwm ${PREFIX}/share/examples
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/x11/pekwm/distinfo,v
retrieving revision 1.12
diff -u -p -r1.12 distinfo
--- distinfo 26 Aug 2021 04:23:03 -0000 1.12
+++ distinfo 19 Nov 2021 09:51:03 -0000
@@ -1,2 +1,2 @@
-SHA256 (pekwm-0.1.18.tar.gz) = e+zEO3nqsP91RXKFLjhUNSIkIDhRB8iBqTrE3ErpYGU=
-SIZE (pekwm-0.1.18.tar.gz) = 531611
+SHA256 (pekwm-0.2.0.tar.gz) = KFZVUN29JPsrdi8eA+CopGaEPcl6gxBlAYoFHnJAZR4=
+SIZE (pekwm-0.2.0.tar.gz) = 938147
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: patches/patch-CMakeLists_txt
diff -N patches/patch-CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-CMakeLists_txt 19 Nov 2021 09:51:03 -0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -65,6 +65,7 @@ int main() { std::stof(\"42.0\"); }
+ set(CMAKE_CXX_FLAGS ${orig_CMAKE_CXX_FLAGS})
+
+ # Look for platform specific methods
++check_function_exists(pledge PEKWM_HAVE_PLEDGE)
+ check_function_exists(setenv PEKWM_HAVE_SETENV)
+ check_function_exists(unsetenv PEKWM_HAVE_UNSETENV)
+ check_function_exists(daemon PEKWM_HAVE_DAEMON)
Index: patches/patch-configure_ac
===================================================================
RCS file: patches/patch-configure_ac
diff -N patches/patch-configure_ac
--- patches/patch-configure_ac 26 Aug 2021 04:23:03 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-configure_ac,v 1.2 2021/08/26 04:23:03 semarie Exp $
-
-Index: configure.ac
---- configure.ac.orig
-+++ configure.ac
-@@ -32,6 +32,9 @@ CXXFLAGS="$CXXFLAGS $INCICONV"
- dnl Check for iconvctl
- AC_CHECK_FUNC(iconvctl, [AC_DEFINE(HAVE_ICONVCTL, [1], [Define to 1 if you
the iconvctl call])], )
-
-+dnl Check for pledge
-+AC_CHECK_FUNC(pledge, [AC_DEFINE(HAVE_PLEDGE, [1], [Define to 1 if you the
pledge call])], )
-+
- dnl add x11 to the env
- AC_PATH_X
- AC_PATH_XTRA
Index: patches/patch-data_scripts_pekwm_screenshot_sh
===================================================================
RCS file: patches/patch-data_scripts_pekwm_screenshot_sh
diff -N patches/patch-data_scripts_pekwm_screenshot_sh
--- patches/patch-data_scripts_pekwm_screenshot_sh 26 Aug 2021 04:23:03
-0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-data_scripts_pekwm_screenshot_sh,v 1.2 2021/08/26 04:23:03
semarie Exp $
-
-Fix getopt: unknown option -- n
-
-Index: data/scripts/pekwm_screenshot.sh
---- data/scripts/pekwm_screenshot.sh.orig
-+++ data/scripts/pekwm_screenshot.sh
-@@ -151,6 +151,6 @@ main()
- exit 0
- }
-
--OPTIONS=$(getopt -o c:d:ho: -n 'pekwm_screenshot.sh' -- "$@")
-+OPTIONS=$(getopt c:d:ho: $*)
- main
-
Index: patches/patch-doc_CMakeLists_txt
===================================================================
RCS file: patches/patch-doc_CMakeLists_txt
diff -N patches/patch-doc_CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-doc_CMakeLists_txt 19 Nov 2021 09:51:03 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+
+Index: doc/CMakeLists.txt
+--- doc/CMakeLists.txt.orig
++++ doc/CMakeLists.txt
+@@ -13,4 +13,4 @@ endif (ENABLE_IMAGE_PNG AND PNG_FOUND)
+
+ install(FILES
+ ${manpages}
+- DESTINATION share/man/man1)
++ DESTINATION man/man1)
Index: patches/patch-src_main_cc
===================================================================
RCS file: patches/patch-src_main_cc
diff -N patches/patch-src_main_cc
--- patches/patch-src_main_cc 26 Aug 2021 04:23:03 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-$OpenBSD: patch-src_main_cc,v 1.2 2021/08/26 04:23:03 semarie Exp $
-
-Index: src/main.cc
---- src/main.cc.orig
-+++ src/main.cc
-@@ -127,6 +127,12 @@ main(int argc, char **argv)
- #endif // DEBUG
-
- WindowManager *wm = WindowManager::start(config_file, replace);
-+#if HAVE_PLEDGE
-+ if (pledge("stdio rpath wpath cpath proc exec", NULL) == -1) {
-+ cerr << "failed to pledge" << endl;
-+ return 1;
-+ }
-+#endif
-
- if (wm) {
- try {
Index: patches/patch-src_pekwm_wm_cc
===================================================================
RCS file: patches/patch-src_pekwm_wm_cc
diff -N patches/patch-src_pekwm_wm_cc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_pekwm_wm_cc 19 Nov 2021 09:51:03 -0000
@@ -0,0 +1,29 @@
+$OpenBSD$
+
+Index: src/pekwm_wm.cc
+--- src/pekwm_wm.cc.orig
++++ src/pekwm_wm.cc
+@@ -21,7 +21,7 @@
+
+ extern "C" {
+ #include <errno.h>
+-#include <unistd.h> // execlp
++#include <unistd.h> // execlp,pledge
+ }
+
+ /**
+@@ -141,6 +141,14 @@ main(int argc, char **argv)
+ << "using configuration at " << config_file);
+
+ WindowManager *wm = WindowManager::start(config_file, replace,
synchronous);
++
++#if PEKWM_HAVE_PLEDGE
++ if (pledge("stdio rpath wpath cpath proc exec", NULL) == -1) {
++ cerr << "failed to pledge" << endl;
++ return 1;
++ }
++#endif
++
+ if (wm) {
+ try {
+ P_TRACE("Enter event loop.");
Index: pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/x11/pekwm/pkg/PLIST,v
retrieving revision 1.9
diff -u -p -r1.9 PLIST
--- pkg/PLIST 26 Aug 2021 04:23:03 -0000 1.9
+++ pkg/PLIST 19 Nov 2021 09:51:03 -0000
@@ -1,6 +1,18 @@
-@comment $OpenBSD: PLIST,v 1.9 2021/08/26 04:23:03 semarie Exp $
+@comment $OpenBSD: PLIST,v$
@bin bin/pekwm
+@bin bin/pekwm_bg
+@bin bin/pekwm_ctrl
+@bin bin/pekwm_dialog
+@bin bin/pekwm_panel
+@bin bin/pekwm_screenshot
+bin/pekwm_theme
+@bin bin/pekwm_wm
@man man/man1/pekwm.1
+@man man/man1/pekwm_bg.1
+@man man/man1/pekwm_dialog.1
+@man man/man1/pekwm_panel.1
+@man man/man1/pekwm_screenshot.1
+@man man/man1/pekwm_theme.1
share/examples/pekwm/
@sample ${SYSCONFDIR}/pekwm/
share/examples/pekwm/autoproperties
@@ -23,13 +35,14 @@ share/examples/pekwm/mouse_sloppy
@sample ${SYSCONFDIR}/pekwm/mouse_sloppy
share/examples/pekwm/mouse_system
@sample ${SYSCONFDIR}/pekwm/mouse_system
+share/examples/pekwm/panel
+@sample ${SYSCONFDIR}/pekwm/panel
share/examples/pekwm/start
@sample ${SYSCONFDIR}/pekwm/start
share/examples/pekwm/vars
@sample ${SYSCONFDIR}/pekwm/vars
share/pekwm/
share/pekwm/scripts/
-share/pekwm/scripts/pekwm_screenshot.sh
share/pekwm/scripts/pekwm_themeset.sh
share/pekwm/scripts/pekwm_ws_menu.sh
share/pekwm/themes/
@@ -38,6 +51,9 @@ share/pekwm/themes/default-plain/
share/pekwm/themes/default-plain/theme
share/pekwm/themes/default/arrow.png
share/pekwm/themes/default/arrow_focus.png
+share/pekwm/themes/default/backgrounds/
+share/pekwm/themes/default/backgrounds/pekwm_generated-1920x1080.png
+share/pekwm/themes/default/backgrounds/pekwm_generated-2560x1440.png
share/pekwm/themes/default/bottom-border.png
share/pekwm/themes/default/bottom-border_unfocus.png
share/pekwm/themes/default/bottom-left.png
@@ -64,6 +80,7 @@ share/pekwm/themes/default/left-border_u
share/pekwm/themes/default/menu-bottom.png
share/pekwm/themes/default/menu-bottom_unfocus.png
share/pekwm/themes/default/menuline.png
+share/pekwm/themes/default/panel.png
share/pekwm/themes/default/right-border.png
share/pekwm/themes/default/right-border_unfocus.png
share/pekwm/themes/default/tab-separator.png
@@ -78,5 +95,3 @@ share/pekwm/themes/default/top-left_unfo
share/pekwm/themes/default/top-right-no-buttons.png
share/pekwm/themes/default/top-right.png
share/pekwm/themes/default/top-right_unfocus.png
-share/pekwm/themes/pion/
-share/pekwm/themes/pion/theme
