Hello community, here is the log from the commit of package vdr for openSUSE:Factory checked in at 2012-06-26 20:04:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vdr (Old) and /work/SRC/openSUSE:Factory/.vdr.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vdr", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/vdr/vdr.changes 2012-04-18 12:35:31.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.vdr.new/vdr.changes 2012-06-26 20:04:14.000000000 +0200 @@ -1,0 +2,6 @@ +Sat Jun 16 08:48:53 UTC 2012 - [email protected] + +- Add vdr-FcFontSort-72c5ec3.diff to fix bug + vdr: fcmatch.c:850: IA__FcFontSort: Assertion `result != ((void *)0)' failed. + +------------------------------------------------------------------- New: ---- vdr-FcFontSort-72c5ec3.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vdr.spec ++++++ --- /var/tmp/diff_new_pack.RtoEO9/_old 2012-06-26 20:04:16.000000000 +0200 +++ /var/tmp/diff_new_pack.RtoEO9/_new 2012-06-26 20:04:16.000000000 +0200 @@ -75,6 +75,8 @@ Patch24: vdr-v4l-2.6.38.patch # PATCH-FIX-UPSTREAM vdr-gcc47.patch [email protected] -- Fix build with gcc 4.7. Patch25: vdr-gcc47.patch +# UPSTREAM 72c5ec3 to make it work with fontconfig-2.9 +Patch26: vdr-FcFontSort-72c5ec3.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: vdr-devel Provides: vdr(abi) = %vdr_apiversion @@ -184,6 +186,7 @@ %patch24 %endif %patch25 -p1 +%patch26 -p1 %build #cp %{SOURCE5} README.SuSE ++++++ vdr-FcFontSort-72c5ec3.diff ++++++ Index: vdr-1.6.0/font.c =================================================================== --- vdr-1.6.0.orig/font.c +++ vdr-1.6.0/font.c @@ -413,7 +413,8 @@ cString cFont::GetFontFileName(const cha FcPatternAddBool(pat, FC_SCALABLE, FcTrue); FcConfigSubstitute(NULL, pat, FcMatchPattern); FcDefaultSubstitute(pat); - FcFontSet *fontset = FcFontSort(NULL, pat, FcFalse, NULL, NULL); + FcResult fresult; + FcFontSet *fontset = FcFontSort(NULL, pat, FcFalse, NULL, &fresult); if (fontset) { for (int i = 0; i < fontset->nfont; i++) { FcBool scalable; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
