From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3FE20138350 for ; Mon, 20 Jan 2020 13:03:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6EF88E0952; Mon, 20 Jan 2020 13:03:28 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 48CBFE0952 for ; Mon, 20 Jan 2020 13:03:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0A44734E30C for ; Mon, 20 Jan 2020 13:03:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8FE5DEE for ; Mon, 20 Jan 2020 13:03:23 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1579525390.e5106d923c2d796469a4da6e0e8d5524cf958126.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/gegl/files/, media-libs/gegl/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/gegl/files/gegl-0.4.18-cltostring_force_utf8.patch media-libs/gegl/gegl-0.4.18.ebuild X-VCS-Directories: media-libs/gegl/ media-libs/gegl/files/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: e5106d923c2d796469a4da6e0e8d5524cf958126 X-VCS-Branch: master Date: Mon, 20 Jan 2020 13:03:23 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c1e8149b-bdc5-4e06-af6f-f7728184f0f6 X-Archives-Hash: c9c2b1745d87f6a9a359b6a92a078fd9 commit: e5106d923c2d796469a4da6e0e8d5524cf958126 Author: band-a-prend yandex ru> AuthorDate: Sun Jan 19 07:02:27 2020 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Mon Jan 20 13:03:10 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5106d92 media-libs/gegl: Fix compilation error due to non-ascii symbols This patch force using utf8 while reading files on converting .cl files to .h files in env where for some reasons sandbox system codepage isn't utf8. The patch provides compatibility both with python2.7 and python3.x. When python2.7 support will be dropped the addition of from __future__ import unicode_literals import io and "io." could be removed as not neccessary for python3.x. Closes: https://bugs.gentoo.org/705286 Signed-off-by: Sergey Torokhov yandex.ru> Closes: https://github.com/gentoo/gentoo/pull/14387 Signed-off-by: Joonas Niilola gentoo.org> .../files/gegl-0.4.18-cltostring_force_utf8.patch | 30 ++++++++++++++++++++++ media-libs/gegl/gegl-0.4.18.ebuild | 5 ++-- 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/media-libs/gegl/files/gegl-0.4.18-cltostring_force_utf8.patch b/media-libs/gegl/files/gegl-0.4.18-cltostring_force_utf8.patch new file mode 100644 index 00000000000..ecb1be4c735 --- /dev/null +++ b/media-libs/gegl/files/gegl-0.4.18-cltostring_force_utf8.patch @@ -0,0 +1,30 @@ +--- a/opencl/cltostring.py 2019-10-27 02:01:07.000000000 +0300 ++++ b/opencl/cltostring.py 2020-01-12 21:22:25.000000000 +0300 +@@ -1,8 +1,10 @@ + #!/usr/bin/env python + from __future__ import print_function ++from __future__ import unicode_literals + + import os + import sys ++import io + + # Search for lines that look like #include "blah.h" and replace them + # with the contents of blah.h. +@@ -34,12 +36,12 @@ + + + if len(sys.argv) == 2: +- infile = open(sys.argv[1], "r") +- outfile = open(sys.argv[1] + '.h', "w") ++ infile = io.open(sys.argv[1], "r", encoding="utf-8") ++ outfile = io.open(sys.argv[1] + '.h', "w", encoding="utf-8") + + elif len(sys.argv) == 3: +- infile = open(sys.argv[1], "r") +- outfile = open(sys.argv[2], "w") ++ infile = io.open(sys.argv[1], "r", encoding="utf-8") ++ outfile = io.open(sys.argv[2], "w", encoding="utf-8") + + else: + print("Usage: %s input [output]" % sys.argv[0]) diff --git a/media-libs/gegl/gegl-0.4.18.ebuild b/media-libs/gegl/gegl-0.4.18.ebuild index f2c662e0cba..56b18bcd87a 100644 --- a/media-libs/gegl/gegl-0.4.18.ebuild +++ b/media-libs/gegl/gegl-0.4.18.ebuild @@ -82,9 +82,10 @@ BDEPEND=" DOCS=( AUTHORS docs/ChangeLog docs/NEWS.txt ) PATCHES=( - "${FILESDIR}"/${PN}-0.4.18-drop-failing-tests.patch - "${FILESDIR}"/${PN}-0.4.18-program-suffix.patch + "${FILESDIR}"/${P}-drop-failing-tests.patch + "${FILESDIR}"/${P}-program-suffix.patch "${FILESDIR}"/${P}-meson_cpu_detection.patch + "${FILESDIR}"/${P}-cltostring_force_utf8.patch ) python_check_deps() {