diff options
| author | shattered <shattered> | 2009-01-19 16:36:40 +0000 |
|---|---|---|
| committer | shattered <shattered> | 2009-01-19 16:36:40 +0000 |
| commit | 14558128eb75d7e58633f8f73a57f19dfee4e140 (patch) | |
| tree | 346f6b9c6e4752a4ab31633c7d22367877eb036b /x11 | |
| parent | 0902752d1b50677430e66819901de5ba78a6b670 (diff) | |
| download | pkgsrc-14558128eb75d7e58633f8f73a57f19dfee4e140.tar.gz | |
Fix a couple of places where 32-bit values were being used for 64 bit
values (i.e. pointers). From PR 40257.
OK by wiz@.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/wxGTK24/Makefile | 4 | ||||
| -rw-r--r-- | x11/wxGTK24/distinfo | 3 | ||||
| -rw-r--r-- | x11/wxGTK24/patches/patch-ak | 44 |
3 files changed, 48 insertions, 3 deletions
diff --git a/x11/wxGTK24/Makefile b/x11/wxGTK24/Makefile index ca92bee806c..0422c53a27e 100644 --- a/x11/wxGTK24/Makefile +++ b/x11/wxGTK24/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.6 2009/01/08 21:58:17 shattered Exp $ +# $NetBSD: Makefile,v 1.7 2009/01/19 16:36:40 shattered Exp $ # .include "Makefile.common" -PKGREVISION= 11 +PKGREVISION= 12 COMMENT= GTK-based implementation of the wxWidgets GUI library CONFLICTS+= wxGTK<=2.4.2nb5 diff --git a/x11/wxGTK24/distinfo b/x11/wxGTK24/distinfo index a6554ed9a06..6bc4d275b3f 100644 --- a/x11/wxGTK24/distinfo +++ b/x11/wxGTK24/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2009/01/08 21:58:17 shattered Exp $ +$NetBSD: distinfo,v 1.7 2009/01/19 16:36:40 shattered Exp $ SHA1 (wxGTK-2.4.2.tar.bz2) = 3f1ebacaaf8eb5510c14ee10bafbc5f225be842c RMD160 (wxGTK-2.4.2.tar.bz2) = 8076d1ba31c9b23becb241cbad5a83763fee776e @@ -13,3 +13,4 @@ SHA1 (patch-ag) = ccdaca4030c08aefa922367019e0c9249b810456 SHA1 (patch-ah) = 24cc32f7eda53f4704422363902f72239eda2253 SHA1 (patch-ai) = c5d301c2cb45397329d9a817d9278707a2d3b97f SHA1 (patch-aj) = 9f74442617e6a869c5ff253591bba3f9da3a9e0c +SHA1 (patch-ak) = 3f26086c8f16ac972db89c21f665c187570937cc diff --git a/x11/wxGTK24/patches/patch-ak b/x11/wxGTK24/patches/patch-ak new file mode 100644 index 00000000000..11b6a5728a8 --- /dev/null +++ b/x11/wxGTK24/patches/patch-ak @@ -0,0 +1,44 @@ +$NetBSD: patch-ak,v 1.1 2009/01/19 16:36:40 shattered Exp $ + +Fix a couple of places where 32-bit values were being used for 64 bit +values (i.e. pointers). From PR 40257. + +--- include/wx/gtk/win_gtk.h.orig 2003-09-21 05:31:56.000000000 -0600 ++++ include/wx/gtk/win_gtk.h 2008-12-21 22:01:53.000000000 -0700 +@@ -82,7 +82,7 @@ + GtkAdjustment *vadjustment); + }; + +-guint gtk_pizza_get_type (void); ++GtkType gtk_pizza_get_type (void); + GtkWidget* gtk_pizza_new (void); + + void gtk_pizza_set_shadow_type (GtkPizza *pizza, +--- src/gtk/win_gtk.c.orig 2003-09-21 05:31:58.000000000 -0600 ++++ src/gtk/win_gtk.c 2008-12-21 21:41:21.000000000 -0700 +@@ -102,10 +102,10 @@ + + static gboolean gravity_works; + +-guint ++GtkType + gtk_pizza_get_type () + { +- static guint pizza_type = 0; ++ static GtkType pizza_type = 0; + + if (!pizza_type) + { +--- src/unix/utilsx11.cpp.orig 2003-09-21 05:31:40.000000000 -0600 ++++ src/unix/utilsx11.cpp 2008-12-21 21:34:49.000000000 -0700 +@@ -101,8 +101,8 @@ + + if( size > 0 ) + { +- wxUint32* data = new wxUint32[size]; +- wxUint32* ptr = data; ++ unsigned long* data = new unsigned long[size]; ++ unsigned long* ptr = data; + + for( i = 0; i < max; ++i ) + { |