gentoo resync : 25.05.2018

2 files changed, 48 insertions, 3 deletions

diff --git a/media-gfx/inkscape/files/inkscape-0.92.3-freetype_pkgconfig.patch b/media-gfx/inkscape/files/inkscape-0.92.3-freetype_pkgconfig.patch
index 0f577bd0e9ab..d00c23d8addc 100644
--- a/media-gfx/inkscape/files/inkscape-0.92.3-freetype_pkgconfig.patch
+++ b/media-gfx/inkscape/files/inkscape-0.92.3-freetype_pkgconfig.patch
@@ -1,6 +1,19 @@
---- inkscape-0.92.3/configure.ac
-+++ inkscape-0.92.3/configure.ac
-@@ -252,12 +252,9 @@
+From 62ed18b4d99e690298cc1984b6f2df2363d165fe Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Fri, 18 May 2018 07:55:38 +0200
+Subject: [PATCH] Use pkg-config to find freetype
+
+As of freetype-2.9.1 the freetype-config file no longer gets installed
+by default.
+---
+ configure.ac | 9 +++------
+ 1 file changed, 3 insertions(+), 6 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 12a081612b..1b75e23670 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -252,12 +252,9 @@ AC_CHECK_FUNCS([mallinfo], [
  			 [#include <malloc.h>])
  ])
  
@@ -16,3 +29,6 @@
  AC_SUBST(FREETYPE_CFLAGS)
  AC_SUBST(FREETYPE_LIBS)
  
+-- 
+2.17.0
+
diff --git a/media-gfx/inkscape/files/inkscape-0.92.3-poppler-0.65.patch b/media-gfx/inkscape/files/inkscape-0.92.3-poppler-0.65.patch
new file mode 100644
index 000000000000..86d9e48396df
--- /dev/null
+++ b/media-gfx/inkscape/files/inkscape-0.92.3-poppler-0.65.patch
@@ -0,0 +1,29 @@
+From 332a80f4847715546be9a00756f693b4aa1316e2 Mon Sep 17 00:00:00 2001
+From: Jan Palus <atler@pld-linux.org>
+Date: Fri, 25 May 2018 00:30:17 +0200
+Subject: [PATCH] Fix compilation with poppler 0.65.0
+
+replace unused includes with one that is actually used
+
+Signed-off-by: Jan Palus <atler@pld-linux.org>
+---
+ src/extension/internal/pdfinput/pdf-parser.cpp | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
+index 6c498f9..caaeca1 100644
+--- a/src/extension/internal/pdfinput/pdf-parser.cpp
++++ b/src/extension/internal/pdfinput/pdf-parser.cpp
+@@ -37,8 +37,7 @@ extern "C" {
+ #include "util/units.h"
+ 
+ #include "goo/gmem.h"
+-#include "goo/GooTimer.h"
+-#include "goo/GooHash.h"
++#include "goo/GooString.h"
+ #include "GlobalParams.h"
+ #include "CharTypes.h"
+ #include "Object.h"
+-- 
+2.17.0
+