[packages/gd] - fix tests - remove obsolete patch that only breaks stuff now

baggins baggins at pld-linux.org
Tue Feb 13 20:44:59 CET 2018


commit 63ee803fc23eb7a8ca0dab0d8f049a2e2793efbe
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Tue Feb 13 20:44:29 2018 +0100

    - fix tests
    - remove obsolete patch that only breaks stuff now

 gd-2.0.33-BoxBound.patch | 12 ------------
 gd.spec                  |  8 --------
 2 files changed, 20 deletions(-)
---
diff --git a/gd.spec b/gd.spec
index f70c586..57f7919 100644
--- a/gd.spec
+++ b/gd.spec
@@ -22,7 +22,6 @@ Group:		Libraries
 Source0:	https://github.com/libgd/libgd/releases/download/%{name}-%{version}/lib%{name}-%{version}.tar.xz
 # Source0-md5:	8d8d6a6189513ecee6e893b1fb109bf8
 Patch0:		%{name}-fontpath.patch
-Patch1:		%{name}-2.0.33-BoxBound.patch
 Patch2:		%{name}-loop.patch
 Patch3:		%{name}-liq.patch
 URL:		https://libgd.github.io/
@@ -161,7 +160,6 @@ para uso pelos programas que usam a libgd.
 %prep
 %setup -q -n libgd-%{version}
 %patch0 -p1
-%patch1 -p1
 %patch2 -p1
 %patch3 -p1
 
@@ -188,20 +186,14 @@ CFLAGS="%{rpmcflags} -msse -mfpmath=sse"
 %{__make}
 
 %if %{with tests}
-# https://bitbucket.org/libgd/gd-libgd/issue/72/gdimagestringft_bbox-test-fails-on-old (what is the exact reason???)
-XFAIL_TESTS=gdimagestringft/gdimagestringft_bbox
 %ifarch %{ix86}
 # https://github.com/libgd/libgd/issues/359
 XFAIL_TESTS="$XFAIL_TESTS gdimagegrayscale/basic"
-%endif
-%ifarch %{ix86}
 %if %{without sse}
 # 387 arithmetic is inexact, https://github.com/libgd/libgd/issues/242
 XFAIL_TESTS="$XFAIL_TESTS gdimagecopyresampled/bug00201 gdimagerotate/bug00067"
 %endif
 %endif
-# freetype TTF rendering difference?
-XFAIL_TESTS="$XFAIL_TESTS freetype/bug00132"
 export XFAIL_TESTS
 %{__make} check
 %endif
diff --git a/gd-2.0.33-BoxBound.patch b/gd-2.0.33-BoxBound.patch
deleted file mode 100644
index 7fd001d..0000000
--- a/gd-2.0.33-BoxBound.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- libgd-2.1.0/src/gdft.c.orig	2013-07-03 21:36:41.222081534 +0200
-+++ libgd-2.1.0/src/gdft.c	2013-07-04 15:58:51.062639663 +0200
-@@ -1217,7 +1217,8 @@
- 			glyph_min.x = penf.x + slot->metrics.horiBearingX;
- 			glyph_min.y = penf.y - slot->metrics.horiBearingY;
- 
--#if 0
-+#if 1
-+/* this version of glyph_max.x setting fixes problem with too large bounding box */
- 			if (ch == ' ') {      /* special case for trailing space */
- 				glyph_max.x = penf.x + horiAdvance;
- 			} else {
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gd.git/commitdiff/63ee803fc23eb7a8ca0dab0d8f049a2e2793efbe



More information about the pld-cvs-commit mailing list