[X2Go-Commits] nx-libs.git - master (branch) updated: redist-server/3.5.0.21-6-g2382d88

[X2Go dev team]

The branch, master has been updated
       via  2382d88357fa8a3196f61d2643ac190278cc8132 (commit)
      from  8cd7d82d750ae1228ba96ae45f28b0169bdebf65 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2382d88357fa8a3196f61d2643ac190278cc8132
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Dec 3 15:08:30 2013 +0100

    Add patch 604_nx-X11_recent-freetype-API.full.patch. Fix FTBFS against recent (>= 2.5.0) libfreetype6 API.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                                   |    2 ++
 .../604_nx-X11_recent-freetype-API.full.patch      |   15 +++++++++++++++
 debian/patches/series                              |    1 +
 3 files changed, 18 insertions(+)
 create mode 100644 debian/patches/604_nx-X11_recent-freetype-API.full.patch

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 96887df..a4c78fb 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 0000000..e751fb8
--- /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 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 3526c84..9e49395 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


hooks/post-receive
-- 
nx-libs.git (NX (redistributed))

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "nx-libs.git" (NX (redistributed)).