diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /media-gfx/xloadimage/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'media-gfx/xloadimage/files')
8 files changed, 434 insertions, 0 deletions
diff --git a/media-gfx/xloadimage/files/xloadimage-4.1-bracket.patch b/media-gfx/xloadimage/files/xloadimage-4.1-bracket.patch new file mode 100644 index 000000000000..5d71028652da --- /dev/null +++ b/media-gfx/xloadimage/files/xloadimage-4.1-bracket.patch @@ -0,0 +1,13 @@ +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-endif.patch b/media-gfx/xloadimage/files/xloadimage-4.1-endif.patch new file mode 100644 index 000000000000..df6f3e492190 --- /dev/null +++ b/media-gfx/xloadimage/files/xloadimage-4.1-endif.patch @@ -0,0 +1,11 @@ +--- 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-include-errno_h.patch b/media-gfx/xloadimage/files/xloadimage-4.1-include-errno_h.patch new file mode 100644 index 000000000000..f071d761617a --- /dev/null +++ b/media-gfx/xloadimage/files/xloadimage-4.1-include-errno_h.patch @@ -0,0 +1,13 @@ +--- 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 new file mode 100644 index 000000000000..afdea768aa47 --- /dev/null +++ b/media-gfx/xloadimage/files/xloadimage-4.1-ldflags_and_exit.patch @@ -0,0 +1,23 @@ +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 new file mode 100644 index 000000000000..ffd05f62b332 --- /dev/null +++ b/media-gfx/xloadimage/files/xloadimage-4.1-libpng15.patch @@ -0,0 +1,29 @@ +--- png.c ++++ 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 new file mode 100644 index 000000000000..874ad8a4f329 --- /dev/null +++ b/media-gfx/xloadimage/files/xloadimage-4.1-unaligned-access.patch @@ -0,0 +1,51 @@ +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 new file mode 100644 index 000000000000..730504fb43f6 --- /dev/null +++ b/media-gfx/xloadimage/files/xloadimage-4.1-zio-shell-meta-char.diff @@ -0,0 +1,36 @@ +--- 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 new file mode 100644 index 000000000000..896786680e30 --- /dev/null +++ b/media-gfx/xloadimage/files/xloadimage-gentoo.patch @@ -0,0 +1,258 @@ +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) |