[packages/fontforge] - dependencies cleanup, .pc files cleanup (in link patch)

[qboosh]

commit 01b2c9d01bfafba184760c219b487e517fa66bfb
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Jun 24 09:14:42 2018 +0200

    - dependencies cleanup, .pc files cleanup (in link patch)

 fontforge-link.patch | 29 +++++++++++++++++++++++++++++
 fontforge.spec       |  6 ++----
 2 files changed, 31 insertions(+), 4 deletions(-)
---
diff --git a/fontforge.spec b/fontforge.spec
index 9df7eee..a6124ab 100644
--- a/fontforge.spec
+++ b/fontforge.spec
@@ -21,7 +21,6 @@ BuildRequires:	automake
 BuildRequires:	cairo-devel >= 1.6
 BuildRequires:	czmq-devel >= 2.2.0
 BuildRequires:	czmq-devel < 4
-BuildRequires:	fontconfig-devel
 BuildRequires:	freetype-devel >= 1:2.3.7
 BuildRequires:	gettext-tools
 BuildRequires:	giflib-devel
@@ -51,6 +50,7 @@ BuildRequires:	zeromq-devel >= 4.0.4
 BuildRequires:	zlib-devel
 Requires:	cairo >= 1.6
 Requires:	czmq >= 2.2.0
+Requires:	freetype >= 1:2.3.7
 Requires:	glib2 >= 1:2.6
 Requires:	iconv
 Requires:	libuninameslist >= 20130501
@@ -81,18 +81,16 @@ Summary(pl.UTF-8):	Pliki nagłówkowe bibliotek FontForge
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	cairo-devel >= 1.6
-Requires:	fontconfig-devel
 Requires:	freetype-devel >= 1:2.3.7
 Requires:	giflib-devel
 Requires:	libjpeg-devel
+Requires:	libltdl-devel
 Requires:	libpng-devel
 Requires:	libspiro-devel >= 1:0.2
 Requires:	libtiff-devel >= 4
 Requires:	libuninameslist-devel >= 20130501
-Requires:	libxml2-devel >= 2.0
 Requires:	pango-devel >= 1:1.10
 Requires:	xorg-lib-libX11-devel
-Requires:	xorg-lib-libXi-devel
 Requires:	zlib-devel
 
 %description devel
diff --git a/fontforge-link.patch b/fontforge-link.patch
index e05519f..91d79eb 100644
--- a/fontforge-link.patch
+++ b/fontforge-link.patch
@@ -27,3 +27,32 @@
  	po \
  	pycontrib \
  	share \
+--- fontforge-2.0.20170731/m4/fontforge_create_pkg-config_files.m4.orig	2017-07-22 07:00:39.158252006 +0200
++++ fontforge-2.0.20170731/m4/fontforge_create_pkg-config_files.m4	2018-06-24 09:03:38.755879927 +0200
+@@ -30,7 +30,7 @@
+ test x"${i_do_have_libuninameslist}" = xyes && test x"${with_libuninameslist}" != xno && __private_deps="${__private_deps} ${LIBUNINAMESLIST_LIBS}"
+ test x"${i_do_have_libunicodenames}" = xyes && __private_deps="${__private_deps} ${LIBUNICODENAMES_LIBS}"
+ test x"${i_do_have_libreadline}" = xyes && test x"${with_libreadline}" != xno && __private_deps="${__private_deps} ${LIBREADLINE_LIBS}"
+-test x"${i_do_have_x}" = xyes && __private_deps="${__private_deps} ${X_PRE_LIBS} ${X_LIBS} ${X_EXTRA_LIBS}"
++test x"${i_do_have_x}" = xyes && __private_deps="${__private_deps} ${X_LIBS} ${X_EXTRA_LIBS}"
+ __private_deps="${__private_deps} ${PTHREAD_LIBS}"
+ __private_deps="${__private_deps} ${LIBLTDL}"
+ __private_deps="${__private_deps} ${LIBS}"
+@@ -41,14 +41,14 @@
+ AC_SUBST([LIBFONTFORGE_PKGCONFIG_VERSION],["${__cleaned_version}"])
+ AC_SUBST([LIBFONTFORGE_PKGCONFIG_REQUIRES],[])
+ AC_SUBST([LIBFONTFORGE_PKGCONFIG_REQUIRES_PRIVATE],["${__pkg_deps}"])
+-AC_SUBST([LIBFONTFORGE_PKGCONFIG_LIBS],["-L${libdir} -lfontforge"])
++AC_SUBST([LIBFONTFORGE_PKGCONFIG_LIBS],["-lfontforge"])
+ AC_SUBST([LIBFONTFORGE_PKGCONFIG_LIBS_PRIVATE],["${__private_deps}"])
+ 
+ AC_SUBST([LIBFONTFORGEEXE_PKGCONFIG_VERSION],["${__cleaned_version}"])
+ AC_SUBST([LIBFONTFORGEEXE_PKGCONFIG_REQUIRES],[])
+ AC_SUBST([LIBFONTFORGEEXE_PKGCONFIG_REQUIRES_PRIVATE],["libfontforge ${__pkg_deps}"])
+-AC_SUBST([LIBFONTFORGEEXE_PKGCONFIG_LIBS],["-L${libdir} -lfontforgeexe"])
+-AC_SUBST([LIBFONTFORGEEXE_PKGCONFIG_LIBS_PRIVATE],["-L${libdir} ${__private_exe_deps} ${__private_deps}"])
++AC_SUBST([LIBFONTFORGEEXE_PKGCONFIG_LIBS],["-lfontforgeexe"])
++AC_SUBST([LIBFONTFORGEEXE_PKGCONFIG_LIBS_PRIVATE],["${__private_exe_deps} ${__private_deps}"])
+ 
+ AC_CONFIG_FILES([libfontforge.pc])
+ AC_CONFIG_FILES([libfontforgeexe.pc])
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/fontforge.git/commitdiff/01b2c9d01bfafba184760c219b487e517fa66bfb