[SCM] MLT multimedia framework packaging branch, master, updated. debian/6.4.1-5-5-gf4369d3

[Patrick Matthäi]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/krap/mlt.git;a=commitdiff;h=f4369d3

The following commit has been merged in the master branch:
commit f4369d33be29f1921ea00bb88b1be2bf8448631c
Author: Patrick Matthäi <pmatthaei at debian.org>
Date:   Tue Nov 7 11:11:54 2017 +0100

    * Adopt patch 05-fix_build_with_glibc_2.26 to fix a FTBFS with newer glibc
      versions.
---
 debian/changelog                                 |  2 ++
 debian/patches/05-fix_build_with_glibc_2.26.diff | 37 ++++++++++++++++++++++++
 debian/patches/series                            |  2 ++
 3 files changed, 41 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 0f47c54..67136ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ mlt (6.4.1-6) UNRELEASED; urgency=medium
   * Add patch 04-allow-repository_deletion_without_side_effect to fix a crash
     on exiting kdenlive.
     Closes: #869226
+  * Adopt patch 05-fix_build_with_glibc_2.26 to fix a FTBFS with newer glibc
+    versions.
 
  -- Patrick Matthäi <pmatthaei at debian.org>  Mon, 06 Nov 2017 14:45:50 +0100
 
diff --git a/debian/patches/05-fix_build_with_glibc_2.26.diff b/debian/patches/05-fix_build_with_glibc_2.26.diff
new file mode 100644
index 0000000..76850b9
--- /dev/null
+++ b/debian/patches/05-fix_build_with_glibc_2.26.diff
@@ -0,0 +1,37 @@
+From 2125e3955a0d0be61571cf43b674f74b4b93c6f8
+From fbf6a5187776f2f392cf258935ff49e4c0e87024
+From: Dan Dennedy <dan at dennedy.org>
+Subject: [PATCH] Fix #248 xlocale.h was removed in glibc 2.26.
+
+Reported by schnitzeltony on Andreas Müller.
+Patch by Dave Plater.
+---
+ src/framework/mlt_property.h | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+Index: b/src/framework/mlt_property.h
+===================================================================
+--- a/src/framework/mlt_property.h
++++ b/src/framework/mlt_property.h
+@@ -3,7 +3,7 @@
+  * rief Property class declaration
+  * \see mlt_property_s
+  *
+- * Copyright (C) 2003-2014 Meltytech, LLC
++ * Copyright (C) 2003-2017 Meltytech, LLC
+  *
+  * This library is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Lesser General Public
+@@ -31,7 +31,11 @@
+ #endif
+ 
+ #if defined(__GLIBC__) || defined(__APPLE__) || (__FreeBSD_version >= 900506)
+-#include <xlocale.h>
++#  if __GLIBC_MINOR__ >= 26 && !defined(__APPLE__)
++#    include <locale.h>
++#  else
++#    include <xlocale.h>
++#  endif
+ #else
+ typedef char* locale_t;
+ #endif
diff --git a/debian/patches/series b/debian/patches/series
index 97d8162..53c0bdf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,5 @@
 01-crash-affine.diff
 02-crash-clipinfo-update.diff
 03-use-external-libebur.diff
+04-allow-repository_deletion_without_side_effect.diff
+05-fix_build_with_glibc_2.26.diff

-- 
MLT multimedia framework packaging