commit a2900c15f0bd9e90d37ec61ec53e64f95543ccd5
Author: Jakub Bogusz <qbo...@pld-linux.org>
Date: Wed Apr 24 22:25:22 2024 +0200
- new URL, updated to 0.31.10
autotrace-CVE-2013-1953.patch | 12 ---
autotrace-CVE-2016-7392.patch | 16 ----
autotrace-CVE-2019-19004.patch | 17 -----
autotrace-CVE-2019-19005.patch | 35 ---------
autotrace-aclocal.patch | 163 -----------------------------------------
autotrace-am.patch | 11 ---
autotrace-am18.patch | 11 ---
autotrace-libpng.patch | 72 ------------------
autotrace-link.patch | 57 ++++++--------
autotrace-magick6.patch | 14 ----
autotrace.spec | 57 +++++++-------
11 files changed, 47 insertions(+), 418 deletions(-)
---
diff --git a/autotrace.spec b/autotrace.spec
index 693eb09..ea4beb2 100644
--- a/autotrace.spec
+++ b/autotrace.spec
@@ -1,30 +1,27 @@
Summary: AutoTrace - convert bitmap to vector graphics
Summary(pl.UTF-8): AutoTrace - konwerter grafiki rastrowej do wektorowej
Name: autotrace
-Version: 0.31.1
-Release: 18
+Version: 0.31.10
+Release: 1
License: GPL v2+
Group: Applications/Graphics
-Source0:
http://downloads.sourceforge.net/autotrace/%{name}-%{version}.tar.gz
-# Source0-md5: 54eabbb38d2076ded6d271e1ee4d0783
+#Source0Download: https://github.com/autotrace/autotrace/releases
+Source0:
https://github.com/autotrace/autotrace/archive/%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: 3078d2530a65f28c31c89974671ef02a
Patch0: %{name}-link.patch
-Patch1: %{name}-aclocal.patch
-Patch2: %{name}-am18.patch
-Patch3: %{name}-magick6.patch
-Patch4: %{name}-am.patch
-Patch5: %{name}-libpng.patch
-Patch6: %{name}-CVE-2013-1953.patch
-Patch7: %{name}-CVE-2016-7392.patch
-Patch8: %{name}-CVE-2019-19004.patch
-Patch9: %{name}-CVE-2019-19005.patch
-URL: http://autotrace.sourceforge.net/
-BuildRequires: ImageMagick-devel >= 1:6.2.4.0
-BuildRequires: autoconf
+URL: https://autotrace.sourceforge.net/
+BuildRequires: ImageMagick-devel >= 1:7.0.1
+BuildRequires: autoconf >= 2.50
BuildRequires: automake
-BuildRequires: libtool
+BuildRequires: gettext-tools >= 0.22.5
+BuildRequires: glib2-devel >= 2.0
+BuildRequires: intltool >= 0.50.1
+BuildRequires: libtool >= 2:2
BuildRequires: libpng-devel >= 1.0.6
BuildRequires: ming-devel
+BuildRequires: pkgconfig
BuildRequires: pstoedit-devel >= 3.33-4
+BuildRequires: sed >= 4.0
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -43,7 +40,8 @@ Summary: AutoTrace library development files
Summary(pl.UTF-8): Pliki dla programistów używających biblioteki AutoTrace
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
-Requires: ImageMagick-devel >= 1:6.2.4.0
+Requires: ImageMagick-devel >= 1:7.0.1
+Requires: glib2-devel >= 2.0
Requires: libpng-devel >= 1.0.6
Requires: ming-devel
Requires: pstoedit-devel >= 3.33-4
@@ -69,19 +67,14 @@ Biblioteka statyczna AutoTrace.
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
+
+%{__sed} -i -e 's,po/Makefile.in ,,' configure.ac
%build
+%{__gettextize}
+%{__intltoolize}
%{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
%{__autoconf}
%{__autoheader}
%{__automake}
@@ -98,15 +91,17 @@ rm -rf $RPM_BUILD_ROOT
# obsoleted by pkg-config
%{__rm} $RPM_BUILD_ROOT%{_libdir}/libautotrace.la
+%find_lang %{name}
+
%clean
rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
-%files
+%files -f %{name}.lang
%defattr(644,root,root,755)
-%doc AUTHORS NEWS README THANKS
+%doc AUTHORS NEWS README.md THANKS TODO
%attr(755,root,root) %{_bindir}/autotrace
%attr(755,root,root) %{_libdir}/libautotrace.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libautotrace.so.3
@@ -114,10 +109,8 @@ rm -rf $RPM_BUILD_ROOT
%files devel
%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/autotrace-config
%attr(755,root,root) %{_libdir}/libautotrace.so
%{_includedir}/autotrace
-%{_aclocaldir}/autotrace.m4
%{_pkgconfigdir}/autotrace.pc
%files static
diff --git a/autotrace-CVE-2013-1953.patch b/autotrace-CVE-2013-1953.patch
deleted file mode 100644
index 38d7eae..0000000
--- a/autotrace-CVE-2013-1953.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up autotrace-0.31.1/input-bmp.c.orig autotrace-0.31.1/input-bmp.c
---- autotrace-0.31.1/input-bmp.c.orig 2002-10-10 22:44:08.000000000 +0200
-+++ autotrace-0.31.1/input-bmp.c 2013-06-28 10:24:58.336056959 +0200
-@@ -166,7 +166,7 @@ input_bmp_reader (at_string filename,
- /* 36 */
- Maps = 4;
- }
-- else if (Bitmap_File_Head.biSize <= 64) /* Probably OS/2 2.x */
-+ else if (Bitmap_File_Head.biSize >= 40 && Bitmap_File_Head.biSize <= 64) /*
Probably OS/2 2.x */
- {
- if (!ReadOK (fd, buffer, Bitmap_File_Head.biSize - 4))
- {
diff --git a/autotrace-CVE-2016-7392.patch b/autotrace-CVE-2016-7392.patch
deleted file mode 100644
index 183320d..0000000
--- a/autotrace-CVE-2016-7392.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Subject: Fix heap-based buffer overflow in pstoedit_suffix_table_init
-ID: CVE-2016-7392
-Author: unknown (taken from DLA-621-1)
-Bug-Debian: https://bugs.debian.org/837599
-
---- a/output-pstoedit.c
-+++ b/output-pstoedit.c
-@@ -84,7 +84,7 @@
- dd_tmp = dd_start;
- while (dd_tmp->symbolicname)
- dd_tmp++;
-- XMALLOC(pstoedit_suffix_table, sizeof(char *) * 2 * (dd_tmp - dd_start)
+ 1);
-+ XMALLOC(pstoedit_suffix_table, sizeof(char *) * (2 * (dd_tmp -
dd_start) + 1));
-
- #if defined (OUTPUT_PSTOEDIT_DEBUG) && defined(__GNUC__)
- fprintf(stderr, "OUTPUT PSTOEDIT BACKEND DEBUG(%s)\n", __FUNCTION__);
diff --git a/autotrace-CVE-2019-19004.patch b/autotrace-CVE-2019-19004.patch
deleted file mode 100644
index 7121b94..0000000
--- a/autotrace-CVE-2019-19004.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -urN autotrace-0.31.1.old/input-bmp.c autotrace-0.31.1/input-bmp.c
---- autotrace-0.31.1.old/input-bmp.c 2021-04-30 15:03:16.264446518 +0530
-+++ autotrace-0.31.1/input-bmp.c 2021-04-30 15:06:14.682051209 +0530
-@@ -220,6 +220,13 @@
- * word length (32 bits == 4 bytes)
- */
-
-+ unsigned long overflowTest = Bitmap_Head.biWidth * Bitmap_Head.biBitCnt;
-+ if (overflowTest / Bitmap_Head.biWidth != Bitmap_Head.biBitCnt) {
-+ LOG("Error reading BMP file header. Width is too large\n");
-+ at_exception_fatal(&exp, "Error reading BMP file header. Width is too
large");
-+ goto cleanup;
-+ }
-+
- rowbytes= ( (Bitmap_Head.biWidth * Bitmap_Head.biBitCnt - 1) / 32) * 4 + 4;
-
- #ifdef DEBUG
diff --git a/autotrace-CVE-2019-19005.patch b/autotrace-CVE-2019-19005.patch
deleted file mode 100644
index cb0ffc7..0000000
--- a/autotrace-CVE-2019-19005.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -urN autotrace-0.31.1.old/xstd.h autotrace-0.31.1/xstd.h
---- autotrace-0.31.1.old/xstd.h 2002-10-11 02:14:17.000000000 +0530
-+++ autotrace-0.31.1/xstd.h 2021-04-30 15:22:25.853589944 +0530
-@@ -20,6 +20,7 @@
- #define XMALLOC(new_mem, size) \
- do \
- { \
-+ assert(size); \
- new_mem = (at_address) malloc (size); \
- assert(new_mem); \
- } while (0)
-@@ -28,6 +29,7 @@
- #define XCALLOC(new_mem, size) \
- do \
- { \
-+ assert(size); \
- new_mem = (at_address) calloc (size, 1); \
- assert(new_mem); \
- } while (0)
-@@ -55,6 +57,7 @@
- #define XMALLOC(new_mem, size) \
- do \
- { \
-+ assert(size); \
- (at_address&)(new_mem) = (at_address) malloc (size); \
- assert(new_mem); \
- } while (0)
-@@ -63,6 +66,7 @@
- #define XCALLOC(new_mem, sizex) \
- do \
- { \
-+ assert(size); \
- (at_address&)(new_mem) = (void *) calloc (sizex, 1); \
- assert(new_mem); \
- } while (0)
diff --git a/autotrace-aclocal.patch b/autotrace-aclocal.patch
deleted file mode 100644
index bb6ff52..0000000
--- a/autotrace-aclocal.patch
+++ /dev/null
@@ -1,163 +0,0 @@
---- autotrace-0.31.1/acinclude.m4.orig Thu Jan 1 01:00:00 1970
-+++ autotrace-0.31.1/acinclude.m4 Wed Dec 18 22:37:33 2002
-@@ -0,0 +1,160 @@
-+# a macro to get the libs/cflags for libpstoedit
-+# Copyed from gdk-pixbuf.m4
-+
-+dnl AM_PATH_PSTOEDIT([MINIMUM-VERSION, [ACTION-IF-FOUND [,
ACTION-IF-NOT-FOUND]])
-+dnl Test to see if libpstoedit is installed, and define PSTOEDIT_CFLAGS, LIBS
-+dnl
-+AC_DEFUN(AM_PATH_PSTOEDIT,
-+[dnl
-+dnl Get the cflags and libraries from the pstoedit-config script
-+dnl
-+AC_ARG_WITH(pstoedit-prefix,[ --with-pstoedit-prefix=PFX Prefix where
Pstoedit is installed (optional)],
-+ pstoedit_prefix="$withval", pstoedit_prefix="")
-+AC_ARG_WITH(pstoedit-exec-prefix,[ --with-pstoedit-exec-prefix=PFX Exec
prefix where Pstoedit is installed (optional)],
-+ pstoedit_exec_prefix="$withval", pstoedit_exec_prefix="")
-+AC_ARG_ENABLE(pstoedittest, [ --disable-pstoedittest Do not try to
compile and run a test Pstoedit program],
-+ , enable_pstoedittest=yes)
-+
-+ if test x$pstoedit_exec_prefix != x ; then
-+ pstoedit_args="$pstoedit_args --exec_prefix=$pstoedit_exec_prefix"
-+ if test x${PSTOEDIT_CONFIG+set} != xset ; then
-+ PSTOEDIT_CONFIG=$pstoedit_exec_prefix/bin/pstoedit-config
-+ fi
-+ fi
-+ if test x$pstoedit_prefix != x ; then
-+ pstoedit_args="$pstoedit_args --prefix=$pstoedit_prefix"
-+ if test x${PSTOEDIT_CONFIG+set} != xset ; then
-+ PSTOEDIT_CONFIG=$pstoedit_prefix/bin/pstoedit-config
-+ fi
-+ fi
-+
-+ AC_PATH_PROG(PSTOEDIT_CONFIG, pstoedit-config, no)
-+ min_pstoedit_version=ifelse([$1], ,3.32.0,$1)
-+ AC_MSG_CHECKING(for PSTOEDIT - version >= $min_pstoedit_version)
-+ no_pstoedit=""
-+ if test "$PSTOEDIT_CONFIG" = "no" ; then
-+ no_pstoedit=yes
-+ else
-+ PSTOEDIT_CFLAGS=`$PSTOEDIT_CONFIG $pstoedit_args --cflags`
-+ PSTOEDIT_LIBS=`$PSTOEDIT_CONFIG $pstoedit_args --libs`
-+
-+ pstoedit_major_version=`$PSTOEDIT_CONFIG $pstoedit_args --version | \
-+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-+ pstoedit_minor_version=`$PSTOEDIT_CONFIG $pstoedit_args --version | \
-+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-+ pstoedit_micro_version=`$PSTOEDIT_CONFIG $pstoedit_args --version | \
-+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-+ if test "x$enable_pstoedittest" = "xyes" ; then
-+ ac_save_CFLAGS="$CFLAGS"
-+ ac_save_LIBS="$LIBS"
-+ CFLAGS="$CFLAGS $PSTOEDIT_CFLAGS"
-+ LIBS="$PSTOEDIT_LIBS $LIBS"
-+dnl
-+dnl Now check if the installed PSTOEDIT is sufficiently new. (Also sanity
-+dnl checks the results of pstoedit-config to some extent
-+dnl
-+ rm -f conf.pstoedittest
-+ AC_TRY_RUN([
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <pstoedit/pstoedit.h>
-+
-+char*
-+my_strdup (char *str)
-+{
-+ char *new_str;
-+
-+ if (str)
-+ {
-+ new_str = malloc ((strlen (str) + 1) * sizeof(char));
-+ strcpy (new_str, str);
-+ }
-+ else
-+ new_str = NULL;
-+
-+ return new_str;
-+}
-+
-+int main ()
-+{
-+ int major, minor, micro;
-+ char *tmp_version;
-+
-+ system ("touch conf.pstoedittest");
-+
-+ /* HP/UX 9 (%@#!) writes to sscanf strings */
-+ tmp_version = my_strdup("$min_pstoedit_version");
-+ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
-+ printf("%s, bad version string\n", "$min_pstoedit_version");
-+ exit(1);
-+ }
-+
-+ if (($pstoedit_major_version > major) ||
-+ (($pstoedit_major_version == major) && ($pstoedit_minor_version >
minor)) ||
-+ (($pstoedit_major_version == major) && ($pstoedit_minor_version ==
minor) && ($pstoedit_micro_version >= micro)))
-+ {
-+ return 0;
-+ }
-+ else
-+ {
-+ printf("\n*** 'pstoedit-config --version' returned %d.%d.%d, but the
minimum version\n", $pstoedit_major_version, $pstoedit_minor_version,
$pstoedit_micro_version);
-+ printf("*** of PSTOEDIT required is %d.%d.%d. If pstoedit-config is
correct, then it is\n", major, minor, micro);
-+ printf("*** best to upgrade to the required version.\n");
-+ printf("*** If pstoedit-config was wrong, set the environment variable
PSTOEDIT_CONFIG\n");
-+ printf("*** to point to the correct copy of pstoedit-config, and remove
the file\n");
-+ printf("*** config.cache before re-running configure\n");
-+ return 1;
-+ }
-+}
-+],, no_pstoedit=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-+ CFLAGS="$ac_save_CFLAGS"
-+ LIBS="$ac_save_LIBS"
-+ fi
-+ fi
-+ if test "x$no_pstoedit" = x ; then
-+ AC_MSG_RESULT(yes)
-+ ifelse([$2], , :, [$2])
-+ else
-+ AC_MSG_RESULT(no)
-+ if test "$PSTOEDIT_CONFIG" = "no" ; then
-+ echo "*** The pstoedit-config script installed by PSTOEDIT could not
be found"
-+ echo "*** If PSTOEDIT was installed in PREFIX, make sure PREFIX/bin is
in"
-+ echo "*** your path, or set the PSTOEDIT_CONFIG environment variable
to the"
-+ echo "*** full path to pstoedit-config."
-+ else
-+ if test -f conf.pstoedittest ; then
-+ :
-+ else
-+ echo "*** Could not run PSTOEDIT test program, checking why..."
-+ CFLAGS="$CFLAGS $PSTOEDIT_CFLAGS"
-+ LIBS="$LIBS $PSTOEDIT_LIBS"
-+ AC_TRY_LINK([
-+#include <stdio.h>
-+#include <pstoedit/pstoedit.h>
-+], [ return 0; ],
-+ [ echo "*** The test program compiled, but did not run. This usually
means"
-+ echo "*** that the run-time linker is not finding PSTOEDIT or
finding the wrong"
-+ echo "*** version of PSTOEDIT. If it is not finding PSTOEDIT,
you'll need to set your"
-+ echo "*** LD_LIBRARY_PATH environment variable, or edit
/etc/ld.so.conf to point"
-+ echo "*** to the installed location Also, make sure you have run
ldconfig if that"
-+ echo "*** is required on your system"
-+ echo "***"
-+ echo "*** If you have an old version installed, it is best to
remove it, although"
-+ echo "*** you may also be able to get things to work by modifying
LD_LIBRARY_PATH"],
-+ [ echo "*** The test program failed to compile or link. See the file
config.log for the"
-+ echo "*** exact error that occured. This usually means PSTOEDIT was
incorrectly installed"
-+ echo "*** or that you have moved PSTOEDIT since it was installed.
In the latter case, you"
-+ echo "*** may want to edit the pstoedit-config script:
$PSTOEDIT_CONFIG" ])
-+ CFLAGS="$ac_save_CFLAGS"
-+ LIBS="$ac_save_LIBS"
-+ fi
-+ fi
-+ PSTOEDIT_CFLAGS=""
-+ PSTOEDIT_LIBS=""
-+ ifelse([$3], , :, [$3])
-+ fi
-+ AC_SUBST(PSTOEDIT_CFLAGS)
-+ AC_SUBST(PSTOEDIT_LIBS)
-+ rm -f conf.pstoedittest
-+])
diff --git a/autotrace-am.patch b/autotrace-am.patch
deleted file mode 100644
index b84067a..0000000
--- a/autotrace-am.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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-am18.patch b/autotrace-am18.patch
deleted file mode 100644
index e97a809..0000000
--- a/autotrace-am18.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- autotrace-0.31.1/autotrace.m4.orig 2002-10-10 22:44:12.000000000 +0200
-+++ autotrace-0.31.1/autotrace.m4 2003-12-28 19:17:21.392670840 +0100
-@@ -4,7 +4,7 @@
- dnl AM_PATH_AUTOTRACE([MINIMUM-VERSION, [ACTION-IF-FOUND [,
ACTION-IF-NOT-FOUND]])
- dnl Test to see if libautotrace is installed, and define AUTOTRACE_CFLAGS,
LIBS
- dnl
--AC_DEFUN(AM_PATH_AUTOTRACE,
-+AC_DEFUN([AM_PATH_AUTOTRACE],
- [dnl
- dnl Get the cflags and libraries from the autotrace-config script
- dnl
diff --git a/autotrace-libpng.patch b/autotrace-libpng.patch
deleted file mode 100644
index 5504fd0..0000000
--- a/autotrace-libpng.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 56103b05af8a9d67ce158eceab9f7c984b38eabb Mon Sep 17 00:00:00 2001
-From: Jon Ciesla <limburg...@gmail.com>
-Date: Fri, 2 Mar 2012 09:39:36 -0600
-Subject: [PATCH 3/3] libpng fix.
-
----
- input-png.c | 22 ++++++----------------
- 1 file changed, 6 insertions(+), 16 deletions(-)
-
-diff --git a/input-png.c b/input-png.c
-index 77b96f1..b631f07 100644
---- a/input-png.c
-+++ b/input-png.c
-@@ -42,17 +42,17 @@ static png_bytep * read_png(png_structp png_ptr, png_infop
info_ptr, at_input_op
-
- 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 @@ read_png(png_structp png_ptr, png_infop info_ptr,
at_input_opts_type * opts)
-
- 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 info_ptr,
at_input_opts_type * opts)
- 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);
- }
---
-1.7.11.2
-
diff --git a/autotrace-link.patch b/autotrace-link.patch
index 42fe867..5fcbc25 100644
--- a/autotrace-link.patch
+++ b/autotrace-link.patch
@@ -1,48 +1,35 @@
---- autotrace-0.31.1/Makefile.am.orig Wed Oct 30 17:51:46 2002
-+++ autotrace-0.31.1/Makefile.am Wed Dec 18 22:31:46 2002
-@@ -105,6 +105,12 @@
- exception.h
+--- autotrace-0.31.10/Makefile.am.orig 2024-04-24 20:13:30.403400098 +0200
++++ autotrace-0.31.10/Makefile.am 2024-04-24 20:21:31.257461755 +0200
+@@ -128,6 +128,15 @@ autotraceinclude_HEADERS=\
+ src/color.h
libautotrace_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+libautotrace_la_LIBADD = \
-+ $(MAGICK_LDFLAGS) \
-+ $(LIBPNG_LDFLAGS) \
-+ $(LIBSWF_LDFLAGS) \
++ $(GRAPHICSMAGICK_LIBS) \
++ $(IMAGEMAGICK_LIBS) \
++ $(LIBPNG_LIBS) \
++ $(LIBSWF_LIBS) \
+ $(LIBPSTOEDIT_LIBS) \
++ $(GLIB2_LIBS) \
++ $(INTLLIBS) \
+ -lm
#
# noinst_HEADERS: headers shared between lib and bin.
-@@ -127,12 +133,7 @@
+@@ -145,15 +154,8 @@ AM_CPPFLAGS = $(GRAPHICSMAGICK_CFLAGS) $
- INCLUDES = $(MAGICK_CFLAGS) $(LIBPSTOEDIT_CFLAGS)
autotrace_LDADD = \
-- libautotrace.la \
-- $(MAGICK_LDFLAGS) \
-- $(LIBPNG_LDFLAGS) \
-- $(LIBSWF_LDFLAGS) \
+ libautotrace.la \
+- $(GRAPHICSMAGICK_LIBS) \
+- $(IMAGEMAGICK_LIBS) \
+- $(LIBPNG_LIBS) \
+- $(LIBSWF_LIBS) \
- $(LIBPSTOEDIT_LIBS) \
+- $(GLIB2_LIBS) \
+ $(POPT_LIBS) \
+- $(INTLLIBS) \
- -lm
-+ libautotrace.la
-
- m4datadir = $(datadir)/aclocal
- m4data_DATA = autotrace.m4
---- autotrace-0.31.1/autotrace-config.af.orig 2002-10-10 22:43:58.000000000
+0200
-+++ autotrace-0.31.1/autotrace-config.af 2022-04-11 19:26:53.462381571
+0200
-@@ -16,4 +16,4 @@ AF_ARG_VERSION(@VERSION@)
- #dummy because this should always be selected
- AF_LIBRARY(autotrace)
- AF_DEF_CFLAGS([-I@includedir@])
--AF_DEF_LIBS([-L@libdir@ -lautotrace @LIBPNG_LDFLAGS@ @MAGICK_LDFLAGS@
@LIBSWF_LDFLAGS@ @LIBPSTOEDIT_LIBS@])
-+AF_DEF_LIBS([-lautotrace @LIBPNG_LDFLAGS@ @MAGICK_LDFLAGS@ @LIBSWF_LDFLAGS@
@LIBPSTOEDIT_LIBS@])
---- autotrace-0.31.1/autotrace-config.in.orig 2002-11-08 19:18:31.000000000
+0100
-+++ autotrace-0.31.1/autotrace-config.in 2022-04-11 19:27:10.912287037
+0200
-@@ -205,7 +205,7 @@ fi
- #dummy because this should always be selected
-
- af_cflags="$af_cflags -I@includedir@"
--af_libs="-L@libdir@ -lautotrace @LIBPNG_LDFLAGS@ @MAGICK_LDFLAGS@
@LIBSWF_LDFLAGS@ @LIBPSTOEDIT_LIBS@ $af_libs"
-+af_libs="-lautotrace @LIBPNG_LDFLAGS@ @MAGICK_LDFLAGS@ @LIBSWF_LDFLAGS@
@LIBPSTOEDIT_LIBS@ $af_libs"
-
-
++ $(nil)
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA= autotrace.pc
diff --git a/autotrace-magick6.patch b/autotrace-magick6.patch
deleted file mode 100644
index 121f9e3..0000000
--- a/autotrace-magick6.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- autotrace-0.31.1/configure.in.orig 2002-11-08 18:49:23.000000000 +0100
-+++ autotrace-0.31.1/configure.in 2004-06-03 01:04:05.729615472 +0200
-@@ -80,7 +80,10 @@
- changequote([,])dnl
- MAGICK_MAJOR_VERSION_CHECK=`expr $MAGICK_MAJOR_VERSION
\>= 5`
- MAGICK_MINOR_VERSION_CHECK=`expr $MAGICK_MINOR_VERSION
\>= 2`
-- dnl I don't consider ImageMagick 6.x.
-+ dnl consider ImageMagick 6.x
-+ if test "$MAGICK_MAJOR_VERSION_CHECK" = 1 ; then
-+ MAGICK_MINOR_VERSION_CHECK="1"
-+ fi
- if test "$MAGICK_VERSION" = "5.2.0" \
- || test "$MAGICK_MAJOR_VERSION_CHECK" = 0 \
- || test "$MAGICK_MINOR_VERSION_CHECK" = 0 ; then
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/autotrace.git/commitdiff/a2900c15f0bd9e90d37ec61ec53e64f95543ccd5
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
