2014-03-10 09:02:34 +01:00
|
|
|
From cef195062aa7f509a60b8765661ba4babd85b79c Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Hrvoje Senjan <hrvoje.senjan@gmail.com>
|
|
|
|
|
Date: Sun, 9 Mar 2014 20:09:12 +0100
|
|
|
|
|
Subject: [PATCH 1/1] Don't mark libpng as required library
|
|
|
|
|
|
|
|
|
|
It is private in .pc anyway
|
|
|
|
|
---
|
|
|
|
|
|
|
|
|
|
diff --git a/builds/unix/configure b/builds/unix/configure
|
2014-03-13 04:11:07 +01:00
|
|
|
index 4ae00dd..c3101e2 100755
|
2014-03-10 09:02:34 +01:00
|
|
|
--- a/builds/unix/configure
|
|
|
|
|
+++ b/builds/unix/configure
|
2014-12-08 17:14:10 +01:00
|
|
|
@@ -13691,7 +13691,6 @@ esac
|
2014-03-13 04:11:07 +01:00
|
|
|
# entries in Requires.private are separated by commas;
|
|
|
|
|
REQUIRES_PRIVATE="$zlib_reqpriv, \
|
|
|
|
|
$bzip2_reqpriv, \
|
|
|
|
|
- $libpng_reqpriv, \
|
|
|
|
|
$harfbuzz_reqpriv"
|
|
|
|
|
# beautify
|
|
|
|
|
REQUIRES_PRIVATE=`echo "$REQUIRES_PRIVATE" \
|
2014-12-08 17:14:10 +01:00
|
|
|
@@ -13705,7 +13704,6 @@ REQUIRES_PRIVATE=`echo "$REQUIRES_PRIVAT
|
|
|
|
|
|
|
|
|
|
LIBS_PRIVATE="$zlib_libpriv \
|
|
|
|
|
$bzip2_libpriv \
|
|
|
|
|
- $libpng_libpriv \
|
|
|
|
|
$harfbuzz_libpriv \
|
|
|
|
|
$ft2_extra_libs"
|
|
|
|
|
# beautify
|
|
|
|
|
@@ -13717,7 +13715,6 @@ LIBS_PRIVATE=`echo "$LIBS_PRIVATE" \
|
|
|
|
|
LIBSSTATIC_CONFIG="-lfreetype \
|
|
|
|
|
$zlib_libstaticconf \
|
|
|
|
|
$bzip2_libstaticconf \
|
|
|
|
|
- $libpng_libstaticconf \
|
|
|
|
|
$harfbuzz_libstaticconf \
|
|
|
|
|
$ft2_extra_libs"
|
2014-03-10 09:02:34 +01:00
|
|
|
# remove -L/usr/lib and -L/usr/lib64 since `freetype-config' adds them later
|
|
|
|
|
diff --git a/builds/unix/configure.raw b/builds/unix/configure.raw
|
2014-03-13 04:11:07 +01:00
|
|
|
index dd7e576..bac2645 100644
|
2014-03-10 09:02:34 +01:00
|
|
|
--- a/builds/unix/configure.raw
|
|
|
|
|
+++ b/builds/unix/configure.raw
|
2014-03-13 04:11:07 +01:00
|
|
|
@@ -914,7 +914,6 @@ esac
|
|
|
|
|
# entries in Requires.private are separated by commas;
|
|
|
|
|
REQUIRES_PRIVATE="$zlib_reqpriv, \
|
|
|
|
|
$bzip2_reqpriv, \
|
|
|
|
|
- $libpng_reqpriv, \
|
|
|
|
|
$harfbuzz_reqpriv"
|
|
|
|
|
# beautify
|
|
|
|
|
REQUIRES_PRIVATE=`echo "$REQUIRES_PRIVATE" \
|
2014-12-08 17:14:10 +01:00
|
|
|
@@ -928,7 +927,6 @@ REQUIRES_PRIVATE=`echo "$REQUIRES_PRIVAT
|
|
|
|
|
|
|
|
|
|
LIBS_PRIVATE="$zlib_libpriv \
|
|
|
|
|
$bzip2_libpriv \
|
|
|
|
|
- $libpng_libpriv \
|
|
|
|
|
$harfbuzz_libpriv \
|
|
|
|
|
$ft2_extra_libs"
|
|
|
|
|
# beautify
|
|
|
|
|
@@ -940,7 +938,6 @@ LIBS_PRIVATE=`echo "$LIBS_PRIVATE" \
|
|
|
|
|
LIBSSTATIC_CONFIG="-lfreetype \
|
|
|
|
|
$zlib_libstaticconf \
|
|
|
|
|
$bzip2_libstaticconf \
|
|
|
|
|
- $libpng_libstaticconf \
|
|
|
|
|
$harfbuzz_libstaticconf \
|
|
|
|
|
$ft2_extra_libs"
|
2014-03-10 09:02:34 +01:00
|
|
|
# remove -L/usr/lib and -L/usr/lib64 since `freetype-config' adds them later
|
