[Lunar-commits] <moonbase-other> tuxpaint: cleanup & patch for libpng1.6

[v4hn]

commit fbe22d43a7d1f37cdee43872981de0290930bd30
Author: v4hn <me at v4hn.de>
Date: Sat, 04 May 2013 18:54:28 -0700
URL: https://github.com/lunar-linux/moonbase-other/commit/fbe22d43a7d1f37cdee43872981de0290930bd30

tuxpaint: cleanup & patch for libpng1.6
---
  graphics/tuxpaint/BUILD | +10/-9    
  1 file changed, 10 insertions(+), 9 deletions(-)

--- a/graphics/tuxpaint/BUILD
+++ b/graphics/tuxpaint/BUILD
@@ -1,13 +1,14 @@
-(
+sedit "s@\(linux_ARCH_LINKS:=.*\)\$@\1 \$(PNG) -lm@" Makefile &&
+sedit "s at -g3@@" Makefile &&
+sedit "s at Art\;@Art\;Graphics@" src/tuxpaint.desktop &&
 
-  sedit "s@\(linux_ARCH_LINKS:=.*\)\$@\1 \$(PNG) -lm@" Makefile &&
-  sedit "s at -g3@@" Makefile &&
-  sedit "s at Art\;@Art\;Graphics@" src/tuxpaint.desktop &&
+# make it work with current libpng
+sedit " /info_ptr->/ d" src/tuxpaint.c &&
+sedit "12901 i png_set_IHDR(png_ptr, info_ptr, surf->w, surf->h, 8, PNG_COLOR_TYPE_RGB, PNG_INTERLACE_ADAM7, PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);" src/tuxpaint.c &&
 
-  make $OPTS PREFIX=/usr &&
-  prepare_install &&
+make $OPTS PREFIX=/usr &&
 
-  # GNOME_PREFIX triggers installation of a .desktop file
-  make install PREFIX=/usr GNOME_PREFIX=/usr
+prepare_install &&
 
-) > $C_FIFO 2>&1
+# GNOME_PREFIX triggers installation of a .desktop file
+make install PREFIX=/usr GNOME_PREFIX=/usr