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/pngquant/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/pngquant/files')
| -rw-r--r-- | media-gfx/pngquant/files/pngquant-1.8.3-libpng16.patch | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/media-gfx/pngquant/files/pngquant-1.8.3-libpng16.patch b/media-gfx/pngquant/files/pngquant-1.8.3-libpng16.patch new file mode 100644 index 000000000000..edf089ff9678 --- /dev/null +++ b/media-gfx/pngquant/files/pngquant-1.8.3-libpng16.patch @@ -0,0 +1,53 @@ +Rename to prevent conflict with png_image from libpng16 + +http://bugs.gentoo.org/464762 + +--- rwpng.c ++++ rwpng.c +@@ -213,7 +213,7 @@ + } + + +-pngquant_error rwpng_write_image_init(png_image *mainprog_ptr, png_structpp png_ptr_p, png_infopp info_ptr_p, FILE *outfile) ++pngquant_error rwpng_write_image_init(rwpng_png_image *mainprog_ptr, png_structpp png_ptr_p, png_infopp info_ptr_p, FILE *outfile) + { + /* could also replace libpng warning-handler (final NULL), but no need: */ + +@@ -277,7 +277,7 @@ + png_structp png_ptr; + png_infop info_ptr; + +- pngquant_error retval = rwpng_write_image_init((png_image*)mainprog_ptr, &png_ptr, &info_ptr, outfile); ++ pngquant_error retval = rwpng_write_image_init((rwpng_png_image*)mainprog_ptr, &png_ptr, &info_ptr, outfile); + if (retval) return retval; + + // Palette images generally don't gain anything from filtering +@@ -321,7 +321,7 @@ + png_structp png_ptr; + png_infop info_ptr; + +- pngquant_error retval = rwpng_write_image_init((png_image*)mainprog_ptr, &png_ptr, &info_ptr, outfile); ++ pngquant_error retval = rwpng_write_image_init((rwpng_png_image*)mainprog_ptr, &png_ptr, &info_ptr, outfile); + if (retval) return retval; + + rwpng_set_gamma(info_ptr, png_ptr, mainprog_ptr->gamma); +@@ -344,7 +344,7 @@ + + static void rwpng_error_handler(png_structp png_ptr, png_const_charp msg) + { +- png_image *mainprog_ptr; ++ rwpng_png_image *mainprog_ptr; + + /* This function, aside from the extra step of retrieving the "error + * pointer" (below) and the fact that it exists within the application +--- rwpng.h ++++ rwpng.h +@@ -80,7 +80,7 @@ + jmp_buf jmpbuf; + png24_image png24; + png8_image png8; +-} png_image; ++} rwpng_png_image; + + /* prototypes for public functions in rwpng.c */ + |