summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobin Cook2010-07-27 17:00:33 -0500
committerRobin Cook2010-07-27 17:00:33 -0500
commitdaa81a6dc0b4667b990a62b8da04ea13377e996b (patch)
treef91a31eac4536932fe6cc99ad7910c5dbdcaf424
parentf1f3b5c1c72846ddf7e45fbb5b4caa7cd097d888 (diff)
libgdiplus: added PRE_BUILD to apply patch so will build against current libpng
-rw-r--r--libs/libgdiplus/HISTORY4
-rwxr-xr-xlibs/libgdiplus/PRE_BUILD5
-rw-r--r--libs/libgdiplus/libpng-fix.patch21
3 files changed, 30 insertions, 0 deletions
diff --git a/libs/libgdiplus/HISTORY b/libs/libgdiplus/HISTORY
index d2447fea1a..5d444ff47f 100644
--- a/libs/libgdiplus/HISTORY
+++ b/libs/libgdiplus/HISTORY
@@ -1,3 +1,7 @@
+2010-07-27 Robin Cook <rcook@wyrms.net>
+ * PRE_BUILD: added to apply libpng patch
+ http://lists.ximian.com/pipermail/mono-patches/2010-July/174786.html
+
2010-05-08 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 2.6.4
diff --git a/libs/libgdiplus/PRE_BUILD b/libs/libgdiplus/PRE_BUILD
new file mode 100755
index 0000000000..85c73bc07c
--- /dev/null
+++ b/libs/libgdiplus/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+
+cd $SOURCE_DIRECTORY &&
+
+patch -p2 < $SPELL_DIRECTORY/libpng-fix.patch
diff --git a/libs/libgdiplus/libpng-fix.patch b/libs/libgdiplus/libpng-fix.patch
new file mode 100644
index 0000000000..eeca69f5ed
--- /dev/null
+++ b/libs/libgdiplus/libpng-fix.patch
@@ -0,0 +1,21 @@
+-- trunk/libgdiplus/src/pngcodec.c 2010-07-07 21:08:33 UTC (rev 160025)
++++ trunk/libgdiplus/src/pngcodec.c 2010-07-07 21:14:27 UTC (rev 160026)
+@@ -352,7 +352,7 @@
+ info_ptr->palette[i].blue,
+ info_ptr->palette[i].green,
+ info_ptr->palette[i].red,
+-#if PNG_LIBPNG_VER > 10243
++#if PNG_LIBPNG_VER > 10399
+ info_ptr->trans_alpha [i]); /* alpha */
+ #else
+ info_ptr->trans[i]); /* alpha */
+@@ -422,7 +422,7 @@
+ }
+
+ if ((color_type == PNG_COLOR_TYPE_GRAY) && (bit_depth < 8)) {
+-#if PNG_LIBPNG_VER > 10243
++#if PNG_LIBPNG_VER > 10399
+ png_set_expand_gray_1_2_4_to_8 (png_ptr);
+ #else
+ png_set_gray_1_2_4_to_8(png_ptr);
+