Accepting request 431287 from home:badshah400:freetype27

Workaround buildfailures with freetype 2.7 by deleting too exact tests

OBS-URL: https://build.opensuse.org/request/show/431287
OBS-URL: https://build.opensuse.org/package/show/graphics/gd?expand=0&rev=31

gd-disable-freetype27-failed-tests.patch

@@ -0,0 +1,31 @@
+Two tests: freetype/bug00132 and gdimagestringft fail with freetype >= 2.7
+for being too exact/strict, as acknowledged by upstream. Let us disable these
+tests for now, as the impact is understood to be "slight". See discussion
+in the issue tracker.
+Issue: https://github.com/libgd/libgd/issues/302
+
+Index: libgd-2.1.1/tests/Makefile.am
+===================================================================
+--- libgd-2.1.1.orig/tests/Makefile.am
++++ libgd-2.1.1/tests/Makefile.am
+@@ -138,7 +138,6 @@ check_PROGRAMS += \
+ 	gdtiled/bug00032
+ endif
+ check_PROGRAMS += \
+-	gdimagestringft/gdimagestringft_bbox \
+ 	gdimagearc/bug00079 \
+ 	gdimageline/gdimageline_aa \
+ 	gdimageline/bug00072 \
+@@ -200,11 +199,6 @@ check_PROGRAMS += \
+ 	tiff/tiff_im2im
+ endif
+ 
+-if HAVE_LIBFREETYPE
+-check_PROGRAMS +=
+-	freetype/bug00132
+-endif
+-
+ LDADD = libgdtest.a ../src/libgd.la
+ AM_CPPFLAGS = -I$(top_srcdir)/src -I $(top_srcdir)/tests/gdtest
+ 
+

gd.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Sep 29 14:06:53 UTC 2016 - badshah400@gmail.com
+
+- Add gd-disable-freetype27-failed-tests.patch: Disable for now
+  tests failing against freetype >= 2.7 for being too exact
+  (gh#libgd/libgd#302). The failures have been understood by
+  upstream to be due to minor differences between test images and
+  those generated when freeetype >= 2.7 is used to build gd.
+
 -------------------------------------------------------------------
 Tue Aug 23 11:16:25 UTC 2016 - pgajdos@suse.com
 

gd.spec

@@ -44,13 +44,14 @@ Patch5:         gd-CVE-2016-5116.patch
 Patch6:         gd-CVE-2016-6132.patch
 Patch7:         gd-CVE-2016-6214.patch
 Patch8:         gd-CVE-2016-6905.patch
+# PATCH-FIX-UPSTREAM gd-disable-freetype27-failed-tests.patch gh#libgd/libgd#302 badshah400@gmail.com -- Disable for now tests failing against freetype >= 2.7 for being too exact.
+Patch9:         gd-disable-freetype27-failed-tests.patch
 BuildRequires:  fontconfig-devel
 BuildRequires:  freetype2-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  libpng-devel
 BuildRequires:  libtiff-devel
 BuildRequires:  libtool
-BuildRequires:  libvpx-devel
 BuildRequires:  pkg-config
 BuildRequires:  xorg-x11-libX11-devel
 BuildRequires:  xorg-x11-libXau-devel
@@ -104,6 +105,7 @@ the formats accepted for inline images by most browsers.
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 %build
 # this file is errorneously forgotten from the tarball