File project.diff of Package geda-gaf
--- geda-gaf.spec.orig
+++ geda-gaf.spec
@@ -37,7 +37,7 @@ Patch3: geda-gaf-disable-failing
# PATCH-FIX-OPENSUSE geda-gaf-enable-guile-2.2.patch -- enable guile-2.2 (for Factory/TW)
Patch5: xorn-enable-guile-2.2.patch
# PATCH-FIX-OPENSUSE geda-gaf-enable-guile-2.0.patch -- enable guile-2.0 (for older distros)
-Patch6: geda-gaf-enable-guile-2.0.patch
+#Patch6: geda-gaf-enable-guile-2.0.patch
# PATCH-FIX-OPENSUSE geda-gaf-fix-uninitialized-variable.patch -- avoid build crash on potentially
# uninitialized variables (for Factory/TW)
Patch7: geda-gaf-fix-uninitialized-variable.patch
@@ -47,7 +47,11 @@ BuildRequires: doxygen
BuildRequires: fdupes
BuildRequires: flex
BuildRequires: gamin-devel
+%if 0%{?suse_version} > 1500
+BuildRequires: gcc7-c++
+%else
BuildRequires: gcc-c++
+%endif
BuildRequires: gdk-pixbuf-devel
BuildRequires: gettext-tools
BuildRequires: groff
@@ -266,19 +270,15 @@ creators, refdes renumbering tools and m
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
-%patch3 -p1
-%if 0%{?suse_version} > 1510
-%patch5 -p1
-%patch7 -p1
-%else
-%patch6 -p1
-%endif
+%autopatch -p1
%build
-# export LDFLAGS="-lm $LDFLAGS"
-# Required for Patch4
+# export LDFLAGS="-lm $LDFLAGS" # Required for Patch4
+export CFLAGS="$CFLAGS -fpermissive"
+%if 0%{?suse_version} > 1500
+export CC=/usr/bin/gcc-7
+export CXX=/usr/bin/g++-7
+%endif
./autogen.sh
%configure \
--docdir=%{_docdir}/%{name} \