Hello community, here is the log from the commit of package autotrace for openSUSE:Factory checked in at 2014-08-13 17:08:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/autotrace (Old) and /work/SRC/openSUSE:Factory/.autotrace.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "autotrace" Changes: -------- --- /work/SRC/openSUSE:Factory/autotrace/autotrace.changes 2013-03-01 07:11:52.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.autotrace.new/autotrace.changes 2014-08-13 17:08:48.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Aug 12 20:12:25 UTC 2014 - [email protected] + +- Add 0001-fix_input_png.patch: Corrects build failure against libpng15 +- Updated .spec file to use %make_install macro + +------------------------------------------------------------------- New: ---- 0001-fix_input_png.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ autotrace.spec ++++++ --- /var/tmp/diff_new_pack.S9JdH1/_old 2014-08-13 17:08:48.000000000 +0200 +++ /var/tmp/diff_new_pack.S9JdH1/_new 2014-08-13 17:08:48.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package autotrace # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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 @@ -28,7 +28,9 @@ Release: 0 Source: %{name}-%{version}.tar.bz2 Source1: pstoedit.m4 -Patch: %{name}-%{version}-quotefix.diff +Patch0: %{name}-%{version}-quotefix.diff +# PATCH-FIX_OPENSUSE 0001-fix_input_png.patch [email protected] -- fixes build failure against libpng15 +Patch1: 0001-fix_input_png.patch Url: http://autotrace.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: ImageMagick-devel @@ -43,10 +45,6 @@ AutoTrace is now a stand-alone program and can be compiled on any UNIX platform using GCC. -Authors: --------- - Martin Weber <[email protected]> - %package -n libautotrace3 Summary: Library for converting bitmaps to vector graphics Group: System/Libraries @@ -59,10 +57,6 @@ AutoTrace is now a stand-alone program and can be compiled on any UNIX platform using GCC. -Authors: --------- - Martin Weber <[email protected]> - %package devel Summary: Library for converting bitmaps to vector graphics @@ -77,13 +71,10 @@ AutoTrace is now a stand-alone program and can be compiled on any UNIX platform using GCC. -Authors: --------- - Martin Weber <[email protected]> - %prep %setup -q -%patch +%patch0 +%patch1 -p1 %build export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fno-tree-sra" @@ -94,12 +85,9 @@ %{__make} %{?jobs:-j%jobs} %install -make DESTDIR=$RPM_BUILD_ROOT install +%make_install %{__rm} -f %{buildroot}%{_libdir}/*.la -%clean -rm -rf $RPM_BUILD_ROOT - %post -n libautotrace3 -p /sbin/ldconfig %postun -n libautotrace3 -p /sbin/ldconfig ++++++ 0001-fix_input_png.patch ++++++ diff -rupN autotrace-0.31.1.old/input-png.c autotrace-0.31.1/input-png.c --- autotrace-0.31.1.old/input-png.c 2002-10-10 13:44:14.000000000 -0700 +++ autotrace-0.31.1/input-png.c 2014-08-12 13:02:26.761764663 -0700 @@ -42,17 +42,17 @@ static png_bytep * read_png(png_structp 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(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 @@ read_png(png_structp png_ptr, png_infop 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); @@ -181,20 +181,10 @@ read_png(png_structp png_ptr, png_infop PNG_BACKGROUND_GAMMA_FILE, 1, 1.0); } else png_set_strip_alpha(png_ptr); + png_set_interlace_handling(png_ptr); png_read_update_info(png_ptr, info_ptr); - - info_ptr->row_pointers = (png_bytepp)png_malloc(png_ptr, - info_ptr->height * 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, - png_get_rowbytes(png_ptr, info_ptr)); - - png_read_image(png_ptr, info_ptr->row_pointers); - info_ptr->valid |= PNG_INFO_IDAT; + png_read_png(png_ptr, info_ptr, PNG_TRANSFORM_IDENTITY, NULL); png_read_end(png_ptr, info_ptr); return png_get_rows(png_ptr, info_ptr); } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
