svn commit: r419205 - in branches/2016Q3/www: webkit-gtk2 webkit-gtk2/files webkit-gtk3 webkit-gtk3/files

Thu Jul 28 15:04:49 UTC 2016

On Thu, 28 Jul 2016 02:50:28 +0000 (UTC)
Jan Beich <jbeich at FreeBSD.org> wrote:

> Author: jbeich
> Date: Thu Jul 28 02:50:28 2016
> New Revision: 419205
> URL: https://svnweb.freebsd.org/changeset/ports/419205
> 
> Log:
>   MFH: r419064
>   
>   www/webkit-gtk{2,3}: use ASCII quotes to unbreak python3 build
>   
>     GEN      DerivedSources/WebCore/XMLViewerCSS.h
>     GEN      DerivedSources/WebCore/XMLViewerJS.h
>   Traceback (most recent call last):
>     File "./Source/JavaScriptCore/inspector/scripts/cssmin.py", line 44, in <module>
>       sys.stdout.write(cssminify(sys.stdin.read()))
>     File "/usr/local/lib/python3.4/encodings/ascii.py", line 26, in decode
>       return codecs.ascii_decode(input, self.errors)[0]
>   UnicodeDecodeError: 'ascii' codec can't decode byte 0xe2 in position 642: ordinal not in range(128)
>   gmake: *** [GNUmakefile:82114: DerivedSources/WebCore/XMLViewerCSS.h] Error 1
>   gmake: *** Waiting for unfinished jobs....
>   Traceback (most recent call last):
>     File "./Source/JavaScriptCore/inspector/scripts/jsmin.py", line 237, in <module>
>       minifier.minify()
>     File "./Source/JavaScriptCore/inspector/scripts/jsmin.py", line 106, in minify
>       previous = read(1)
>     File "/usr/local/lib/python3.4/encodings/ascii.py", line 26, in decode
>       return codecs.ascii_decode(input, self.errors)[0]
>   UnicodeDecodeError: 'ascii' codec can't decode byte 0xe2 in position 696: ordinal not in range(128)
>   gmake: *** [GNUmakefile:82119: DerivedSources/WebCore/XMLViewerJS.h] Error 1
>   offlineasm: offset extractor DerivedSources/JavaScriptCore/LLIntDesiredOffsets.h successfully generated.
>   
>   PR:		197316
>   Submitted by:	olivier at cochard.me
>   Approved by:	maintainer timeout (1.5 years)
>   Approved by:	ports-secteam (feld)

Someone in ports-secteam can justify why this commit was backported into 2016Q3 branch (which is a "stable" branch).

I can understand in head (using Python3 instead of Python2), but by default it's Python 2.7.x which is used, and WebKitGTK+ build fines.

Note: I don't know the context, but error mentioned in commit log can also happen with Python2.

