[X2Go-Commits] [nx-libs] 06/08: Drop 604_nx-X11_recent-freetype-API.full.patch. Not used in current build process.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository nx-libs.

commit 2f1a0ad60dbce19596c860e176b77541add0a8e7
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Feb 2 15:29:45 2015 +0100

    Drop 604_nx-X11_recent-freetype-API.full.patch. Not used in current build process.
---
 .../604_nx-X11_recent-freetype-API.full.patch      |   15 ---------------
 debian/patches/series                              |    1 -
 2 files changed, 16 deletions(-)

diff --git a/debian/patches/604_nx-X11_recent-freetype-API.full.patch b/debian/patches/604_nx-X11_recent-freetype-API.full.patch
deleted file mode 100644
index e751fb8..0000000
--- a/debian/patches/604_nx-X11_recent-freetype-API.full.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Fix FTBFS against libfreetype6 (>= 2.5.0)
-Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
---- a/nx-X11/lib/Xft/xftglyphs.c
-+++ b/nx-X11/lib/Xft/xftglyphs.c
-@@ -23,7 +23,9 @@
-  */
- 
- #include "xftint.h"
--#include <freetype/ftoutln.h>
-+
-+#include <ft2build.h>
-+#include FT_FREETYPE_H
- 
- static const int    filters[3][3] = {
-     /* red */
diff --git a/debian/patches/series b/debian/patches/series
index 982c2a0..1b0e2b5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -65,7 +65,6 @@
 601_nx-X11_build-option-changes-to-not-use-bundled-libraries.full.patch
 602_nx-X11_initgroups.full.patch
 603_nx-X11_compilation_warnings.full.patch
-604_nx-X11_recent-freetype-API.full.patch
 605_nxcomp_Types.h-dont-use-STL-internals-on-libc++.full+lite.patch
 606_nx-X11_build-on-aarch64.full.patch
 607_nxcomp_macosx-X11-launcher-in-private-tmp.full+lite.patch

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git