diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-03-03 13:42:34 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-03-03 13:42:34 +0000 |
commit | 066d27181e9a797ad9f8fc43b49fc9a10ff2f707 (patch) | |
tree | 3cb05783d73b2c33589ba305144a31c718e123cd /app-editors/fte | |
parent | 16449a80e28af2209916cc66d19c9a44ca2b90d9 (diff) |
gentoo resync : 03.03.2019
Diffstat (limited to 'app-editors/fte')
-rw-r--r-- | app-editors/fte/Manifest | 5 | ||||
-rw-r--r-- | app-editors/fte/files/fte-cpp14.patch | 17 | ||||
-rw-r--r-- | app-editors/fte/files/fte-gcc34 | 38 | ||||
-rw-r--r-- | app-editors/fte/files/fte-interix.patch | 38 | ||||
-rw-r--r-- | app-editors/fte/files/fte-new_keyword.patch | 14 | ||||
-rw-r--r-- | app-editors/fte/files/fte-slang.patch | 131 |
6 files changed, 0 insertions, 243 deletions
diff --git a/app-editors/fte/Manifest b/app-editors/fte/Manifest index 2648deb205ac..ac212dbd39d7 100644 --- a/app-editors/fte/Manifest +++ b/app-editors/fte/Manifest @@ -1,9 +1,4 @@ AUX fte 604 BLAKE2B ccb21ce020421a68d33fb94185d3acc6ad26f6f8cd0c574c9ca611aa923180e5192b6271312575f7a64f329d3e25d2722b07425553cfa57e54ed55ec3668f0f1 SHA512 5f93df643282016c352db88cddd37c1b9f86d94654a7eff0089b9d349ad3f56ba4266cb2431ac3a418bd4b5aebf6d7ad04c26099061942fd3e90fc9fb938322b -AUX fte-cpp14.patch 531 BLAKE2B 1a40bf7a6a71daab0a550d6de1fc2c653b4b5ce9108be9be12819e0b09829bdb06a961ef5e66792a51d25d1751dd0223e4b3ae3bd38aab82cea88ddf92ac921c SHA512 d6bfe5912f92e5d948d3de49085824d74ca51877b93cf8af7f2d4a6d162e6ea5ae11f96fc2b096875a9cd08476af88b07a7a1e352a97206876c15779e4bc36a5 -AUX fte-gcc34 1092 BLAKE2B f713cc9b727b2e133a55fcf01b2a22b9d27451deb7db803946160d6711bc088aba8850743a8ca93358107f8000894b92be93156cf22428cb8d7478dadd3cfe93 SHA512 390da870507786d74d67847d644c07d9c24789913117c46fcd8739f5ceb58345ac100a7cd1e2ef1183d09e76f923b73cd94fa523f5eaa3d6113a952240fd4800 -AUX fte-interix.patch 1041 BLAKE2B 55f18c0cc954181800e9efcdbf463d4ceaa63ff3ae8f9e062af824bafab5364ab079afae40361d0caba95cca7635c8d756f7317355092293bf901aac4076b031 SHA512 6f43c682b577b838675fe93c9e2b4c225e3c853d2db95f81f84d64508e78c6f957f1c8842343df2d9a6e7d01e5103a6cc2a1cd0cf414cee641b6b11c0d551b78 -AUX fte-new_keyword.patch 340 BLAKE2B a50987a59180352dfec174af7467f153c575442407dbd48b40c7a0c1d2e0260f09a42d55cab122489ea01fd98f4579722ddd39ebc0eecf50d720a464b410e25c SHA512 ab003f671919fb03429ab13adda5025554258e0799844b887cb786c2378e81025893998b0ef3b0b121d82422502d90f5dc8afa9855c1432c8d2f6597ea087c7a -AUX fte-slang.patch 3567 BLAKE2B 3519a97a1f354ad8515df86ce8dbb8c9a66f531f8f8653c1ddc5d910a97ba794556b9840a5c0694710150e7fddd53dd6bb69e1a70fb40c2c33e0232b9719bf77 SHA512 3f9504d9b4d6de6e012f0aedf762dce51d1fbc79345f2f45f5303bc81194441396cbd7eadc9457e07814cb6d33b6db6ad1186de026b5b474f9419071e4b75d10 DIST fte-20110708-common.zip 200007 BLAKE2B ce1ac0f2bd68b2bb7ef1d96a46bd9a481cd46f5cde00607c64f752d5e87f6edefd8a92c8210e1ac7629ef8bc5720a8a2d75bd61f292f344e211b88a2462989fa SHA512 0bb59a5b6b4a5ef6c1234dadd8922cd50a13ad1f0c06d6046b74a95592ad55f720b43bbc78a42cab63dfc68c5e073d44d5179bd6ed72f346563f43f3c5c146f1 DIST fte-20110708-src.zip 504199 BLAKE2B 42bb3cc4ae9be4b64c0b161488d91d4a260a2e6a1574fccb0fc652359e34f7b6b881f170dfd85a8954f2b2fdbe4fecaaf2fc68cd5244f185dde36fe1a694004e SHA512 2d59fadcdd988ee85b87425c343341e1b768a7e9ef838c5f8a1f22c4adc5bf2cc37d547f36354ca1740bce07b33d5ae93d14e24001b9dbd3b1b267986564a089 EBUILD fte-20110708-r1.ebuild 2650 BLAKE2B dd59d0f406114411a1e1c209874638c70c64a3009a25c7bcf9f66e030519ec5bcbb2b5cc7114ac0ee2ad04abb9e589c07d62ceb0bf007c90884ada1a8650ced5 SHA512 7806ebeb454e83cae2dff40f5bb30d942545f22e58ea3cc768dfb5bf944eed6ea1c91176d91a3e6e56df1c29bedbca9820cb9616efd53ef6673d878043569765 diff --git a/app-editors/fte/files/fte-cpp14.patch b/app-editors/fte/files/fte-cpp14.patch deleted file mode 100644 index bea83b6a5ccd..000000000000 --- a/app-editors/fte/files/fte-cpp14.patch +++ /dev/null @@ -1,17 +0,0 @@ -Fix C++14 compilation errors. Add casting int literals to char in config -generator to avoid narrowing conversions. -Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=595048 - ---- a/src/mkdefcfg.pl -+++ b/src/mkdefcfg.pl -@@ -24,8 +24,8 @@ - - @c = split(//, $buf); - for ($i = 0; $i < $len; $i++) { -- $out .= sprintf("0x%02X", ord($c[$i])); -- if ($n++ % 10) { -+ $out .= sprintf("(char)0x%02X", ord($c[$i])); -+ if ($n++ % 5) { - $out .= ", "; - } else { - $out .= ",\n"; diff --git a/app-editors/fte/files/fte-gcc34 b/app-editors/fte/files/fte-gcc34 deleted file mode 100644 index 51940e650657..000000000000 --- a/app-editors/fte/files/fte-gcc34 +++ /dev/null @@ -1,38 +0,0 @@ ---- fte/src/con_slang.cpp 2003-02-16 19:23:58.000000000 +0100 -+++ fte-gcc34/src/con_slang.cpp 2005-01-12 16:57:38.050369064 +0100 -@@ -246,7 +246,7 @@ - SLsmg_write_nchars(slang_dchs, sizeof(slang_dchs)); - - SLsmg_gotorc(0, 0); -- SLsmg_read_raw(linebuf, sizeof(slang_dchs)); -+ SLsmg_read_raw((SLsmg_Char_Type*)linebuf, sizeof(slang_dchs)); - for (i = 0; i < sizeof(slang_dchs); i++) - raw_dchs[i] = (linebuf[i]) & 0xff; - -@@ -368,7 +368,7 @@ - ConQueryCursorPos(&CurX, &CurY); - while (H > 0) { - SLsmg_gotorc(Y++, X); -- SLsmg_write_raw(box, W); -+ SLsmg_write_raw((SLsmg_Char_Type*)box, W); - box += W; - H--; - } -@@ -386,7 +386,7 @@ - ConQueryCursorPos(&CurX, &CurY); - while (H > 0) { - SLsmg_gotorc(Y++, X); -- SLsmg_read_raw(Cell, W); -+ SLsmg_read_raw((SLsmg_Char_Type*)Cell, W); - for (i = 0; i < W; i++) - if (Cell[i] & 0x8000) { - ch = Cell[i] & 0xff; -@@ -409,7 +409,7 @@ - ConQueryCursorPos(&CurX, &CurY); - while (H > 0) { - SLsmg_gotorc(Y++, X); -- SLsmg_read_raw(box, W); -+ SLsmg_read_raw((SLsmg_Char_Type*)box, W); - box += W; - H--; - } diff --git a/app-editors/fte/files/fte-interix.patch b/app-editors/fte/files/fte-interix.patch deleted file mode 100644 index 1df0a49f488a..000000000000 --- a/app-editors/fte/files/fte-interix.patch +++ /dev/null @@ -1,38 +0,0 @@ -https://sourceforge.net/tracker/?func=detail&aid=3554646&group_id=943&atid=100943 - -diff -ru fte.orig/src/g_unix_pipe.cpp fte/src/g_unix_pipe.cpp ---- fte.orig/src/g_unix_pipe.cpp 2008-04-03 13:33:49 +0200 -+++ fte/src/g_unix_pipe.cpp 2008-04-03 13:34:20 +0200 -@@ -4,6 +4,10 @@ - #include <signal.h> - #include <sys/wait.h> - -+#ifdef __INTERIX -+# include <sys/time.h> -+#endif -+ - #include "sysdep.h" - #include "c_config.h" - #include "console.h" -diff -ru fte.orig/src/sysdep.h fte/src/sysdep.h ---- fte.orig/src/sysdep.h 2008-04-03 13:33:58 +0200 -+++ fte/src/sysdep.h 2008-04-03 13:30:43 +0200 -@@ -15,7 +15,7 @@ - #include <stdlib.h> - #include <stdarg.h> - #include <string.h> --#if defined(AIX) || defined(SCO) || defined(NCR) -+#if defined(AIX) || defined(SCO) || defined(NCR) || defined(__INTERIX) - #include <strings.h> - #endif - #include <stdio.h> -@@ -38,7 +38,8 @@ - !defined(IRIX) && \ - !defined(SCO) && \ - !defined(SUNOS) && \ -- !defined(NCR) -+ !defined(NCR) && \ -+ !defined(__INTERIX) - # error Target not supported. - #endif - diff --git a/app-editors/fte/files/fte-new_keyword.patch b/app-editors/fte/files/fte-new_keyword.patch deleted file mode 100644 index c7b2a2b64554..000000000000 --- a/app-editors/fte/files/fte-new_keyword.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- src/con_linux.cpp.orig 2005-01-30 22:46:54.170485296 +0300 -+++ src/con_linux.cpp 2005-01-30 22:46:28.859333176 +0300 -@@ -50,7 +50,11 @@ - #include <linux/major.h> - #include <linux/kdev_t.h> - #include <linux/kd.h> -+extern "C" { -+#define new xnew - #include <linux/keyboard.h> -+#undef new -+} - #ifdef USE_GPM - extern "C" { - #include <gpm.h> diff --git a/app-editors/fte/files/fte-slang.patch b/app-editors/fte/files/fte-slang.patch deleted file mode 100644 index 50470bd6b7ef..000000000000 --- a/app-editors/fte/files/fte-slang.patch +++ /dev/null @@ -1,131 +0,0 @@ -diff -Nru /tmp/wgHyQebD7F/fte-0.50.0/src/con_slang.cpp /tmp/PQJo4szkUb/fte-0.50.0/src/con_slang.cpp ---- a/fte-0.50.0/src/con_slang.cpp 2005-12-28 16:53:24.000000000 +0100 -+++ b/fte-0.50.0/src/con_slang.cpp 2006-06-05 06:02:37.000000000 +0200 -@@ -99,12 +99,14 @@ - '+' - }; - --static char raw_dchs[sizeof(slang_dchs)]; -+static SLsmg_Char_Type raw_dchs[sizeof(slang_dchs)]; - --static unsigned char ftesl_get_dch(char raw) -+static unsigned char ftesl_get_dch(SLsmg_Char_Type raw) - { - for (int i = 0; i < (int) sizeof(slang_dchs); i++) -- if (raw_dchs[i] == raw) -+ if (raw_dchs[i].nchars == raw.nchars -+ && !memcmp(raw_dchs[i].wchars, raw.wchars, -+ raw.nchars * sizeof(*raw.wchars))) - return DCH_SLANG_C1 + i; - return DCH_SLANG_EOL; - } -@@ -215,7 +217,6 @@ - int ConInit(int /*XSize */ , int /*YSize */ ) - { - unsigned i; -- unsigned short linebuf[sizeof(slang_dchs)]; - - SLtt_get_terminfo(); - -@@ -246,9 +247,7 @@ - SLsmg_write_nchars(slang_dchs, sizeof(slang_dchs)); - - SLsmg_gotorc(0, 0); -- SLsmg_read_raw((SLsmg_Char_Type*)linebuf, sizeof(slang_dchs)); -- for (i = 0; i < sizeof(slang_dchs); i++) -- raw_dchs[i] = (linebuf[i]) & 0xff; -+ SLsmg_read_raw(raw_dchs, sizeof(slang_dchs)); - - SLsmg_set_char_set(0); - -@@ -361,14 +360,14 @@ - return 0; - } - --static int ConPutBoxRaw(int X, int Y, int W, int H, unsigned short *box) -+static int ConPutBoxRaw(int X, int Y, int W, int H, SLsmg_Char_Type *box) - { - int CurX, CurY; - - ConQueryCursorPos(&CurX, &CurY); - while (H > 0) { - SLsmg_gotorc(Y++, X); -- SLsmg_write_raw((SLsmg_Char_Type*)box, W); -+ SLsmg_write_raw(box, W); - box += W; - H--; - } -@@ -381,35 +380,51 @@ - int ConGetBox(int X, int Y, int W, int H, PCell Cell) - { - int CurX, CurY, i; -- char ch; -+ SLsmg_Char_Type *linebuf; -+ -+ linebuf = new SLsmg_Char_Type [W]; - - ConQueryCursorPos(&CurX, &CurY); - while (H > 0) { - SLsmg_gotorc(Y++, X); -- SLsmg_read_raw((SLsmg_Char_Type*)Cell, W); -- for (i = 0; i < W; i++) -- if (Cell[i] & 0x8000) { -- ch = Cell[i] & 0xff; -- Cell[i] &= 0x7f00; -- Cell[i] |= ftesl_get_dch(ch); -- } -+ SLsmg_read_raw(linebuf, W); -+ for (i = 0; i < W; i++) { -+ if (linebuf[i].color & SLSMG_ACS_MASK) -+ Cell[i] = ftesl_get_dch(linebuf[i]); -+ else -+ /* -+ * FIXME: Handle UTF-8 -- way beyond a quick-and-dirty -+ * fix. --MV -+ */ -+ Cell[i] = SLSMG_EXTRACT_CHAR(linebuf[i]); -+ /* -+ * FIXME: This preserves only 7 out of 15 bits of color. -+ * Fortunately, we're dealing with color handles rather than -+ * colors themselves -- S-Lang jumps through an extra hoop to -+ * map these to color data. As long as we use less than 127 -+ * different colors, things should be OK. I think. --MV -+ */ -+ Cell[i] |= (linebuf[i].color & 0x7f) << 8; -+ } - Cell += W; - H--; - } - ConSetCursorPos(CurX, CurY); - -+ delete [] (linebuf); -+ - return 0; - - } - --static int ConGetBoxRaw(int X, int Y, int W, int H, unsigned short *box) -+static int ConGetBoxRaw(int X, int Y, int W, int H, SLsmg_Char_Type *box) - { - int CurX, CurY; - - ConQueryCursorPos(&CurX, &CurY); - while (H > 0) { - SLsmg_gotorc(Y++, X); -- SLsmg_read_raw((SLsmg_Char_Type*)box, W); -+ SLsmg_read_raw(box, W); - box += W; - H--; - } -@@ -451,9 +466,9 @@ - - int ConScroll(int Way, int X, int Y, int W, int H, TAttr Fill, int Count) - { -- unsigned short *box; -+ SLsmg_Char_Type *box; - -- box = new unsigned short [W * H]; -+ box = new SLsmg_Char_Type [W * H]; - - TCell fill = (((unsigned) Fill) << 8) | ' '; - |