commit: 52a4c3ea0aacf4f14b8d7483038625bfabc30fae Author: Hanno Böck <hanno <AT> gentoo <DOT> org> AuthorDate: Wed Jun 11 08:01:42 2025 +0000 Commit: Hanno Böck <hanno <AT> gentoo <DOT> org> CommitDate: Wed Jun 11 08:01:45 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52a4c3ea
www-misc/mergelog: Fix gcc 14 compilation, use EAPI 8 Patch for correct pointer type provided by André Malo in bug #920810. Closes: https://bugs.gentoo.org/920810 Signed-off-by: Hanno Böck <hanno <AT> gentoo.org> .../files/mergelog-4.5-zlib-gcc14-pointer.diff | 48 ++++++++++++++++++++++ www-misc/mergelog/mergelog-4.5-r4.ebuild | 28 +++++++++++++ 2 files changed, 76 insertions(+) diff --git a/www-misc/mergelog/files/mergelog-4.5-zlib-gcc14-pointer.diff b/www-misc/mergelog/files/mergelog-4.5-zlib-gcc14-pointer.diff new file mode 100644 index 000000000000..c2f62a8528fb --- /dev/null +++ b/www-misc/mergelog/files/mergelog-4.5-zlib-gcc14-pointer.diff @@ -0,0 +1,48 @@ +diff '--color=auto' -Nur mergelog-4.5~/src/mergelog.c mergelog-4.5/src/mergelog.c +--- mergelog-4.5~/src/mergelog.c 2025-06-07 18:17:16.000000000 +0200 ++++ mergelog-4.5/src/mergelog.c 2025-06-07 18:17:59.000000000 +0200 +@@ -40,7 +40,7 @@ + + + #ifdef USE_ZLIB +-#define myFH gzFile ++typedef gzFile myFH; + #define myopen gzopen + #define mygets(a,b,c,d) fast_gzgets(a,b,c,d) + #define myrewind gzrewind +@@ -48,7 +48,7 @@ + #define mywrite(f,b,l) gzwrite((f),(b),(l)) + #define MYSUFFIX ".gz" + #else +-#define myFH FILE ++typedef FILE * myFH; + #define myopen fopen + #define mygets(a,b,c,d) fgets(a,b,c) + #define myrewind rewind +@@ -71,7 +71,7 @@ + /* + replacement for gzgets which reduces calls to zlib decompression + */ +-char *fast_gzgets (char *buf, int size, myFH *fp, int i) { ++char *fast_gzgets (char *buf, int size, myFH fp, int i) { + + char *out_cp=buf; + +@@ -101,7 +101,7 @@ + int main (int argc, char *argv[]) { + + int i,j,nb_files,nb_files_orig; +- myFH *log_file[argc-1]; ++ myFH log_file[argc-1]; + char *log_buffer[argc-1]; + char *log_scan[argc-1]; + char *log_month[argc-1]; +@@ -122,7 +122,7 @@ + const char* argv0 = *argv; + struct tm gotmFlags; + const char* goOutPtr; +- myFH *outFile = NULL; ++ myFH outFile = NULL; + char outFileName[512]; + struct tm outFileTM; + char outFileNewName[512]; diff --git a/www-misc/mergelog/mergelog-4.5-r4.ebuild b/www-misc/mergelog/mergelog-4.5-r4.ebuild new file mode 100644 index 000000000000..62f71dd84e1a --- /dev/null +++ b/www-misc/mergelog/mergelog-4.5-r4.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="A utility to merge apache logs in chronological order" +HOMEPAGE="http://mergelog.sourceforge.net"; +SRC_URI="https://downloads.sourceforge.net/mergelog/${P}.tar.gz"; + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc ~x86" + +RDEPEND="sys-libs/zlib" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}/${P}-splitlog.patch" + "${FILESDIR}/${P}-asneeded.patch" + "${FILESDIR}/${P}-zlib-gcc14-pointer.diff" +) + +src_prepare() { + default + eautoreconf +}
