[pkgsrc/trunk]: pkgsrc/x11/wxGTK Workaround GCC 2.95's inability to use #if i...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9188d7452c45
branches:  trunk
changeset: 511022:9188d7452c45
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sat Apr 08 13:12:07 2006 +0000

description:
Workaround GCC 2.95's inability to use #if in a macro.

diffstat:

 x11/wxGTK/distinfo         |   3 ++-
 x11/wxGTK/patches/patch-ab |  28 ++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletions(-)

diffs (46 lines):

diff -r cb511b8186f3 -r 9188d7452c45 x11/wxGTK/distinfo
--- a/x11/wxGTK/distinfo        Sat Apr 08 11:45:43 2006 +0000
+++ b/x11/wxGTK/distinfo        Sat Apr 08 13:12:07 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.24 2006/03/30 15:28:12 joerg Exp $
+$NetBSD: distinfo,v 1.25 2006/04/08 13:12:07 joerg Exp $
 
 SHA1 (wxGTK-2.6.3.tar.bz2) = 7c2dfe27a56aa99b4ea557a436bf84a13a579a9d
 RMD160 (wxGTK-2.6.3.tar.bz2) = d7465860d7c07b42d299d4b4c5d015b25f96a9dd
@@ -7,3 +7,4 @@
 RMD160 (wxGTK-2.6.3-libtool.diff.bz2) = 9031bc030bb1c23b1c46bdc43e2282741fcd078a
 Size (wxGTK-2.6.3-libtool.diff.bz2) = 136324 bytes
 SHA1 (patch-aa) = 159a42a05fe9287931e46bfdd1adfa7cfa9d36a3
+SHA1 (patch-ab) = 3e9c6bc0df33e466390a4f6483b1c84e2eb9257b
diff -r cb511b8186f3 -r 9188d7452c45 x11/wxGTK/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/wxGTK/patches/patch-ab        Sat Apr 08 13:12:07 2006 +0000
@@ -0,0 +1,28 @@
+$NetBSD: patch-ab,v 1.16 2006/04/08 13:12:07 joerg Exp $
+
+--- src/gtk/clipbrd.cpp.orig   2006-04-03 18:45:23.000000000 +0200
++++ src/gtk/clipbrd.cpp
+@@ -494,16 +494,21 @@ bool wxClipboard::AddData( wxDataObject 
+ 
+     delete[] array;
+ 
++#ifdef __WXGTK20__
+     gtk_signal_connect( GTK_OBJECT(m_clipboardWidget),
+                         "selection_get",
+                         GTK_SIGNAL_FUNC(selection_handler),
+                         GUINT_TO_POINTER(
+-#ifdef __WXGTK20__
+                                 gtk_get_current_event_time()
++                                        ) );
+ #else
++    gtk_signal_connect( GTK_OBJECT(m_clipboardWidget),
++                        "selection_get",
++                        GTK_SIGNAL_FUNC(selection_handler),
++                        GUINT_TO_POINTER(
+                                 gdk_event_get_time(gtk_get_current_event())
+-#endif
+                                         ) );
++#endif
+ 
+ #if wxUSE_THREADS
+     /* disable GUI threads */