[packages/libgdiplus] - updated to 6.1 - removed outdated ac patch - added pango patch (fixes pango linking with as-needed

[qboosh]

commit 1fcc5df9fb83aa356ffea26083f52ba5922cc115
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Apr 17 10:55:29 2022 +0200

    - updated to 6.1
    - removed outdated ac patch
    - added pango patch (fixes pango linking with as-needed)
    - now pango rendering is the default if pango is found (cairo is chosen only if there is no pango)

 libgdiplus-ac.patch    | 11 -----------
 libgdiplus-pango.patch | 13 +++++++++++++
 libgdiplus.spec        | 29 ++++++++++++++---------------
 3 files changed, 27 insertions(+), 26 deletions(-)
---
diff --git a/libgdiplus.spec b/libgdiplus.spec
index 3115d3e..b0b22c3 100644
--- a/libgdiplus.spec
+++ b/libgdiplus.spec
@@ -1,20 +1,20 @@
 #
 # Conditional build:
-%bcond_with	pango		# use pango for text rendering (experimental and unsupported)
+%bcond_without	pango		# pango based text rendering
 #
 # WARNING! libgdiplus will not work if compiled with -fomit-frame-pointer
 #
 Summary:	An Open Source implementation of the GDI+ API
 Summary(pl.UTF-8):	Otwarta implementacja API GDI+
 Name:		libgdiplus
-Version:	5.6.1
+Version:	6.1
 Release:	1
 License:	MIT
 Group:		Libraries
-Source0:	http://download.mono-project.com/sources/libgdiplus/%{name}-%{version}.tar.gz
-# Source0-md5:	71dd7e00431dbd590f2ea7f1d49f097e
-Patch0:		%{name}-ac.patch
-URL:		http://www.mono-project.com/docs/gui/libgdiplus/
+Source0:	https://download.mono-project.com/sources/libgdiplus/%{name}-%{version}.tar.gz
+# Source0-md5:	c017987f3434e0dcd5fa5e5c5631afeb
+Patch0:		%{name}-pango.patch
+URL:		https://www.mono-project.com/docs/gui/libgdiplus/
 BuildRequires:	autoconf >= 2.54
 BuildRequires:	automake >= 1:1.7
 BuildRequires:	cairo-devel >= 1.6.4
@@ -25,16 +25,17 @@ BuildRequires:	glib2-devel >= 1:2.2.3
 BuildRequires:	gtk+2-devel
 BuildRequires:	libexif-devel
 BuildRequires:	libjpeg-devel
-BuildRequires:	libpng-devel >= 2:1.4
+BuildRequires:	libpng-devel >= 2:1.6
 BuildRequires:	libtiff-devel
 BuildRequires:	libtool
-%{?with_pango:BuildRequires:	pango-devel >= 1:1.10}
+%{?with_pango:BuildRequires:	pango-devel >= 1:1.40.14}
 BuildRequires:	pkgconfig
 BuildRequires:	sed >= 4.0
 BuildRequires:	xorg-lib-libX11-devel
+%{!?with_pango:BuildConflicts:	pango-devel}
 Requires:	cairo >= 1.6.4
 Requires:	glib2 >= 1:2.2.3
-%{?with_pango:Requires:	pango >= 1:1.10}
+%{?with_pango:Requires:	pango >= 1:1.40.14}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %undefine	__cxx
@@ -61,9 +62,9 @@ Requires:	giflib-devel
 Requires:	glib2-devel >= 1:2.2.3
 Requires:	libexif-devel
 Requires:	libjpeg-devel
-Requires:	libpng-devel >= 2:1.4
+Requires:	libpng-devel >= 2:1.6
 Requires:	libtiff-devel
-%{?with_pango:Requires:	pango-devel >= 1:1.10}
+%{?with_pango:Requires:	pango-devel >= 1:1.40.14}
 Requires:	xorg-lib-libXrender-devel
 
 %description devel
@@ -88,9 +89,6 @@ Statyczna biblioteka libgdiplus.
 %setup -q
 %patch0 -p1
 
-# prefer default libpng instead of libpng14 > libpng12 > default
-%{__sed} -e 's/libpng14/libpng/g' -i configure.ac
-
 %build
 %{__libtoolize}
 %{__aclocal}
@@ -98,6 +96,7 @@ Statyczna biblioteka libgdiplus.
 %{__autoheader}
 %{__automake}
 %configure \
+	--disable-silent-rules \
 	%{?with_pango:--with-pango}
 
 %{__make}
@@ -118,7 +117,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS COPYING ChangeLog %{?with_internal_cairo:LICENSE} NEWS README TODO
+%doc AUTHORS LICENSE NEWS README.md TODO
 %attr(755,root,root) %{_libdir}/libgdiplus.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libgdiplus.so.0
 # needed at runtime for mono to load it as gdiplus.dll
diff --git a/libgdiplus-ac.patch b/libgdiplus-ac.patch
deleted file mode 100644
index 9786819..0000000
--- a/libgdiplus-ac.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libgdiplus-5.6.1/configure.ac~	2019-03-14 21:08:54.000000000 +0100
-+++ libgdiplus-5.6.1/configure.ac	2019-04-03 09:17:17.886210084 +0200
-@@ -413,7 +413,7 @@
- AM_CONDITIONAL([HAS_X11], [test x$x11_available = xyes])
- 
- # Add xrender here so that we don't fail to find glib if we won't have xrender.pc
--if test "x$no_x" != "xyes" && "x$x11_available" = "xyes"; then
-+if test "x$no_x" != "xyes" && test "x$x11_available" = "xyes"; then
-    GDIPLUS_LIBS="$GDIPLUS_LIBS `$PKG_CONFIG --libs xrender `"
-    GDIPLUS_CFLAGS="$GDIPLUS_CFLAGS `$PKG_CONFIG --cflags xrender `"
- fi
diff --git a/libgdiplus-pango.patch b/libgdiplus-pango.patch
new file mode 100644
index 0000000..9fb4082
--- /dev/null
+++ b/libgdiplus-pango.patch
@@ -0,0 +1,13 @@
+--- libgdiplus-6.1/configure.ac.orig	2021-11-03 20:53:36.000000000 +0100
++++ libgdiplus-6.1/configure.ac	2022-04-17 10:42:27.774431994 +0200
+@@ -75,8 +75,8 @@ if test $text_v = "default"; then
+ 	  [text_v=pango], [text_v=cairo])
+ fi
+ if test $text_v = "pango"; then
+-	PANGO_LIBS="`$PKG_CONFIG --libs pangocairo `"
+-	PANGO_CFLAGS="`$PKG_CONFIG --cflags pangocairo `"
++	PANGO_LIBS="`$PKG_CONFIG --libs pangocairo pangoft2`"
++	PANGO_CFLAGS="`$PKG_CONFIG --cflags pangocairo pangoft2`"
+ 	AC_DEFINE(USE_PANGO_RENDERING,1,[Use Pango to measure and draw text])
+ 	GDIPLUS_PKG_REQ="$GDIPLUS_PKG_REQ pangocairo-1.0"
+ fi
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libgdiplus.git/commitdiff/1fcc5df9fb83aa356ffea26083f52ba5922cc115