Update to pekwm 0.1.10. pekwm now has builtin compat code for swprintf so the following patches may be removed:
patches/patch-configure patches/patch-src_FrameListMenu_cc patches/patch-src_Frame_cc patches/patch-src_PDecor_cc Builds and works fine on i386; also builds okay on amd64. Please test, etc. Thanks! Nicholas Index: Makefile =================================================================== RCS file: /cvs/ports/x11/pekwm/Makefile,v retrieving revision 1.13 diff -u -p -r1.13 Makefile --- Makefile 9 Oct 2008 16:56:12 -0000 1.13 +++ Makefile 4 Apr 2009 19:40:50 -0000 @@ -2,7 +2,7 @@ COMMENT= aewm++ based pretty themable window manager -DISTNAME= pekwm-0.1.7 +DISTNAME= pekwm-0.1.10 CATEGORIES= x11 HOMEPAGE= http://pekwm.org/ Index: distinfo =================================================================== RCS file: /cvs/ports/x11/pekwm/distinfo,v retrieving revision 1.6 diff -u -p -r1.6 distinfo --- distinfo 9 Oct 2008 16:56:12 -0000 1.6 +++ distinfo 4 Apr 2009 19:40:50 -0000 @@ -1,5 +1,5 @@ -MD5 (pekwm-0.1.7.tar.bz2) = MKz6QaUAWp8xEXBB7DLrDQ== -RMD160 (pekwm-0.1.7.tar.bz2) = d8YY3e/qrRapt1cwTKIz7Omxjjw= -SHA1 (pekwm-0.1.7.tar.bz2) = 3NkdyNCAAL2N9AKwi3z7LXGwOLw= -SHA256 (pekwm-0.1.7.tar.bz2) = IhbrDHIvSq0Vdhp/Ts7WfqEoSgDjLgPWbeS1X4wclSQ= -SIZE (pekwm-0.1.7.tar.bz2) = 363788 +MD5 (pekwm-0.1.10.tar.bz2) = BDLyCR4a/IvgTb9fCsIq0A== +RMD160 (pekwm-0.1.10.tar.bz2) = jo8Wj4SIl9gH+/uS9n7MuhBgkAE= +SHA1 (pekwm-0.1.10.tar.bz2) = WpL7P2RGJwkA/k3s1JGuhBqS3jg= +SHA256 (pekwm-0.1.10.tar.bz2) = J8BUu7wZLZuPEhK/4ncvX+yJZtQfG1WX/lTQ/s+tP90= +SIZE (pekwm-0.1.10.tar.bz2) = 372622 Index: patches/patch-configure =================================================================== RCS file: patches/patch-configure diff -N patches/patch-configure --- patches/patch-configure 9 Oct 2008 16:56:12 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,35 +0,0 @@ -$OpenBSD: patch-configure,v 1.1 2008/10/09 16:56:12 ajacoutot Exp $ ---- configure.orig Tue Oct 7 17:37:23 2008 -+++ configure Tue Oct 7 17:37:15 2008 -@@ -7397,12 +7397,12 @@ if test -n "$libpng12_CFLAGS"; then - pkg_cv_libpng12_CFLAGS="$libpng12_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ -- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpng12 >= 1.2.0\"") >&5 -- ($PKG_CONFIG --exists --print-errors "libpng12 >= 1.2.0") 2>&5 -+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpng >= 1.2.0\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "libpng >= 1.2.0") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then -- pkg_cv_libpng12_CFLAGS=`$PKG_CONFIG --cflags "libpng12 >= 1.2.0" 2>/dev/null` -+ pkg_cv_libpng12_CFLAGS=`$PKG_CONFIG --cflags "libpng >= 1.2.0" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -7413,12 +7413,12 @@ if test -n "$libpng12_LIBS"; then - pkg_cv_libpng12_LIBS="$libpng12_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ -- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpng12 >= 1.2.0\"") >&5 -- ($PKG_CONFIG --exists --print-errors "libpng12 >= 1.2.0") 2>&5 -+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpng >= 1.2.0\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "libpng >= 1.2.0") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then -- pkg_cv_libpng12_LIBS=`$PKG_CONFIG --libs "libpng12 >= 1.2.0" 2>/dev/null` -+ pkg_cv_libpng12_LIBS=`$PKG_CONFIG --libs "libpng >= 1.2.0" 2>/dev/null` - else - pkg_failed=yes - fi Index: patches/patch-data_Makefile_in =================================================================== RCS file: /cvs/ports/x11/pekwm/patches/patch-data_Makefile_in,v retrieving revision 1.1 diff -u -p -r1.1 patch-data_Makefile_in --- patches/patch-data_Makefile_in 11 Jun 2007 08:56:43 -0000 1.1 +++ patches/patch-data_Makefile_in 4 Apr 2009 19:40:50 -0000 @@ -1,12 +1,25 @@ -$OpenBSD: patch-data_Makefile_in,v 1.1 2007/06/11 08:56:43 ajacoutot Exp $ ---- data/Makefile.in.orig Mon Jun 11 10:39:01 2007 -+++ data/Makefile.in Mon Jun 11 10:39:11 2007 -@@ -439,7 +439,7 @@ info: info-recursive +$OpenBSD$ +--- data/Makefile.in.orig Mon Jan 26 17:59:45 2009 ++++ data/Makefile.in Sat Apr 4 20:32:32 2009 +@@ -461,7 +461,7 @@ info: info-recursive info-am: -install-data-am: install-cfgdataDATA +install-data-am: - install-dvi: install-dvi-recursive + install-exec-am: +@@ -507,8 +507,10 @@ uninstall-info: uninstall-info-recursive + + all-local: config menu + +-%: $(srcdir)/%.in +- @SED@ -e 's:<PREFIX>:$(pkgdatadir):g' -e "s:<THEME>:@THEME@:g" $< > $@ ++config: ++ @SED@ -e 's:<PREFIX>:$(pkgdatadir):g' -e "s:<THEME>:@THEME@:g" $...@.in > $@ ++menu: ++ @SED@ -e 's:<PREFIX>:$(pkgdatadir):g' -e "s:<THEME>:@THEME@:g" $...@.in > $@ + + distclean-local: + rm -f *\~ .\#* Index: patches/patch-data_scripts_Makefile_in =================================================================== RCS file: patches/patch-data_scripts_Makefile_in diff -N patches/patch-data_scripts_Makefile_in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-data_scripts_Makefile_in 4 Apr 2009 19:40:50 -0000 @@ -0,0 +1,17 @@ +$OpenBSD$ +--- data/scripts/Makefile.in.orig Mon Jan 26 17:59:45 2009 ++++ data/scripts/Makefile.in Sat Apr 4 20:18:57 2009 +@@ -345,8 +345,11 @@ uninstall-am: uninstall-info-am uninstall-scriptsSCRIP + + all-local: $(scripts_SCRIPTS) + +-%.sh: $(srcdir)/%.sh.in +- @SED@ -e 's:<SH>:$(SH):g' -e 's:<SED>:$(SED):g' $< > $@ ++ ++pekwm_ws_menu.sh: ++ @SED@ -e 's:<SH>:$(SH):g' -e 's:<SED>:$(SED):g' $...@.in > $@ ++pekwm_themeset.sh: ++ @SED@ -e 's:<SH>:$(SH):g' -e 's:<SED>:$(SED):g' $...@.in > $@ + + distclean-local: + rm -f *\~ .\#* Index: patches/patch-src_FrameListMenu_cc =================================================================== RCS file: patches/patch-src_FrameListMenu_cc diff -N patches/patch-src_FrameListMenu_cc --- patches/patch-src_FrameListMenu_cc 9 Oct 2008 16:56:12 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,21 +0,0 @@ -$OpenBSD: patch-src_FrameListMenu_cc,v 1.1 2008/10/09 16:56:12 ajacoutot Exp $ ---- src/FrameListMenu.cc.orig Tue Oct 7 18:21:44 2008 -+++ src/FrameListMenu.cc Tue Oct 7 18:23:23 2008 -@@ -118,6 +118,7 @@ FrameListMenu::updateFrameListMenu(void) - removeAll(); - - wchar_t buf[16]; -+ char buf2[16]; - wstring name; - - // need to add an action, otherwise it looks as if we don't have anything -@@ -141,7 +142,8 @@ FrameListMenu::updateFrameListMenu(void) - - for (uint i = 0; i < Workspaces::instance()->size(); ++i) { - if (Workspaces::instance()->size() > 1) { -- swprintf(buf, 16, L"<%d> ", i + 1); -+ snprintf(buf2, sizeof buf2, "<%d> ", i + 1); -+ mbstowcs(buf, buf2, 16); - } - - for (it = Frame::frame_begin(); it != Frame::frame_end(); ++it) { Index: patches/patch-src_Frame_cc =================================================================== RCS file: patches/patch-src_Frame_cc diff -N patches/patch-src_Frame_cc --- patches/patch-src_Frame_cc 9 Oct 2008 16:56:12 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,21 +0,0 @@ -$OpenBSD: patch-src_Frame_cc,v 1.1 2008/10/09 16:56:12 ajacoutot Exp $ ---- src/Frame.cc.orig Tue Oct 7 18:15:58 2008 -+++ src/Frame.cc Tue Oct 7 18:22:05 2008 -@@ -469,6 +469,7 @@ Frame::updatedActiveChild(void) - void - Frame::getDecorInfo(wchar_t *buf, uint size) - { -+ char buf2[256]; - uint width, height; - if (_client) { - calcSizeInCells(width, height); -@@ -476,7 +477,8 @@ Frame::getDecorInfo(wchar_t *buf, uint size) - width = _gm.width; - height = _gm.height; - } -- swprintf(buf, size, L"%d+%d+%d+%d", width, height, _gm.x, _gm.y); -+ snprintf(buf2, sizeof buf2, "%d+%d+%d+%d", width, height, _gm.x, _gm.y); -+ mbstowcs(buf, buf2, size); - } - - //! @brief Index: patches/patch-src_ManagerWindows_cc =================================================================== RCS file: patches/patch-src_ManagerWindows_cc diff -N patches/patch-src_ManagerWindows_cc --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_ManagerWindows_cc 4 Apr 2009 19:40:50 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- src/ManagerWindows.cc.orig Sat Apr 4 19:52:11 2009 ++++ src/ManagerWindows.cc Sat Apr 4 19:52:12 2009 +@@ -18,6 +18,8 @@ + + #include <string> + ++#include <unistd.h> ++ + using std::cerr; + using std::endl; + using std::string; Index: patches/patch-src_PDecor_cc =================================================================== RCS file: patches/patch-src_PDecor_cc diff -N patches/patch-src_PDecor_cc --- patches/patch-src_PDecor_cc 9 Oct 2008 16:56:12 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ -$OpenBSD: patch-src_PDecor_cc,v 1.2 2008/10/09 16:56:12 ajacoutot Exp $ ---- src/PDecor.cc.orig Tue Oct 7 18:21:36 2008 -+++ src/PDecor.cc Tue Oct 7 18:22:20 2008 -@@ -1025,7 +1025,9 @@ PDecor::activateChild(PWinObj *child) - void - PDecor::getDecorInfo(wchar_t *buf, uint size) - { -- swprintf(buf, size, L"%dx%d+%d+%d", _gm.width, _gm.height, _gm.x, _gm.y); -+ char buf2[256]; -+ snprintf(buf2, sizeof buf2, "%dx%d+%d+%d", _gm.width, _gm.height, _gm.x, _gm.y); -+ mbstowcs(buf, buf2, size); - } - - //! @brief Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/x11/pekwm/pkg/PLIST,v retrieving revision 1.5 diff -u -p -r1.5 PLIST --- pkg/PLIST 9 Oct 2008 16:56:12 -0000 1.5 +++ pkg/PLIST 4 Apr 2009 19:40:50 -0000 @@ -23,4 +23,37 @@ share/pekwm/scripts/pekwm_themeset.sh share/pekwm/scripts/pekwm_ws_menu.sh share/pekwm/themes/ share/pekwm/themes/default/ +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/bottom-border.png +share/pekwm/themes/default/bottom-border_unfocus.png +share/pekwm/themes/default/bottom-left.png +share/pekwm/themes/default/bottom-left_unfocus.png +share/pekwm/themes/default/bottom-right.png +share/pekwm/themes/default/bottom-right_unfocus.png +share/pekwm/themes/default/button.png +share/pekwm/themes/default/button_hover.png +share/pekwm/themes/default/button_press.png +share/pekwm/themes/default/button_unfocus.png +share/pekwm/themes/default/item.png +share/pekwm/themes/default/item_focus.png +share/pekwm/themes/default/left-border.png +share/pekwm/themes/default/left-border_unfocus.png +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/right-border.png +share/pekwm/themes/default/right-border_unfocus.png +share/pekwm/themes/default/tab-separator.png +share/pekwm/themes/default/tab-separator_unfocus.png share/pekwm/themes/default/theme +share/pekwm/themes/default/title.png +share/pekwm/themes/default/title_unfocus.png +share/pekwm/themes/default/top-border.png +share/pekwm/themes/default/top-border_unfocus.png +share/pekwm/themes/default/top-left.png +share/pekwm/themes/default/top-left_unfocus.png +share/pekwm/themes/default/top-right.png +share/pekwm/themes/default/top-right_unfocus.png
