From 2650963727c15e09f1bfca58b836978b24f94b0777d7077998c60524b4445f04 Mon Sep 17 00:00:00 2001
From: Hrvoje Senjan <hrvoje.senjan@gmail.com>
Date: Thu, 13 Mar 2014 03:11:07 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/M17N/freetype2?expand=0&rev=88

---
 don-t-mark-libpng-as-required-library.patch | 30 ++++++++++++++-------
 freetype2.changes                           |  6 +++++
 ft2demos.changes                            |  6 +++++
 3 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/don-t-mark-libpng-as-required-library.patch b/don-t-mark-libpng-as-required-library.patch
index 481f2c0..0ae3556 100644
--- a/don-t-mark-libpng-as-required-library.patch
+++ b/don-t-mark-libpng-as-required-library.patch
@@ -5,15 +5,20 @@ Subject: [PATCH 1/1] Don't mark libpng as required library
 
 It is private in .pc anyway
 ---
- builds/unix/configure     | 1 -
- builds/unix/configure.raw | 1 -
- 2 files changed, 2 deletions(-)
 
 diff --git a/builds/unix/configure b/builds/unix/configure
-index 4ae00dd..5ef2115 100755
+index 4ae00dd..c3101e2 100755
 --- a/builds/unix/configure
 +++ b/builds/unix/configure
-@@ -13718,7 +13718,6 @@ LIBS_PRIVATE=`echo "$LIBS_PRIVATE"  \
+@@ -13692,7 +13692,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" \
+@@ -13718,7 +13717,6 @@ LIBS_PRIVATE=`echo "$LIBS_PRIVATE"  \
  LIBS_CONFIG="-lfreetype      \
               $ZLIB_LIBS      \
               $BZIP2_LIBS     \
@@ -22,10 +27,18 @@ index 4ae00dd..5ef2115 100755
               $ft2_extra_libs"
  # 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
-index dd7e576..aff1238 100644
+index dd7e576..bac2645 100644
 --- a/builds/unix/configure.raw
 +++ b/builds/unix/configure.raw
-@@ -940,7 +940,6 @@ LIBS_PRIVATE=`echo "$LIBS_PRIVATE"  \
+@@ -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" \
+@@ -940,7 +939,6 @@ LIBS_PRIVATE=`echo "$LIBS_PRIVATE"  \
  LIBS_CONFIG="-lfreetype      \
               $ZLIB_LIBS      \
               $BZIP2_LIBS     \
@@ -33,6 +46,3 @@ index dd7e576..aff1238 100644
               $HARFBUZZ_LIBS  \
               $ft2_extra_libs"
  # remove -L/usr/lib and -L/usr/lib64 since `freetype-config' adds them later
--- 
-1.9.0
-
diff --git a/freetype2.changes b/freetype2.changes
index 484919e..f7e7771 100644
--- a/freetype2.changes
+++ b/freetype2.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Mar 13 03:14:26 UTC 2014 - hrvoje.senjan@gmail.com
+
+- Improve don-t-mark-libpng-as-required-library.patch: also handle
+  Requires.private case (freetype does not include png headers)
+
 -------------------------------------------------------------------
 Sun Mar  9 18:39:56 UTC 2014 - hrvoje.senjan@gmail.com
 
diff --git a/ft2demos.changes b/ft2demos.changes
index 22919a0..471dd70 100644
--- a/ft2demos.changes
+++ b/ft2demos.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Mar 13 03:14:26 UTC 2014 - hrvoje.senjan@gmail.com
+
+- Improve don-t-mark-libpng-as-required-library.patch: also handle
+  Requires.private case (freetype does not include png headers)
+
 -------------------------------------------------------------------
 Sun Mar  9 18:39:56 UTC 2014 - hrvoje.senjan@gmail.com