rpm/inkscape
SHA256
1
0
Fork 0
forked from pool/inkscape
Code Pull Requests Activity

Accepting request 621712 from home:iznogood:branches:graphics

Browse Source 
- Add Fix-compilation-poppler-0_65.patch: Fix compilation with
  poppler 0.65.0 and newer. Replace unused includes with one that
  is actually used (lp#1772883).

OBS-URL: https://build.opensuse.org/request/show/621712
OBS-URL: https://build.opensuse.org/package/show/graphics/inkscape?expand=0&rev=40
This commit is contained in:
Ismail Dönmez 2018-07-09 13:00:48 +00:00 committed by Git OBS Bridge
parent bf1f9c4dea
commit 350e9c0084
3 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Fix-compilation-poppler-0_65.patch Normal file
View File

@ -0,0 +1,28 @@
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

7
inkscape.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Jul 9 12:38:09 UTC 2018 - bjorn.lie@gmail.com
- Add Fix-compilation-poppler-0_65.patch: Fix compilation with
poppler 0.65.0 and newer. Replace unused includes with one that
is actually used (lp#1772883).
-------------------------------------------------------------------
Sat Jun 2 21:34:36 UTC 2018 - bjorn.lie@gmail.com

3
inkscape.spec
View File

@ -33,6 +33,8 @@ Patch0: inkscape-packages.patch
Patch1: build_internal_libraries_as_static.patch
# PATCH-FIX-OPENSUSE fix_install_targets.patch -- use correct libdir etc.
Patch2: fix_install_targets.patch
# PATCH-FIX-UPSTREAM Fix-compilation-poppler-0_65.patch -- Fix compilation with poppler 0.65.0
Patch3: Fix-compilation-poppler-0_65.patch
BuildRequires: gtkspell-devel
%if 0%{?suse_version} > 1325
@ -159,6 +161,7 @@ Inkscape is a vector graphics editor.
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%build
%ifarch %{arm}