Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (a3baaf26cf07984b8cc4ac6e5c48276ac819b18a)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (a3baaf26cf07984b8cc4ac6e5c48276ac819b18a)
  • Date: Sat, 10 Feb 2018 15:28:01 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

x11-libs/fontconfig/HISTORY | 3 +++
x11-libs/fontconfig/PRE_BUILD | 6 ++++++
x11-libs/fontconfig/crash.patch | 27 +++++++++++++++++++++++++++
3 files changed, 36 insertions(+)

New commits:
commit a3baaf26cf07984b8cc4ac6e5c48276ac819b18a
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

x11-libs/fontconfig: added an upstream patch to avoid crashes in devel
branch

diff --git a/x11-libs/fontconfig/HISTORY b/x11-libs/fontconfig/HISTORY
index a7298cd..5e1c71e 100644
--- a/x11-libs/fontconfig/HISTORY
+++ b/x11-libs/fontconfig/HISTORY
@@ -1,3 +1,6 @@
+2018-02-10 Pavel Vinogradov <public AT sourcemage.org>
+ * PRE_BUILD, crash.patch: added to fix crashing devel branch
+
2018-01-03 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.12.91 (devel)
* DEPENDS: add gettext itstool
diff --git a/x11-libs/fontconfig/PRE_BUILD b/x11-libs/fontconfig/PRE_BUILD
new file mode 100755
index 0000000..c351bcd
--- /dev/null
+++ b/x11-libs/fontconfig/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&
+
+if [[ "${FONTCONFIG_BRANCH}" == "devel" ]]; then
+ patch -p1 < "${SPELL_DIRECTORY}/crash.patch"
+fi
diff --git a/x11-libs/fontconfig/crash.patch b/x11-libs/fontconfig/crash.patch
new file mode 100644
index 0000000..66031cd
--- /dev/null
+++ b/x11-libs/fontconfig/crash.patch
@@ -0,0 +1,27 @@
+From 7ca28c2fedb34c1db5ee3116d335f15195859db0 Mon Sep 17 00:00:00 2001
+From: Behdad Esfahbod <behdad AT behdad.org>
+Date: Mon, 18 Dec 2017 21:22:21 -0500
+Subject: Don't crash
+
+Not proper fix necessarily. But fixes this crash:
+https://bugs.freedesktop.org/show_bug.cgi?id=101889#c81
+---
+ src/fcmatch.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/fcmatch.c b/src/fcmatch.c
+index 5d30cc7..95bb204 100644
+--- a/src/fcmatch.c
++++ b/src/fcmatch.c
+@@ -653,7 +653,7 @@ FcFontRenderPrepare (FcConfig *config,
+ if (!l)
+ goto bail0;
+ dir = FcStrDirname (FcValueString (&l->value));
+- if (FcHashTableFind (config->alias_table, dir, (void **)
&alias))
++ if (config && FcHashTableFind (config->alias_table, dir,
(void **) &alias))
+ {
+ FcChar8 *base = FcStrBasename (FcValueString (&l->value));
+ FcChar8 *s = FcStrBuildFilename (alias, base, NULL);
+--
+cgit v1.1
+



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (a3baaf26cf07984b8cc4ac6e5c48276ac819b18a), Pavel Vinogradov, 02/10/2018

Archive powered by MHonArc 2.6.24.

Top of Page