diff options
| author |   Michael Cummings <mcummings@gentoo.org> | 2006-06-14 03:06:45 +0000 |
|---|---|---|
| committer | Michael Cummings <mcummings@gentoo.org> | 2006-06-14 03:06:45 +0000 |
| commit | 20df86c159f0686d2f7b9c2bf7aff63f93ae3f97 (patch) | |
| tree | 368f10f63b6232482bebca7bdafd7f9d9733e145 /dev-perl/perl-tk/files | |
| parent | Proper fix for new numpy -- just depend on the new numpy, and always fix up t... (diff) | |
| download | gentoo-2-20df86c159f0686d2f7b9c2bf7aff63f93ae3f97.tar.gz gentoo-2-20df86c159f0686d2f7b9c2bf7aff63f93ae3f97.tar.bz2 gentoo-2-20df86c159f0686d2f7b9c2bf7aff63f93ae3f97.zip | |
Bug 128326 - modified to build for users that didn't install xorg meta
(Portage version: 2.1)
Diffstat (limited to 'dev-perl/perl-tk/files')
| -rw-r--r-- | dev-perl/perl-tk/files/digest-perl-tk-804.027 | 2 | ||||
| -rw-r--r-- | dev-perl/perl-tk/files/xorg.patch | 49 |
2 files changed, 51 insertions, 0 deletions
diff --git a/dev-perl/perl-tk/files/digest-perl-tk-804.027 b/dev-perl/perl-tk/files/digest-perl-tk-804.027 index 0651c014c6c9..de30de9344eb 100644 --- a/dev-perl/perl-tk/files/digest-perl-tk-804.027 +++ b/dev-perl/perl-tk/files/digest-perl-tk-804.027 @@ -1 +1,3 @@ MD5 d1ca4a6bff6dae4d937fabde4e86256b Tk-804.027.tar.gz 6011130 +RMD160 8ef2086efa4d7818bd82cc6d36a4d60ca8654bc7 Tk-804.027.tar.gz 6011130 +SHA256 fc12136d8885168cdb77af4107d0cd8121c329925219355a19bfffe01a1ad8a2 Tk-804.027.tar.gz 6011130 diff --git a/dev-perl/perl-tk/files/xorg.patch b/dev-perl/perl-tk/files/xorg.patch new file mode 100644 index 000000000000..9e88f46100db --- /dev/null +++ b/dev-perl/perl-tk/files/xorg.patch @@ -0,0 +1,49 @@ +diff -Naurp Tk-804.027/Tk/MakeDepend.pm Tk-804.027.new/Tk/MakeDepend.pm +--- Tk-804.027/Tk/MakeDepend.pm 2003-12-13 07:28:22.000000000 -0500 ++++ Tk-804.027.new/Tk/MakeDepend.pm 2006-06-13 22:34:21.000000000 -0400 +@@ -248,6 +248,7 @@ sub command_line + # force /usr/include to be last element of @include + push @include, $Config{'usrinc'} + if (defined $Config{'usrinc'} and $Config{'usrinc'} ne ''); ++ push @include, "/usr/include"; + # warn "Include:@include\n"; + while (@files) + { +diff -Naurp Tk-804.027/myConfig Tk-804.027.new/myConfig +--- Tk-804.027/myConfig 2004-02-28 11:59:28.000000000 -0500 ++++ Tk-804.027.new/myConfig 2006-06-13 22:27:53.000000000 -0400 +@@ -253,7 +253,7 @@ if ($win_arch eq 'x') { + } + close(XMKMF); + while (defined $uidir) { +- last unless ($uidir =~ s!^.*-I(\S+)/lib/X11/config!!o); ++ last unless ($uidir =~ s!^.*-I(\S+)/lib(64)/X11/config!!o); + $try = $1; + $try =~ s/'x11root'/$ENV{X11ROOT}/; + push(@xdirs,$try); +@@ -294,7 +294,7 @@ if ($win_arch eq 'x') { + # + unless (defined $xlib) + { +- $xlib = &lX11(0,chooseX11(</usr/X11*/lib>),chooseX11(</usr/lib/X11*>),</usr/Xfree*/lib>,'/usr/X386/lib') ++ $xlib = &lX11(0,chooseX11(</usr/X11*/lib>),chooseX11(</usr/lib/X11*>),</usr/Xfree*/lib>,'/usr/X386/lib','/usr/lib64') + } + + # +@@ -309,7 +309,7 @@ if ($win_arch eq 'x') { + + die "Cannot find -lX11 anywhere" unless(defined $xlib); + +- ($base) = $xlib =~ m#-L(.*)(?:/lib)$#x; ++ ($base) = $xlib =~ m#-L(.*)(?:/lib(64))$#x; + if (defined $X11INC) + { + $xinc = &IX11("$X11INC"); +@@ -321,6 +321,7 @@ if ($win_arch eq 'x') { + { + warn "Cannot find X include files via $base/include\n"; + $xinc = &IX11(map("$_/include",@xdirs), ++ chooseX11(</usr/include/X11*>), + '/usr/openwin/include', + chooseX11(</usr/X11*/include>), + chooseX11(</usr/include/X11*>), |