[Gsrc-commit] /srv/bzr/gsrc/trunk r1606: add xaos at 3.5

[Brandon Invergo]

------------------------------------------------------------
revno: 1606
committer: Brandon Invergo <address@hidden>
branch nick: trunk
timestamp: Wed 2013-01-16 00:23:11 +0100
message:
  add xaos at 3.5
added:
  gnu/xaos/
  gnu/xaos/Makefile
  gnu/xaos/config.mk
  gnu/xaos/files/
  gnu/xaos/files/xaos-3.5-libpng15.diff
  gnu/xaos/files/xaos-3.5-unprotected-locales.diff
  gnu/xaos/sha256sums
modified:
  TODO

=== modified file 'TODO'
--- a/TODO      2013-01-15 21:34:24 +0000
+++ b/TODO      2013-01-15 23:23:11 +0000
@@ -69,7 +69,7 @@
 **** TODO gar.master.mk
 *** TODO clean out unnecessary sites from gar.master.mk
 *** TODO (maybe) clean out unnecessary rules from gar.lib.mk
-* GNU packages [362/453] [79%]
+* GNU packages [366/453] [80%]
 ** IGNORE 3dkit
 *** decommissioned
 ** DONE 3dldf
@@ -227,10 +227,15 @@
    CLOSED: [2012-12-16 Sun 20:12]
 ** DONE dominion
    CLOSED: [2012-12-16 Sun 20:12]
-** TODO dotgnu
-** DEFERRED dotgnu-forum
-*** no release available
-** TODO dotgnu-pnet
+** IGNORE dotgnu
+   CLOSED: [2013-01-15 Tue 22:41]
+*** decommissioned
+** IGNORE dotgnu-forum
+   CLOSED: [2013-01-15 Tue 22:42]
+*** decommissioned
+** IGNORE dotgnu-pnet
+   CLOSED: [2013-01-15 Tue 22:42]
+*** decommissioned
 ** IGNORE dr.genius
    CLOSED: [2012-12-16 Sun 20:16]
 *** decommissioned
@@ -1011,13 +1016,16 @@
 ** DONE which
    CLOSED: [2012-12-16 Sun 20:12]
 ** TODO womb
-** TODO xaos
+** DONE xaos
+   CLOSED: [2013-01-16 Wed 00:22]
+*** program segfaults
 ** IGNORE xbase
    CLOSED: [2012-12-16 Sun 20:16]
 *** decommissioned
 ** DONE xboard
    CLOSED: [2012-12-16 Sun 20:12]
-** TODO xhippo
+** DEFERRED xhippo
+*** requires gtk 1
 ** IGNORE xinfo
    CLOSED: [2012-12-16 Sun 20:16]
 *** decommissioned
@@ -1026,7 +1034,8 @@
 ** IGNORE xmhtml
    CLOSED: [2012-12-16 Sun 20:16]
 *** decommissioned
-** TODO xmlat
+** DEFERRED xmlat
+*** no release available
 ** DONE xnee
    CLOSED: [2012-12-16 Sun 20:12]
 ** DONE xorriso

=== added directory 'gnu/xaos'
=== added file 'gnu/xaos/Makefile'
--- a/gnu/xaos/Makefile 1970-01-01 00:00:00 +0000
+++ b/gnu/xaos/Makefile 2013-01-15 23:23:11 +0000
@@ -0,0 +1,24 @@
+NAME = GNU XaoS
+GARNAME = xaos
+GARVERSION = 3.5
+HOME_URL = http://www.gnu.org/software/xaos
+DESCRIPTION = An interactive fractal zoomer
+
+######################################################################
+
+MASTER_SITES = $(MASTER_SOURCEFORGE)
+MASTER_SUBDIR = $(GARNAME)/files/XaoS/$(GARVERSION)/
+DISTFILES = $(DISTNAME).tar.gz
+SIGFILES = 
+PATCHFILES = $(DISTNAME)-libpng15.diff \
+            $(DISTNAME)-unprotected-locales.diff 
+
+BUILDDEPS =
+LIBDEPS = gsl libpng gtk gettext
+
+######################################################################
+
+include ../../gar.lib/auto.mk
+include config.mk
+
+CONFIGURE_ARGS += --with-gsl --with-gtk-driver

