[packages/kde4-kde3support] - some more gcc fixes required for x32

baggins baggins at pld-linux.org
Sun Mar 5 01:56:54 CET 2017


commit 7f21e22f274a4b3afd9ceab61b8922b7dfa1cbaa
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Mar 5 01:56:33 2017 +0100

    - some more gcc fixes required for x32

 gcc6.patch            | 35 +++++++++++++++++++++++++++++++++++
 kde4-kde3support.spec |  1 +
 2 files changed, 36 insertions(+)
---
diff --git a/kde4-kde3support.spec b/kde4-kde3support.spec
index cb4a0b5..2c2ab8a 100644
--- a/kde4-kde3support.spec
+++ b/kde4-kde3support.spec
@@ -273,6 +273,7 @@ if [ ! -f configure ]; then
 fi
 
 export path_sudo=%{_bindir}/sudo
+export CXXFLAGS="%{rpmcxxflags} -Wno-narrowing"
 %configure \
 	--%{?debug:en}%{!?debug:dis}able-debug%{?debug:=full} \
 	%{!?debug:--disable-rpath} \
diff --git a/gcc6.patch b/gcc6.patch
index 4a0d958..bb2ddd5 100644
--- a/gcc6.patch
+++ b/gcc6.patch
@@ -19,3 +19,38 @@ diff -up kdelibs-3.5.10/kate/part/katebuffer.cpp.than kdelibs-3.5.10/kate/part/k
      foldingList.resize(foldingList.size()-2,QGArray::SpeedOptim);
    }
    addIndentBasedFoldingInformation(foldingList,addindent,deindent);
+--- kdelibs-3.5.10/kdecore/network/kserversocket.cpp~	2005-09-10 10:27:10.000000000 +0200
++++ kdelibs-3.5.10/kdecore/network/kserversocket.cpp	2017-03-05 01:18:43.529185795 +0100
+@@ -292,7 +292,7 @@
+ 	}
+       else if (!listen())
+ 	// error happened during listen
+-	return false;
++	return NULL;
+     }
+ 
+   // check to see if we're doing a timeout
+--- kdelibs-3.5.10/acinclude.m4~	2017-03-05 01:16:57.000000000 +0100
++++ kdelibs-3.5.10/acinclude.m4	2017-03-05 01:23:49.733489472 +0100
+@@ -2168,9 +2168,6 @@
+ save_CXXFLAGS="$CXXFLAGS"
+ kde_safe_LIBS="$LIBS"
+ LIBS="$LIBS $X_EXTRA_LIBS"
+-if test "$GXX" = "yes"; then
+-CXXFLAGS="$CXXFLAGS -pedantic-errors"
+-fi
+ AC_TRY_COMPILE([
+ $2
+ ],
+--- kdelibs-3.5.10/admin/acinclude.m4.in~	2017-03-05 01:25:23.000000000 +0100
++++ kdelibs-3.5.10/admin/acinclude.m4.in	2017-03-05 01:27:21.469832283 +0100
+@@ -2168,9 +2168,6 @@
+ save_CXXFLAGS="$CXXFLAGS"
+ kde_safe_LIBS="$LIBS"
+ LIBS="$LIBS $X_EXTRA_LIBS"
+-if test "$GXX" = "yes"; then
+-CXXFLAGS="$CXXFLAGS -pedantic-errors"
+-fi
+ AC_TRY_COMPILE([
+ $2
+ ],
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kde4-kde3support.git/commitdiff/7f21e22f274a4b3afd9ceab61b8922b7dfa1cbaa



More information about the pld-cvs-commit mailing list