diff options
| author | agc <agc@pkgsrc.org> | 2003-12-19 23:00:26 +0000 |
|---|---|---|
| committer | agc <agc@pkgsrc.org> | 2003-12-19 23:00:26 +0000 |
| commit | dd17c7cbf91b291d712a5a9fef29aae0f7ba4606 (patch) | |
| tree | 3f9d20211b34c0e0976fcefbdec6095c00002c6b /x11/qt1 | |
| parent | b043fa59b4e4e27757905231f257f6a8e5cf4a53 (diff) | |
| download | pkgsrc-dd17c7cbf91b291d712a5a9fef29aae0f7ba4606.tar.gz | |
Make this package compile in the face of gcc3 and a working
implementation of xor.
Diffstat (limited to 'x11/qt1')
| -rw-r--r-- | x11/qt1/distinfo | 4 | ||||
| -rw-r--r-- | x11/qt1/patches/patch-ad | 13 | ||||
| -rw-r--r-- | x11/qt1/patches/patch-ae | 13 |
3 files changed, 29 insertions, 1 deletions
diff --git a/x11/qt1/distinfo b/x11/qt1/distinfo index 4c80d7de097..1650be803e2 100644 --- a/x11/qt1/distinfo +++ b/x11/qt1/distinfo @@ -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 --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. + */ |