commit 1c82da1450fb4bca3602247955db2bc51469ecb0
Author: Jakub Bogusz <[email protected]>
Date: Fri Mar 22 20:53:43 2013 +0100
- added am patch (fixes build with automake 1.13)
- added libpng patch (fixes build with libpng 1.5+)
- release 8
autotrace-am.patch | 11 ++++++++++
autotrace-libpng.patch | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++
autotrace.spec | 6 +++++-
3 files changed, 74 insertions(+), 1 deletion(-)
---
diff --git a/autotrace.spec b/autotrace.spec
index 58412a7..acdcc4f 100644
--- a/autotrace.spec
+++ b/autotrace.spec
@@ -2,7 +2,7 @@ Summary: AutoTrace - convert bitmap to vector graphics
Summary(pl.UTF-8): AutoTrace - konwerter grafiki rastrowej do wektorowej
Name: autotrace
Version: 0.31.1
-Release: 7
+Release: 8
License: GPL v2+
Group: Applications/Graphics
Source0:
http://downloads.sourceforge.net/autotrace/%{name}-%{version}.tar.gz
@@ -11,6 +11,8 @@ Patch0: %{name}-link.patch
Patch1: %{name}-aclocal.patch
Patch2: %{name}-am18.patch
Patch3: %{name}-magick6.patch
+Patch4: %{name}-am.patch
+Patch5: %{name}-libpng.patch
URL: http://autotrace.sourceforge.net/
BuildRequires: ImageMagick-devel >= 1:6.2.4.0
BuildRequires: autoconf
@@ -66,6 +68,8 @@ Biblioteka statyczna AutoTrace.
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
+%patch5 -p1
%build
%{__libtoolize}
diff --git a/autotrace-am.patch b/autotrace-am.patch
new file mode 100644
index 0000000..b84067a
--- /dev/null
+++ b/autotrace-am.patch
@@ -0,0 +1,11 @@
+--- autotrace-0.31.1/configure.in.orig 2013-03-22 20:04:12.391947441 +0100
++++ autotrace-0.31.1/configure.in 2013-03-22 20:05:18.201944690 +0100
+@@ -34,7 +34,7 @@
+
+ AM_MAINTAINER_MODE
+
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+
+ AC_PROG_CPP
+ AC_PROG_RANLIB
diff --git a/autotrace-libpng.patch b/autotrace-libpng.patch
new file mode 100644
index 0000000..0009317
--- /dev/null
+++ b/autotrace-libpng.patch
@@ -0,0 +1,58 @@
+--- autotrace-0.31.1/input-png.c.orig 2002-10-10 22:44:14.000000000 +0200
++++ autotrace-0.31.1/input-png.c 2013-03-22 20:20:49.835238916 +0100
+@@ -42,17 +42,17 @@
+
+ static void handle_warning(png_structp png, const at_string message) {
+ LOG1("PNG warning: %s", message);
+- at_exception_warning((at_exception_type *)png->error_ptr,
++ at_exception_warning((at_exception_type *)png_get_error_ptr(png),
+ message);
+- /* at_exception_fatal((at_exception_type *)at_png->error_ptr,
++ /* at_exception_fatal((at_exception_type *)png_get_error_ptr(at_png),
+ "PNG warning"); */
+ }
+
+ static void handle_error(png_structp png, const at_string message) {
+ LOG1("PNG error: %s", message);
+- at_exception_fatal((at_exception_type *)png->error_ptr,
++ at_exception_fatal((at_exception_type *)png_get_error_ptr(png),
+ message);
+- /* at_exception_fatal((at_exception_type *)at_png->error_ptr,
++ /* at_exception_fatal((at_exception_type *)png_get_error_ptr(at_png),
+ "PNG error"); */
+
+ }
+@@ -157,8 +157,8 @@
+
+ png_set_strip_16(png_ptr);
+ png_set_packing(png_ptr);
+- if ((png_ptr->bit_depth < 8) ||
+- (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE) ||
++ if ((png_get_bit_depth(png_ptr, info_ptr) < 8) ||
++ (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_PALETTE) ||
+ (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)))
+ png_set_expand(png_ptr);
+
+@@ -184,17 +184,16 @@
+ png_read_update_info(png_ptr, info_ptr);
+
+
+- info_ptr->row_pointers = (png_bytepp)png_malloc(png_ptr,
+- info_ptr->height *
sizeof(png_bytep));
++ png_set_rows(png_ptr, info_ptr, (png_bytepp)png_malloc(png_ptr,
++
png_get_image_height(png_ptr, info_ptr) * sizeof(png_bytep)));
+ #ifdef PNG_FREE_ME_SUPPORTED
+ info_ptr->free_me |= PNG_FREE_ROWS;
+ #endif
+- for (row = 0; row < (int)info_ptr->height; row++)
+- info_ptr->row_pointers[row] = (png_bytep)png_malloc(png_ptr,
++ for (row = 0; row < (int)png_get_image_height(png_ptr, info_ptr); row++)
++ png_get_rows(png_ptr, info_ptr)[row] =
(png_bytep)png_malloc(png_ptr,
+
png_get_rowbytes(png_ptr, info_ptr));
+
+- png_read_image(png_ptr, info_ptr->row_pointers);
+- info_ptr->valid |= PNG_INFO_IDAT;
++ png_read_image(png_ptr, png_get_rows(png_ptr, info_ptr));
+ png_read_end(png_ptr, info_ptr);
+ return png_get_rows(png_ptr, info_ptr);
+ }
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/autotrace.git/commitdiff/1c82da1450fb4bca3602247955db2bc51469ecb0
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
