Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (c2c660709694fdf2ba7e5f720e8e693cf1092cc2)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (c2c660709694fdf2ba7e5f720e8e693cf1092cc2)
  • Date: Mon, 3 Apr 2017 09:03:42 +0000

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

kde5-apps/calligra/BUILD | 4 +---
kde5-apps/calligra/CONFIGURE | 8 +-------
kde5-apps/calligra/DEPENDS | 16 ++++++++--------
kde5-apps/calligra/HISTORY | 7 +++++++
kde5-apps/calligra/PRE_BUILD | 2 +-
kde5-apps/calligra/office.cmake | 24 ------------------------
kde5-apps/calligra/vc.diff | 19 +++++++++++++++++++
7 files changed, 37 insertions(+), 43 deletions(-)

New commits:
commit c2c660709694fdf2ba7e5f720e8e693cf1092cc2
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

calligra - forgotten changes

diff --git a/kde5-apps/calligra/BUILD b/kde5-apps/calligra/BUILD
index 2e082d0..47242dc 100755
--- a/kde5-apps/calligra/BUILD
+++ b/kde5-apps/calligra/BUILD
@@ -1,5 +1,3 @@
-VV=`installed_version kio` &&
-OPTS+=" -DKF5_VERSION=$VV" &&
-OPTS+=" -DPRODUCTSET=$CPROD" &&
+OPTS+=" -DCMAKE_CXX_STANDARD=14" &&
OPTS+=" -DPACKAGERS_BUILD=OFF" &&
default_build
diff --git a/kde5-apps/calligra/CONFIGURE b/kde5-apps/calligra/CONFIGURE
index 6962b98..5a2f514 100755
--- a/kde5-apps/calligra/CONFIGURE
+++ b/kde5-apps/calligra/CONFIGURE
@@ -1,7 +1 @@
-source $GRIMOIRE/CMAKE_CONFIGURE &&
-message " Calligra now defines ProductSets:\n\
-Desktop:Words Stage Sheets Karbon Flow Plan Braindump\n\
-It is also possible to define your own product sets\n\n\
-I have defined\n\
-Office: Words + Sheets\n"
-config_query_list CPROD "Which product set?" OFFICE DESKTOP
+source $GRIMOIRE/CMAKE_CONFIGURE
diff --git a/kde5-apps/calligra/DEPENDS b/kde5-apps/calligra/DEPENDS
index bc61455..c48a429 100755
--- a/kde5-apps/calligra/DEPENDS
+++ b/kde5-apps/calligra/DEPENDS
@@ -22,6 +22,7 @@ depends ki18n &&
depends kiconthemes &&
depends kio &&
depends kitemviews &&
+depends kjobwidgets &&
depends knotifications &&
depends knotifyconfig &&
depends kparts &&
@@ -36,19 +37,18 @@ optional_depends freetype2 '' '' 'font support' &&
optional_depends fontconfig '' '' '' &&

# multiple things
-optional_depends lcms2 '' '' 'colour management' &&
-optional_depends vc '' '' 'vectorisation code' &&
+optional_depends lcms2 '' ' -DWITH_LCMS2=OFF' 'colour management'
&&
+optional_depends vc '' ' -DWITH_Vc=OFF' 'vectorisation code' &&

optional_depends poppler -sub QT5 '' '' 'PDF support' &&
-optional_depends khtml '' '-DCMAKE_DISABLE_FIND_PACKAGE_KF5KHtml=1'
'HTML2ODS import filter + Plan' &&
-#optional_depends kross ''
'-DCMAKE_DISABLE_FIND_PACKAGE_KF5Kross=1' 'Scripting support' &&
-#optional_depends marble '' '-DCMAKE_DISABLE_FIND_PACKAGE_Marble=1'
'show locations on a map' &&
-optional_depends qca-qt5 '' '-DCMAKE_DISABLE_FIND_PACKAGE_Qca-Qt5=1'
'Crypro support' &&
+optional_depends khtml '' ' -DWITH_KF5KHtml=OFF' 'HTML2ODS import
filter + Plan' &&
+optional_depends marble '' ' -DWITH_Marble=OFF' 'show locations on a
map' &&
+optional_depends qca-qt5 '' ' -DWITH_Qca-Qt5=OFF' 'Crypro support' &&
optional_depends libodfgen '' '' 'various import filters' &&
optional_depends librevenge '' '' 'various document import filters' &&

