Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-xorg-modular grimoire by Ismael Luceno (9abec8cfbde7b858eb6aba34a203a081efd9dea0)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Ismael Luceno (9abec8cfbde7b858eb6aba34a203a081efd9dea0)
  • Date: Tue, 20 Jan 2015 09:45:01 -0600

GIT changes to devel-xorg-modular grimoire by Ismael Luceno
<ismael AT sourcemage.org>:

xorg-lib/libxft/HISTORY | 3 +++
xorg-lib/libxft/PRE_BUILD | 4 ----
xorg-lib/libxft/fix-freetype-includes.patch | 19 -------------------
3 files changed, 3 insertions(+), 23 deletions(-)

New commits:
commit 9abec8cfbde7b858eb6aba34a203a081efd9dea0
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

libxft: Remove freetype includes patch, not needed anymore

diff --git a/xorg-lib/libxft/HISTORY b/xorg-lib/libxft/HISTORY
index 29c8d1b..e11c511 100644
--- a/xorg-lib/libxft/HISTORY
+++ b/xorg-lib/libxft/HISTORY
@@ -1,3 +1,6 @@
+2015-01-20 Ismael Luceno <ismael AT sourcemage.org>
+ * PRE_BUILD, fix-freetype-includes.patch: Removed, not needed anymore
+
2014-12-04 Eric Sandall <sandalle AT sourcemage.org>
* PRE_BUILD, fix-freetype-includes.patch: Added to compile against
freetype2 2.5.0+

diff --git a/xorg-lib/libxft/PRE_BUILD b/xorg-lib/libxft/PRE_BUILD
deleted file mode 100755
index 2fb1dad..0000000
--- a/xorg-lib/libxft/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-message "${MESSAGE_COLOR}Fixing compilation against
${SPELL_COLOR}freetype2${DEFAULT_COLOR}" &&
-patch "${SOURCE_DIRECTORY}"/src/xftglyphs.c \
- "${SPELL_DIRECTORY}"/fix-freetype-includes.patch
diff --git a/xorg-lib/libxft/fix-freetype-includes.patch
b/xorg-lib/libxft/fix-freetype-includes.patch
deleted file mode 100644
index d36c3a7..0000000
--- a/xorg-lib/libxft/fix-freetype-includes.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-# Modified from https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=733385
-diff -Naur libXft-2.2.0.orig/src/xftglyphs.c libXft-2.2.0/src/xftglyphs.c
---- libXft-2.2.0.orig/src/xftglyphs.c 2009-10-16 14:27:08.000000000 -0700
-+++ libXft-2.2.0/src/xftglyphs.c 2014-12-04 15:03:54.485358680 -0800
-@@ -21,10 +21,12 @@
- */
-
- #include "xftint.h"
--#include <freetype/ftoutln.h>
-+#include <ft2build.h>
-+#include FT_OUTLINE_H
-+#include FT_LCD_FILTER_H
-
- #if HAVE_FT_GLYPHSLOT_EMBOLDEN
--#include <freetype/ftsynth.h>
-+#include FT_SYNTHESIS_H
- #endif
-
- static const int filters[3][3] = {



  • [SM-Commit] GIT changes to devel-xorg-modular grimoire by Ismael Luceno (9abec8cfbde7b858eb6aba34a203a081efd9dea0), Ismael Luceno, 01/20/2015

Archive powered by MHonArc 2.6.24.

Top of Page