diff --git a/fontconfig-stylelang.patch b/fontconfig-stylelang.patch deleted file mode 100644 index 6cf8768..0000000 --- a/fontconfig-stylelang.patch +++ /dev/null @@ -1,51 +0,0 @@ -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,46 @@ FcFontRenderPrepare (FcConfig *confi - } - else - v = FcValueCanonicalize(&FcPatternEltValues (fe)->value); -+ -+ /* This is workaround only!! */ -+ if (fe->object == FC_STYLE_OBJECT) -+ { -+ FcPatternElt *le, *sle; -+ FcValue lang, stlang, style; -+ FcValueList *stlangs, *sts; -+ int l; -+ -+ if ((le = FcPatternObjectFindElt(pat, FC_LANG_OBJECT))) -+ lang = FcValueCanonicalize(&FcPatternEltValues(le)->value); -+ else -+ { /* I think it is not needed. */ -+ lang.type = FcTypeString; -+ lang.u.s = (const FcChar8 *)"en"; -+ } -+ sts = FcPatternEltValues(fe); -+ sle = FcPatternObjectFindElt(font, FC_STYLELANG_OBJECT); -+ if (sle) /* style elt can be present, stylelang no (e. g. fc-match Times) */ -+ { /* if so, sts list contain only one value, so we can jump to style = .. */ -+ stlangs = FcPatternEltValues(sle); -+ l = 0; -+ -+ do -+ { -+ stlang = FcValueCanonicalize(&stlangs->value); -+ if (FcLangCompare(stlang.u.s, lang.u.s) < FcLangDifferentLang) -+ break; -+ sts = FcValueListNext(sts); -+ l++; -+ } while ((stlangs = FcValueListNext(stlangs))); -+ } -+ -+ if (sts) -+ style = FcValueCanonicalize(&sts->value); -+ else -+ style = ""; -+ v.u.s = style.u.s; -+ } -+ - FcPatternObjectAdd (new, fe->object, v, FcFalse); - } - for (i = 0; i < pat->num; i++) diff --git a/fontconfig.changes b/fontconfig.changes index 20bd231..a6440f5 100644 --- a/fontconfig.changes +++ b/fontconfig.changes @@ -1,10 +1,3 @@ -------------------------------------------------------------------- -Tue Nov 30 21:18:13 CET 2010 - pgajdos@suse.cz - -- workarounded problems with choosing right style lang - [bnc#379991], [bnc#457427] - * stylelang.patch - ------------------------------------------------------------------- Thu Nov 25 13:15:08 CET 2010 - pgajdos@suse.cz diff --git a/fontconfig.spec b/fontconfig.spec index e64a557..b3f220b 100644 --- a/fontconfig.spec +++ b/fontconfig.spec @@ -70,7 +70,6 @@ Patch31: bugzilla-246783-do-not-crash-when-config-files-contain-broken-st Patch32: usr-share-doc-packages.patch Patch33: bnc438855-make-FcInitReinitialize-work-again.patch Patch34: urw-aliases-whitespaces.patch -Patch35: %{name}-stylelang.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -117,33 +116,24 @@ accepts font patterns and returns the nearest matching font. %patch32 -p1 %patch33 -p1 %patch34 -p1 -%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} -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 - +%endif +make %{?jobs:-j %jobs} %check export MALLOC_CHECK_=2