aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-02-02 15:29:45 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-02-02 15:29:45 +0100
commit91dc4b5099128d024e98dce760c12f995ca4d8fc (patch)
treedc89d0c7559be0845689a97293ce92e5fdea965f
parent237d7487fc39a25108a2b690ec4c104edbd4b1c0 (diff)
downloadnx-libs-91dc4b5099128d024e98dce760c12f995ca4d8fc.tar.gz
nx-libs-91dc4b5099128d024e98dce760c12f995ca4d8fc.tar.bz2
nx-libs-91dc4b5099128d024e98dce760c12f995ca4d8fc.zip
Drop 604_nx-X11_recent-freetype-API.full.patch. Not used in current build process.
-rw-r--r--debian/patches/604_nx-X11_recent-freetype-API.full.patch15
-rw-r--r--debian/patches/series1
2 files changed, 0 insertions, 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 e751fb82d..000000000
--- 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@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 82c949ccd..e6398bc19 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