From d91034bb707551b50209cfd2b2225da76fc88126 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 23 Oct 2023 20:37:30 +0100 Subject: gentoo auto-resync : 23:10:2023 - 20:37:30 --- x11-terms/Manifest.gz | Bin 4543 -> 4546 bytes x11-terms/mlterm/Manifest | 6 +- x11-terms/mlterm/files/mlterm-clang-16.patch | 123 +++++++++++++++++++ .../mlterm/files/mlterm-configure-clang16.patch | 123 ------------------- x11-terms/mlterm/mlterm-3.9.2.ebuild | 133 --------------------- x11-terms/mlterm/mlterm-3.9.3-r1.ebuild | 2 +- 6 files changed, 126 insertions(+), 261 deletions(-) create mode 100644 x11-terms/mlterm/files/mlterm-clang-16.patch delete mode 100644 x11-terms/mlterm/files/mlterm-configure-clang16.patch delete mode 100644 x11-terms/mlterm/mlterm-3.9.2.ebuild (limited to 'x11-terms') diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz index a3c4e176d67f..64c8c302ed49 100644 Binary files a/x11-terms/Manifest.gz and b/x11-terms/Manifest.gz differ diff --git a/x11-terms/mlterm/Manifest b/x11-terms/mlterm/Manifest index 18ead4b9af5d..ff3a39e07172 100644 --- a/x11-terms/mlterm/Manifest +++ b/x11-terms/mlterm/Manifest @@ -1,7 +1,5 @@ -AUX mlterm-configure-clang16.patch 3768 BLAKE2B 2a7b5e99c469fcc4303017a0aa0d5a4e7c097d5ce4a4a0642701d7e5b68e3737a557c34a60d2847ca4571ae6d4788f8853a4b72d95df9bb721110dcff6c5c372 SHA512 be0025373d14eff53ad4d3d07333f0ffb269a0f2b7857a79046596abd2761ef12044cbcefe42a30193626e3eea5c016d6f484f9aecb325ebe1caa3d086da3ea5 +AUX mlterm-clang-16.patch 3768 BLAKE2B 2a7b5e99c469fcc4303017a0aa0d5a4e7c097d5ce4a4a0642701d7e5b68e3737a557c34a60d2847ca4571ae6d4788f8853a4b72d95df9bb721110dcff6c5c372 SHA512 be0025373d14eff53ad4d3d07333f0ffb269a0f2b7857a79046596abd2761ef12044cbcefe42a30193626e3eea5c016d6f484f9aecb325ebe1caa3d086da3ea5 AUX mlterm-font.patch 606 BLAKE2B 5d9989a2656a0375e79c189db88167f443c3f7ee6f7f8b83972b65cc59b455fcb2c2ee6c4a25c82bb48cb2610d7453a5552b0eb5a17bd80eed947418a038b252 SHA512 60e625e554341feda77a926f3a59c4858ab19a810eeba39810701c429a504666643e1a614586b88379fe2d42606865f0afa8da6c14c1499a52aa1200e8bd5c4a -DIST mlterm-3.9.2.tar.gz 4259208 BLAKE2B 161d496326abd58e8dabedd4c49e0e17ade77956fd0be6f450d5adf2953fe04a2c62a40d3694296d12cdea1274410e17a64cc62f88b953d894cce216425b29f3 SHA512 3076dafbc98a01738d88acf0e0f52e15d33862b3e9b7a851a4496f1be07ee9e51103daf7842954bcae1f1ba62bd6645b0bd60af7f66ee98721bdf3786b9fcbaf DIST mlterm-3.9.3.tar.gz 4272090 BLAKE2B 8f71a8c5cd63b7caa803e699a7e42b8d11cb18324595a7a255c7542df6fad6b968bf56a03a2d19a2381d103232685e3c3cd62388ac036a024870fbe3d222d081 SHA512 67c22ee8411cef499620a37e43af5609bb52cf8be6b617f0dfa6605217eb7f66227bfe073ca9b878606392fac26f94299221b5890fba1d90a3afc35a0f3132a1 -EBUILD mlterm-3.9.2.ebuild 2988 BLAKE2B 59e3a253040ecbab108e3b213e6f792835a0a7a5218030719e7a64ae697905a38d409db4f9d767d51c973fa7398a0225af93c0bbeccb22129892bc822ad59347 SHA512 0e7baa0d749843c051c0102f38c3e51924bb8b168ed44053fb7ce42d1f98827647fa90f431f87f7daff4d7e0457bcd4d78ae62ff6b7f82ea0b8a3a93177e333c -EBUILD mlterm-3.9.3-r1.ebuild 3051 BLAKE2B a5353df3f190058d56f4be5e152ee1ac534c667ea2a1e9ffbf7a014ea6808c3da364614c6ede6a8265eef10c4fecbe8edd45c066cfef67de3336dc48e0ed6412 SHA512 38929ae293d2597c44a135562b522ee16045d653663163e2a249fca31c036238a04e1f8195fee6b09de10b0f6adb5a40a7dd79467a9210f1ef51a2e9371ec3a4 +EBUILD mlterm-3.9.3-r1.ebuild 3042 BLAKE2B 9e13775d72fb31969e73e533a913bbbe663c0aca05d9845f4335e04445e46d17b45e3eb3ef20ed0bcf56946aa1c89d61af2e2a0b14c6dcb00675bc895a2ed205 SHA512 73ad7097b61705683472f288fbacb36170f11587e41d2502d5ec026ba39931091981efaed7f165b631116819b690e9722d706a8ad8b88944c9369a670aa32d00 MISC metadata.xml 1228 BLAKE2B 788a19c8b676d0d5991cd80809f67f526edf6343ab897bc6287cc51f100b4e82bc5cffea0d2165ed3dc7950d0302579005763b0679aaaad5aaabdb8947a94d94 SHA512 d2efc5096992c50c00437cb5e735a12959e6e577b11c9f3d653ca2123ad04923db38c796bc3eaabd79772f521096784404b68a324712f749a15fbd81ae33eabe diff --git a/x11-terms/mlterm/files/mlterm-clang-16.patch b/x11-terms/mlterm/files/mlterm-clang-16.patch new file mode 100644 index 000000000000..134870d8f756 --- /dev/null +++ b/x11-terms/mlterm/files/mlterm-clang-16.patch @@ -0,0 +1,123 @@ +https://github.com/arakiken/mlterm/pull/68 + +From 4eb1a0b237a861cee7ba0ceb4b69d54ab46f87f5 Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Sun, 16 Apr 2023 11:38:16 +0100 +Subject: [PATCH] Fix configure.ac compatibility with Clang 16 + +Clang 16 makes -Wimplicit-function-declaration and -Wimplicit-int errors by default. + +Unfortunately, this can lead to misconfiguration or miscompilation of software as configure +tests may then return the wrong result. + +For more information, see LWN.net [0] or LLVM's Discourse [1], the Gentoo wiki [2], +or the (new) c-std-porting mailing list [3]. + +Bug: https://bugs.gentoo.org/904353 + +[0] https://lwn.net/Articles/913505/ +[1] https://discourse.llvm.org/t/configure-script-breakage-with-the-new-werror-implicit-function-declaration/65213 +[2] https://wiki.gentoo.org/wiki/Modern_C_porting +[3] hosted at lists.linux.dev. +--- a/baselib/configure ++++ b/baselib/configure +@@ -13226,6 +13226,8 @@ See \`config.log' for more details" "$LINENO" 5; } + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ ++#define _XOPEN_SOURCE 600 ++#include + #include + int + main () +@@ -13599,6 +13601,8 @@ else + /* end confdefs.h. */ + + #include ++ #include ++ #include + int main() { + return calloc(8, ((1 << (sizeof(size_t) * 8 - 1)) + 1)) ? 1 : 0 ; + } +--- a/baselib/configure.in ++++ b/baselib/configure.in +@@ -285,7 +285,9 @@ elif test "$bl_cv_mingw" = "yes" ; then + bl_cv_pty=streams + elif test "$host" = "$build" ; then + AC_CHECK_FUNC(posix_openpt, +- [AC_RUN_IFELSE([AC_LANG_PROGRAM([#include ], ++ [AC_RUN_IFELSE([AC_LANG_PROGRAM([#define _XOPEN_SOURCE 600 ++ #include ++ #include ], + [return posix_openpt(O_RDWR | O_NOCTTY) == -1;])], + [ + AC_DEFINE(HAVE_POSIX_OPENPT,,"HAVE_POSIX_OPENPT") +@@ -435,6 +437,8 @@ if test "$host" = "$build"; then + AC_TRY_RUN( + [ + #include ++ #include ++ #include + int main() { + return calloc(8, ((1 << (sizeof(size_t) * 8 - 1)) + 1)) ? 1 : 0 ; + } +--- a/configure ++++ b/configure +@@ -25110,6 +25110,8 @@ See \`config.log' for more details" "$LINENO" 5; } + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ ++#define _XOPEN_SOURCE 600 ++#include + #include + int + main () +@@ -25147,6 +25149,7 @@ else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include ++#include + int + main () + { +@@ -25475,6 +25478,8 @@ else + /* end confdefs.h. */ + + #include ++ #include ++ #include + int main() { + return calloc(8, ((1 << (sizeof(size_t) * 8 - 1)) + 1)) ? 1 : 0 ; + } +--- a/configure.in ++++ b/configure.in +@@ -2150,7 +2150,9 @@ elif test "$bl_cv_mingw" = "yes" ; then + bl_cv_pty=streams + elif test "$host" = "$build" ; then + AC_CHECK_FUNC(posix_openpt, +- [AC_RUN_IFELSE([AC_LANG_PROGRAM([#include ], ++ [AC_RUN_IFELSE([AC_LANG_PROGRAM([#define _XOPEN_SOURCE 600 ++ #include ++ #include ], + [return posix_openpt(O_RDWR | O_NOCTTY) == -1;])], + [ + AC_DEFINE(HAVE_POSIX_OPENPT,,"HAVE_POSIX_OPENPT") +@@ -2160,7 +2162,8 @@ elif test "$host" = "$build" ; then + [bl_cv_pty=bsd]) + if test "$bl_cv_pty" = "bsd" ; then + AC_RUN_IFELSE( +- [AC_LANG_PROGRAM([#include ], ++ [AC_LANG_PROGRAM([#include ++ #include ], + [return open( "/dev/ptmx", O_RDWR | O_NOCTTY, 0) == -1;])], + [bl_cv_pty=streams]) + fi +@@ -2297,6 +2300,8 @@ if test "$host" = "$build"; then + AC_TRY_RUN( + [ + #include ++ #include ++ #include + int main() { + return calloc(8, ((1 << (sizeof(size_t) * 8 - 1)) + 1)) ? 1 : 0 ; + } diff --git a/x11-terms/mlterm/files/mlterm-configure-clang16.patch b/x11-terms/mlterm/files/mlterm-configure-clang16.patch deleted file mode 100644 index 134870d8f756..000000000000 --- a/x11-terms/mlterm/files/mlterm-configure-clang16.patch +++ /dev/null @@ -1,123 +0,0 @@ -https://github.com/arakiken/mlterm/pull/68 - -From 4eb1a0b237a861cee7ba0ceb4b69d54ab46f87f5 Mon Sep 17 00:00:00 2001 -From: Sam James -Date: Sun, 16 Apr 2023 11:38:16 +0100 -Subject: [PATCH] Fix configure.ac compatibility with Clang 16 - -Clang 16 makes -Wimplicit-function-declaration and -Wimplicit-int errors by default. - -Unfortunately, this can lead to misconfiguration or miscompilation of software as configure -tests may then return the wrong result. - -For more information, see LWN.net [0] or LLVM's Discourse [1], the Gentoo wiki [2], -or the (new) c-std-porting mailing list [3]. - -Bug: https://bugs.gentoo.org/904353 - -[0] https://lwn.net/Articles/913505/ -[1] https://discourse.llvm.org/t/configure-script-breakage-with-the-new-werror-implicit-function-declaration/65213 -[2] https://wiki.gentoo.org/wiki/Modern_C_porting -[3] hosted at lists.linux.dev. ---- a/baselib/configure -+++ b/baselib/configure -@@ -13226,6 +13226,8 @@ See \`config.log' for more details" "$LINENO" 5; } - else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ -+#define _XOPEN_SOURCE 600 -+#include - #include - int - main () -@@ -13599,6 +13601,8 @@ else - /* end confdefs.h. */ - - #include -+ #include -+ #include - int main() { - return calloc(8, ((1 << (sizeof(size_t) * 8 - 1)) + 1)) ? 1 : 0 ; - } ---- a/baselib/configure.in -+++ b/baselib/configure.in -@@ -285,7 +285,9 @@ elif test "$bl_cv_mingw" = "yes" ; then - bl_cv_pty=streams - elif test "$host" = "$build" ; then - AC_CHECK_FUNC(posix_openpt, -- [AC_RUN_IFELSE([AC_LANG_PROGRAM([#include ], -+ [AC_RUN_IFELSE([AC_LANG_PROGRAM([#define _XOPEN_SOURCE 600 -+ #include -+ #include ], - [return posix_openpt(O_RDWR | O_NOCTTY) == -1;])], - [ - AC_DEFINE(HAVE_POSIX_OPENPT,,"HAVE_POSIX_OPENPT") -@@ -435,6 +437,8 @@ if test "$host" = "$build"; then - AC_TRY_RUN( - [ - #include -+ #include -+ #include - int main() { - return calloc(8, ((1 << (sizeof(size_t) * 8 - 1)) + 1)) ? 1 : 0 ; - } ---- a/configure -+++ b/configure -@@ -25110,6 +25110,8 @@ See \`config.log' for more details" "$LINENO" 5; } - else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ -+#define _XOPEN_SOURCE 600 -+#include - #include - int - main () -@@ -25147,6 +25149,7 @@ else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include -+#include - int - main () - { -@@ -25475,6 +25478,8 @@ else - /* end confdefs.h. */ - - #include -+ #include -+ #include - int main() { - return calloc(8, ((1 << (sizeof(size_t) * 8 - 1)) + 1)) ? 1 : 0 ; - } ---- a/configure.in -+++ b/configure.in -@@ -2150,7 +2150,9 @@ elif test "$bl_cv_mingw" = "yes" ; then - bl_cv_pty=streams - elif test "$host" = "$build" ; then - AC_CHECK_FUNC(posix_openpt, -- [AC_RUN_IFELSE([AC_LANG_PROGRAM([#include ], -+ [AC_RUN_IFELSE([AC_LANG_PROGRAM([#define _XOPEN_SOURCE 600 -+ #include -+ #include ], - [return posix_openpt(O_RDWR | O_NOCTTY) == -1;])], - [ - AC_DEFINE(HAVE_POSIX_OPENPT,,"HAVE_POSIX_OPENPT") -@@ -2160,7 +2162,8 @@ elif test "$host" = "$build" ; then - [bl_cv_pty=bsd]) - if test "$bl_cv_pty" = "bsd" ; then - AC_RUN_IFELSE( -- [AC_LANG_PROGRAM([#include ], -+ [AC_LANG_PROGRAM([#include -+ #include ], - [return open( "/dev/ptmx", O_RDWR | O_NOCTTY, 0) == -1;])], - [bl_cv_pty=streams]) - fi -@@ -2297,6 +2300,8 @@ if test "$host" = "$build"; then - AC_TRY_RUN( - [ - #include -+ #include -+ #include - int main() { - return calloc(8, ((1 << (sizeof(size_t) * 8 - 1)) + 1)) ? 1 : 0 ; - } diff --git a/x11-terms/mlterm/mlterm-3.9.2.ebuild b/x11-terms/mlterm/mlterm-3.9.2.ebuild deleted file mode 100644 index 4b0544ea7dec..000000000000 --- a/x11-terms/mlterm/mlterm-3.9.2.ebuild +++ /dev/null @@ -1,133 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="8" - -inherit desktop - -DESCRIPTION="A multi-lingual terminal emulator" -HOMEPAGE="http://mlterm.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ppc ppc64 ~riscv x86" -IUSE="+X bidi brltty cairo debug fbcon fcitx freewnn gtk harfbuzz ibus libssh2 m17n-lib nls regis scim skk static-libs uim utempter wayland xft" -REQUIRED_USE="|| ( X fbcon wayland )" - -RDEPEND="virtual/libcrypt:= - X? ( - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - ) - bidi? ( dev-libs/fribidi ) - brltty? ( app-accessibility/brltty[api(+)] ) - cairo? ( x11-libs/cairo[X(+)] ) - fbcon? ( media-fonts/unifont ) - fcitx? ( app-i18n/fcitx ) - freewnn? ( app-i18n/freewnn ) - gtk? ( x11-libs/gtk+:3 ) - harfbuzz? ( media-libs/harfbuzz[truetype(+)] ) - ibus? ( app-i18n/ibus ) - libssh2? ( net-libs/libssh2 ) - m17n-lib? ( dev-libs/m17n-lib ) - nls? ( virtual/libintl ) - regis? ( - || ( - media-libs/sdl-ttf - media-libs/sdl2-ttf - ) - ) - scim? ( app-i18n/scim ) - skk? ( - || ( - virtual/skkserv - app-i18n/skk-jisyo - ) - ) - uim? ( app-i18n/uim ) - utempter? ( sys-libs/libutempter ) - wayland? ( - dev-libs/wayland - x11-libs/libxkbcommon - ) - xft? ( x11-libs/libXft )" -DEPEND="${RDEPEND} - virtual/pkgconfig - nls? ( sys-devel/gettext )" - -PATCHES=( "${FILESDIR}"/${PN}-font.patch ) -DOCS=( doc/{en,ja} ) - -src_prepare() { - # default config - sed -i \ - -e "/ icon_path =/aicon_path = ${EPREFIX}/usr/share/pixmaps/${PN}-icon.svg" \ - -e "/ scrollbar_view_name =/ascrollbar_view_name = sample" \ - etc/main - - default -} - -src_configure() { - local myconf=( - $(use_enable bidi fribidi) - $(use_enable brltty brlapi) - $(use_enable debug) - $(use_enable fcitx) - $(use_enable freewnn wnn) - $(use_enable harfbuzz otl) - $(use_enable ibus) - $(use_enable libssh2 ssh2) - $(use_enable m17n-lib m17nlib) - $(use_enable nls) - $(use_enable scim) - $(use_enable skk) - $(use_enable uim) - $(use_with X x) - --with-gui=$(usex X "xlib" "")$(usex fbcon ",fb" "")$(usex wayland ",wayland" "") - --with-type-engines=xcore$(usex xft ",xft" "")$(usex cairo ",cairo" "") - --with-utmp=$(usex utempter utempter none) - --enable-optimize-redrawing - --enable-vt52 - --disable-canna - --disable-static - ) - - local scrollbars="sample,extra" - local tools="mlclient,mlcc,mlfc,mlmenu,${PN}-zoom" - if use gtk; then - myconf+=( - --with-gtk=3.0 - --with-imagelib=gdk-pixbuf - ) - scrollbars+=",pixmap_engine" - tools+=",mlconfig,mlimgloader" - else - myconf+=( --without-gtk ) - fi - if use regis; then - tools+=",registobmp" - fi - myconf+=( --with-scrollbars="${scrollbars}" ) - myconf+=( --with-tools="${tools}" ) - - addpredict /dev/ptmx - econf "${myconf[@]}" -} - -src_test() { - : -} - -src_install() { - default - find "${ED}" -name '*.la' -delete || die - - docinto contrib/icon - dodoc contrib/icon/README - - doicon contrib/icon/${PN}* - make_desktop_entry ${PN} ${PN} ${PN}-icon "System;TerminalEmulator" -} diff --git a/x11-terms/mlterm/mlterm-3.9.3-r1.ebuild b/x11-terms/mlterm/mlterm-3.9.3-r1.ebuild index 5ee8e8a8c281..0238abc31f43 100644 --- a/x11-terms/mlterm/mlterm-3.9.3-r1.ebuild +++ b/x11-terms/mlterm/mlterm-3.9.3-r1.ebuild @@ -61,7 +61,7 @@ DOCS=( doc/{en,ja} ) PATCHES=( "${FILESDIR}"/${PN}-font.patch - "${FILESDIR}"/${PN}-configure-clang16.patch + "${FILESDIR}"/${PN}-clang-16.patch ) src_prepare() { -- cgit v1.2.3