diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2013-12-03 15:08:30 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2013-12-03 15:08:30 +0100 |
| commit | 2382d88357fa8a3196f61d2643ac190278cc8132 (patch) | |
| tree | 423153f0bf1ba8988d236627828aaac6841ba016 | |
| parent | 8cd7d82d750ae1228ba96ae45f28b0169bdebf65 (diff) | |
| download | nx-libs-2382d88357fa8a3196f61d2643ac190278cc8132.tar.gz nx-libs-2382d88357fa8a3196f61d2643ac190278cc8132.tar.bz2 nx-libs-2382d88357fa8a3196f61d2643ac190278cc8132.zip | |
Add patch 604_nx-X11_recent-freetype-API.full.patch. Fix FTBFS against recent (>= 2.5.0) libfreetype6 API.
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/patches/604_nx-X11_recent-freetype-API.full.patch | 15 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 18 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 96887df2a..a4c78fbdd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ nx-libs (2:3.5.0.22-0x2go1) UNRELEASED; urgency=low issues. (Fixes: #314). [ Mike Gabriel ] + * Add patch 604_nx-X11_recent-freetype-API.full.patch. Fix FTBFS against + recent (>= 2.5.0) libfreetype6 API. * debian/source/format: + Switch to format 1.0. * debian/control: diff --git a/debian/patches/604_nx-X11_recent-freetype-API.full.patch b/debian/patches/604_nx-X11_recent-freetype-API.full.patch new file mode 100644 index 000000000..e751fb82d --- /dev/null +++ b/debian/patches/604_nx-X11_recent-freetype-API.full.patch @@ -0,0 +1,15 @@ +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 3526c8422..9e49395ed 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -49,6 +49,7 @@ 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 999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch 016_nx-X11_install-location.debian.patch 102_xserver-xext_set-securitypolicy-path.debian.patch |