From nobody Fri Mar 25 13:44:42 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 896BF1A2D7C3; Fri, 25 Mar 2022 13:44:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KQ3HG5W7Fz3MMr; Fri, 25 Mar 2022 13:44:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648215882; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J1tZCVXrgtwZhKYUpdHEH6aRX5vozvlNM8dxU9bX8zk=; b=UcOB3Zz5ynLt1Drsv083Bw10Gtf9f/+c0a5z+KImhxgKs2D3/QuYGntg8wSRvMP4f6lNCO 3UqmM4+eduLS8vix0SOkS5uODRqYoSj8DbWok2e/B49FEM7OTWfZql6tg/EbFUaiuCpYz/ VDT4LbR3BtBu4wKvGIESXVtg5zy7lzUpxfw378Y7wVk7S8295TB1VVCm9GOx9yR5GTe9RH MZgZZD3+kMWwJgee/Qq9mWCgrMT7xlDPuT3xSzGRiZ5vq2wKQaqWpOgj+I+gIZe+hycMeV r59out6jrmqGOzrGYu6dYwXbmjR7fbwAPLBEM3VPgys6kDfmlX5NQNjmJccEgg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3AC8E569D; Fri, 25 Mar 2022 13:44:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22PDigZe021071; Fri, 25 Mar 2022 13:44:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22PDigHK021070; Fri, 25 Mar 2022 13:44:42 GMT (envelope-from git) Date: Fri, 25 Mar 2022 13:44:42 GMT Message-Id: <202203251344.22PDigHK021070@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 677595a691d1 - main - graphics/py-pycha: Fix build with setuptools 58.0.0+ List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 677595a691d1a58c114bbc4455eafec56d427a2f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648215882; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J1tZCVXrgtwZhKYUpdHEH6aRX5vozvlNM8dxU9bX8zk=; b=VcNnTDrttJ2y0n2ltJrw5C+cG4Zd91fmorHHFQANBrlFjMujFwSPfstv9sdMePhn14xVZH 5lF0aiu81bqiIoX/GBU6aVY0EQYOaG4xoqDlF6rWO9EyEVuNYv9GPgIxOoVJqO4B5IXHYO FyY8lBOlixxap4u0BWCF3SkfPVDfjiBCFDrCMqu7lOl1arjd/Yde4oMZbURqIPxfWtfkif CsYfWoTztdw2xzHt6dmajQ9cr8Lvw7dk6TglUVwt5pRbdorJ2/06kVdNKCWh+mEAqJJxtM xY5bfp0c5hLPbDYtXEBgQifWTRGiW1oeu40fUZ6T105vdayIh8UurfTVtotmyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648215882; a=rsa-sha256; cv=none; b=JhIzfuFQzZSvhYawIz308RTbzmlXb36Y7uDHT6KZO8LKQoHZ45ubzIgtpQt2q3szOsWAK3 0GCRiXZQlYa6TF/ewTHWVuLnvHqPhR+fe6JAFF6ITZXzV48Cn8NgMfl1DujtN2plUwSLbR L0NAzicm1sc14PKYQscvVzcxPRfCRr3L4fqqkhnCECJD35l1GYjZyFt9b90FRW9fXxD3V/ Ig/dVfP3+Jy0gU/8UXlGp/iDNMCfHjfnbE0Dlmsk8kmC1Ks1d9e0lVi+hTjHcp16xGQ+5l zfwHvYxvFvgwGlnUO33acc+9e7RbsFY2khQIP2iTburUf6uCsoN9renKU0MI4g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=677595a691d1a58c114bbc4455eafec56d427a2f commit 677595a691d1a58c114bbc4455eafec56d427a2f Author: Po-Chuan Hsieh AuthorDate: 2022-03-25 13:00:24 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-03-25 13:37:05 +0000 graphics/py-pycha: Fix build with setuptools 58.0.0+ --- graphics/py-pycha/files/patch-2to3 | 104 +++++++++++++++++++++++++++++++++++++ 1 file changed, 104 insertions(+) diff --git a/graphics/py-pycha/files/patch-2to3 b/graphics/py-pycha/files/patch-2to3 new file mode 100644 index 000000000000..be83c43ce2a1 --- /dev/null +++ b/graphics/py-pycha/files/patch-2to3 @@ -0,0 +1,104 @@ +--- chavier/gui.py.orig 2011-08-08 19:23:18 UTC ++++ chavier/gui.py +@@ -37,7 +37,7 @@ class GUI(object): + self.main_window.connect('delete_event', self.delete_event) + self.main_window.connect('destroy', self.destroy) + self.main_window.set_default_size(640, 480) +- self.main_window.set_title(u'Chavier') ++ self.main_window.set_title('Chavier') + + vbox = gtk.VBox() + self.main_window.add(vbox) +@@ -59,7 +59,7 @@ class GUI(object): + hpaned.add1(vpaned) + vpaned.show() + +- block1 = self._create_sidebar_block(u'Data sets', ++ block1 = self._create_sidebar_block('Data sets', + self._datasets_notebook_creator) + self._create_dataset("Dataset 1") + block1.set_size_request(-1, 200) +@@ -67,7 +67,7 @@ class GUI(object): + vpaned.add1(block1) + block1.show() + +- block2 = self._create_sidebar_block(u'Options', ++ block2 = self._create_sidebar_block('Options', + self._options_treeview_creator) + vpaned.add2(block2) + block2.show() +@@ -215,7 +215,7 @@ class GUI(object): + box = gtk.VBox(spacing=6) + box.set_border_width(6) + label = gtk.Label() +- label.set_markup(u'%s' % title) ++ label.set_markup('%s' % title) + label.set_alignment(0.0, 0.5) + box.pack_start(label, False, False) + label.show() +@@ -276,7 +276,7 @@ class GUI(object): + return scrolled_window + + def _fill_options_store(self, options, parent_node, types): +- for name, value in options.items(): ++ for name, value in list(options.items()): + value_type = types[name] + if isinstance(value, dict): + current_parent = self.options_store.append(parent_node, +@@ -356,7 +356,7 @@ class GUI(object): + parent = model.iter_parent(parent) + parents.reverse() + parents.append(name) +- label = u'.'.join(parents) ++ label = '.'.join(parents) + + dialog = OptionDialog(self.main_window, label, value, value_type) + response = dialog.run() +@@ -408,7 +408,7 @@ class GUI(object): + + def add_dataset(self, action): + n_pages = self.datasets_notebook.get_n_pages() +- suggested_name = u'Dataset %d' % (n_pages + 1) ++ suggested_name = 'Dataset %d' % (n_pages + 1) + dialog = TextInputDialog(self.main_window, suggested_name) + response = dialog.run() + if response == gtk.RESPONSE_ACCEPT: +@@ -523,18 +523,18 @@ class GUI(object): + + alloc = self.drawing_area.get_allocation() + +- print 'CHART STATE' +- print '-' * 70 +- print 'surface: %d x %d' % (alloc.width, alloc.height) +- print 'area :', self.chart.area +- print +- print 'minxval:', self.chart.minxval +- print 'maxxval:', self.chart.maxxval +- print 'xrange :', self.chart.xrange +- print +- print 'minyval:', self.chart.minyval +- print 'maxyval:', self.chart.maxyval +- print 'yrange :', self.chart.yrange ++ print('CHART STATE') ++ print('-' * 70) ++ print('surface: %d x %d' % (alloc.width, alloc.height)) ++ print('area :', self.chart.area) ++ print() ++ print('minxval:', self.chart.minxval) ++ print('maxxval:', self.chart.maxxval) ++ print('xrange :', self.chart.xrange) ++ print() ++ print('minyval:', self.chart.minyval) ++ print('maxyval:', self.chart.maxyval) ++ print('yrange :', self.chart.yrange) + + def about(self, action=None): + dialog = AboutDialog(self.main_window) +@@ -556,6 +556,6 @@ str_converters = { + str: str, + int: int, + float: float, +- unicode: unicode, ++ str: str, + bool: str2bool, + }