diff --git a/packages/python/graphics/Pillow/patches/Pillow-0002-Fix-missing-symbols-as-libtiff-can-depend-on-libjpeg.patch b/packages/python/graphics/Pillow/patches/Pillow-0002-Fix-missing-symbols-as-libtiff-can-depend-on-libjpeg.patch new file mode 100644 index 0000000000..69d07dbeb0 --- /dev/null +++ b/packages/python/graphics/Pillow/patches/Pillow-0002-Fix-missing-symbols-as-libtiff-can-depend-on-libjpeg.patch @@ -0,0 +1,62 @@ +From d17947e802498a1315ea070cb0df5f01cb5c43c0 Mon Sep 17 00:00:00 2001 +From: Rudi Heitbaum +Date: Sat, 8 Jul 2023 12:39:40 +0000 +Subject: [PATCH] Fix missing symbols as libtiff can depend on libjpeg + +when compiling Pillow with libtiff and libjpeg (with jpeg12 enabled - +which is the default with libjpeg-3.0.0) the libtiff object +tif_jpeg_12.c.o uses the following libjpeg12 functions: +jpeg12_read_raw_data, jpeg12_read_scanlines, jpeg12_write_raw_data, +jpeg12_write_scanlines. + +update the ordering of libs.append(feature.tiff) to be before +libs.append(feature.jpeg) to allow the linker to include the required +functions. + +this issue occurs when the libtiff and libjpeg libraries are static +(not shared.) + +Signed-off-by: Rudi Heitbaum +--- + setup.py | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +diff --git a/setup.py b/setup.py +index 024634ad8..baf7b9395 100755 +--- a/setup.py ++++ b/setup.py +@@ -816,6 +816,15 @@ class pil_build_ext(build_ext): + + libs = self.add_imaging_libs.split() + defs = [] ++ if feature.tiff: ++ libs.append(feature.tiff) ++ defs.append(("HAVE_LIBTIFF", None)) ++ if sys.platform == "win32": ++ # This define needs to be defined if-and-only-if it was defined ++ # when compiling LibTIFF. LibTIFF doesn't expose it in `tiffconf.h`, ++ # so we have to guess; by default it is defined in all Windows builds. ++ # See #4237, #5243, #5359 for more information. ++ defs.append(("USE_WIN32_FILEIO", None)) + if feature.jpeg: + libs.append(feature.jpeg) + defs.append(("HAVE_LIBJPEG", None)) +@@ -830,15 +839,6 @@ class pil_build_ext(build_ext): + if feature.imagequant: + libs.append(feature.imagequant) + defs.append(("HAVE_LIBIMAGEQUANT", None)) +- if feature.tiff: +- libs.append(feature.tiff) +- defs.append(("HAVE_LIBTIFF", None)) +- if sys.platform == "win32": +- # This define needs to be defined if-and-only-if it was defined +- # when compiling LibTIFF. LibTIFF doesn't expose it in `tiffconf.h`, +- # so we have to guess; by default it is defined in all Windows builds. +- # See #4237, #5243, #5359 for more information. +- defs.append(("USE_WIN32_FILEIO", None)) + if feature.xcb: + libs.append(feature.xcb) + defs.append(("HAVE_XCB", None)) +-- +2.34.1 + diff --git a/packages/textproc/libxslt/package.mk b/packages/textproc/libxslt/package.mk index 58bdc4157d..c7f2bab3fd 100644 --- a/packages/textproc/libxslt/package.mk +++ b/packages/textproc/libxslt/package.mk @@ -4,10 +4,10 @@ PKG_NAME="libxslt" PKG_VERSION="1.1.38" -PKG_SHA256="5c7855f989cfa9ece9901a4e106d018f091b5bf742c8161f559c0b1cb561d076" +PKG_SHA256="1f32450425819a09acaff2ab7a5a7f8a2ec7956e505d7beeb45e843d0e1ecab1" PKG_LICENSE="MIT" PKG_SITE="http://xmlsoft.org/xslt/" -PKG_URL="https://gitlab.gnome.org/GNOME/${PKG_NAME}/-/archive/v${PKG_VERSION}/${PKG_NAME}-v${PKG_VERSION}.tar.bz2" +PKG_URL="https://download.gnome.org/sources/libxslt/$(get_pkg_version_maj_min)/libxslt-${PKG_VERSION}.tar.xz" PKG_DEPENDS_HOST="libxml2:host" PKG_DEPENDS_TARGET="toolchain libxml2" PKG_LONGDESC="A XSLT C library."