From 45b9b61188e55794f2cce4cdeeb81ba7a2ac80d0 Mon Sep 17 00:00:00 2001 From: gryf Date: Sun, 21 May 2017 12:49:15 +0200 Subject: [PATCH] unlzx: removed gcc warnings --- app-arch/unlzx/Manifest | 3 +- .../unlzx-1.1-fix-compiler-warnings.patch | 50 +++++++++++++++++++ app-arch/unlzx/unlzx-1.1-r10.ebuild | 8 +-- 3 files changed, 57 insertions(+), 4 deletions(-) create mode 100644 app-arch/unlzx/files/unlzx-1.1-fix-compiler-warnings.patch diff --git a/app-arch/unlzx/Manifest b/app-arch/unlzx/Manifest index 17c0df0..67e4b3d 100644 --- a/app-arch/unlzx/Manifest +++ b/app-arch/unlzx/Manifest @@ -1,3 +1,4 @@ +AUX unlzx-1.1-fix-compiler-warnings.patch 1806 SHA256 00c077e5b71563026bb70a5b33a2c7bc96292046e7a54728284cf0860af4a300 SHA512 9f87ea6a0376278f73302fe062460b0ca08e774ecb2f5637c1e99f7ce6536fa00b981a5a5c36a00b945a5e16d6bbe38595a8ca79b7171e58075444d0dbb21c68 WHIRLPOOL a13d84f6c86c4ece2cebe6edf9864758830671eeb68e2afc8e6ed17b4ddee68b09fea7087289c43235c375c925048bc1e4954fe9e3ec579d3655f896b2ee0ea7 DIST unlzx.c.gz 9680 SHA256 3cfd5dfe34482f91b6fbfc6a5fdd44c7454ce4867061e99cda8aaba628208f7d SHA512 f88812e06c0de47ace6ef2d405193ebbfde9091da8ab6a493ea57054e1c2c08b3217510b8564756b9e54392afe88fe822b77317c541be0dda90deac96db61057 WHIRLPOOL 64423d590fd056fe7e755324d05bfcd3c206a8299bb40c95c35b12275bfa6c2d73c3f6c9a5865e023268ce770f5930b710798d9d87e6d3bc5e9e0ce7d7961ac9 DIST unlzx.c.readme 684 SHA256 15c22956da50396f1ab6cfb887c3fc2d8f913722e9af0dd50516860c619ccce5 SHA512 9bf0a6ce0a9d3c12556367b2858aee577ae02f86314db5faa5cf76a43e3ac81d158f5760f43c3c130743b78ec7a058f0eb4bf15d292882e8dc9a8857d0070b82 WHIRLPOOL ecff68e307d80c0db20a8fba1a43992582a190a35eb7061c9503588123aa82b6d285994c9a8689ae7aac847501b345fae74a01fbc34a6077830817442355c75f -EBUILD unlzx-1.1-r10.ebuild 721 SHA256 6fa47e0e22063e8fe2a3deaee0e47465d3a8d8ada287d0752fa7eee260f20cd7 SHA512 08280bbd78b8baad9f515118715f581a328cf43b5f582e80f1c4acb01d6d58432b6c06695bd3924bf76268a4f39b3ab2a972e90ded5e12e14a651813315caede WHIRLPOOL 28fdddd8c2575358c258e874c76c47a90f40cb0234132439f63867cfe58c910fb51c6d7ff5bf3d845a57b86a25d5bf828492c4d549bbf7f7c25f1d17ebc83437 +EBUILD unlzx-1.1-r10.ebuild 786 SHA256 255b25d7368a6a285519cdc4218f0c46baf17199d89ac2a34ed731c297f509ad SHA512 2665dc141726ce6e95d9b1c0fee5c44eaf46d9f7f410f4dd121d0d415aea7380385a93af7b93992d7606b870f5fa090b542d2a154d9f49d612e14bc94a54ea34 WHIRLPOOL fd666aea35ed53d98efa7ca98c9af91252f121bc17fb7936dcf0f2d9ff7daff73ea4b383d5500a7d8368618dab16b2f35f8b0352a3ab9b73a5452dea876b6fb0 diff --git a/app-arch/unlzx/files/unlzx-1.1-fix-compiler-warnings.patch b/app-arch/unlzx/files/unlzx-1.1-fix-compiler-warnings.patch new file mode 100644 index 0000000..2796410 --- /dev/null +++ b/app-arch/unlzx/files/unlzx-1.1-fix-compiler-warnings.patch @@ -0,0 +1,50 @@ +--- unlzx-1.1/unlzx_orig.c 2017-05-21 12:28:19.000000000 +0200 ++++ unlzx-1.1/unlzx.c 2017-05-21 12:34:37.475524675 +0200 +@@ -20,6 +20,9 @@ + + #include + #include ++#include ++#include ++#include + + /* ---------------------------------------------------------------------- */ + +@@ -1090,13 +1093,13 @@ + total_files++; + merge_size += unpack_size; + +- printf("%8ld ", unpack_size); ++ printf("%8u ", unpack_size); + if(archive_header[12] & 1) + printf(" n/a "); + else +- printf("%8ld ", pack_size); +- printf("%02ld:%02ld:%02ld ", hour, minute, second); +- printf("%2ld-%s-%4ld ", day, month_str[month], year); ++ printf("%8u ", pack_size); ++ printf("%02u:%02u:%02u ", hour, minute, second); ++ printf("%2u-%s-%4u ", day, month_str[month], year); + printf("%c%c%c%c%c%c%c%c ", + (attributes & 32) ? 'h' : '-', + (attributes & 64) ? 's' : '-', +@@ -1111,7 +1114,7 @@ + printf(": \"%s\"\n", header_comment); + if((archive_header[12] & 1) && pack_size) + { +- printf("%8ld %8ld Merged\n", merge_size, pack_size); ++ printf("%8u %8u Merged\n", merge_size, pack_size); + } + + if(pack_size) /* seek past the packed data */ +@@ -1148,8 +1151,8 @@ + else + { + printf("-------- -------- -------- ----------- -------- ----\n"); +- printf("%8ld %8ld ", total_unpack, total_pack); +- printf("%ld file%s\n", total_files, ((total_files == 1) ? "" : "s")); ++ printf("%8u %8u ", total_unpack, total_pack); ++ printf("%u file%s\n", total_files, ((total_files == 1) ? "" : "s")); + + result = 0; /* normal termination */ + } diff --git a/app-arch/unlzx/unlzx-1.1-r10.ebuild b/app-arch/unlzx/unlzx-1.1-r10.ebuild index 9ee326e..b449754 100644 --- a/app-arch/unlzx/unlzx-1.1-r10.ebuild +++ b/app-arch/unlzx/unlzx-1.1-r10.ebuild @@ -1,7 +1,8 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -inherit toolchain-funcs +EAPI=6 +inherit eutils toolchain-funcs DESCRIPTION="Unarchiver for Amiga LZX archives" SRC_URI="http://aminet.net/misc/unix/${PN}.c.gz http://aminet.net/misc/unix/${PN}.c.readme" @@ -15,7 +16,8 @@ KEYWORDS="alpha amd64 ~hppa ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" src_unpack() { mkdir "${S}" gzip -dc "${DISTDIR}"/${PN}.c.gz > "${S}"/unlzx.c - cp "${DISTDIR}"/${PN}.c.gz.readme "${S}"/${PN}.c.gz.readme + cp "${DISTDIR}"/${PN}.c.readme "${S}"/${PN}.c.readme + epatch "${FILESDIR}"/unlzx-1.1-fix-compiler-warnings.patch } src_compile() { @@ -24,5 +26,5 @@ src_compile() { src_install() { dobin unlzx - dodoc unlzx.c.gz.readme + dodoc unlzx.c.readme }