From: W. Michael Petullo <redacted>
Date: Thu, 9 Jan 2020 01:47:13 +0000 (-0500)
Subject: php7: update the gd module to depend on libgd-full
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=fa0d982c77200910f5fe2061531580ca3f362b1a;p=openwrt-packages.git

php7: update the gd module to depend on libgd-full

The php7-mod-gd package requires that freetype support exist in libgd. The
libgd-full package provides this, whereas the libgd package does only
if explicitly configured.

Ref: https://github.com/openwrt/packages/issues/10944
Signed-off-by: W. Michael Petullo <redacted>
Signed-off-by: Michael Heimpold <redacted>
---

diff --git a/lang/php7/Makefile b/lang/php7/Makefile
index 23f47c14e..64034def1 100644
--- a/lang/php7/Makefile
+++ b/lang/php7/Makefile
@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=php
 PKG_VERSION:=7.4.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_MAINTAINER:=Michael Heimpold <mhei@heimpold.de>
 PKG_LICENSE:=PHP-3.01
@@ -597,7 +597,7 @@ $(eval $(call BuildModule,exif,EXIF))
 $(eval $(call BuildModule,fileinfo,Fileinfo))
 $(eval $(call BuildModule,filter,Filter))
 $(eval $(call BuildModule,ftp,FTP,+PACKAGE_php7-mod-ftp:libopenssl))
-$(eval $(call BuildModule,gd,GD graphics,+PACKAGE_php7-mod-gd:libgd))
+$(eval $(call BuildModule,gd,GD graphics,+PACKAGE_php7-mod-gd:libgd-full))
 $(eval $(call BuildModule,gettext,Gettext,+PACKAGE_php7-mod-gettext:libintl-full))
 $(eval $(call BuildModule,gmp,GMP,+PACKAGE_php7-mod-gmp:libgmp))
 $(eval $(call BuildModule,iconv,iConv,$(ICONV_DEPENDS)))