commit: 6f8fdc695bc538925e51b51bba9213d1536ce798 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Mon Dec 4 20:14:21 2017 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> CommitDate: Wed Dec 6 13:03:58 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f8fdc69
x11-misc/xaos: remove unused patches Closes: https://github.com/gentoo/gentoo/pull/6441 x11-misc/xaos/files/xaos-3.5-gettext.patch | 88 ------------------- x11-misc/xaos/files/xaos-3.5-libpng15.patch | 131 ---------------------------- 2 files changed, 219 deletions(-) diff --git a/x11-misc/xaos/files/xaos-3.5-gettext.patch b/x11-misc/xaos/files/xaos-3.5-gettext.patch deleted file mode 100644 index b83b24346cd..00000000000 --- a/x11-misc/xaos/files/xaos-3.5-gettext.patch +++ /dev/null @@ -1,88 +0,0 @@ -diff -ur xaos-3.5.orig/src/i18n/cs.po xaos-3.5/src/i18n/cs.po ---- xaos-3.5.orig/src/i18n/cs.po 2014-06-08 15:19:23.313803520 +0200 -+++ xaos-3.5/src/i18n/cs.po 2014-06-08 15:20:35.071009379 +0200 -@@ -10,6 +10,7 @@ - "PO-Revision-Date: 2002-08-17 21:44+0200\n" - "Last-Translator: MadSoft <[email protected]>\n" - "Language-Team: Czech\n" -+"Language: cs\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=ISO-8859-2\n" - "Content-Transfer-Encoding: 8-bit\n" -diff -ur xaos-3.5.orig/src/i18n/de.po xaos-3.5/src/i18n/de.po ---- xaos-3.5.orig/src/i18n/de.po 2014-06-08 15:19:23.314803662 +0200 -+++ xaos-3.5/src/i18n/de.po 2014-06-08 15:20:59.684508120 +0200 -@@ -11,6 +11,7 @@ - "PO-Revision-Date: 2008-04-27 21:48+0200\n" - "Last-Translator: \n" - "Language-Team: <[email protected]>\n" -+"Language: de\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=ISO-8859-1\n" - "Content-Transfer-Encoding: 8bit\n" -diff -ur xaos-3.5.orig/src/i18n/es.po xaos-3.5/src/i18n/es.po ---- xaos-3.5.orig/src/i18n/es.po 2014-06-08 15:19:23.314803662 +0200 -+++ xaos-3.5/src/i18n/es.po 2014-06-08 15:21:10.917104552 +0200 -@@ -10,6 +10,7 @@ - "PO-Revision-Date: 2002-10-04 15:22+0200\n" - "Last-Translator: C�sar P�rez <[email protected]>\n" - "Language-Team: Spanish <[email protected]>\n" -+"Language: es\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=ISO-8859-1\n" - "Content-Transfer-Encoding: 8-bit\n" -diff -ur xaos-3.5.orig/src/i18n/fr.po xaos-3.5/src/i18n/fr.po ---- xaos-3.5.orig/src/i18n/fr.po 2014-06-08 15:19:23.315803804 +0200 -+++ xaos-3.5/src/i18n/fr.po 2014-06-08 15:21:24.653056586 +0200 -@@ -10,6 +10,7 @@ - "PO-Revision-Date: 2006-02-05 17:35+0200\n" - "Last-Translator: Philippe Wautelet <traduc _at_ fractalzone _dot_ be>\n" - "Language-Team: French\n" -+"Language: fr\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=ISO-8859-1\n" - "Content-Transfer-Encoding: 8-bit\n" -diff -ur xaos-3.5.orig/src/i18n/hu.po xaos-3.5/src/i18n/hu.po ---- xaos-3.5.orig/src/i18n/hu.po 2014-06-08 15:19:23.315803804 +0200 -+++ xaos-3.5/src/i18n/hu.po 2014-06-08 15:21:49.950651185 +0200 -@@ -10,6 +10,7 @@ - "PO-Revision-Date: 2002-08-17 21:44+0200\n" - "Last-Translator: Zoltan Kovacs <[email protected]>\n" - "Language-Team: Hungarian\n" -+"Language: hu\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=ISO-8859-2\n" - "Content-Transfer-Encoding: 8-bit\n" -diff -ur xaos-3.5.orig/src/i18n/it.po xaos-3.5/src/i18n/it.po ---- xaos-3.5.orig/src/i18n/it.po 2014-06-08 15:19:23.316803947 +0200 -+++ xaos-3.5/src/i18n/it.po 2014-06-08 15:22:00.324125022 +0200 -@@ -11,6 +11,7 @@ - "PO-Revision-Date: 2008-04-08 10:10+0000\n" - "Last-Translator: Sergio Zanchetta <Unknown>\n" - "Language-Team: Italian <[email protected]>\n" -+"Language: it\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=ISO-8859-1\n" - "Content-Transfer-Encoding: 8bit\n" -diff -ur xaos-3.5.orig/src/i18n/pt.po xaos-3.5/src/i18n/pt.po ---- xaos-3.5.orig/src/i18n/pt.po 2014-06-08 15:19:23.316803947 +0200 -+++ xaos-3.5/src/i18n/pt.po 2014-06-08 15:22:12.961920461 +0200 -@@ -9,6 +9,7 @@ - "PO-Revision-Date: 2009-06-01 14:07-0300\n" - "Last-Translator: Lucio de Araujo <[email protected]>\n" - "Language-Team: Portuguese <[email protected]>\n" -+"Language: pt\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=ISO-8859-1\n" - "Content-Transfer-Encoding: 8bit\n" -diff -ur xaos-3.5.orig/src/i18n/ro.po xaos-3.5/src/i18n/ro.po ---- xaos-3.5.orig/src/i18n/ro.po 2014-06-08 15:19:23.317804089 +0200 -+++ xaos-3.5/src/i18n/ro.po 2014-06-08 15:22:21.969200049 +0200 -@@ -10,6 +10,7 @@ - "PO-Revision-Date: 2008-04-28 11:21+0100\n" - "Last-Translator: Zoltan Kovacs <[email protected]>\n" - "Language-Team: The XaoS Development Team <[email protected]>\n" -+"Language: ro\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=utf-8\n" - "Content-Transfer-Encoding: 8bit\n" diff --git a/x11-misc/xaos/files/xaos-3.5-libpng15.patch b/x11-misc/xaos/files/xaos-3.5-libpng15.patch deleted file mode 100644 index beece8339e3..00000000000 --- a/x11-misc/xaos/files/xaos-3.5-libpng15.patch +++ /dev/null @@ -1,131 +0,0 @@ -http://code.google.com/p/gnuxaos/issues/detail?id=55 - ---- src/util/png.c -+++ src/util/png.c -@@ -3,6 +3,7 @@ - #include <aconfig.h> - #ifdef USE_PNG - #include <png.h> -+#include <zlib.h> - #endif - #include <stdlib.h> - #include <stdio.h> -@@ -31,6 +32,9 @@ - png_structp png_ptr; - png_infop info_ptr; - png_color palette[256]; -+ png_color_8 sig_bit; -+ int color_type; -+ int bit_depth; - volatile unsigned short a = 255; - volatile unsigned char *b = (volatile unsigned char *) &a; - #ifdef _undefined_ -@@ -59,7 +63,7 @@ - png_destroy_write_struct(&png_ptr, (png_infopp) NULL); - return "No memory to create png info structure"; - } -- if (setjmp(png_ptr->jmpbuf)) { -+ if (setjmp(png_jmpbuf(png_ptr))) { - png_destroy_write_struct(&png_ptr, &info_ptr); - fclose(file); - return strerror(errno); -@@ -78,57 +82,70 @@ - png_set_compression_window_bits(png_ptr, 15); - png_set_compression_method(png_ptr, 8); - -- info_ptr->width = image->width; -- info_ptr->height = image->height; -- /*info_ptr->gamma=1.0; */ -- info_ptr->gamma = 0.5; -- info_ptr->valid |= PNG_INFO_gAMA | PNG_INFO_pHYs; -- info_ptr->x_pixels_per_unit = (png_uint_32) (100 / image->pixelwidth); -- info_ptr->y_pixels_per_unit = (png_uint_32) (100 / image->pixelheight); -+ switch (image->palette->type) -+ { -+ case C256: -+ color_type = PNG_COLOR_TYPE_PALETTE; -+ bit_depth = image->bytesperpixel * 8; -+ break; -+ case SMALLITER: -+ case LARGEITER: -+ case GRAYSCALE: -+ color_type = PNG_COLOR_TYPE_GRAY; -+ bit_depth = image->bytesperpixel * 8; -+ break; -+ case TRUECOLOR: -+ case TRUECOLOR24: -+ case TRUECOLOR16: -+ color_type = PNG_COLOR_TYPE_RGB; -+ bit_depth = 8; -+ break; -+ } - -+ png_set_IHDR (png_ptr, info_ptr, image->width, image->height, bit_depth, -+ color_type, PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_BASE, -+ PNG_FILTER_TYPE_BASE); - - switch (image->palette->type) { - case C256: - { - int i; -- info_ptr->color_type = PNG_COLOR_TYPE_PALETTE; -- info_ptr->bit_depth = image->bytesperpixel * 8; -- info_ptr->palette = palette; -- info_ptr->valid |= PNG_INFO_PLTE; -+ png_color png_palette[257]; -+ int png_num_palette; - for (i = 0; i < image->palette->end; i++) -- info_ptr->palette[i].red = image->palette->rgb[i][0], -- info_ptr->palette[i].green = image->palette->rgb[i][1], -- info_ptr->palette[i].blue = image->palette->rgb[i][2], -- info_ptr->num_palette = image->palette->end; -+ png_palette[i].red = image->palette->rgb[i][0], -+ png_palette[i].green = image->palette->rgb[i][1], -+ png_palette[i].blue = image->palette->rgb[i][2], -+ png_num_palette = image->palette->end; -+ png_set_PLTE(png_ptr, info_ptr, png_palette, png_num_palette); - } - break; -- case SMALLITER: -- case LARGEITER: -- case GRAYSCALE: -- info_ptr->color_type = PNG_COLOR_TYPE_GRAY; -- info_ptr->bit_depth = image->bytesperpixel * 8; -- break; - case TRUECOLOR: - case TRUECOLOR24: - case TRUECOLOR16: -- info_ptr->color_type = PNG_COLOR_TYPE_RGB; -- info_ptr->bit_depth = 8; -- info_ptr->sig_bit.red = 8 - image->palette->info.truec.rprec; -- info_ptr->sig_bit.green = 8 - image->palette->info.truec.gprec; -- info_ptr->sig_bit.blue = 8 - image->palette->info.truec.bprec; -+ sig_bit.red = 8 - image->palette->info.truec.rprec; -+ sig_bit.green = 8 - image->palette->info.truec.gprec; -+ sig_bit.blue = 8 - image->palette->info.truec.bprec; -+ png_set_sBIT(png_ptr, info_ptr, &sig_bit); - break; - } -- info_ptr->interlace_type = 0; -+ -+ png_write_info (png_ptr, info_ptr); -+ - #ifdef _undefined_ - png_set_text(png_ptr, info_ptr, comments, - sizeof(comments) / sizeof(png_text)); - #endif - -- png_write_info(png_ptr, info_ptr); -+ png_set_gAMA(png_ptr, info_ptr, 0.5 /* 1.0 */); -+ png_set_pHYs(png_ptr, info_ptr, (png_uint_32) (100 / image->pixelwidth), -+ (png_uint_32) (100 / image->pixelheight), -+ PNG_RESOLUTION_UNKNOWN); -+ - /*png_set_filler(png_ptr,0,PNG_FILLER_AFTER); */ - png_set_packing(png_ptr); - if (image->palette->type & (TRUECOLOR | TRUECOLOR24 | TRUECOLOR16)) -- png_set_shift(png_ptr, &(info_ptr->sig_bit)); -+ png_set_shift (png_ptr, &sig_bit); - if (*b == 255) - png_set_swap(png_ptr); - png_set_bgr(png_ptr);
