[SVN-Commit] r294 - branches/experimental/www/seamonkey/files trunk/deskutils/sunbird/files trunk/mail/lightning/files trunk/www/seamonkey/files

[svn-freebsd-gecko at chruetertee.ch]

Author: beat
Date: Tue Mar 30 08:12:19 2010
New Revision: 294

Log:
- Sync with ports:
  Fix build for png-1.4.1

Added:
   branches/experimental/www/seamonkey/files/patch-modules-libpr0n-encoders-png-nsPNGEncoder.cpp
   trunk/deskutils/sunbird/files/patch-modules-libpr0n-encoders-png-nsPNGEncoder.cpp
   trunk/mail/lightning/files/patch-modules-libpr0n-encoders-png-nsPNGEncoder.cpp
   trunk/www/seamonkey/files/patch-modules-libpr0n-encoders-png-nsPNGEncoder.cpp

Added: branches/experimental/www/seamonkey/files/patch-modules-libpr0n-encoders-png-nsPNGEncoder.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/www/seamonkey/files/patch-modules-libpr0n-encoders-png-nsPNGEncoder.cpp	Tue Mar 30 08:12:19 2010	(r294)
@@ -0,0 +1,15 @@
+--- modules/libpr0n/encoders/png/nsPNGEncoder.cpp	2010-03-28 13:48:53.000000000 +0200
++++ modules/libpr0n/encoders/png/nsPNGEncoder.cpp.orig	2010-03-28 13:46:50.000000000 +0200
+@@ -111,9 +111,9 @@
+ 
+   // initialize
+   png_struct* png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING,
+-                                                png_voidp_NULL,
+-                                                png_error_ptr_NULL,
+-                                                png_error_ptr_NULL);
++                                                NULL,
++                                                NULL,
++                                                NULL);
+   if (! png_ptr)
+     return NS_ERROR_OUT_OF_MEMORY;
+   png_info* info_ptr = png_create_info_struct(png_ptr);

Added: trunk/deskutils/sunbird/files/patch-modules-libpr0n-encoders-png-nsPNGEncoder.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/deskutils/sunbird/files/patch-modules-libpr0n-encoders-png-nsPNGEncoder.cpp	Tue Mar 30 08:12:19 2010	(r294)
@@ -0,0 +1,15 @@
+--- modules/libpr0n/encoders/png/nsPNGEncoder.cpp	2010-03-28 13:48:53.000000000 +0200
++++ modules/libpr0n/encoders/png/nsPNGEncoder.cpp.orig	2010-03-28 13:46:50.000000000 +0200
+@@ -111,9 +111,9 @@
+ 
+   // initialize
+   png_struct* png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING,
+-                                                png_voidp_NULL,
+-                                                png_error_ptr_NULL,
+-                                                png_error_ptr_NULL);
++                                                NULL,
++                                                NULL,
++                                                NULL);
+   if (! png_ptr)
+     return NS_ERROR_OUT_OF_MEMORY;
+   png_info* info_ptr = png_create_info_struct(png_ptr);

Added: trunk/mail/lightning/files/patch-modules-libpr0n-encoders-png-nsPNGEncoder.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/mail/lightning/files/patch-modules-libpr0n-encoders-png-nsPNGEncoder.cpp	Tue Mar 30 08:12:19 2010	(r294)
@@ -0,0 +1,15 @@
+--- modules/libpr0n/encoders/png/nsPNGEncoder.cpp	2010-03-28 13:48:53.000000000 +0200
++++ modules/libpr0n/encoders/png/nsPNGEncoder.cpp.orig	2010-03-28 13:46:50.000000000 +0200
+@@ -111,9 +111,9 @@
+ 
+   // initialize
+   png_struct* png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING,
+-                                                png_voidp_NULL,
+-                                                png_error_ptr_NULL,
+-                                                png_error_ptr_NULL);
++                                                NULL,
++                                                NULL,
++                                                NULL);
+   if (! png_ptr)
+     return NS_ERROR_OUT_OF_MEMORY;
+   png_info* info_ptr = png_create_info_struct(png_ptr);

Added: trunk/www/seamonkey/files/patch-modules-libpr0n-encoders-png-nsPNGEncoder.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/www/seamonkey/files/patch-modules-libpr0n-encoders-png-nsPNGEncoder.cpp	Tue Mar 30 08:12:19 2010	(r294)
@@ -0,0 +1,15 @@
+--- modules/libpr0n/encoders/png/nsPNGEncoder.cpp	2010-03-28 13:48:53.000000000 +0200
++++ modules/libpr0n/encoders/png/nsPNGEncoder.cpp.orig	2010-03-28 13:46:50.000000000 +0200
+@@ -111,9 +111,9 @@
+ 
+   // initialize
+   png_struct* png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING,
+-                                                png_voidp_NULL,
+-                                                png_error_ptr_NULL,
+-                                                png_error_ptr_NULL);
++                                                NULL,
++                                                NULL,
++                                                NULL);
+   if (! png_ptr)
+     return NS_ERROR_OUT_OF_MEMORY;
+   png_info* info_ptr = png_create_info_struct(png_ptr);