992da42db7
- Added patches: * don-t-mark-libpng-as-required-library-in-freetype-co.patch: it's private in pkgconfig file, and causes issues in downstream packages - As per patch, remove libpng-devel Requires from devel package OBS-URL: https://build.opensuse.org/request/show/211310 OBS-URL: https://build.opensuse.org/package/show/M17N/freetype2?expand=0&rev=85
40 lines
1.5 KiB
Diff
40 lines
1.5 KiB
Diff
From 752bf00d315bee455eab3b31009894141ca8efca Mon Sep 17 00:00:00 2001
|
|
From: Hrvoje Senjan <hrvoje.senjan@gmail.com>
|
|
Date: Thu, 12 Dec 2013 17:41:19 +0100
|
|
Subject: [PATCH 1/1] Don't mark libpng as required library in freetype-config
|
|
|
|
It is private in .pc anyway
|
|
---
|
|
builds/unix/freetype-config.in | 2 +-
|
|
builds/unix/unix-def.in | 1 -
|
|
2 files changed, 1 insertion(+), 2 deletions(-)
|
|
|
|
diff --git a/builds/unix/freetype-config.in b/builds/unix/freetype-config.in
|
|
index e4c504d..2fdf39f 100644
|
|
--- a/builds/unix/freetype-config.in
|
|
+++ b/builds/unix/freetype-config.in
|
|
@@ -137,7 +137,7 @@ if test "$echo_cflags" = "yes" ; then
|
|
fi
|
|
|
|
if test "$echo_libs" = "yes" ; then
|
|
- libs="-lfreetype %LIBZ% %LIBBZ2% %LIBPNG% %FT2_EXTRA_LIBS%"
|
|
+ libs="-lfreetype %LIBZ% %LIBBZ2% %FT2_EXTRA_LIBS%"
|
|
if test "${SYSROOT}$libdir" != "/usr/lib" &&
|
|
test "${SYSROOT}$libdir" != "/usr/lib64"; then
|
|
echo -L${SYSROOT}$libdir $libs
|
|
diff --git a/builds/unix/unix-def.in b/builds/unix/unix-def.in
|
|
index 491e974..ae2e3c5 100644
|
|
--- a/builds/unix/unix-def.in
|
|
+++ b/builds/unix/unix-def.in
|
|
@@ -103,7 +103,6 @@ $(OBJ_BUILD)/freetype-config: $(TOP_DIR)/builds/unix/freetype-config.in
|
|
sed -e 's|%FT2_EXTRA_LIBS%|$(FT2_EXTRA_LIBS)|' \
|
|
-e 's|%LIBBZ2%|$(LIBBZ2)|' \
|
|
-e 's|%LIBZ%|$(LIBZ)|' \
|
|
- -e 's|%LIBPNG%|$(LIBPNG)|' \
|
|
-e 's|%build_libtool_libs%|$(build_libtool_libs)|' \
|
|
-e 's|%exec_prefix%|$(exec_prefix)|' \
|
|
-e 's|%ft_version%|$(ft_version)|' \
|
|
--
|
|
1.8.5
|
|
|