From cbf967fa56a8c3d6968b8fd16558b9b2b866ef9e688f03b2317e433d885c70e9 Mon Sep 17 00:00:00 2001 From: OBS User mrdocs Date: Mon, 10 Mar 2014 00:48:41 +0000 Subject: [PATCH] Accepting request 225215 from home:AndreasSchwab:f - fontforge-arraysubscript.patch: Fix invalid array subscript OBS-URL: https://build.opensuse.org/request/show/225215 OBS-URL: https://build.opensuse.org/package/show/M17N/fontforge?expand=0&rev=32 --- fontforge-arraysubscript.patch | 13 +++++++++++++ fontforge.changes | 5 +++++ fontforge.spec | 3 +++ 3 files changed, 21 insertions(+) create mode 100644 fontforge-arraysubscript.patch diff --git a/fontforge-arraysubscript.patch b/fontforge-arraysubscript.patch new file mode 100644 index 0000000..32e13aa --- /dev/null +++ b/fontforge-arraysubscript.patch @@ -0,0 +1,13 @@ +Index: fontforge-20120731-b/fontforge/contextchain.c +=================================================================== +--- fontforge-20120731-b.orig/fontforge/contextchain.c ++++ fontforge-20120731-b/fontforge/contextchain.c +@@ -928,7 +928,7 @@ return; + uc_strcpy(ubuf,buf); + } else { + ubuf[0]=' '; +- utf82u_strncpy(ubuf-1,classes[cols*r+0].u.md_str,sizeof(ubuf)/sizeof(ubuf[0])-2 ); ++ utf82u_strncpy(ubuf+1,classes[cols*r+0].u.md_str,sizeof(ubuf)/sizeof(ubuf[0])-2 ); + ubuf[sizeof(ubuf)/sizeof(ubuf[0])-2] = '\0'; + uc_strcat(ubuf," "); + } diff --git a/fontforge.changes b/fontforge.changes index 4da8fd4..ea2fe92 100644 --- a/fontforge.changes +++ b/fontforge.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Mar 9 13:40:08 UTC 2014 - schwab@linux-m68k.org + +- fontforge-arraysubscript.patch: Fix invalid array subscript + ------------------------------------------------------------------- Thu Nov 14 06:59:13 UTC 2013 - jengelh@inai.de diff --git a/fontforge.spec b/fontforge.spec index 24849c5..493f348 100644 --- a/fontforge.spec +++ b/fontforge.spec @@ -34,6 +34,8 @@ Patch2: libpng14-dynamic.diff # PATCH-FIX-OPENSUSE fontforge-python-module-name.diff -- change python module name according to naming policy Patch3: fontforge-python-module-name.diff Patch4: fontforge-fixgiflib.patch +# PATCH-FIX-UPSTREAM http://sourceforge.net/p/fontforge/git/ci/9ae25e0 +Patch5: fontforge-arraysubscript.patch BuildRequires: cairo-devel BuildRequires: fdupes @@ -104,6 +106,7 @@ to develop applications that use FontForge libraries. %if 0%{?suse_version} > 1230 %patch4 -p1 %endif +%patch5 -p1 mkdir docs tar -jxvf %{SOURCE1} -C docs