Skip to content

Commit

Permalink
app-text/poppler: Fix build (missing include)
Browse files Browse the repository at this point in the history
Closes: https://bugs.gentoo.org/643858
Package-Manager: Portage-2.3.19, Repoman-2.3.6
  • Loading branch information
a17r committed Jan 9, 2018
1 parent 6e75c5a commit c145c4b
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 0 deletions.
34 changes: 34 additions & 0 deletions app-text/poppler/files/poppler-0.62.0-glibc.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
From 7b434a7ad9333a3b2250d636a517c58d9a12bca2 Mon Sep 17 00:00:00 2001
From: Pekka Vuorela <[email protected]>
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 <[email protected]>
// Copyright (C) 2012 Albert Astals Cid <[email protected]>
// Copyright (C) 2017 Adrian Johnson <[email protected]>
+// Copyright (C) 2017 Pekka Vuorela <[email protected]>
//
// 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

1 change: 1 addition & 0 deletions app-text/poppler/poppler-0.62.0-r1.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down

0 comments on commit c145c4b

Please sign in to comment.