diff options
Diffstat (limited to 'x11-terms')
17 files changed, 74 insertions, 398 deletions
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz Binary files differindex 7afb9b5618f2..823e0d1ef5c1 100644 --- a/x11-terms/Manifest.gz +++ b/x11-terms/Manifest.gz diff --git a/x11-terms/lilyterm/Manifest b/x11-terms/lilyterm/Manifest index 878b1a2472e5..7810edbe2ea6 100644 --- a/x11-terms/lilyterm/Manifest +++ b/x11-terms/lilyterm/Manifest @@ -2,6 +2,6 @@ AUX lilyterm-0.9.9.4-autogen.patch 230 BLAKE2B e1fe8cfc6e7efb174910a716043fcb86b AUX lilyterm-0.9.9.4-gettext.patch 246 BLAKE2B 2061244d1e51659e78a55880111463a7fb54b121fca4a32a6e1b56ea2a1a74d8c0c158554a0ef6dea6f4d020cfc584e87b028d09631ec193b58a266583a66cf6 SHA512 94308160a63482d3c07f5baac819111958e7d3e6ddb10318671a30db866a18756b59ccc79e7ea866864c520865c24dd0f3e3920aa3e4259e2accf2dce05219f1 AUX lilyterm-99999-autogen.patch 927 BLAKE2B 3b057a1b2d0445bba467fb4ef227fc2d9969d82a7e05b64d56a133b5991d78b17d2a2abdac4bd805d85a46aeea534af057daf5293af0f571b26acd543afcf74b SHA512 310de428a085f9307f69ba1f23e4bf0fc72886ff9351527da8bee61293f2cbacd61ce7e866b4fa22b5153e7f13456d597382df66fd66e2b5ca087741da556e29 DIST lilyterm-0.9.9.4.tar.gz 346180 BLAKE2B 8e9a728760aa1435a3a4247659443e0a29c6ab5f129b2eaeb3c070c4ec8807024f35ee22d028d2400c110143b52ee008496fbd10e67052e73046d6cb6e130b3d SHA512 2fcd9d31a28d6bf9d953cd77b38cb3c67591dd04157f0efd418ce3ac9eab0f8090156435207c8bc18e619dda45e726f3346b1344f2d37fd308fa802476d3b5da -EBUILD lilyterm-0.9.9.4-r2.ebuild 677 BLAKE2B e17e40173218a922c725d6f79d720726db579648db1806fff513aa4e687695d71f96fcc2fec1b65d20efcdbc5f89197bf850c8780116887038e15dd3f39ecbc9 SHA512 a2fb76923975b71e22a911c0fe0bb2f5338745b835131393f9ef9ea35cf039f101d81608abf81f3f520de937c183f1321c8c50ec44b7a19dea023f7e69ff845f -EBUILD lilyterm-99999.ebuild 631 BLAKE2B 4ec61a17eb74756ae7946fa1d234db20104a8df37cfda6ae7c1f4fffe6f4edbccb72fec8fd969499ad334e83adcafeb2668daf5962a03fcd1bc90fc9866d7213 SHA512 a62bf2229dc006baf17e4da35254224dc6d81a31b7fc386efb73b5a2cd9caae9dae9dd19d51e9881fbb33e51fb7193eeae76c5ccb27168bb2ecfdf619dd4e149 -MISC metadata.xml 271 BLAKE2B d4782f6ba7c664109b22a91a47d23a240a7b3493b5f189372c4e42ca8b0e291eead5f2339a8f3ee7d84deab676b8aa4195f1f6d88dc16a10f412566ba1a59350 SHA512 3b6824a9fe5c11732577c4c5e35cd8c36b74090ca94d1027f90f1a8054a6bd75066c244e2d51489bce4af5980c9b6215c9e2b3fa5f11475685eaf19d82cc1d94 +EBUILD lilyterm-0.9.9.4-r2.ebuild 711 BLAKE2B 07b9c17624b81081d6ba26007cf86551c89bf1bade28979edb8b678e9746d1d401d1f7f13c241f29226f9daa3f41704d9c8311706021dd479f8f86f1b7474abe SHA512 2e5146b48682e9ad8c22fcabaa8d132989df6f20ade1096442f10f9beeb04d80cbed11c091fcb49d8feec0bd1c076113dcc58a5782f2ae4f13416df04a6d3009 +EBUILD lilyterm-99999.ebuild 665 BLAKE2B 5f42342fa93423c9cc01d79758e4101824594deb9a91d2d99845644671b041fecf107b0097280890eb7f70da813fb42fe401a4e779f7e8faa9a70e64533b911f SHA512 e07437e75eb3ee070e8688976a5ea9c8cbf6e3d0488eeb612d725a1ace1aed6f9f6b1f93aaafc3e3b3035cca04b7d432be168cac6ebbf3bb13a5fe0e3efb4ca4 +MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3 diff --git a/x11-terms/lilyterm/lilyterm-0.9.9.4-r2.ebuild b/x11-terms/lilyterm/lilyterm-0.9.9.4-r2.ebuild index 8221d88b0e3c..cf925772f572 100644 --- a/x11-terms/lilyterm/lilyterm-0.9.9.4-r2.ebuild +++ b/x11-terms/lilyterm/lilyterm-0.9.9.4-r2.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 inherit autotools DESCRIPTION="a terminal emulator based off of libvte that aims to be fast and lightweight" -HOMEPAGE="https://lilyterm.luna.com.tw" +HOMEPAGE="https://lilyterm.luna.com.tw https://github.com/Tetralet/LilyTerm" LICENSE="GPL-3" SRC_URI="https://${PN}.luna.com.tw/file/${P}.tar.gz" diff --git a/x11-terms/lilyterm/lilyterm-99999.ebuild b/x11-terms/lilyterm/lilyterm-99999.ebuild index 21280cce5b43..20ebf6b3d4c2 100644 --- a/x11-terms/lilyterm/lilyterm-99999.ebuild +++ b/x11-terms/lilyterm/lilyterm-99999.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 inherit autotools git-r3 DESCRIPTION="a terminal emulator based off of libvte that aims to be fast and lightweight" -HOMEPAGE="https://lilyterm.luna.com.tw" +HOMEPAGE="https://lilyterm.luna.com.tw https://github.com/Tetralet/LilyTerm" EGIT_REPO_URI="https://github.com/Tetralet/LilyTerm" SLOT="0" diff --git a/x11-terms/lilyterm/metadata.xml b/x11-terms/lilyterm/metadata.xml index 0cf800309878..115e9d64a669 100644 --- a/x11-terms/lilyterm/metadata.xml +++ b/x11-terms/lilyterm/metadata.xml @@ -1,8 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> -<email>desktop-misc@gentoo.org</email> -<name>Gentoo Desktop Miscellaneous Project</name> -</maintainer> + <!-- maintainer-needed --> </pkgmetadata> diff --git a/x11-terms/mate-terminal/Manifest b/x11-terms/mate-terminal/Manifest index adef50f67f92..96f61b52ec16 100644 --- a/x11-terms/mate-terminal/Manifest +++ b/x11-terms/mate-terminal/Manifest @@ -1,3 +1,3 @@ DIST mate-terminal-1.24.1.tar.xz 2032824 BLAKE2B d5c6e97fbb22550f8caf0042422ea9104b947f04e3dacb42bee4e6d1dcdbd59c8cb6765889ac86ea5850ac5ca293a9f796aa5c41d5e1707df2bb37670b3832f3 SHA512 83090667f823605ef0681efeff66c30729df83e7335c100171017ee5f2e819ec0bb219fdc71ed54a27c4a846fcc8db01c4462ef5b9c1e3f31d9c5838427566dc -EBUILD mate-terminal-1.24.1.ebuild 749 BLAKE2B a315f999ea9f7fcb20efe5392bd7bea96f9aa3a6ae5a5b5b0211aeb3a058a271b5cf31e1d77ff8fc141df2eb6d3bb39def4a4b5e681dc6ae9bada46569602357 SHA512 0c22e8a9a0b279af282ed50e71389fc85c25e603f3c59fc011aeab5e11c100f80900b79faaa0d09740551e239922c8e0d47543e1b28c3bd80c0a3197e618f964 +EBUILD mate-terminal-1.24.1.ebuild 756 BLAKE2B 9a4a58b9e8fe498a3b6107c4c0718c65bca822e2ac3e52c306e8e683db4993848ecc2ba14c67f8ea23dd33a5b4b313f0a5bf58a174b89fd118a763c902b15f79 SHA512 0267b4b6e42f211833478c5a72dd8b2dbedc4924c9a02951138d9bb55b610807803660a541f8ee9bf82ec4f058290c40ecef385a13a081f872b207d387a86d81 MISC metadata.xml 343 BLAKE2B a551b6d036d45f08c7a3c925b92a5ce2a7b17435b6df28d410abd318f21f08152aa31a70a6b477085777be36a410f1a1d8b1ca40ad95ebeb7afce2486eba6767 SHA512 ce620470e64f45c91502a26a9847cec26c71b4994a45a68a07cbf9f8f88a2d0586716005f3da729fa84941139269b7494d7c7ac6fb0449b627817f1d13037a08 diff --git a/x11-terms/mate-terminal/mate-terminal-1.24.1.ebuild b/x11-terms/mate-terminal/mate-terminal-1.24.1.ebuild index d93afe70cb32..af088b2a1eba 100644 --- a/x11-terms/mate-terminal/mate-terminal-1.24.1.ebuild +++ b/x11-terms/mate-terminal/mate-terminal-1.24.1.ebuild @@ -6,7 +6,7 @@ EAPI=6 inherit mate if [[ ${PV} != 9999 ]]; then - KEYWORDS="amd64 ~arm ~arm64 x86" + KEYWORDS="amd64 ~arm ~arm64 ~riscv x86" fi DESCRIPTION="The MATE Terminal" diff --git a/x11-terms/rxvt-unicode/Manifest b/x11-terms/rxvt-unicode/Manifest index 440f1e514917..0bfa21a5473e 100644 --- a/x11-terms/rxvt-unicode/Manifest +++ b/x11-terms/rxvt-unicode/Manifest @@ -1,15 +1,11 @@ AUX rxvt-unicode-9.06-case-insensitive-fs.patch 238 BLAKE2B 887eec8ec419900765ede1a8b75ea0acde945275af0e524e4382610a40d1e42b2f0be9879bf7c25cb00da6ae410e554567efdcc2f43ceff52e37c44060e6c4a7 SHA512 5257b1d33e25a6a390da2f23100fc3a2b8dcc4787205273933c2ba64ecf72e663cdc0cb86273a1ffa1a87b04bbeeff9edbc8c028c521ae612722f21cf6c40762 AUX rxvt-unicode-9.21-xsubpp.patch 640 BLAKE2B 51b9f626436153239ca98df1094c5bbadaca463cf3624d39094cf5dce75a42c23568584292cd55b891439a45bc7d9e3fbf098ec80743b44267e6c3c1d0b339ca SHA512 70f4c5cb7b6a440f009f693c4dc2f8595051e198250d375cd18704c35059596d77938a3d062740bd26f947bfebdb67ea7d46f59f8cbf08fc73193a62267723ec -AUX rxvt-unicode-9.22-perl-segfault-on-exit.patch 996 BLAKE2B bdabdeda2b12e8466dd134899e7aef45c74ef41fc96e15b762b16ad59e74e2fe1036d129c8daf3d9c20f7014ae5dba768afd5b4f3150a4894cc648178113052f SHA512 1640ab12379ebd6a7f0dff0ef6a680a1bf014f6c20e4db0e4d4e05e1725858c42bf8333d5eb1b176dfc35fc695adddc7a3b08665e9b7a8dea06f8d2566ce300a -AUX rxvt-unicode-9.22-query-graphics-insecure.patch 403 BLAKE2B 306fab801001368ddde73eba4fab460b454bfacee36565ebf3211ebb1383ab8f4d42972c15c479b731771fa012daa73556a0406da7dc55331eb7428970134d47 SHA512 d3574abb33cd099f66d8080b93d897966ce7133dc38a3f280aaa791cc8b11372dc569371e2dce7ed40222a406f593d3c3ddd4c91849aa2fd6396bbae6fed7a7a -AUX rxvt-unicode-9.22-sgr-mouse-mode-flag.patch 5613 BLAKE2B 28cf8af70841027ba254704b3bb94e2bcf7f8f6743963056c046279aeef4fc8f866711144880ac6a3ad6acd4ed86332f497dff905f3836775579ba5e90328218 SHA512 b6bf180cd25f46fd22841aa8322839886712312341950e3abeeec1a44d73bbec8e7467ce09878c84b86263ab7067443529a89f017e54dceb84b189477e58f10e AUX urxvtd.service 145 BLAKE2B 9199c81f02ff161caf6f72bac95808d4ba584bf09fb68cf7fef1bdf883873fe360816d8736835987a61c1cf0ac1be469aa47f2b74e96d8215a3ac17de896d6a5 SHA512 a77606d11e80c8d117917ab34a6d2ca430c667372ee713cf8519e49df4d972f289399d49bd808a9d31fa343d11c2fd2eb761b813be3f2892784d1dd9c281fc38 AUX urxvtd.socket 133 BLAKE2B d685c78de25a3f2d661f180a6a5cc227c500e873dab049587f0742330910c3867f60871a96a237787d85f66b8999b397281b36ed9b92bda2422e1e2295accfee SHA512 20c7d7a00bd41deefb738b6795ecbea8098ec81d3356cceab4de39408de3552d385fc48ef74a087f3724d436b77de54adb67d0858a0949b9595820ee3d9cf7e4 -DIST rxvt-unicode-9.22.tar.bz2 931198 BLAKE2B ea9a12e4a8396ed6be12b4d50ae260a0376902dbd47b0628bb14ce0509c5d89f5a80370b413fdb9df9b8b81728ec26e115cbf0d88ab6e9cb2a87b03b5d79c432 SHA512 b39f1b2cbe6dd3fbd2a0ad6a9d391a2b6f49d7c5e67bc65fe44a9c86937f8db379572c67564c6e21ff6e09b447cdfd4e540544e486179e94da0e0db679c04dd9 -DIST rxvt-unicode-9.22_24-bit-color_cpixl-20201108.patch.xz 8116 BLAKE2B 27940ad42ee3f26c357a50b7fae1e1539acec71f5ff43e7ed16167d0adb175c4de20ba84880f25eec0817703d937d097fda228541d16511811efe5816109e71b SHA512 2b8bbb90c6bb223f622c1e99d62a70a812604d1f8e57cea37a8faf0af578588d3888ea8009568d623710cc03e020a69269770e23476fd9ff9e46dbd9ea23f540 DIST rxvt-unicode-9.26.tar.bz2 904950 BLAKE2B 1790d02eeadf630cc9bc718288af2f6bd19c3e320d3dbfa44c8cef516c8e790e0abfbfe4e557795749ddd3ec41b8358f6eac623c060240f091b3e84a549151ad SHA512 35560b57730e17c9542ea4a615fd86ce703c4e6421323e8fe1570007737a880fde90d17943e5af9e170be4111b9769f4aa7e57efca5428421fdc1c299112f8e0 DIST rxvt-unicode-9.26_24-bit-color_aur-20210516+eautoreconf.patch.xz 11716 BLAKE2B 7e18b0f884dbb9574515db8cfb4e1521e1e3287ac194750db288409c7e4d0bb120964e4559ce7e3b91e169935ded93f3af3045fc7c1737a5a6de2710ee2e107b SHA512 8cbcc1c04bdb83996ce08ece559ef9e7f5f530140a2a66291e0ffd049808da60787a68520b4a990dc12e1272de861a85b199ddd10ac8b245eafbfe16dc521199 -EBUILD rxvt-unicode-9.22-r9.ebuild 3305 BLAKE2B 10fa2f2fc53f8da9a499703af03be15e464775ed0f0411de2da90ba669061fa846a3a0bb3f75c61da5de6c71e950e9d79c657f9bc5f542be6e0dd6e420982786 SHA512 0907a7236e52c83777d76dbc758d655b27a78778e42d5c0965715b0f3dd60dd717356dce745cf9bb557a5ee1c4ffe55cad8c2d5d599b1bac6855fe6671dc70d9 -EBUILD rxvt-unicode-9.26-r2.ebuild 3155 BLAKE2B 60e04597647df85cdca4011792947a72be04749fda41b295715bad1dcd1bf377138a6f103a93995504f38119d1c7da4f75adc976325476a250377c957c517f6d SHA512 f6b0e3c175c3c800e965c63d63f819d08c1279d7ebc02214ca2918444782462ff9dfaa15f6636db5701f58893480d783e776c6b60014c3853b4a26dae70b92d5 -EBUILD rxvt-unicode-9999.ebuild 2163 BLAKE2B bbad76d956512288ef1284526f8ea4d1c039df62868e74078a93640dae7e95361f05d0062e2cf7dcf74e6b5f799e99cf6bd0712263290d9caef92dfd058507e5 SHA512 0b8d154abbc49368df6cbe4efa50e482f7b4226507f2babcc7932ed7ff39dc7d666e544e8f80d797de0f1a1a0047e1763c81254005ca319009a568b87ce84a89 -MISC metadata.xml 1790 BLAKE2B c9ada6e7379ee5cbeaa4ca0353fabeb4c5a7426f7e5658a18873ca610394f4937806a177084170fc357626a7921eecaca5d0c12f0e44973d6a6e7254d5a0f7b6 SHA512 eb3224e3915991373b02ace258b0f6f918003e78dd07541134ba72010b233d8dd8877942cdea79a308585b38a139dbbca089cad2c688d0f99a825df2cc2724f4 +DIST rxvt-unicode-9.29_24-bit-color_aur-9.26-20210712.patch.xz 7568 BLAKE2B 8ea5d813e00fd4012d145acf70e3d9b0974dddffd203fbec4bf06a0da1c9368ec316fc2903dccae3a5d71d684fd93b2a09ed208f26be1e85f77c702494db4e54 SHA512 baa226ca9adf6025a72dea925ec3be16186502bb4aab21dd61ef1f7c3e2eb793e7a1dc9619ed8228166758daa2879a465da2ace3f3b14545808955388bd2b74b +DIST rxvt-unicode-9.30.tar.bz2 877186 BLAKE2B 645164e37e9e484c66f5047836689e4e4727575dfdcbefc64affb70d9110497529fdcc7d476f77737efed5cee4af314e1e1ccbcb42b506bb7e653b827c24a0c7 SHA512 048d5f635a61bc1a739d5cbc09e7a9f77cee18c81df468ce1ff0a62866ced06fc4ec258bb015d2484a7e7bad2339f0bdd79bd824d649c2553a80bdef9f199e99 +EBUILD rxvt-unicode-9.26-r2.ebuild 3021 BLAKE2B 80d258c5d5e5319b98370e9d59d0200e5a7fa8540a4c0b1a3884004d7399e0d3c22c0555554cd81c8a23a5f854c322451adfd447f549cb5fe268d2816fec8070 SHA512 ed19df722eb87d6c18bbe0155e8a5e15738d3353a7fbfccf95baf769eb0ca39bc5e3b24b75acbab086cdd65a1c181bbe1c3f1f15a9b0848f99602d332ed50369 +EBUILD rxvt-unicode-9.30.ebuild 3022 BLAKE2B 06b57918a115940d0ca696e44c4904d1f8200a537872da9639b8d74724d927b8e4db85b714c9b674ff947ebadc28798ef4b30043c021085c8db8cfac89eca725 SHA512 379f1753ffd3a741d625ea07dfeb6612b3df51484f5f896b53ec0c046bfd50ccce541db9a6d59707d2839e29a2eb8d6b861086e9479d5123aae966ea4f847fe6 +MISC metadata.xml 1577 BLAKE2B ca4f7c5d7697dd6a3bb087b59a1fa76501372cb802061285b0c35c55a014cd044a2c1a67db94d4f5c3cf86afc5307e3052dbd533287664fa3f855f79bd575e77 SHA512 65ee848f71db806ae5e8016243d328b786b2135705e4d2d5fae30e8b018b1d215327a8310be2845b0958c6af92be75082bc16e5007f1f2b888dba74e9f8e74b8 diff --git a/x11-terms/rxvt-unicode/files/rxvt-unicode-9.22-perl-segfault-on-exit.patch b/x11-terms/rxvt-unicode/files/rxvt-unicode-9.22-perl-segfault-on-exit.patch deleted file mode 100644 index 0a3cb1ec4cd5..000000000000 --- a/x11-terms/rxvt-unicode/files/rxvt-unicode-9.22-perl-segfault-on-exit.patch +++ /dev/null @@ -1,36 +0,0 @@ -Backported from the upstream CVS repository, see: -http://cvs.schmorp.de/rxvt-unicode/src/rxvtperl.h?r1=1.28&r2=1.29 -http://cvs.schmorp.de/rxvt-unicode/src/rxvtperl.xs?r1=1.246&r2=1.247 - ---- rxvt-unicode/src/rxvtperl.h 2012/06/12 10:45:53 1.28 -+++ rxvt-unicode/src/rxvtperl.h 2020/06/30 07:31:24 1.29 -@@ -51,7 +51,9 @@ - { - char **perl_environ; - -+ #if 0 // see rxvtperl.xs - ~rxvt_perl_interp (); -+ #endif - - void init (); - void init (rxvt_term *term); ---- rxvt-unicode/src/rxvtperl.xs 2020/01/20 09:35:12 1.246 -+++ rxvt-unicode/src/rxvtperl.xs 2020/06/30 07:31:24 1.247 -@@ -372,6 +372,9 @@ - - static PerlInterpreter *perl; - -+#if 0 /* we are not a library anymore, so doing this is just not worth it */ -+/*THINK/TODO: this has the side effect of, of course, not calling destructors. */ -+/* but therse are not guaranteed anyway... */ - rxvt_perl_interp::~rxvt_perl_interp () - { - if (perl) -@@ -381,6 +384,7 @@ - PERL_SYS_TERM (); - } - } -+#endif - - void - rxvt_perl_interp::init () diff --git a/x11-terms/rxvt-unicode/files/rxvt-unicode-9.22-query-graphics-insecure.patch b/x11-terms/rxvt-unicode/files/rxvt-unicode-9.22-query-graphics-insecure.patch deleted file mode 100644 index 52a8c8297050..000000000000 --- a/x11-terms/rxvt-unicode/files/rxvt-unicode-9.22-query-graphics-insecure.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/command.C -+++ b/src/command.C -@@ -2695,7 +2695,7 @@ - /* kidnapped escape sequence: Should be 8.3.48 */ - case C1_ESA: /* ESC G */ - // used by original rxvt for rob nations own graphics mode -- if (cmd_getc () == 'Q') -+ if (cmd_getc () == 'Q' && option (Opt_insecure)) - tt_printf ("\033G0\012"); /* query graphics - no graphics */ - break; - diff --git a/x11-terms/rxvt-unicode/files/rxvt-unicode-9.22-sgr-mouse-mode-flag.patch b/x11-terms/rxvt-unicode/files/rxvt-unicode-9.22-sgr-mouse-mode-flag.patch deleted file mode 100644 index 3f6f5d90618e..000000000000 --- a/x11-terms/rxvt-unicode/files/rxvt-unicode-9.22-sgr-mouse-mode-flag.patch +++ /dev/null @@ -1,165 +0,0 @@ -diff --git a/config.h.in b/config.h.in -index 914d606..b869bfb 100644 ---- a/config.h.in -+++ b/config.h.in -@@ -9,6 +9,9 @@ - /* Define if you want handling for rarely used but handy features */ - #undef ENABLE_FRILLS - -+/* Define if you want support for SGR mouse mode 1006 */ -+#undef ENABLE_SGRMOUSE -+ - /* Define if you can embed a perl interpreter */ - #undef ENABLE_PERL - -diff --git a/configure.ac b/configure.ac -index 0da3b59..c8b9c80 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -76,6 +76,7 @@ AC_SEARCH_LIBS(gethostbyname, nsl) - AC_SEARCH_LIBS(socket, socket) - - support_frills=yes -+support_sgrmouse=yes - support_inheritpixmap=yes - support_fading=yes - support_keepscrolling=yes -@@ -109,6 +110,7 @@ AC_ARG_ENABLE(everything, - [ - if test x$enableval = xno; then - support_frills=no -+ support_sgrmouse=no - support_inheritpixmap=no - support_fading=no - support_keepscrolling=no -@@ -137,6 +139,7 @@ AC_ARG_ENABLE(everything, - fi - if test x$enableval = xyes; then - support_frills=yes -+ support_sgrmouse=yes - support_inheritpixmap=yes - support_fading=yes - support_keepscrolling=yes -@@ -359,6 +362,12 @@ AC_ARG_ENABLE(frills, - support_frills=$enableval - fi]) - -+AC_ARG_ENABLE(sgrmouse, -+ [ --enable-sgrmouse enable support for SGR mouse mode 1006], -+ [if test x$enableval = xyes -o x$enableval = xno; then -+ support_sgrmouse=$enableval -+ fi]) -+ - AC_ARG_ENABLE(keepscrolling, - [ --enable-keepscrolling enable continual scrolling on scrollbar arrow press], - [if test x$enableval = xyes -o x$enableval = xno; then -@@ -666,6 +675,9 @@ fi - if test x$support_frills = xyes; then - AC_DEFINE(ENABLE_FRILLS, 1, Define if you want handling for rarely used but handy features) - fi -+if test x$support_sgrmouse = xyes; then -+ AC_DEFINE(ENABLE_SGRMOUSE, 1, Define if you want support for SGR mouse mode 1006) -+fi - if test x$support_mousewheel = xyes; then - AC_DEFINE(MOUSE_WHEEL, 1, Define to use wheel events (button4 and button5) to scroll) - fi -diff --git a/src/command.C b/src/command.C -index 7b79f51..a62ef87 100644 ---- a/src/command.C -+++ b/src/command.C -@@ -1282,6 +1282,13 @@ rxvt_term::mouse_report (XButtonEvent &ev) - int button_number, key_state = 0; - int x, y; - int code = 32; -+ bool mode_sgr = false; -+ -+#if ENABLE_SGRMOUSE -+ if (priv_modes & PrivMode_ExtMouseSgr) mode_sgr = true; -+#endif -+ -+ if (mode_sgr) code = 0; - - x = Pixel2Col (ev.x) + 1; - y = Pixel2Row (ev.y) + 1; -@@ -1296,11 +1303,18 @@ rxvt_term::mouse_report (XButtonEvent &ev) - code += 32; - } - -- if (MEvent.button == AnyButton) -+ if (!(mode_sgr) && MEvent.button == AnyButton) - button_number = 3; - else - { -- button_number = MEvent.button - Button1; -+ if (ev.type == MotionNotify) { -+ if (ev.state & Button1Mask) button_number = 0; -+ else if (ev.state & Button2Mask) button_number = 1; -+ else if (ev.state & Button3Mask) button_number = 2; -+ else return; -+ } else { -+ button_number = ev.button - Button1; -+ } - /* add 0x3D for wheel events, like xterm does */ - if (button_number >= 3) - button_number += 64 - 3; -@@ -1361,6 +1375,15 @@ rxvt_term::mouse_report (XButtonEvent &ev) - wint_t (32 + x), - wint_t (32 + y)); - else -+#endif -+#if ENABLE_SGRMOUSE -+ if (mode_sgr) -+ tt_printf ("\033[<%d;%d;%d%c", -+ code + button_number + key_state, -+ x, -+ y, -+ (ev.type == ButtonRelease ? 'm' : 'M')); -+ else - #endif - tt_printf ("\033[M%c%c%c", - code + button_number + key_state, -@@ -2904,7 +2927,7 @@ rxvt_term::process_csi_seq () - scr_soft_reset (); - - static const int pm_h[] = { 7, 25 }; -- static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 }; -+ static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1002, 1003, 1005, 1006, 1015, 1049 }; - - process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h); - process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l); -@@ -3710,6 +3733,9 @@ rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int na - { 1003, PrivMode_MouseAnyEvent }, - #if ENABLE_FRILLS - { 1005, PrivMode_ExtModeMouse }, -+#endif -+#if ENABLE_SGRMOUSE -+ { 1006, PrivMode_ExtMouseSgr }, - #endif - { 1010, PrivMode_TtyOutputInh }, // rxvt extension - { 1011, PrivMode_Keypress }, // rxvt extension -diff --git a/src/rxvt.h b/src/rxvt.h -index 5c7cf66..2ffd3fb 100644 ---- a/src/rxvt.h -+++ b/src/rxvt.h -@@ -645,6 +645,7 @@ enum { - #define PrivMode_ExtModeMouse (1UL<<23) // xterm pseudo-utf-8 hack - #define PrivMode_ExtMouseRight (1UL<<24) // xterm pseudo-utf-8, but works in non-utf-8-locales - #define PrivMode_BlinkingCursor (1UL<<25) -+#define PrivMode_ExtMouseSgr (1UL<<27) // sgr mouse extension - - #define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent) - -diff --git a/src/xdefaults.C b/src/xdefaults.C -index 894aa8d..e5952b7 100644 ---- a/src/xdefaults.C -+++ b/src/xdefaults.C -@@ -359,6 +359,9 @@ static const char optionsstring[] = "options: " - #if defined(ENABLE_FRILLS) - "frills," - #endif -+#if defined(ENABLE_SGRMOUSE) -+ "sgrmouse," -+#endif - #if defined(SELECTION_SCROLLING) - "selectionscrolling," - #endif diff --git a/x11-terms/rxvt-unicode/metadata.xml b/x11-terms/rxvt-unicode/metadata.xml index 6cd6906d211f..fc597b93c849 100644 --- a/x11-terms/rxvt-unicode/metadata.xml +++ b/x11-terms/rxvt-unicode/metadata.xml @@ -6,29 +6,26 @@ <name>Marek Szuba</name> </maintainer> <!-- co-maintainers welcome! --> -<use> -<flag name="24-bit-color">Enable 24-bit color support. Note that this feature - is unofficial, may cause visual glitches due to the fact there is no - termcap/terminfo definition for rxvt-unicode-24bit yet so it is necessary - to use the one for 256 colours, visibly increases memory usage, and might - slow urxvt down dramatically when more than six fonts are in use in a terminal - instance.</flag> -<flag name="256-color">Enable 256 color support</flag> -<flag name="blink">Enable blinking text</flag> -<flag name="fading-colors">Enable colors fading when off focus</flag> -<flag name="font-styles">Enable support for bold and italic fonts</flag> -<flag name="gdk-pixbuf">Enable transparency support using <pkg>x11-libs/gdk-pixbuf</pkg></flag> -<flag name="iso14755">Enable ISO-14755 support</flag> -<flag name="mousewheel">Enable scrolling via mouse wheel or buttons 4 and 5</flag> -<flag name="perl">Enable perl script support. You can still disable this at runtime with -pe ""</flag> -<flag name="sgrmouse">Enable unofficial support for the xterm SGR 1006 mouse-tracking extension. - Needed to properly support mouse events for terminals with more than 223 - rows or columns, in applications not supporting the urxvt 1015 extension.</flag> -<flag name="unicode3">Use 21 instead of 16 bits to represent unicode characters</flag> -<flag name="utmp">Enable utmp support</flag> -<flag name="wtmp">Enable wtmp support</flag> -</use> -<upstream> -<remote-id type="cpe">cpe:/a:rxvt-unicode:rxvt-unicode</remote-id> -</upstream> + <use> + <flag name="24-bit-color">Enable 24-bit color support. Note that this feature + is unofficial, may cause visual glitches due to the fact there is no + termcap/terminfo definition for rxvt-unicode-24bit yet so it is necessary + to use the one for 256 colours, visibly increases memory usage, and might + slow urxvt down dramatically when more than six fonts are in use in a terminal + instance.</flag> + <flag name="256-color">Enable 256 color support</flag> + <flag name="blink">Enable blinking text</flag> + <flag name="fading-colors">Enable colors fading when off focus</flag> + <flag name="font-styles">Enable support for bold and italic fonts</flag> + <flag name="gdk-pixbuf">Enable transparency support using <pkg>x11-libs/gdk-pixbuf</pkg></flag> + <flag name="iso14755">Enable ISO-14755 support</flag> + <flag name="mousewheel">Enable scrolling via mouse wheel or buttons 4 and 5</flag> + <flag name="perl">Enable perl script support. You can still disable this at runtime with -pe ""</flag> + <flag name="unicode3">Use 21 instead of 16 bits to represent unicode characters</flag> + <flag name="utmp">Enable utmp support</flag> + <flag name="wtmp">Enable wtmp support</flag> + </use> + <upstream> + <remote-id type="cpe">cpe:/a:rxvt-unicode:rxvt-unicode</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.26-r2.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.26-r2.ebuild index 0802f81d5097..131c98ce2cc3 100644 --- a/x11-terms/rxvt-unicode/rxvt-unicode-9.26-r2.ebuild +++ b/x11-terms/rxvt-unicode/rxvt-unicode-9.26-r2.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit autotools desktop flag-o-matic systemd prefix +inherit desktop systemd prefix COLOUR_PATCH_NAME="${PN}-9.26_24-bit-color_aur-20210516+eautoreconf.patch" @@ -31,7 +31,6 @@ RDEPEND=">=sys-libs/ncurses-5.7-r6:= DEPEND="${RDEPEND} x11-base/xorg-proto" BDEPEND="virtual/pkgconfig" -# WARNING: will bdepend on >=sys-devel/autoconf-2.71 (masked as of 2021-07-07) if eautoreconf has to be called PATCHES=( "${FILESDIR}"/${PN}-9.06-case-insensitive-fs.patch diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r9.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.30.ebuild index 2e9acbe9987a..1ad87ebf9625 100644 --- a/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r9.ebuild +++ b/x11-terms/rxvt-unicode/rxvt-unicode-9.30.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit autotools desktop flag-o-matic systemd prefix +inherit autotools desktop systemd prefix -COLOUR_PATCH_NAME="${PN}-9.22_24-bit-color_cpixl-20201108.patch" +COLOUR_PATCH_NAME="${PN}-9.29_24-bit-color_aur-9.26-20210712.patch" DESCRIPTION="rxvt clone with xft and unicode support" HOMEPAGE="http://software.schmorp.de/pkg/rxvt-unicode.html" @@ -14,16 +14,16 @@ SRC_URI="http://dist.schmorp.de/rxvt-unicode/Attic/${P}.tar.bz2 LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" IUSE="24-bit-color 256-color blink fading-colors +font-styles gdk-pixbuf iso14755 +mousewheel - +perl sgrmouse startup-notification unicode3 +utmp +wtmp xft" - -RESTRICT="test" + +perl startup-notification unicode3 xft" RDEPEND=">=sys-libs/ncurses-5.7-r6:= + dev-libs/libptytty media-libs/fontconfig x11-libs/libX11 x11-libs/libXrender + x11-libs/libXt gdk-pixbuf? ( x11-libs/gdk-pixbuf ) kernel_Darwin? ( dev-perl/Mac-Pasteboard ) perl? ( dev-lang/perl:= ) @@ -31,15 +31,13 @@ RDEPEND=">=sys-libs/ncurses-5.7-r6:= xft? ( x11-libs/libXft )" DEPEND="${RDEPEND} x11-base/xorg-proto" -BDEPEND="virtual/pkgconfig" +# autoconf dependency hopefully temporary, see Bug #827852 +BDEPEND="virtual/pkgconfig + >=sys-devel/autoconf-2.71" PATCHES=( "${FILESDIR}"/${PN}-9.06-case-insensitive-fs.patch "${FILESDIR}"/${PN}-9.21-xsubpp.patch - "${FILESDIR}"/${PN}-9.22-perl-segfault-on-exit.patch - "${FILESDIR}"/${PN}-9.22-query-graphics-insecure.patch - "${FILESDIR}"/${PN}-9.22-sgr-mouse-mode-flag.patch - "${WORKDIR}"/${COLOUR_PATCH_NAME} ) DOCS=( Changes @@ -51,38 +49,41 @@ DOCS=( ) src_prepare() { - # Bug #787104 - append-cxxflags -std=c++14 - default + # Current patch is too aggressive to apply unconditionally, see Bug #801571 + if use 24-bit-color; then + eapply "${WORKDIR}"/${COLOUR_PATCH_NAME} + eautoreconf + fi + # kill the rxvt-unicode terminfo file - #192083 sed -i -e "/rxvt-unicode.terminfo/d" doc/Makefile.in || die "sed failed" # use xsubpp from Prefix - #506500 hprefixify -q '"' -w "/xsubpp/" src/Makefile.in - - eautoreconf } src_configure() { # --enable-everything goes first: the order of the arguments matters - econf --enable-everything \ - $(use_enable 24-bit-color) \ - $(use_enable 256-color) \ - $(use_enable blink text-blink) \ - $(use_enable fading-colors fading) \ - $(use_enable font-styles) \ - $(use_enable gdk-pixbuf pixbuf) \ - $(use_enable iso14755) \ - $(use_enable mousewheel) \ - $(use_enable perl) \ - $(use_enable sgrmouse) \ - $(use_enable startup-notification) \ - $(use_enable unicode3) \ - $(use_enable utmp) \ - $(use_enable wtmp) \ + local myconf=( + --enable-everything + $(use_enable 256-color) + $(use_enable blink text-blink) + $(use_enable fading-colors fading) + $(use_enable font-styles) + $(use_enable gdk-pixbuf pixbuf) + $(use_enable iso14755) + $(use_enable mousewheel) + $(use_enable perl) + $(use_enable startup-notification) + $(use_enable unicode3) $(use_enable xft) + ) + if use 24-bit-color; then + myconf+=( --enable-24-bit-color ) + fi + econf "${myconf[@]}" } src_compile() { @@ -97,6 +98,7 @@ src_install() { default systemd_douserunit "${FILESDIR}"/urxvtd.service + systemd_douserunit "${FILESDIR}"/urxvtd.socket make_desktop_entry urxvt rxvt-unicode utilities-terminal \ "System;TerminalEmulator" @@ -110,11 +112,4 @@ pkg_postinst() { ewarn "rebuild =${CATEGORY}/${PF} with USE=-24-bit-color (the default setting)." ewarn fi - - if use sgrmouse; then - ewarn - ewarn "Support for the SGR 1006 mouse extension in ${PN} is UNOFFICIAL and provided as-is." - ewarn "When in doubt, rebuild =${CATEGORY}/${PF} with USE=-sgrmouse (the default setting)." - ewarn - fi } diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9999.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9999.ebuild deleted file mode 100644 index 71119ddbc14a..000000000000 --- a/x11-terms/rxvt-unicode/rxvt-unicode-9999.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools cvs desktop vcs-clean prefix - -DESCRIPTION="rxvt clone with xft and unicode support" -HOMEPAGE="http://software.schmorp.de/pkg/rxvt-unicode.html" -ECVS_SERVER="cvs.schmorp.de/schmorpforge" -ECVS_USER="anonymous" -ECVS_MODULE="rxvt-unicode" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="" -IUSE=" - 256-color blink fading-colors +font-styles gdk-pixbuf iso14755 +mousewheel - +perl startup-notification unicode3 +utmp +wtmp xft -" -RESTRICT="test" - -RDEPEND=" - >=sys-libs/ncurses-5.7-r6:= - media-libs/fontconfig - x11-libs/libX11 - x11-libs/libXrender - gdk-pixbuf? ( x11-libs/gdk-pixbuf ) - kernel_Darwin? ( dev-perl/Mac-Pasteboard ) - perl? ( dev-lang/perl:= ) - startup-notification? ( x11-libs/startup-notification ) - xft? ( x11-libs/libXft ) -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig - x11-base/xorg-proto -" -DOCS=( - Changes - README.FAQ - doc/README.xvt - doc/changes.txt - doc/etc/${PN}.term{cap,info} - doc/rxvt-tabbed -) -S=${WORKDIR}/${PN} - -src_prepare() { - ecvs_clean - eapply \ - "${FILESDIR}"/${PN}-9.06-case-insensitive-fs.patch \ - "${FILESDIR}"/${PN}-9.21-xsubpp.patch - - eapply_user - - # kill the rxvt-unicode terminfo file - #192083 - sed -i -e "/rxvt-unicode.terminfo/d" doc/Makefile.in || die "sed failed" - - # use xsubpp from Prefix - #506500 - hprefixify -q '"' -w "/xsubpp/" src/Makefile.in - - eautoreconf -} - -src_configure() { - # --enable-everything goes first: the order of the arguments matters - econf --enable-everything \ - $(use_enable 256-color) \ - $(use_enable blink text-blink) \ - $(use_enable fading-colors fading) \ - $(use_enable font-styles) \ - $(use_enable gdk-pixbuf pixbuf) \ - $(use_enable iso14755) \ - $(use_enable mousewheel) \ - $(use_enable perl) \ - $(use_enable startup-notification) \ - $(use_enable unicode3) \ - $(use_enable utmp) \ - $(use_enable wtmp) \ - $(use_enable xft) -} - -src_compile() { - default - - sed -i \ - -e 's/RXVT_BASENAME = "rxvt"/RXVT_BASENAME = "urxvt"/' \ - "${S}"/doc/rxvt-tabbed || die -} - -src_install() { - default - - make_desktop_entry urxvt rxvt-unicode utilities-terminal \ - "System;TerminalEmulator" -} diff --git a/x11-terms/zutty/Manifest b/x11-terms/zutty/Manifest index 0cf07389d85b..8eec03855850 100644 --- a/x11-terms/zutty/Manifest +++ b/x11-terms/zutty/Manifest @@ -1,6 +1,6 @@ AUX zutty-0.9-freetype-2.11.0.patch 1072 BLAKE2B 91b443535e432304c80df2fa91995eccac32bdc2e1c6bb95f55450b57b72789cc50f485c0c4376db32425481d17793985b4ebdeeb4093dd68d4323f9cc2dc04b SHA512 df7a4da6367a05d15dfd8dbe03ee59d01d385600b96798761202016e014e881271dce6e596a2fae2e155793e25b4743bda43ceb1a52d08eb6c327886b02b8180 DIST zutty-0.10.tar.gz 336599 BLAKE2B 0041bbbc268ff042bac6bea1984ebf05d958f622b4c2e736bfe3d18e3a224238f27a7ef9920b8f7bc820705ce7560f20819650ec27fb3e5fc13dbef76fc6d0af SHA512 f499fb499779f8b5936a03c48e3c042f5fa0f0c99d3b24a4c9b963c2df8151561ac82456625d768e65f75aea641539a036300f1f99404eecfd15a0a25aeb6779 DIST zutty-0.9.tar.gz 336534 BLAKE2B 61d2ae02e2c0b08a9c536190f61f14300b0cd1bacb83f5da33e92a6c8502df6adda72805e58f3d679c7258c30338178b4488c0f7bfbfaf8b5e922401e6442427 SHA512 590cf090c0d80e683d4473828cdb8bbe4f60bc5bc3c5e9e63039a59757e281ecefc774709f08777fe36ab596fb102f392c8bf643449e62914e5b88d0ebc728c0 -EBUILD zutty-0.10.ebuild 683 BLAKE2B 6aaa8f2efdc473559d156d57decbe1efe8c628e189863f6519e97000acb4385b2aa77506bd489c44f8af38c314a2c9101bcc91798074e8b159b8868b1f895a93 SHA512 c2243668401245170de599c63e9710245cc3865200cc1579cde299b70f311c156ad8923b7101890d8ff0adfc7e5447d9425fb3d2b0452d94bd4560ffde82af7b +EBUILD zutty-0.10.ebuild 682 BLAKE2B 48c4ca8530d0eb51a88c2e8494987e59d89e11a53379be7a704c889e128f17d07a71f607862d025c6388013ba1c6b6558680640c4b19f79932a4d4ea80f14815 SHA512 efe82d8d68e47cfa54bc37dbea6b87abeeb5db55fc560594f001dae40fe60139562858f07d300dd4333303681f9878a016e6fd2e374f18775b26bd597cf7d01d EBUILD zutty-0.9-r1.ebuild 758 BLAKE2B 5aff0a097a3c6c0fe046033b1a4af0a9168b68dff979a78b244588c47e4a9e59911677f31729edfa6232804acf91942dc176512daceb41afee74d840b8f78dbd SHA512 6a7c06d5a0923c8fdfa38bbd2bedab753ff5e1f1d0d73d88aff8f2e2f3113f7f0731217fe2c3f3c6716a267e425ccef8806d9b84fb9bdd0a45fc840596054f40 MISC metadata.xml 1157 BLAKE2B 883ce392103af3b9f9be08766807134f21136c3e40d622b6e29b9da3ba3e08ac461856ea64c32110ac6d169a92260ebaffc9398ed1fa9ad44f2eaaae18336faf SHA512 f2eb0fc8e9ef6c505759c3721ca65636c3d76fede249675a57f23f1a3498a5eb2290fd1ba0c51c97d726483a0b6d2ce1e3310c621ce67401509c21010ceb75d5 diff --git a/x11-terms/zutty/zutty-0.10.ebuild b/x11-terms/zutty/zutty-0.10.ebuild index ff5acfab391e..cc6a1b77922e 100644 --- a/x11-terms/zutty/zutty-0.10.ebuild +++ b/x11-terms/zutty/zutty-0.10.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/tomszilagyi/zutty/archive/refs/tags/${PV}.tar.gz -> LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64" RDEPEND=" media-libs/freetype:2 |