From patchwork Wed May 2 20:08:38 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joerg Bornkessel X-Patchwork-Id: 12944 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1SPfqq-0003xb-UP for vdr@linuxtv.org; Wed, 02 May 2012 22:09:04 +0200 X-tubIT-Incoming-IP: 217.115.142.82 Received: from maggie.webpack.hosteurope.de ([217.115.142.82]) by mail.tu-berlin.de (exim-4.75/mailfrontend-3) with esmtp for id 1SPfqq-0000CJ-FN; Wed, 02 May 2012 22:08:40 +0200 Received: from i59f6d76b.versanet.de ([89.246.215.107] helo=mail.websitec.lan); authenticated by maggie.webpack.hosteurope.de running ExIM with esmtpa id 1SPfqq-0005Wg-3S; Wed, 02 May 2012 22:08:40 +0200 Received: from localhost (localhost [127.0.0.1]) by mail.websitec.lan (Postfix) with ESMTP id 94016E50134 for ; Wed, 2 May 2012 22:08:39 +0200 (CEST) Received: from mail.websitec.lan (localhost [127.0.0.1]) by localhost (AvMailGate-2.0.5-5) id 17387-0182B47E; Wed, 02 May 2012 22:08:39 +0200 Received: from VIRTUAL1 (newmain.websitec.lan [192.168.3.9]) by mail.websitec.lan (Postfix) with ESMTP id 81A1879E35D for ; Wed, 2 May 2012 22:08:39 +0200 (CEST) Date: Wed, 2 May 2012 22:08:38 +0200 From: Joerg Bornkessel X-Mailer: The Bat! (v4.0.24) Professional X-Priority: 3 (Normal) Message-ID: <1787092639.20120502220838@websitec.de> To: vdr@linuxtv.org MIME-Version: 1.0 X-AntiVirus: checked by AntiVir MailGate (version: 2.0.5-5; AVE: 7.9.10.52; VDF: 7.11.16.72; host: server.websitec.lan) X-bounce-key: webpack.hosteurope.de;ml@websitec.de;1335989320;5e41d3c0; X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2012.5.2.195416 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' HTML_00_01 0.05, HTML_00_10 0.05, MSGID_ADDED_BY_MTA 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1200_1299 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, __ANY_URI 0, __BAT_MSGID 0, __CT 0, __CTE 0, __CT_TEXT_PLAIN 0, __FW_1LN_BOT_MSGID 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_PRIORITY 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __MSGID_SPAM_THE_BAT 0, __SANE_MSGID 0, __SUBJ_ALPHA_START 0, __THEBAT_MUA 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_PATH 0, __URI_NO_WWW 0, __URI_NS ' X-LSpam-Score: -1.8 (-) X-LSpam-Report: No, score=-1.8 required=5.0 tests=BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, RDNS_NONE=0.793 autolearn=no Subject: [vdr] vdr-1.7.27 fails on compile against fontconfig-2.9.0 X-BeenThere: vdr@linuxtv.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: vdr@linuxtv.org List-Id: VDR Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 May 2012 20:09:04 -0000 Status: O X-Status: X-Keywords: X-UID: 26157 Hallo Klaus, included a small patch to fix compile problems with fontconfig-2.9.0 Error Message: vdr: fcmatch.c:850: IA__FcFontSort: Assertion `result != ((void *)0)' failed. Aborted this diff resolve the compile problem, backwards compatible to fontconfig-2.8.0 Credits? iam noticed the patch first time on IRC #gentoo-vdr submitted by negril don't know, if he has written the patch or if he found the patch somewhere in the wilderness... May be the patch writer will give i sign here to catch the credits Yust to informe you, befor vdr-2.0 is available ;) diff --git a/font.c b/font.c index 706a017..72c5ec3 100644 --- a/font.c +++ b/font.c @@ -482,7 +482,8 @@ cString cFont::GetFontFileName(const char *FontName) 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;