From 10c857c3cfc8584d7d7fc0f8b058d99bd1c50c5772afa64cfba4882523c9e754 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Mon, 17 Nov 2008 15:50:55 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gd?expand=0&rev=10 --- gd-2.0.36.RC1-ppc64.patch | 13 +++++++++++++ gd.changes | 6 ++++++ gd.spec | 30 +++++++++++++++++++++++------- 3 files changed, 42 insertions(+), 7 deletions(-) create mode 100644 gd-2.0.36.RC1-ppc64.patch diff --git a/gd-2.0.36.RC1-ppc64.patch b/gd-2.0.36.RC1-ppc64.patch new file mode 100644 index 0000000..c823a3f --- /dev/null +++ b/gd-2.0.36.RC1-ppc64.patch @@ -0,0 +1,13 @@ +Index: gd.c +=================================================================== +--- gd.c.orig 2007-11-27 09:30:34.000000000 +0100 ++++ gd.c 2008-11-12 16:13:25.000000000 +0100 +@@ -1895,7 +1895,7 @@ struct seg {int y, xl, xr, dy;}; + /* max depth of stack */ + #define FILL_MAX 1200000 + #define FILL_PUSH(Y, XL, XR, DY) \ +- if (sp=0 && Y+(DY)=0 && Y+(DY)y = Y; sp->xl = XL; sp->xr = XR; sp->dy = DY; sp++;} + + #define FILL_POP(Y, XL, XR, DY) \ diff --git a/gd.changes b/gd.changes index d1b8eef..4365539 100644 --- a/gd.changes +++ b/gd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Nov 12 16:18:34 CET 2008 - crrodriguez@suse.de + +- QA Results: Regression on PPC64 only, detected by PHP test suite, + the system libgd part, fix by IBM + ------------------------------------------------------------------- Mon Mar 10 01:43:39 CET 2008 - crrodriguez@suse.de diff --git a/gd.spec b/gd.spec index 9979285..f8640b9 100644 --- a/gd.spec +++ b/gd.spec @@ -2,9 +2,16 @@ # spec file for package gd (Version 2.0.36.RC1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -19,7 +26,7 @@ Provides: gdlib Obsoletes: gdlib AutoReqProv: on Version: 2.0.36.RC1 -Release: 1 +Release: 52 Url: http://www.libgd.org/ Summary: A Drawing Library for Programs That Use PNG and JPEG Output Source: gd-%{version}.tar.bz2 @@ -29,6 +36,7 @@ Patch2: gd-format.patch Patch3: gd-aliasing.patch Patch6: gd-fontpath.patch Patch7: gd-2.0.36RC1-config.patch +Patch8: gd-2.0.36.RC1-ppc64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -69,9 +77,10 @@ Authors: %patch3 %patch6 %patch7 +%patch8 %build -autoreconf -fi +autoreconf -fiv export CFLAGS="$RPM_OPT_FLAGS" export CPPFLAGS="%{optflags}" %configure \ @@ -81,7 +90,10 @@ export CPPFLAGS="%{optflags}" --with-xpm \ --disable-static \ --with-pic -make +%{__make} %{?jobs:-j%jobs} + +%check +export MALLOC_CHECK_=2 MALLOC_PERTURB_=$((${RANDOM:-256} % 256)) #run test programs cp test/gdtest_wbmp_to_png.png gdtest.png ./gdtest gdtest.png 2>&1 |tee gdtest.log @@ -95,6 +107,7 @@ grep -v "gdtest.png, gdtest.wbmp.*ERROR" gdtest.log | grep ERROR && exit 1 #for f in `find /usr/share/fonts/truetype /usr/X11R6/lib/X11/fonts/truetype -name "*.ttf"` ; do # ./gdtestft $f #done +unset MALLOC_CHECK_ MALLOC_PERTURB_ %install make install DESTDIR=$RPM_BUILD_ROOT @@ -131,6 +144,9 @@ rm -rf $RPM_BUILD_ROOT %exclude %{_libdir}/*.la %changelog +* Wed Nov 12 2008 crrodriguez@suse.de +- QA Results: Regression on PPC64 only, detected by PHP test suite, + the system libgd part, fix by IBM * Mon Mar 10 2008 crrodriguez@suse.de - fix rpm version number, otherwise it wont upgrade later. * Fri Jan 18 2008 anosek@suse.cz @@ -271,7 +287,7 @@ rm -rf $RPM_BUILD_ROOT * Fri May 12 2000 nadvornik@suse.cz - update to 1.8.1 - added BuildRoot -* Tue Oct 12 1999 ro@suse.de +* Mon Oct 11 1999 ro@suse.de - added xpm and ttf support * Sun Oct 10 1999 ro@suse.de - added libpng to neededforbuild @@ -281,7 +297,7 @@ rm -rf $RPM_BUILD_ROOT - ran old prepare_spec on spec file to switch to new prepare_spec. * Thu Sep 09 1999 bs@suse.de - fixed call of Check at the end of %%install section -* Wed Jun 16 1999 ro@suse.de +* Tue Jun 15 1999 ro@suse.de - fixed doc installation * Tue Jun 15 1999 ro@suse.de - update to 1.3