=== added file 'gnu/xaos/config.mk'
--- a/gnu/xaos/config.mk        1970-01-01 00:00:00 +0000
+++ b/gnu/xaos/config.mk        2013-01-15 23:23:11 +0000
@@ -0,0 +1,4 @@
+## Configuration options for xaos ##
+
+CONFIGURE_OPTS ?= 
+BUILD_OPTS ?=

=== added directory 'gnu/xaos/files'
=== added file 'gnu/xaos/files/xaos-3.5-libpng15.diff'
--- a/gnu/xaos/files/xaos-3.5-libpng15.diff     1970-01-01 00:00:00 +0000
+++ b/gnu/xaos/files/xaos-3.5-libpng15.diff     2013-01-15 23:23:11 +0000
@@ -0,0 +1,131 @@
+http://code.google.com/p/gnuxaos/issues/detail?id=55
+
+--- work/xaos-3.5/src/util/png.c
++++ work/xaos-3.5/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);

=== added file 'gnu/xaos/files/xaos-3.5-unprotected-locales.diff'
--- a/gnu/xaos/files/xaos-3.5-unprotected-locales.diff  1970-01-01 00:00:00 
+0000
+++ b/gnu/xaos/files/xaos-3.5-unprotected-locales.diff  2013-01-15 23:23:11 
+0000
@@ -0,0 +1,33 @@
+This patch removes protection from locale files installed by XaoS, since their
+protection interferes with the normal operation of GSRC. If you're installing 
+XaoS system-wide using GSRC and you have root priveleges, you can disable this
+patch.
+
+diff -x config.log -x config.status -ru tmp/xaos-3.5/src/i18n/Makefile.in.in 
work/xaos-3.5/src/i18n/Makefile.in.in
+--- work/xaos-3.5/src/i18n/Makefile.in.in      2009-07-18 01:50:28.000000000 
+0200
++++ work/xaos-3.5/src/i18n/Makefile.in.in      2013-01-15 23:49:47.827560898 
+0100
+@@ -2,7 +2,7 @@
+ LANGUAGES=$(PO-FILES:.po=)
+ 
+ # Maybe this should be autogenerated by "configure".
address@hidden@
++LOCALEDIR=$(prefix)/share/locale
+ 
+ # If other files will be translated, they must be also here:
+ CSOURCES=../ui/ui.c ../ui-hlp/menu.c \
+@@ -21,13 +21,13 @@
+ install: $(MO-FILES)
+       @for i in $(LANGUAGES); do \
+        @INSTALL@ -d $(DESTDIR)$(LOCALEDIR)/$$i/LC_MESSAGES; \
+-       @INSTALL@ -m 444 $$i.mo 
$(DESTDIR)$(LOCALEDIR)/$$i/LC_MESSAGES/xaos.mo; \
++       @INSTALL@ -m 666 $$i.mo 
$(DESTDIR)$(LOCALEDIR)/$$i/LC_MESSAGES/xaos.mo; \
+        done
+ 
+ install-win: $(MO-FILES)
+       @for i in $(LANGUAGES); do \
+        @INSTALL@ -d $(DESTDIR)/locale/$$i/LC_MESSAGES; \
+-       @INSTALL@ -m 444 $$i.mo $(DESTDIR)/locale/$$i/LC_MESSAGES/xaos.mo; \
++       @INSTALL@ -m 666 $$i.mo $(DESTDIR)/locale/$$i/LC_MESSAGES/xaos.mo; \
+        done
+ 
+ clean:

=== added file 'gnu/xaos/sha256sums'
--- a/gnu/xaos/sha256sums       1970-01-01 00:00:00 +0000
+++ b/gnu/xaos/sha256sums       2013-01-15 23:23:11 +0000
@@ -0,0 +1,3 @@
+471fa752154a8e4c4687797fe1241df1b3f82400b2ef4e6a603969a27cd74842  
download/xaos-3.5.tar.gz
+f9f34eaa9651d159cc06a7c664acdf963abc26fc2c2661247f8544e945e3d1c7  
download/xaos-3.5-libpng15.diff
+5a8e5952048f30833394e27a9b433173c414ecf42e93b459600abaa262b6275e  
download/xaos-3.5-unprotected-locales.diff