From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-996581-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id DA9C9138330
for <garchives@archives.gentoo.org>; Tue, 9 Jan 2018 10:15:50 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 3CB9BE0922;
Tue, 9 Jan 2018 10:15:50 +0000 (UTC)
Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 1A36DE0922
for <gentoo-commits@lists.gentoo.org>; Tue, 9 Jan 2018 10:15:50 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 1C8B0335C3A
for <gentoo-commits@lists.gentoo.org>; Tue, 9 Jan 2018 10:15:49 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 7D162151
for <gentoo-commits@lists.gentoo.org>; Tue, 9 Jan 2018 10:15:47 +0000 (UTC)
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" <asturm@gentoo.org>
Message-ID: <1515492931.c145c4b7287e9dd9e80724030be17b7ee1944afc.asturm@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/poppler/files/, app-text/poppler/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-text/poppler/files/poppler-0.62.0-glibc.patch app-text/poppler/poppler-0.62.0-r1.ebuild
X-VCS-Directories: app-text/poppler/files/ app-text/poppler/
X-VCS-Committer: asturm
X-VCS-Committer-Name: Andreas Sturmlechner
X-VCS-Revision: c145c4b7287e9dd9e80724030be17b7ee1944afc
X-VCS-Branch: master
Date: Tue, 9 Jan 2018 10:15:47 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 254327bd-54a9-4591-a199-4b8b013e8a96
X-Archives-Hash: b538257429dd0ad39a24c7b7a4850743
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@jollamobile.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@gmail.com>
+ // Copyright (C) 2012 Albert Astals Cid <aacid@kde.org>
+ // Copyright (C) 2017 Adrian Johnson <ajohnson@redneon.com>
++// Copyright (C) 2017 Pekka Vuorela <pekka.vuorela@jollamobile.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() {