From 03aeaea8484d52b906072973a834fd6f6025742aba3d216da5c477ec1e8666f2 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Mon, 11 May 2015 11:24:38 +0000 Subject: [PATCH 1/3] - updated to 20150430: this release includes a few bug fixes, performance enhancements, and refreshed icons. - download uthash when get-source.sh - fontforge --version now returns fontforge release version OBS-URL: https://build.opensuse.org/package/show/M17N/fontforge?expand=0&rev=52 --- fontforge-20150330-repacked.tar.gz | 3 --- fontforge-20150430-repacked.tar.gz | 3 +++ fontforge-version.patch | 32 ++++++++++++++++++++++++++++++ fontforge.changes | 8 ++++++++ fontforge.spec | 13 ++++++++++-- get-source.sh | 15 ++++++++------ 6 files changed, 63 insertions(+), 11 deletions(-) delete mode 100644 fontforge-20150330-repacked.tar.gz create mode 100644 fontforge-20150430-repacked.tar.gz create mode 100644 fontforge-version.patch diff --git a/fontforge-20150330-repacked.tar.gz b/fontforge-20150330-repacked.tar.gz deleted file mode 100644 index 21f3b8e..0000000 --- a/fontforge-20150330-repacked.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c706593ca9d39921148163bade339c0784298e0bdc0f94edf4f169d8dc0c0fb1 -size 232714240 diff --git a/fontforge-20150430-repacked.tar.gz b/fontforge-20150430-repacked.tar.gz new file mode 100644 index 0000000..0ce1f34 --- /dev/null +++ b/fontforge-20150430-repacked.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:684bfebe81cd52c89e566a45af623a2dfa0c7573b79951b2462c2079977e74ca +size 42173044 diff --git a/fontforge-version.patch b/fontforge-version.patch new file mode 100644 index 0000000..ca42817 --- /dev/null +++ b/fontforge-version.patch @@ -0,0 +1,32 @@ +Index: fontforge/start.c +=================================================================== +--- fontforge/start.c.orig 2015-04-30 22:29:11.000000000 +0200 ++++ fontforge/start.c 2015-05-11 12:45:19.923253423 +0200 +@@ -133,9 +133,14 @@ + } + + void doversion(const char *source_version_str) { ++ /* not to be upstreamed ! */ + if ( source_version_str!=NULL ) ++ { + printf( "fontforge %s\n", source_version_str ); ++ printf( "libfontforge %s\n", source_version_str ); ++ } else { + printf( "libfontforge %d\n", + FONTFORGE_VERSIONDATE_RAW ); ++ } + exit(0); + } +Index: fontforgeexe/startnoui.c +=================================================================== +--- fontforgeexe/startnoui.c.orig 2015-04-30 22:29:11.000000000 +0200 ++++ fontforgeexe/startnoui.c 2015-05-11 11:54:33.442771227 +0200 +@@ -116,7 +116,7 @@ + else if ( strcmp(pt,"-help")==0 ) + doscripthelp(); + else if ( strcmp(pt,"-version")==0 || strcmp(pt,"-v")==0 || strcmp(pt,"-V")==0 ) +- doversion(FONTFORGE_MODTIME_STR); ++ doversion(source_version_str); + } + # if defined(_NO_PYTHON) + ProcessNativeScript(argc, argv,stdin); diff --git a/fontforge.changes b/fontforge.changes index 2e01e99..9c1fa4a 100644 --- a/fontforge.changes +++ b/fontforge.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon May 11 08:36:20 UTC 2015 - pgajdos@suse.com + +- updated to 20150430: this release includes a few bug fixes, + performance enhancements, and refreshed icons. +- download uthash when get-source.sh +- fontforge --version now returns fontforge release version + ------------------------------------------------------------------- Fri May 1 13:17:09 UTC 2015 - coolo@suse.com diff --git a/fontforge.spec b/fontforge.spec index 3ab5722..dae298d 100644 --- a/fontforge.spec +++ b/fontforge.spec @@ -17,18 +17,20 @@ Name: fontforge -Version: 20150330 +Version: 20150430 Release: 0 Summary: A Font Editor License: GPL-3.0+ Group: Productivity/Graphics/Vector Editors Url: http://fontforge.org/ -# Source: https://github.com/fontforge/fontforge/releases/download/%{version}/fontforge-%{version}.tar.gz +# Source: https://github.com/fontforge/fontforge/archive/%{version}.tar.gz # see bug 926061, fontforge-*-repacked.tar.gz does not contain fontforge-*/win/gold/libX11-*.noarch.rpm Source0: fontforge-%{version}-repacked.tar.gz Source1: get-source.sh # suse specific Patch0: propagate-creation-and-modification-times-to-ttf.patch +# workardound for bug 930076, imho upstream should fix this +Patch1: fontforge-version.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: cairo-devel @@ -95,7 +97,14 @@ to develop applications that use FontForge libraries. %prep %setup -q %patch0 -p1 +%patch1 sed -i 's/\r$//' doc/html/{Big5.txt,corpchar.txt} +# workaround for bug 930076; we just need the _version_of_the_release_! (see also fontforge-version.patch) --- +grep 'doversion(FONTFORGE_MODTIME_STR)' fontforgeexe/startnoui.c && \ +sed -i 's:FONTFORGE_MODTIME_STR:"%{version}":' fontforgeexe/startnoui.c +grep 'doversion(FONTFORGE_MODTIME_STR)' fontforgeexe/startui.c && \ +sed -i 's:FONTFORGE_MODTIME_STR:"%{version}":' fontforgeexe/startui.c +# --- %build ./bootstrap --force diff --git a/get-source.sh b/get-source.sh index 3fb1124..3f98200 100644 --- a/get-source.sh +++ b/get-source.sh @@ -12,13 +12,16 @@ if [ -z $VERSION ]; then exit 1 fi -wget "https://github.com/fontforge/fontforge/releases/download/$VERSION/fontforge-$VERSION.tar.gz" -tar xf fontforge-$VERSION.tar.gz -cd fontforge-* +wget "https://github.com/fontforge/fontforge/archive/$VERSION.tar.gz" +tar xf $VERSION.tar.gz +pushd fontforge-$VERSION +# do not depend on git +git clone https://github.com/troydhanson/uthash +# remove not shippable files (bug 926061) rm win/gold/libX11-*.noarch.rpm -./bootsrap --copy --force -cd .. +./bootstrap --copy --force +popd tar czf fontforge-$VERSION-repacked.tar.gz fontforge-$VERSION rm -rf fontforge-$VERSION -rm fontforge-$VERSION.tar.gz +rm $VERSION.tar.gz From 780aa454fe67db2a78f11ad6a6c6d4031965af29013109aeada8b753cf039ac9 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Mon, 11 May 2015 11:26:30 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/M17N/fontforge?expand=0&rev=53 --- fontforge.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/fontforge.spec b/fontforge.spec index dae298d..72d126d 100644 --- a/fontforge.spec +++ b/fontforge.spec @@ -30,6 +30,7 @@ Source1: get-source.sh # suse specific Patch0: propagate-creation-and-modification-times-to-ttf.patch # workardound for bug 930076, imho upstream should fix this +# https://github.com/fontforge/fontforge/issues/2270 Patch1: fontforge-version.patch BuildRequires: autoconf BuildRequires: automake From 5f42e728c49e1c5371b67f4ba581ef34f2372f0530a598605b0e996d84971328 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Mon, 11 May 2015 11:47:07 +0000 Subject: [PATCH 3/3] + fontforge-version.patch OBS-URL: https://build.opensuse.org/package/show/M17N/fontforge?expand=0&rev=54 --- fontforge.changes | 1 + 1 file changed, 1 insertion(+) diff --git a/fontforge.changes b/fontforge.changes index 9c1fa4a..1be48ee 100644 --- a/fontforge.changes +++ b/fontforge.changes @@ -5,6 +5,7 @@ Mon May 11 08:36:20 UTC 2015 - pgajdos@suse.com performance enhancements, and refreshed icons. - download uthash when get-source.sh - fontforge --version now returns fontforge release version + + fontforge-version.patch ------------------------------------------------------------------- Fri May 1 13:17:09 UTC 2015 - coolo@suse.com