From d109c5e88811fbbccd590f6a497f8069da7764d8 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 11 Jan 2020 21:08:51 +0100 Subject: [PATCH] jbig2dec: restore abi compatibibility with 0.16. patch from Julien Cristau, Debian. fixes #4545 --- media-libs/jbig2dec/jbig2dec-0.17.recipe | 2 +- .../jbig2dec/patches/jbig2dec-0.17.patchset | 34 +++++++++++++++++-- 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/media-libs/jbig2dec/jbig2dec-0.17.recipe b/media-libs/jbig2dec/jbig2dec-0.17.recipe index e2d26ff13..bdb0afda6 100644 --- a/media-libs/jbig2dec/jbig2dec-0.17.recipe +++ b/media-libs/jbig2dec/jbig2dec-0.17.recipe @@ -8,7 +8,7 @@ ratios on the order of 100:1." HOMEPAGE="https://jbig2dec.com/" COPYRIGHT="2001-2009 Artifex Software, Inc." LICENSE="GNU GPL v3" -REVISION="2" +REVISION="3" SOURCE_URI="https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs950/jbig2dec-$portVersion.tar.gz" CHECKSUM_SHA256="f72bad7102638b31fa96be7492fb3d447a83d71c644cffd01f2a7ec52bd5fb72" PATCHES="jbig2dec-$portVersion.patchset" diff --git a/media-libs/jbig2dec/patches/jbig2dec-0.17.patchset b/media-libs/jbig2dec/patches/jbig2dec-0.17.patchset index 399e97892..88168483f 100644 --- a/media-libs/jbig2dec/patches/jbig2dec-0.17.patchset +++ b/media-libs/jbig2dec/patches/jbig2dec-0.17.patchset @@ -1,11 +1,11 @@ -From b90c4388ae17eb7198d0ef73b4772f2b13aa199b Mon Sep 17 00:00:00 2001 +From f01b3b2c6dbec26a373410b1d5d44d72e3c73909 Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Sun, 17 Nov 2013 22:50:08 -0700 Subject: Change macro to AC_CONFIG_HEADERS diff --git a/configure.ac b/configure.ac -index e9dd8ee..6302f69 100644 +index dd9b63c..abfea77 100644 --- a/configure.ac +++ b/configure.ac @@ -5,7 +5,7 @@ AC_PREREQ(2.53) @@ -18,5 +18,33 @@ index e9dd8ee..6302f69 100644 dnl Library versioning - Adapted from the libtool info page dnl -- -1.8.3.4 +2.24.0 + + +From 8fecd6a59a06f3645a9b10d620302a3f4bdf4320 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Sat, 11 Jan 2020 21:07:00 +0100 +Subject: restore jbig2_ctx_new for ABI compatibility. + + +diff --git a/jbig2.c b/jbig2.c +index 07c7969..136cf78 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) + { +-- +2.24.0