[libfont-freetype-perl] 04/06: Drop Fallback_to_default_charmap_for_2.8.1.patch

[gregor herrmann]

This is an automated email from the git hooks/post-receive script.

gregoa pushed a commit to branch master
in repository libfont-freetype-perl.

commit 6f130a918820427fad14c5f01ad603aac29a4b69
Author: gregor herrmann <gregoa at debian.org>
Date:   Thu Oct 19 16:32:49 2017 +0200

    Drop Fallback_to_default_charmap_for_2.8.1.patch
    
    which was cherry-picked from upstream.
---
 .../Fallback_to_default_charmap_for_2.8.1.patch    | 28 ----------------------
 debian/patches/series                              |  1 -
 2 files changed, 29 deletions(-)

diff --git a/debian/patches/Fallback_to_default_charmap_for_2.8.1.patch b/debian/patches/Fallback_to_default_charmap_for_2.8.1.patch
deleted file mode 100644
index d398d12..0000000
--- a/debian/patches/Fallback_to_default_charmap_for_2.8.1.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 7b51bae468a75533c79c8ebea306495756b086bc Mon Sep 17 00:00:00 2001
-From: Ivan Baidakou <the.dmol at yandex.by>
-Date: Mon, 16 Oct 2017 17:58:16 +0300
-Subject: [PATCH] Fallback to default charmap for 2.8.1 for
- backward-compatibility
-Bug:  https://github.com/zmughal/p5-Font-FreeType/issues/21
-Bug-Debian: https://bugs.debian.org/878632
-
---- a/FreeType.xs
-+++ b/FreeType.xs
-@@ -420,6 +420,17 @@
-         extra->glyph_load_flags = glyph_load_flags;
-         extra->glyph_ft = 0;
-         RETVAL->generic.data = (void *) extra;
-+        /*
-+        set active charmap if we don't have one;  caused by regression:
-+        https://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=79e3789f81e14266578e71196ce71ecf5381d142
-+        http://lists.nongnu.org/archive/html/freetype/2017-10/msg00006.html
-+        */
-+#if (QEFFT2_FT_AT_LEAST(2,8,1))
-+        if (!RETVAL->charmap && RETVAL->num_charmaps) {
-+            RETVAL->charmap = RETVAL->charmaps[0];
-+        }
-+#endif
-+
-     OUTPUT:
-         RETVAL
- 
diff --git a/debian/patches/series b/debian/patches/series
index bf10e14..8ec3fbf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 02_new_functions.patch
-Fallback_to_default_charmap_for_2.8.1.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libfont-freetype-perl.git