From e23a08d0c97a0cc415aaa165da840b056f93c997 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 8 Oct 2021 23:06:07 +0100 Subject: gentoo resync : 08.10.2021 --- app-i18n/jfbterm/Manifest | 11 +- app-i18n/jfbterm/files/jfbterm-0.4.7-gentoo.patch | 144 --------------------- .../files/jfbterm-0.4.7-no-kernel-headers.patch | 17 --- .../files/jfbterm-0.4.7-sigchld-debian.patch | 22 ---- .../files/jfbterm-0.4.7-wrong-inline-gcc5.patch | 24 ---- app-i18n/jfbterm/files/jfbterm-automake-1.13.patch | 14 ++ app-i18n/jfbterm/files/jfbterm-gentoo.patch | 140 ++++++++++++++++++++ .../jfbterm/files/jfbterm-no-kernel-headers.patch | 17 +++ .../jfbterm/files/jfbterm-sigchld-debian.patch | 22 ++++ .../jfbterm/files/jfbterm-wrong-inline-gcc5.patch | 24 ++++ app-i18n/jfbterm/jfbterm-0.4.7-r4.ebuild | 28 ++-- 11 files changed, 237 insertions(+), 226 deletions(-) delete mode 100644 app-i18n/jfbterm/files/jfbterm-0.4.7-gentoo.patch delete mode 100644 app-i18n/jfbterm/files/jfbterm-0.4.7-no-kernel-headers.patch delete mode 100644 app-i18n/jfbterm/files/jfbterm-0.4.7-sigchld-debian.patch delete mode 100644 app-i18n/jfbterm/files/jfbterm-0.4.7-wrong-inline-gcc5.patch create mode 100644 app-i18n/jfbterm/files/jfbterm-automake-1.13.patch create mode 100644 app-i18n/jfbterm/files/jfbterm-gentoo.patch create mode 100644 app-i18n/jfbterm/files/jfbterm-no-kernel-headers.patch create mode 100644 app-i18n/jfbterm/files/jfbterm-sigchld-debian.patch create mode 100644 app-i18n/jfbterm/files/jfbterm-wrong-inline-gcc5.patch (limited to 'app-i18n/jfbterm') diff --git a/app-i18n/jfbterm/Manifest b/app-i18n/jfbterm/Manifest index ef5fef554040..f48acd8f1aec 100644 --- a/app-i18n/jfbterm/Manifest +++ b/app-i18n/jfbterm/Manifest @@ -1,7 +1,8 @@ -AUX jfbterm-0.4.7-gentoo.patch 8279 BLAKE2B 47e7e75c13b42d5b62090857c0db22f2ec59eb626551793d93a5cf24898d66c01ffb515c6071014bd4e7f41f62ecb3957cf759686dddfad97e89cae8394853ef SHA512 42a709594300bd35d29bd86691ffe81895bdbc694e1618e1938520147612d2549a7242867fece1083eaf938109f008e2c1539ad70c335216f3aaa3806ab37293 -AUX jfbterm-0.4.7-no-kernel-headers.patch 522 BLAKE2B 73537d38256f2d3be7b0a82919f0930295a78d1acb61394e28d1f84e443010156df2a7751969efef7a5e909b558476d7dec108123e18f3ea0e37c18cef7373e4 SHA512 95c40607ee9e2c3d89b35fb36cbf2c72b1bc7b65f82858fa1c34c39f26b9dd599be342c14dc85504d7c48ecc6b4cdad76ab06cabec9ca008dea889fc891e2c4d -AUX jfbterm-0.4.7-sigchld-debian.patch 455 BLAKE2B becf439bb5adefa40b36c8cc6a918c0ccd3925854f69048831762e3b3b2d38d780c844e856e1d705ce8ae4b66a8f8849e314b3daa5dc027d974d6f30c8817408 SHA512 b03667158fdc157a44a1ff093ba4f80e5ddc4e6054e61879bea77fdfb17715be536d83044f3aa8bf4e03b5d73fd7a091f7d4b4f7d73e5d1349da78ce8d84d542 -AUX jfbterm-0.4.7-wrong-inline-gcc5.patch 813 BLAKE2B 0af239eece0d36dd2754ef009707da1dfccc88dd5f7c73fbe740acb3d4b43bdd625e89f7573092ceee759d80e3038d355126d4fd32029d619108f378ce80f57d SHA512 f698efc9deebe91cde0a38b6a9a5a08f7f65d14d043e920fc48a5ebb94d2d59a04032a8f1ec0cdb68ae262d6dfb20e9d1da209866cdfba6ec9ac8a8e881ae725 +AUX jfbterm-automake-1.13.patch 355 BLAKE2B 983fae9e0f38c364a75fb909846496fc29061d4462a51d5b23d5905d86f5d354c292e2a287920f1f9f1602623c387dd0b994167c5fb91c42e14522c96c4b4c78 SHA512 0fcbe5df3eda3dcb6fd87a4bbe8b3bb7e2fcf115562a9836a9c17a797b5a235ff5010c454feb6df7a05f2e9a183cd55cffc873a1f728e446a19efcdaeb0b1d4c +AUX jfbterm-gentoo.patch 7577 BLAKE2B bbfa5df19dd3fb10c6b4f2a32846b45bdcca272f62299cb52efb5d512a12f07879fbbfc81103f1e1eb65410a54661cc640450a6d4f9c9cef5b58a12ee69bdda6 SHA512 516b35fc5bda80a0ea14ba682473d443fee0ff049a61d12ba73ef43c36a738fec87fa7da4a3acd2ec7bb907212e96a972744b84cf117889007061aeed06339b1 +AUX jfbterm-no-kernel-headers.patch 421 BLAKE2B 1c69df44bfea80daefe004c9f52b40df6c8fd8c63d1775fbe57cde2331c603bd85959ea0cf7122a0c2267c3f9e5f9288b8f64f6620bb649018c5cc3783178866 SHA512 c05eb56036b8f9432c6e113c7800b9f8ed895d58fd77e7db75b84cd7c8015200122f8cdfe9d3391feee7a010a8694a65b815b621ebfe03a8b6d7d905c9d29ff7 +AUX jfbterm-sigchld-debian.patch 397 BLAKE2B a3312e88a7d47358f191b140da419b2baef474840d9472beacc1064d73e3189dfe2baa41f8648a3ba82dfb7bd09265559a119def0668402c777e797ea19c99d5 SHA512 d79aefca2b1b58d0b34f1b39d4095714ed1f2923864ed7fc37ca7a610b9bc63b043a395a7c2d3580d633b8771bcc7900b35da71d3f61ede167fc5adeb1e6bd0b +AUX jfbterm-wrong-inline-gcc5.patch 589 BLAKE2B 49fabf5b4e8780f161caf59c5a51a0734f870e5c42c64e063326b926b36d91a3fa9b369d42b57e5f2de881e20f70f9a6c34ba0cf1b4595f6cb1c55e1fa6270d9 SHA512 1fe0eac425ed5ffe18fb6f738d72efac8a8b1aadef081a0edb12e07522ff814bc492a52b9d2102a7a966f8f1d752a14f6d19ea8633bbf2607c544873cf5cb82c DIST jfbterm-0.4.7.tar.gz 104592 BLAKE2B 3432af1598f77db4edac3be962acd086dd215e3a261ffbca3462cb8632012f6b1920c73b4590eaed4a8016a18018a80645fdaee31cca69317b4a82ffda0cbc72 SHA512 267dc777c2a296731ac7e5fb89381891e26ac119be63c8889b0e194246a3ac03b1c4b50f7d9254221c2ab201a126da46d312946845ddaad82fcc718a76472dcc -EBUILD jfbterm-0.4.7-r4.ebuild 1083 BLAKE2B 48d8ae78775b759220c12e571b612023267d8ccd0ec05d1096155047344de14ef4630592ccaee9ca2e3d7eee0ec94d6d95863e927060eebc66b9e00b2400c5b2 SHA512 9b2fb3bd864334919113c3cd7e726bc25ae7ee6f18cd0fcba0abcab21cb866eea146fac6d4957c9d7adb7abfcf20dc3f1939e0a1f10d5c9a96cbc7dfe7a3c292 +EBUILD jfbterm-0.4.7-r4.ebuild 1109 BLAKE2B c201f301e0326889ce85bd80045be77c74921af9acc710d8382597f3dc227d3a05a09c3e2d00d7cebf939abaeb96e52c9d3f287149a4bdb6c158cd427041ca73 SHA512 f46cf7e9e90fabcefebe23da328f52ae9555f7ae3bcf834b846f952c37378714873a67d3a1901f073c6547e9477bd6cb536dae6422335454d04b5b4aac8da792 MISC metadata.xml 657 BLAKE2B 7579add5f452265168499d5c25c6c7f548ab69822fd3899fcc63f1d898da3ab4c5c59b010cc7708c6592bf428a0c3f787e2f6f8cb064f51361824c933442c5d2 SHA512 4306d2f5502775357a9200e385a32c82d67f5cc61f8fbc3f0b91e860b25de9c6aabd064e3b19700bb1e2a7dedef4ca7b481f2d67cc778b8a29390a923e86f6fa diff --git a/app-i18n/jfbterm/files/jfbterm-0.4.7-gentoo.patch b/app-i18n/jfbterm/files/jfbterm-0.4.7-gentoo.patch deleted file mode 100644 index 8dc8bc097b05..000000000000 --- a/app-i18n/jfbterm/files/jfbterm-0.4.7-gentoo.patch +++ /dev/null @@ -1,144 +0,0 @@ -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 -@@ -46,7 +46,6 @@ - #endif - #include - #include --#include - - #include "mytypes.h" - #include "fbcommon.h" -@@ -475,6 +474,9 @@ - perror("ioctl FBIOGET_CON2FBMAP"); - c2m.framebuffer = 0; - } -+ if (-1 == c2m.framebuffer) { -+ c2m.framebuffer = 0; -+ } - 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 -@@ -19,29 +19,29 @@ - # Absolute path or relative path to PWD - # - ############################################################################### --fontset : iso646-1973irv,pcf,L,/usr/X11R6/lib/X11/fonts/misc/8x16.pcf.gz -+fontset : iso646-1973irv,pcf,L,/usr/share/fonts/misc/8x16.pcf.gz - +fontset: ansix3.4-1968,alias,L,iso646-1973irv --+fontset: jisc6226-1978,pcf,L,/usr/X11R6/lib/X11/fonts/misc/jiskan16.pcf.gz -++fontset: jisc6226-1978,pcf,L,/usr/share/fonts/misc/jiskan16.pcf.gz - +fontset: jisx0208-1983,alias,L,jisc6226-1978 --+fontset: jisc6220-1969roman,pcf,L,/usr/X11R6/lib/X11/fonts/misc/a18rk.pcf.gz -++fontset: jisc6220-1969roman,pcf,L,/usr/share/fonts/intlfonts/a18rk.pcf.gz - +fontset: jisc6220-1969kana,alias,R,jisc6220-1969roman --+fontset: jisx0212-1990,pcf,L,/usr/X11R6/lib/X11/fonts/misc/jksp16.pcf.gz --+fontset: gb2312-80,pcf,L,/usr/X11R6/lib/X11/fonts/misc/gb16fs.pcf.gz --+fontset: ksc5601-1987,pcf,L,/usr/X11R6/lib/X11/fonts/misc/hanglg16.pcf.gz --+fontset: iso8859.1-1987,pcf,R,/usr/X11R6/lib/X11/fonts/misc/8x16.pcf.gz --+fontset: iso8859.2-1987,pcf,R,/usr/X11R6/lib/X11/fonts/misc/lt2-16-etl.pcf.gz --+fontset: iso8859.3-1988,pcf,R,/usr/X11R6/lib/X11/fonts/misc/lt3-16-etl.pcf.gz --+fontset: iso8859.4-1988,pcf,R,/usr/X11R6/lib/X11/fonts/misc/lt4-16-etl.pcf.gz --+fontset: iso8859.5-1988,pcf,R,/usr/X11R6/lib/X11/fonts/misc/cyr16-etl.pcf.gz --+fontset: iso8859.7-1987,pcf,R,/usr/X11R6/lib/X11/fonts/misc/grk16-etl.pcf.gz --+fontset: iso8859.8-1988,pcf,R,/usr/X11R6/lib/X11/fonts/misc/heb16-etl.pcf.gz --+fontset: iso8859.9-1989,pcf,R,/usr/X11R6/lib/X11/fonts/misc/lt5-16-etl.pcf.gz --+fontset: iso8859.10-1992,pcf,R,/usr/X11R6/lib/X11/fonts/misc/8x13-ISO8859-10.pcf.gz --+fontset: iso8859.13-1998,pcf,R,/usr/X11R6/lib/X11/fonts/misc/8x13-ISO8859-13.pcf.gz --+fontset: iso8859.14-1998,pcf,R,/usr/X11R6/lib/X11/fonts/misc/8x13-ISO8859-14.pcf.gz --+fontset: iso8859.15-1999,pcf,R,/usr/X11R6/lib/X11/fonts/misc/8x13-ISO8859-15.pcf.gz -++fontset: jisx0212-1990,pcf,L,/usr/share/fonts/intlfonts/jksp16.pcf.gz -++fontset: gb2312-80,pcf,L,/usr/share/fonts/misc/gb16fs.pcf.gz -++fontset: ksc5601-1987,pcf,L,/usr/share/fonts/misc/hanglg16.pcf.gz -++fontset: iso8859.1-1987,pcf,R,/usr/share/fonts/misc/8x16.pcf.gz -++fontset: iso8859.2-1987,pcf,R,/usr/share/fonts/intlfonts/lt2-16-etl.pcf.gz -++fontset: iso8859.3-1988,pcf,R,/usr/share/fonts/intlfonts/lt3-16-etl.pcf.gz -++fontset: iso8859.4-1988,pcf,R,/usr/share/fonts/intlfonts/lt4-16-etl.pcf.gz -++fontset: iso8859.5-1988,pcf,R,/usr/share/fonts/intlfonts/cyr16-etl.pcf.gz -++fontset: iso8859.7-1987,pcf,R,/usr/share/fonts/intlfonts/grk16-etl.pcf.gz -++fontset: iso8859.8-1988,pcf,R,/usr/share/fonts/intlfonts/heb16-etl.pcf.gz -++fontset: iso8859.9-1989,pcf,R,/usr/share/fonts/intlfonts/lt5-16-etl.pcf.gz -++fontset: iso8859.10-1992,pcf,R,/usr/share/fonts/misc/8x13-ISO8859-10.pcf.gz -++fontset: iso8859.13-1998,pcf,R,/usr/share/fonts/misc/8x13-ISO8859-13.pcf.gz -++fontset: iso8859.14-1998,pcf,R,/usr/share/fonts/misc/8x13-ISO8859-14.pcf.gz -++fontset: iso8859.15-1999,pcf,R,/usr/share/fonts/misc/8x13-ISO8859-15.pcf.gz - +fontset: vt100-graphics,pcf,L,/usr/share/fonts/jfbterm/vt100-graphics.pcf.gz --+fontset: iso10646.1,pcf,U,/usr/X11R6/lib/X11/fonts/misc/unifont.pcf.gz -++fontset: iso10646.1,pcf,U,/usr/share/fonts/unifont/unifont.pcf.gz - - - ############################################################################### -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 -@@ -25,29 +25,29 @@ - # 絶対パス or PWDからの相対パス - # - ################################################################################ --fontset : iso646-1973irv,pcf,L,/usr/X11R6/lib/X11/fonts/misc/8x16.pcf.gz -+fontset : iso646-1973irv,pcf,L,/usr/share/fonts/misc/8x16.pcf.gz - +fontset: ansix3.4-1968,alias,L,iso646-1973irv --+fontset: jisc6226-1978,pcf,L,/usr/X11R6/lib/X11/fonts/misc/jiskan16.pcf.gz -++fontset: jisc6226-1978,pcf,L,/usr/share/fonts/misc/jiskan16.pcf.gz - +fontset: jisx0208-1983,alias,L,jisc6226-1978 --+fontset: jisc6220-1969roman,pcf,L,/usr/X11R6/lib/X11/fonts/misc/a18rk.pcf.gz -++fontset: jisc6220-1969roman,pcf,L,/usr/share/fonts/intlfonts/a18rk.pcf.gz - +fontset: jisc6220-1969kana,alias,R,jisc6220-1969roman --+fontset: jisx0212-1990,pcf,L,/usr/X11R6/lib/X11/fonts/misc/jksp16.pcf.gz --+fontset: gb2312-80,pcf,L,/usr/X11R6/lib/X11/fonts/misc/gb16fs.pcf.gz --+fontset: ksc5601-1987,pcf,L,/usr/X11R6/lib/X11/fonts/misc/hanglg16.pcf.gz --+fontset: iso8859.1-1987,pcf,R,/usr/X11R6/lib/X11/fonts/misc/8x16.pcf.gz --+fontset: iso8859.2-1987,pcf,R,/usr/X11R6/lib/X11/fonts/misc/lt2-16-etl.pcf.gz --+fontset: iso8859.3-1987,pcf,R,/usr/X11R6/lib/X11/fonts/misc/lt3-16-etl.pcf.gz --+fontset: iso8859.4-1988,pcf,R,/usr/X11R6/lib/X11/fonts/misc/lt4-16-etl.pcf.gz --+fontset: iso8859.5-1988,pcf,R,/usr/X11R6/lib/X11/fonts/misc/cyr16-etl.pcf.gz --+fontset: iso8859.7-1987,pcf,R,/usr/X11R6/lib/X11/fonts/misc/grk16-etl.pcf.gz --+fontset: iso8859.8-1988,pcf,R,/usr/X11R6/lib/X11/fonts/misc/heb16-etl.pcf.gz --+fontset: iso8859.9-1989,pcf,R,/usr/X11R6/lib/X11/fonts/misc/lt5-16-etl.pcf.gz --+fontset: iso8859.10-1992,pcf,R,/usr/X11R6/lib/X11/fonts/misc/8x13-ISO8859-10.pcf.gz --+fontset: iso8859.13-1998,pcf,R,/usr/X11R6/lib/X11/fonts/misc/8x13-ISO8859-13.pcf.gz --+fontset: iso8859.14-1998,pcf,R,/usr/X11R6/lib/X11/fonts/misc/8x13-ISO8859-14.pcf.gz --+fontset: iso8859.15-1999,pcf,R,/usr/X11R6/lib/X11/fonts/misc/8x13-ISO8859-15.pcf.gz -++fontset: jisx0212-1990,pcf,L,/usr/share/fonts/intlfonts/jksp16.pcf.gz -++fontset: gb2312-80,pcf,L,/usr/share/fonts/misc/gb16fs.pcf.gz -++fontset: ksc5601-1987,pcf,L,/usr/share/fonts/misc/hanglg16.pcf.gz -++fontset: iso8859.1-1987,pcf,R,/usr/share/fonts/misc/8x16.pcf.gz -++fontset: iso8859.2-1987,pcf,R,/usr/share/fonts/intlfonts/lt2-16-etl.pcf.gz -++fontset: iso8859.3-1987,pcf,R,/usr/share/fonts/intlfonts/lt3-16-etl.pcf.gz -++fontset: iso8859.4-1988,pcf,R,/usr/share/fonts/intlfonts/lt4-16-etl.pcf.gz -++fontset: iso8859.5-1988,pcf,R,/usr/share/fonts/intlfonts/cyr16-etl.pcf.gz -++fontset: iso8859.7-1987,pcf,R,/usr/share/fonts/intlfonts/grk16-etl.pcf.gz -++fontset: iso8859.8-1988,pcf,R,/usr/share/fonts/intlfonts/heb16-etl.pcf.gz -++fontset: iso8859.9-1989,pcf,R,/usr/share/fonts/intlfonts/lt5-16-etl.pcf.gz -++fontset: iso8859.10-1992,pcf,R,/usr/share/fonts/misc/8x13-ISO8859-10.pcf.gz -++fontset: iso8859.13-1998,pcf,R,/usr/share/fonts/misc/8x13-ISO8859-13.pcf.gz -++fontset: iso8859.14-1998,pcf,R,/usr/share/fonts/misc/8x13-ISO8859-14.pcf.gz -++fontset: iso8859.15-1999,pcf,R,/usr/share/fonts/misc/8x13-ISO8859-15.pcf.gz - +fontset: vt100-graphics,pcf,L,/usr/share/fonts/jfbterm/vt100-graphics.pcf.gz --+fontset: iso10646.1,pcf,L,/usr/X11R6/lib/X11/fonts/misc/unifont.pcf.gz -++fontset: iso10646.1,pcf,L,/usr/share/fonts/unifont/unifont.pcf.gz - - ################################################################################ - # -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 -@@ -31,6 +31,7 @@ - - #include - #include -+#include - - void util_privilege_init(); - void util_privilege_on(); -@@ -49,4 +50,7 @@ - - int util_search_string(const char* s, const char** array); - -+#define PAGE_SIZE (sysconf(_SC_PAGESIZE)) -+#define PAGE_MASK (~(PAGE_SIZE-1)) -+ - #endif /* INCLUDE_UTIL_H */ diff --git a/app-i18n/jfbterm/files/jfbterm-0.4.7-no-kernel-headers.patch b/app-i18n/jfbterm/files/jfbterm-0.4.7-no-kernel-headers.patch deleted file mode 100644 index 06c6e6033488..000000000000 --- a/app-i18n/jfbterm/files/jfbterm-0.4.7-no-kernel-headers.patch +++ /dev/null @@ -1,17 +0,0 @@ -Remove usage of kernel headers, deprecated since linux-headers-2.6.18. -Patch by Shunichi Fuji . - -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 -@@ -827,8 +827,7 @@ - - #ifdef JFB_VGA16FB - --#include --#include -+#include - - #define GRAPHICS_ADDR_REG 0x3ce /* Graphics address register. */ - #define GRAPHICS_DATA_REG 0x3cf /* Graphics data register. */ diff --git a/app-i18n/jfbterm/files/jfbterm-0.4.7-sigchld-debian.patch b/app-i18n/jfbterm/files/jfbterm-0.4.7-sigchld-debian.patch deleted file mode 100644 index 2e8036400770..000000000000 --- a/app-i18n/jfbterm/files/jfbterm-0.4.7-sigchld-debian.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- jfbterm-0.4.7.orig/main.c -+++ jfbterm-0.4.7/main.c -@@ -184,7 +184,7 @@ - p->gExecShellArgv = NULL; - p->gConfFile = FILE_JFBTERM_CONF; - p->gConfEncoding = NULL; -- -+ signal(SIGCHLD, sigchld); - atexit(tapp_final_at_exit); - } - ---- jfbterm-0.4.7.orig/term.h -+++ jfbterm-0.4.7/term.h -@@ -44,7 +44,7 @@ - } TTerm; - - void tterm_start(TTerm* p, const char* tn, const char* en); -- -+void sigchld(int sig); - extern TTerm gTerm; - - #endif /* INCLUDE_TERM_H */ 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 deleted file mode 100644 index 974ccbc41307..000000000000 --- a/app-i18n/jfbterm/files/jfbterm-0.4.7-wrong-inline-gcc5.patch +++ /dev/null @@ -1,24 +0,0 @@ -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/files/jfbterm-automake-1.13.patch b/app-i18n/jfbterm/files/jfbterm-automake-1.13.patch new file mode 100644 index 000000000000..e20f068a8387 --- /dev/null +++ b/app-i18n/jfbterm/files/jfbterm-automake-1.13.patch @@ -0,0 +1,14 @@ +--- a/configure.in ++++ b/configure.in +@@ -1,7 +1,8 @@ + dnl Process this file with autoconf to produce a configure script. +-AC_INIT(fbcommon.c) +-AM_CONFIG_HEADER(config.h) +-AM_INIT_AUTOMAKE(jfbterm, 0.4.7) ++AC_INIT([jfbterm], [0.4.7]) ++AC_CONFIG_SRCDIR([fbcommon.c]) ++AC_CONFIG_HEADERS([config.h]) ++AM_INIT_AUTOMAKE + + dnl Checks for programs. + AC_PROG_CC diff --git a/app-i18n/jfbterm/files/jfbterm-gentoo.patch b/app-i18n/jfbterm/files/jfbterm-gentoo.patch new file mode 100644 index 000000000000..48286aa8b227 --- /dev/null +++ b/app-i18n/jfbterm/files/jfbterm-gentoo.patch @@ -0,0 +1,140 @@ +--- a/fbcommon.c ++++ b/fbcommon.c +@@ -46,7 +46,6 @@ + #endif + #include + #include +-#include + + #include "mytypes.h" + #include "fbcommon.h" +@@ -475,6 +474,9 @@ + perror("ioctl FBIOGET_CON2FBMAP"); + c2m.framebuffer = 0; + } ++ if (-1 == c2m.framebuffer) { ++ c2m.framebuffer = 0; ++ } + close(fd); + snprintf(fbdn, 15, "/dev/fb%d", c2m.framebuffer); + } +--- a/jfbterm.conf.sample ++++ b/jfbterm.conf.sample +@@ -19,29 +19,29 @@ + # Absolute path or relative path to PWD + # + ############################################################################### +-fontset : iso646-1973irv,pcf,L,/usr/X11R6/lib/X11/fonts/misc/8x16.pcf.gz ++fontset : iso646-1973irv,pcf,L,/usr/share/fonts/misc/8x16.pcf.gz + +fontset: ansix3.4-1968,alias,L,iso646-1973irv +-+fontset: jisc6226-1978,pcf,L,/usr/X11R6/lib/X11/fonts/misc/jiskan16.pcf.gz +++fontset: jisc6226-1978,pcf,L,/usr/share/fonts/misc/jiskan16.pcf.gz + +fontset: jisx0208-1983,alias,L,jisc6226-1978 +-+fontset: jisc6220-1969roman,pcf,L,/usr/X11R6/lib/X11/fonts/misc/a18rk.pcf.gz +++fontset: jisc6220-1969roman,pcf,L,/usr/share/fonts/intlfonts/a18rk.pcf.gz + +fontset: jisc6220-1969kana,alias,R,jisc6220-1969roman +-+fontset: jisx0212-1990,pcf,L,/usr/X11R6/lib/X11/fonts/misc/jksp16.pcf.gz +-+fontset: gb2312-80,pcf,L,/usr/X11R6/lib/X11/fonts/misc/gb16fs.pcf.gz +-+fontset: ksc5601-1987,pcf,L,/usr/X11R6/lib/X11/fonts/misc/hanglg16.pcf.gz +-+fontset: iso8859.1-1987,pcf,R,/usr/X11R6/lib/X11/fonts/misc/8x16.pcf.gz +-+fontset: iso8859.2-1987,pcf,R,/usr/X11R6/lib/X11/fonts/misc/lt2-16-etl.pcf.gz +-+fontset: iso8859.3-1988,pcf,R,/usr/X11R6/lib/X11/fonts/misc/lt3-16-etl.pcf.gz +-+fontset: iso8859.4-1988,pcf,R,/usr/X11R6/lib/X11/fonts/misc/lt4-16-etl.pcf.gz +-+fontset: iso8859.5-1988,pcf,R,/usr/X11R6/lib/X11/fonts/misc/cyr16-etl.pcf.gz +-+fontset: iso8859.7-1987,pcf,R,/usr/X11R6/lib/X11/fonts/misc/grk16-etl.pcf.gz +-+fontset: iso8859.8-1988,pcf,R,/usr/X11R6/lib/X11/fonts/misc/heb16-etl.pcf.gz +-+fontset: iso8859.9-1989,pcf,R,/usr/X11R6/lib/X11/fonts/misc/lt5-16-etl.pcf.gz +-+fontset: iso8859.10-1992,pcf,R,/usr/X11R6/lib/X11/fonts/misc/8x13-ISO8859-10.pcf.gz +-+fontset: iso8859.13-1998,pcf,R,/usr/X11R6/lib/X11/fonts/misc/8x13-ISO8859-13.pcf.gz +-+fontset: iso8859.14-1998,pcf,R,/usr/X11R6/lib/X11/fonts/misc/8x13-ISO8859-14.pcf.gz +-+fontset: iso8859.15-1999,pcf,R,/usr/X11R6/lib/X11/fonts/misc/8x13-ISO8859-15.pcf.gz +++fontset: jisx0212-1990,pcf,L,/usr/share/fonts/intlfonts/jksp16.pcf.gz +++fontset: gb2312-80,pcf,L,/usr/share/fonts/misc/gb16fs.pcf.gz +++fontset: ksc5601-1987,pcf,L,/usr/share/fonts/misc/hanglg16.pcf.gz +++fontset: iso8859.1-1987,pcf,R,/usr/share/fonts/misc/8x16.pcf.gz +++fontset: iso8859.2-1987,pcf,R,/usr/share/fonts/intlfonts/lt2-16-etl.pcf.gz +++fontset: iso8859.3-1988,pcf,R,/usr/share/fonts/intlfonts/lt3-16-etl.pcf.gz +++fontset: iso8859.4-1988,pcf,R,/usr/share/fonts/intlfonts/lt4-16-etl.pcf.gz +++fontset: iso8859.5-1988,pcf,R,/usr/share/fonts/intlfonts/cyr16-etl.pcf.gz +++fontset: iso8859.7-1987,pcf,R,/usr/share/fonts/intlfonts/grk16-etl.pcf.gz +++fontset: iso8859.8-1988,pcf,R,/usr/share/fonts/intlfonts/heb16-etl.pcf.gz +++fontset: iso8859.9-1989,pcf,R,/usr/share/fonts/intlfonts/lt5-16-etl.pcf.gz +++fontset: iso8859.10-1992,pcf,R,/usr/share/fonts/misc/8x13-ISO8859-10.pcf.gz +++fontset: iso8859.13-1998,pcf,R,/usr/share/fonts/misc/8x13-ISO8859-13.pcf.gz +++fontset: iso8859.14-1998,pcf,R,/usr/share/fonts/misc/8x13-ISO8859-14.pcf.gz +++fontset: iso8859.15-1999,pcf,R,/usr/share/fonts/misc/8x13-ISO8859-15.pcf.gz + +fontset: vt100-graphics,pcf,L,/usr/share/fonts/jfbterm/vt100-graphics.pcf.gz +-+fontset: iso10646.1,pcf,U,/usr/X11R6/lib/X11/fonts/misc/unifont.pcf.gz +++fontset: iso10646.1,pcf,U,/usr/share/fonts/unifont/unifont.pcf.gz + + + ############################################################################### +--- a/jfbterm.conf.sample.ja ++++ b/jfbterm.conf.sample.ja +@@ -25,29 +25,29 @@ + # 絶対パス or PWDからの相対パス + # + ################################################################################ +-fontset : iso646-1973irv,pcf,L,/usr/X11R6/lib/X11/fonts/misc/8x16.pcf.gz ++fontset : iso646-1973irv,pcf,L,/usr/share/fonts/misc/8x16.pcf.gz + +fontset: ansix3.4-1968,alias,L,iso646-1973irv +-+fontset: jisc6226-1978,pcf,L,/usr/X11R6/lib/X11/fonts/misc/jiskan16.pcf.gz +++fontset: jisc6226-1978,pcf,L,/usr/share/fonts/misc/jiskan16.pcf.gz + +fontset: jisx0208-1983,alias,L,jisc6226-1978 +-+fontset: jisc6220-1969roman,pcf,L,/usr/X11R6/lib/X11/fonts/misc/a18rk.pcf.gz +++fontset: jisc6220-1969roman,pcf,L,/usr/share/fonts/intlfonts/a18rk.pcf.gz + +fontset: jisc6220-1969kana,alias,R,jisc6220-1969roman +-+fontset: jisx0212-1990,pcf,L,/usr/X11R6/lib/X11/fonts/misc/jksp16.pcf.gz +-+fontset: gb2312-80,pcf,L,/usr/X11R6/lib/X11/fonts/misc/gb16fs.pcf.gz +-+fontset: ksc5601-1987,pcf,L,/usr/X11R6/lib/X11/fonts/misc/hanglg16.pcf.gz +-+fontset: iso8859.1-1987,pcf,R,/usr/X11R6/lib/X11/fonts/misc/8x16.pcf.gz +-+fontset: iso8859.2-1987,pcf,R,/usr/X11R6/lib/X11/fonts/misc/lt2-16-etl.pcf.gz +-+fontset: iso8859.3-1987,pcf,R,/usr/X11R6/lib/X11/fonts/misc/lt3-16-etl.pcf.gz +-+fontset: iso8859.4-1988,pcf,R,/usr/X11R6/lib/X11/fonts/misc/lt4-16-etl.pcf.gz +-+fontset: iso8859.5-1988,pcf,R,/usr/X11R6/lib/X11/fonts/misc/cyr16-etl.pcf.gz +-+fontset: iso8859.7-1987,pcf,R,/usr/X11R6/lib/X11/fonts/misc/grk16-etl.pcf.gz +-+fontset: iso8859.8-1988,pcf,R,/usr/X11R6/lib/X11/fonts/misc/heb16-etl.pcf.gz +-+fontset: iso8859.9-1989,pcf,R,/usr/X11R6/lib/X11/fonts/misc/lt5-16-etl.pcf.gz +-+fontset: iso8859.10-1992,pcf,R,/usr/X11R6/lib/X11/fonts/misc/8x13-ISO8859-10.pcf.gz +-+fontset: iso8859.13-1998,pcf,R,/usr/X11R6/lib/X11/fonts/misc/8x13-ISO8859-13.pcf.gz +-+fontset: iso8859.14-1998,pcf,R,/usr/X11R6/lib/X11/fonts/misc/8x13-ISO8859-14.pcf.gz +-+fontset: iso8859.15-1999,pcf,R,/usr/X11R6/lib/X11/fonts/misc/8x13-ISO8859-15.pcf.gz +++fontset: jisx0212-1990,pcf,L,/usr/share/fonts/intlfonts/jksp16.pcf.gz +++fontset: gb2312-80,pcf,L,/usr/share/fonts/misc/gb16fs.pcf.gz +++fontset: ksc5601-1987,pcf,L,/usr/share/fonts/misc/hanglg16.pcf.gz +++fontset: iso8859.1-1987,pcf,R,/usr/share/fonts/misc/8x16.pcf.gz +++fontset: iso8859.2-1987,pcf,R,/usr/share/fonts/intlfonts/lt2-16-etl.pcf.gz +++fontset: iso8859.3-1987,pcf,R,/usr/share/fonts/intlfonts/lt3-16-etl.pcf.gz +++fontset: iso8859.4-1988,pcf,R,/usr/share/fonts/intlfonts/lt4-16-etl.pcf.gz +++fontset: iso8859.5-1988,pcf,R,/usr/share/fonts/intlfonts/cyr16-etl.pcf.gz +++fontset: iso8859.7-1987,pcf,R,/usr/share/fonts/intlfonts/grk16-etl.pcf.gz +++fontset: iso8859.8-1988,pcf,R,/usr/share/fonts/intlfonts/heb16-etl.pcf.gz +++fontset: iso8859.9-1989,pcf,R,/usr/share/fonts/intlfonts/lt5-16-etl.pcf.gz +++fontset: iso8859.10-1992,pcf,R,/usr/share/fonts/misc/8x13-ISO8859-10.pcf.gz +++fontset: iso8859.13-1998,pcf,R,/usr/share/fonts/misc/8x13-ISO8859-13.pcf.gz +++fontset: iso8859.14-1998,pcf,R,/usr/share/fonts/misc/8x13-ISO8859-14.pcf.gz +++fontset: iso8859.15-1999,pcf,R,/usr/share/fonts/misc/8x13-ISO8859-15.pcf.gz + +fontset: vt100-graphics,pcf,L,/usr/share/fonts/jfbterm/vt100-graphics.pcf.gz +-+fontset: iso10646.1,pcf,L,/usr/X11R6/lib/X11/fonts/misc/unifont.pcf.gz +++fontset: iso10646.1,pcf,L,/usr/share/fonts/unifont/unifont.pcf.gz + + ################################################################################ + # +--- a/util.h ++++ b/util.h +@@ -31,6 +31,7 @@ + + #include + #include ++#include + + void util_privilege_init(); + void util_privilege_on(); +@@ -49,4 +50,7 @@ + + int util_search_string(const char* s, const char** array); + ++#define PAGE_SIZE (sysconf(_SC_PAGESIZE)) ++#define PAGE_MASK (~(PAGE_SIZE-1)) ++ + #endif /* INCLUDE_UTIL_H */ diff --git a/app-i18n/jfbterm/files/jfbterm-no-kernel-headers.patch b/app-i18n/jfbterm/files/jfbterm-no-kernel-headers.patch new file mode 100644 index 000000000000..aa0b39ed269f --- /dev/null +++ b/app-i18n/jfbterm/files/jfbterm-no-kernel-headers.patch @@ -0,0 +1,17 @@ +Remove usage of kernel headers, deprecated since linux-headers-2.6.18. +Patch by Shunichi Fuji . + +See bug #156306 + +--- a/fbdpsp.c ++++ b/fbdpsp.c +@@ -827,8 +827,7 @@ + + #ifdef JFB_VGA16FB + +-#include +-#include ++#include + + #define GRAPHICS_ADDR_REG 0x3ce /* Graphics address register. */ + #define GRAPHICS_DATA_REG 0x3cf /* Graphics data register. */ diff --git a/app-i18n/jfbterm/files/jfbterm-sigchld-debian.patch b/app-i18n/jfbterm/files/jfbterm-sigchld-debian.patch new file mode 100644 index 000000000000..60deee49422e --- /dev/null +++ b/app-i18n/jfbterm/files/jfbterm-sigchld-debian.patch @@ -0,0 +1,22 @@ +--- a/main.c ++++ b/main.c +@@ -184,7 +184,7 @@ + p->gExecShellArgv = NULL; + p->gConfFile = FILE_JFBTERM_CONF; + p->gConfEncoding = NULL; +- ++ signal(SIGCHLD, sigchld); + atexit(tapp_final_at_exit); + } + +--- a/term.h ++++ b/term.h +@@ -44,7 +44,7 @@ + } TTerm; + + void tterm_start(TTerm* p, const char* tn, const char* en); +- ++void sigchld(int sig); + extern TTerm gTerm; + + #endif /* INCLUDE_TERM_H */ diff --git a/app-i18n/jfbterm/files/jfbterm-wrong-inline-gcc5.patch b/app-i18n/jfbterm/files/jfbterm-wrong-inline-gcc5.patch new file mode 100644 index 000000000000..aa41d5e02ce7 --- /dev/null +++ b/app-i18n/jfbterm/files/jfbterm-wrong-inline-gcc5.patch @@ -0,0 +1,24 @@ +https://src.fedoraproject.org/rpms/jfbterm/blob/rawhide/f/jfbterm-0.4.7-wrong-inline-gcc5.patch + +--- a/pen.c ++++ b/pen.c +@@ -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; +--- a/pen.h ++++ b/pen.h +@@ -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 93989a66a5ad..3fb31512982d 100644 --- a/app-i18n/jfbterm/jfbterm-0.4.7-r4.ebuild +++ b/app-i18n/jfbterm/jfbterm-0.4.7-r4.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI="7" inherit autotools flag-o-matic @@ -15,16 +15,16 @@ KEYWORDS="amd64 ppc ppc64 sparc x86" IUSE="debug" DEPEND="sys-libs/ncurses:0" -RDEPEND=" - media-fonts/unifont - media-fonts/font-misc-misc - media-fonts/intlfonts" +RDEPEND="media-fonts/font-misc-misc + media-fonts/intlfonts + media-fonts/unifont" 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 + "${FILESDIR}"/${PN}-automake-1.13.patch ) src_prepare() { @@ -38,15 +38,15 @@ src_configure() { } src_install() { - dodir /etc /usr/share/fonts/jfbterm + dodir /etc /usr/share/fonts/${PN} default - mv "${ED%/}"/etc/jfbterm.conf{.sample,} || die + mv "${ED}"/etc/${PN}.conf{.sample,} || die - doman jfbterm.1 jfbterm.conf.5 + doman ${PN}.{1,conf.5} # install example config files docinto examples - dodoc jfbterm.conf.sample* + dodoc ${PN}.conf.sample* docompress -x /usr/share/doc/${PF}/examples } -- cgit v1.2.3