From 45195ac482b6fdfdc5d67510b0c7fd9c7b72f405d061f8143d105902778f3402 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Mon, 4 Feb 2013 19:12:13 +0000 Subject: [PATCH] Accepting request 150898 from devel:libraries:c_c++ - gd-autoconf.patch fix up compile file so gd can handle large files on 32 bit (forwarded request 150882 from elvigia) OBS-URL: https://build.opensuse.org/request/show/150898 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gd?expand=0&rev=27 --- gd-autoconf.patch | 34 ++++++++++++++++++++++++++++++++++ gd.changes | 6 ++++++ gd.spec | 16 +++++++++------- 3 files changed, 49 insertions(+), 7 deletions(-) create mode 100644 gd-autoconf.patch diff --git a/gd-autoconf.patch b/gd-autoconf.patch new file mode 100644 index 0000000..51e80ee --- /dev/null +++ b/gd-autoconf.patch @@ -0,0 +1,34 @@ +--- configure.ac.orig ++++ configure.ac +@@ -40,8 +40,9 @@ esac + AC_MSG_RESULT([$os_cygwin]) + AC_SUBST([XTRA_LDFLAGS]) + +-AC_PROG_CC +-AM_PROG_CC_STDC ++AC_PROG_CC_STDC ++AC_USE_SYSTEM_EXTENSIONS ++AC_SYS_LARGEFILE + AC_PROG_INSTALL + AC_PROG_LIBTOOL + AC_PROG_LN_S +--- Makefile.am.orig ++++ Makefile.am +@@ -3,6 +3,8 @@ AUTOMAKE_OPTIONS = foreign 1.7 + + ACLOCAL_AMFLAGS = -I config + ++AM_CPPFLAGS = -include $(top_builddir)/config.h ++ + SUBDIRS = config test + + bin_PROGRAMS = annotate gdparttopng gdtopng gd2copypal gd2topng pngtogd pngtogd2 webpng gd2togif gdcmpgif giftogd2 +@@ -19,7 +21,7 @@ lib_LTLIBRARIES = libgd.la + + libgd_la_SOURCES = gd.c gdfx.c gd_security.c gd_gd.c gd_gd2.c gd_io.c gd_io_dp.c gd_gif_in.c gd_gif_out.c gd_io_file.c gd_io_ss.c gd_jpeg.c gd_png.c gd_ss.c gd_topal.c gd_wbmp.c gdcache.c gdfontg.c gdfontl.c gdfontmb.c gdfonts.c gdfontt.c gdft.c gdhelpers.c gdhelpers.h gdkanji.c gdtables.c gdxpm.c jisx0208.h wbmp.c wbmp.h + +-libgd_la_LDFLAGS = -version-info 2:0:0 $(XTRA_LDFLAGS) ++libgd_la_LDFLAGS = -no-undefined -version-info 2:0:0 $(XTRA_LDFLAGS) + + libgd_la_LIBADD = $(LTLIBICONV) + diff --git a/gd.changes b/gd.changes index ec217d0..efa3514 100644 --- a/gd.changes +++ b/gd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Feb 3 14:57:17 UTC 2013 - crrodriguez@opensuse.org + +- gd-autoconf.patch fix up compile file so gd can handle + large files on 32 bit + ------------------------------------------------------------------- Sun Feb 5 16:31:39 UTC 2012 - jengelh@medozas.de diff --git a/gd.spec b/gd.spec index a480dd0..b0cbde1 100644 --- a/gd.spec +++ b/gd.spec @@ -1,7 +1,7 @@ # # spec file for package gd # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: gd BuildRequires: fontconfig-devel BuildRequires: freetype2-devel @@ -26,7 +27,7 @@ BuildRequires: xorg-x11-libXau-devel BuildRequires: xorg-x11-libXdmcp-devel BuildRequires: xorg-x11-libXpm-devel Provides: gdlib -Obsoletes: gdlib +Obsoletes: gdlib Version: 2.0.36.RC1 Release: 0 Url: http://www.libgd.org/ @@ -43,6 +44,7 @@ Patch6: gd-fontpath.patch Patch7: gd-2.0.36RC1-config.patch Patch8: gd-2.0.36.RC1-ppc64.patch Patch9: gd-png_check_sig.patch +Patch10: gd-autoconf.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -58,10 +60,12 @@ Authors: Thomas Boutell %package devel -Requires: %{name} = %{version} glibc-devel +Requires: %{name} = %{version} +Requires: glibc-devel Summary: Drawing Library for Programs with PNG and JPEG Output Group: Development/Libraries/C and C++ -Requires: zlib-devel libpng-devel +Requires: libpng-devel +Requires: zlib-devel %description devel gd allows code to quickly draw images complete with lines, arcs, text, @@ -85,11 +89,9 @@ Authors: %patch7 %patch8 %patch9 - +%patch10 %build autoreconf -fiv -export CFLAGS="%optflags" -export CPPFLAGS="%{optflags}" %configure \ --with-freetype \ --with-jpeg \