From 8e6b5e3c4a8da28409a9c3d1672e34fc53cede32af2232b9aedc6b40b25e97ed Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Fri, 1 May 2015 15:49:29 +0000
Subject: [PATCH] Accepting request 304929 from
 home:coolo:branches:openSUSE:Factory

- also repackage the broken gnulib links to fix build with
  newer libtool

OBS-URL: https://build.opensuse.org/request/show/304929
OBS-URL: https://build.opensuse.org/package/show/M17N/fontforge?expand=0&rev=50
---
 fontforge-20150330-repacked.tar.gz                   |  4 ++--
 fontforge.changes                                    |  6 ++++++
 fontforge.spec                                       |  2 +-
 get-source.sh                                        |  5 ++++-
 ...gate-creation-and-modification-times-to-ttf.patch | 12 ++++++------
 5 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/fontforge-20150330-repacked.tar.gz b/fontforge-20150330-repacked.tar.gz
index 7ff7db2..21f3b8e 100644
--- a/fontforge-20150330-repacked.tar.gz
+++ b/fontforge-20150330-repacked.tar.gz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:94070fce0de20742282faea607635e8a374e60a753b7f3871e6ba9cfa703cbba
-size 120489451
+oid sha256:c706593ca9d39921148163bade339c0784298e0bdc0f94edf4f169d8dc0c0fb1
+size 232714240
diff --git a/fontforge.changes b/fontforge.changes
index 8b551ae..2e01e99 100644
--- a/fontforge.changes
+++ b/fontforge.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri May  1 13:17:09 UTC 2015 - coolo@suse.com
+
+- also repackage the broken gnulib links to fix build with 
+  newer libtool
+
 -------------------------------------------------------------------
 Mon Apr 20 07:10:42 UTC 2015 - pgajdos@suse.com
 
diff --git a/fontforge.spec b/fontforge.spec
index 7bb292f..3ab5722 100644
--- a/fontforge.spec
+++ b/fontforge.spec
@@ -98,7 +98,7 @@ to develop applications that use FontForge libraries.
 sed -i 's/\r$//' doc/html/{Big5.txt,corpchar.txt}
 
 %build
-./bootstrap
+./bootstrap --force
 %configure \
     --disable-static \
     --enable-pyextension \
diff --git a/get-source.sh b/get-source.sh
index 51a71dc..3fb1124 100644
--- a/get-source.sh
+++ b/get-source.sh
@@ -14,7 +14,10 @@ fi
 
 wget "https://github.com/fontforge/fontforge/releases/download/$VERSION/fontforge-$VERSION.tar.gz"
 tar xf fontforge-$VERSION.tar.gz
-rm fontforge-*/win/gold/libX11-*.noarch.rpm
+cd fontforge-*
+rm win/gold/libX11-*.noarch.rpm
+./bootsrap --copy --force
+cd ..
 tar czf fontforge-$VERSION-repacked.tar.gz fontforge-$VERSION
 rm -rf fontforge-$VERSION
 rm fontforge-$VERSION.tar.gz
diff --git a/propagate-creation-and-modification-times-to-ttf.patch b/propagate-creation-and-modification-times-to-ttf.patch
index dce8a4d..56d766c 100644
--- a/propagate-creation-and-modification-times-to-ttf.patch
+++ b/propagate-creation-and-modification-times-to-ttf.patch
@@ -6,11 +6,11 @@ Description: propagate creation and modification times to TTF
  coming from the source. This enables TrueType Font to be built
  reproducibly.
 
-diff --git a/fontforge/tottf.c b/fontforge/tottf.c
-index a980610..3d488b0 100644
---- a/fontforge/tottf.c
-+++ b/fontforge/tottf.c
-@@ -2812,7 +2812,6 @@ void cvt_unix_to_1904( long time, int32 result[2]) {
+Index: fontforge-20150330/fontforge/tottf.c
+===================================================================
+--- fontforge-20150330.orig/fontforge/tottf.c
++++ fontforge-20150330/fontforge/tottf.c
+@@ -2758,7 +2758,6 @@ void cvt_unix_to_1904( long long time, i
  
  static void sethead(struct head *head,SplineFont *sf,struct alltabs *at,
  	enum fontformat format, int32 *bsizes) {
@@ -18,7 +18,7 @@ index a980610..3d488b0 100644
      int i, lr, rl, indic_rearrange, arabic;
      ASM *sm;
      struct ttflangname *useng;
-@@ -2920,10 +2919,8 @@ static void sethead(struct head *head,SplineFont *sf,struct alltabs *at,
+@@ -2866,10 +2865,8 @@ static void sethead(struct head *head,Sp
  	head->flags |= (1<<9);		/* Apple documents this */
      /* if there are any indic characters, set bit 10 */