[gentoo-commits] repo/gentoo:master commit in: app-text/poppler/files/, app-text/poppler/

[Andreas Sturmlechner]

commit:     c145c4b7287e9dd9e80724030be17b7ee1944afc
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  9 10:13:18 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jan  9 10:15:31 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c145c4b7

app-text/poppler: Fix build (missing include)

Closes: https://bugs.gentoo.org/643858
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 app-text/poppler/files/poppler-0.62.0-glibc.patch | 34 +++++++++++++++++++++++
 app-text/poppler/poppler-0.62.0-r1.ebuild         |  1 +
 2 files changed, 35 insertions(+)

diff --git a/app-text/poppler/files/poppler-0.62.0-glibc.patch b/app-text/poppler/files/poppler-0.62.0-glibc.patch
new file mode 100644
index 00000000000..6808e91601d
--- /dev/null
+++ b/app-text/poppler/files/poppler-0.62.0-glibc.patch
@@ -0,0 +1,34 @@
+From 7b434a7ad9333a3b2250d636a517c58d9a12bca2 Mon Sep 17 00:00:00 2001
+From: Pekka Vuorela <pekka.vuorela@×××××××××××.com>
+Date: Fri, 15 Dec 2017 16:56:20 +0200
+Subject: Honor configuration for building glibc copy of strtok_r
+
+config.h didn't get included and HAVE_STRTOK_R was never defined.
+Now getting via glibc.h.
+---
+ goo/glibc_strtok_r.cc | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/goo/glibc_strtok_r.cc b/goo/glibc_strtok_r.cc
+index e779bf5..e323bc2 100644
+--- a/goo/glibc_strtok_r.cc
++++ b/goo/glibc_strtok_r.cc
+@@ -50,12 +50,15 @@
+ // Copyright (C) 2012 Alexey Pavlov <alexpux@×××××.com>
+ // Copyright (C) 2012 Albert Astals Cid <aacid@×××.org>
+ // Copyright (C) 2017 Adrian Johnson <ajohnson@×××××××.com>
++// Copyright (C) 2017 Pekka Vuorela <pekka.vuorela@×××××××××××.com>
+ //
+ // To see a description of the changes please see the Changelog file that
+ // came with your tarball or type make ChangeLog if you are building from git
+ //
+ //========================================================================
+ 
++#include "glibc.h"
++
+ #ifndef HAVE_STRTOK_R
+ 
+ #include <string.h>
+-- 
+cgit v1.1
+

diff --git a/app-text/poppler/poppler-0.62.0-r1.ebuild b/app-text/poppler/poppler-0.62.0-r1.ebuild
index b582e20f1f7..9b19e865af5 100644
--- a/app-text/poppler/poppler-0.62.0-r1.ebuild
+++ b/app-text/poppler/poppler-0.62.0-r1.ebuild
@@ -61,6 +61,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-0.61.0-respect-cflags.patch"
 	"${FILESDIR}/${PN}-0.62.0-openjpeg2.patch"
 	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
+	"${FILESDIR}/${P}-glibc.patch" # bug 643858
 )
 
 src_prepare() {