yngwin 15/04/18 12:45:21
Added: fontconfig-2.11.93-fix-sigfpe.patch
fontconfig-2.11.93-latin-update.patch
fontconfig-2.11.93-rmdead.patch
fontconfig-2.11.93-addfile.patch
Log:
Version bump to development snapshot release. Roll new latin reorder patch,
adding Liberation as default font family. Add 3 post-release patches from
upstream. Drop old.
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key
0x4FDF9CFD2FAC514E!)
Revision Changes Path
1.1
media-libs/fontconfig/files/fontconfig-2.11.93-fix-sigfpe.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/fontconfig/files/fontconfig-2.11.93-fix-sigfpe.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/fontconfig/files/fontconfig-2.11.93-fix-sigfpe.patch?rev=1.1&content-type=text/plain
Index: fontconfig-2.11.93-fix-sigfpe.patch
===================================================================
>From 7bc07cf6c2a5685ab95f146f5af2b3bcd5f5864d Mon Sep 17 00:00:00 2001
From: Akira TAGOH <[email protected]>
Date: Mon, 30 Mar 2015 15:18:44 +0900
Subject: Fix SIGFPE
diff --git a/src/fcrange.c b/src/fcrange.c
index 37cf067..9b1b67b 100644
--- a/src/fcrange.c
+++ b/src/fcrange.c
@@ -204,7 +204,7 @@ FcRangeHash (const FcRange *r)
{
FcRange c = FcRangeCanonicalize (r);
int b = (int) (c.u.d.begin * 100);
- int e = (int) (c.u.d.end * 100);
+ int e = FcDoubleCmpEQ (c.u.d.end, DBL_MAX) ? INT_MAX : (int) (c.u.d.end *
100);
return b ^ (b << 1) ^ (e << 9);
}
--
cgit v0.10.2
1.1
media-libs/fontconfig/files/fontconfig-2.11.93-latin-update.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/fontconfig/files/fontconfig-2.11.93-latin-update.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/fontconfig/files/fontconfig-2.11.93-latin-update.patch?rev=1.1&content-type=text/plain
Index: fontconfig-2.11.93-latin-update.patch
===================================================================
--- fontconfig-2.11.93.orig/conf.d/60-latin.conf 2015-04-18
20:06:06.070687989 +0800
+++ fontconfig-2.11.93/conf.d/60-latin.conf 2015-04-18 20:14:15.245732796
+0800
@@ -4,46 +4,49 @@
<alias>
<family>serif</family>
<prefer>
- <family>Bitstream Vera Serif</family>
+ <family>Liberation Serif</family>
<family>DejaVu Serif</family>
<family>Times New Roman</family>
- <family>Thorndale AMT</family>
<family>Luxi Serif</family>
<family>Nimbus Roman No9 L</family>
<family>Nimbus Roman</family>
<family>Times</family>
+ <family>Thorndale AMT</family>
+ <family>Bitstream Vera Serif</family>
</prefer>
</alias>
<alias>
<family>sans-serif</family>
<prefer>
- <family>Bitstream Vera Sans</family>
+ <family>Liberation Sans</family>
<family>DejaVu Sans</family>
- <family>Verdana</family>
<family>Arial</family>
- <family>Albany AMT</family>
<family>Luxi Sans</family>
<family>Nimbus Sans L</family>
<family>Nimbus Sans</family>
<family>Helvetica</family>
<family>Lucida Sans Unicode</family>
<family>BPG Glaho International</family> <!--
lat,cyr,arab,geor -->
+ <family>Verdana</family>
<family>Tahoma</family> <!--
lat,cyr,greek,heb,arab,thai -->
+ <family>Albany AMT</family>
+ <family>Bitstream Vera Sans</family>
</prefer>
</alias>
<alias>
<family>monospace</family>
<prefer>
- <family>Bitstream Vera Sans Mono</family>
+ <family>Liberation Mono</family>
<family>DejaVu Sans Mono</family>
<family>Inconsolata</family>
<family>Andale Mono</family>
<family>Courier New</family>
- <family>Cumberland AMT</family>
<family>Luxi Mono</family>
<family>Nimbus Mono L</family>
<family>Nimbus Mono</family>
<family>Courier</family>
+ <family>Cumberland AMT</family>
+ <family>Bitstream Vera Sans Mono</family>
</prefer>
</alias>
<!--
@@ -64,6 +67,7 @@
<alias>
<family>cursive</family>
<prefer>
+ <family>Comic Neue</family>
<family>ITC Zapf Chancery Std</family>
<family>Zapfino</family>
<family>Comic Sans MS</family>
1.1 media-libs/fontconfig/files/fontconfig-2.11.93-rmdead.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/fontconfig/files/fontconfig-2.11.93-rmdead.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/fontconfig/files/fontconfig-2.11.93-rmdead.patch?rev=1.1&content-type=text/plain
Index: fontconfig-2.11.93-rmdead.patch
===================================================================
>From 7301f2f02816c5d44ee75dd0689c806c5aabdbda Mon Sep 17 00:00:00 2001
From: Akira TAGOH <[email protected]>
Date: Mon, 23 Mar 2015 13:18:49 +0900
Subject: Remove the dead code
diff --git a/src/fcdir.c b/src/fcdir.c
index 593382f..00dee72 100644
--- a/src/fcdir.c
+++ b/src/fcdir.c
@@ -136,8 +136,6 @@ FcFileScanFontConfig (FcFontSet *set,
ret = FcFalse;
}
}
- else if (font)
- FcPatternDestroy (font);
id++;
} while (font && ret && id < count);
return ret;
--
cgit v0.10.2
1.1
media-libs/fontconfig/files/fontconfig-2.11.93-addfile.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/fontconfig/files/fontconfig-2.11.93-addfile.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/fontconfig/files/fontconfig-2.11.93-addfile.patch?rev=1.1&content-type=text/plain
Index: fontconfig-2.11.93-addfile.patch
===================================================================
>From c965c9f67759585909fa03236bad826de85bd39c Mon Sep 17 00:00:00 2001
From: Akira TAGOH <[email protected]>
Date: Mon, 23 Mar 2015 13:30:59 +0900
Subject: Bug 89617 - FcConfigAppFontAddFile() returns false on any font file
Prior to the change of 32ac7c75e8db0135ef37cf86f92d8b9be000c8bb
FcConfigAppFontAddFile() always returned FcTrue no matter what
fonts was added. after that, it always returned FcFalse because
adding a font doesn't add any subdirs with FcFileScanConfig().
so changing that to simply ignore it.
Also fixing it to return FcFalse if non-fonts was added, i.e.
FcFreeTypeQuery() fails.
https://bugs.freedesktop.org/show_bug.cgi?id=89617
diff --git a/src/fccfg.c b/src/fccfg.c
index b92270b..5467493 100644
--- a/src/fccfg.c
+++ b/src/fccfg.c
@@ -2227,7 +2227,9 @@ FcConfigAppFontAddFile (FcConfig *config,
FcStrSetDestroy (subdirs);
return FcFalse;
}
- if ((sublist = FcStrListCreate (subdirs)))
+ if (subdirs->num == 0)
+ ret = FcTrue;
+ else if ((sublist = FcStrListCreate (subdirs)))
{
while ((subdir = FcStrListNext (sublist)))
{
diff --git a/src/fcdir.c b/src/fcdir.c
index 00dee72..2e7f0dc 100644
--- a/src/fcdir.c
+++ b/src/fcdir.c
@@ -136,6 +136,8 @@ FcFileScanFontConfig (FcFontSet *set,
ret = FcFalse;
}
}
+ else
+ ret = FcFalse;
id++;
} while (font && ret && id < count);
return ret;
diff --git a/test/Makefile.am b/test/Makefile.am
index f270b50..bf1ec24 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -24,6 +24,13 @@ test_pthread_LDADD = $(top_builddir)/src/libfontconfig.la
# to meaningfully test anything, and we are not installed yet.
#TESTS += test-pthread
endif
+check_PROGRAMS += test-bz89617
+test_bz89617_CFLAGS = \
+ -DSRCDIR="\"$(abs_srcdir)\""
+
+test_bz89617_LDADD = $(top_builddir)/src/libfontconfig.la
+TESTS += test-bz89617
+
noinst_PROGRAMS = $(check_PROGRAMS)
if !OS_WIN32
diff --git a/test/test-bz89617.c b/test/test-bz89617.c
new file mode 100644
index 0000000..389f470
--- /dev/null
+++ b/test/test-bz89617.c
@@ -0,0 +1,38 @@
+/*
+ * fontconfig/test/test-bz89617.c
+ *
+ * Copyright © 2000 Keith Packard
+ * Copyright © 2015 Akira TAGOH
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of the author(s) not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission. The authors make no
+ * representations about the suitability of this software for any purpose. It
+ * is provided "as is" without express or implied warranty.
+ *
+ * THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+#include <stdio.h>
+#include <fontconfig/fontconfig.h>
+
+int
+main (void)
+{
+ FcConfig *config = FcConfigGetCurrent ();
+
+ if (!FcConfigAppFontAddFile (config, SRCDIR "/4x6.pcf") ||
+ FcConfigAppFontAddFile (config, "/dev/null"))
+ return 1;
+
+ return 0;
+}
--
cgit v0.10.2
