* [gentoo-commits] repo/gentoo:master commit in: app-i18n/jfbterm/files/, app-i18n/jfbterm/
@ 2017-02-12 11:36 Michael Palimaka
0 siblings, 0 replies; 3+ messages in thread
From: Michael Palimaka @ 2017-02-12 11:36 UTC (permalink / raw
To: gentoo-commits
commit: f3ff448671e8102de87143905d9b847362f15997
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 12 11:35:48 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Feb 12 11:36:04 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3ff4486
app-i18n/jfbterm: add patch from Fedora fixing build with gcc-5
Gentoo-bug: 571066
Package-Manager: Portage-2.3.3, Repoman-2.3.1
.../files/jfbterm-0.4.7-wrong-inline-gcc5.patch | 24 ++++++++++++++++++++++
app-i18n/jfbterm/jfbterm-0.4.7-r4.ebuild | 3 ++-
2 files changed, 26 insertions(+), 1 deletion(-)
diff --git a/app-i18n/jfbterm/files/jfbterm-0.4.7-wrong-inline-gcc5.patch b/app-i18n/jfbterm/files/jfbterm-0.4.7-wrong-inline-gcc5.patch
new file mode 100644
index 0000000000..974ccbc413
--- /dev/null
+++ b/app-i18n/jfbterm/files/jfbterm-0.4.7-wrong-inline-gcc5.patch
@@ -0,0 +1,24 @@
+Source: http://pkgs.fedoraproject.org/cgit/rpms/jfbterm.git/plain/jfbterm-0.4.7-wrong-inline-gcc5.patch
+
+--- jfbterm-0.4.7/pen.c.inline_gcc5 2003-08-30 03:48:16.000000000 +0900
++++ jfbterm-0.4.7/pen.c 2015-02-09 10:36:47.182751545 +0900
+@@ -62,7 +62,7 @@
+ p->attr = q->attr;
+ }
+
+-inline void tpen_off_all_attribute(TPen* p)
++void tpen_off_all_attribute(TPen* p)
+ {
+ p->bcol = 0;
+ p->fcol = 7;
+--- jfbterm-0.4.7/pen.h.inline_gcc5 2002-07-17 01:21:23.000000000 +0900
++++ jfbterm-0.4.7/pen.h 2015-02-09 10:36:52.058705503 +0900
+@@ -58,7 +58,7 @@
+ void tpen_init(TPen* p);
+ void tpen_final(TPen* p);
+ void tpen_copy(TPen* p, TPen* q);
+-inline void tpen_off_all_attribute(TPen* p);
++void tpen_off_all_attribute(TPen* p);
+ void tpen_higlight(TPen* p);
+ void tpen_dehiglight(TPen* p);
+ void tpen_underline(TPen* p);
diff --git a/app-i18n/jfbterm/jfbterm-0.4.7-r4.ebuild b/app-i18n/jfbterm/jfbterm-0.4.7-r4.ebuild
index a1266429d3..b79f0ff20b 100644
--- a/app-i18n/jfbterm/jfbterm-0.4.7-r4.ebuild
+++ b/app-i18n/jfbterm/jfbterm-0.4.7-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -24,6 +24,7 @@ src_unpack() {
epatch "${FILESDIR}/${P}-sigchld-debian.patch"
epatch "${FILESDIR}/${P}-no-kernel-headers.patch"
epatch "${FILESDIR}/${P}-gentoo.patch"
+ epatch "${FILESDIR}/${P}-wrong-inline-gcc5.patch"
eautoreconf
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/jfbterm/files/, app-i18n/jfbterm/
@ 2021-10-07 14:13 Akinori Hattori
0 siblings, 0 replies; 3+ messages in thread
From: Akinori Hattori @ 2021-10-07 14:13 UTC (permalink / raw
To: gentoo-commits
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=UTF-8, Size: 6732 bytes --]
commit: 98a04d17c51d43f158eb6f1c77db86f8f390b4d9
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 7 14:08:17 2021 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Thu Oct 7 14:13:25 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98a04d17
app-i18n/jfbterm: update patches
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>
...bterm-0.4.7-gentoo.patch => jfbterm-gentoo.patch} | 20 ++++++++------------
| 4 ++--
...hld-debian.patch => jfbterm-sigchld-debian.patch} | 8 ++++----
...ne-gcc5.patch => jfbterm-wrong-inline-gcc5.patch} | 10 +++++-----
app-i18n/jfbterm/jfbterm-0.4.7-r4.ebuild | 10 +++++-----
5 files changed, 24 insertions(+), 28 deletions(-)
diff --git a/app-i18n/jfbterm/files/jfbterm-0.4.7-gentoo.patch b/app-i18n/jfbterm/files/jfbterm-gentoo.patch
similarity index 89%
rename from app-i18n/jfbterm/files/jfbterm-0.4.7-gentoo.patch
rename to app-i18n/jfbterm/files/jfbterm-gentoo.patch
index 8dc8bc097b0..48286aa8b22 100644
--- a/app-i18n/jfbterm/files/jfbterm-0.4.7-gentoo.patch
+++ b/app-i18n/jfbterm/files/jfbterm-gentoo.patch
@@ -1,6 +1,5 @@
-diff -Naur jfbterm-0.4.7.orig/fbcommon.c jfbterm-0.4.7/fbcommon.c
---- jfbterm-0.4.7.orig/fbcommon.c 2003-09-03 00:23:17.000000000 +0900
-+++ jfbterm-0.4.7/fbcommon.c 2007-08-18 10:55:30.000000000 +0900
+--- a/fbcommon.c
++++ b/fbcommon.c
@@ -46,7 +46,6 @@
#endif
#include <linux/vt.h>
@@ -19,9 +18,8 @@ diff -Naur jfbterm-0.4.7.orig/fbcommon.c jfbterm-0.4.7/fbcommon.c
close(fd);
snprintf(fbdn, 15, "/dev/fb%d", c2m.framebuffer);
}
-diff -Naur jfbterm-0.4.7.orig/jfbterm.conf.sample jfbterm-0.4.7/jfbterm.conf.sample
---- jfbterm-0.4.7.orig/jfbterm.conf.sample 2003-09-16 00:16:35.000000000 +0900
-+++ jfbterm-0.4.7/jfbterm.conf.sample 2007-08-18 10:19:00.000000000 +0900
+--- a/jfbterm.conf.sample
++++ b/jfbterm.conf.sample
@@ -19,29 +19,29 @@
# Absolute path or relative path to PWD
#
@@ -71,9 +69,8 @@ diff -Naur jfbterm-0.4.7.orig/jfbterm.conf.sample jfbterm-0.4.7/jfbterm.conf.sam
###############################################################################
-diff -Naur jfbterm-0.4.7.orig/jfbterm.conf.sample.ja jfbterm-0.4.7/jfbterm.conf.sample.ja
---- jfbterm-0.4.7.orig/jfbterm.conf.sample.ja 2003-09-16 00:16:35.000000000 +0900
-+++ jfbterm-0.4.7/jfbterm.conf.sample.ja 2007-08-18 10:19:11.000000000 +0900
+--- a/jfbterm.conf.sample.ja
++++ b/jfbterm.conf.sample.ja
@@ -25,29 +25,29 @@
# ÀäÂХѥ¹ or PWD¤«¤é¤ÎÁêÂХѥ¹
#
@@ -123,9 +120,8 @@ diff -Naur jfbterm-0.4.7.orig/jfbterm.conf.sample.ja jfbterm-0.4.7/jfbterm.conf.
################################################################################
#
-diff -Naur jfbterm-0.4.7.orig/util.h jfbterm-0.4.7/util.h
---- jfbterm-0.4.7.orig/util.h 2003-09-16 00:45:31.000000000 +0900
-+++ jfbterm-0.4.7/util.h 2007-08-18 08:48:49.000000000 +0900
+--- a/util.h
++++ b/util.h
@@ -31,6 +31,7 @@
#include <sys/types.h>
diff --git a/app-i18n/jfbterm/files/jfbterm-0.4.7-no-kernel-headers.patch b/app-i18n/jfbterm/files/jfbterm-no-kernel-headers.patch
similarity index 74%
rename from app-i18n/jfbterm/files/jfbterm-0.4.7-no-kernel-headers.patch
rename to app-i18n/jfbterm/files/jfbterm-no-kernel-headers.patch
index 06c6e603348..aa0b39ed269 100644
--- a/app-i18n/jfbterm/files/jfbterm-0.4.7-no-kernel-headers.patch
+++ b/app-i18n/jfbterm/files/jfbterm-no-kernel-headers.patch
@@ -3,8 +3,8 @@ Patch by Shunichi Fuji <palgowr@gmail.com>.
See bug #156306
---- jfbterm-0.4.7.orig/fbdpsp.c 2003-08-30 03:48:16.000000000 +0900
-+++ jfbterm-0.4.7/fbdpsp.c 2006-11-27 01:22:20.000000000 +0900
+--- a/fbdpsp.c
++++ b/fbdpsp.c
@@ -827,8 +827,7 @@
#ifdef JFB_VGA16FB
diff --git a/app-i18n/jfbterm/files/jfbterm-0.4.7-sigchld-debian.patch b/app-i18n/jfbterm/files/jfbterm-sigchld-debian.patch
similarity index 75%
rename from app-i18n/jfbterm/files/jfbterm-0.4.7-sigchld-debian.patch
rename to app-i18n/jfbterm/files/jfbterm-sigchld-debian.patch
index 2e803640077..60deee49422 100644
--- a/app-i18n/jfbterm/files/jfbterm-0.4.7-sigchld-debian.patch
+++ b/app-i18n/jfbterm/files/jfbterm-sigchld-debian.patch
@@ -1,5 +1,5 @@
---- jfbterm-0.4.7.orig/main.c
-+++ jfbterm-0.4.7/main.c
+--- a/main.c
++++ b/main.c
@@ -184,7 +184,7 @@
p->gExecShellArgv = NULL;
p->gConfFile = FILE_JFBTERM_CONF;
@@ -9,8 +9,8 @@
atexit(tapp_final_at_exit);
}
---- jfbterm-0.4.7.orig/term.h
-+++ jfbterm-0.4.7/term.h
+--- a/term.h
++++ b/term.h
@@ -44,7 +44,7 @@
} TTerm;
diff --git a/app-i18n/jfbterm/files/jfbterm-0.4.7-wrong-inline-gcc5.patch b/app-i18n/jfbterm/files/jfbterm-wrong-inline-gcc5.patch
similarity index 54%
rename from app-i18n/jfbterm/files/jfbterm-0.4.7-wrong-inline-gcc5.patch
rename to app-i18n/jfbterm/files/jfbterm-wrong-inline-gcc5.patch
index 974ccbc4130..aa41d5e02ce 100644
--- a/app-i18n/jfbterm/files/jfbterm-0.4.7-wrong-inline-gcc5.patch
+++ b/app-i18n/jfbterm/files/jfbterm-wrong-inline-gcc5.patch
@@ -1,7 +1,7 @@
-Source: http://pkgs.fedoraproject.org/cgit/rpms/jfbterm.git/plain/jfbterm-0.4.7-wrong-inline-gcc5.patch
+https://src.fedoraproject.org/rpms/jfbterm/blob/rawhide/f/jfbterm-0.4.7-wrong-inline-gcc5.patch
---- jfbterm-0.4.7/pen.c.inline_gcc5 2003-08-30 03:48:16.000000000 +0900
-+++ jfbterm-0.4.7/pen.c 2015-02-09 10:36:47.182751545 +0900
+--- a/pen.c
++++ b/pen.c
@@ -62,7 +62,7 @@
p->attr = q->attr;
}
@@ -11,8 +11,8 @@ Source: http://pkgs.fedoraproject.org/cgit/rpms/jfbterm.git/plain/jfbterm-0.4.7-
{
p->bcol = 0;
p->fcol = 7;
---- jfbterm-0.4.7/pen.h.inline_gcc5 2002-07-17 01:21:23.000000000 +0900
-+++ jfbterm-0.4.7/pen.h 2015-02-09 10:36:52.058705503 +0900
+--- a/pen.h
++++ b/pen.h
@@ -58,7 +58,7 @@
void tpen_init(TPen* p);
void tpen_final(TPen* p);
diff --git a/app-i18n/jfbterm/jfbterm-0.4.7-r4.ebuild b/app-i18n/jfbterm/jfbterm-0.4.7-r4.ebuild
index 93989a66a5a..70443ef74fd 100644
--- a/app-i18n/jfbterm/jfbterm-0.4.7-r4.ebuild
+++ b/app-i18n/jfbterm/jfbterm-0.4.7-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -21,10 +21,10 @@ RDEPEND="
media-fonts/intlfonts"
PATCHES=(
- "${FILESDIR}"/${P}-sigchld-debian.patch
- "${FILESDIR}"/${P}-no-kernel-headers.patch
- "${FILESDIR}"/${P}-gentoo.patch
- "${FILESDIR}"/${P}-wrong-inline-gcc5.patch
+ "${FILESDIR}"/${PN}-sigchld-debian.patch
+ "${FILESDIR}"/${PN}-no-kernel-headers.patch
+ "${FILESDIR}"/${PN}-gentoo.patch
+ "${FILESDIR}"/${PN}-wrong-inline-gcc5.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/jfbterm/files/, app-i18n/jfbterm/
@ 2025-02-12 18:16 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2025-02-12 18:16 UTC (permalink / raw
To: gentoo-commits
commit: 77728d89f28570c51693d1f0278c88a711bf29bb
Author: NHOrus <jy6x2b32pie9 <AT> yahoo <DOT> com>
AuthorDate: Wed Feb 12 17:34:34 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Feb 12 18:15:42 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77728d89
app-i18n/jfbterm: update EAPI 7 -> 8, fix home URI, port to C23
Changes call to time() to call to gettimeofday() according to utmp man page
Removes font installation from makefile and delegates to portage machinery
so font cache gets updated
Bug: https://bugs.gentoo.org/835793
Closes: https://bugs.gentoo.org/919295
Signed-off-by: NHOrus <jy6x2b32pie9 <AT> yahoo.com>
Closes: https://github.com/gentoo/gentoo/pull/40547
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-i18n/jfbterm/files/jfbterm-0.4.7-fonts.patch | 15 ++++++
.../files/jfbterm-0.4.7-gettimeoftheday.patch | 43 +++++++++++++++
app-i18n/jfbterm/jfbterm-0.4.7-r5.ebuild | 63 ++++++++++++++++++++++
3 files changed, 121 insertions(+)
diff --git a/app-i18n/jfbterm/files/jfbterm-0.4.7-fonts.patch b/app-i18n/jfbterm/files/jfbterm-0.4.7-fonts.patch
new file mode 100644
index 000000000000..264c0499d573
--- /dev/null
+++ b/app-i18n/jfbterm/files/jfbterm-0.4.7-fonts.patch
@@ -0,0 +1,15 @@
+Use portage machinery instead of package makefiles to install fonts
+This does fc-cache, unlike before
+https://bugs.gentoo.org/835793
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -22,9 +22,7 @@
+
+ install-exec-hook:
+ chown root:utmp $(DESTDIR)$(bindir)/jfbterm
+- chmod ug+s $(DESTDIR)$(bindir)/jfbterm
+
+ install-data-local:
+ $(INSTALL_DATA) $(srcdir)/$(JFBTERM_CONFIG_FILE) $(DESTDIR)$(sysconfdir)/$(JFBTERM_CONFIG_FILE)
+- $(INSTALL_DATA) $(srcdir)/fonts/*.pcf.gz $(DESTDIR)$(datadir)/fonts/jfbterm
+
diff --git a/app-i18n/jfbterm/files/jfbterm-0.4.7-gettimeoftheday.patch b/app-i18n/jfbterm/files/jfbterm-0.4.7-gettimeoftheday.patch
new file mode 100644
index 000000000000..f7da1afb8010
--- /dev/null
+++ b/app-i18n/jfbterm/files/jfbterm-0.4.7-gettimeoftheday.patch
@@ -0,0 +1,43 @@
+Man 5 utmp has instructions how to replace time with gettimeofday in utmp.
+Use them.
+https://bugs.gentoo.org/919295
+--- a/term.c
++++ b/term.c
+@@ -248,6 +248,7 @@
+ struct utmp utmp;
+ struct passwd *pw;
+ char *tn;
++ struct timeval tv;
+
+ pw = getpwuid(util_getuid());
+ tn = rindex(p->name, '/') + 1;
+@@ -262,7 +263,9 @@
+ tn = p->name + 5;
+ strncpy(utmp.ut_line, tn, sizeof(utmp.ut_line));
+ strncpy(utmp.ut_user, pw->pw_name, sizeof(utmp.ut_user));
+- time(&(utmp.ut_time));
++ gettimeofday(&tv, NULL);
++ utmp.ut_tv.tv_sec = tv.tv_sec;
++ utmp.ut_tv.tv_usec = tv.tv_usec;
+ pututline(&utmp);
+ endutent();
+ }
+@@ -271,6 +274,7 @@
+ {
+ struct utmp utmp, *utp;
+ char *tn;
++ struct timeval tv;
+
+ tn = rindex(p->name, '/') + 4;
+ memset((char *)&utmp, 0, sizeof(utmp));
+@@ -281,7 +285,9 @@
+ utp->ut_type = DEAD_PROCESS;
+ memset(utp->ut_user, 0, sizeof(utmp.ut_user));
+ utp->ut_type = DEAD_PROCESS;
+- time(&(utp->ut_time));
++ gettimeofday(&tv, NULL);
++ utp->ut_tv.tv_sec = tv.tv_sec;
++ utp->ut_tv.tv_usec = tv.tv_usec;
+ pututline(utp);
+ endutent();
+ }
diff --git a/app-i18n/jfbterm/jfbterm-0.4.7-r5.ebuild b/app-i18n/jfbterm/jfbterm-0.4.7-r5.ebuild
new file mode 100644
index 000000000000..17e2545b6782
--- /dev/null
+++ b/app-i18n/jfbterm/jfbterm-0.4.7-r5.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools font
+
+DESCRIPTION="The J Framebuffer Terminal/Multilingual Enhancement with UTF-8 support"
+HOMEPAGE="https://osdn.net/projects/jfbterm/"
+SRC_URI="mirror://sourceforge.jp/${PN}/13501/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug"
+
+# ncurses is runtime-onlu dependency, because program provides it's own terminfo
+# gzip needed for unpacking font at runtime
+RDEPEND="media-fonts/font-misc-misc
+ media-fonts/intlfonts
+ media-fonts/unifont
+ sys-libs/ncurses
+ app-alternatives/gzip"
+
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-sigchld-debian.patch
+ "${FILESDIR}"/${PN}-no-kernel-headers.patch
+ "${FILESDIR}"/${PN}-gentoo.patch
+ "${FILESDIR}"/${PN}-wrong-inline-gcc5.patch
+ "${FILESDIR}"/${PN}-automake-1.13.patch
+ "${FILESDIR}"/"${P}"-fonts.patch
+ "${FILESDIR}"/"${P}"-gettimeoftheday.patch
+)
+
+FONT_S="${S}/fonts"
+FONT_SUFFIX="pcf.gz"
+
+src_prepare() {
+ default
+
+ eautoreconf
+}
+
+src_configure() {
+ econf $(use_enable debug)
+}
+
+src_install() {
+ dodir /etc
+ default
+
+ mv "${ED}"/etc/${PN}.conf{.sample,} || die
+
+ font_src_install
+
+ doman ${PN}.{1,conf.5}
+
+ # install example config files
+ docinto examples
+ dodoc ${PN}.conf.sample*
+ docompress -x /usr/share/doc/${PF}/examples
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-02-12 18:16 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-10-07 14:13 [gentoo-commits] repo/gentoo:master commit in: app-i18n/jfbterm/files/, app-i18n/jfbterm/ Akinori Hattori
-- strict thread matches above, loose matches on Subject: below --
2025-02-12 18:16 Sam James
2017-02-12 11:36 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox