diff options
| author |   Kent Fredric <kentfredric@gmail.com> | 2016-03-12 16:09:13 +1300 |
|---|---|---|
| committer |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2016-03-15 00:06:37 +0100 |
| commit | 1493d223794efe79baa2249d5c54a647d84ab914 (patch) | |
| tree | 3888b918c510d692c794b59a407141445f766005 /dev-perl/Tk/files/Tk-804.33.0-xorg.patch | |
| parent | dev-go/sanitized-anchor-name: sync live ebuild (diff) | |
| download | gentoo-1493d223794efe79baa2249d5c54a647d84ab914.tar.gz gentoo-1493d223794efe79baa2249d5c54a647d84ab914.tar.bz2 gentoo-1493d223794efe79baa2249d5c54a647d84ab914.zip | |
dev-perl/Tk: Copy from dev-perl/perl-tk
Migrating to a more predictable name matching upstream conventions
Package-Manager: portage-2.2.27
Diffstat (limited to 'dev-perl/Tk/files/Tk-804.33.0-xorg.patch')
| -rw-r--r-- | dev-perl/Tk/files/Tk-804.33.0-xorg.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/dev-perl/Tk/files/Tk-804.33.0-xorg.patch b/dev-perl/Tk/files/Tk-804.33.0-xorg.patch new file mode 100644 index 000000000000..d4284a394930 --- /dev/null +++ b/dev-perl/Tk/files/Tk-804.33.0-xorg.patch @@ -0,0 +1,41 @@ +diff --git a/myConfig b/myConfig +index fcf1933..14033cb 100755 +--- a/myConfig ++++ b/myConfig +@@ -316,7 +316,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); +@@ -365,8 +365,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', +- '/opt/X11/lib') ++ $xlib = &lX11(0,chooseX11(</usr/X11*/lib>),chooseX11(</usr/lib/X11*>),</usr/Xfree*/lib>,'/usr/X386/lib','/opt/X11/lib','/usr/lib64') + } + + # +@@ -385,7 +384,7 @@ if ($win_arch eq 'x') { + exit 0; + } + +- ($base) = $xlib =~ m#-L(.*)(?:/lib)$#x; ++ ($base) = $xlib =~ m#-L(.*)(?:/lib(64))$#x; + if (defined $X11INC) + { + $xinc = &IX11("$X11INC"); +@@ -397,6 +396,8 @@ 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/include', + '/usr/openwin/include', + chooseX11(</usr/X11*/include>), + chooseX11(</usr/include/X11*>), |