autotrace package is retired on branch c10s for BAKERY-412
This commit is contained in:
parent
57ad1c8ebb
commit
161c88b4cc
2
.gitignore
vendored
2
.gitignore
vendored
@ -1,2 +0,0 @@
|
|||||||
autotrace-0.31.1.tar.gz
|
|
||||||
/autotrace-0.31.9.tar.gz
|
|
@ -1,31 +0,0 @@
|
|||||||
diff -up autotrace-0.31.9/tests/github-#70/run.expected-failure-no-imagemagick autotrace-0.31.9/tests/github-#70/run
|
|
||||||
--- autotrace-0.31.9/tests/github-#70/run.expected-failure-no-imagemagick 2023-01-24 14:53:57.278820241 +0100
|
|
||||||
+++ autotrace-0.31.9/tests/github-#70/run 2023-01-24 14:54:05.026741994 +0100
|
|
||||||
@@ -4,6 +4,16 @@
|
|
||||||
|
|
||||||
DIR=$1
|
|
||||||
|
|
||||||
+# Check whether ImageMagick support is enabled and hence we support XPM
|
|
||||||
+autotrace -list-input-formats 2>&1 | grep xpm
|
|
||||||
+RESULT=$?
|
|
||||||
+
|
|
||||||
+if [ $RESULT -ne 0 ] ; then
|
|
||||||
+ XPM=0
|
|
||||||
+else
|
|
||||||
+ XPM=1
|
|
||||||
+fi
|
|
||||||
+
|
|
||||||
autotrace -report-progress -centerline -input-format XPM $DIR/lego_5.xpm -output-format svg -output-file $DIR/lego_5.svg
|
|
||||||
RESULT=$?
|
|
||||||
|
|
||||||
@@ -11,5 +21,9 @@ if [ $RESULT -eq 0 ] && [ -s $DIR/lego_5
|
|
||||||
rm -f $DIR/lego_5.svg
|
|
||||||
ok
|
|
||||||
else
|
|
||||||
- fail
|
|
||||||
+ if [ $XPM -eq 0 ] ; then
|
|
||||||
+ expected_fail
|
|
||||||
+ else
|
|
||||||
+ fail
|
|
||||||
+ fi
|
|
||||||
fi
|
|
@ -1,364 +0,0 @@
|
|||||||
From 73b2ddcac6b88157a241a35b498f07230bdd1868 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Mamoru TASAKA <mtasaka@fedoraproject.org>
|
|
||||||
Date: Thu, 12 Jan 2023 22:57:42 +0900
|
|
||||||
Subject: [PATCH 1/8] Support ImageMagick 7
|
|
||||||
|
|
||||||
* Detect IM7 at configure and define preprocesser macro when IM' is detected appropriately,
|
|
||||||
because with IM7 we have to change header path to include
|
|
||||||
* Change header inclusion path for IM7
|
|
||||||
* GetExceptionInfo is deprecated (at least) in 6.9.12, replace with AcquireExceptionInfo
|
|
||||||
* InitializeMagick is deprecated (at least) in 6.9.12, it calls MagickCoreGenesis(path,MagickFalse) internally, so replace as such.
|
|
||||||
* GetImageType should be replaced with IdentifyImageType
|
|
||||||
* GetOnePixel should be replaced with GetOneAuthenticPixel.
|
|
||||||
GetOneAuthenticPixel returns Quantum array, which must be passed to ScaleQuantumToChar.
|
|
||||||
---
|
|
||||||
configure.ac | 6 +++++
|
|
||||||
src/input-magick.c | 62 ++++++++++++++++++++++++++++++++++++++--------
|
|
||||||
2 files changed, 58 insertions(+), 10 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/configure.ac b/configure.ac
|
|
||||||
index f85d6e6..acaaa3d 100644
|
|
||||||
--- a/configure.ac
|
|
||||||
+++ b/configure.ac
|
|
||||||
@@ -94,6 +94,12 @@ else
|
|
||||||
)
|
|
||||||
fi
|
|
||||||
if test "x${with_magick}" = xImageMagick; then
|
|
||||||
+ PKG_CHECK_MODULES([IMAGEMAGICK7],
|
|
||||||
+ [ImageMagick >= 7.0.1],
|
|
||||||
+ [HAVE_IMAGEMAGICK7=yes
|
|
||||||
+ AC_DEFINE(HAVE_IMAGEMAGICK7, 1, [ImageMagick version 7 or higher is available.])
|
|
||||||
+ ],[]
|
|
||||||
+ )
|
|
||||||
PKG_CHECK_MODULES([IMAGEMAGICK],
|
|
||||||
[ImageMagick >= 5.2.1],
|
|
||||||
[HAVE_MAGICK=yes
|
|
||||||
diff --git a/src/input-magick.c b/src/input-magick.c
|
|
||||||
index ccb9c12..d76e175 100644
|
|
||||||
--- a/src/input-magick.c
|
|
||||||
+++ b/src/input-magick.c
|
|
||||||
@@ -29,7 +29,11 @@
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include <sys/types.h> /* Needed for correct interpretation of magick/api.h */
|
|
||||||
+#ifdef HAVE_IMAGEMAGICK7
|
|
||||||
+#include <MagickCore/MagickCore.h>
|
|
||||||
+#else
|
|
||||||
#include <magick/api.h>
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
static at_bitmap input_magick_reader(gchar * filename, at_input_opts_type * opts, at_msg_func msg_func, gpointer msg_data, gpointer user_data)
|
|
||||||
{
|
|
||||||
@@ -37,24 +41,39 @@ static at_bitmap input_magick_reader(gchar * filename, at_input_opts_type * opts
|
|
||||||
ImageInfo *image_info;
|
|
||||||
ImageType image_type;
|
|
||||||
unsigned int i, j, point, np, runcount;
|
|
||||||
+ unsigned char red, green, blue;
|
|
||||||
at_bitmap bitmap;
|
|
||||||
+#if defined(HAVE_IMAGEMAGICK7)
|
|
||||||
+ Quantum q[MaxPixelChannels];
|
|
||||||
+#else
|
|
||||||
PixelPacket p;
|
|
||||||
PixelPacket *pixel = &p;
|
|
||||||
+#endif
|
|
||||||
+#if defined(HAVE_IMAGEMAGICK7)
|
|
||||||
+ ExceptionInfo *exception_ptr = AcquireExceptionInfo();
|
|
||||||
+ MagickCoreGenesis("", MagickFalse);
|
|
||||||
+#else
|
|
||||||
ExceptionInfo exception;
|
|
||||||
+ ExceptionInfo *exception_ptr = &exception;
|
|
||||||
InitializeMagick("");
|
|
||||||
- GetExceptionInfo(&exception);
|
|
||||||
+ GetExceptionInfo(exception_ptr);
|
|
||||||
+#endif
|
|
||||||
image_info = CloneImageInfo((ImageInfo *) NULL);
|
|
||||||
(void)strcpy(image_info->filename, filename);
|
|
||||||
image_info->antialias = 0;
|
|
||||||
|
|
||||||
- image = ReadImage(image_info, &exception);
|
|
||||||
+ image = ReadImage(image_info, exception_ptr);
|
|
||||||
if (image == (Image *) NULL) {
|
|
||||||
/* MagickError(exception.severity,exception.reason,exception.description); */
|
|
||||||
if (msg_func)
|
|
||||||
- msg_func(exception.reason, AT_MSG_FATAL, msg_data);
|
|
||||||
+ msg_func(exception_ptr->reason, AT_MSG_FATAL, msg_data);
|
|
||||||
goto cleanup;
|
|
||||||
}
|
|
||||||
- image_type = GetImageType(image, &exception);
|
|
||||||
+#if defined(HAVE_IMAGEMAGICK7)
|
|
||||||
+ image_type = IdentifyImageType(image, exception_ptr);
|
|
||||||
+#else
|
|
||||||
+ image_type = GetImageType(image, exception_ptr);
|
|
||||||
+#endif
|
|
||||||
if (image_type == BilevelType || image_type == GrayscaleType)
|
|
||||||
np = 1;
|
|
||||||
else
|
|
||||||
@@ -68,34 +87,57 @@ static at_bitmap input_magick_reader(gchar * filename, at_input_opts_type * opts
|
|
||||||
ExceptionInfo exception;
|
|
||||||
p = AcquireOnePixel(image, i, j, &exception);
|
|
||||||
#elif defined(HAVE_IMAGEMAGICK)
|
|
||||||
+ #if defined(HAVE_IMAGEMAGICK7)
|
|
||||||
+ ClearMagickException(exception_ptr);
|
|
||||||
+ GetOneAuthenticPixel(image, i, j, q, exception_ptr);
|
|
||||||
+ red = ScaleQuantumToChar(q[RedPixelChannel]);
|
|
||||||
+ green = ScaleQuantumToChar(q[GreenPixelChannel]);
|
|
||||||
+ blue = ScaleQuantumToChar(q[BluePixelChannel]);
|
|
||||||
+ #else
|
|
||||||
#if ((MagickLibVersion < 0x0645) || (MagickLibVersion >= 0x0649))
|
|
||||||
p = GetOnePixel(image, i, j);
|
|
||||||
#else
|
|
||||||
GetOnePixel(image, i, j, pixel);
|
|
||||||
+ #endif
|
|
||||||
+ red = pixel->red;
|
|
||||||
+ green = pixel->green;
|
|
||||||
+ blue = pixel->blue;
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
- AT_BITMAP_BITS(&bitmap)[point++] = pixel->red; /* if gray: red=green=blue */
|
|
||||||
+ AT_BITMAP_BITS(&bitmap)[point++] = red; /* if gray: red=green=blue */
|
|
||||||
if (np == 3) {
|
|
||||||
- AT_BITMAP_BITS(&bitmap)[point++] = pixel->green;
|
|
||||||
- AT_BITMAP_BITS(&bitmap)[point++] = pixel->blue;
|
|
||||||
+ AT_BITMAP_BITS(&bitmap)[point++] = green;
|
|
||||||
+ AT_BITMAP_BITS(&bitmap)[point++] = blue;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
DestroyImage(image);
|
|
||||||
cleanup:
|
|
||||||
DestroyImageInfo(image_info);
|
|
||||||
+#if defined(HAVE_IMAGEMAGICK7)
|
|
||||||
+ DestroyExceptionInfo(exception_ptr);
|
|
||||||
+#endif
|
|
||||||
return (bitmap);
|
|
||||||
}
|
|
||||||
|
|
||||||
int install_input_magick_readers(void)
|
|
||||||
{
|
|
||||||
size_t n = 0;
|
|
||||||
+#if defined(HAVE_IMAGEMAGICK7)
|
|
||||||
+ ExceptionInfo *exception_ptr = AcquireExceptionInfo();
|
|
||||||
+#else
|
|
||||||
ExceptionInfo exception;
|
|
||||||
+ ExceptionInfo *exception_ptr = &exception;
|
|
||||||
+#endif
|
|
||||||
MagickInfo *info;
|
|
||||||
const MagickInfo **infos;
|
|
||||||
+#if defined(HAVE_IMAGEMAGICK7)
|
|
||||||
+ MagickCoreGenesis("", MagickFalse);
|
|
||||||
+#else
|
|
||||||
InitializeMagick("");
|
|
||||||
|
|
||||||
- GetExceptionInfo(&exception);
|
|
||||||
+ GetExceptionInfo(exception_ptr);
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
#ifdef HAVE_GRAPHICSMAGICK
|
|
||||||
info = GetMagickInfo("*", &exception);
|
|
||||||
@@ -106,7 +148,7 @@ int install_input_magick_readers(void)
|
|
||||||
info = info->next;
|
|
||||||
}
|
|
||||||
#else
|
|
||||||
- infos = GetMagickInfoList("*", &n, &exception);
|
|
||||||
+ infos = GetMagickInfoList("*", &n, exception_ptr);
|
|
||||||
for (int i = 0; i < n; i++){
|
|
||||||
info = infos[i];
|
|
||||||
if (info->name && info->description)
|
|
||||||
@@ -114,6 +156,6 @@ int install_input_magick_readers(void)
|
|
||||||
}
|
|
||||||
#endif // HAVE_GRAPHICSMAGICK
|
|
||||||
|
|
||||||
- DestroyExceptionInfo(&exception);
|
|
||||||
+ DestroyExceptionInfo(exception_ptr);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
From 52a3775efd51cf2fdb54da6286a394230f01457b Mon Sep 17 00:00:00 2001
|
|
||||||
From: Peter Lemenkov <lemenkov@gmail.com>
|
|
||||||
Date: Mon, 16 Jan 2023 18:36:34 +0100
|
|
||||||
Subject: [PATCH 2/8] Fix GraphicsMagick
|
|
||||||
|
|
||||||
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
|
|
||||||
---
|
|
||||||
src/input-magick.c | 3 +++
|
|
||||||
1 file changed, 3 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/src/input-magick.c b/src/input-magick.c
|
|
||||||
index d76e175..efc45d4 100644
|
|
||||||
--- a/src/input-magick.c
|
|
||||||
+++ b/src/input-magick.c
|
|
||||||
@@ -86,6 +86,9 @@ static at_bitmap input_magick_reader(gchar * filename, at_input_opts_type * opts
|
|
||||||
#ifdef HAVE_GRAPHICSMAGICK
|
|
||||||
ExceptionInfo exception;
|
|
||||||
p = AcquireOnePixel(image, i, j, &exception);
|
|
||||||
+ red = pixel->red;
|
|
||||||
+ green = pixel->green;
|
|
||||||
+ blue = pixel->blue;
|
|
||||||
#elif defined(HAVE_IMAGEMAGICK)
|
|
||||||
#if defined(HAVE_IMAGEMAGICK7)
|
|
||||||
ClearMagickException(exception_ptr);
|
|
||||||
|
|
||||||
From a25fb12948ec49d9717e5902b7219f1c24ee15e5 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Peter Lemenkov <lemenkov@gmail.com>
|
|
||||||
Date: Mon, 16 Jan 2023 19:09:46 +0100
|
|
||||||
Subject: [PATCH 3/8] Mention it runs ImageMagick 6
|
|
||||||
|
|
||||||
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
|
|
||||||
---
|
|
||||||
.github/workflows/linux_test.yml | 4 ++--
|
|
||||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/.github/workflows/linux_test.yml b/.github/workflows/linux_test.yml
|
|
||||||
index 8fa05bc..2dd0255 100644
|
|
||||||
--- a/.github/workflows/linux_test.yml
|
|
||||||
+++ b/.github/workflows/linux_test.yml
|
|
||||||
@@ -41,13 +41,13 @@ jobs:
|
|
||||||
make check
|
|
||||||
shell: bash
|
|
||||||
|
|
||||||
- build_with_latest_imagemagick:
|
|
||||||
+ build_with_latest_imagemagick_6:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
|
|
||||||
- uses: actions/checkout@v2
|
|
||||||
# Runs a single command using the runners shell
|
|
||||||
- - name: build and run tests package against ImageMagick only
|
|
||||||
+ - name: build and run tests package against ImageMagick 6 only
|
|
||||||
run: |
|
|
||||||
sudo apt update
|
|
||||||
sudo apt install -y libmagickcore-6.q16-dev libpng-dev libexiv2-dev libtiff-dev libjpeg-dev libxml2-dev libbz2-dev libfreetype6-dev libpstoedit-dev autoconf automake libtool intltool autopoint
|
|
||||||
|
|
||||||
From ec78ba5174a614d40fc1f179eeb41da89c7b5308 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Peter Lemenkov <lemenkov@gmail.com>
|
|
||||||
Date: Mon, 16 Jan 2023 19:18:20 +0100
|
|
||||||
Subject: [PATCH 4/8] Enable Fedora 38
|
|
||||||
|
|
||||||
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
|
|
||||||
---
|
|
||||||
.github/workflows/linux_test.yml | 16 ++++++++++++++++
|
|
||||||
1 file changed, 16 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/.github/workflows/linux_test.yml b/.github/workflows/linux_test.yml
|
|
||||||
index 2dd0255..a1e6e0c 100644
|
|
||||||
--- a/.github/workflows/linux_test.yml
|
|
||||||
+++ b/.github/workflows/linux_test.yml
|
|
||||||
@@ -56,6 +56,22 @@ jobs:
|
|
||||||
make
|
|
||||||
make check
|
|
||||||
|
|
||||||
+ build_with_latest_imagemagick_7:
|
|
||||||
+ runs-on: ubuntu-latest
|
|
||||||
+ container: fedora:38
|
|
||||||
+ steps:
|
|
||||||
+ # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
|
|
||||||
+ - uses: actions/checkout@v2
|
|
||||||
+ # Runs a single command using the runners shell
|
|
||||||
+ - name: build and run tests package against ImageMagick 7 only
|
|
||||||
+ run: |
|
|
||||||
+ sudo dnf update
|
|
||||||
+ sudo dnf install -y ImageMagick-devel autoconf automake gcc gcc-c++ gettext-devel glib2-devel intltool libpng-devel libstdc++-devel libtiff-devel libtool make procps-ng pstoedit-devel
|
|
||||||
+ ./autogen.sh
|
|
||||||
+ ./configure --enable-magick-readers
|
|
||||||
+ make
|
|
||||||
+ make check
|
|
||||||
+
|
|
||||||
build_with_latest_graphicsmagick:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
|
|
||||||
From 97d6c0b039ecf4fc55fff8ab62f9ab7e81943818 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Peter Lemenkov <lemenkov@gmail.com>
|
|
||||||
Date: Mon, 16 Jan 2023 19:20:32 +0100
|
|
||||||
Subject: [PATCH 5/8] wsp
|
|
||||||
|
|
||||||
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
|
|
||||||
---
|
|
||||||
.github/workflows/linux_test.yml | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/.github/workflows/linux_test.yml b/.github/workflows/linux_test.yml
|
|
||||||
index a1e6e0c..4e7f609 100644
|
|
||||||
--- a/.github/workflows/linux_test.yml
|
|
||||||
+++ b/.github/workflows/linux_test.yml
|
|
||||||
@@ -66,7 +66,7 @@ jobs:
|
|
||||||
- name: build and run tests package against ImageMagick 7 only
|
|
||||||
run: |
|
|
||||||
sudo dnf update
|
|
||||||
- sudo dnf install -y ImageMagick-devel autoconf automake gcc gcc-c++ gettext-devel glib2-devel intltool libpng-devel libstdc++-devel libtiff-devel libtool make procps-ng pstoedit-devel
|
|
||||||
+ sudo dnf install -y ImageMagick-devel autoconf automake gcc gcc-c++ gettext-devel glib2-devel intltool libpng-devel libstdc++-devel libtiff-devel libtool make procps-ng pstoedit-devel
|
|
||||||
./autogen.sh
|
|
||||||
./configure --enable-magick-readers
|
|
||||||
make
|
|
||||||
|
|
||||||
From 63b8d9c5238226a89443f73cf630a641f6a2e138 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Peter Lemenkov <lemenkov@gmail.com>
|
|
||||||
Date: Mon, 16 Jan 2023 19:21:33 +0100
|
|
||||||
Subject: [PATCH 6/8] Use -y
|
|
||||||
|
|
||||||
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
|
|
||||||
---
|
|
||||||
.github/workflows/linux_test.yml | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/.github/workflows/linux_test.yml b/.github/workflows/linux_test.yml
|
|
||||||
index 4e7f609..211b251 100644
|
|
||||||
--- a/.github/workflows/linux_test.yml
|
|
||||||
+++ b/.github/workflows/linux_test.yml
|
|
||||||
@@ -65,7 +65,7 @@ jobs:
|
|
||||||
# Runs a single command using the runners shell
|
|
||||||
- name: build and run tests package against ImageMagick 7 only
|
|
||||||
run: |
|
|
||||||
- sudo dnf update
|
|
||||||
+ sudo dnf update -y
|
|
||||||
sudo dnf install -y ImageMagick-devel autoconf automake gcc gcc-c++ gettext-devel glib2-devel intltool libpng-devel libstdc++-devel libtiff-devel libtool make procps-ng pstoedit-devel
|
|
||||||
./autogen.sh
|
|
||||||
./configure --enable-magick-readers
|
|
||||||
|
|
||||||
From cc8205ead703ef684fc79f34f5f324c54cebad0c Mon Sep 17 00:00:00 2001
|
|
||||||
From: Peter Lemenkov <lemenkov@gmail.com>
|
|
||||||
Date: Mon, 16 Jan 2023 19:25:55 +0100
|
|
||||||
Subject: [PATCH 7/8] Missing BR
|
|
||||||
|
|
||||||
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
|
|
||||||
---
|
|
||||||
.github/workflows/linux_test.yml | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/.github/workflows/linux_test.yml b/.github/workflows/linux_test.yml
|
|
||||||
index 211b251..912fb92 100644
|
|
||||||
--- a/.github/workflows/linux_test.yml
|
|
||||||
+++ b/.github/workflows/linux_test.yml
|
|
||||||
@@ -66,7 +66,7 @@ jobs:
|
|
||||||
- name: build and run tests package against ImageMagick 7 only
|
|
||||||
run: |
|
|
||||||
sudo dnf update -y
|
|
||||||
- sudo dnf install -y ImageMagick-devel autoconf automake gcc gcc-c++ gettext-devel glib2-devel intltool libpng-devel libstdc++-devel libtiff-devel libtool make procps-ng pstoedit-devel
|
|
||||||
+ sudo dnf install -y ImageMagick-devel autoconf automake gcc gcc-c++ gettext-devel glib2-devel intltool libpng-devel libstdc++-devel libtiff-devel libtool make pkgconf-pkg-config procps-ng pstoedit-devel
|
|
||||||
./autogen.sh
|
|
||||||
./configure --enable-magick-readers
|
|
||||||
make
|
|
||||||
|
|
||||||
From c26a2a059926c595a00839c8d9961e9381206579 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Peter Lemenkov <lemenkov@gmail.com>
|
|
||||||
Date: Mon, 16 Jan 2023 19:35:45 +0100
|
|
||||||
Subject: [PATCH 8/8] More BR
|
|
||||||
|
|
||||||
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
|
|
||||||
---
|
|
||||||
.github/workflows/linux_test.yml | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/.github/workflows/linux_test.yml b/.github/workflows/linux_test.yml
|
|
||||||
index 912fb92..ce355f7 100644
|
|
||||||
--- a/.github/workflows/linux_test.yml
|
|
||||||
+++ b/.github/workflows/linux_test.yml
|
|
||||||
@@ -66,7 +66,7 @@ jobs:
|
|
||||||
- name: build and run tests package against ImageMagick 7 only
|
|
||||||
run: |
|
|
||||||
sudo dnf update -y
|
|
||||||
- sudo dnf install -y ImageMagick-devel autoconf automake gcc gcc-c++ gettext-devel glib2-devel intltool libpng-devel libstdc++-devel libtiff-devel libtool make pkgconf-pkg-config procps-ng pstoedit-devel
|
|
||||||
+ sudo dnf install -y ImageMagick-devel autoconf automake gcc gcc-c++ gettext-devel glib2-devel intltool libpng-devel libstdc++-devel libtiff-devel libtool make pkgconf-pkg-config procps-ng pstoedit-devel which
|
|
||||||
./autogen.sh
|
|
||||||
./configure --enable-magick-readers
|
|
||||||
make
|
|
@ -1,95 +0,0 @@
|
|||||||
Name: autotrace
|
|
||||||
Version: 0.31.9
|
|
||||||
Release: %autorelease
|
|
||||||
Summary: Utility for converting bitmaps to vector graphics
|
|
||||||
License: GPL-2.0-or-later and LGPL-2.1-or-later
|
|
||||||
URL: http://autotrace.sourceforge.net/
|
|
||||||
Source0: https://github.com/%{name}/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
|
|
||||||
# https://github.com/autotrace/autotrace/pull/105
|
|
||||||
Patch0: autotrace-0.31.9-pr105-ImageMagick7.patch
|
|
||||||
# https://github.com/autotrace/autotrace/pull/108
|
|
||||||
Patch1: autotrace-0.31.9-expected-test-failure-no-imagemagick.patch
|
|
||||||
# No ImageMagick in RHEL 8 and future releases
|
|
||||||
%if 0%{?rhel} < 8
|
|
||||||
BuildRequires: ImageMagick-devel
|
|
||||||
%endif
|
|
||||||
BuildRequires: autoconf
|
|
||||||
BuildRequires: automake
|
|
||||||
BuildRequires: gcc
|
|
||||||
BuildRequires: gcc-c++
|
|
||||||
BuildRequires: gettext-devel
|
|
||||||
BuildRequires: glib2-devel
|
|
||||||
BuildRequires: intltool
|
|
||||||
BuildRequires: libpng-devel > 2:1.2
|
|
||||||
BuildRequires: libstdc++-devel
|
|
||||||
BuildRequires: libtiff-devel
|
|
||||||
BuildRequires: libtool
|
|
||||||
BuildRequires: make
|
|
||||||
BuildRequires: procps-ng
|
|
||||||
BuildRequires: pstoedit-devel
|
|
||||||
|
|
||||||
|
|
||||||
%description
|
|
||||||
AutoTrace is a program for converting bitmaps to vector graphics.
|
|
||||||
|
|
||||||
Supported input formats include BMP, TGA, PNM, PPM, and any format
|
|
||||||
supported by ImageMagick, whereas output can be produced in
|
|
||||||
Postscript, SVG, xfig, SWF, and others.
|
|
||||||
|
|
||||||
|
|
||||||
%package devel
|
|
||||||
Summary: Header files for autotrace
|
|
||||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
|
||||||
Requires: pkgconfig
|
|
||||||
%if 0%{?rhel} < 8
|
|
||||||
Requires: ImageMagick-devel
|
|
||||||
%endif
|
|
||||||
Requires: pstoedit-devel
|
|
||||||
|
|
||||||
|
|
||||||
%description devel
|
|
||||||
This package contains header files and development libraries for autotrace.
|
|
||||||
|
|
||||||
|
|
||||||
%prep
|
|
||||||
%autosetup -p1
|
|
||||||
|
|
||||||
|
|
||||||
%build
|
|
||||||
autoreconf -ivf
|
|
||||||
%if 0%{?rhel} < 8
|
|
||||||
%configure --enable-magick-readers --disable-static
|
|
||||||
%else
|
|
||||||
%configure --without-magick --disable-static
|
|
||||||
%endif
|
|
||||||
%make_build
|
|
||||||
|
|
||||||
|
|
||||||
%install
|
|
||||||
%make_install
|
|
||||||
%find_lang %{name}
|
|
||||||
|
|
||||||
|
|
||||||
%check
|
|
||||||
make check
|
|
||||||
|
|
||||||
|
|
||||||
%ldconfig_scriptlets
|
|
||||||
|
|
||||||
|
|
||||||
%files -f %{name}.lang
|
|
||||||
%license COPYING COPYING.LIB
|
|
||||||
%doc AUTHORS ChangeLog FAQ NEWS README.md THANKS TODO
|
|
||||||
%{_bindir}/autotrace
|
|
||||||
%{_libdir}/*.so.*
|
|
||||||
%{_mandir}/man[^3]/*
|
|
||||||
|
|
||||||
|
|
||||||
%files devel
|
|
||||||
%{_libdir}/*.so
|
|
||||||
%{_libdir}/pkgconfig/autotrace.pc
|
|
||||||
%{_includedir}/autotrace/
|
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
|
||||||
%autochangelog
|
|
214
changelog
214
changelog
@ -1,214 +0,0 @@
|
|||||||
* Tue Aug 30 2022 Peter Lemenkov <lemenkov@gmail.com> - 0.31.9-1
|
|
||||||
- Ver. 0.31.9 (API/ABI compatible)
|
|
||||||
|
|
||||||
* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.31.1-64
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.31.1-63
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
|
||||||
|
|
||||||
* Fri Oct 15 2021 Gwyn Ciesla <gwync@protonmail.com> - 0.31.1-62
|
|
||||||
- ImageMagick rebuild.
|
|
||||||
|
|
||||||
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.31.1-61
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
|
||||||
|
|
||||||
* Fri Apr 30 2021 Parag Nemade <pnemade AT redhat DOT com> - 0.31.1-60
|
|
||||||
- Resolves: CVE-2019-19004 : integer overflow in input-bmp.c
|
|
||||||
- Resolves: CVE-2019-19005 : fix bitmap double free in main.c
|
|
||||||
|
|
||||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.31.1-59
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Oct 28 2020 Parag Nemade <pnemade AT redhat DOT com> - 0.31.1-58
|
|
||||||
- Don't build with ImageMagick on EL
|
|
||||||
|
|
||||||
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.31.1-57
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
|
||||||
|
|
||||||
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.31.1-56
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.31.1-55
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
|
||||||
|
|
||||||
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.31.1-54
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
|
||||||
|
|
||||||
* Tue Aug 28 2018 Michael Cronenworth <mike@cchtml.com> - 0.31.1-53
|
|
||||||
- Rebuilt for new ImageMagick 6.9.10
|
|
||||||
|
|
||||||
* Fri Jul 20 2018 Jaroslav Škarvada <jskarvad@redhat.com> - 0.31.1-52
|
|
||||||
- Fixed FTBFS by adding gcc-c++ requirement
|
|
||||||
Resolves: rhbz#1603443
|
|
||||||
|
|
||||||
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.31.1-51
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.31.1-50
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
|
||||||
|
|
||||||
* Thu Aug 24 2017 Michael Cronenworth <mike@cchtml.com> - 0.31.1-49
|
|
||||||
- Bump release for upgrade path
|
|
||||||
|
|
||||||
* Wed Aug 23 2017 Michael Cronenworth <mike@cchtml.com> - 0.31.1-48
|
|
||||||
- Rebuilt for new ImageMagick
|
|
||||||
|
|
||||||
* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.31.1-47
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
|
||||||
|
|
||||||
* Sun Jul 30 2017 Kevin Fenzi <kevin@scrye.com> - 0.31.1-46
|
|
||||||
- Rebuild for new ImageMagick
|
|
||||||
|
|
||||||
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.31.1-45
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
|
||||||
|
|
||||||
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.31.1-44
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
|
||||||
|
|
||||||
* Fri Jan 20 2017 Jaroslav Škarvada <jskarvad@redhat.com> - 0.31.1-43
|
|
||||||
- Enabled pstoedit backend
|
|
||||||
- Fixed out of bounds write when using pstoedit backend
|
|
||||||
Resolves: CVE-2016-7392
|
|
||||||
- Fixed hardcoded version on source URL
|
|
||||||
- Fixed bogus date in changelog (best effort)
|
|
||||||
|
|
||||||
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.31.1-42
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.31.1-41
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
|
||||||
|
|
||||||
* Fri Aug 15 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.31.1-40
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
|
||||||
|
|
||||||
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.31.1-39
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
|
||||||
|
|
||||||
* Mon Mar 31 2014 Jon Ciesla <limburgher@gmail.com> - 0.31.1-38
|
|
||||||
- ImageMagick rebuild.
|
|
||||||
|
|
||||||
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.31.1-37
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
|
||||||
|
|
||||||
* Sun Jul 21 2013 Peter Lemenkov <lemenkov@gmail.com> - 0.31.1-36
|
|
||||||
- Fix building on AArch64
|
|
||||||
- Enable pstoedit back
|
|
||||||
|
|
||||||
* Fri Jul 19 2013 Jaroslav Škarvada <jskarvad@redhat.com> - 0.31.1-35
|
|
||||||
- Fixed multilib conflict in devel package (by multilib-fix patch)
|
|
||||||
- Removed rpaths
|
|
||||||
|
|
||||||
* Fri Jun 28 2013 Jaroslav Škarvada <jskarvad@redhat.com> - 0.31.1-34
|
|
||||||
- Fixed buffer overflow when parsing BMP files
|
|
||||||
Resolves: CVE-2013-1953
|
|
||||||
|
|
||||||
* Mon Mar 18 2013 Jon Ciesla <limburgher@gmail.com> - 0.31.1-33
|
|
||||||
- ImageMagick rebuild.
|
|
||||||
|
|
||||||
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.31.1-32
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
|
||||||
|
|
||||||
* Sat Jul 21 2012 Peter Lemenkov <lemenkov@gmail.com> - 0.31.1-31
|
|
||||||
- Cosmetic changes in the spec-file (closes rhbz #803928 and #817950)
|
|
||||||
|
|
||||||
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.31.1-30.1
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
|
||||||
|
|
||||||
* Fri Mar 02 2012 Jon Ciesla <limburgher@gmail.com> - 0.31.1-29.1
|
|
||||||
- Libpng 1.5 fix.
|
|
||||||
|
|
||||||
* Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.31.1-28.1
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
|
||||||
|
|
||||||
* Tue Dec 06 2011 Adam Jackson <ajax@redhat.com> - 0.31.1-27.1
|
|
||||||
- Rebuild for new libpng
|
|
||||||
|
|
||||||
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.31.1-26.1
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Sep 29 2010 jkeating - 0.31.1-25.1
|
|
||||||
- Rebuilt for gcc bug 634757
|
|
||||||
|
|
||||||
* Fri Sep 17 2010 Rex Dieter <rdieter@fedoraproject.org> - 0.31.1-24.1
|
|
||||||
- rebuild (ImageMagick)
|
|
||||||
|
|
||||||
* Mon May 17 2010 Peter Lemenkov <lemenkov@gmail.com> - 0.31.1-24
|
|
||||||
- Changed description (closes rhbz #591659).
|
|
||||||
|
|
||||||
* Mon Jul 27 2009 Peter Lemenkov <lemenkov@gmail.com> - 0.31.1-23
|
|
||||||
- Removed static libraries from -devel
|
|
||||||
- Changed %%makeinstall to "make install DESTDIR=blablabla"
|
|
||||||
- Fixed rhbz# 477980
|
|
||||||
|
|
||||||
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.31.1-22
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
|
||||||
|
|
||||||
* Fri Mar 13 2009 Hans de Goede <hdegoede@redhat.com> - 0.31.1-21
|
|
||||||
- Rebuild for new ImageMagick
|
|
||||||
|
|
||||||
* Mon Mar 02 2009 Caolán McNamara <caolanm@redhat.com> - 0.31.1-20
|
|
||||||
- Modify GetOnePixel usage to build against current ImageMagick api
|
|
||||||
|
|
||||||
* Mon Feb 23 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.31.1-19
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
|
|
||||||
|
|
||||||
* Mon Jul 14 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 0.31.1-18
|
|
||||||
- fix license tag
|
|
||||||
|
|
||||||
* Mon May 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 0.31.1-17
|
|
||||||
- Rebuild for new ImageMagick.
|
|
||||||
|
|
||||||
* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 0.31.1-16
|
|
||||||
- Autorebuild for GCC 4.3
|
|
||||||
|
|
||||||
* Wed Aug 22 2007 Quentin Spencer <qspencer@users.sourceforge.net> - 0.31.1-15
|
|
||||||
- Rebuild for F8.
|
|
||||||
|
|
||||||
* Thu Oct 05 2006 Christian Iseli <Christian.Iseli@licr.org> 0.31.1-14
|
|
||||||
- rebuilt for unwind info generation, broken in gcc-4.1.1-21
|
|
||||||
|
|
||||||
* Thu Sep 21 2006 Quentin Spencer <qspencer@users.sourceforge.net> - 0.31.1-13
|
|
||||||
- Rebuild for FC6.
|
|
||||||
|
|
||||||
* Mon Feb 13 2006 Roozbeh Pournader <roozbeh@farsiweb.info> - 0.31.1-12
|
|
||||||
- Rebuild for Fedora Extras 5
|
|
||||||
|
|
||||||
* Sat Jan 28 2006 Roozbeh Pournader <roozbeh@farsiweb.info> - 0.31.1-11
|
|
||||||
- rebuild
|
|
||||||
|
|
||||||
* Tue Jan 17 2006 Roozbeh Pournader <roozbeh@farsiweb.info> - 0.31.1-10
|
|
||||||
- add BuildRequires on freetype-devel
|
|
||||||
|
|
||||||
* Tue Jan 17 2006 Roozbeh Pournader <roozbeh@farsiweb.info> - 0.31.1-9
|
|
||||||
- remove BuildRequires on XFree86-devel
|
|
||||||
|
|
||||||
* Mon Jan 16 2006 Roozbeh Pournader <roozbeh@farsiweb.info> - 0.31.1-8
|
|
||||||
- add %%{?dist} tag
|
|
||||||
- add a BuildRequires on bzip2-devel
|
|
||||||
- add ldconfig to %%post and %%postun
|
|
||||||
|
|
||||||
* Thu May 26 2005 Jeremy Katz <katzj@redhat.com> - 0.31.1-7
|
|
||||||
- and more buildrequires
|
|
||||||
|
|
||||||
* Thu May 26 2005 Jeremy Katz <katzj@redhat.com> - 0.31.1-6
|
|
||||||
- BR libtiff-devel
|
|
||||||
|
|
||||||
* Wed May 25 2005 Jeremy Katz <katzj@redhat.com> - 0.31.1-5
|
|
||||||
- rebuild
|
|
||||||
|
|
||||||
* Thu Apr 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
|
|
||||||
- rebuilt
|
|
||||||
|
|
||||||
* Sat Aug 21 2004 Marius L. Jøhndal <mariuslj at ifi.uio.no> - 0:0.31.1-3
|
|
||||||
- Temporarily changed buildreq pstoedit-devel to buildconflicts.
|
|
||||||
|
|
||||||
* Thu Apr 22 2004 Marius L. Jøhndal <mariuslj at ifi.uio.no> - 0:0.31.1-0.fdr.2
|
|
||||||
- Added new BuildReq pstoedit-devel.
|
|
||||||
- Added missing BuildReq libexif-devel.
|
|
||||||
- Added missing -devel requires pkgconfig, ImageMagick-devel.
|
|
||||||
- Converted spec file to UTF-8.
|
|
||||||
|
|
||||||
* Mon Sep 29 2003 Marius L. Johndal <mariuslj at ifi.uio.no> 0:0.31.1-0.fdr.1
|
|
||||||
- Initial RPM release.
|
|
||||||
|
|
1
dead.package
Normal file
1
dead.package
Normal file
@ -0,0 +1 @@
|
|||||||
|
autotrace package is retired on branch c10s for BAKERY-412
|
1
sources
1
sources
@ -1 +0,0 @@
|
|||||||
SHA512 (autotrace-0.31.9.tar.gz) = 1ca97e8650529d26a104a86882c4c109ba8f17275b92e564cfbde37593cf867e55d1cbaa0f9421ba7b44ddbba2ceb5a65352cc697abc290ba335f5739361a304
|
|
@ -1,17 +0,0 @@
|
|||||||
---
|
|
||||||
- hosts: localhost
|
|
||||||
tags:
|
|
||||||
- classic
|
|
||||||
roles:
|
|
||||||
- role: standard-test-basic
|
|
||||||
required_packages:
|
|
||||||
- sed
|
|
||||||
- autotrace
|
|
||||||
# Fetch tests from GitHub upstream.
|
|
||||||
repositories:
|
|
||||||
- repo: https://github.com/autotrace/autotrace.git
|
|
||||||
dest: autotrace
|
|
||||||
tests:
|
|
||||||
- unittests:
|
|
||||||
dir: autotrace/tests
|
|
||||||
run: AUTOTRACE=/usr/bin/autotrace sh ./runtests.sh
|
|
Loading…
Reference in New Issue
Block a user