# Plan
- optional_depends kdiagram '' '-DCMAKE_DISABLE__FIND_PACKAGE_KChart=1
-DCMAKE_DISABLE__FIND_PACKAGE_KGantt=1' 'charting' &&
+ optional_depends kdiagram '' ' -DWITH_KChart=OFF -DWITH_KGantt=OFF'
'charting' &&
optional_depends kcalcore '' '' 'PIM support' &&
optional_depends kcontacts '' '' 'PIM support' &&
optional_depends kproperty '' '' 'Reporting for Plan' &&
@@ -73,7 +73,7 @@ optional_depends libwps '' '' 'MS Works import'
#
optional_depends qtdeclarative '' '' 'Gemini' &&
optional_depends qtquick1 '' '' ' Gemini' &&
-optional_depends WEBKIT_QT '' ' -DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebKit=1
-DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebKitWidgets=1' 'Stage/Braindump'
+optional_depends WEBKIT_QT '' ' -DWITH_Qt5WebKit=OFF
-DWITH_Qt5WebKitWidgets=OFF' 'Stage/Braindump'

#Karbon
suggest_depends pstoedit 'Karbon eps import filter'
diff --git a/kde5-apps/calligra/HISTORY b/kde5-apps/calligra/HISTORY
index b89fc60..d00759c 100644
--- a/kde5-apps/calligra/HISTORY
+++ b/kde5-apps/calligra/HISTORY
@@ -1,6 +1,13 @@
2017-04-03 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.0.1

+2017-03-23 Treeve Jelbert <treeve AT sourcemage.org>
+ * CONFIGURE PRE_BUILD BUILD: no product sets
+ use c++14, apply vc.diff
+ * DEPENDS: use correct flags
+ * vc.diff: added
+ * office.cmake: deleted
+
2017-01-11 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: qtwebkit => WEBKIT_QT

diff --git a/kde5-apps/calligra/PRE_BUILD b/kde5-apps/calligra/PRE_BUILD
index 4381da7..48a084d 100755
--- a/kde5-apps/calligra/PRE_BUILD
+++ b/kde5-apps/calligra/PRE_BUILD
@@ -2,4 +2,4 @@ default_pre_build &&
cd $SOURCE_DIRECTORY &&
sed -i -e '/update_xdg_mimetypes/D' filters/libmsooxml/CMakeLists.txt
filters/stage/keynote/import/CMakeLists.txt \
filters/words/wiki/CMakeLists.txt plugins/vectorshape/CMakeLists.txt &&
-cp $SPELL_DIRECTORY/office.cmake $SOURCE_DIRECTORY/cmake/productsets
+patch -p1 < $SPELL_DIRECTORY/vc.diff
diff --git a/kde5-apps/calligra/office.cmake b/kde5-apps/calligra/office.cmake
deleted file mode 100644
index 831436c..0000000
--- a/kde5-apps/calligra/office.cmake
+++ /dev/null
@@ -1,24 +0,0 @@
-#defines the set of products commonly wanted for classic Desktop environment
-
-calligra_define_productset(OFFICE "Calligra for Office"
- OPTIONAL
- # apps
-# AUTHOR
-# BRAINDUMP
-# FLOW
-# KARBON
-# PLAN
- SHEETS
- STAGE
- WORDS
- # features
-# FEATURE_SCRIPTING
-# FEATURE_RDF
- # extras
- APP_CALLIGRA
- APP_CONVERTER
- FILEMANAGER
- OKULAR
- # docs
-# DOC
-)
diff --git a/kde5-apps/calligra/vc.diff b/kde5-apps/calligra/vc.diff
new file mode 100644
index 0000000..a07374f
--- /dev/null
+++ b/kde5-apps/calligra/vc.diff
@@ -0,0 +1,19 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 13ac88f0..cfaa0fff 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -611,14 +611,6 @@ if(HAVE_VC)
+ set(ADDITIONAL_VC_FLAGS "-Wabi -fabi-version=0 -ffp-contract=fast
-fPIC")
+ endif()
+
+- #Handle Vc master
+- if(Vc_COMPILER_IS_GCC OR Vc_COMPILER_IS_CLANG)
+- AddCompilerFlag("-std=c++11" _ok)
+- if(NOT _ok)
+- AddCompilerFlag("-std=c++0x" _ok)
+- endif()
+- endif()
+-
+ macro(ko_compile_for_all_implementations_no_scalar _objs _src)
+ if(PACKAGERS_BUILD)
+ vc_compile_for_all_implementations(${_objs} ${_src} FLAGS
${ADDITIONAL_VC_FLAGS} ONLY SSE2 SSSE3 SSE4_1 AVX AVX2+FMA+BMI2)



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (c2c660709694fdf2ba7e5f720e8e693cf1092cc2), Treeve Jelbert, 04/03/2017

Archive powered by MHonArc 2.6.24.

Top of Page