up to 2.1-rc1

diff --git a/format-security.patch b/format-security.patch
deleted file mode 100644 (file)
index 64e358f..0000000
--- a/format-security.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- gd-2.0.35/gdtestft.c.orig  2012-12-12 13:17:03.460823690 +0100
-+++ gd-2.0.35/gdtestft.c       2012-12-12 13:17:31.160822713 +0100
-@@ -74,7 +74,7 @@
-     gdImageStringFT ((gdImagePtr) NULL, &brect[0], 0, f, sz, angle, 0, 0, s);
-   if (err)
-     {
--      fprintf (stderr, err);
-+      fprintf (stderr, "%s", err);
-       return 1;
-     }
- 
-@@ -146,21 +146,21 @@
-   err = gdImageStringFT (im, NULL, blue, f, sz, angle, x, y, s);
-   if (err)
-     {
--      fprintf (stderr, err);
-+      fprintf (stderr, "%s", err);
-       return 1;
-     }
-   /* Without antialiasing (negative color value) */
-   err = gdImageStringFT (im, NULL, -blue, f, sz, angle, sx + x, y, s);
-   if (err)
-     {
--      fprintf (stderr, err);
-+      fprintf (stderr, "%s", err);
-       return 1;
-     }
-   /* With antialiasing, and 50% alpha blending (truecolor only) */
-   err = gdImageStringFT (im, NULL, blueAlpha, f, sz, angle, sx * 2 + x, y, s);
-   if (err)
-     {
--      fprintf (stderr, err);
-+      fprintf (stderr, "%s", err);
-       return 1;
-     }
-   /* TBB: Write img to test/fttest.jpg or test/fttest.png */

diff --git a/gd-fontpath.patch b/gd-fontpath.patch
index 8f836ed53bbf45ea312b9136f78274c4432f2355..12c9e786490584853b8baafe0c8985cf1cdd6584 100644 (file)
--- a/gd-fontpath.patch
+++ b/gd-fontpath.patch
@@ -1,11 +1,11 @@
---- gd-2.0.23/gd.h.orig        2004-04-21 23:19:49.000000000 +0200
-+++ gd-2.0.23/gd.h     2004-04-21 23:24:10.433748224 +0200
-@@ -40,7 +40,7 @@
- /* 2.0.23: more Type 1 fonts */
- #ifndef DEFAULT_FONTPATH
- /* default fontpath for unix systems  - whatever happened to standards ! */
--#define DEFAULT_FONTPATH "/usr/X11R6/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/truetype:/usr/X11R6/lib/X11/fonts/TTF:/usr/share/fonts/TrueType:/usr/share/fonts/truetype:/usr/openwin/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/Type1:/usr/lib/X11/fonts/Type1:/usr/openwin/lib/X11/fonts/Type1"
-+#define DEFAULT_FONTPATH "/usr/share/fonts/TTF:/usr/share/fonts/Type1"
+--- libgd-2.1.0-rc1/src/gdft.c~        2013-05-20 22:10:28.000000000 +0300
++++ libgd-2.1.0-rc1/src/gdft.c 2013-05-25 12:47:12.371315588 +0300
+@@ -74,7 +74,7 @@
+ #    define DEFAULT_FONTPATH "/usr/share/fonts/truetype:/System/Library/Fonts:/Library/Fonts"
+ #  else
+    /* default fontpath for unix systems  - whatever happened to standards ! */
+-#    define DEFAULT_FONTPATH "/usr/X11R6/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/truetype:/usr/X11R6/lib/X11/fonts/TTF:/usr/share/fonts/TrueType:/usr/share/fonts/truetype:/usr/openwin/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/Type1:/usr/lib/X11/fonts/Type1:/usr/openwin/lib/X11/fonts/Type1"
++#    define DEFAULT_FONTPATH "/usr/share/fonts/TTF:/usr/share/fonts/Type1"
+ #  endif
  #endif
- #ifndef PATHSEPARATOR
- #define PATHSEPARATOR ":"
+ 

