From c6ec340ace10c365bfc25e6e08339a5687297d64 Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Fri, 18 Sep 2020 17:30:25 +0200 Subject: [PATCH] remove ABI patch jbig2dec includes its own checks now (comparing the versions of the dynamically linked library against that of the compile time headers), rendering any attempty at cross version compatibility futile. Rather than patching out this check, accept Artifex' approach and coordinate jbig2dec updates via side-tags. --- jbig2dec-0.17-Restore-ABI-compatibility.patch | 18 ------------------ jbig2dec.spec | 6 ++++-- 2 files changed, 4 insertions(+), 20 deletions(-) delete mode 100644 jbig2dec-0.17-Restore-ABI-compatibility.patch diff --git a/jbig2dec-0.17-Restore-ABI-compatibility.patch b/jbig2dec-0.17-Restore-ABI-compatibility.patch deleted file mode 100644 index b3bfb28..0000000 --- a/jbig2dec-0.17-Restore-ABI-compatibility.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/jbig2.c b/jbig2.c -index 97018ea..17ffd72 100644 ---- a/jbig2.c -+++ b/jbig2.c -@@ -99,6 +99,13 @@ jbig2_error(Jbig2Ctx *ctx, Jbig2Severity severity, int32_t segment_number, const - return -1; - } - -+#undef jbig2_ctx_new -+Jbig2Ctx * -+jbig2_ctx_new(Jbig2Allocator *allocator, Jbig2Options options, Jbig2GlobalCtx *global_ctx, Jbig2ErrorCallback error_callback, void *error_callback_data) -+{ -+ return jbig2_ctx_new_imp((allocator), (options), (global_ctx), (error_callback), (error_callback_data), JBIG2_VERSION_MAJOR, JBIG2_VERSION_MINOR); -+} -+ - Jbig2Ctx * - jbig2_ctx_new_imp(Jbig2Allocator *allocator, Jbig2Options options, Jbig2GlobalCtx *global_ctx, Jbig2ErrorCallback error_callback, void *error_callback_data, int jbig2_version_major, int jbig2_version_minor) - { diff --git a/jbig2dec.spec b/jbig2dec.spec index 3e788b8..3993b92 100644 --- a/jbig2dec.spec +++ b/jbig2dec.spec @@ -1,11 +1,10 @@ Name: jbig2dec Version: 0.19 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A decoder implementation of the JBIG2 image compression format License: AGPLv3+ URL: http://jbig2dec.sourceforge.net/ Source0: https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs952/%{name}-%{version}.tar.gz -Patch1: jbig2dec-0.17-Restore-ABI-compatibility.patch Requires: %{name}-libs = %{version}-%{release} BuildRequires: libtool BuildRequires: libpng-devel @@ -81,6 +80,9 @@ rm -f %{buildroot}%{_libdir}/*.la %changelog +* Fri Sep 18 2020 Michael J Gruber - 0.19-2 +- remove ABI patch (and coordinate builds) + * Thu Sep 17 2020 Anna Khaitovich - 0.19-1 - Rebase to 0.19