diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-09-16 09:32:48 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-09-16 09:32:48 +0100 |
commit | 9ee6d97c2883d42f204a533a8bc1f4562df778fb (patch) | |
tree | b690ddc0ca30f1472887edbb0b8313629bfcbbb2 /app-editors/hteditor | |
parent | b17a3ef12038de50228bade1f05502c74e135321 (diff) |
gentoo resync : 16.09.2020
Diffstat (limited to 'app-editors/hteditor')
-rw-r--r-- | app-editors/hteditor/Manifest | 8 | ||||
-rw-r--r-- | app-editors/hteditor/files/hteditor-2.1.0-AR.patch | 14 | ||||
-rw-r--r-- | app-editors/hteditor/files/hteditor-2.1.0-format-security.patch | 57 | ||||
-rw-r--r-- | app-editors/hteditor/files/hteditor-2.1.0-gcc-10.patch | 36 | ||||
-rw-r--r-- | app-editors/hteditor/files/hteditor-2.1.0-gcc-7.patch | 32 | ||||
-rw-r--r-- | app-editors/hteditor/hteditor-2.1.0-r1.ebuild | 64 | ||||
-rw-r--r-- | app-editors/hteditor/hteditor-2.1.1_pre20161206.ebuild | 2 |
7 files changed, 2 insertions, 211 deletions
diff --git a/app-editors/hteditor/Manifest b/app-editors/hteditor/Manifest index 865c2db9964d..6c3a38603392 100644 --- a/app-editors/hteditor/Manifest +++ b/app-editors/hteditor/Manifest @@ -1,11 +1,5 @@ -AUX hteditor-2.1.0-AR.patch 362 BLAKE2B 7698e475679e730f4e5642f1acfc802170810699209c6e68d6587075bf95502eaec18e618b065b4072178e9d4371628331af1d867495c7283380facc07594a24 SHA512 3b656378c025e94fa480b942ae9ce073b9af33a062ba9806d3baeb2b091df1a186eee87e58e1ddcb9823c97db4a68f0f69ee0584aa0b4bfb03f487bc28dcf7c4 -AUX hteditor-2.1.0-format-security.patch 1517 BLAKE2B 29ba4d308ac6b03b79f25c1aef38aac224ef936c0ebbb052e8a6238d863da34e575791bbbb6a430ff1e700f0c51f3ac27658646038f76c837a6fa2070d318bda SHA512 71b27c81d421d2ddee2e8ac6fe0d599678686880bebbd15464bee9ce4692f9e36dc1022f055ed6ff544985cdf1ccc496c1729ada193285b345597b5c186f5b5f -AUX hteditor-2.1.0-gcc-10.patch 989 BLAKE2B f4678cfa1eccc741005d4a51d4c74f4d01c0f62594b1f138121758db26b24c4a588430a43f4cae5d9b6f4032236c4f6478b385542e060c37225859d9cd78ba93 SHA512 2fceb761e1ef4225917a66db2fabac1a38072e83ce0fdfa9bdc592d34f9f7870c2a0aae971a4ebe7baffb52203f6b7b906e57f672925fbaf0c8ca77fcebf1a2d AUX hteditor-2.1.0-gcc-6-uchar.patch 1443 BLAKE2B e08ca71c4c0499f8344174ea09fa3252c4199367904b9d1b937f13d95e36f48a2d5c687d5e3d39edd56fba4fda74190facffbc7a8bc8b8ebfcf0bba9cd820226 SHA512 2bf1b8b6b945f9a153b2ee2afa03facbcebad36405bbe07c16230a2269595836fd802770b9209ce8a018195d77be553817352d99da6acdf0e7d8989a4ce09431 -AUX hteditor-2.1.0-gcc-7.patch 724 BLAKE2B 030fe4de475ce4b140f5dcee8cb0268bb0b6dc19f1e50b94cf0f3b8f0546d462025ca30a1a75acc16f7560c9318efaa8adeb6a29c33789c304c97512b31994c5 SHA512 afdc2fef1c05a225e9a8e8d4ccd25a8b1912ff6532dd09a320f6df031edb732d9b9b99fb77f39cd41ccc45fd9818fae1b802ca1831669a0e2825b59094094de9 AUX hteditor-2.1.0-tinfo.patch 176 BLAKE2B 936f60f54424b9d69986b7b9564abd3c5de2a321611e66e386aac47ea504f7a40d3c6614f4430a70052b39dcdf68f4540cf1ae4a2dd0a4b237857cd611bbf8fe SHA512 1800a7010f0d94da473bd10e3ab36bea2b99c2d9b78b01f0c3ce7c35d2f9ee33eb3da9a2b091482f213136f23c97bc3afd9a10f59c7e56b36817cb5ba34f4c36 -DIST ht-2.1.0.tar.bz2 884139 BLAKE2B c979563cbfc4df7e14f587b250fbf099d9f4683afddb3afc88693284c378c45466dfa3c47555fc69e83e2972cfabab63f3cdd42fd85602842854372131e4063d SHA512 6b5fc5fcbc63b9b7c85721158e044e4578ebfdc38618c760c0e6de06a276bccd3a960ab8bed172de788934515ad94d86349c4abd3228da66b1601deaaa2ce410 DIST ht-2.1.1_pre20161206.tar.gz 1082309 BLAKE2B 4fb00b0aa6115da3b561436f9f9905c48d93d6768bcf207931bb46840727c85fb5c9a1afda8ed805f71e9ce242161a2b95e26add02ff5aedc407df7f11c6ddec SHA512 33d681ee8c978568dd0d187d6846994362625d000c316baab10c237175fa6a47dc0e7b61cfd503c4dfad8a01d27af7fc87cbf20109087e1d9280048c898fa621 -EBUILD hteditor-2.1.0-r1.ebuild 1340 BLAKE2B 3869802dc5c5a8d19a3e8ccefb1ff4c14ff6a27775e95bda7a2d29c7e394af9b37a6b4ca1a9fe73c14d4163e7d9506719e4378440797a5d3d2fa3ee71e83ed40 SHA512 0302c17994d1fa7f7b22995912bca82942c00141db3a79d1c67b41aff74b6c92e6b8920b20e63917926fa775035ee4db3b38ffd6ddf09314a439f5826afa3bd4 -EBUILD hteditor-2.1.1_pre20161206.ebuild 1065 BLAKE2B 76c002feeb153448c4f34ea7bee41a767861c5f760ee5e71e72c7b144afe458fd467d68d70d7041167f349ceeb08711778809cf212ad5e1d157d5e33bbd3c8b0 SHA512 e6874b42a40c6a6e61870326e9b0bcaf51a600250da2c257449503b924802f46403a3be9c62aaf67b18b0fc579b2e9d615ff98eec2489477cd868f138973d0ec +EBUILD hteditor-2.1.1_pre20161206.ebuild 1064 BLAKE2B 4d4b1c02c3d0a0484dc0e12d32303f8977af7ac972b4b5df3147594c0a9cba6434f6745bb00eb7fe40e34de7d0c72f8d836c02902f857306c9af198dea5d53b3 SHA512 c36e1528a6e79f222ada5c97a8c0f49e4e338b597369ca768312efeaf33cb919d96fac1f7bf5477ccb0b4f25c29e0aff8f7f78817f8cc99496e77a7fd6bc2528 MISC metadata.xml 464 BLAKE2B 7fdb5c881881e21f4a74db09bf905c4d0aebdb5077598916186266ca12dca891c1619ce550a37ac3400ef92138ff2521dffd91c25bf254d8e49e0b628ea7ebca SHA512 b08be8368d7459a56096769aec6cdb6607225968b87ac12d22c788081287d16345060f071c09c0d505a8caffcb5de9378328250758b13c9229eb1fc5c10a8388 diff --git a/app-editors/hteditor/files/hteditor-2.1.0-AR.patch b/app-editors/hteditor/files/hteditor-2.1.0-AR.patch deleted file mode 100644 index 60a0427a2125..000000000000 --- a/app-editors/hteditor/files/hteditor-2.1.0-AR.patch +++ /dev/null @@ -1,14 +0,0 @@ -https://bugs.gentoo.org/722040 ---- a/configure.ac -+++ b/configure.ac -@@ -104,8 +104,8 @@ AC_PROG_CPP - AC_PROG_CXX - AC_PROG_YACC - AM_PROG_LEX --AC_PATH_PROG(AR, ar) --AC_PATH_PROG(AR, gar) -+AC_CHECK_TOOL(AR, ar) -+AC_CHECK_TOOL(AR, gar) - - if test "x$AR" = "x"; then - AC_MSG_ERROR([*** 'ar' and 'gar' missing, please install one of them or fix your \$PATH ***]) diff --git a/app-editors/hteditor/files/hteditor-2.1.0-format-security.patch b/app-editors/hteditor/files/hteditor-2.1.0-format-security.patch deleted file mode 100644 index 408d1b9b1be3..000000000000 --- a/app-editors/hteditor/files/hteditor-2.1.0-format-security.patch +++ /dev/null @@ -1,57 +0,0 @@ -https://bugs.gentoo.org/521018 - -From 5839355d67ff822593190473a41512ca19e4280a Mon Sep 17 00:00:00 2001 -From: Anton Gladky <gladk@debian.org> -Date: Wed, 18 Feb 2015 21:20:39 +0100 -Subject: [PATCH] Fix "format not a string" compilation failure - -Compilation with the flag -Werror=format-security fails with -the message: - -error: format not a string literal and no format arguments - -This patch solves the issue. ---- - asm/x86dis.cc | 6 +++--- - htpal.cc | 2 +- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/asm/x86dis.cc b/asm/x86dis.cc -index 0830d9c..bb9028f 100644 ---- a/asm/x86dis.cc -+++ b/asm/x86dis.cc -@@ -1218,15 +1218,15 @@ void x86dis::str_op(char *opstr, int *opstrlen, x86dis_insn *insn, x86_insn_op * - default: {assert(0);} - } - if (!insn->rexprefix) { -- sprintf(opstr, x86_regs[j][op->reg]); -+ sprintf(opstr, "%s", x86_regs[j][op->reg]); - } else { -- sprintf(opstr, x86_64regs[j][op->reg]); -+ sprintf(opstr, "%s", x86_64regs[j][op->reg]); - } - break; - } - case X86_OPTYPE_SEG: - if (x86_segs[op->seg]) { -- sprintf(opstr, x86_segs[op->seg]); -+ sprintf(opstr, "%s", x86_segs[op->seg]); - } - break; - case X86_OPTYPE_CRX: -diff --git a/htpal.cc b/htpal.cc -index 03dea18..3d5f51e 100644 ---- a/htpal.cc -+++ b/htpal.cc -@@ -307,7 +307,7 @@ void palette_entry::strvalue(char *buf32bytes) - text = "normal"; - } - p = tag_make_color(p, 32, VCP(fg, bg)); -- p += sprintf(p, text); -+ p += sprintf(p, "%s", text); - p = tag_make_default_color(p, 32); - *p = 0; - } --- -2.16.2 - diff --git a/app-editors/hteditor/files/hteditor-2.1.0-gcc-10.patch b/app-editors/hteditor/files/hteditor-2.1.0-gcc-10.patch deleted file mode 100644 index 3516efd2871b..000000000000 --- a/app-editors/hteditor/files/hteditor-2.1.0-gcc-10.patch +++ /dev/null @@ -1,36 +0,0 @@ -Backport a subset of upstream c++11 fixes. ---- a/htmacho.cc -+++ b/htmacho.cc -@@ -146,7 +146,7 @@ void ht_macho::init(Bounds *b, File *f, format_viewer_if **ifs, ht_format_group - break; - case MACHO_CPU_TYPE_I386: - switch (c->flavor) { -- case -1: -+ default: - createHostStruct(&c->state, MACHO_I386_THREAD_STATE_struct, image_endianess); - break; - } ---- a/htmachohd.cc -+++ b/htmachohd.cc -@@ -313,7 +313,7 @@ static ht_view *htmachoheader_init(Bounds *b, File *file, ht_format_group *group - switch (macho_shared->header.cputype) { - case MACHO_CPU_TYPE_I386: - switch (c->flavor) { -- case -1: -+ default: - m->add_staticmask_ptable(macho_i386_thread_state, ofs+4*4/*4 32bit words in thread_header*/, isbigendian); - break; - } ---- a/io/types.h -+++ b/io/types.h -@@ -87,8 +87,8 @@ union htmsg_param { - }; - - struct htmsg { -- int msg; -- int type; -+ unsigned int msg; -+ unsigned int type; - htmsg_param data1; - htmsg_param data2; - }; diff --git a/app-editors/hteditor/files/hteditor-2.1.0-gcc-7.patch b/app-editors/hteditor/files/hteditor-2.1.0-gcc-7.patch deleted file mode 100644 index ebcc3c0aa43e..000000000000 --- a/app-editors/hteditor/files/hteditor-2.1.0-gcc-7.patch +++ /dev/null @@ -1,32 +0,0 @@ -https://bugs.gentoo.org/show_bug.cgi?id=620732 - -Fixes build failure on gcc-7: - - htapp.cc: In function 'uint isqr(uint)': - htapp.cc:3026:18: error: call of overloaded 'abs(uint)' is ambiguous - while (abs(a - b) > 1) { - ^ - -Picked upstream patch that fixes it: - -commit 3b62f2f7e49e024ec9d3c5ffc8ff9cd87a107af6 -Author: Sebastian Biallas <sb@biallas.net> -Date: Sun Nov 13 15:25:26 2016 +0100 - - use unsigned variables - -diff --git a/htapp.cc b/htapp.cc -index 53d8725..03236e2 100644 ---- a/htapp.cc -+++ b/htapp.cc -@@ -3021,8 +3021,8 @@ void do_modal_resize() - - static uint isqr(uint u) - { -- uint a = 2; -- uint b = u/a; -+ int a = 2; -+ int b = u/a; - while (abs(a - b) > 1) { - a = (a+b)/2; - b = u/a; diff --git a/app-editors/hteditor/hteditor-2.1.0-r1.ebuild b/app-editors/hteditor/hteditor-2.1.0-r1.ebuild deleted file mode 100644 index 1660e108bde7..000000000000 --- a/app-editors/hteditor/hteditor-2.1.0-r1.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools flag-o-matic toolchain-funcs - -MY_P=${P/editor} - -DESCRIPTION="A file viewer, editor and analyzer for text, binary, and executable files" -HOMEPAGE="http://hte.sourceforge.net/ https://github.com/sebastianbiallas/ht/" -SRC_URI="mirror://sourceforge/hte/${MY_P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc ppc64 x86" -IUSE="X" - -RDEPEND="sys-libs/ncurses:0= - X? ( x11-libs/libX11 ) - >=dev-libs/lzo-2" -DEPEND="${RDEPEND} - virtual/yacc - sys-devel/flex" - -DOCS=( AUTHORS ChangeLog KNOWNBUGS README TODO ) - -S=${WORKDIR}/${MY_P} - -PATCHES=( - "${FILESDIR}"/${P}-gcc-7.patch - "${FILESDIR}"/${P}-tinfo.patch - "${FILESDIR}"/${P}-gcc-6-uchar.patch - "${FILESDIR}"/${P}-format-security.patch - "${FILESDIR}"/${P}-gcc-10.patch - "${FILESDIR}"/${P}-AR.patch -) - -src_prepare() { - default - eautoreconf - - # Many literals are concatenated with macro definitions. - # Instead of patching them all let's pick old c++ standard - # and port to c++11 upstream. - # https://bugs.gentoo.org/729252 - append-cxxflags -std=c++98 -} - -src_configure() { - econf \ - $(use_enable X x11-textmode) \ - --enable-maintainermode -} - -src_install() { - #For prefix - chmod u+x "${S}/install-sh" - - local HTML_DOCS="doc/*.html" - doinfo doc/*.info - - default -} diff --git a/app-editors/hteditor/hteditor-2.1.1_pre20161206.ebuild b/app-editors/hteditor/hteditor-2.1.1_pre20161206.ebuild index 03d8d87c000b..9b87e74ff978 100644 --- a/app-editors/hteditor/hteditor-2.1.1_pre20161206.ebuild +++ b/app-editors/hteditor/hteditor-2.1.1_pre20161206.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ppc ~ppc64 x86" +KEYWORDS="amd64 ppc ppc64 x86" IUSE="X" RDEPEND="sys-libs/ncurses:0= |