> 
> Added:
>   branches/2016Q3/www/webkit-gtk2/files/patch-Source_WebCore_xml_XMLViewer.css
>      - copied unchanged from r419064, head/www/webkit-gtk2/files/patch-Source_WebCore_xml_XMLViewer.css
>   branches/2016Q3/www/webkit-gtk2/files/patch-Source_WebCore_xml_XMLViewer.js
>      - copied unchanged from r419064, head/www/webkit-gtk2/files/patch-Source_WebCore_xml_XMLViewer.js
>   branches/2016Q3/www/webkit-gtk3/files/patch-Source_WebCore_xml_XMLViewer.css
>      - copied unchanged from r419064, head/www/webkit-gtk3/files/patch-Source_WebCore_xml_XMLViewer.css
>   branches/2016Q3/www/webkit-gtk3/files/patch-Source_WebCore_xml_XMLViewer.js
>      - copied unchanged from r419064, head/www/webkit-gtk3/files/patch-Source_WebCore_xml_XMLViewer.js
> Modified:
>   branches/2016Q3/www/webkit-gtk2/Makefile
>   branches/2016Q3/www/webkit-gtk3/Makefile
> Directory Properties:
>   branches/2016Q3/   (props changed)
> 
> Modified: branches/2016Q3/www/webkit-gtk2/Makefile
> ==============================================================================
> --- branches/2016Q3/www/webkit-gtk2/Makefile	Thu Jul 28 00:46:59 2016	(r419204)
> +++ branches/2016Q3/www/webkit-gtk2/Makefile	Thu Jul 28 02:50:28 2016	(r419205)
> @@ -3,6 +3,7 @@
>  
>  PORTNAME=	webkit
>  PORTVERSION=	2.4.11
> +PORTREVISION=	1
>  CATEGORIES=	www
>  MASTER_SITES=	http://webkitgtk.org/releases/
>  PKGNAMESUFFIX=	-gtk2
> 
> Copied: branches/2016Q3/www/webkit-gtk2/files/patch-Source_WebCore_xml_XMLViewer.css (from r419064, head/www/webkit-gtk2/files/patch-Source_WebCore_xml_XMLViewer.css)
> ==============================================================================
> --- /dev/null	00:00:00 1970	(empty, because file is newly added)
> +++ branches/2016Q3/www/webkit-gtk2/files/patch-Source_WebCore_xml_XMLViewer.css	Thu Jul 28 02:50:28 2016	(r419205, copy of r419064, head/www/webkit-gtk2/files/patch-Source_WebCore_xml_XMLViewer.css)
> @@ -0,0 +1,11 @@
> +--- Source/WebCore/xml/XMLViewer.css.orig	2016-04-10 06:48:37 UTC
> ++++ Source/WebCore/xml/XMLViewer.css
> +@@ -14,7 +14,7 @@
> +  * distribution.
> +  *
> +  * THIS SOFTWARE IS PROVIDED BY GOOGLE INC. AND ITS CONTRIBUTORS
> +- * “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
> ++ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
> +  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
> +  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GOOGLE INC.
> +  * OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
> 
> Copied: branches/2016Q3/www/webkit-gtk2/files/patch-Source_WebCore_xml_XMLViewer.js (from r419064, head/www/webkit-gtk2/files/patch-Source_WebCore_xml_XMLViewer.js)
> ==============================================================================
> --- /dev/null	00:00:00 1970	(empty, because file is newly added)
> +++ branches/2016Q3/www/webkit-gtk2/files/patch-Source_WebCore_xml_XMLViewer.js	Thu Jul 28 02:50:28 2016	(r419205, copy of r419064, head/www/webkit-gtk2/files/patch-Source_WebCore_xml_XMLViewer.js)
> @@ -0,0 +1,11 @@
> +--- Source/WebCore/xml/XMLViewer.js.orig	2015-07-22 12:37:57 UTC
> ++++ Source/WebCore/xml/XMLViewer.js
> +@@ -15,7 +15,7 @@
> +  * distribution.
> +  *
> +  * THIS SOFTWARE IS PROVIDED BY GOOGLE INC. AND ITS CONTRIBUTORS
> +- * “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
> ++ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
> +  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
> +  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GOOGLE INC.
> +  * OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
> 
> Modified: branches/2016Q3/www/webkit-gtk3/Makefile
> ==============================================================================
> --- branches/2016Q3/www/webkit-gtk3/Makefile	Thu Jul 28 00:46:59 2016	(r419204)
> +++ branches/2016Q3/www/webkit-gtk3/Makefile	Thu Jul 28 02:50:28 2016	(r419205)
> @@ -3,6 +3,7 @@
>  
>  PORTNAME=	webkit
>  PORTVERSION=	2.4.11
> +PORTREVISION=	1
>  CATEGORIES=	www
>  MASTER_SITES=	http://webkitgtk.org/releases/
>  PKGNAMESUFFIX=	-gtk3
> 
> Copied: branches/2016Q3/www/webkit-gtk3/files/patch-Source_WebCore_xml_XMLViewer.css (from r419064, head/www/webkit-gtk3/files/patch-Source_WebCore_xml_XMLViewer.css)
> ==============================================================================
> --- /dev/null	00:00:00 1970	(empty, because file is newly added)
> +++ branches/2016Q3/www/webkit-gtk3/files/patch-Source_WebCore_xml_XMLViewer.css	Thu Jul 28 02:50:28 2016	(r419205, copy of r419064, head/www/webkit-gtk3/files/patch-Source_WebCore_xml_XMLViewer.css)
> @@ -0,0 +1,11 @@
> +--- Source/WebCore/xml/XMLViewer.css.orig	2016-04-10 06:48:37 UTC
> ++++ Source/WebCore/xml/XMLViewer.css
> +@@ -14,7 +14,7 @@
> +  * distribution.
> +  *
> +  * THIS SOFTWARE IS PROVIDED BY GOOGLE INC. AND ITS CONTRIBUTORS
> +- * “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
> ++ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
> +  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
> +  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GOOGLE INC.
> +  * OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
> 
> Copied: branches/2016Q3/www/webkit-gtk3/files/patch-Source_WebCore_xml_XMLViewer.js (from r419064, head/www/webkit-gtk3/files/patch-Source_WebCore_xml_XMLViewer.js)
> ==============================================================================
> --- /dev/null	00:00:00 1970	(empty, because file is newly added)
> +++ branches/2016Q3/www/webkit-gtk3/files/patch-Source_WebCore_xml_XMLViewer.js	Thu Jul 28 02:50:28 2016	(r419205, copy of r419064, head/www/webkit-gtk3/files/patch-Source_WebCore_xml_XMLViewer.js)
> @@ -0,0 +1,11 @@
> +--- Source/WebCore/xml/XMLViewer.js.orig	2015-07-22 12:37:57 UTC
> ++++ Source/WebCore/xml/XMLViewer.js
> +@@ -15,7 +15,7 @@
> +  * distribution.
> +  *
> +  * THIS SOFTWARE IS PROVIDED BY GOOGLE INC. AND ITS CONTRIBUTORS
> +- * “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
> ++ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
> +  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
> +  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GOOGLE INC.
> +  * OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
> 

-- 
Olivier Duchateau <olivierd at freebsd.org>