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 | |
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')
-rw-r--r-- | dev-perl/Tk/files/Tk-804.31.0-xorg.patch | 43 | ||||
-rw-r--r-- | dev-perl/Tk/files/Tk-804.33.0-xorg.patch | 41 | ||||
-rw-r--r-- | dev-perl/Tk/files/freetype_location.patch | 32 | ||||
-rw-r--r-- | dev-perl/Tk/files/mainwindow_segfaults.patch | 25 |
4 files changed, 141 insertions, 0 deletions
diff --git a/dev-perl/Tk/files/Tk-804.31.0-xorg.patch b/dev-perl/Tk/files/Tk-804.31.0-xorg.patch new file mode 100644 index 000000000000..2bad0ba092d5 --- /dev/null +++ b/dev-perl/Tk/files/Tk-804.31.0-xorg.patch @@ -0,0 +1,43 @@ + myConfig | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/myConfig b/myConfig +index e0ace45..be52a82 100755 +--- a/myConfig ++++ b/myConfig +@@ -307,7 +307,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); +@@ -356,7 +356,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') + } + + # +@@ -375,7 +375,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"); +@@ -387,6 +387,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*>), 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*>), diff --git a/dev-perl/Tk/files/freetype_location.patch b/dev-perl/Tk/files/freetype_location.patch new file mode 100644 index 000000000000..bac2a437c235 --- /dev/null +++ b/dev-perl/Tk/files/freetype_location.patch @@ -0,0 +1,32 @@ +From 1ca4589ef5a87999ec564081900bc8fdaed83c74 Mon Sep 17 00:00:00 2001 +From: Slaven Rezic <slaven@rezic.de> +Date: Sun, 2 Mar 2014 12:10:31 +0100 +Subject: [PATCH] look also for /usr/include/freetype2/freetype.h + +In some freetype installations (e.g. Debian/jessie) the intermediate +"freetype" directory may be missing in the include path. + +This should fix +https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=740207 +--- + myConfig | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/myConfig b/myConfig +index 02d2ee5..3ca8144 100755 +--- a/myConfig ++++ b/myConfig +@@ -147,7 +147,12 @@ sub Ift + { + foreach (map { "$_/freetype2" } @_) + { +- if (-d $_ && -d "$_/freetype" && -r "$_/freetype/freetype.h") ++ if (-r "$_/freetype.h") # location in Debian (since jessie) ++ { ++ print "Using -I$_ to find $_/freetype/freetype.h\n"; ++ return "-I$_"; ++ } ++ if (-r "$_/freetype/freetype.h") # location in FreeBSD (up to version 10.0) and Debian (up to wheezy) + { + print "Using -I$_ to find $_/freetype/freetype.h\n"; + return "-I$_"; diff --git a/dev-perl/Tk/files/mainwindow_segfaults.patch b/dev-perl/Tk/files/mainwindow_segfaults.patch new file mode 100644 index 000000000000..50e2e4b826ad --- /dev/null +++ b/dev-perl/Tk/files/mainwindow_segfaults.patch @@ -0,0 +1,25 @@ +From ba3a92a779f7adcf655b7e45b40ee5b0cb79bc8b Mon Sep 17 00:00:00 2001 +From: Slaven Rezic <slaven@rezic.de> +Date: Fri, 14 Mar 2014 16:00:05 +0100 +Subject: [PATCH] no segfaults if Tk::MainWindow::Create was called without + args + +However, this case never happened in real life, as this function was +not supposed to be used directly anyway. +--- + tkGlue.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tkGlue.c b/tkGlue.c +index 57f0bca..ae595bf 100644 +--- a/tkGlue.c ++++ b/tkGlue.c +@@ -2370,7 +2370,7 @@ XS(XS_Tk__MainWindow_Create) + STRLEN na; + Tcl_Interp *interp = Tcl_CreateInterp(); + SV **args = &ST(0); +- char *appName = SvPV(ST(1),na); ++ char *appName = items >= 1 ? SvPV(ST(1),na) : ""; + int offset = args - sp; + int code; + if (!initialized) |