libgd: update to 2.3.3

Refresh patches.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

diff --git a/libs/libgd/Makefile b/libs/libgd/Makefile
index 4ca2eff2b40293d252fde881c5ce192a2993f020..9e0108915a878657eec3d26f13113e17be00664d 100644 (file)
--- a/libs/libgd/Makefile
+++ b/libs/libgd/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libgd
-PKG_VERSION:=2.3.2
-PKG_RELEASE:=$(AUTORELEASE)
+PKG_VERSION:=2.3.3
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://github.com/$(PKG_NAME)/$(PKG_NAME)/releases/download/gd-$(PKG_VERSION)/
-PKG_HASH:=478a047084e0d89b83616e4c2cf3c9438175fb0cc55d8c8967f06e0427f7d7fb
+PKG_HASH:=3fe822ece20796060af63b7c60acb151e5844204d289da0ce08f8fdf131e5a61
 
 PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io>
 PKG_LICENSE:=MIT

diff --git a/libs/libgd/patches/010-webp.patch b/libs/libgd/patches/010-webp.patch
index e68a8ac5324f8dcdfdebfd504f6673ed32252bfa..2b21bab8136df4b397cc279d69b3c248f0510c95 100644 (file)
--- 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 3deb6cc947d13e420e3497b60079519e3b3f5d9a..63c733ab1bae76e8d4cb01476455f58f90fae674 100644 (file)
--- 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