Giovanni Bechis wrote:
"no event type or button # or keysym at
/usr/obj/ports/p5-Tk-804.028/Tk-804.028/blib/lib/Tk/Widget.pm line 1105.
This diff fixes quite all regression tests and let graphics/mapivi work.
Taken from Gentoo bugzilla (http://bugs.gentoo.org/show_bug.cgi?id=225999).
Cheers
Giovanni
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/p5-Tk/Makefile,v
retrieving revision 1.30
diff -u -p -r1.30 Makefile
--- Makefile 2 Oct 2008 08:31:29 -0000 1.30
+++ Makefile 4 Nov 2008 08:32:34 -0000
@@ -8,7 +8,7 @@ COMMENT-demo= demonstrate the features o
MODULES= cpan
VERSION= 804.028
DISTNAME= Tk-${VERSION}
-PKGNAME-main= p5-Tk-${VERSION}
+PKGNAME-main= p5-Tk-${VERSION}p0
PKGNAME-demo= p5-Tk-demo-${VERSION}
CATEGORIES= x11 devel
Index: patches/patch-PNG_Makefile_PL
===================================================================
RCS file: /cvs/ports/x11/p5-Tk/patches/patch-PNG_Makefile_PL,v
retrieving revision 1.2
diff -u -p -r1.2 patch-PNG_Makefile_PL
--- patches/patch-PNG_Makefile_PL 2 Jun 2007 14:54:53 -0000 1.2
+++ patches/patch-PNG_Makefile_PL 4 Nov 2008 08:32:34 -0000
@@ -1,12 +1,12 @@
$OpenBSD: patch-PNG_Makefile_PL,v 1.2 2007/06/02 14:54:53 ajacoutot Exp $
---- PNG/Makefile.PL.orig Tue Dec 30 11:45:03 2003
-+++ PNG/Makefile.PL Sat Jun 2 16:10:46 2007
+--- PNG/Makefile.PL.orig Sat May 5 20:38:35 2007
++++ PNG/Makefile.PL Tue Nov 4 09:26:25 2008
@@ -15,7 +15,7 @@ foreach my $file (qw(zlib/Makefile.PL libpng/Makefile.
}
if ($Tk::MMtry::VERSION ge '4.007' &&
- try_run("config/has_png.c",['-I/usr/local/include'],['-lpng -lz -lm']))
-+
try_run("config/has_png.c",['-I%%LOCALBASE%%/include/libpng'],['-L%%LOCALBASE%%/lib
-lpng -lz -lm']))
++
try_run("config/has_png.c",['-I/usr/local/include/libpng'],['-L/usr/local/lib
-lpng -lz -lm']))
{
Tk::MMutil::TkExtMakefile(
NAME => 'Tk::PNG',
@@ -16,8 +16,8 @@ $OpenBSD: patch-PNG_Makefile_PL,v 1.2 20
OBJECT => '$(O_FILES)',
- INC => '-I/usr/local/include',
- LIBS => ['-lpng -lz -lm'],
-+ INC => '-I%%LOCALBASE%%/include/libpng',
-+ LIBS => ['-L%%LOCALBASE%%/lib -lpng -lz -lm'],
++ INC => '-I/usr/local/include/libpng',
++ LIBS => ['-L/usr/local/lib -lpng -lz -lm'],
);
}
else
Index: patches/patch-Tk_ColorEditor_pm
===================================================================
RCS file: /cvs/ports/x11/p5-Tk/patches/patch-Tk_ColorEditor_pm,v
retrieving revision 1.1
diff -u -p -r1.1 patch-Tk_ColorEditor_pm
--- patches/patch-Tk_ColorEditor_pm 2 Jun 2007 14:54:53 -0000 1.1
+++ patches/patch-Tk_ColorEditor_pm 4 Nov 2008 08:32:34 -0000
@@ -1,12 +1,12 @@
$OpenBSD: patch-Tk_ColorEditor_pm,v 1.1 2007/06/02 14:54:53 ajacoutot Exp $
---- Tk/ColorEditor.pm.orig Sat Jun 2 15:16:35 2007
-+++ Tk/ColorEditor.pm Sat Jun 2 15:17:03 2007
-@@ -20,7 +20,7 @@ sub Populate
- split /\s+/, $Tk::Config::xlib;
+--- Tk/ColorEditor.pm.orig Sat Nov 3 21:35:55 2007
++++ Tk/ColorEditor.pm Tue Nov 4 09:19:32 2008
+@@ -21,7 +21,7 @@ sub Populate
+ my %seen_names;
foreach $i (@xlibpath,
'/usr/local/lib/X11/rgb.txt', '/usr/lib/X11/rgb.txt',
- '/usr/X11R6/lib/X11/rgb.txt',
+ '/usr/X11R6/share/X11/rgb.txt',
'/usr/local/X11R5/lib/X11/rgb.txt', '/X11/R5/lib/X11/rgb.txt',
- '/X11/R4/lib/rgb/rgb.txt', '/usr/openwin/lib/X11/rgb.txt') {
- local *FOO;
+ '/X11/R4/lib/rgb/rgb.txt', '/usr/openwin/lib/X11/rgb.txt',
+ '/usr/share/X11/rgb.txt', # This is the Debian location
Index: patches/patch-pTk_mTk_generic_tkBind_c
===================================================================
RCS file: patches/patch-pTk_mTk_generic_tkBind_c
diff -N patches/patch-pTk_mTk_generic_tkBind_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-pTk_mTk_generic_tkBind_c 4 Nov 2008 08:32:34 -0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+--- pTk/mTk/generic/tkBind.c.orig Tue Nov 4 09:25:33 2008
++++ pTk/mTk/generic/tkBind.c Tue Nov 4 09:25:05 2008
+@@ -629,6 +629,9 @@ static int flagArray[TK_LASTEVENT] = {
+ /* ColormapNotify */ COLORMAP,
+ /* ClientMessage */ 0,
+ /* MappingNotify */ 0,
++#ifdef GenericEvent
++ /* GenericEvent */ 0,
++#endif
+ /* VirtualEvent */ VIRTUAL,
+ /* Activate */ ACTIVATE,
+ /* Deactivate */ ACTIVATE,
