update to 0.1.10; Nicholas Marriott (maintainer)

This commit is contained in:
sthen 2009-04-29 20:11:25 +00:00
parent a305c77413
commit a5d5271da8
10 changed files with 88 additions and 104 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.13 2008/10/09 16:56:12 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.14 2009/04/29 20:11:25 sthen Exp $
COMMENT= aewm++ based pretty themable window manager
DISTNAME= pekwm-0.1.7
DISTNAME= pekwm-0.1.10
CATEGORIES= x11
HOMEPAGE= http://pekwm.org/

View File

@ -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

View File

@ -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

View File

@ -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: patch-data_Makefile_in,v 1.2 2009/04/29 20:11:25 sthen Exp $
--- 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 *\~ .\#*

View File

@ -0,0 +1,17 @@
$OpenBSD: patch-data_scripts_Makefile_in,v 1.1 2009/04/29 20:11:25 sthen Exp $
--- 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 *\~ .\#*

View File

@ -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) {

View File

@ -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

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_ManagerWindows_cc,v 1.1 2009/04/29 20:11:25 sthen Exp $
--- 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;

View File

@ -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

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.5 2008/10/09 16:56:12 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.6 2009/04/29 20:11:25 sthen Exp $
@bin bin/pekwm
@man man/man1/pekwm.1
share/examples/pekwm/
@ -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