summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorbjs <bjs@pkgsrc.org>2008-01-29 03:37:02 +0000
committerbjs <bjs@pkgsrc.org>2008-01-29 03:37:02 +0000
commit16bb77288b89262afe0250cc9425c5c2f9a55fa2 (patch)
treebcf9c0c34fc309cf1685e987c15f8abeab47b0a6 /x11
parent005b80472c43d15eb705bf0895017afeefcefc5a (diff)
downloadpkgsrc-16bb77288b89262afe0250cc9425c5c2f9a55fa2.tar.gz
Add patch from GIT to recalculate fd_set more aggressively in
NextEvent.c, as select() can modify it. Add hacks.mk to build with -fno-strict-aliasing when needed; there are quite a few warnings about this. Given this is an important dependency, IMHO it's better to just disable it. Bump rev.
Diffstat (limited to 'x11')
-rw-r--r--x11/libXt/Makefile3
-rw-r--r--x11/libXt/distinfo3
-rw-r--r--x11/libXt/hacks.mk13
-rw-r--r--x11/libXt/patches/patch-ag21
4 files changed, 38 insertions, 2 deletions
diff --git a/x11/libXt/Makefile b/x11/libXt/Makefile
index 85de6dc5c90..3ba00d267d3 100644
--- a/x11/libXt/Makefile
+++ b/x11/libXt/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2007/08/01 16:52:48 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2008/01/29 03:37:02 bjs Exp $
#
DISTNAME= libXt-1.0.5
+PKGREVISION= 1
CATEGORIES= x11 devel
MASTER_SITES= http://xorg.freedesktop.org/releases/individual/lib/
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/libXt/distinfo b/x11/libXt/distinfo
index 15df05adb58..7fcf12b294d 100644
--- a/x11/libXt/distinfo
+++ b/x11/libXt/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2007/09/20 08:30:14 rillig Exp $
+$NetBSD: distinfo,v 1.6 2008/01/29 03:37:02 bjs Exp $
SHA1 (libXt-1.0.5.tar.bz2) = 5f33921e373ce162a39eabef2ce05d946935eb5b
RMD160 (libXt-1.0.5.tar.bz2) = 7e5ef9e03dc860bf5b64b85a897dd1d2ae1ed0bf
@@ -9,3 +9,4 @@ SHA1 (patch-ac) = d053f56de09d13fc60b5a8dd281837020a0aee95
SHA1 (patch-ad) = 5fa9b62316dc04eaf80cec20fc900cdd120751af
SHA1 (patch-ae) = feff93927edcb31c1c9320212df0754b4cab0676
SHA1 (patch-af) = 8cc0692ff61345149830682703533e65870d1693
+SHA1 (patch-ag) = da1e7688a5923542d81e87d204ce8e95b920e221
diff --git a/x11/libXt/hacks.mk b/x11/libXt/hacks.mk
new file mode 100644
index 00000000000..83ada1ce6c8
--- /dev/null
+++ b/x11/libXt/hacks.mk
@@ -0,0 +1,13 @@
+# $NetBSD: hacks.mk,v 1.1 2008/01/29 03:37:02 bjs Exp $
+
+.if !defined(LIBXT_HACKS_MK)
+LIBXT_HACKS_MK= # defined
+
+.include "../../mk/compiler.mk"
+
+.if !empty(CC_VERSION:Mgcc-[34]*)
+CFLAGS+= -fno-strict-aliasing
+PKG_HACKS+= no-strict-aliasing
+.endif
+
+.endif
diff --git a/x11/libXt/patches/patch-ag b/x11/libXt/patches/patch-ag
new file mode 100644
index 00000000000..3f0fe3ae3b1
--- /dev/null
+++ b/x11/libXt/patches/patch-ag
@@ -0,0 +1,21 @@
+$NetBSD: patch-ag,v 1.1 2008/01/29 03:37:02 bjs Exp $
+
+Recalculate fd_set more aggressively (bug #808)
+
+select() can modify the fd set, so be a bit pessimistic and recalculate
+it more often.
+
+--- src/NextEvent.c.orig 2006-07-11 14:05:55.000000000 -0400
++++ src/NextEvent.c
+@@ -581,10 +581,10 @@ int _XtWaitForSomething(
+ wf.stack = fdlist;
+ #endif
+
++WaitLoop:
+ app->rebuild_fdlist = TRUE;
+
+ while (1) {
+-WaitLoop:
+ AdjustTimes (app, block, howlong, ignoreTimers, &wt);
+
+ if (block && app->block_hook_list) {