diff --git a/gd.spec b/gd.spec
index 7cdb8d4f5c8f44990e1cf55ad7298d66fd5a1377..a9842dbbc430804acbc7433b979ce0065678a3d3 100644 (file)
--- a/gd.spec
+++ b/gd.spec
@@ -1,19 +1,21 @@
+# TODO
+# - perhaps should rename .spec to libgd and put programs to "gd" and libs to "libgd" package to match upstream project name?
 #
 # Conditional build:
 %bcond_without fontconfig      # without fontconfig support
 %bcond_without xpm             # without XPM support (requires X11 libs)
-#
+
 Summary:       Library for PNG, JPEG creation
 Summary(es.UTF-8):     Biblioteca para manipulación de imágenes
 Summary(pl.UTF-8):     Biblioteka do tworzenia grafiki w formacie PNG, JPEG
 Summary(pt_BR.UTF-8):  Biblioteca para manipulação de imagens
 Name:          gd
-Version:       2.0.35
-Release:       11
+Version:       2.1.0
+Release:       0.rc1.1
 License:       BSD-like
 Group:         Libraries
-Source0:       http://www.libgd.org/releases/%{name}-%{version}.tar.bz2
-# Source0-md5: 6c6c3dbb7bf079e0bb5fbbfd3bb8a71c
+Source0:       https://bitbucket.org/libgd/gd-libgd/downloads/lib%{name}-%{version}-rc1.tar.xz
+# Source0-md5: 5dcd61ada3dea83e59f9fb972bccae55
 Patch0:                %{name}-fontpath.patch
 Patch1:                %{name}-rotate_from_php.patch
 Patch2:                %{name}-2.0.33-BoxBound.patch
@@ -21,7 +23,6 @@ Patch3:               %{name}-2.0.35-AALineThick.patch
 Patch4:                %{name}-2.0.35-overflow.patch
 Patch5:                %{name}-2.0.35-security3.patch
 Patch6:                %{name}-loop.patch
-Patch7:                format-security.patch
 URL:           http://www.libgd.org/
 BuildRequires: autoconf >= 2.54
 BuildRequires: automake
@@ -32,7 +33,9 @@ BuildRequires:        libjpeg-devel
 BuildRequires: libpng-devel >= 2:1.4.0
 BuildRequires: libtiff-devel
 BuildRequires: libtool >= 1:1.4.3
+BuildRequires: tar >= 1:1.22
 %{?with_xpm:BuildRequires:     xorg-lib-libXpm-devel}
+BuildRequires: xz
 BuildRequires: zlib-devel
 Provides:      gd(gif) = %{version}-%{release}
 # versioned by php version rotate_from_php code comes from
@@ -146,21 +149,22 @@ Este pacote inclui vários utilitários para manipulação de arquivos gd
 para uso pelos programas que usam a libgd.
 
 %prep
-%setup -q
+%setup -q -n lib%{name}-%{version}-rc1
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
+#%patch1 -p1 needs refreshing, is there a point?
+cd src
+#%patch2 -p1 check
+#%patch3 -p1 check
+#%patch4 -p1 check
+#%patch5 -p1 check
+#%patch6 -p1 check if still needed
+cd -
 
 # hack to avoid inclusion of -s in --ldflags
-%{__perl} -pi -e 's,\@LDFLAGS\@,,g' config/gdlib-config.in
+%{__sed} -i~ -e 's,@LDFLAGS@,,g' config/gdlib-config.in
 
 # png_check_sig was replaced by png_sig_cmp in libpng
-%{__sed} -i -e 's/if (!png_check_sig (sig, 8))/if (png_sig_cmp(sig, 0, 8))/g' gd_png.c
+#%{__sed} -i~ -e 's/if (!png_check_sig (sig, 8))/if (png_sig_cmp(sig, 0, 8))/g' src/gd_png.c
 
 %build
 %{__libtoolize}
@@ -187,7 +191,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc COPYING index.html
+%doc COPYING ChangeLog NEWS 
 %attr(755,root,root) %{_libdir}/libgd.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libgd.so.2