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.
This commit is contained in:
Michael J Gruber 2020-09-18 17:30:25 +02:00
parent 3271ff9bca
commit c6ec340ace
2 changed files with 4 additions and 20 deletions

View File

@ -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)
{

View File

@ -1,11 +1,10 @@
Name: jbig2dec Name: jbig2dec
Version: 0.19 Version: 0.19
Release: 1%{?dist} Release: 2%{?dist}
Summary: A decoder implementation of the JBIG2 image compression format Summary: A decoder implementation of the JBIG2 image compression format
License: AGPLv3+ License: AGPLv3+
URL: http://jbig2dec.sourceforge.net/ URL: http://jbig2dec.sourceforge.net/
Source0: https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs952/%{name}-%{version}.tar.gz 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} Requires: %{name}-libs = %{version}-%{release}
BuildRequires: libtool BuildRequires: libtool
BuildRequires: libpng-devel BuildRequires: libpng-devel
@ -81,6 +80,9 @@ rm -f %{buildroot}%{_libdir}/*.la
%changelog %changelog
* Fri Sep 18 2020 Michael J Gruber <mjg@fedoraproject.org> - 0.19-2
- remove ABI patch (and coordinate builds)
* Thu Sep 17 2020 Anna Khaitovich <akhaitov@redhat.com> - 0.19-1 * Thu Sep 17 2020 Anna Khaitovich <akhaitov@redhat.com> - 0.19-1
- Rebase to 0.19 - Rebase to 0.19