From a3a40b0a806ce11d006b1a791e400389d33e3bc1 Mon Sep 17 00:00:00 2001 From: Jeremy Hansen Date: Tue, 9 Jul 2024 03:06:12 -0700 Subject: [PATCH] graphics/autotrace: Version bump to 3.31.10 + new maintainer Signed-off-by: Willy Sudiarto Raharjo --- graphics/autotrace/README | 12 +-- graphics/autotrace/autotrace.SlackBuild | 23 +++-- graphics/autotrace/autotrace.info | 12 +-- graphics/autotrace/autotrace.patch | 115 ------------------------ graphics/autotrace/slack-desc | 14 +-- 5 files changed, 33 insertions(+), 143 deletions(-) delete mode 100644 graphics/autotrace/autotrace.patch diff --git a/graphics/autotrace/README b/graphics/autotrace/README index 251884c7d2..2c546b1029 100644 --- a/graphics/autotrace/README +++ b/graphics/autotrace/README @@ -1,9 +1,9 @@ -AutoTrace is a utility for converting bitmap into vector graphics and -is a free replacement of CorelTrace & Adobe Streamline. +AutoTrace is a utility for converting bitmap into vector graphics. + Features: - Tracing outline and midline - Color reduction and Despeckling -- Import Formats: BMP, TGA, PNM, PPM, PGM, PBM and those supported - by ImageMagick. -- Export Formats: Postscript, svg,xfig, swf, pstoedit, emf, dxf, -cgm, mif, p2e and sk. +- Supports a lot of input and output formats + +NOTE: AutoTrace will use SBo's graphics/GraphicsMagick if installed, +otherwise it will default to Slackware's stock ImageMagick. diff --git a/graphics/autotrace/autotrace.SlackBuild b/graphics/autotrace/autotrace.SlackBuild index 8f524ee3c3..ef32a8dbe6 100644 --- a/graphics/autotrace/autotrace.SlackBuild +++ b/graphics/autotrace/autotrace.SlackBuild @@ -4,6 +4,7 @@ # # Copyright 2015 Citizen X Clearwater, Florida, USA # Maintainer Citizen X +# Copyright 2024 Jeremy Hansen # All rights reserved. # # @@ -27,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=autotrace -VERSION=${VERSION:-0.31.1} +VERSION=${VERSION:-0.31.10} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -78,11 +79,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ -patch -p1 < $CWD/autotrace.patch -autoreconf -vif +./autogen.sh CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ -LDFLAGS="$( pkg-config --libs MagickWand )" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ @@ -94,14 +93,20 @@ LDFLAGS="$( pkg-config --libs MagickWand )" \ make make install-strip DESTDIR=$PKG -gzip -9 $PKG/usr/man/man*/* + +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la + +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +find $PKG/usr/man -type f -exec gzip -9 {} \; +for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS NEWS README THANKS $PKG/usr/doc/$PRGNAM-$VERSION +cp -a \ + AUTHORS COPYING ChangeLog FAQ NEWS README.md THANKS \ + $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -find $PKG/usr/doc -type f -exec chmod 644 {} \; - -rm -f $PKG/usr/lib*/*.la mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/graphics/autotrace/autotrace.info b/graphics/autotrace/autotrace.info index b820ae4bc7..a10d275db8 100644 --- a/graphics/autotrace/autotrace.info +++ b/graphics/autotrace/autotrace.info @@ -1,10 +1,10 @@ PRGNAM="autotrace" -VERSION="0.31.1" -HOMEPAGE="http://autotrace.sourceforge.net/" -DOWNLOAD="http://sourceforge.net/projects/autotrace/files/AutoTrace/0.31.1/autotrace-0.31.1.tar.gz" -MD5SUM="54eabbb38d2076ded6d271e1ee4d0783" +VERSION="0.31.10" +HOMEPAGE="https://github.com/autotrace/autotrace" +DOWNLOAD="https://github.com/autotrace/autotrace/archive/refs/tags/0.31.10/autotrace-0.31.10.tar.gz" +MD5SUM="3078d2530a65f28c31c89974671ef02a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="pstoedit" -MAINTAINER="Citizen X" -EMAIL="citizen.anon.x@gmail.com" +MAINTAINER="Jeremy Hansen" +EMAIL="jebrhansen+SBo@gmail.com" diff --git a/graphics/autotrace/autotrace.patch b/graphics/autotrace/autotrace.patch deleted file mode 100644 index 9cd4bff98e..0000000000 --- a/graphics/autotrace/autotrace.patch +++ /dev/null @@ -1,115 +0,0 @@ -diff -ud autotrace-0.31.1/autotrace-config.in autotrace-0.31.1.patched/autotrace-config.in ---- autotrace-0.31.1/autotrace-config.in 2002-11-08 19:18:31.000000000 +0100 -+++ autotrace-0.31.1.patched/autotrace-config.in 2015-08-31 01:22:03.777617655 +0200 -@@ -4,6 +4,7 @@ - af_cflags= - prefix=@prefix@ - exec_prefix=@exec_prefix@ -+libdir=`pkg-config --variable=libdir autotrace` - - - ## -@@ -205,7 +206,7 @@ - #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="-L$libdir -lautotrace @LIBPNG_LDFLAGS@ @MAGICK_LDFLAGS@ @LIBSWF_LDFLAGS@ @LIBPSTOEDIT_LIBS@ $af_libs" - - - -diff -ud autotrace-0.31.1/autotrace.m4 autotrace-0.31.1.patched/autotrace.m4 ---- autotrace-0.31.1/autotrace.m4 2002-10-10 22:44:12.000000000 +0200 -+++ autotrace-0.31.1.patched/autotrace.m4 2015-08-31 01:21:28.763826869 +0200 -@@ -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 -ud autotrace-0.31.1/input-bmp.c autotrace-0.31.1.patched/input-bmp.c ---- autotrace-0.31.1/input-bmp.c 2002-10-10 22:44:08.000000000 +0200 -+++ autotrace-0.31.1.patched/input-bmp.c 2015-08-31 01:21:44.767369265 +0200 -@@ -166,7 +166,7 @@ - /* 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 -ud autotrace-0.31.1/input-magick.c autotrace-0.31.1.patched/input-magick.c ---- autotrace-0.31.1/input-magick.c 2002-10-29 04:42:05.000000000 +0100 -+++ autotrace-0.31.1.patched/input-magick.c 2015-08-31 01:21:23.650426744 +0200 -@@ -83,7 +83,11 @@ - - for(j=0,runcount=0,point=0;jrows;j++) - for(i=0;icolumns;i++) { -+#if (MagickLibVersion < 0x0645) || (MagickLibVersion >= 0x0649) - p=GetOnePixel(image,i,j); -+#else -+ GetOnePixel(image,i,j,pixel); -+#endif - AT_BITMAP_BITS(bitmap)[point++]=pixel->red; /* if gray: red=green=blue */ - if(np==3) { - AT_BITMAP_BITS(bitmap)[point++]=pixel->green; -diff -ud autotrace-0.31.1/input-png.c autotrace-0.31.1.patched/input-png.c ---- autotrace-0.31.1/input-png.c 2002-10-10 22:44:14.000000000 +0200 -+++ autotrace-0.31.1.patched/input-png.c 2015-08-31 01:21:33.000548879 +0200 -@@ -42,7 +42,7 @@ - - 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, - "PNG warning"); */ -@@ -50,7 +50,7 @@ - - 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, - "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); - -@@ -181,20 +181,10 @@ - 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); - } - diff --git a/graphics/autotrace/slack-desc b/graphics/autotrace/slack-desc index 7ed9f98af7..fa5b0f90a0 100644 --- a/graphics/autotrace/slack-desc +++ b/graphics/autotrace/slack-desc @@ -7,13 +7,13 @@ |-----handy-ruler------------------------------------------------------| autotrace: autotrace (Bitmap to vector graphics converter) -autotrace: AutoTrace is a utility for converting bitmap into vector graphics and -autotrace: is a free replacement of CorelTrace & Adobe Streamline. +autotrace: +autotrace: AutoTrace is a utility for converting bitmap into vector graphics. +autotrace: autotrace: Features: autotrace: - Tracing outline and midline autotrace: - Color reduction and Despeckling -autotrace: - Import Formats: BMP, TGA, PNM, PPM, PGM, PBM and those supported -autotrace: by ImageMagick. -autotrace: - Export Formats: Postscript, svg,xfig, swf, pstoedit, emf, dxf, -autotrace: cgm, mif, p2e and sk. -autotrace: Homepage: http://autotrace.sourceforge.net/ +autotrace: - Supports a lot of input and output formats +autotrace: +autotrace: Homepage: https://github.com/autotrace/autotrace +autotrace: