diff options
| author | Liguros - Gitlab CI/CD [master] <gitlab@liguros.net> | 2021-01-17 23:35:33 +0000 |
|---|---|---|
| committer | Liguros - Gitlab CI/CD [master] <gitlab@liguros.net> | 2021-01-17 23:35:33 +0000 |
| commit | 8e8120eabdd28020aa69c7a60505cce2edd20adc (patch) | |
| tree | 061bf0acdc672720e0bc3a2d575f67d25aedb2d8 /dev-vcs/git-cola | |
| parent | c16790af2c9b4cbc38e565d4311252193ff85484 (diff) | |
| download | baldeagleos-repo-21.1.2.tar.gz baldeagleos-repo-21.1.2.tar.xz baldeagleos-repo-21.1.2.zip | |
Updating liguros repo21.1.2
Diffstat (limited to 'dev-vcs/git-cola')
| -rw-r--r-- | dev-vcs/git-cola/files/git-cola-3.5-py3.8-line-buffering.patch | 29 | ||||
| -rw-r--r-- | dev-vcs/git-cola/git-cola-3.5-r1.ebuild | 8 |
2 files changed, 36 insertions, 1 deletions
diff --git a/dev-vcs/git-cola/files/git-cola-3.5-py3.8-line-buffering.patch b/dev-vcs/git-cola/files/git-cola-3.5-py3.8-line-buffering.patch new file mode 100644 index 000000000000..4938d6a30eca --- /dev/null +++ b/dev-vcs/git-cola/files/git-cola-3.5-py3.8-line-buffering.patch @@ -0,0 +1,29 @@ +From ed00653d43b00b18e89c8c4d9e733ef156c02579 Mon Sep 17 00:00:00 2001 +From: Simon Peeters <peeters.simon@gmail.com> +Date: Mon, 18 Nov 2019 21:15:32 +0100 +Subject: [PATCH] Only use line buffering in text mode when calling Popen + +Python3.8 started complaining loudly when trying to open a stream in binary mode but with line buffering enabled. +So we should only try to set `bufsize` to `1` when we enable `text` or `universal_newlines` mode. + +see https://docs.python.org/3/library/subprocess.html#subprocess.Popen under bufsize +--- + cola/core.py | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/cola/core.py b/cola/core.py +index 0fabfcf3d..5ad719f05 100644 +--- a/cola/core.py ++++ b/cola/core.py +@@ -208,7 +208,10 @@ def start_command(cmd, cwd=None, add_env=None, + CREATE_NO_WINDOW = 0x08000000 + extra['creationflags'] = CREATE_NO_WINDOW + +- return subprocess.Popen(cmd, bufsize=1, stdin=stdin, stdout=stdout, ++ # Use line buffering when in text/universal_newlines mode, ++ # otherwise use the system default buffer size. ++ bufsize = 1 if universal_newlines else -1 ++ return subprocess.Popen(cmd, bufsize=bufsize, stdin=stdin, stdout=stdout, + stderr=stderr, cwd=cwd, env=env, + universal_newlines=universal_newlines, **extra) + diff --git a/dev-vcs/git-cola/git-cola-3.5-r1.ebuild b/dev-vcs/git-cola/git-cola-3.5-r1.ebuild index 03ac69978998..46a2a07b29a3 100644 --- a/dev-vcs/git-cola/git-cola-3.5-r1.ebuild +++ b/dev-vcs/git-cola/git-cola-3.5-r1.ebuild @@ -5,6 +5,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{6,7,8,9,10} ) DISTUTILS_SINGLE_IMPL=true +DISTUTILS_USE_SETUPTOOLS=no inherit distutils-r1 readme.gentoo-r1 virtualx xdg-utils DESCRIPTION="The highly caffeinated git GUI" @@ -13,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 x86" IUSE="doc test" RESTRICT="!test? ( test )" @@ -37,6 +38,8 @@ BDEPEND="sys-devel/gettext ) ")" +PATCHES=( "${FILESDIR}/${P}-py3.8-line-buffering.patch" ) + python_prepare_all() { # make sure that tests also use the system provided QtPy rm -r qtpy || die @@ -95,6 +98,9 @@ python_install_all() { python_fix_shebang "${ED}/usr/share/git-cola/bin/git-xbase" "${ED}"/usr/bin/git-cola python_optimize "${ED}/usr/share/git-cola/lib/cola" + # fix appdata installation + mv "${D}"/usr/share/appdata "${D}"/usr/share/metainfo || die "moving appdata failed" + use doc || HTML_DOCS=( "${FILESDIR}"/index.html ) distutils-r1_python_install_all |