From ee231cca0c5f915bf2133887aebe0183ed589356 Mon Sep 17 00:00:00 2001
From: Gwyn Ciesla <limburgher@gmail.com>
Date: Thu, 11 May 2017 08:18:12 -0500
Subject: [PATCH] Fix CFlags, corners, Wayland.

---
 .gitignore    |  1 +
 inkscape.spec | 30 ++++++++++--------------------
 sources       |  2 +-
 3 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/.gitignore b/.gitignore
index f2dae5c..86bd9d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ inkscape.tar.bz2
 /inkscape-0.92.0.tar.bz2
 /inkscape-0.92.1.tar_XlpI7qT.bz2
 /inkscape-r15604.tar.bz2
+/inkscape-r15686.tar.bz2
diff --git a/inkscape.spec b/inkscape.spec
index 3a10c30..5d35c7d 100644
--- a/inkscape.spec
+++ b/inkscape.spec
@@ -1,6 +1,6 @@
 Name:           inkscape
 Version:        0.92.1
-Release:        3.20170321bzr15604%{?dist}
+Release:        4.20170510bzr15686%{?dist}
 Summary:        Vector-based drawing program using SVG
 
 Group:          Applications/Productivity
@@ -8,7 +8,7 @@ License:        GPLv2+ and CC-BY
 URL:            http://inkscape.sourceforge.net/
 #Source0:        http://downloads.sourceforge.net/inkscape/%{name}-%{version}.tar.bz2
 #Source0:	https://inkscape.org/en/gallery/item/10682/inkscape-0.92.1.tar_XlpI7qT.bz2
-Source0:	inkscape-r15604.tar.bz2
+Source0:	inkscape-r15686.tar.bz2
 # AppData file. Upstream has merged a patch adding an appdata file
 # after into the 0.92 release branch.
 Source1:        %{name}.appdata.xml
@@ -105,7 +105,7 @@ graphics in W3C standard Scalable Vector Graphics (SVG) file format.
 
 
 %prep
-%setup -qn inkscape-r15604
+%setup -qn inkscape-r15686
 
 # https://bugs.launchpad.net/inkscape/+bug/314381
 # A couple of files have executable bits set,
@@ -118,19 +118,7 @@ find share/extensions -name '*.py' | xargs chmod -x
 dos2unix -k -q share/extensions/*.py
 
 %build
-# This is still needed with gcc6 until this is fixed:
-# https://bugs.launchpad.net/inkscape/+bug/1488079
-#export CXXFLAGS="%{optflags} -std=c++11"
-#./autogen.sh
-#%%configure                      \
-#        --with-python           \
-#        --with-perl             \
-#        --with-xft              \
-#        --enable-lcms2           \
-#        --enable-poppler-cairo
-mkdir build
-pushd build
-/usr/bin/cmake \
+%cmake \
         -DCMAKE_C_FLAGS_RELEASE:STRING="-DNDEBUG" \
         -DCMAKE_CXX_FLAGS_RELEASE:STRING="-DNDEBUG" \
         -DCMAKE_Fortran_FLAGS_RELEASE:STRING="-DNDEBUG" \
@@ -143,12 +131,11 @@ pushd build
 %if "lib64" == "lib64" 
         -DLIB_SUFFIX=64 \
 %endif 
-        -DBUILD_SHARED_LIBS:BOOL=OFF ..
-make
+        -DBUILD_SHARED_LIBS:BOOL=OFF .
+make %{?_smp_mflags}
 
 
 %install
-pushd build
 make install DESTDIR=$RPM_BUILD_ROOT
 sed -i 's/Drawing Shortcut Group/X-Drawing Shortcut Group/g' $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 find $RPM_BUILD_ROOT -type f -name 'lib*.a' | xargs rm -f
@@ -169,7 +156,6 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_datadir}/appdata/*.appda
 # Install Fedora Color Pallette
 install -pm 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/inkscape/palettes/
 
-popd
 %find_lang %{name}
 
 
@@ -240,6 +226,10 @@ fi
 
 
 %changelog
+* Wed May 10 2017 Gwyn Ciesla <limburgher@gmail.com> - 0.92.1-4.20170510bzr15686
+- Update to fix on Wayland.
+- Fix CFLAGS.
+
 * Tue Mar 28 2017 David Tardon <dtardon@redhat.com> - 0.92.1-3.20170321bzr15604
 - rebuild for poppler 0.53.0
 
diff --git a/sources b/sources
index 31161e1..9b4515a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (inkscape-r15604.tar.bz2) = 7863f7ae37da6a851c990052d42555d034f2df2a497f164a5ff0a236240d9e88b01f9f0c47ac5f21f71e1d4132babbe36cde4fab53b9f11eb33b2f7ecb73e9db
+SHA512 (inkscape-r15686.tar.bz2) = 28d742094d9a32a4f53f36cdddb2c235160c9495267cbbf6e09cc8418e804a9fa42212eea6ca536deec0c59d1931dea42375ef6638c56cda62fa3c22b5684375