commit: 38cc5f38847cdbd5a00cc7a07bf76a1a3a9be224 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Wed May 7 01:48:21 2025 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Wed May 7 01:50:18 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38cc5f38
media-gfx/xloadimage: Delete Closes: https://bugs.gentoo.org/953119 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> media-gfx/xloadimage/Manifest | 3 - .../xloadimage/files/xloadimage-4.1-bracket.patch | 13 -- .../xloadimage/files/xloadimage-4.1-c99.patch | 15 -- .../xloadimage/files/xloadimage-4.1-endif.patch | 11 - ...mage-4.1-fix-incomp-function-pointer-musl.patch | 14 -- ...age-4.1-fix-incomp-function-pointer-types.patch | 17 -- .../files/xloadimage-4.1-include-errno_h.patch | 13 -- .../files/xloadimage-4.1-ldflags_and_exit.patch | 23 -- .../xloadimage/files/xloadimage-4.1-libpng15.patch | 29 --- .../files/xloadimage-4.1-unaligned-access.patch | 51 ---- .../files/xloadimage-4.1-zio-shell-meta-char.diff | 36 --- media-gfx/xloadimage/files/xloadimage-gentoo.patch | 258 --------------------- media-gfx/xloadimage/metadata.xml | 5 - media-gfx/xloadimage/xloadimage-4.1-r15.ebuild | 92 -------- media-gfx/xloadimage/xloadimage-4.1-r16.ebuild | 93 -------- media-gfx/xloadimage/xloadimage-4.1-r17.ebuild | 97 -------- media-gfx/xloadimage/xloadimage-4.1-r18.ebuild | 97 -------- profiles/package.mask | 6 - 18 files changed, 873 deletions(-) diff --git a/media-gfx/xloadimage/Manifest b/media-gfx/xloadimage/Manifest deleted file mode 100644 index 32fe79df1f93..000000000000 --- a/media-gfx/xloadimage/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST xloadimage-4.1-fix-build-for-clang16.patch.xz 23800 BLAKE2B 8417465020f06483c397dd86124297feb320530bd013d6f94b091ac2166da9dc45017b43a21e2ce7a6f03493188e2535294e9b79e7ebbe0062bf0f22166f13d7 SHA512 a8f40fe4a5e8750b2c2b98b1f7488275c1f0763d2814359ec8dce48d1201e78d87f189abf6fcb8fa4753828921fd0c593696ad1958345f954f740687502a896f -DIST xloadimage-4.1-gentoo-r1.diff.bz2 41535 BLAKE2B 77cdbb2e6d5dda6084aae2831bcb8750a027f59a673f5a1f8eeb61385bd21243d640bd13a3be7fb24d2ce2cb475a05cb04c91c2b53977c61fb3aa4416e67e112 SHA512 a1a52d576eb68c44e5ff3b68a6bd87cd9b8f21f6fa8edee2d7df2329002d40f6513df6c04ecd57f66018583d0251019bd02e15756dac705b8c9cb8470cb386e3 -DIST xloadimage.4.1.tar.gz 596021 BLAKE2B 3c22facf05167d1836c21243799d8f66c211e44d659b4397668ed604cdd82b3bd8f11ab7b3be5e87c59a9b3aa8569d0d3d2e474b572c3bca07b6437b293014bf SHA512 2c91699c8ef07c101ff9b458708ace01cab2979a5e88cf8a4e47ec971f7b4cb5571108afa3e53271ade4e8ccfdcf72ef9e2e09edfc0be6b8afaba50847aa0586 diff --git a/media-gfx/xloadimage/files/xloadimage-4.1-bracket.patch b/media-gfx/xloadimage/files/xloadimage-4.1-bracket.patch deleted file mode 100644 index 5d71028652da..000000000000 --- a/media-gfx/xloadimage/files/xloadimage-4.1-bracket.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ruN xloadimage.4.1.patched/jpeg.c xloadimage.4.1/jpeg.c ---- xloadimage.4.1.patched/jpeg.c 2011-08-25 22:44:04.835308001 +0200 -+++ xloadimage.4.1/jpeg.c 2011-08-25 22:45:57.391307973 +0200 -@@ -321,8 +321,8 @@ - cinfo->arith_code = TRUE; - #else - fprintf(stderr, "jpegDump: sorry, arithmetic coding not supported\n"); -- } - #endif -+ } - else if (!strncmp("grayscale", name, strlen(name)) || - !strncmp("greyscale", name, strlen(name)) || - !strncmp("monochrome", name, strlen(name))) { diff --git a/media-gfx/xloadimage/files/xloadimage-4.1-c99.patch b/media-gfx/xloadimage/files/xloadimage-4.1-c99.patch deleted file mode 100644 index 6da8b008aa86..000000000000 --- a/media-gfx/xloadimage/files/xloadimage-4.1-c99.patch +++ /dev/null @@ -1,15 +0,0 @@ -https://bugs.gentoo.org/920772#c11 -Signed-off-by: Stephane Bakhos <[email protected]> ---- a/pdsuncomp.c -+++ b/pdsuncomp.c -@@ -421,8 +421,8 @@ - static char obuf[2048]; - char ibuf[2048]; - int left; -- int in_length; -- static int out_length= 2048, out_ptr= 0; -+ long int in_length; -+ static long int out_length= 2048, out_ptr= 0; - - if (Decompressing) { - left= size; diff --git a/media-gfx/xloadimage/files/xloadimage-4.1-endif.patch b/media-gfx/xloadimage/files/xloadimage-4.1-endif.patch deleted file mode 100644 index df6f3e492190..000000000000 --- a/media-gfx/xloadimage/files/xloadimage-4.1-endif.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- xloadimage.4.1/copyright.orig 2005-03-04 12:58:27.347474256 +0100 -+++ xloadimage.4.1/copyright.h 2005-03-04 12:58:42.913107920 +0100 -@@ -22,7 +22,7 @@ - #ifndef __SABER__ - #ifndef LINT - static char *Copyright= "Copyright 1989, 1993 Jim Frost"; --#endif LINT -+#endif /* LINT */ - #endif - #define _JIM_COPYRIGHT_ - #endif diff --git a/media-gfx/xloadimage/files/xloadimage-4.1-fix-incomp-function-pointer-musl.patch b/media-gfx/xloadimage/files/xloadimage-4.1-fix-incomp-function-pointer-musl.patch deleted file mode 100644 index ab76b835c899..000000000000 --- a/media-gfx/xloadimage/files/xloadimage-4.1-fix-incomp-function-pointer-musl.patch +++ /dev/null @@ -1,14 +0,0 @@ -__signalhandler_t isn't defined on musl, one needs to drill down to bare type definition -so code builds both on glibc and musl systems -https://bugs.gentoo.org/924114 ---- a/window.c -+++ b/window.c -@@ -833,7 +833,7 @@ char imageInWindow (Display *disp, int scrn, Image *image, OptionSet *global_opt - /* reset alarm to -delay seconds after every event */ - #ifdef ENABLE_TIMEOUT - AlarmWentOff = 0; -- signal(SIGALRM, delayAlarmHandler); -+ signal(SIGALRM, (void (*)(int))delayAlarmHandler); - alarm(delay); - #endif /* ENABLE_TIMEOUT */ - } diff --git a/media-gfx/xloadimage/files/xloadimage-4.1-fix-incomp-function-pointer-types.patch b/media-gfx/xloadimage/files/xloadimage-4.1-fix-incomp-function-pointer-types.patch deleted file mode 100644 index 0ddd2da0f65f..000000000000 --- a/media-gfx/xloadimage/files/xloadimage-4.1-fix-incomp-function-pointer-types.patch +++ /dev/null @@ -1,17 +0,0 @@ -Inpompatible function pointers are an error instead of a warning by default since clang16 - -Bug: https://bugs.gentoo.org/896232 - -Pascal Jäger <[email protected]> (2023-09-22) - ---- a/window.c -+++ b/window.c -@@ -833,7 +833,7 @@ char imageInWindow (Display *disp, int scrn, Image *image, OptionSet *global_opt - /* reset alarm to -delay seconds after every event */ - #ifdef ENABLE_TIMEOUT - AlarmWentOff = 0; -- signal(SIGALRM, delayAlarmHandler); -+ signal(SIGALRM, (__sighandler_t)delayAlarmHandler); - alarm(delay); - #endif /* ENABLE_TIMEOUT */ - } diff --git a/media-gfx/xloadimage/files/xloadimage-4.1-include-errno_h.patch b/media-gfx/xloadimage/files/xloadimage-4.1-include-errno_h.patch deleted file mode 100644 index f071d761617a..000000000000 --- a/media-gfx/xloadimage/files/xloadimage-4.1-include-errno_h.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- xloadimage.4.1/img.c.orig 2003-01-01 15:14:47.000000000 +0200 -+++ xloadimage.4.1/img.c 2003-01-01 15:15:05.000000000 +0200 -@@ -14,9 +14,9 @@ - #include <stdlib.h> - #include <string.h> - #include <math.h> -+#include <errno.h> - #include "image.h" - --extern int errno; - - #define TRUE 1 - #define FALSE 0 diff --git a/media-gfx/xloadimage/files/xloadimage-4.1-ldflags_and_exit.patch b/media-gfx/xloadimage/files/xloadimage-4.1-ldflags_and_exit.patch deleted file mode 100644 index afdea768aa47..000000000000 --- a/media-gfx/xloadimage/files/xloadimage-4.1-ldflags_and_exit.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -ur xloadimage.4.1.orig/Makefile.in xloadimage.4.1/Makefile.in ---- xloadimage.4.1.orig/Makefile.in 2009-09-04 15:37:09.000000000 +0300 -+++ xloadimage.4.1/Makefile.in 2009-09-04 15:38:50.000000000 +0300 -@@ -27,7 +27,7 @@ - $(CC) -o $@ $(OBJS) build.o $(LDFLAGS) $(XLIB) $(LIBS) - - uufilter: uufilter.c -- $(CC) $(CFLAGS) $(DEFS) uufilter.c -o $@ -+ $(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) uufilter.c -o $@ - - .c.o: config.h image.h - $(CC) $(CFLAGS) -c $(DEFS) $< -diff -ur xloadimage.4.1.orig/uufilter.c xloadimage.4.1/uufilter.c ---- xloadimage.4.1.orig/uufilter.c 2009-09-04 15:37:09.000000000 +0300 -+++ xloadimage.4.1/uufilter.c 2009-09-04 15:37:59.000000000 +0300 -@@ -11,6 +11,7 @@ - */ - - #include <stdio.h> -+#include <stdlib.h> - #include <string.h> - - int main(argc, argv) diff --git a/media-gfx/xloadimage/files/xloadimage-4.1-libpng15.patch b/media-gfx/xloadimage/files/xloadimage-4.1-libpng15.patch deleted file mode 100644 index da222d68c257..000000000000 --- a/media-gfx/xloadimage/files/xloadimage-4.1-libpng15.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/png.c -+++ b/png.c -@@ -75,7 +75,7 @@ - { - debug(" #error "); - output_warn( png_ptr, str); -- longjmp(png_ptr->jmpbuf, 1); /* return control to outer routine */ -+ longjmp(png_jmpbuf(png_ptr), 1); /* return control to outer routine */ - } - - -@@ -164,7 +164,7 @@ - png_destroy_read_struct(png_pp, info_pp, end_pp); - return 0; - } -- if (setjmp((*png_pp)->jmpbuf)) { -+ if (setjmp(png_jmpbuf(*png_pp))) { - /* On error */ - png_destroy_read_struct(png_pp, info_pp, end_pp); - return 0; -@@ -220,7 +220,7 @@ - zclose(zinput_file); - return 0; - } -- if (setjmp(png_ptr->jmpbuf)) { -+ if (setjmp(png_jmpbuf(png_ptr))) { - /* On error */ - freeImage(image); - png_destroy_read_struct(&png_ptr, &info_ptr, &end_info); diff --git a/media-gfx/xloadimage/files/xloadimage-4.1-unaligned-access.patch b/media-gfx/xloadimage/files/xloadimage-4.1-unaligned-access.patch deleted file mode 100644 index 874ad8a4f329..000000000000 --- a/media-gfx/xloadimage/files/xloadimage-4.1-unaligned-access.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff -ruN ./cmuwmraster.c /tmp/xloadimage.4.1/cmuwmraster.c ---- a/cmuwmraster.c 2005-07-23 13:15:50 -0700 -+++ b/cmuwmraster.c 2005-07-23 13:08:36 -0700 -@@ -20,7 +20,7 @@ - char *name; - struct cmuwm_header *headerp; - { -- printf("%s is a %ldx%ld %ld plane CMU WM raster\n", -+ printf("%s is a %lux%lu %lu plane CMU WM raster\n", - name, - memToVal(headerp->width, sizeof(long)), - memToVal(headerp->height, sizeof(long)), -diff -ruN ./niff.c /tmp/xloadimage.4.1/niff.c ---- a/niff.c 2005-07-23 13:15:50 -0700 -+++ b/niff.c 2005-07-23 13:07:55 -0700 -@@ -24,18 +24,18 @@ - memToVal(header->width, 4), - memToVal(header->height, 4)); - if (memToVal(header->version, 4) != NIFF_VERSION) -- printf("version %ld ", memToVal(header->version, 4)); -+ printf("version %lu ", memToVal(header->version, 4)); - printf("NIFF "); - switch (header->type) { - case NIFF_BITMAP: - printf("bitmap image"); - break; - case NIFF_RGB: -- printf("%ld-bit RGB image with %ld colors", -+ printf("%lu-bit RGB image with %lu colors", - memToVal(header->depth, 4), memToVal(header->cmap_size, 4)); - break; - case NIFF_TRUE: -- printf("%ld-bit true color image", memToVal(header->depth, 4)); -+ printf("%lu-bit true color image", memToVal(header->depth, 4)); - break; - default: - printf("image with an unknown type"); -diff -ruN ./root.c /tmp/xloadimage.4.1/root.c ---- a/root.c 2005-07-23 13:15:51 -0700 -+++ b/root.c 2005-07-23 13:05:48 -0700 -@@ -68,8 +68,8 @@ - Pixmap *pm; - Atom actual_type; /* NOTUSED */ - int format; -- int nitems; -- int bytes_after; -+ unsigned long nitems; -+ unsigned long bytes_after; - - /* intern the property name */ - Atom atom = XInternAtom(dpy, RETAIN_PROP_NAME, 0); diff --git a/media-gfx/xloadimage/files/xloadimage-4.1-zio-shell-meta-char.diff b/media-gfx/xloadimage/files/xloadimage-4.1-zio-shell-meta-char.diff deleted file mode 100644 index 730504fb43f6..000000000000 --- a/media-gfx/xloadimage/files/xloadimage-4.1-zio-shell-meta-char.diff +++ /dev/null @@ -1,36 +0,0 @@ ---- xloadimage.4.1/zio.c 1993-10-28 17:10:02.000000000 +0000 -+++ xloadimage.4.1/zio.c 2005-02-28 15:32:05.895470680 +0000 -@@ -210,9 +211,30 @@ - if ((strlen(name) > strlen(filter->extension)) && - !strcmp(filter->extension, - name + (strlen(name) - strlen(filter->extension)))) { -- debug(("Filtering image through '%s'\n", filter->filter)); -- zf->type= ZPIPE; -- sprintf(buf, "%s %s", filter->filter, name); -+ char *fname, *t, *s; -+ -+ /* meta-char protection from xli. -+ * -+ * protect in single quotes, replacing single quotes -+ * with '"'"', so worst-case expansion is 5x -+ */ -+ -+ s = fname = (char *) lmalloc(1 + (5 * strlen(name)) + 1 + 1); -+ *s++ = '\''; -+ for (t = name; *t; ++t) { -+ if ('\'' == *t) { -+ /* 'foo'bar' -> 'foo'"'"'bar' */ -+ strcpy(s, "'\"'\"'"); -+ s += strlen(s); -+ } else { -+ *s++ = *t; -+ } -+ } -+ strcpy (s, "'"); -+ debug(("Filtering image through '%s'\n", filter->filter)); -+ zf->type= ZPIPE; -+ sprintf(buf, "%s %s", filter->filter, fname); -+ lfree (fname); - if (! (zf->stream= popen(buf, "r"))) { - lfree((byte *)zf->filename); - zf->filename= NULL; diff --git a/media-gfx/xloadimage/files/xloadimage-gentoo.patch b/media-gfx/xloadimage/files/xloadimage-gentoo.patch deleted file mode 100644 index 896786680e30..000000000000 --- a/media-gfx/xloadimage/files/xloadimage-gentoo.patch +++ /dev/null @@ -1,258 +0,0 @@ -diff -ru xloadimage.4.1.orig/config.c xloadimage.4.1/config.c ---- xloadimage.4.1.orig/config.c 2005-10-22 15:47:17.000000000 +0200 -+++ xloadimage.4.1/config.c 2005-10-22 15:58:16.000000000 +0200 -@@ -313,12 +313,13 @@ - * -1 if access denied or not found, 0 if ok. - */ - --int findImage(name, fullname) -+int findImage(name, fullname, size) - char *name, *fullname; -+ size_t size; - { unsigned int p, e; - struct stat sbuf; - -- strcpy(fullname, name); -+ strncpy(fullname, name, size); - if (!strcmp(name, "stdin")) /* stdin is special name */ - return(0); - -@@ -327,7 +328,7 @@ - if (! stat(fullname, &sbuf)) - return(fileIsOk(fullname, &sbuf)); - #ifndef NO_COMPRESS -- strcat(fullname, ".Z"); -+ strncat(fullname, ".Z", size); - if (! stat(fullname, &sbuf)) - return(fileIsOk(fullname, &sbuf)); - #endif -@@ -336,12 +337,12 @@ - #ifdef VMS - sprintf(fullname, "%s%s", Paths[p], name); - #else -- sprintf(fullname, "%s/%s", Paths[p], name); -+ snprintf(fullname, size, "%s/%s", Paths[p], name); - #endif - if (! stat(fullname, &sbuf)) - return(fileIsOk(fullname, &sbuf)); - #ifndef NO_COMPRESS -- strcat(fullname, ".Z"); -+ strncat(fullname, ".Z", size); - if (! stat(fullname, &sbuf)) - #endif - return(fileIsOk(fullname, &sbuf)); -@@ -349,12 +350,12 @@ - #ifdef VMS - sprintf(fullname, "%s%s%s", Paths[p], name, Exts[e]); - #else -- sprintf(fullname, "%s/%s%s", Paths[p], name, Exts[e]); -+ snprintf(fullname, size, "%s/%s%s", Paths[p], name, Exts[e]); - #endif - if (! stat(fullname, &sbuf)) - return(fileIsOk(fullname, &sbuf)); - #ifndef NO_COMPRESS -- strcat(fullname, ".Z"); -+ strncat(fullname, ".Z", size); - if (! stat(fullname, &sbuf)) - return(fileIsOk(fullname, &sbuf)); - #endif -@@ -362,11 +363,11 @@ - } - - for (e= 0; e < NumExts; e++) { -- sprintf(fullname, "%s%s", name, Exts[e]); -+ snprintf(fullname, size, "%s%s", name, Exts[e]); - if (! stat(fullname, &sbuf)) - return(fileIsOk(fullname, &sbuf)); - #ifndef NO_COMPRESS -- strcat(fullname, ".Z"); -+ strncat(fullname, ".Z", size); - if (! stat(fullname, &sbuf)) - return(fileIsOk(fullname, &sbuf)); - #endif -@@ -392,7 +393,7 @@ - #ifdef VMS - sprintf(buf, "directory %s", Paths[a]); - #else -- sprintf(buf, "ls %s", Paths[a]); -+ snprintf(buf, sizeof(buf)-1, "ls %s", Paths[a]); - #endif - if (system(buf) < 0) { - #ifdef VMS -diff -ru xloadimage.4.1.orig/imagetypes.c xloadimage.4.1/imagetypes.c ---- xloadimage.4.1.orig/imagetypes.c 2005-10-22 15:47:17.000000000 +0200 -+++ xloadimage.4.1/imagetypes.c 2005-10-22 15:51:31.000000000 +0200 -@@ -17,7 +17,7 @@ - /* SUPPRESS 560 */ - - extern int errno; --extern int findImage(char *name, char *fullname); -+extern int findImage(char *name, char *fullname, size_t size); - - /* load a named image - */ -@@ -32,7 +32,7 @@ - Image *image; - int a; - -- if (findImage(name, fullname) < 0) { -+ if (findImage(name, fullname, BUFSIZ) < 0) { - if (errno == ENOENT) - fprintf(stderr, "%s: image not found\n", name); - else -@@ -109,7 +109,7 @@ - { char fullname[BUFSIZ]; - int a; - -- if (findImage(name, fullname) < 0) { -+ if (findImage(name, fullname, BUFSIZ) < 0) { - if (errno == ENOENT) - fprintf(stderr, "%s: image not found\n", name); - else -diff -ru xloadimage.4.1.orig/jpeg.c xloadimage.4.1/jpeg.c ---- xloadimage.4.1.orig/jpeg.c 2005-10-22 15:47:17.000000000 +0200 -+++ xloadimage.4.1/jpeg.c 2005-10-22 16:02:03.000000000 +0200 -@@ -19,7 +19,7 @@ - #undef debug - - #ifdef DEBUG --# define debug(xx) fprintf(stderr,xx) -+# define debug(xx) fprintf(stderr, "%s", xx) - #else - # define debug(xx) - #endif -diff -ru xloadimage.4.1.orig/mcidas.c xloadimage.4.1/mcidas.c ---- xloadimage.4.1.orig/mcidas.c 2005-10-22 15:47:17.000000000 +0200 -+++ xloadimage.4.1/mcidas.c 2005-10-22 15:48:49.000000000 +0200 -@@ -63,7 +63,7 @@ - minute = (time % 10000) / 100; - second = (time % 100); - -- sprintf(buf, "%d:%2.2d:%2.2d %s %d, %d (day %d)", -+ snprintf(buf, 29, "%d:%2.2d:%2.2d %s %d, %d (day %d)", - hour, minute, second, month_info[month].name, day, year, - (date % 1000)); - return(buf); -diff -ru xloadimage.4.1.orig/png.c xloadimage.4.1/png.c ---- xloadimage.4.1.orig/png.c 2005-10-22 15:47:17.000000000 +0200 -+++ xloadimage.4.1/png.c 2005-10-22 16:02:20.000000000 +0200 -@@ -30,7 +30,7 @@ - #undef debug - - #ifdef DEBUG --# define debug(xx) fprintf(stderr,xx) -+# define debug(xx) fprintf(stderr, "%s", xx) - #else - # define debug(xx) - #endif -diff -ru xloadimage.4.1.orig/reduce.c xloadimage.4.1/reduce.c ---- xloadimage.4.1.orig/reduce.c 2005-10-22 15:47:17.000000000 +0200 -+++ xloadimage.4.1/reduce.c 2005-10-22 15:48:49.000000000 +0200 -@@ -502,7 +502,7 @@ - - depth= colorsToDepth(n); - new_image= newRGBImage(image->width, image->height, depth); -- sprintf(buf, "%s (%d colors)", image->title, n); -+ snprintf(buf, BUFSIZ - 1, "%s (%d colors)", image->title, n); - new_image->title= dupString(buf); - - /* calculate RGB table from each color area. this should really calculate -diff -ru xloadimage.4.1.orig/rle.c xloadimage.4.1/rle.c ---- xloadimage.4.1.orig/rle.c 2005-10-22 15:47:17.000000000 +0200 -+++ xloadimage.4.1/rle.c 2005-10-22 16:00:06.000000000 +0200 -@@ -21,7 +21,7 @@ - #undef debug - - #ifdef DEBUG --# define debug(xx) fprintf(stderr,xx) -+# define debug(xx) fprintf(stderr, "%s", xx) - #else - # define debug(xx) - #endif -diff -ru xloadimage.4.1.orig/rotate.c xloadimage.4.1/rotate.c ---- xloadimage.4.1.orig/rotate.c 2005-10-22 15:47:17.000000000 +0200 -+++ xloadimage.4.1/rotate.c 2005-10-22 15:48:49.000000000 +0200 -@@ -70,7 +70,7 @@ - { printf(" Rotating image by %d degrees...", degrees); - fflush(stdout); - } -- sprintf(buf, "%s (rotated by %d degrees)", simage->title, degrees); -+ snprintf(buf, BUFSIZ - 1, "%s (rotated by %d degrees)", simage->title, degrees); - - image1 = simage; - image2 = NULL; -diff -ru xloadimage.4.1.orig/tiff.c xloadimage.4.1/tiff.c ---- xloadimage.4.1.orig/tiff.c 2005-10-22 15:47:17.000000000 +0200 -+++ xloadimage.4.1/tiff.c 2005-10-22 15:48:49.000000000 +0200 -@@ -133,14 +133,14 @@ - switch (info->photometric) { - case PHOTOMETRIC_MINISBLACK: - if (info->bitspersample > 1) { -- sprintf(buf, "%d-bit greyscale ", info->bitspersample); -+ snprintf(buf, 31, "%d-bit greyscale ", info->bitspersample); - return(buf); - } - else - return "white-on-black "; - case PHOTOMETRIC_MINISWHITE: - if (info->bitspersample > 1) { -- sprintf(buf, "%d-bit greyscale ", info->bitspersample); -+ snprintf(buf, 31, "%d-bit greyscale ", info->bitspersample); - return(buf); - } - else -diff -ru xloadimage.4.1.orig/window.c xloadimage.4.1/window.c ---- xloadimage.4.1.orig/window.c 2005-10-22 15:47:17.000000000 +0200 -+++ xloadimage.4.1/window.c 2005-10-22 15:48:50.000000000 +0200 -@@ -606,7 +606,7 @@ - else { - char def_geom[30]; - -- sprintf(def_geom, "%ux%u+0+0", image->width, image->height); -+ snprintf(def_geom, 29, "%ux%u+0+0", image->width, image->height); - XGeometry(disp, scrn, opt->info.geometry.string, def_geom, 0, 1, 1, 0, 0, - (int *)&winx, (int *)&winy, (int *)&winwidth, (int *)&winheight); - } -diff -ru xloadimage.4.1.orig/zio.c xloadimage.4.1/zio.c ---- xloadimage.4.1.orig/zio.c 2005-10-22 15:47:17.000000000 +0200 -+++ xloadimage.4.1/zio.c 2005-10-22 15:48:50.000000000 +0200 -@@ -233,7 +233,7 @@ - strcpy (s, "'"); - debug(("Filtering image through '%s'\n", filter->filter)); - zf->type= ZPIPE; -- sprintf(buf, "%s %s", filter->filter, fname); -+ snprintf(buf, BUFSIZ - 1, "%s %s", filter->filter, fname); - lfree (fname); - if (! (zf->stream= popen(buf, "r"))) { - lfree((byte *)zf->filename); -diff -ru xloadimage.4.1.orig/zoom.c xloadimage.4.1/zoom.c ---- xloadimage.4.1.orig/zoom.c 2005-10-22 15:47:17.000000000 +0200 -+++ xloadimage.4.1/zoom.c 2005-10-22 15:48:50.000000000 +0200 -@@ -63,23 +63,23 @@ - if (!xzoom) { - if (verbose) - printf(" Zooming image Y axis by %d%%...", yzoom); -- sprintf(buf, "%s (Y zoom %d%%)", oimage->title, yzoom); -+ snprintf(buf, BUFSIZ - 1, "%s (Y zoom %d%%)", oimage->title, yzoom); - } - else if (!yzoom) { - if (verbose) - printf(" Zooming image X axis by %d%%...", xzoom); -- sprintf(buf, "%s (X zoom %d%%)", oimage->title, xzoom); -+ snprintf(buf, BUFSIZ - 1, "%s (X zoom %d%%)", oimage->title, xzoom); - } - else if (xzoom == yzoom) { - if (verbose) - printf(" Zooming image by %d%%...", xzoom); -- sprintf(buf, "%s (%d%% zoom)", oimage->title, xzoom); -+ snprintf(buf, BUFSIZ - 1, "%s (%d%% zoom)", oimage->title, xzoom); - } - else { - if (verbose) - printf(" Zooming image X axis by %d%% and Y axis by %d%%...", - xzoom, yzoom); -- sprintf(buf, "%s (X zoom %d%% Y zoom %d%%)", oimage->title, -+ snprintf(buf, BUFSIZ - 1, "%s (X zoom %d%% Y zoom %d%%)", oimage->title, - xzoom, yzoom); - } - if (verbose) diff --git a/media-gfx/xloadimage/metadata.xml b/media-gfx/xloadimage/metadata.xml deleted file mode 100644 index bef24d2c2337..000000000000 --- a/media-gfx/xloadimage/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <!-- maintainer-needed --> -</pkgmetadata> diff --git a/media-gfx/xloadimage/xloadimage-4.1-r15.ebuild b/media-gfx/xloadimage/xloadimage-4.1-r15.ebuild deleted file mode 100644 index 984fe17d6d40..000000000000 --- a/media-gfx/xloadimage/xloadimage-4.1-r15.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools flag-o-matic toolchain-funcs - -DESCRIPTION="Utility to view many different types of images under X11" -HOMEPAGE="https://sioseis.ucsd.edu/xloadimage.html https://tracker.debian.org/pkg/xloadimage"; -SRC_URI=" - ftp://ftp.x.org/R5contrib/${P/-/.}.tar.gz - mirror://gentoo/${P}-gentoo-r1.diff.bz2 - https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-fix-build-for-clang16.patch.xz -" -S="${WORKDIR}"/${P/-/.} - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="tiff jpeg png" - -RDEPEND="x11-libs/libX11 - tiff? ( media-libs/tiff:= ) - png? ( media-libs/libpng:= ) - jpeg? ( media-libs/libjpeg-turbo:= ) - !media-gfx/xli" -DEPEND="${RDEPEND}" - -PATCHES=( - "${WORKDIR}"/${P}-gentoo-r1.diff - "${FILESDIR}"/${P}-zio-shell-meta-char.diff - "${FILESDIR}"/${P}-endif.patch - # Do not define errno extern, but rather include errno.h - # <[email protected]> (1 Jan 2003) - "${FILESDIR}"/${P}-include-errno_h.patch - "${FILESDIR}"/xloadimage-gentoo.patch - "${FILESDIR}"/${P}-unaligned-access.patch - "${FILESDIR}"/${P}-ldflags_and_exit.patch - "${FILESDIR}"/${P}-libpng15.patch - "${WORKDIR}"/${P}-fix-build-for-clang16.patch - # One of the previous patches screws up a bracket... - "${FILESDIR}"/${P}-bracket.patch -) - -src_prepare() { - default - - sed -i -e "s:OPT_FLAGS=:OPT_FLAGS=$CFLAGS:" Make.conf || die - sed -i -e "s:^#include <varargs.h>:#include <stdarg.h>:" rlelib.c || die - # qa-sed sees no-op on the next sed on non-gentoo-prefix systems, - # but that is alright - sed -i -e "/^DEFS = /s:/etc:${EPREFIX}/etc:" Makefile.in || die - sed -i \ - -e 's:png_set_gray_1_2_4_to_8:png_set_expand_gray_1_2_4_to_8:' \ - png.c || die - - eautoreconf -} - -src_configure() { - # Set TIFFHeader to TIFFHeaderCommon wrt #319383 - has_version '>=media-libs/tiff-4.0.0_pre' && \ - append-flags -DTIFFHeader=TIFFHeaderCommon - - tc-export CC - econf $(use_with jpeg) \ - $(use_with png) \ - $(use_with tiff) -} - -src_compile() { - emake SYSPATHFILE="${EPREFIX}"/etc/X11/Xloadimage -} - -src_install() { - dobin xloadimage uufilter - - dosym xloadimage /usr/bin/xsetbg - dosym xloadimage /usr/bin/xview - - insinto /etc/X11 - doins xloadimagerc - - newman xloadimage.man xloadimage.1 - newman uufilter.man uufilter.1 - - echo ".so man1/xloadimage.1" > "${T}"/xsetbg.1 || die - doman "${T}"/xsetbg.1 - newman "${T}"/xsetbg.1 xview.1 - - dodoc README -} diff --git a/media-gfx/xloadimage/xloadimage-4.1-r16.ebuild b/media-gfx/xloadimage/xloadimage-4.1-r16.ebuild deleted file mode 100644 index 55580772932d..000000000000 --- a/media-gfx/xloadimage/xloadimage-4.1-r16.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools flag-o-matic toolchain-funcs - -DESCRIPTION="Utility to view many different types of images under X11" -HOMEPAGE="https://sioseis.ucsd.edu/xloadimage.html https://tracker.debian.org/pkg/xloadimage"; -SRC_URI=" - ftp://ftp.x.org/R5contrib/${P/-/.}.tar.gz - mirror://gentoo/${P}-gentoo-r1.diff.bz2 - https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-fix-build-for-clang16.patch.xz -" -S="${WORKDIR}"/${P/-/.} - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="tiff jpeg png" - -RDEPEND="x11-libs/libX11 - tiff? ( media-libs/tiff:= ) - png? ( media-libs/libpng:= ) - jpeg? ( media-libs/libjpeg-turbo:= ) - !media-gfx/xli" -DEPEND="${RDEPEND}" - -PATCHES=( - "${WORKDIR}"/${P}-gentoo-r1.diff - "${FILESDIR}"/${P}-zio-shell-meta-char.diff - "${FILESDIR}"/${P}-endif.patch - # Do not define errno extern, but rather include errno.h - # <[email protected]> (1 Jan 2003) - "${FILESDIR}"/${P}-include-errno_h.patch - "${FILESDIR}"/xloadimage-gentoo.patch - "${FILESDIR}"/${P}-unaligned-access.patch - "${FILESDIR}"/${P}-ldflags_and_exit.patch - "${FILESDIR}"/${P}-libpng15.patch - "${WORKDIR}"/${P}-fix-build-for-clang16.patch - # One of the previous patches screws up a bracket... - "${FILESDIR}"/${P}-bracket.patch - "${FILESDIR}"/${P}-fix-incomp-function-pointer-types.patch -) - -src_prepare() { - default - - sed -i -e "s:OPT_FLAGS=:OPT_FLAGS=$CFLAGS:" Make.conf || die - sed -i -e "s:^#include <varargs.h>:#include <stdarg.h>:" rlelib.c || die - # qa-sed sees no-op on the next sed on non-gentoo-prefix systems, - # but that is alright - sed -i -e "/^DEFS = /s:/etc:${EPREFIX}/etc:" Makefile.in || die - sed -i \ - -e 's:png_set_gray_1_2_4_to_8:png_set_expand_gray_1_2_4_to_8:' \ - png.c || die - - eautoreconf -} - -src_configure() { - # Set TIFFHeader to TIFFHeaderCommon wrt #319383 - has_version '>=media-libs/tiff-4.0.0_pre' && \ - append-flags -DTIFFHeader=TIFFHeaderCommon - - tc-export CC - econf $(use_with jpeg) \ - $(use_with png) \ - $(use_with tiff) -} - -src_compile() { - emake SYSPATHFILE="${EPREFIX}"/etc/X11/Xloadimage -} - -src_install() { - dobin xloadimage uufilter - - dosym xloadimage /usr/bin/xsetbg - dosym xloadimage /usr/bin/xview - - insinto /etc/X11 - doins xloadimagerc - - newman xloadimage.man xloadimage.1 - newman uufilter.man uufilter.1 - - echo ".so man1/xloadimage.1" > "${T}"/xsetbg.1 || die - doman "${T}"/xsetbg.1 - newman "${T}"/xsetbg.1 xview.1 - - dodoc README -} diff --git a/media-gfx/xloadimage/xloadimage-4.1-r17.ebuild b/media-gfx/xloadimage/xloadimage-4.1-r17.ebuild deleted file mode 100644 index 13cc65fc73aa..000000000000 --- a/media-gfx/xloadimage/xloadimage-4.1-r17.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools flag-o-matic toolchain-funcs - -DESCRIPTION="Utility to view many different types of images under X11" -HOMEPAGE="https://sioseis.ucsd.edu/xloadimage.html https://tracker.debian.org/pkg/xloadimage"; -SRC_URI=" - ftp://ftp.x.org/R5contrib/${P/-/.}.tar.gz - mirror://gentoo/${P}-gentoo-r1.diff.bz2 - https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-fix-build-for-clang16.patch.xz -" -S="${WORKDIR}"/${P/-/.} - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="tiff jpeg png" - -RDEPEND="x11-libs/libX11 - tiff? ( media-libs/tiff:= ) - png? ( media-libs/libpng:= ) - jpeg? ( media-libs/libjpeg-turbo:= ) - !media-gfx/xli" -DEPEND="${RDEPEND} - x11-base/xorg-proto" - -PATCHES=( - "${WORKDIR}"/${P}-gentoo-r1.diff - "${FILESDIR}"/${P}-zio-shell-meta-char.diff - "${FILESDIR}"/${P}-endif.patch - # Do not define errno extern, but rather include errno.h - # <[email protected]> (1 Jan 2003) - "${FILESDIR}"/${P}-include-errno_h.patch - "${FILESDIR}"/xloadimage-gentoo.patch - "${FILESDIR}"/${P}-unaligned-access.patch - "${FILESDIR}"/${P}-ldflags_and_exit.patch - "${FILESDIR}"/${P}-libpng15.patch - "${WORKDIR}"/${P}-fix-build-for-clang16.patch - # One of the previous patches screws up a bracket... - "${FILESDIR}"/${P}-bracket.patch - "${FILESDIR}"/${P}-fix-incomp-function-pointer-types.patch - "${FILESDIR}"/${P}-c99.patch -) - -src_prepare() { - default - - sed -i -e "s|OPT_FLAGS=|OPT_FLAGS=$CFLAGS|" Make.conf || die - sed -i -e "s:^#include <varargs.h>:#include <stdarg.h>:" rlelib.c || die - # qa-sed sees no-op on the next sed on non-gentoo-prefix systems, - # but that is alright - sed -i -e "/^DEFS = /s:/etc:${EPREFIX}/etc:" Makefile.in || die - sed -i \ - -e 's:png_set_gray_1_2_4_to_8:png_set_expand_gray_1_2_4_to_8:' \ - png.c || die - - eautoreconf -} - -src_configure() { - append-cflags -std=gnu17 - - # Set TIFFHeader to TIFFHeaderCommon wrt #319383 - has_version '>=media-libs/tiff-4.0.0_pre' && \ - append-flags -DTIFFHeader=TIFFHeaderCommon - - tc-export CC - econf $(use_with jpeg) \ - $(use_with png) \ - $(use_with tiff) -} - -src_compile() { - emake SYSPATHFILE="${EPREFIX}"/etc/X11/Xloadimage -} - -src_install() { - dobin xloadimage uufilter - - dosym xloadimage /usr/bin/xsetbg - dosym xloadimage /usr/bin/xview - - insinto /etc/X11 - doins xloadimagerc - - newman xloadimage.man xloadimage.1 - newman uufilter.man uufilter.1 - - echo ".so man1/xloadimage.1" > "${T}"/xsetbg.1 || die - doman "${T}"/xsetbg.1 - newman "${T}"/xsetbg.1 xview.1 - - dodoc README -} diff --git a/media-gfx/xloadimage/xloadimage-4.1-r18.ebuild b/media-gfx/xloadimage/xloadimage-4.1-r18.ebuild deleted file mode 100644 index 848cd70d77c4..000000000000 --- a/media-gfx/xloadimage/xloadimage-4.1-r18.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools flag-o-matic toolchain-funcs - -DESCRIPTION="Utility to view many different types of images under X11" -HOMEPAGE="https://sioseis.ucsd.edu/xloadimage.html https://tracker.debian.org/pkg/xloadimage"; -SRC_URI=" - ftp://ftp.x.org/R5contrib/${P/-/.}.tar.gz - mirror://gentoo/${P}-gentoo-r1.diff.bz2 - https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-fix-build-for-clang16.patch.xz -" -S="${WORKDIR}"/${P/-/.} - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="tiff jpeg png" - -RDEPEND="x11-libs/libX11 - tiff? ( media-libs/tiff:= ) - png? ( media-libs/libpng:= ) - jpeg? ( media-libs/libjpeg-turbo:= ) - !media-gfx/xli" -DEPEND="${RDEPEND} - x11-base/xorg-proto" - -PATCHES=( - "${WORKDIR}"/${P}-gentoo-r1.diff - "${FILESDIR}"/${P}-zio-shell-meta-char.diff - "${FILESDIR}"/${P}-endif.patch - # Do not define errno extern, but rather include errno.h - # <[email protected]> (1 Jan 2003) - "${FILESDIR}"/${P}-include-errno_h.patch - "${FILESDIR}"/xloadimage-gentoo.patch - "${FILESDIR}"/${P}-unaligned-access.patch - "${FILESDIR}"/${P}-ldflags_and_exit.patch - "${FILESDIR}"/${P}-libpng15.patch - "${WORKDIR}"/${P}-fix-build-for-clang16.patch - # One of the previous patches screws up a bracket... - "${FILESDIR}"/${P}-bracket.patch - "${FILESDIR}"/${P}-fix-incomp-function-pointer-musl.patch - "${FILESDIR}"/${P}-c99.patch -) - -src_prepare() { - default - - sed -i -e "s|OPT_FLAGS=|OPT_FLAGS=$CFLAGS|" Make.conf || die - sed -i -e "s:^#include <varargs.h>:#include <stdarg.h>:" rlelib.c || die - # qa-sed sees no-op on the next sed on non-gentoo-prefix systems, - # but that is alright - sed -i -e "/^DEFS = /s:/etc:${EPREFIX}/etc:" Makefile.in || die - sed -i \ - -e 's:png_set_gray_1_2_4_to_8:png_set_expand_gray_1_2_4_to_8:' \ - png.c || die - - eautoreconf -} - -src_configure() { - append-cflags -std=gnu17 - - # Set TIFFHeader to TIFFHeaderCommon wrt #319383 - has_version '>=media-libs/tiff-4.0.0_pre' && \ - append-flags -DTIFFHeader=TIFFHeaderCommon - - tc-export CC - econf $(use_with jpeg) \ - $(use_with png) \ - $(use_with tiff) -} - -src_compile() { - emake SYSPATHFILE="${EPREFIX}"/etc/X11/Xloadimage -} - -src_install() { - dobin xloadimage uufilter - - dosym xloadimage /usr/bin/xsetbg - dosym xloadimage /usr/bin/xview - - insinto /etc/X11 - doins xloadimagerc - - newman xloadimage.man xloadimage.1 - newman uufilter.man uufilter.1 - - echo ".so man1/xloadimage.1" > "${T}"/xsetbg.1 || die - doman "${T}"/xsetbg.1 - newman "${T}"/xsetbg.1 xview.1 - - dodoc README -} diff --git a/profiles/package.mask b/profiles/package.mask index 5dfbae8e298a..bd66c431e543 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -224,12 +224,6 @@ dev-ruby/childprocess:2 # Removal on 2025-05-04. Bug #953120. x11-misc/xtoolwait -# Matt Turner <[email protected]> (2025-04-04) -# Package is dead and has a pile of patches to make it compile. -# SRC_URI is long gone. Many alternative image viewers. -# Removal on 2025-05-04. Bug #953119. -media-gfx/xloadimage - # Ionen Wolkens <[email protected]> (2025-04-02) # Masked for testing the new .0 version and leave time for packages # to catch up on support if needed. May or may keep masked until 6.9.1
