Author: urkud
Date: Wed Oct 5 06:33:10 2011
New Revision: 29651
URL: https://ssl.nixos.org/websvn/nix/?rev=29651&sc=1
Log:
Fix visualboyadvance compilation with libpng-1.5; patch from gentoo
Added:
nixpkgs/branches/libpng15/pkgs/misc/emulators/VisualBoyAdvance/libpng15.patch
Modified:
nixpkgs/branches/libpng15/pkgs/misc/emulators/VisualBoyAdvance/default.nix
Modified:
nixpkgs/branches/libpng15/pkgs/misc/emulators/VisualBoyAdvance/default.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/misc/emulators/VisualBoyAdvance/default.nix
Tue Oct 4 22:29:36 2011 (r29650)
+++ nixpkgs/branches/libpng15/pkgs/misc/emulators/VisualBoyAdvance/default.nix
Wed Oct 5 06:33:10 2011 (r29651)
@@ -6,7 +6,7 @@
url = mirror://sourceforge/vba/VisualBoyAdvance-src-1.7.2.tar.gz;
sha256 = "1dr9w5i296dyq2gbx7sijk6p375aqnwld2n6rwnbzm2g3a94y4gl";
};
- patches = [ ./fix.diff ]; # patch to shut up lost of precision errors
+ patches = [ ./libpng15.patch ./fix.diff ]; # patch to shut up lost of
precision errors
preConfigure = ''
# Fix errors with invalid conversion from 'const char*' to 'char*'
sed -i -e "s|char \* p = strrchr|const char * p = strrchr|g" src/GBA.cpp
Added:
nixpkgs/branches/libpng15/pkgs/misc/emulators/VisualBoyAdvance/libpng15.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/branches/libpng15/pkgs/misc/emulators/VisualBoyAdvance/libpng15.patch
Wed Oct 5 06:33:10 2011 (r29651)
@@ -0,0 +1,13 @@
+From Gentoo. Fixes compilation with libpng-1.5
+
+--- a/src/Util.cpp
++++ b/src/Util.cpp
+@@ -79,7 +79,7 @@
+ return false;
+ }
+
+- if(setjmp(png_ptr->jmpbuf)) {
++ if(setjmp(png_jmpbuf(png_ptr))) {
+ png_destroy_write_struct(&png_ptr,NULL);
+ fclose(fp);
+ return false;
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
