From 68c8542c53a55ac917a8261d59cc103fb2153441 Mon Sep 17 00:00:00 2001 From: Ray-V Date: Sun, 6 May 2018 09:49:32 +0100 Subject: [PATCH] Revised patch for building koffice with clang --- Apps/koffice/koffice.SlackBuild | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/Apps/koffice/koffice.SlackBuild b/Apps/koffice/koffice.SlackBuild index 43b46ff..cc4f8b7 100755 --- a/Apps/koffice/koffice.SlackBuild +++ b/Apps/koffice/koffice.SlackBuild @@ -46,9 +46,13 @@ getsource_fn untar_fn ## patch for clang -## first hunk based on 0004-fix-an-FTBFS-when-build-with-clang.patch -## @ http://trinity-devel.pearsoncomputing.net/?0::11397[:get:6] +## second hunk based on 0004-fix-an-FTBFS-when-build-with-clang.patch @ http://trinity-devel.pearsoncomputing.net/?0::11397 echo $' +--- kspread/plugins/scripting/Makefile.am ++++ kspread/plugins/scripting/Makefile.am +@@ -23,0 +24,2 @@ ++ ++KDE_CXXFLAGS = $(USE_EXCEPTIONS) --- kexi/migration/keximigratetest.cpp +++ kexi/migration/keximigratetest.cpp @@ -41 +41 @@ @@ -108,7 +112,6 @@ chown_fn cd_builddir_fn -# Refusing to compile with Clang =[ LDFLAGS=$SLKLDFLAGS \ CFLAGS="$SLKCFLAGS $TQT_INCLUDE_PATH" \ CXXFLAGS=$SLKCFLAGS \ @@ -121,14 +124,6 @@ CXX=$COMPILER_CXX \ --disable-rpath \ --enable-closure -## Hack for this clang build error: -#In file included from ../../../../kspread/plugins/scripting/scripting.cc:30: -#In file included from ../../../../lib/kross/main/manager.h:31: -#../../../../lib/kross/main/../api/object.h:145:9: error: cannot use 'throw' with exceptions disabled -# throw TDESharedPtr( new Exception(TQString("Object \"%1\" invalid.").arg(object ? object->getClassName() : "")) ); -# ^ -[[ $COMPILER == clang ]] && sed -i 's|-fno-exceptions|-fexceptions|' kspread/plugins/scripting/Makefile - make_fn installdocs_fn