Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-xorg-modular grimoire by Florian Franzmann (ec205e939024e9ffe7812c2c4d4a6aa64d1993fc)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Florian Franzmann (ec205e939024e9ffe7812c2c4d4a6aa64d1993fc)
  • Date: Sun, 6 Apr 2014 12:16:33 -0500

GIT changes to devel-xorg-modular grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

xorg-lib/libxft/0001-fix-freetype-include-path.patch | 30
+++++++++++++++++++
xorg-lib/libxft/HISTORY | 4 ++
xorg-lib/libxft/PRE_BUILD | 4 ++
3 files changed, 38 insertions(+)

New commits:
commit ec205e939024e9ffe7812c2c4d4a6aa64d1993fc
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

xorg-lib/libxft: fix include path for freetype headers

diff --git a/xorg-lib/libxft/0001-fix-freetype-include-path.patch
b/xorg-lib/libxft/0001-fix-freetype-include-path.patch
new file mode 100644
index 0000000..78f6be8
--- /dev/null
+++ b/xorg-lib/libxft/0001-fix-freetype-include-path.patch
@@ -0,0 +1,30 @@
+From 00be753f0b2b5f71293b1b01602e059fd03982c6 Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+Date: Sun, 6 Apr 2014 19:06:47 +0200
+Subject: [PATCH] fix freetype include path
+
+---
+ src/xftglyphs.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/xftglyphs.c b/src/xftglyphs.c
+index 2f3dc5a..602ef0f 100644
+--- a/src/xftglyphs.c
++++ b/src/xftglyphs.c
+@@ -21,10 +21,10 @@
+ */
+
+ #include "xftint.h"
+-#include <freetype/ftoutln.h>
+-#include <freetype/ftlcdfil.h>
++#include <freetype2/ftoutln.h>
++#include <freetype2/ftlcdfil.h>
+
+-#include <freetype/ftsynth.h>
++#include <freetype2/ftsynth.h>
+
+ /*
+ * Validate the memory info for a font
+--
+1.9.0
+
diff --git a/xorg-lib/libxft/HISTORY b/xorg-lib/libxft/HISTORY
index 9b64864..b1467d9 100644
--- a/xorg-lib/libxft/HISTORY
+++ b/xorg-lib/libxft/HISTORY
@@ -1,3 +1,7 @@
+2014-04-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * PRE_BUILD, 0001-fix-freetype-include-path.patch: fix include
+ path for freetype headers
+
2012-06-03 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.3.1

diff --git a/xorg-lib/libxft/PRE_BUILD b/xorg-lib/libxft/PRE_BUILD
new file mode 100755
index 0000000..48be04b
--- /dev/null
+++ b/xorg-lib/libxft/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+
+patch -p1 < $SPELL_DIRECTORY/0001-fix-freetype-include-path.patch



  • [SM-Commit] GIT changes to devel-xorg-modular grimoire by Florian Franzmann (ec205e939024e9ffe7812c2c4d4a6aa64d1993fc), Florian Franzmann, 04/06/2014

Archive powered by MHonArc 2.6.24.

Top of Page