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
This commit is contained in:
Stephan Kulow 2015-05-01 15:49:29 +00:00 committed by Git OBS Bridge
parent f8666284c0
commit 8e6b5e3c4a
5 changed files with 19 additions and 10 deletions

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:94070fce0de20742282faea607635e8a374e60a753b7f3871e6ba9cfa703cbba oid sha256:c706593ca9d39921148163bade339c0784298e0bdc0f94edf4f169d8dc0c0fb1
size 120489451 size 232714240

View File

@ -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 Mon Apr 20 07:10:42 UTC 2015 - pgajdos@suse.com

View File

@ -98,7 +98,7 @@ to develop applications that use FontForge libraries.
sed -i 's/\r$//' doc/html/{Big5.txt,corpchar.txt} sed -i 's/\r$//' doc/html/{Big5.txt,corpchar.txt}
%build %build
./bootstrap ./bootstrap --force
%configure \ %configure \
--disable-static \ --disable-static \
--enable-pyextension \ --enable-pyextension \

View File

@ -14,7 +14,10 @@ fi
wget "https://github.com/fontforge/fontforge/releases/download/$VERSION/fontforge-$VERSION.tar.gz" wget "https://github.com/fontforge/fontforge/releases/download/$VERSION/fontforge-$VERSION.tar.gz"
tar xf 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 tar czf fontforge-$VERSION-repacked.tar.gz fontforge-$VERSION
rm -rf fontforge-$VERSION rm -rf fontforge-$VERSION
rm fontforge-$VERSION.tar.gz rm fontforge-$VERSION.tar.gz

View File

@ -6,11 +6,11 @@ Description: propagate creation and modification times to TTF
coming from the source. This enables TrueType Font to be built coming from the source. This enables TrueType Font to be built
reproducibly. reproducibly.
diff --git a/fontforge/tottf.c b/fontforge/tottf.c Index: fontforge-20150330/fontforge/tottf.c
index a980610..3d488b0 100644 ===================================================================
--- a/fontforge/tottf.c --- fontforge-20150330.orig/fontforge/tottf.c
+++ b/fontforge/tottf.c +++ fontforge-20150330/fontforge/tottf.c
@@ -2812,7 +2812,6 @@ void cvt_unix_to_1904( long time, int32 result[2]) { @@ -2758,7 +2758,6 @@ void cvt_unix_to_1904( long long time, i
static void sethead(struct head *head,SplineFont *sf,struct alltabs *at, static void sethead(struct head *head,SplineFont *sf,struct alltabs *at,
enum fontformat format, int32 *bsizes) { enum fontformat format, int32 *bsizes) {
@ -18,7 +18,7 @@ index a980610..3d488b0 100644
int i, lr, rl, indic_rearrange, arabic; int i, lr, rl, indic_rearrange, arabic;
ASM *sm; ASM *sm;
struct ttflangname *useng; 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 */ head->flags |= (1<<9); /* Apple documents this */
/* if there are any indic characters, set bit 10 */ /* if there are any indic characters, set bit 10 */