summaryrefslogtreecommitdiff
path: root/wm
diff options
context:
space:
mode:
authorjmmv <jmmv@pkgsrc.org>2003-09-22 20:30:27 +0000
committerjmmv <jmmv@pkgsrc.org>2003-09-22 20:30:27 +0000
commit5543ec7349c203d77bd8e655a10ce345c883173a (patch)
treec546de6c1d10669df667ec61be334cad3c16815e /wm
parent915fd0ce04c5b0622b9a48f662b9959b410620e6 (diff)
downloadpkgsrc-5543ec7349c203d77bd8e655a10ce345c883173a.tar.gz
Bring patch from development version to fix a race condition on old machines.
While here, avoid passing gcc specific flags to the compiler. Bump PKGREVISION to 1. From Jonathan Perkin in PR pkg/22897.
Diffstat (limited to 'wm')
-rw-r--r--wm/evilwm/Makefile3
-rw-r--r--wm/evilwm/distinfo5
-rw-r--r--wm/evilwm/patches/patch-aa18
-rw-r--r--wm/evilwm/patches/patch-ab14
4 files changed, 34 insertions, 6 deletions
diff --git a/wm/evilwm/Makefile b/wm/evilwm/Makefile
index b452c5ebc8b..73cb5af165b 100644
--- a/wm/evilwm/Makefile
+++ b/wm/evilwm/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2003/09/16 19:23:34 xtraeme Exp $
+# $NetBSD: Makefile,v 1.8 2003/09/22 20:30:27 jmmv Exp $
#
DISTNAME= evilwm_0.99.15.orig
PKGNAME= ${DISTNAME:S/.orig//:S/_/-/}
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/${DISTNAME:S/_/-/}
CATEGORIES= wm x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=evilwm/}
diff --git a/wm/evilwm/distinfo b/wm/evilwm/distinfo
index e004c064256..6820f7d8373 100644
--- a/wm/evilwm/distinfo
+++ b/wm/evilwm/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.8 2003/09/16 19:17:39 xtraeme Exp $
+$NetBSD: distinfo,v 1.9 2003/09/22 20:30:27 jmmv Exp $
SHA1 (evilwm_0.99.15.orig.tar.gz) = ce969f1f85042c6e3247bcddf0b6c3bbb8e7dbc0
Size (evilwm_0.99.15.orig.tar.gz) = 22966 bytes
-SHA1 (patch-aa) = b7c0c569cfd1fefdd9b6da3c5139558c19d0bfca
+SHA1 (patch-aa) = 00542a6b1c0f94ea43be5d73379ec16bc369bf80
+SHA1 (patch-ab) = c514ba478a478282298d2b4e8f9f1b7422a98e38
diff --git a/wm/evilwm/patches/patch-aa b/wm/evilwm/patches/patch-aa
index 32c2fd0a512..8c0d64b0968 100644
--- a/wm/evilwm/patches/patch-aa
+++ b/wm/evilwm/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.8 2003/09/16 19:17:40 xtraeme Exp $
+$NetBSD: patch-aa,v 1.9 2003/09/22 20:30:28 jmmv Exp $
---- Makefile.orig 2003-09-16 21:09:49.000000000 +0200
-+++ Makefile 2003-09-16 21:11:16.000000000 +0200
+--- Makefile.orig Fri Jun 27 11:32:14 2003
++++ Makefile Mon Sep 22 20:07:06 2003
@@ -1,11 +1,11 @@
# If you don't use CC
-CC = gcc
@@ -26,6 +26,18 @@ $NetBSD: patch-aa,v 1.8 2003/09/16 19:17:40 xtraeme Exp $
# To support virtual desktops, uncomment one or both of the following 2 lines.
DEFINES += -DVWM
+@@ -66,9 +66,9 @@
+ #DEFINES += -DXDEBUG # show some X calls
+
+ DEFINES += -DVERSION=\"$(version).$(revision).$(subrev)\" $(DEBIAN)
+-CFLAGS += $(INCLUDES) $(DEFINES) -Os -Wall
++CFLAGS += $(INCLUDES) $(DEFINES)
+ #CFLAGS += $(INCLUDES) $(DEFINES) -g -Wall
+-CFLAGS += -Wstrict-prototypes -Wpointer-arith -Wcast-align -Wcast-qual -Wshadow -Waggregate-return -Wnested-externs -Winline -Wwrite-strings -Wundef
++#CFLAGS += -Wstrict-prototypes -Wpointer-arith -Wcast-align -Wcast-qual -Wshadow -Waggregate-return -Wnested-externs -Winline -Wwrite-strings -Wundef
+ LDFLAGS += $(LDPATH) $(LIBS)
+
+ HEADERS = evilwm.h
@@ -90,9 +90,8 @@
doinstall:
diff --git a/wm/evilwm/patches/patch-ab b/wm/evilwm/patches/patch-ab
new file mode 100644
index 00000000000..2e4e7c14e51
--- /dev/null
+++ b/wm/evilwm/patches/patch-ab
@@ -0,0 +1,14 @@
+$NetBSD: patch-ab,v 1.1 2003/09/22 20:30:28 jmmv Exp $
+
+--- screen.c.orig Mon Sep 22 20:04:18 2003
++++ screen.c Mon Sep 22 20:04:35 2003
+@@ -356,7 +356,8 @@
+ #endif
+
+ void unhide(Client *c, int raise) {
+- c->ignore_unmap = 0;
++ if (!c->ignore_unmap)
++ c->ignore_unmap = 0;
+ XMapWindow(dpy, c->window);
+ raise ? XMapRaised(dpy, c->parent) : XMapWindow(dpy, c->parent);
+ set_wm_state(c, NormalState);