From 48221441c4fd377965b7f37f5bcc24baa36aacb3 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sun, 19 Sep 2021 01:23:17 -0700 Subject: libgd: update to 2.3.3 Refresh patches. Signed-off-by: Rosen Penev --- libs/libgd/patches/010-webp.patch | 4 ++-- libs/libgd/patches/100-no-cxx.patch | 12 +++++------- 2 files changed, 7 insertions(+), 9 deletions(-) (limited to 'libs/libgd/patches') diff --git a/libs/libgd/patches/010-webp.patch b/libs/libgd/patches/010-webp.patch index e68a8ac53..2b21bab81 100644 --- a/libs/libgd/patches/010-webp.patch +++ b/libs/libgd/patches/010-webp.patch @@ -1,6 +1,6 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -118,7 +118,7 @@ else (USE_EXT_GD) +@@ -134,7 +134,7 @@ else (USE_EXT_GD) endif (ENABLE_ICONV) IF (ENABLE_WEBP) @@ -9,7 +9,7 @@ ENDIF (ENABLE_WEBP) IF (ENABLE_HEIF) -@@ -179,10 +179,10 @@ else (USE_EXT_GD) +@@ -195,10 +195,10 @@ else (USE_EXT_GD) LIST(APPEND PKG_REQUIRES_PRIVATES zlib) ENDIF(ZLIB_FOUND) diff --git a/libs/libgd/patches/100-no-cxx.patch b/libs/libgd/patches/100-no-cxx.patch index 3deb6cc94..63c733ab1 100644 --- a/libs/libgd/patches/100-no-cxx.patch +++ b/libs/libgd/patches/100-no-cxx.patch @@ -1,24 +1,22 @@ --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -24,8 +24,6 @@ SET (LIBGD_SRC_FILES +@@ -18,7 +18,6 @@ SET (LIBGD_SRC_FILES gd_io_dp.c gd_io_file.c gd_io_ss.c - gd_io_stream.cxx -- gd_io_stream.h gd_jpeg.c gd_matrix.c gd_nnquant.c -@@ -61,8 +59,6 @@ SET (LIBGD_SRC_FILES +@@ -44,7 +43,6 @@ SET (LIBGD_SRC_FILES + gdfx.c gdhelpers.c - gdhelpers.h gdkanji.c - gdpp.cxx -- gdpp.h gdtables.c gdxpm.c - jisx0208.h -@@ -203,7 +199,6 @@ install(FILES + wbmp.c +@@ -193,7 +191,6 @@ install(FILES gdfonts.h gdfontt.h gdfx.h -- cgit v1.2.3