From owner-svn-ports-branches@freebsd.org Thu Jul 28 15:04:49 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1EEF9BA7E70; Thu, 28 Jul 2016 15:04:49 +0000 (UTC) (envelope-from duchateau.olivier@gmail.com) Received: from mail-wm0-x22e.google.com (mail-wm0-x22e.google.com [IPv6:2a00:1450:400c:c09::22e]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id AF2C917A8; Thu, 28 Jul 2016 15:04:48 +0000 (UTC) (envelope-from duchateau.olivier@gmail.com) Received: by mail-wm0-x22e.google.com with SMTP id i5so112572701wmg.0; Thu, 28 Jul 2016 08:04:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:date:from:to:cc:subject:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Vs1xEcGwbIj0YltDeW24SPwfd6ETza9xz3jdF4q++Qc=; b=upeOSm4Zyt9wuhD8ccEz8YALGpnlxGeKqRbJR47qTzkZ3qfV5GXndCOGJvM1Rb1t9h yCKm1uDGa0h9J+yFp6HQUht4fLCC6eDdOi+s4SMV/neCP5iacX/C5B42ikWUUGxC0C7N W2bWuawopoom8k0+dsXlsyxVOJHU+SlCn6jgYJSWztOJls8d9saKO7N6FnRGNla0f9Zk fmT7WIFjqLq/RRXjp+4Q1IniZcmQrFknpjN7yT4pNj4BfiPTKnK5ZKmUPdckIw8XaABj 5otz6M2cQ+r1bq//Rjn57DgukxybN+pJeRbpGc0mJOkjgGpt6ADTlCpgxwxqEQjISWwp diEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:date:from:to:cc:subject:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Vs1xEcGwbIj0YltDeW24SPwfd6ETza9xz3jdF4q++Qc=; b=c9t5c9U0TOXDzgbrdVz2jSQqVT8N6f4cLr04Cdy124LlUh+E9h+5ObNYm80+YPbu3g 5YEr1+Udtmr+Sij2cmKM/dMFeci1+zpSGJR6E1wLVp5r3VEdbU4hBv4BhoHJH8sjRVlm vOPHOljbJiCnpG4QGPkCy58PImL1G4NOyslPOwa8azmZIgqkkaw5UJ+6GO8dtmRaOmp0 qNCJ/X+sX++AJTsZTylxZtVkKtil6/jdaFK2NHGYXQHH0VFBnh1TgKNAT/nu1cllq96S j6bBOZzxBs3/HOWIeN8LFcXoXnTzWaV/EB6SqIgmHSgqJQUA1JuR2OEuLLh8fK5iScX2 3PTg== X-Gm-Message-State: AEkoouvaNTZQZgnBnOBXY6Wiv9Js2QRSyCA5hXoyaod6OwUBbufMHMYNdNosbR3N//ya8w== X-Received: by 10.195.18.170 with SMTP id gn10mr34278838wjd.46.1469718286465; Thu, 28 Jul 2016 08:04:46 -0700 (PDT) Received: from tuborg (AMarseille-655-1-729-119.w92-150.abo.wanadoo.fr. [92.150.126.119]) by smtp.gmail.com with ESMTPSA id i8sm12697304wmg.21.2016.07.28.08.04.45 (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 28 Jul 2016 08:04:45 -0700 (PDT) Sender: Olivier Duchateau Date: Thu, 28 Jul 2016 17:01:32 +0000 From: Olivier Duchateau To: Jan Beich Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: Re: svn commit: r419205 - in branches/2016Q3/www: webkit-gtk2 webkit-gtk2/files webkit-gtk3 webkit-gtk3/files Message-Id: <20160728170132.f2e4c8735e66df4124d2a6f8@freebsd.org> In-Reply-To: <201607280250.u6S2oStk027070@repo.freebsd.org> References: <201607280250.u6S2oStk027070@repo.freebsd.org> X-Mailer: Sylpheed 3.5.0 (GTK+ 2.24.29; i386-portbld-freebsd9.3) Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Jul 2016 15:04:49 -0000 On Thu, 28 Jul 2016 02:50:28 +0000 (UTC) Jan Beich 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 > 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 > 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@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