diff --git a/fontconfig-stylelang.patch b/fontconfig-stylelang.patch index c27f52c..6cf8768 100644 --- a/fontconfig-stylelang.patch +++ b/fontconfig-stylelang.patch @@ -2,7 +2,7 @@ Index: fontconfig-2.8.0/src/fcmatch.c =================================================================== --- fontconfig-2.8.0.orig/src/fcmatch.c +++ fontconfig-2.8.0/src/fcmatch.c -@@ -413,6 +413,43 @@ FcFontRenderPrepare (FcConfig *confi +@@ -413,6 +413,46 @@ FcFontRenderPrepare (FcConfig *confi } else v = FcValueCanonicalize(&FcPatternEltValues (fe)->value); @@ -39,7 +39,10 @@ Index: fontconfig-2.8.0/src/fcmatch.c + } while ((stlangs = FcValueListNext(stlangs))); + } + -+ style = FcValueCanonicalize(&sts->value); ++ if (sts) ++ style = FcValueCanonicalize(&sts->value); ++ else ++ style = ""; + v.u.s = style.u.s; + } + diff --git a/fontconfig.spec b/fontconfig.spec index ae7304a..e64a557 100644 --- a/fontconfig.spec +++ b/fontconfig.spec @@ -120,22 +120,30 @@ accepts font patterns and returns the nearest matching font. %patch35 -p1 %build -%configure --with-pic \ -%if %suse_version > 1100 - --disable-static \ -%endif - --with-freetype-lib=%_libdir \ - --with-x \ - --enable-libxml2=no \ - --with-confdir=/etc/fonts \ - --with-docdir=%{_defaultdocdir}/%{name} \ - --with-add-fonts=/usr/X11R6/lib/X11/fonts,/opt/kde3/share/fonts,/usr/local/share/fonts \ - %if %{build_docs} < 1 - --disable-docs - %else +#%configure --with-pic \ +#%if %suse_version > 1100 +# --disable-static \ +#%endif +# --with-freetype-lib=%_libdir \ +# --with-x \ +# --enable-libxml2=no \ +# --with-confdir=/etc/fonts \ +# --with-docdir=%{_defaultdocdir}/%{name} \ +# --with-add-fonts=/usr/X11R6/lib/X11/fonts,/opt/kde3/share/fonts,/usr/local/share/fonts \ +# %if %{build_docs} < 1 +# --disable-docs +# %else # -%endif -make %{?jobs:-j %jobs} +#%endif +#make %{?jobs:-j %jobs} +CFLAGS='-fmessage-length=0 -O0 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -g' +export CFLAGS +CXXFLAGS='-fmessage-length=0 -O0 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -g' +export CXXFLAGS +FFLAGS='-fmessage-length=0 -O0 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -g' +export FFLAGS +./configure --host=x86_64-unknown-linux-gnu --build=x86_64-unknown-linux-gnu --program-prefix= --prefix=/usr --exec-prefix=/usr --bindir=/usr/bin --sbindir=/usr/sbin --sysconfdir=/etc --datadir=/usr/share --includedir=/usr/include --libdir=/usr/lib64 --libexecdir=/usr/lib --localstatedir=/var --sharedstatedir=/usr/com --mandir=/usr/share/man --infodir=/usr/share/info --with-pic --disable-static --with-freetype-lib=/usr/lib64 --with-x --enable-libxml2=no --with-confdir=/etc/fonts --with-docdir=/usr/share/doc/packages/fontconfig --with-add-fonts=/usr/X11R6/lib/X11/fonts,/opt/kde3/share/fonts,/usr/local/share/fonts --disable-docs + %check export MALLOC_CHECK_=2