From bd35a61d88b111f25f4b10126e0d4755545fc7a5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 29 Oct 2024 03:04:53 +0000 Subject: gentoo auto-resync : 29:10:2024 - 03:04:53 --- sys-apps/Manifest.gz | Bin 51305 -> 51306 bytes sys-apps/ethtool/Manifest | 8 +- sys-apps/ethtool/ethtool-6.10.ebuild | 5 +- sys-apps/ethtool/ethtool-6.6.ebuild | 5 +- sys-apps/ethtool/ethtool-6.7.ebuild | 5 +- sys-apps/ethtool/ethtool-6.9.ebuild | 5 +- sys-apps/texinfo/Manifest | 9 +- ...tp-Texinfo-XS-xspara.c-get_utf8_codepoint.patch | 103 ---------- ...-XS-xspara.c-xspara__add_next-Do-not-pass.patch | 44 ---- ...-write_tag_contents-Check-if-added-text-i.patch | 51 ----- ...exinfo-XS-parsetexi-tree.c-reset_obstacks.patch | 53 ----- .../7.1/0005-tp-Texinfo-command_data.txt.patch | 221 --------------------- sys-apps/texinfo/texinfo-7.1-r1.ebuild | 98 --------- sys-apps/texinfo/texinfo-7.1.90.ebuild | 93 +++++++++ 14 files changed, 115 insertions(+), 585 deletions(-) delete mode 100644 sys-apps/texinfo/files/7.1/0001-tp-Texinfo-XS-xspara.c-get_utf8_codepoint.patch delete mode 100644 sys-apps/texinfo/files/7.1/0002-tp-Texinfo-XS-xspara.c-xspara__add_next-Do-not-pass.patch delete mode 100644 sys-apps/texinfo/files/7.1/0003-info-scan.c-write_tag_contents-Check-if-added-text-i.patch delete mode 100644 sys-apps/texinfo/files/7.1/0004-tp-Texinfo-XS-parsetexi-tree.c-reset_obstacks.patch delete mode 100644 sys-apps/texinfo/files/7.1/0005-tp-Texinfo-command_data.txt.patch delete mode 100644 sys-apps/texinfo/texinfo-7.1-r1.ebuild create mode 100644 sys-apps/texinfo/texinfo-7.1.90.ebuild (limited to 'sys-apps') diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz index 91761aab23c4..b7ba51a70010 100644 Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ diff --git a/sys-apps/ethtool/Manifest b/sys-apps/ethtool/Manifest index 05418df802b5..a8e3b2299c5f 100644 --- a/sys-apps/ethtool/Manifest +++ b/sys-apps/ethtool/Manifest @@ -2,8 +2,8 @@ DIST ethtool-6.10.tar.xz 360300 BLAKE2B 530ec7fc00a6f88173d403ce0288cbdc7610997f DIST ethtool-6.6.tar.xz 352476 BLAKE2B dfbc5f9a6ac63210d1ae305c2458cc44d38d44fcc272c9b0397a13a93e0aa0a09e3750e330a27dcf4dce796c6bd302c4d4c1fd91faab824a81949c31f1ed3504 SHA512 1e7eae3abe59e6af4bce0ebedd0a7ea84d1b0adc7693a0f03021c4096677096a022fdae521ac02413f9db46ee232b89dd2015a116845aa6ca7686fdda50a5b21 DIST ethtool-6.7.tar.xz 352772 BLAKE2B 94a6fd8d29ff479eb894fe56bf991f522fff9af5a94c176d06be2819fe2520125cb48dbded229df1a9f5a0308aeaec503c55caf5d248eef87640c7f90f1132ec SHA512 07d13f9a8f980dab73c07e7c68179cfee272f53103c6dfbce1814b768e3313dc671a0cbefc63d4d53a616876bc1f96db8db2444617e4d58d741fae3acf0be524 DIST ethtool-6.9.tar.xz 358640 BLAKE2B e04fa530084ad14abfea8c3802f272eb61eae9ee07aa2a12d16eeb77708b5ab021f1cdee10c24f83f77d65f2740ba5aceda99c21c47ef6cbcd65834af8334b00 SHA512 bc7e56a1a27a0679119491d6fce076e68374cf47a86fa4c0533851df0aa737cb9139920a9f3f3733deca672923d01bbb579f3d79bd17a2c6738f9f93aa469570 -EBUILD ethtool-6.10.ebuild 599 BLAKE2B f8a1a875b94bc50295bcde8569658b3806ae576874574d5de070ae53092c8cb6b9a16d659727ab0e58a3453e5840922afd64d0d807bf9ddeec382e1aa636c571 SHA512 ad6bfa74c2395867a9f7cc59649642f8877785e1c5ab519d81ad70c9af30077421554d85c348799d4d7f6705ef65db71c61c48117f632ddbee9a5ba2ec75064d -EBUILD ethtool-6.6.ebuild 591 BLAKE2B ea7d45fa546620e6d65f8016c2f0bff89d76083084695f95ca4456b8b2e9655e943c25d4d481710dadbe53ee142d4ed5e16a49972fb04ec6c3e749d4ff11517b SHA512 cdcea2beea7eed45a8844809e739872f6606eee8cc5e903817306939227048a3a269b4786db3aba4f4b2c7d08eb63f3850f3d13cacc94d8795df0b78b22a4304 -EBUILD ethtool-6.7.ebuild 591 BLAKE2B ea7d45fa546620e6d65f8016c2f0bff89d76083084695f95ca4456b8b2e9655e943c25d4d481710dadbe53ee142d4ed5e16a49972fb04ec6c3e749d4ff11517b SHA512 cdcea2beea7eed45a8844809e739872f6606eee8cc5e903817306939227048a3a269b4786db3aba4f4b2c7d08eb63f3850f3d13cacc94d8795df0b78b22a4304 -EBUILD ethtool-6.9.ebuild 592 BLAKE2B 60960192ed058ef292f3108b5a2cdcaac14e9fcfbd7e76decaa1930f3f5c7373164ee5f7f129426300bd83f38f902e721b5d119b5cf0019b2835776a6665176f SHA512 4800cb216d1c253ead6f262019ea7385759a2861fe1f4a74858c9d006e79030949f8e9e1b5cc1a6c29a5d28cc3931a34b1e1de50734324ac1b08b2508afe52a0 +EBUILD ethtool-6.10.ebuild 634 BLAKE2B 0bebd2778e8914baaa6b288346d37d3b3698c864e824e365477bb6068f20728b75ec7974c9d300d2fd771b7c5c767d0f0fe72dd9cd28a71ad1dd660b6c58c38b SHA512 f79c7b9a13a3f81ae90012ec9df1b7378515449bf978680009c0fb88f8e750b10f7ca6240615eca5c40d33055692a51b5e676fff52b6c40434f5c71647430f90 +EBUILD ethtool-6.6.ebuild 626 BLAKE2B fa9322385648da5d6c8db562fc2e2b7caae0e250ac267314ec4d09a0750d9e859bbcdc0fe0db57394ae40000ea4582710de9803f6b8fb6e08f82ea870cab811f SHA512 d3d289f29780bc9f75e9afc70596d0974bcc4cb5094818425d4063aae9efec08fe3853d6e7ff54c3c7a9eb30af15c4d23c77d29487faea6f1f9de83db2a3a99c +EBUILD ethtool-6.7.ebuild 626 BLAKE2B fa9322385648da5d6c8db562fc2e2b7caae0e250ac267314ec4d09a0750d9e859bbcdc0fe0db57394ae40000ea4582710de9803f6b8fb6e08f82ea870cab811f SHA512 d3d289f29780bc9f75e9afc70596d0974bcc4cb5094818425d4063aae9efec08fe3853d6e7ff54c3c7a9eb30af15c4d23c77d29487faea6f1f9de83db2a3a99c +EBUILD ethtool-6.9.ebuild 627 BLAKE2B 89ebbf2f568d93ae2962bb10148cd2fa7154313723ee31efe68392f2699e78d128e3a2fd108f9fafa9f62db665c3c6f877f75bdc16e745e6fcc4c68b7fe490ef SHA512 72e4abc49eb61b316621feb8494379534a5e8a0d09c4e42e7f795467142ae84ce9a472bb13b8b8661517a0515ce70fad50323af603d8a6d27f9f20188995b4b4 MISC metadata.xml 993 BLAKE2B 92777546a5d0d904b319409448ce71991ddd4b89941888b19d2cb093b9f3227361fac1ef39535524a5bcb7b1cfd91c90fb4557d5501b46d44df64e647fb7d3aa SHA512 696f633f299189a01bc9ff309faac585a849323e0d471e1ddb7631bc917c83220844bae7ba1568a181b08029f4109bb2cf0c3063cee5f0d91705a04abe353793 diff --git a/sys-apps/ethtool/ethtool-6.10.ebuild b/sys-apps/ethtool/ethtool-6.10.ebuild index a77d7dcecbe4..e2b004957591 100644 --- a/sys-apps/ethtool/ethtool-6.10.ebuild +++ b/sys-apps/ethtool/ethtool-6.10.ebuild @@ -14,7 +14,10 @@ IUSE="+netlink" RDEPEND="netlink? ( net-libs/libmnl )" DEPEND="${RDEPEND}" -BDEPEND="app-arch/xz-utils" +BDEPEND=" + app-arch/xz-utils + netlink? ( virtual/pkgconfig ) +" src_configure() { econf $(use_enable netlink) diff --git a/sys-apps/ethtool/ethtool-6.6.ebuild b/sys-apps/ethtool/ethtool-6.6.ebuild index 90851ccd8b7c..cd0bd783b1a7 100644 --- a/sys-apps/ethtool/ethtool-6.6.ebuild +++ b/sys-apps/ethtool/ethtool-6.6.ebuild @@ -14,7 +14,10 @@ IUSE="+netlink" RDEPEND="netlink? ( net-libs/libmnl )" DEPEND="${RDEPEND}" -BDEPEND="app-arch/xz-utils" +BDEPEND=" + app-arch/xz-utils + netlink? ( virtual/pkgconfig ) +" src_configure() { econf $(use_enable netlink) diff --git a/sys-apps/ethtool/ethtool-6.7.ebuild b/sys-apps/ethtool/ethtool-6.7.ebuild index 90851ccd8b7c..cd0bd783b1a7 100644 --- a/sys-apps/ethtool/ethtool-6.7.ebuild +++ b/sys-apps/ethtool/ethtool-6.7.ebuild @@ -14,7 +14,10 @@ IUSE="+netlink" RDEPEND="netlink? ( net-libs/libmnl )" DEPEND="${RDEPEND}" -BDEPEND="app-arch/xz-utils" +BDEPEND=" + app-arch/xz-utils + netlink? ( virtual/pkgconfig ) +" src_configure() { econf $(use_enable netlink) diff --git a/sys-apps/ethtool/ethtool-6.9.ebuild b/sys-apps/ethtool/ethtool-6.9.ebuild index 9e9b809a9dfd..cb6df20a3a0b 100644 --- a/sys-apps/ethtool/ethtool-6.9.ebuild +++ b/sys-apps/ethtool/ethtool-6.9.ebuild @@ -14,7 +14,10 @@ IUSE="+netlink" RDEPEND="netlink? ( net-libs/libmnl )" DEPEND="${RDEPEND}" -BDEPEND="app-arch/xz-utils" +BDEPEND=" + app-arch/xz-utils + netlink? ( virtual/pkgconfig ) +" src_configure() { econf $(use_enable netlink) diff --git a/sys-apps/texinfo/Manifest b/sys-apps/texinfo/Manifest index e98acbaa6699..a2d5552e9b7f 100644 --- a/sys-apps/texinfo/Manifest +++ b/sys-apps/texinfo/Manifest @@ -1,11 +1,6 @@ -AUX 7.1/0001-tp-Texinfo-XS-xspara.c-get_utf8_codepoint.patch 3424 BLAKE2B a6a9ac407882b9bda5daa3c3950a84096f5949eeaedab4494c78dd541f527b9414894086c9d9fd389e00af42e9b56e8508eb466dc4311dee6020133c57c941a8 SHA512 c72f5b37cad85c8a6f927f4efdb7107560f483b0bc64192afb64f778f68c3ab73ab646cb536600428b83d9e0fe754f04fe6e8c3fad993655630072f16fa17893 -AUX 7.1/0002-tp-Texinfo-XS-xspara.c-xspara__add_next-Do-not-pass.patch 1488 BLAKE2B fa33876ee93382de2091eb4209134ecc066d18d6b3336bfd4ef00ea2dadeed43ce53d42d491cd99d3ad50503674e8b73e4589590464cf8108dd68e7c1e447f13 SHA512 4f5d5306b29b9185a1676aca166787968b7a736012bc6fec358775f488f76b428cc3ba15da63cfe53a856165c0e05887b3563614ad0985fe1fb518e06d49e1c5 -AUX 7.1/0003-info-scan.c-write_tag_contents-Check-if-added-text-i.patch 1649 BLAKE2B d4ed598172f63c698ccf652d75b246da9d3db5256a3fde0f3692124657c19a2430a7c69c7bd1687e2677fe182e8bf2820ed1ac72cc5d25b3b84267e16dd0a6ea SHA512 c7dc124438319f4340fe75b06a2c7bc5bb6fd69dfbc445eaf5bb7ea3ba2c904cde1db71e41fc985bbdc3ff27b4a5d601633f736cf8a3a7904ece8bde2ce7f802 -AUX 7.1/0004-tp-Texinfo-XS-parsetexi-tree.c-reset_obstacks.patch 1867 BLAKE2B 95dad1dd7c6a5f76f3abfd905340490f19fbfe01ab40e0512ff1fb77a491ee062a8c1f6265048aab7797274f622dd13f6a7ffa560817919b288176346850f94b SHA512 b212e99ac51e06b1bc2dd2eac6fdd5716a0f0a8ebfcfce98b1f27e5a251901c5121ca997c63b59eb79c5deed023e0d3ec07aff2aad67f590b97ea918de784499 -AUX 7.1/0005-tp-Texinfo-command_data.txt.patch 7841 BLAKE2B 47b482d95904b96af0d538c1d969e7c90e82f547d5d96bab855780209378efd5b577a7e0b1b3fef1ca32cb442bb9bee74a80f0bd62237b8a8f03764a368134ae SHA512 050e87f0a0ec5f23eabaeb8ddbc12e42a65121d67da5843210ac3c80deea5ef415b274216702e236919ad42b5e25552fbd704f78c81fb3e737188417a9405195 DIST texinfo-7.1.1.tar.xz 5572864 BLAKE2B 64dbd315e65d5b7cb0bb06c918e9924bb15a25a4bb26322db10b7ee98e9e6626b62592f8edd0ff016256f4a84837dabacb5278c3826e34fa3e080a5e8c0fb626 SHA512 05d605fba810f2939cab16ed5ddb341e22d397370648e6e0271c807fa573267e933c75ed7ae682c3c9cfecb568311a8df7abeb8c0556a94ef7169737d5b9c52a -DIST texinfo-7.1.tar.xz 5545720 BLAKE2B 4385ca6250daeaa4f6bfedd9ab41f25993613031bcb8da55360365701213f4f3cf786d958749c59dc1c9dda328eca42f028aa051a7062313142aa92f55a96ecd SHA512 ceab03e8422d800b08c7b44e8263b0a1f35bb7758d83a81136df6f3304a14daecda98a12a282afb85406d2ca2f665b2295e10b6f4064156ea1285d80d5d355db -EBUILD texinfo-7.1-r1.ebuild 2534 BLAKE2B d451b5949d7e57d010fcf3a4638d2ee899ba9bc3625441ce49559727cb5b2b5ac947f2a20b01034bddf21bb67ae31551de0b58446075c5392ad8aec76ed61185 SHA512 eba76343f12bb54891e8963d08a47ea008699402b6321326ae0b3c9abbb0fc6074c28a2d938dd7d3f072aeeb99964c7d075e89570ed26579d2ba53ba6d971694 +DIST texinfo-7.1.90.tar.xz 6694376 BLAKE2B b77771e39f8c73cea9c449c1f4268dcdb9603497b719dda036908122805f2f4f85507ee797d7d9d1f4c3e4de236a7be6837c2985d7f10960e347860d98c49a8c SHA512 ecf6359c256c3c203fac26d211b4fad738e5e7cb142005a73df22eb17888296eac17d4748551243fee1f1cf891e612deeeb85bc841c8b64acb99e7fa49d1c3ad EBUILD texinfo-7.1.1.ebuild 2461 BLAKE2B f6f250d33af7029937e2c78d59d7b175f50a20784fb0bcdc608ef3e517c3e3db03d1245b443cea1106725f73cca50628888eb7417134847a18905f309446c206 SHA512 32c052cdef710bfbfb65738d6099a496ecba17dcd829598c241d599f3dd67376aaaaf44d167d08867743f5bcdf3ed9cd73ad4bc665a18c9acc0e8d883c676a8a +EBUILD texinfo-7.1.90.ebuild 2469 BLAKE2B e618b521a09399d8d5ed2131cd3a9c45a534720df4dae25212930da1326814f750017804b56d1b2117785fd365408aa6a6404a18114c707b346845c90f3b99cd SHA512 813703a04ece913809736af871449a501c0e0fa08310b4c07d28c67442df4650e2be1551c9df79001f1d70b6401fd607c19250d4a16dfcbfb41a484fbfdbb95b EBUILD texinfo-9999.ebuild 2469 BLAKE2B e618b521a09399d8d5ed2131cd3a9c45a534720df4dae25212930da1326814f750017804b56d1b2117785fd365408aa6a6404a18114c707b346845c90f3b99cd SHA512 813703a04ece913809736af871449a501c0e0fa08310b4c07d28c67442df4650e2be1551c9df79001f1d70b6401fd607c19250d4a16dfcbfb41a484fbfdbb95b MISC metadata.xml 588 BLAKE2B 4e5549f1b07df4c081d2cc03691f0f8ba13c0f8f86807a7e5e87ea618080895a2714f169e9a1294226e71207ed88586a027092a328ab618f417ae3a74ac2586b SHA512 343c287a2c0c7f7bcbd5a40373c0aebe718d46042947abcb8364fed0aeb6dd7e585e9d226ef5bfb0084074d085510e802faf3a3c08b1489ed35556b6c14d1015 diff --git a/sys-apps/texinfo/files/7.1/0001-tp-Texinfo-XS-xspara.c-get_utf8_codepoint.patch b/sys-apps/texinfo/files/7.1/0001-tp-Texinfo-XS-xspara.c-get_utf8_codepoint.patch deleted file mode 100644 index 8aed47b7bc24..000000000000 --- a/sys-apps/texinfo/files/7.1/0001-tp-Texinfo-XS-xspara.c-get_utf8_codepoint.patch +++ /dev/null @@ -1,103 +0,0 @@ -From c76bcd0feed005aaf9db28a76f4883f3ae98295b Mon Sep 17 00:00:00 2001 -From: Gavin Smith -Date: Mon, 23 Oct 2023 19:51:00 +0100 -Subject: [PATCH 1/5] * tp/Texinfo/XS/xspara.c (get_utf8_codepoint): Wrapper - for mbrtowc/btowc. [_WIN32]: Do not call btowc, as it was tested to be very - slow on MinGW. Report from Eli Zaretskii. - ---- - ChangeLog | 7 ++++++ - tp/Texinfo/XS/xspara.c | 48 +++++++++++++++++++++++------------------- - 2 files changed, 33 insertions(+), 22 deletions(-) - -diff --git a/ChangeLog b/ChangeLog -index e619109f5b..c4379ec56b 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,3 +1,10 @@ -+2023-10-23 Gavin Smith -+ -+ * tp/Texinfo/XS/xspara.c (get_utf8_codepoint): -+ Wrapper for mbrtowc/btowc. -+ [_WIN32]: Do not call btowc, as it was tested to be very slow -+ on MinGW. Report from Eli Zaretskii. -+ - 2023-10-18 Gavin Smith - - Texinfo 7.1 -diff --git a/tp/Texinfo/XS/xspara.c b/tp/Texinfo/XS/xspara.c -index 7c6895a7ff..e1cddcdc2a 100644 ---- a/tp/Texinfo/XS/xspara.c -+++ b/tp/Texinfo/XS/xspara.c -@@ -684,6 +684,30 @@ xspara_end (void) - /* characters triggering an end of sentence */ - #define end_sentence_characters ".?!" - -+/* Wrapper for mbrtowc. Set *PWC and return length of codepoint in bytes. */ -+size_t -+get_utf8_codepoint (wchar_t *pwc, const char *mbs, size_t n) -+{ -+#ifdef _WIN32 -+ /* Use the above implementation of mbrtowc. Do not use btowc as -+ does not exist as standard on MS-Windows, and was tested to be -+ very slow on MinGW. */ -+ return mbrtowc (pwc, mbs, n, NULL); -+#else -+ if (!PRINTABLE_ASCII(*mbs)) -+ { -+ return mbrtowc (pwc, mbs, n, NULL); -+ } -+ else -+ { -+ /* Functionally the same as mbrtowc but (tested) slightly quicker. */ -+ *pwc = btowc (*mbs); -+ return 1; -+ } -+#endif -+} -+ -+ - /* Add WORD to paragraph in RESULT, not refilling WORD. If we go past the end - of the line start a new one. TRANSPARENT means that the letters in WORD - are ignored for the purpose of deciding whether a full stop ends a sentence -@@ -730,18 +754,7 @@ xspara__add_next (TEXT *result, char *word, int word_len, int transparent) - if (!strchr (end_sentence_characters - after_punctuation_characters, *p)) - { -- if (!PRINTABLE_ASCII(*p)) -- { -- wchar_t wc = L'\0'; -- mbrtowc (&wc, p, len, NULL); -- state.last_letter = wc; -- break; -- } -- else -- { -- state.last_letter = btowc (*p); -- break; -- } -+ get_utf8_codepoint (&state.last_letter, p, len); - } - } - } -@@ -1013,16 +1026,7 @@ xspara_add_text (char *text, int len) - } - - /************** Not a white space character. *****************/ -- if (!PRINTABLE_ASCII(*p)) -- { -- char_len = mbrtowc (&wc, p, len, NULL); -- } -- else -- { -- /* Functonally the same as mbrtowc but (tested) slightly quicker. */ -- char_len = 1; -- wc = btowc (*p); -- } -+ char_len = get_utf8_codepoint (&wc, p, len); - - if ((long) char_len == 0) - break; /* Null character. Shouldn't happen. */ --- -2.42.1 - diff --git a/sys-apps/texinfo/files/7.1/0002-tp-Texinfo-XS-xspara.c-xspara__add_next-Do-not-pass.patch b/sys-apps/texinfo/files/7.1/0002-tp-Texinfo-XS-xspara.c-xspara__add_next-Do-not-pass.patch deleted file mode 100644 index 242f90add70d..000000000000 --- a/sys-apps/texinfo/files/7.1/0002-tp-Texinfo-XS-xspara.c-xspara__add_next-Do-not-pass.patch +++ /dev/null @@ -1,44 +0,0 @@ -From f038d3f13f95b5494d5523f2af9dec59ff89b79d Mon Sep 17 00:00:00 2001 -From: Eli Zaretskii -Date: Wed, 25 Oct 2023 22:35:37 +0100 -Subject: [PATCH 2/5] * tp/Texinfo/XS/xspara.c (xspara__add_next): Do not pass - pointer to wint_t as a pointer to wchar_t, as the two types may be of - different sizes. - ---- - ChangeLog | 6 ++++++ - tp/Texinfo/XS/xspara.c | 4 +++- - 2 files changed, 9 insertions(+), 1 deletion(-) - -diff --git a/ChangeLog b/ChangeLog -index c4379ec56b..3d13a15517 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,3 +1,9 @@ -+2023-10-25 Eli Zaretskii -+ -+ * tp/Texinfo/XS/xspara.c (xspara__add_next): Do not pass -+ pointer to wint_t as a pointer to wchar_t, as the two types -+ may be of different sizes. -+ - 2023-10-23 Gavin Smith - - * tp/Texinfo/XS/xspara.c (get_utf8_codepoint): -diff --git a/tp/Texinfo/XS/xspara.c b/tp/Texinfo/XS/xspara.c -index e1cddcdc2a..130e43a4db 100644 ---- a/tp/Texinfo/XS/xspara.c -+++ b/tp/Texinfo/XS/xspara.c -@@ -754,7 +754,9 @@ xspara__add_next (TEXT *result, char *word, int word_len, int transparent) - if (!strchr (end_sentence_characters - after_punctuation_characters, *p)) - { -- get_utf8_codepoint (&state.last_letter, p, len); -+ wchar_t wc; -+ get_utf8_codepoint (&wc, p, len); -+ state.last_letter = wc; - } - } - } --- -2.42.1 - diff --git a/sys-apps/texinfo/files/7.1/0003-info-scan.c-write_tag_contents-Check-if-added-text-i.patch b/sys-apps/texinfo/files/7.1/0003-info-scan.c-write_tag_contents-Check-if-added-text-i.patch deleted file mode 100644 index b3fbc85f461b..000000000000 --- a/sys-apps/texinfo/files/7.1/0003-info-scan.c-write_tag_contents-Check-if-added-text-i.patch +++ /dev/null @@ -1,51 +0,0 @@ -https://lists.gnu.org/archive/html/bug-texinfo/2023-11/msg00001.html - -From 12ad80f3a1cfa78c8a7b3a45458df7e07251317d Mon Sep 17 00:00:00 2001 -From: Gavin Smith -Date: Sat, 4 Nov 2023 10:38:48 +0000 -Subject: [PATCH 3/5] * info/scan.c (write_tag_contents): Check if added text - is of zero length in order to avoid subsequently calling memcpy with a null - source argument. Report with -fsanitize=undefined on amd64 from Sam James - . - ---- - ChangeLog | 7 +++++++ - info/scan.c | 4 ++-- - 2 files changed, 9 insertions(+), 2 deletions(-) - -diff --git a/ChangeLog b/ChangeLog -index 3d13a15517..efbb3b22d1 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,3 +1,10 @@ -+2023-11-04 Gavin Smith -+ -+ * info/scan.c (write_tag_contents): Check if added text is of -+ zero length in order to avoid subsequently calling memcpy with -+ a null source argument. Report with -fsanitize=undefined on amd64 -+ from Sam James . -+ - 2023-10-25 Eli Zaretskii - - * tp/Texinfo/XS/xspara.c (xspara__add_next): Do not pass -diff --git a/info/scan.c b/info/scan.c -index d6183ae9ae..bdf272f9bf 100644 ---- a/info/scan.c -+++ b/info/scan.c -@@ -925,11 +925,11 @@ write_extra_bytes_to_output (char *input, long n) - } - - /* Like write_extra_bytes_to_output, but writes bytes even when -- preprocess_nodes=Off. */ -+ preprocess_nodes=Off. Note n could be 0 for an index tag. */ - static void - write_tag_contents (char *input, long n) - { -- if (rewrite_p) -+ if (rewrite_p && n > 0) - { - text_buffer_add_string (&output_buf, input, n); - output_bytes_difference -= n; --- -2.42.1 - diff --git a/sys-apps/texinfo/files/7.1/0004-tp-Texinfo-XS-parsetexi-tree.c-reset_obstacks.patch b/sys-apps/texinfo/files/7.1/0004-tp-Texinfo-XS-parsetexi-tree.c-reset_obstacks.patch deleted file mode 100644 index 6f57363fc435..000000000000 --- a/sys-apps/texinfo/files/7.1/0004-tp-Texinfo-XS-parsetexi-tree.c-reset_obstacks.patch +++ /dev/null @@ -1,53 +0,0 @@ -https://lists.gnu.org/archive/html/bug-texinfo/2023-11/msg00000.html -https://lists.gnu.org/archive/html/bug-texinfo/2023-11/msg00016.html -https://lists.gnu.org/archive/html/bug-texinfo/2023-11/msg00073.html - -From 81a854e22ca2449f2351436a863e5262935f5dc0 Mon Sep 17 00:00:00 2001 -From: Gavin Smith -Date: Mon, 13 Nov 2023 18:43:40 +0000 -Subject: [PATCH 4/5] * tp/Texinfo/XS/parsetexi/tree.c (reset_obstacks): Call - obstack_alignment_mask to use 8-byte alignment. Needed for Debian on - sparc64. Report of "Bus error" from John Paul Adrian Glaubitz - . - ---- - ChangeLog | 7 +++++++ - tp/Texinfo/XS/parsetexi/tree.c | 7 ++++++- - 2 files changed, 13 insertions(+), 1 deletion(-) - -diff --git a/ChangeLog b/ChangeLog -index efbb3b22d1..a146820671 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,3 +1,10 @@ -+2023-11-13 Gavin Smith -+ -+ * tp/Texinfo/XS/parsetexi/tree.c (reset_obstacks): -+ Call obstack_alignment_mask to use 8-byte alignment. Needed -+ for Debian on sparc64. Report of "Bus error" from -+ John Paul Adrian Glaubitz . -+ - 2023-11-04 Gavin Smith - - * info/scan.c (write_tag_contents): Check if added text is of -diff --git a/tp/Texinfo/XS/parsetexi/tree.c b/tp/Texinfo/XS/parsetexi/tree.c -index f2d69e0454..09db6fc151 100644 ---- a/tp/Texinfo/XS/parsetexi/tree.c -+++ b/tp/Texinfo/XS/parsetexi/tree.c -@@ -43,7 +43,12 @@ reset_obstacks (void) - if (obs_element_first) - obstack_free (&obs_element, obs_element_first); - else -- obstack_init (&obs_element); -+ { -+ /* Specify 8-byte alignment. Needed for SPARC. */ -+ obstack_alignment_mask (&obs_element) = 7; -+ -+ obstack_init (&obs_element); -+ } - - obs_element_first = obstack_alloc (&obs_element, sizeof (int)); - } --- -2.42.1 - diff --git a/sys-apps/texinfo/files/7.1/0005-tp-Texinfo-command_data.txt.patch b/sys-apps/texinfo/files/7.1/0005-tp-Texinfo-command_data.txt.patch deleted file mode 100644 index 59b590617964..000000000000 --- a/sys-apps/texinfo/files/7.1/0005-tp-Texinfo-command_data.txt.patch +++ /dev/null @@ -1,221 +0,0 @@ -From f1f8920d798dbcb20cb775b46a54cd81847295fd Mon Sep 17 00:00:00 2001 -From: Gavin Smith -Date: Tue, 14 Nov 2023 21:53:49 +0000 -Subject: [PATCH 5/5] * tp/Texinfo/command_data.txt (item_LINE, itemx, - defblock, defline, deftypeline): Remove contain_basic_inline flag. There is - no reason an @anchor should not occur inside @item, inside @table, or the - other commands, as no index entry is being created with the @anchor. - -Report from Ihor Radchenko for Org mode manual. ---- - ChangeLog | 10 +++ - tp/Texinfo/command_data.txt | 10 +-- - tp/t/results/invalid_nestings/in_table.pl | 90 ------------------- - .../invalid_nestings/table_on_item_line.pl | 9 -- - 4 files changed, 15 insertions(+), 104 deletions(-) - -diff --git a/ChangeLog b/ChangeLog -index a146820671..0dcdb1a904 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,3 +1,13 @@ -+2023-11-14 Gavin Smith -+ -+ * tp/Texinfo/command_data.txt -+ (item_LINE, itemx, defblock, defline, deftypeline): -+ Remove contain_basic_inline flag. There is no reason an @anchor -+ should not occur inside @item, inside @table, or the other -+ commands, as no index entry is being created with the @anchor. -+ -+ Report from Ihor Radchenko for Org mode manual. -+ - 2023-11-13 Gavin Smith - - * tp/Texinfo/XS/parsetexi/tree.c (reset_obstacks): -diff --git a/tp/Texinfo/command_data.txt b/tp/Texinfo/command_data.txt -index bcda173e2c..c9b5f51569 100644 ---- a/tp/Texinfo/command_data.txt -+++ b/tp/Texinfo/command_data.txt -@@ -253,8 +253,8 @@ printindex line,formattable_line,close_paragraph,global,contain_pla - listoffloats line,formattable_line,close_paragraph,global,contain_basic_inline LINE_line - exdent line,formatted_line,close_paragraph LINE_line - # or nobrace skipspace, depending on the context --item_LINE line,formatted_line,close_paragraph,contain_basic_inline LINE_line --itemx line,formatted_line,close_paragraph,contain_basic_inline LINE_line -+item_LINE line,formatted_line,close_paragraph LINE_line -+itemx line,formatted_line,close_paragraph LINE_line - nodedescription line,close_paragraph LINE_line - # in index entries - subentry line,in_index,contain_basic_inline LINE_line -@@ -494,9 +494,9 @@ defmethod block,def,contain_basic_inline,def_alias,close_paragraph - deftypemethod block,def,contain_basic_inline,def_alias,close_paragraph BLOCK_def - - # generic, no automatic index --defblock block,contain_basic_inline,close_paragraph BLOCK_def --defline line,def,contain_basic_inline,close_paragraph LINE_line --deftypeline line,def,contain_basic_inline,close_paragraph LINE_line -+defblock block,close_paragraph BLOCK_def -+defline line,def,close_paragraph LINE_line -+deftypeline line,def,close_paragraph LINE_line - - # def*x - deffnx line,def,contain_basic_inline,close_paragraph LINE_line -diff --git a/tp/t/results/invalid_nestings/in_table.pl b/tp/t/results/invalid_nestings/in_table.pl -index f4dcef1141..76eea8b3b4 100644 ---- a/tp/t/results/invalid_nestings/in_table.pl -+++ b/tp/t/results/invalid_nestings/in_table.pl -@@ -1107,42 +1107,6 @@ $result_errors{'in_table'} = [ - 'text' => '@indent should not appear in @item', - 'type' => 'warning' - }, -- { -- 'error_line' => 'warning: @indent should not appear on @item line --', -- 'file_name' => '', -- 'line_nr' => 9, -- 'macro' => '', -- 'text' => '@indent should not appear on @item line', -- 'type' => 'warning' -- }, -- { -- 'error_line' => 'warning: @titlefont should not appear on @item line --', -- 'file_name' => '', -- 'line_nr' => 9, -- 'macro' => '', -- 'text' => '@titlefont should not appear on @item line', -- 'type' => 'warning' -- }, -- { -- 'error_line' => 'warning: @anchor should not appear on @item line --', -- 'file_name' => '', -- 'line_nr' => 9, -- 'macro' => '', -- 'text' => '@anchor should not appear on @item line', -- 'type' => 'warning' -- }, -- { -- 'error_line' => 'warning: @footnote should not appear on @item line --', -- 'file_name' => '', -- 'line_nr' => 9, -- 'macro' => '', -- 'text' => '@footnote should not appear on @item line', -- 'type' => 'warning' -- }, - { - 'error_line' => 'warning: @exdent should only appear at the beginning of a line - ', -@@ -1161,24 +1125,6 @@ $result_errors{'in_table'} = [ - 'text' => '@exdent should not appear in @item', - 'type' => 'warning' - }, -- { -- 'error_line' => 'warning: @exdent should not appear on @item line --', -- 'file_name' => '', -- 'line_nr' => 9, -- 'macro' => '', -- 'text' => '@exdent should not appear on @item line', -- 'type' => 'warning' -- }, -- { -- 'error_line' => 'warning: @ref should not appear on @item line --', -- 'file_name' => '', -- 'line_nr' => 11, -- 'macro' => '', -- 'text' => '@ref should not appear on @item line', -- 'type' => 'warning' -- }, - { - 'error_line' => '@ref missing closing brace - ', -@@ -1206,15 +1152,6 @@ $result_errors{'in_table'} = [ - 'text' => '@center should not appear in @item', - 'type' => 'warning' - }, -- { -- 'error_line' => 'warning: @center should not appear on @item line --', -- 'file_name' => '', -- 'line_nr' => 13, -- 'macro' => '', -- 'text' => '@center should not appear on @item line', -- 'type' => 'warning' -- }, - { - 'error_line' => 'warning: @cindex should not appear in @item - ', -@@ -1224,15 +1161,6 @@ $result_errors{'in_table'} = [ - 'text' => '@cindex should not appear in @item', - 'type' => 'warning' - }, -- { -- 'error_line' => 'warning: @cindex should not appear on @item line --', -- 'file_name' => '', -- 'line_nr' => 14, -- 'macro' => '', -- 'text' => '@cindex should not appear on @item line', -- 'type' => 'warning' -- }, - { - 'error_line' => 'warning: @cindex should not appear in @item - ', -@@ -1242,15 +1170,6 @@ $result_errors{'in_table'} = [ - 'text' => '@cindex should not appear in @item', - 'type' => 'warning' - }, -- { -- 'error_line' => 'warning: @cindex should not appear on @item line --', -- 'file_name' => '', -- 'line_nr' => 18, -- 'macro' => '', -- 'text' => '@cindex should not appear on @item line', -- 'type' => 'warning' -- }, - { - 'error_line' => 'warning: @cindex should not appear in @item - ', -@@ -1260,15 +1179,6 @@ $result_errors{'in_table'} = [ - 'text' => '@cindex should not appear in @item', - 'type' => 'warning' - }, -- { -- 'error_line' => 'warning: @cindex should not appear on @item line --', -- 'file_name' => '', -- 'line_nr' => 21, -- 'macro' => '', -- 'text' => '@cindex should not appear on @item line', -- 'type' => 'warning' -- }, - { - 'error_line' => 'warning: empty index key in @item - ', -diff --git a/tp/t/results/invalid_nestings/table_on_item_line.pl b/tp/t/results/invalid_nestings/table_on_item_line.pl -index b1184ba915..51ba523fd7 100644 ---- a/tp/t/results/invalid_nestings/table_on_item_line.pl -+++ b/tp/t/results/invalid_nestings/table_on_item_line.pl -@@ -273,15 +273,6 @@ $result_errors{'table_on_item_line'} = [ - 'text' => '@table should not appear in @item', - 'type' => 'warning' - }, -- { -- 'error_line' => 'warning: @table should not appear on @item line --', -- 'file_name' => '', -- 'line_nr' => 2, -- 'macro' => '', -- 'text' => '@table should not appear on @item line', -- 'type' => 'warning' -- }, - { - 'error_line' => 'no matching `@end table\' - ', --- -2.42.1 - diff --git a/sys-apps/texinfo/texinfo-7.1-r1.ebuild b/sys-apps/texinfo/texinfo-7.1-r1.ebuild deleted file mode 100644 index 6cb50bcb6b49..000000000000 --- a/sys-apps/texinfo/texinfo-7.1-r1.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Note: if your package uses the texi2dvi utility, it must depend on the -# virtual/texi2dvi package to pull in all the right deps. The tool is not -# usable out-of-the-box because it requires the large tex packages. - -# Keep an eye on the release/$(ver_cut 1-2) branch upstream for backports. - -EAPI=8 - -inherit flag-o-matic toolchain-funcs - -DESCRIPTION="The GNU info program and utilities" -HOMEPAGE="https://www.gnu.org/software/texinfo/" - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://git.savannah.gnu.org/git/texinfo.git" - REGEN_BDEPEND=" - >=dev-build/autoconf-2.62 - >=dev-build/automake-1.16 - dev-build/libtool - " -elif [[ $(ver_cut 3) -ge 90 || $(ver_cut 4) -ge 90 ]] ; then - SRC_URI="https://alpha.gnu.org/gnu/${PN}/${P}.tar.xz" - REGEN_BDEPEND="" -else - SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" - REGEN_BDEPEND="" -fi - -LICENSE="GPL-3+" -SLOT="0" -IUSE="nls +standalone static" - -RDEPEND=" - >=sys-libs/ncurses-5.2-r2:= - virtual/perl-Data-Dumper - virtual/perl-Encode - virtual/perl-Unicode-Collate - standalone? ( >=dev-lang/perl-5.8.1 ) - !standalone? ( - >=dev-lang/perl-5.8.1:= - dev-libs/libunistring:= - ) - nls? ( virtual/libintl ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - ${REGEN_BDEPEND} - nls? ( >=sys-devel/gettext-0.19.6 ) -" - -PATCHES=( - # Backports from the release/7.1 branch - "${FILESDIR}"/7.1 -) - -src_prepare() { - default - - if [[ ${PV} == 9999 ]]; then - ./autogen.sh || die - fi - - # Needed if a patch touches install-info.c - #touch man/install-info.1 || die - - if use prefix ; then - sed -i -e '1c\#!/usr/bin/env sh' util/texi2dvi util/texi2pdf || die - touch {doc,man}/{texi2dvi,texi2pdf,pdftexi2dvi}.1 || die - fi -} - -src_configure() { - # Respect compiler and CPPFLAGS/CFLAGS/LDFLAGS for Perl extensions - # bug #622576 - local -x PERL_EXT_CC="$(tc-getCC)" PERL_EXT_CPPFLAGS="${CPPFLAGS}" - local -x PERL_EXT_CFLAGS="${CFLAGS}" PERL_EXT_LDFLAGS="${LDFLAGS}" - - use static && append-ldflags -static - - # TODO: - # --with-external-Unicode-EastAsianWidth - # --with-external-Text-Unidecode - # - # Also, 7.0.91 seemed to introduce a included-libunistring w/ USE=-standalone - # but it doesn't seem to do anything? - local myeconfargs=( - --cache-file="${S}"/config.cache - $(use_enable nls) - $(use_enable !standalone perl-xs) - ) - - econf "${myeconfargs[@]}" -} diff --git a/sys-apps/texinfo/texinfo-7.1.90.ebuild b/sys-apps/texinfo/texinfo-7.1.90.ebuild new file mode 100644 index 000000000000..eda59950b465 --- /dev/null +++ b/sys-apps/texinfo/texinfo-7.1.90.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Note: if your package uses the texi2dvi utility, it must depend on the +# virtual/texi2dvi package to pull in all the right deps. The tool is not +# usable out-of-the-box because it requires the large tex packages. + +# Keep an eye on the release/$(ver_cut 1-2) branch upstream for backports. + +EAPI=8 + +inherit flag-o-matic toolchain-funcs + +DESCRIPTION="The GNU info program and utilities" +HOMEPAGE="https://www.gnu.org/software/texinfo/" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://git.savannah.gnu.org/git/texinfo.git" + REGEN_BDEPEND=" + >=dev-build/autoconf-2.62 + >=dev-build/automake-1.16 + dev-build/libtool + " +elif [[ $(ver_cut 3) -ge 90 || $(ver_cut 4) -ge 90 ]] ; then + SRC_URI="https://alpha.gnu.org/gnu/${PN}/${P}.tar.xz" + REGEN_BDEPEND="" +else + SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + REGEN_BDEPEND="" +fi + +LICENSE="GPL-3+" +SLOT="0" +IUSE="nls +standalone static" + +RDEPEND=" + >=sys-libs/ncurses-5.2-r2:= + virtual/perl-Data-Dumper + virtual/perl-Encode + virtual/perl-Unicode-Collate + standalone? ( >=dev-lang/perl-5.8.1 ) + !standalone? ( + >=dev-lang/perl-5.8.1:= + dev-libs/libunistring:= + ) + nls? ( virtual/libintl ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + ${REGEN_BDEPEND} + nls? ( >=sys-devel/gettext-0.19.6 ) +" + +src_prepare() { + default + + if [[ ${PV} == 9999 ]]; then + ./autogen.sh || die + fi + + # Needed if a patch touches install-info.c + #touch man/install-info.1 || die + + if use prefix ; then + sed -i -e '1c\#!/usr/bin/env sh' util/texi2dvi util/texi2pdf || die + touch {doc,man}/{texi2dvi,texi2pdf,pdftexi2dvi}.1 || die + fi +} + +src_configure() { + # Respect compiler and CPPFLAGS/CFLAGS/LDFLAGS for Perl extensions + # bug #622576 + local -x PERL_EXT_CC="$(tc-getCC)" PERL_EXT_CPPFLAGS="${CPPFLAGS}" + local -x PERL_EXT_CFLAGS="${CFLAGS}" PERL_EXT_LDFLAGS="${LDFLAGS}" + + use static && append-ldflags -static + + # TODO: + # --with-external-Unicode-EastAsianWidth + # --with-external-Text-Unidecode + # + # Also, 7.0.91 seemed to introduce a included-libunistring w/ USE=-standalone + # but it doesn't seem to do anything? + local myeconfargs=( + --cache-file="${S}"/config.cache + $(use_enable nls) + $(use_enable !standalone perl-xs) + ) + + econf "${myeconfargs[@]}" +} -- cgit v1.2.3