jlec 14/10/21 11:14:55 Added: freetype_location.patch mainwindow_segfaults.patch Log: dev-perl/perl-tk: Add fix for build against perl-5.20, thanks Norman Yarvin for the patch, #523982 (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)
Revision Changes Path 1.1 dev-perl/perl-tk/files/freetype_location.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-perl/perl-tk/files/freetype_location.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-perl/perl-tk/files/freetype_location.patch?rev=1.1&content-type=text/plain Index: freetype_location.patch =================================================================== >From 1ca4589ef5a87999ec564081900bc8fdaed83c74 Mon Sep 17 00:00:00 2001 From: Slaven Rezic <sla...@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$_"; 1.1 dev-perl/perl-tk/files/mainwindow_segfaults.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-perl/perl-tk/files/mainwindow_segfaults.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-perl/perl-tk/files/mainwindow_segfaults.patch?rev=1.1&content-type=text/plain Index: mainwindow_segfaults.patch =================================================================== >From ba3a92a779f7adcf655b7e45b40ee5b0cb79bc8b Mon Sep 17 00:00:00 2001 From: Slaven Rezic <sla...@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)
