mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-01-06 02:17:34 -08:00
x11-terms/mlterm: drop old
Signed-off-by: Akinori Hattori <hattya@gentoo.org>
This commit is contained in:
Akinori Hattori
parent
b9b9c5c72f
commit
dc505f55e1
@ -1,2 +1 @@
|
||||
DIST mlterm-3.9.3.tar.gz 4272090 BLAKE2B 8f71a8c5cd63b7caa803e699a7e42b8d11cb18324595a7a255c7542df6fad6b968bf56a03a2d19a2381d103232685e3c3cd62388ac036a024870fbe3d222d081 SHA512 67c22ee8411cef499620a37e43af5609bb52cf8be6b617f0dfa6605217eb7f66227bfe073ca9b878606392fac26f94299221b5890fba1d90a3afc35a0f3132a1
|
||||
DIST mlterm-3.9.4.tar.gz 4227568 BLAKE2B 75bb435a3ec0fc3872fc763d850125a20314b4a54e6c628dee8045db6d1acaf669d45540d5812e9331ceb8a210f93178e208ccd48acc7c70d8743dea43783f99 SHA512 f03ce24b89f74510cd8924a2cd9ab795c6ebf7f7ef2b69fb8a17bf3f5855c255cf86558b0e5abc7db64175f7c909b165cf96663825b98f4a2df4371d5e4a9469
|
||||
|
||||
@ -1,123 +0,0 @@
|
||||
https://github.com/arakiken/mlterm/pull/68
|
||||
|
||||
From 4eb1a0b237a861cee7ba0ceb4b69d54ab46f87f5 Mon Sep 17 00:00:00 2001
|
||||
From: Sam James <sam@gentoo.org>
|
||||
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 <stdlib.h>
|
||||
#include <fcntl.h>
|
||||
int
|
||||
main ()
|
||||
@@ -13599,6 +13601,8 @@ else
|
||||
/* end confdefs.h. */
|
||||
|
||||
#include <stdio.h>
|
||||
+ #include <stdlib.h>
|
||||
+ #include <stddef.h>
|
||||
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 <fcntl.h>],
|
||||
+ [AC_RUN_IFELSE([AC_LANG_PROGRAM([#define _XOPEN_SOURCE 600
|
||||
+ #include <stdlib.h>
|
||||
+ #include <fcntl.h>],
|
||||
[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 <stdio.h>
|
||||
+ #include <stdlib.h>
|
||||
+ #include <stddef.h>
|
||||
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 <stdlib.h>
|
||||
#include <fcntl.h>
|
||||
int
|
||||
main ()
|
||||
@@ -25147,6 +25149,7 @@ else
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
#include <fcntl.h>
|
||||
+#include <sys/stat.h>
|
||||
int
|
||||
main ()
|
||||
{
|
||||
@@ -25475,6 +25478,8 @@ else
|
||||
/* end confdefs.h. */
|
||||
|
||||
#include <stdio.h>
|
||||
+ #include <stdlib.h>
|
||||
+ #include <stddef.h>
|
||||
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 <fcntl.h>],
|
||||
+ [AC_RUN_IFELSE([AC_LANG_PROGRAM([#define _XOPEN_SOURCE 600
|
||||
+ #include <stdlib.h>
|
||||
+ #include <fcntl.h>],
|
||||
[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 <fcntl.h>],
|
||||
+ [AC_LANG_PROGRAM([#include <sys/stat.h>
|
||||
+ #include <fcntl.h>],
|
||||
[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 <stdio.h>
|
||||
+ #include <stdlib.h>
|
||||
+ #include <stddef.h>
|
||||
int main() {
|
||||
return calloc(8, ((1 << (sizeof(size_t) * 8 - 1)) + 1)) ? 1 : 0 ;
|
||||
}
|
||||
@ -1,135 +0,0 @@
|
||||
# Copyright 1999-2025 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="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 ~ppc ppc64 ~riscv x86"
|
||||
IUSE="+X bidi brltty cairo debug fbcon fcitx 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:* )
|
||||
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}"
|
||||
BDEPEND="virtual/pkgconfig
|
||||
nls? ( sys-devel/gettext )"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-font.patch
|
||||
"${FILESDIR}"/${PN}-clang-16.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 || die
|
||||
|
||||
default
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf=(
|
||||
$(use_enable bidi fribidi)
|
||||
$(use_enable brltty brlapi)
|
||||
$(use_enable debug)
|
||||
$(use_enable fcitx)
|
||||
$(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
|
||||
--disable-wnn
|
||||
)
|
||||
|
||||
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"
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user