Pullup ticket #4277 - requested by is

graphics/gd: build fix for e.g. arm

Revisions pulled up:
- graphics/gd/distinfo                                          1.34-1.35
- graphics/gd/patches/patch-src_gd__bmp.c                       1.1-1.2

-------------------------------------------------------------------
   Module Name:	pkgsrc
   Committed By:	dholland
   Date:		Mon Nov 11 20:38:16 UTC 2013

   Modified Files:
   	pkgsrc/graphics/gd: distinfo
   Added Files:
   	pkgsrc/graphics/gd/patches: patch-src_gd__bmp.c

   Log Message:
   Don't use ceill(); it isn't needed here and causes problems. See PR 48334.

   Technically this change should bump PKGREVISION (as it changes the
   binary package ever so slightly for platforms where the ceill() didn't
   cause a build failure) but I'm going to let it slide.


   To generate a diff of this commit:
   cvs rdiff -u -r1.33 -r1.34 pkgsrc/graphics/gd/distinfo
   cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/gd/patches/patch-src_gd__bmp.c

-------------------------------------------------------------------
   Module Name:	pkgsrc
   Committed By:	dholland
   Date:		Mon Nov 11 21:34:40 UTC 2013

   Modified Files:
   	pkgsrc/graphics/gd: distinfo
   	pkgsrc/graphics/gd/patches: patch-src_gd__bmp.c

   Log Message:
   Add upstream report URL per PR 48334.


   To generate a diff of this commit:
   cvs rdiff -u -r1.34 -r1.35 pkgsrc/graphics/gd/distinfo
   cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/gd/patches/patch-src_gd__bmp.c

2 files changed, 22 insertions, 1 deletions

diff --git a/graphics/gd/distinfo b/graphics/gd/distinfo
index f19a9f23eb8..caa516c45f3 100644
--- a/graphics/gd/distinfo
+++ b/graphics/gd/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.33 2013/09/02 21:17:42 adam Exp $
+$NetBSD: distinfo,v 1.33.2.1 2013/12/20 08:45:43 spz Exp $
 
 SHA1 (libgd-2.1.0.tar.xz) = 66c56fc07246b66ba649c83e996fd2085ea2f9e2
 RMD160 (libgd-2.1.0.tar.xz) = 3fcdf88e1ca653ffd40ddba607dbc317ca87bf63
 Size (libgd-2.1.0.tar.xz) = 2004304 bytes
 SHA1 (patch-aa) = 00198349dd9cff60f1f5738524096a251057eb16
 SHA1 (patch-ab) = 300ffacf47d7421fc9efb7b3fd9e93f011de1b4b
+SHA1 (patch-src_gd__bmp.c) = 4db300a26cebae6fb6f14564c5648608d7ed6cc5
diff --git a/graphics/gd/patches/patch-src_gd__bmp.c b/graphics/gd/patches/patch-src_gd__bmp.c
new file mode 100644
index 00000000000..6996a380a13
--- /dev/null
+++ b/graphics/gd/patches/patch-src_gd__bmp.c
@@ -0,0 +1,20 @@
+$NetBSD: patch-src_gd__bmp.c,v 1.2.2.2 2013/12/20 08:45:44 spz Exp $
+
+Don't use ceill(); it isn't remotely needed here (it is probably a
+typo) and causes build failure on platforms where it isn't available.
+See PR 48334.
+
+upstream report:
+https://bitbucket.org/libgd/gd-libgd/issue/98/gd_bmpc-use-of-both-ceil-and-ceill
+
+--- src/gd_bmp.c~	2013-06-25 09:58:23.000000000 +0000
++++ src/gd_bmp.c
+@@ -792,7 +792,7 @@ static int bmp_read_1bit(gdImagePtr im, 
+ 	}
+ 
+ 	/* The line must be divisible by 4, else its padded with NULLs */
+-	padding = ((int)ceill(0.1 * info->width)) % 4;
++	padding = ((int)ceil(0.1 * info->width)) % 4;
+ 	if (padding) {
+ 		padding = 4 - padding;
+ 	}