summaryrefslogtreecommitdiff
path: root/x11/wxGTK
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2006-04-08 13:12:07 +0000
committerjoerg <joerg@pkgsrc.org>2006-04-08 13:12:07 +0000
commitbc24c6dc6112c97b096a7d1fa77c8166cebee72f (patch)
treec00be1afe9448e1c89033b193233cf02d274089b /x11/wxGTK
parentb8415e12fbbc14d7f9372eeaea6060b558c00228 (diff)
downloadpkgsrc-bc24c6dc6112c97b096a7d1fa77c8166cebee72f.tar.gz
Workaround GCC 2.95's inability to use #if in a macro.
Diffstat (limited to 'x11/wxGTK')
-rw-r--r--x11/wxGTK/distinfo3
-rw-r--r--x11/wxGTK/patches/patch-ab28
2 files changed, 30 insertions, 1 deletions
diff --git a/x11/wxGTK/distinfo b/x11/wxGTK/distinfo
index 4f308dff245..988f17de3b9 100644
--- a/x11/wxGTK/distinfo
+++ b/x11/wxGTK/distinfo
@@ -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 @@ SHA1 (wxGTK-2.6.3-libtool.diff.bz2) = 5e1e93f34f031aeb970c5821a19cd57ed7b2013c
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 --git a/x11/wxGTK/patches/patch-ab b/x11/wxGTK/patches/patch-ab
new file mode 100644
index 00000000000..ef6b969fd4a
--- /dev/null
+++ b/x11/wxGTK/patches/patch-ab
@@ -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 */