diff options
Diffstat (limited to 'x11-misc/xaos/files')
| -rw-r--r-- | x11-misc/xaos/files/xaos-3.4-include.patch | 7 | ||||
| -rw-r--r-- | x11-misc/xaos/files/xaos-3.4-png.patch | 11 | ||||
| -rw-r--r-- | x11-misc/xaos/files/xaos-3.5-build-fix-i686.patch | 20 | ||||
| -rw-r--r-- | x11-misc/xaos/files/xaos-3.5-gettext.patch | 88 | ||||
| -rw-r--r-- | x11-misc/xaos/files/xaos-3.5-libpng15.patch | 131 | ||||
| -rw-r--r-- | x11-misc/xaos/files/xaos-3.6-locale-dir.patch | 11 | ||||
| -rw-r--r-- | x11-misc/xaos/files/xaos-3.6-no-auto-strip.patch | 20 |
7 files changed, 288 insertions, 0 deletions
diff --git a/x11-misc/xaos/files/xaos-3.4-include.patch b/x11-misc/xaos/files/xaos-3.4-include.patch new file mode 100644 index 000000000000..65f7b8c5630c --- /dev/null +++ b/x11-misc/xaos/files/xaos-3.4-include.patch @@ -0,0 +1,7 @@ +--- src/util/thread.c.orig 2009-03-28 10:50:49.817619387 +0000 ++++ src/util/thread.c 2009-03-28 10:59:40.048185946 +0000 +@@ -1,3 +1,4 @@ ++#include <stdlib.h> + #ifndef _plan9_ + #include <signal.h> + #include <stdio.h> diff --git a/x11-misc/xaos/files/xaos-3.4-png.patch b/x11-misc/xaos/files/xaos-3.4-png.patch new file mode 100644 index 000000000000..454f8acaa994 --- /dev/null +++ b/x11-misc/xaos/files/xaos-3.4-png.patch @@ -0,0 +1,11 @@ +--- configure.in.orig 2009-03-28 09:50:18.764999182 +0000 ++++ configure.in 2009-03-28 09:49:18.685947638 +0000 +@@ -98,7 +98,7 @@ + AC_ARG_WITH(png, + [ --with-png=yes/no enables/disables PNG saving support],[ + if test x$withval = xyes; then +- png=test ++ png=yes + fi + if test x$withval = xno; then + png=no diff --git a/x11-misc/xaos/files/xaos-3.5-build-fix-i686.patch b/x11-misc/xaos/files/xaos-3.5-build-fix-i686.patch new file mode 100644 index 000000000000..4736dd389b5a --- /dev/null +++ b/x11-misc/xaos/files/xaos-3.5-build-fix-i686.patch @@ -0,0 +1,20 @@ +--- xaos-3.5/src/engine/zoomd.c.orig 2009-07-18 00:50:31.000000000 +0100 ++++ xaos-3.5/src/engine/zoomd.c 2012-05-20 19:04:55.891065437 +0100 +@@ -280,6 +280,7 @@ dosymetry2(void /*@unused@ */ *data, str + #endif + #undef bpp1 + ++REGISTERS(0) + static INLINE void fillline(int line) + { + register unsigned char *RESTRICT vbuff = cimage.currlines[line]; +--- xaos-3.5/src/engine/zoom.c.fix-build 2009-07-18 00:50:31.000000000 +0100 ++++ xaos-3.5/src/engine/zoom.c 2012-05-20 19:11:53.625083113 +0100 +@@ -933,6 +933,7 @@ static /*INLINE */ void preparemoveoldpo + } + + #ifndef USE_i386ASM ++REGISTERS(0) + static /*INLINE */ void + moveoldpoints(void /*@unused@ */ *data1, + struct taskinfo /*@unused@ */ *task, diff --git a/x11-misc/xaos/files/xaos-3.5-gettext.patch b/x11-misc/xaos/files/xaos-3.5-gettext.patch new file mode 100644 index 000000000000..b83b24346cd8 --- /dev/null +++ b/x11-misc/xaos/files/xaos-3.5-gettext.patch @@ -0,0 +1,88 @@ +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 <madsoft@centrum.cz>\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: <de@li.org>\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 <oroz@users.sourceforge.net>\n" + "Language-Team: Spanish <es@li.org>\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 <kovzol@math.u-szeged.hu>\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 <it@li.org>\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 <lucio.matema@gmail.com>\n" + "Language-Team: Portuguese <zeliagarcia@seed.pr.gov.br>\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 <kovzol@matek.hu>\n" + "Language-Team: The XaoS Development Team <xaos-devel@lists.sf.net>\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 new file mode 100644 index 000000000000..beece8339e31 --- /dev/null +++ b/x11-misc/xaos/files/xaos-3.5-libpng15.patch @@ -0,0 +1,131 @@ +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); diff --git a/x11-misc/xaos/files/xaos-3.6-locale-dir.patch b/x11-misc/xaos/files/xaos-3.6-locale-dir.patch new file mode 100644 index 000000000000..740f32d18985 --- /dev/null +++ b/x11-misc/xaos/files/xaos-3.6-locale-dir.patch @@ -0,0 +1,11 @@ +--- configure.in.orig 2014-06-09 10:54:18.459186718 -0700 ++++ configure.in 2014-06-09 10:56:47.472204763 -0700 +@@ -141,7 +141,7 @@ + dnl Checks for programs. + + DRIVERDIRS="" +-LOCALEDIR="/usr/share/locale" ++LOCALEDIR="$prefix/share/locale" + DRIVERLIBS="lib/libui.a lib/libui-hlp.a lib/libengine.a lib/libutil.a lib/libfilter.a" + AC_PROG_INSTALL + diff --git a/x11-misc/xaos/files/xaos-3.6-no-auto-strip.patch b/x11-misc/xaos/files/xaos-3.6-no-auto-strip.patch new file mode 100644 index 000000000000..ab6e6b56a9b8 --- /dev/null +++ b/x11-misc/xaos/files/xaos-3.6-no-auto-strip.patch @@ -0,0 +1,20 @@ +--- Makefile.in.orig 2014-06-09 10:42:00.574129368 -0700 ++++ Makefile.in 2014-06-09 10:43:04.035568767 -0700 +@@ -36,7 +36,7 @@ + @INSTALL@ -d $(DESTDIR)$(datadir)/XaoS/help + @INSTALL@ -d $(DESTDIR)$(bindir) + @INSTALL@ -d $(DESTDIR)$(mandir)/man6 +- @INSTALL@ -s bin/xaos $(DESTDIR)$(bindir) ++ @INSTALL@ bin/xaos $(DESTDIR)$(bindir) + @INSTALL@ -m 444 tutorial/*.x[ah]f $(DESTDIR)$(datadir)/XaoS/tutorial + + @INSTALL@ -m 444 examples/README $(DESTDIR)$(datadir)/XaoS/examples +@@ -49,7 +49,7 @@ + + @INSTALL@ -m 444 catalogs/*.cat catalogs/README $(DESTDIR)$(datadir)/XaoS/catalogs + @INSTALL@ -m 444 help/xaos.hlp $(DESTDIR)$(datadir)/XaoS/help +- @INSTALL@ -m 444 AUTHORS NEWS COPYING TODO INSTALL ChangeLog ChangeLog.old $(DESTDIR)$(datadir)/XaoS/doc ++ @INSTALL@ -m 444 AUTHORS NEWS TODO ChangeLog ChangeLog.old $(DESTDIR)$(datadir)/XaoS/doc + @INSTALL@ -m 444 doc/xaos.6 $(DESTDIR)$(mandir)/man6 + test -z "$(infodir)" || @INSTALL@ -d "$(DESTDIR)$(infodir)" + @INSTALL@ -m 444 doc/xaos.info $(DESTDIR)$(infodir)/xaos.info |