diff options
author | agc <agc> | 2003-12-19 23:00:26 +0000 |
---|---|---|
committer | agc <agc> | 2003-12-19 23:00:26 +0000 |
commit | 8ad45415d2bfa021c35d9bd8837f66c3de0cbc89 (patch) | |
tree | 3f9d20211b34c0e0976fcefbdec6095c00002c6b /x11/qt1/patches | |
parent | ad5f23f3cad5d29a503583414ceb01968c3b332b (diff) | |
download | pkgsrc-8ad45415d2bfa021c35d9bd8837f66c3de0cbc89.tar.gz |
Make this package compile in the face of gcc3 and a working
implementation of xor.
Diffstat (limited to 'x11/qt1/patches')
-rw-r--r-- | x11/qt1/patches/patch-ad | 13 | ||||
-rw-r--r-- | x11/qt1/patches/patch-ae | 13 |
2 files changed, 26 insertions, 0 deletions
diff --git a/x11/qt1/patches/patch-ad b/x11/qt1/patches/patch-ad new file mode 100644 index 00000000000..fee5ddff5b7 --- /dev/null +++ b/x11/qt1/patches/patch-ad @@ -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 --git a/x11/qt1/patches/patch-ae b/x11/qt1/patches/patch-ae new file mode 100644 index 00000000000..7bd219464c2 --- /dev/null +++ b/x11/qt1/patches/patch-ae @@ -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. + */ |