[pkgsrc/trunk]: pkgsrc/x11/qt1 Make this package compile in the face of gcc3 ...

[agc <agc%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a4fd1a37ac8b
branches:  trunk
changeset: 465040:a4fd1a37ac8b
user:      agc <agc%pkgsrc.org@localhost>
date:      Fri Dec 19 23:00:26 2003 +0000

description:
Make this package compile in the face of gcc3 and a working
implementation of xor.

diffstat:

 x11/qt1/distinfo         |   4 +++-
 x11/qt1/patches/patch-ad |  13 +++++++++++++
 x11/qt1/patches/patch-ae |  13 +++++++++++++
 3 files changed, 29 insertions(+), 1 deletions(-)

diffs (48 lines):

diff -r c0e1f6da08b6 -r a4fd1a37ac8b x11/qt1/distinfo
--- a/x11/qt1/distinfo  Fri Dec 19 22:46:01 2003 +0000
+++ b/x11/qt1/distinfo  Fri Dec 19 23:00:26 2003 +0000
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.3 2001/05/01 16:43:39 jlam Exp $
+$NetBSD: distinfo,v 1.4 2003/12/19 23:00:26 agc Exp $
 
 SHA1 (qt-1.44.tar.gz) = 08848fe5534bb210b151a1d9f3480fe83c0053c1
 Size (qt-1.44.tar.gz) = 2659999 bytes
 SHA1 (patch-aa) = b94f2fadee75696e0afb98cd2d0839d991f98573
 SHA1 (patch-ab) = 76d0ac60cd386518b5d8a48d15552abc5c8737ef
 SHA1 (patch-ac) = 5554b60c0f4cbd13ea2fde8fcb8c287e8ac8b651
+SHA1 (patch-ad) = cee971069a2f41219c14669ee5b4e1687d445dd8
+SHA1 (patch-ae) = cef04901bf46e4511fafe08a9d7eee975ceae320
diff -r c0e1f6da08b6 -r a4fd1a37ac8b x11/qt1/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/qt1/patches/patch-ad  Fri Dec 19 23:00:26 2003 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.3 2003/12/19 23:00:26 agc Exp $
+
+--- src/kernel/qregion.h       2003/12/19 22:47:37     1.1
++++ src/kernel/qregion.h       2003/12/19 22:48:00
+@@ -70,7 +70,7 @@
+ // case someone is using #define xor ^ to work around deficiencies in
+ // their compiler that cause problems with some other header files.
+ //
+-#if !(defined(__STRICT_ANSI__) && defined(_CC_GNU_)) && !defined(_CC_EDG_) && !defined(_CC_HP_) && !defined(_CC_HP_ACC_) && !defined(_CC_USLC_) && !defined(_CC_MWERKS_) && !defined(xor)
++#if !(defined(__STRICT_ANSI__) && defined(_CC_GNU_)) && !defined(_CC_EDG_) && !defined(_CC_HP_) && !defined(_CC_HP_ACC_) && !defined(_CC_USLC_) && !defined(_CC_MWERKS_) && 0
+     QRegion xor( const QRegion & )    const;
+ #endif
+     QRegion eor( const QRegion & )    const;
diff -r c0e1f6da08b6 -r a4fd1a37ac8b x11/qt1/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/qt1/patches/patch-ae  Fri Dec 19 23:00:26 2003 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2003/12/19 23:00:26 agc Exp $
+
+--- src/kernel/qregion.cpp     2003/12/19 22:49:16     1.1
++++ src/kernel/qregion.cpp     2003/12/19 22:49:30
+@@ -229,7 +229,7 @@
+ 
+ 
+ // OBSOLETE
+-#if !(defined(__STRICT_ANSI__) && defined(_CC_GNU_)) && !defined(_CC_EDG_) && !defined(_CC_HP_) && !defined(_CC_HP_ACC_) && !defined(_CC_USLC_) && !defined(xor)
++#if !(defined(__STRICT_ANSI__) && defined(_CC_GNU_)) && !defined(_CC_EDG_) && !defined(_CC_HP_) && !defined(_CC_HP_ACC_) && !defined(_CC_USLC_) && 0
+ /*!
+   OBSOLETE - Use eor() instead.
+ */