From 3b08f674e3f771b49370edb144dab0958c8cf721 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 31 Aug 2021 08:59:54 +0100 Subject: gentoo resync : 31.08.2021 --- x11-terms/zutty/Manifest | 5 ++-- x11-terms/zutty/files/zutty-0.8-gcc11.patch | 24 --------------- .../zutty/files/zutty-0.9-freetype-2.11.0.patch | 35 ++++++++++++++++++++++ x11-terms/zutty/zutty-0.8.ebuild | 32 -------------------- x11-terms/zutty/zutty-0.9-r1.ebuild | 35 ++++++++++++++++++++++ 5 files changed, 72 insertions(+), 59 deletions(-) delete mode 100644 x11-terms/zutty/files/zutty-0.8-gcc11.patch create mode 100644 x11-terms/zutty/files/zutty-0.9-freetype-2.11.0.patch delete mode 100644 x11-terms/zutty/zutty-0.8.ebuild create mode 100644 x11-terms/zutty/zutty-0.9-r1.ebuild (limited to 'x11-terms/zutty') diff --git a/x11-terms/zutty/Manifest b/x11-terms/zutty/Manifest index 2eb1e363ac67..a40e700430c9 100644 --- a/x11-terms/zutty/Manifest +++ b/x11-terms/zutty/Manifest @@ -1,6 +1,5 @@ -AUX zutty-0.8-gcc11.patch 517 BLAKE2B 0d8432a219e20b985f13e75814440640c0a83f3a92df313aad8cc3f6091b3e5f3d503f87b9d48574e88ae64206b9e0b1434166c125a46dc669de02bdf2b13ad3 SHA512 7b3167d6643dc7672c5aa2ab1215c73af6b9e7c1072a012810d45defcb2362535bb2b8b88bef321cad28e6efe130811e3d314da0a1f795ba4a748c1011381dac -DIST zutty-0.8.tar.gz 307235 BLAKE2B 897fea3735785ba1e8c811adbc90b96598c04f3ec19d9d3027745e5b9d3c1d21c55343b9409e48327139545e2675346be90d84af422d3ce97b1737cc287bb96b SHA512 75c5637fe8f0c8aff41e394a05f304f56bf03faf1dfa78807ca930a722536a93f54012f051f411b4e8ff478dd991f5b8ca1285fcd674879eac568c8971004317 +AUX zutty-0.9-freetype-2.11.0.patch 1072 BLAKE2B 91b443535e432304c80df2fa91995eccac32bdc2e1c6bb95f55450b57b72789cc50f485c0c4376db32425481d17793985b4ebdeeb4093dd68d4323f9cc2dc04b SHA512 df7a4da6367a05d15dfd8dbe03ee59d01d385600b96798761202016e014e881271dce6e596a2fae2e155793e25b4743bda43ceb1a52d08eb6c327886b02b8180 DIST zutty-0.9.tar.gz 336534 BLAKE2B 61d2ae02e2c0b08a9c536190f61f14300b0cd1bacb83f5da33e92a6c8502df6adda72805e58f3d679c7258c30338178b4488c0f7bfbfaf8b5e922401e6442427 SHA512 590cf090c0d80e683d4473828cdb8bbe4f60bc5bc3c5e9e63039a59757e281ecefc774709f08777fe36ab596fb102f392c8bf643449e62914e5b88d0ebc728c0 -EBUILD zutty-0.8.ebuild 734 BLAKE2B 6a1f930a041b6431556ccc3bdb764dd773a7b1df1c46e1dd6125c8c4cbf4807b59ee081762b277f4f4986394ee0555949ed6c4827b0374904a759eeca58a2dd0 SHA512 7d5de7d3092a84104b49e77908e3475d4316eefbc4f3932334cf3fbc4477524366cfece3f8938633650c6c599904f19d7b19c67c574990ad98d9ed86f4f9315f +EBUILD zutty-0.9-r1.ebuild 758 BLAKE2B 5aff0a097a3c6c0fe046033b1a4af0a9168b68dff979a78b244588c47e4a9e59911677f31729edfa6232804acf91942dc176512daceb41afee74d840b8f78dbd SHA512 6a7c06d5a0923c8fdfa38bbd2bedab753ff5e1f1d0d73d88aff8f2e2f3113f7f0731217fe2c3f3c6716a267e425ccef8806d9b84fb9bdd0a45fc840596054f40 EBUILD zutty-0.9.ebuild 684 BLAKE2B ebc469725ac2ed634719b3346d533341fc81f71a7435903f1339f73bc84b54e22c702153af170ffb77d42a6b2bf19bef5b18743dbaa8ea0a4969b0736d48d915 SHA512 20f0d3cdb20e309dd39b621a9142444a05c63534b53f2dc03a0d6ae85752449d3383e87d5b34db86b3458dbd4fab28dd80c1456f33dcac55cbf7c3e954c342e8 MISC metadata.xml 1156 BLAKE2B 86e49541468db22123cd56f6aee08e61e6e79daddb817a11bf549b7c50cbcf5ed165316772c726caf7aaa0dc1321753ec3cd36eb25d88fad4216520827ad59e2 SHA512 3caa4dbda104f1fc1ab8326e40de573d2d8ba445c3a1002dd5c24d64d2bba9c5808addae2508d267497d80d90cd0cf285244a9874f9a31f62175f3c77adfadc5 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 75b8234d24bf..000000000000 --- 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/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 000000000000..b5d62204e6be --- /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.8.ebuild b/x11-terms/zutty/zutty-0.8.ebuild deleted file mode 100644 index e4986f621853..000000000000 --- 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 ) 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 000000000000..cdf1da5f9cd0 --- /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 ) -- cgit v1.2.3