[SCM] MLT multimedia framework packaging branch, master, updated. debian/6.4.1-6-13-ga2da7dd

[Patrick Matthäi]

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

The following commit has been merged in the master branch:
commit 366a74d28378bd310c3d854a0702a9114a8c8d94
Author: Patrick Matthäi <pmatthaei at debian.org>
Date:   Wed Jan 24 09:56:15 2018 +0100

     - Remove merged patch 05-fix_build_with_glibc_2.26.
---
 debian/changelog                                 |  1 +
 debian/patches/05-fix_build_with_glibc_2.26.diff | 37 ------------------------
 debian/patches/series                            |  5 ----
 3 files changed, 1 insertion(+), 42 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 66aae3b..82303d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ mlt (6.6.0-1) UNRELEASED; urgency=medium
     - Remove merged patch 02-crash-clipinfo-update.
     - Remove merged patch 03-use-external-libebur.
     - Remove merged patch 04-allow-repository_deletion_without_side_effect.
+    - Remove merged patch 05-fix_build_with_glibc_2.26.
 
  -- Patrick Matthäi <pmatthaei at debian.org>  Wed, 24 Jan 2018 09:53:33 +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
deleted file mode 100644
index 76850b9..0000000
--- a/debian/patches/05-fix_build_with_glibc_2.26.diff
+++ /dev/null
@@ -1,37 +0,0 @@
-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 53c0bdf..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +0,0 @@
-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