[gentoo-commits] repo/gentoo:master commit in: x11-terms/zutty/files/, x11-terms/zutty/
commit: 556a1f65d35ad0877383b4958f0099715d22b3de
Author: Matthew Smith gentoo org>
AuthorDate: Sat May 21 09:10:20 2022 +
Commit: Matthew Smith gentoo org>
CommitDate: Sat May 21 09:10:20 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=556a1f65
x11-terms/zutty: add 0.12
Signed-off-by: Matthew Smith gentoo.org>
x11-terms/zutty/Manifest| 1 +
x11-terms/zutty/files/zutty-0.12-cxxflags.patch | 27
x11-terms/zutty/zutty-0.12.ebuild | 41 +
3 files changed, 69 insertions(+)
diff --git a/x11-terms/zutty/Manifest b/x11-terms/zutty/Manifest
index dda55cd631d9..b6740d9b6972 100644
--- a/x11-terms/zutty/Manifest
+++ b/x11-terms/zutty/Manifest
@@ -1 +1,2 @@
DIST zutty-0.11.tar.gz 343469 BLAKE2B
9cd040e72d0ea76a526d099265b3a0974d40b1b8b679ff3baafc47f827b140943ac8bc13676831245e219ca1335ded7aca1e7826baf175fc63e88012791785e1
SHA512
84e8402a310adc80c698ded38fa3eb8ba44034f391e2538bccbdbc4082e239dc0d6ceb20504eeab4e5d2499ded55ef0941ae2e5d07eeb809d1059e5449cdb708
+DIST zutty-0.12.tar.gz 348226 BLAKE2B
8d065928fe3e8049e63f1e679d4e8d2ef6643b01b098698594d536c6fa9494a2a934dce3e4fe60594be4f1b56691a83a8e7fab0dd1ec6c09e12eeb1e69354f5e
SHA512
d10289a51469ec6352a5b1feefb732dce7cf507b02ce57e64f8f65443f4533b8d61f357dec92cb00b58386416470928d763290a6d4ff714f65f98f1f09d60083
diff --git a/x11-terms/zutty/files/zutty-0.12-cxxflags.patch
b/x11-terms/zutty/files/zutty-0.12-cxxflags.patch
new file mode 100644
index ..11b3066e50ba
--- /dev/null
+++ b/x11-terms/zutty/files/zutty-0.12-cxxflags.patch
@@ -0,0 +1,27 @@
+From 06927a1f2f88bd9d5f4bb8056661ffbc4a0aeb77 Mon Sep 17 00:00:00 2001
+From: Matthew Smith
+Date: Wed, 19 Jan 2022 18:07:55 +
+Subject: [PATCH] Remove default CXXFLAGS and LINKFLAGS
+
+---
+ wscript | 4
+ 1 file changed, 4 deletions(-)
+
+diff --git a/wscript b/wscript
+index d2bfbc8..b38b50b 100644
+--- a/wscript
b/wscript
+@@ -69,10 +69,6 @@ def configure(cfg):
+['-DDEBUG', '-Og', '-g', '-ggdb'])
+ else:
+ cfg.env.target = 'zutty'
+-cfg.env.append_value('CXXFLAGS',
+- ['-Werror', '-O3', '-flto'])
+-cfg.env.append_value('LINKFLAGS',
+- ['-flto'])
+
+ cfg.check_cfg(package='freetype2', args=['--cflags', '--libs'],
+ uselib_store='FT')
+--
+2.34.1
+
diff --git a/x11-terms/zutty/zutty-0.12.ebuild
b/x11-terms/zutty/zutty-0.12.ebuild
new file mode 100644
index ..10690f8057ce
--- /dev/null
+++ b/x11-terms/zutty/zutty-0.12.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit python-any-r1 waf-utils
+
+DESCRIPTION="X terminal emulator rendering through OpenGL ES Compute Shaders"
+HOMEPAGE="https://tomscii.sig7.se/zutty/ https://github.com/tomszilagyi/zutty;
+SRC_URI="https://github.com/tomszilagyi/zutty/archive/refs/tags/${PV}.tar.gz
-> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# It is possible to run the tests using virtualx, but it seems to take
+# screenshots of the terminal window, and compares checksums that never
+# seem to match.
+RESTRICT="test"
+
+RDEPEND="
+ media-libs/freetype:2
+ virtual/opengl
+ x11-libs/libX11
+ x11-libs/libXmu
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ ${PYTHON_DEPS}
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ # Remove default CXX/LDFLAGS, bug #830405.
+ "${FILESDIR}"/${PN}-0.12-cxxflags.patch
+)
+
+DOCS=( doc/KEYS.org doc/USAGE.org )
[gentoo-commits] repo/gentoo:master commit in: x11-terms/zutty/files/, x11-terms/zutty/
commit: 28d1808fb59e77300673c7374efe1db06ae0221c
Author: Joonas Niilola gentoo org>
AuthorDate: Fri Jan 21 06:33:52 2022 +
Commit: Joonas Niilola gentoo org>
CommitDate: Fri Jan 21 06:33:52 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28d1808f
x11-terms/zutty: move .patch file under FILESDIR
Signed-off-by: Joonas Niilola gentoo.org>
x11-terms/zutty/{ => files}/zutty-0.11-cxxflags.patch | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/x11-terms/zutty/zutty-0.11-cxxflags.patch
b/x11-terms/zutty/files/zutty-0.11-cxxflags.patch
similarity index 100%
rename from x11-terms/zutty/zutty-0.11-cxxflags.patch
rename to x11-terms/zutty/files/zutty-0.11-cxxflags.patch
[gentoo-commits] repo/gentoo:master commit in: x11-terms/zutty/files/, x11-terms/zutty/
commit: 10cc462e684d5aa4b10e1f39d09849401e01f971
Author: Matt Smith offtopica uk>
AuthorDate: Sun Aug 29 17:26:00 2021 +
Commit: Sam James gentoo org>
CommitDate: Sun Aug 29 18:33:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10cc462e
x11-terms/zutty: Compatibility with >=media-libs/freetype-2.11.0
Closes: https://bugs.gentoo.org/809611
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Matt Smith offtopica.uk>
Closes: https://github.com/gentoo/gentoo/pull/22150
Signed-off-by: Sam James gentoo.org>
.../zutty/files/zutty-0.9-freetype-2.11.0.patch| 35 ++
x11-terms/zutty/zutty-0.9-r1.ebuild| 35 ++
2 files changed, 70 insertions(+)
diff --git a/x11-terms/zutty/files/zutty-0.9-freetype-2.11.0.patch
b/x11-terms/zutty/files/zutty-0.9-freetype-2.11.0.patch
new file mode 100644
index 000..b5d62204e6b
--- /dev/null
+++ b/x11-terms/zutty/files/zutty-0.9-freetype-2.11.0.patch
@@ -0,0 +1,35 @@
+From c73c99d6b024047d9f9e53e263be56093b6bf986 Mon Sep 17 00:00:00 2001
+From: Matt Smith
+Date: Sun, 29 Aug 2021 19:15:01 +0100
+Subject: [PATCH] Prevent rendering glyphs twice
+
+Characters are loaded with FT_LOAD_RENDER. Calling FT_Render_Glyph
+again causes an error in Freetype 2.11.0 and later.
+
+Thanks to Stephan Hartmann for debugging and creating
initial patch.
+
+Bug: https://bugs.gentoo.org/809611
+---
+ src/font.cc | 6 --
+ 1 file changed, 6 deletions(-)
+
+diff --git a/src/font.cc b/src/font.cc
+index f8da582..350a1a6 100644
+--- a/src/font.cc
b/src/font.cc
+@@ -255,12 +255,6 @@ namespace zutty
+ std::to_string (c));
+ }
+
+- if (FT_Render_Glyph (face->glyph, FT_RENDER_MODE_NORMAL))
+- throw std::runtime_error (
+-std::string ("FreeType: Failed to render glyph for char ") +
+-std::to_string (c));
+-
+-
+ // destination pixel offset
+ const unsigned int dx = face->glyph->bitmap_left > 0
+ ? face->glyph->bitmap_left : 0;
+--
+2.33.0
+
diff --git a/x11-terms/zutty/zutty-0.9-r1.ebuild
b/x11-terms/zutty/zutty-0.9-r1.ebuild
new file mode 100644
index 000..fdcb77c3890
--- /dev/null
+++ b/x11-terms/zutty/zutty-0.9-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit python-any-r1 waf-utils
+
+DESCRIPTION="X terminal emulator rendering through OpenGL ES Compute Shaders"
+HOMEPAGE="https://tomscii.sig7.se/zutty/ https://github.com/tomszilagyi/zutty;
+SRC_URI="https://github.com/tomszilagyi/zutty/archive/refs/tags/${PV}.tar.gz
-> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+ media-libs/freetype:2
+ media-libs/libglvnd[X]
+ x11-libs/libXmu
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ ${PYTHON_DEPS}
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ # Bug 809611
+ "${FILESDIR}"/${PN}-0.9-freetype-2.11.0.patch
+)
+
+DOCS=( doc/KEYS.org doc/USAGE.org )
[gentoo-commits] repo/gentoo:master commit in: x11-terms/zutty/files/, x11-terms/zutty/
commit: e73c5d792dbf6599283ea1462d68826a2b012729
Author: Matt Smith offtopica uk>
AuthorDate: Sun Aug 29 17:21:35 2021 +
Commit: Sam James gentoo org>
CommitDate: Sun Aug 29 18:32:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e73c5d79
x11-terms/zutty: Drop old
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Matt Smith offtopica.uk>
Signed-off-by: Sam James gentoo.org>
x11-terms/zutty/Manifest| 1 -
x11-terms/zutty/files/zutty-0.8-gcc11.patch | 24 --
x11-terms/zutty/zutty-0.8.ebuild| 32 -
3 files changed, 57 deletions(-)
diff --git a/x11-terms/zutty/Manifest b/x11-terms/zutty/Manifest
index 71b171d7f87..b5a3a8ba9dc 100644
--- a/x11-terms/zutty/Manifest
+++ b/x11-terms/zutty/Manifest
@@ -1,2 +1 @@
-DIST zutty-0.8.tar.gz 307235 BLAKE2B
897fea3735785ba1e8c811adbc90b96598c04f3ec19d9d3027745e5b9d3c1d21c55343b9409e48327139545e2675346be90d84af422d3ce97b1737cc287bb96b
SHA512
75c5637fe8f0c8aff41e394a05f304f56bf03faf1dfa78807ca930a722536a93f54012f051f411b4e8ff478dd991f5b8ca1285fcd674879eac568c8971004317
DIST zutty-0.9.tar.gz 336534 BLAKE2B
61d2ae02e2c0b08a9c536190f61f14300b0cd1bacb83f5da33e92a6c8502df6adda72805e58f3d679c7258c30338178b4488c0f7bfbfaf8b5e922401e6442427
SHA512
590cf090c0d80e683d4473828cdb8bbe4f60bc5bc3c5e9e63039a59757e281ecefc774709f08777fe36ab596fb102f392c8bf643449e62914e5b88d0ebc728c0
diff --git a/x11-terms/zutty/files/zutty-0.8-gcc11.patch
b/x11-terms/zutty/files/zutty-0.8-gcc11.patch
deleted file mode 100644
index 75b8234d24b..000
--- a/x11-terms/zutty/files/zutty-0.8-gcc11.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 75bffab09e842bfff56a6cf111360421a5ee9e15 Mon Sep 17 00:00:00 2001
-From: Matt Smith
-Date: Thu, 29 Apr 2021 19:23:00 +0100
-Subject: [PATCH] Add missing include to fix GCC 11 build
-
- src/font.cc | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/font.cc b/src/font.cc
-index 0dd2166..f8da582 100644
a/src/font.cc
-+++ b/src/font.cc
-@@ -15,6 +15,7 @@
-
- #include
- #include
-+#include
- #include
- #include
- #include
---
-2.31.1
-
diff --git a/x11-terms/zutty/zutty-0.8.ebuild b/x11-terms/zutty/zutty-0.8.ebuild
deleted file mode 100644
index e4986f62185..000
--- a/x11-terms/zutty/zutty-0.8.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit python-any-r1 waf-utils
-
-DESCRIPTION="X terminal emulator rendering through OpenGL ES Compute Shaders"
-HOMEPAGE="https://tomscii.sig7.se/zutty/ https://github.com/tomszilagyi/zutty;
-SRC_URI="https://github.com/tomszilagyi/zutty/archive/refs/tags/${PV}.tar.gz
-> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
- media-libs/freetype:2
- media-libs/libglvnd[X]
- x11-libs/libXmu
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- ${PYTHON_DEPS}
- virtual/pkgconfig
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.8-gcc11.patch )
-
-DOCS=( doc/KEYS.org doc/USAGE.org )
