From: Adolf Belka <adolf.belka@ipfire.org>
Date: Thu, 23 Sep 2021 12:24:48 +0000 (+0200)
Subject: gd: Update to version 2.3.3
X-Git-Tag: v2.27-core161~2^2~40
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5f71d0a6bf369719e2456c2ffe34e4ac2b103e94;p=ipfire-2.x.git

gd: Update to version 2.3.3

- Update from 2.0.33 (2006) to 2.3.3 (Sep 2021)
- Updating gd requires GD-Graph and perl-GD to be updated otherwise the png graphs
   didn't work so all required changes are part of this patch series
- Update rootfile
- Dependencies checked from library so bump. Nothing found.
- Changelog is too large to include here.
   For full details see https://github.com/libgd/libgd/releases

Tested-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---

diff --git a/config/rootfiles/common/gd b/config/rootfiles/common/gd
index 09366b717a..434102084c 100644
--- a/config/rootfiles/common/gd
+++ b/config/rootfiles/common/gd
@@ -4,15 +4,15 @@
 #usr/bin/gd2togif
 #usr/bin/gd2topng
 #usr/bin/gdcmpgif
-#usr/bin/gdlib-config
 #usr/bin/gdparttopng
 #usr/bin/gdtopng
 #usr/bin/giftogd2
 #usr/bin/pngtogd
 #usr/bin/pngtogd2
 #usr/bin/webpng
-#usr/include/entities.h
 #usr/include/gd.h
+#usr/include/gd_color_map.h
+#usr/include/gd_errors.h
 #usr/include/gd_io.h
 #usr/include/gdcache.h
 #usr/include/gdfontg.h
@@ -21,8 +21,9 @@
 #usr/include/gdfonts.h
 #usr/include/gdfontt.h
 #usr/include/gdfx.h
-#usr/lib/libgd.a
+#usr/include/gdpp.h
 #usr/lib/libgd.la
-usr/lib/libgd.so
-usr/lib/libgd.so.2
-usr/lib/libgd.so.2.0.0
+#usr/lib/libgd.so
+usr/lib/libgd.so.3
+usr/lib/libgd.so.3.0.11
+#usr/lib/pkgconfig/gdlib.pc
diff --git a/lfs/gd b/lfs/gd
index 134d2fccdf..d4a593fbfb 100644
--- a/lfs/gd
+++ b/lfs/gd
@@ -24,10 +24,10 @@
 
 include Config
 
-VER        = 2.0.33
+VER        = 2.3.3
 
-THISAPP    = gd-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+THISAPP    = libgd-$(VER)
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = be0a6d326cd8567e736fbc75df0a5c45
+$(DL_FILE)_MD5 = 7a58b54d375eda236414201252a0ee3c
 
 install : $(TARGET)
 
@@ -69,9 +69,12 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
 	$(UPDATE_AUTOMAKE)
-	cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
+	cd $(DIR_APP) && ./configure \
+			--prefix=/usr \
+			--disable-static \
+			--without-tiff
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)