From: Michael Heimpold <redacted>
Date: Tue, 3 Dec 2019 20:35:43 +0000 (+0100)
Subject: libgd: fix version in generated pkg-config .pc file
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=2065eb81471ccd7f3485177345170eff97a398b8;p=openwrt-packages.git

libgd: fix version in generated pkg-config .pc file

With the previous change to cmake, the generated pkg-config .pc
file does not contain the library version anymore. This breaks
programs which checks for a specific version, e.g. upcoming PHP 7.4.

The version is not filled because of a variable misnaming,
which was not covered by the imported upstream patch.

To not mangle the upstream patch, add an additional patch to
fix things up.

Signed-off-by: Michael Heimpold <redacted>
---

diff --git a/libs/libgd/Makefile b/libs/libgd/Makefile
index e298e9fc4..6dfe81df4 100644
--- a/libs/libgd/Makefile
+++ b/libs/libgd/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libgd
 PKG_VERSION:=2.2.5
-PKG_RELEASE:=4
+PKG_RELEASE:=5
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://github.com/$(PKG_NAME)/$(PKG_NAME)/releases/download/gd-$(PKG_VERSION)/
diff --git a/libs/libgd/patches/300-gdlib.pc-cmake.patch b/libs/libgd/patches/300-gdlib.pc-cmake.patch
new file mode 100644
index 000000000..fe1a726f6
--- /dev/null
+++ b/libs/libgd/patches/300-gdlib.pc-cmake.patch
@@ -0,0 +1,11 @@
+--- a/config/gdlib.pc.cmake
++++ b/config/gdlib.pc.cmake
+@@ -5,7 +5,7 @@ includedir=${prefix}/@CMAKE_INSTALL_INCL
+ 
+ Name: gd
+ Description: GD graphics library
+-Version: @GDLIB_VERSION@
++Version: @GD_VERSION@
+ Cflags: -I${includedir}
+ Libs.private: @LIBGD_DEP_LIBS@
+ Libs: -L${libdir} -lgd