From mboxrd@z Thu Jan  1 00:00:00 1970
From: Adolf Belka <adolf.belka@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 1/4] gd: Update to version 2.3.3
Date: Thu, 23 Sep 2021 14:24:48 +0200
Message-ID: <20210923122451.41131-1-adolf.belka@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3239491436932609126=="
List-Id: <development.lists.ipfire.org>

--===============3239491436932609126==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

- 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 g=
raphs
   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(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
 config/rootfiles/common/gd | 13 +++++++------
 lfs/gd                     | 15 +++++++++------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/config/rootfiles/common/gd b/config/rootfiles/common/gd
index 09366b717..434102084 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 134d2fccd..d4a593fbf 100644
--- a/lfs/gd
+++ b/lfs/gd
@@ -24,10 +24,10 @@
=20
 include Config
=20
-VER        =3D 2.0.33
+VER        =3D 2.3.3
=20
-THISAPP    =3D gd-$(VER)
-DL_FILE    =3D $(THISAPP).tar.gz
+THISAPP    =3D libgd-$(VER)
+DL_FILE    =3D $(THISAPP).tar.xz
 DL_FROM    =3D $(URL_IPFIRE)
 DIR_APP    =3D $(DIR_SRC)/$(THISAPP)
 TARGET     =3D $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects =3D $(DL_FILE)
=20
 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
=20
-$(DL_FILE)_MD5 =3D be0a6d326cd8567e736fbc75df0a5c45
+$(DL_FILE)_MD5 =3D 7a58b54d375eda236414201252a0ee3c
=20
 install : $(TARGET)
=20
@@ -69,9 +69,12 @@ $(subst %,%_MD5,$(objects)) :
=20
 $(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=3D/usr --disable-nls
+	cd $(DIR_APP) && ./configure \
+			--prefix=3D/usr \
+			--disable-static \
+			--without-tiff
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)
--=20
2.33.0


--===============3239491436932609126==--