diff --git a/inkscape-gcc48-buildfix.patch b/inkscape-gcc48-buildfix.patch new file mode 100644 index 0000000..a011420 --- /dev/null +++ b/inkscape-gcc48-buildfix.patch @@ -0,0 +1,13 @@ +=== modified file 'src/widgets/desktop-widget.h' +--- src/widgets/desktop-widget.h 2011-06-06 06:43:00 +0000 ++++ src/widgets/desktop-widget.h 2013-01-05 14:34:09 +0000 +@@ -239,7 +239,7 @@ + private: + GtkWidget *tool_toolbox; + GtkWidget *aux_toolbox; +- GtkWidget *commands_toolbox,; ++ GtkWidget *commands_toolbox; + GtkWidget *snap_toolbox; + + static void init(SPDesktopWidget *widget); + diff --git a/inkscape.changes b/inkscape.changes index 99e0d33..ce1de94 100644 --- a/inkscape.changes +++ b/inkscape.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jun 24 10:19:35 UTC 2013 - cgiboudeaux@gmx.com + +- Add inkscape-gcc48-buildfix.patch: Fix build with GCC 4.8 + (lp#1095364). + ------------------------------------------------------------------- Mon Dec 17 23:11:27 UTC 2012 - dimstar@opensuse.org diff --git a/inkscape.spec b/inkscape.spec index 1d01c28..0b095b0 100644 --- a/inkscape.spec +++ b/inkscape.spec @@ -1,7 +1,7 @@ # # spec file for package inkscape # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -35,6 +35,8 @@ Patch1: inkscape-packages.patch Patch2: inkscape-return-on-exit.patch # PATCH-FIX-UPSTREAM inkscape-apply-invert-transform.patch bnc#779560 lp#840625 malcolmlewis@opensuse.org -- Apply invert transform to all image tags. Patch4: inkscape-apply-invert-transform.patch +# PATCH-FIX-UPSTREAM inkscape-gcc48-buildfix.patch lp#1095364 nicoduf@yahoo.fr -- Fix build with GCC 4.8. +Patch5: inkscape-gcc48-buildfix.patch BuildRequires: boost-devel BuildRequires: docbook-toys BuildRequires: fdupes @@ -158,6 +160,7 @@ Inkscape is a vector illustration program for the GNOME desktop. %patch1 -p1 %patch2 -p1 %patch4 -p1 +%patch5 -p0 %build RPM_OPT_FLAGS="%{optflags}"