Skip to Content.
Sympa Menu

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

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 (29f6393f9f5fde3fd020d6d969393261e5f6d264)
  • Date: Wed, 4 Jan 2017 07:36:49 +0000

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

ChangeLog | 4 +
kde4-apps/calligra/BUILD | 4 -
kde4-apps/calligra/CONFIGURE | 8 ---
kde4-apps/calligra/DEPENDS | 65 -------------------------
kde4-apps/calligra/DETAILS | 15 -----
kde4-apps/calligra/HISTORY | 32 ------------
kde4-apps/calligra/PRE_BUILD | 3 -
kde4-apps/calligra/office.cmake | 20 -------
kde5-apps/calligra/BUILD | 5 +
kde5-apps/calligra/CONFIGURE | 7 ++
kde5-apps/calligra/DEPENDS | 80
+++++++++++++++++++++++++++++++
kde5-apps/calligra/DETAILS | 17 ++++++
kde5-apps/calligra/HISTORY | 10 +++
kde5-apps/calligra/PRE_BUILD | 5 +
kde5-apps/calligra/office.cmake | 24 +++++++++
kde5-apps/kde4-apps/tellico2/BUILD | 1
kde5-apps/kde4-apps/tellico2/CONFLICTS | 1
kde5-apps/kde4-apps/tellico2/DETAILS | 8 ---
kde5-apps/kde4-apps/tellico2/DOWNLOAD | 1
kde5-apps/kde4-apps/tellico2/HISTORY | 4 -
kde5-apps/kde4-apps/tellico2/INSTALL | 1
kde5-apps/kde4-apps/tellico2/PRE_BUILD | 1
kde5-apps/kde4-apps/tellico2/UP_TRIGGERS | 1
23 files changed, 152 insertions(+), 165 deletions(-)

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

calligra: => 3.0.0.1

commit c725a77dd7bc9d1fa7656a9a4ad3c959ae5c6845
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

calligra3

commit 9c06b6f0b908a5f1cccf5655994122d5e8a5ceba
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

delete duplicate junk

commit c092b38e76321db6ca4e7fae35ff49dc04cbeb6b
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

delete calligra

diff --git a/ChangeLog b/ChangeLog
index 40efc8b..1559acf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -104,6 +104,10 @@
* utils/containers: new spell, Lightweight containers using Linux
user namespaces

+2016-12-05 Treeve Jelbert <treeve AT sourcemage.org>
+ * kde4-apps/calligra: deleted
+ * kde5-apps/calligra: added
+
2016-12-03 Treeve Jelbert <treeve AT sourcemage.org>
* kde5-apps/kxstitch: added - Cross stitch pattern editor
* kde4-apps; delete kaffeine4, k9copy4, kraft, kmymoney, kwave4
diff --git a/kde4-apps/calligra/BUILD b/kde4-apps/calligra/BUILD
deleted file mode 100755
index e2bf4d8..0000000
--- a/kde4-apps/calligra/BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-OPTS+=" -DPRODUCTSET=$CPROD" &&
-OPTS+=" -DPACKAGERS_BUILD=OFF" &&
-OPTS+=" -DQT3SUPPORT=$QT3" &&
-default_build
diff --git a/kde4-apps/calligra/CONFIGURE b/kde4-apps/calligra/CONFIGURE
deleted file mode 100755
index c218bff..0000000
--- a/kde4-apps/calligra/CONFIGURE
+++ /dev/null
@@ -1,8 +0,0 @@
-source $GRIMORE/CMAKE_CONFIGURE &&
-message " Calligra now defines ProductSets:\n\
-Creative: Krita + Karbon\n\
-Desktop:Words Stage Sheets Author Karbon Krita Kexi 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 CREATIVE DESKTOP
diff --git a/kde4-apps/calligra/DEPENDS b/kde4-apps/calligra/DEPENDS
deleted file mode 100755
index 431a5df..0000000
--- a/kde4-apps/calligra/DEPENDS
+++ /dev/null
@@ -1,65 +0,0 @@
-source $GRIMOIRE/KDE4_DEPENDS &&
-depends perl &&
-depends libpng &&
-depends zlib &&
-depends OPENGL &&
-depends boost &&
-depends shared-mime-info &&
-
-depends automoc &&
-optional_depends soprano '' '-DCMAKE_DISABLE_FIND_PACKAGE_Soprano=1'
'handle RDF metadata in ODF' &&
-
-optional_depends freetype2 '' '' 'font support' &&
-optional_depends fontconfig '' '' '' &&
-
-if [[ $CPROD != OFFICE ]];then
-#Karbon
-optional_depends pstoedit '' '' 'Karbon eps import filter' &&
-
-# Kexi
- depends bzip2 &&
- depends sqlite &&
- optional_depends mysql '' '' 'import MySql to Kexi' &&
- optional_depends postgresql '' '' 'import Postgresql to Kexi'&&
-
-#Krita
-optional_depends libkdcraw '' '' 'process RAW photos' &&
-optional_depends glew '' '' 'OpenGL shaders in Krita' &&
-optional_depends gmm '' '' 'Krita panorama plugin' &&
-optional_depends exiv2 '' '' 'decode photo tags' &&
-optional_depends tiff '' '' 'graphics support' &&
-optional_depends openexr '' '' 'Krita EXR filter' &&
-optional_depends openjpeg '' '' 'Krita graphics filters' &&
-optional_depends glpk '' '' 'painterly mixer plugin' &&
-optional_depends tiff '' '' 'graphics support' &&
-optional_depends create '' '' 'creative resources, brushes,
palettes etc' &&
-optional_depends fftw '' '' 'faster image manipulation' &&
-optional_depends vc '' '' 'vectorisation code' &&
-optional_depends libvisio '' '' 'import Visio diagrams'
-fi &&
-
-# multiple things
-optional_depends icu '' '' 'Unicode support' &&
-optional_depends lcms2 '' '' 'colour management' &&
-optional_depends poppler '' '' 'PDF support' &&
-optional_depends attica ''
'-DCMAKE_DISABLE_FIND_PACKAGE_LibAttica=1' 'Get Hot New Stuff' &&
-optional_depends kactivities ''
'-DCMAKE_DISABLE_FIND_PACKAGE_KActivities=1' 'Kactivities support' &&
-optional_depends marble '' '-DCMAKE_DISABLE_FIND_PACKAGE_Marble=1'
'show locations on a map' &&
-optional_depends qca2 '' '-DCMAKE_DISABLE_FIND_PACKAGE_QCA2=1'
'Crypro support' &&
-optional_depends libodfgen '' '' 'various import filters' &&
-optional_depends librevenge '' '' 'various document import filters' &&
-#Stage
-optional_depends okular '' '' 'OpenDocument Presenter plugin' &&
-
-if [[ $CPROD != CREATIVE ]];then
-
-#Tables
-optional_depends eigen3 '' '' 'for Tables' &&
-optional_depends gsl '' '' 'improved maths' &&
-#Words
-#optional_depends libetonyek '' '' 'Apple Keynote Document Library'
-optional_depends libwpg '' '' 'WordPerfect graphics' &&
-optional_depends libwpd '' '' 'WordPerfect import' &&
-optional_depends libwps '' '' 'MS Works import'
-#
-fi
diff --git a/kde4-apps/calligra/DETAILS b/kde4-apps/calligra/DETAILS
deleted file mode 100755
index 63d05e2..0000000
--- a/kde4-apps/calligra/DETAILS
+++ /dev/null
@@ -1,15 +0,0 @@
- SPELL=calligra
- VERSION=2.8.5
-
SOURCE_HASH=sha512:09e32b7ce2415daae2ac3c1871fc1bc270210cbf5bc774f622922f8adb20e639db3dfb16c2974404b4395b30f8367a7ddd0016363a8b3e46fa24ff3fde1e4c14
- SOURCE=$SPELL-$VERSION.tar.xz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- WEB_SITE=http://www.calligra-suite.org/
- SOURCE_URL=http://download.kde.org/stable/$SPELL-$VERSION/$SOURCE
- ENTERED=2012-05-10
- LICENSE[0]=GPL
- KEYWORDS="kde office"
- SHORT="Full office suite"
-cat << EOF
-The Calligra Suite is Calligra for the desktop. It offers a comprehensive
set
-of 8 applications which satisfies the office, graphics and management needs.
-EOF
diff --git a/kde4-apps/calligra/HISTORY b/kde4-apps/calligra/HISTORY
deleted file mode 100644
index 36acce9..0000000
--- a/kde4-apps/calligra/HISTORY
+++ /dev/null
@@ -1,32 +0,0 @@
-2016-08-18 Treeve Jelbert <treeve AT sourcemage.org>
- * DEPENDS: delete kdepimlibs
-
-2015-05-23 Treeve Jelbert <treeve AT sourcemage.org>
- * DEPENDS, CONFIGURE: remove unneeded stuff
-
-2014-08-21 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 2.8.5
- * office.cmake, PRE_BUILD: added
- * CONFIGURE, BUILD, DEPENDs: adapt to product sets
-
-2013-03-14 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 2.6.2
-
-2013-02-05 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 2.6.0
-
-2013-01-24 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 2.5.5
-
-2012-09-13 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 2.5.2
-
-2012-08-30 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 2.5.1
-
-2012-05-31 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 2.4.2
-
-2012-05-10 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 2.4.1
- this is a new spell derived from the koffice2 spell
diff --git a/kde4-apps/calligra/PRE_BUILD b/kde4-apps/calligra/PRE_BUILD
deleted file mode 100755
index 47e0d41..0000000
--- a/kde4-apps/calligra/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-cp $SPELL_DIRECTORY/office.cmake cmake/productsets
diff --git a/kde4-apps/calligra/office.cmake b/kde4-apps/calligra/office.cmake
deleted file mode 100644
index 8275d7f..0000000
--- a/kde4-apps/calligra/office.cmake
+++ /dev/null
@@ -1,20 +0,0 @@
-set( CALLIGRA_SHOULD_BUILD_PRODUCTS
- WORDS_APP SHEETS_APP AUTHOR_APP
- FILTER_CSV_TO_SHEETS
- FILTER_HTML_TO_ODS
- FILTER_OPENCALC_TO_SHEETS
- FILTER_XLSX_TO_ODS
- FILTER_XLS_TO_SHEETS
- FILTER_SHEETS_TO_CSV
- FILTER_SHEETS_TO_OPENCALC
- FILTER_SHEETS_TO_XLS
- FILTER_DOC_TO_ODT
- FILTER_DOCX_TO_ODT
- FILTER_ODT_TO_ASCII
- FILTER_RTF_TO_ODT
- FILTER_ODT_TO_MOBI
- FILTER_ODT_TO_EPUB2
- FILTER_ODT_TO_HTML
-
-)
-
diff --git a/kde5-apps/calligra/BUILD b/kde5-apps/calligra/BUILD
new file mode 100755
index 0000000..2e082d0
--- /dev/null
+++ b/kde5-apps/calligra/BUILD
@@ -0,0 +1,5 @@
+VV=`installed_version kio` &&
+OPTS+=" -DKF5_VERSION=$VV" &&
+OPTS+=" -DPRODUCTSET=$CPROD" &&
+OPTS+=" -DPACKAGERS_BUILD=OFF" &&
+default_build
diff --git a/kde5-apps/calligra/CONFIGURE b/kde5-apps/calligra/CONFIGURE
new file mode 100755
index 0000000..6962b98
--- /dev/null
+++ b/kde5-apps/calligra/CONFIGURE
@@ -0,0 +1,7 @@
+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
diff --git a/kde5-apps/calligra/DEPENDS b/kde5-apps/calligra/DEPENDS
new file mode 100755
index 0000000..f8c2b97
--- /dev/null
+++ b/kde5-apps/calligra/DEPENDS
@@ -0,0 +1,80 @@
+source $GRIMOIRE/KDE5_DEPENDS &&
+depends qtsvg &&
+depends perl &&
+depends zlib &&
+depends OPENGL &&
+depends boost &&
+depends sqlite &&
+depends shared-mime-info &&
+
+depends kactivities5 &&
+depends karchive &&
+depends kcodecs &&
+depends kcompletion &&
+depends kconfig &&
+depends kconfigwidgets &&
+depends kcoreaddons &&
+depends kdeclarative &&
+depends kdelibs4support &&
+depends kdoctools &&
+depends kguiaddons &&
+depends ki18n &&
+depends kiconthemes &&
+depends kio &&
+depends kitemviews &&
+depends knotifications &&
+depends knotifyconfig &&
+depends kparts &&
+depends kross &&
+depends kservice &&
+depends ktextwidgets &&
+depends kwidgetsaddons &&
+depends kxmlgui &&
+depends threadweaver &&
+
+optional_depends freetype2 '' '' 'font support' &&
+optional_depends fontconfig '' '' '' &&
+
+# multiple things
+optional_depends lcms2 '' '' 'colour management' &&
+optional_depends vc '' '' '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 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 kcalcore '' '' 'PIM support' &&
+ optional_depends kcontacts '' '' 'PIM support' &&
+ optional_depends kproperty '' '' 'Reporting for Plan' &&
+ optional_depends kreport '' '' 'Reporting for Plan' &&
+
+# optional_depends akonadi-contacts '' '' 'PIM support' &&
+# if is_depends_enabled $SPELL akonadi-contacts;then
+# depends akonadi
+# fi &&
+
+# Stage
+optional_depends okular '' '' 'OpenDocument Presenter plugin' &&
+optional_depends phonon4qt5 '' '' 'for Stage' &&
+#Sheets
+optional_depends eigen3 '' '' 'for Sheets' &&
+optional_depends gsl '' '' 'improved maths' &&
+#Words
+#optional_depends libetonyek '' '' 'Apple Keynote Document Library'
+optional_depends libwpg '' '' 'WordPerfect graphics' &&
+optional_depends libwpd '' '' 'WordPerfect import' &&
+optional_depends libwps '' '' 'MS Works import'
+#
+optional_depends qtdeclarative '' '' 'Gemini' &&
+optional_depends qtquick1 '' '' ' Gemini' &&
+optional_depends qtwebkit '' ' -DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebKit=1
-DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebKitWidgets=1' 'Stage/Braindump'
+
+#Karbon
+suggest_depends pstoedit 'Karbon eps import filter'
+
diff --git a/kde5-apps/calligra/DETAILS b/kde5-apps/calligra/DETAILS
new file mode 100755
index 0000000..539afa8
--- /dev/null
+++ b/kde5-apps/calligra/DETAILS
@@ -0,0 +1,17 @@
+ SPELL=calligra
+ VERSION=3.0.0.1
+ SOURCE=$SPELL-$VERSION.tar.xz
+ SOURCE_URL=http://download.kde.org/stable/${SPELL}/${VERSION}/$SOURCE
+ SOURCE2=$SOURCE.sig
+ SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
+ SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
+ SOURCE2_IGNORE=signature
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ WEB_SITE=http://www.calligra-suite.org/
+ ENTERED=201601205
+ LICENSE[0]=GPL
+ KEYWORDS="kde office"
+ SHORT="Full office suite"
+cat << EOF
+Office suite for KDE5
+EOF
diff --git a/kde5-apps/calligra/HISTORY b/kde5-apps/calligra/HISTORY
new file mode 100644
index 0000000..9c84068
--- /dev/null
+++ b/kde5-apps/calligra/HISTORY
@@ -0,0 +1,10 @@
+2017-01-03 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.0.0.1
+
+ * DETAILS: add gpg checking
+
+2016-12-05 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.0.0
+
+2015-03-06 Treeve Jelbert <treeve AT sourcemage.org>
+ * first attempt at qt5/kf5 support
diff --git a/kde5-apps/calligra/PRE_BUILD b/kde5-apps/calligra/PRE_BUILD
new file mode 100755
index 0000000..4381da7
--- /dev/null
+++ b/kde5-apps/calligra/PRE_BUILD
@@ -0,0 +1,5 @@
+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
diff --git a/kde5-apps/calligra/office.cmake b/kde5-apps/calligra/office.cmake
new file mode 100644
index 0000000..831436c
--- /dev/null
+++ b/kde5-apps/calligra/office.cmake
@@ -0,0 +1,24 @@
+#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/kde4-apps/tellico2/BUILD
b/kde5-apps/kde4-apps/tellico2/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/kde5-apps/kde4-apps/tellico2/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/kde5-apps/kde4-apps/tellico2/CONFLICTS
b/kde5-apps/kde4-apps/tellico2/CONFLICTS
deleted file mode 100755
index 53d4f93..0000000
--- a/kde5-apps/kde4-apps/tellico2/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts tellico2 y
diff --git a/kde5-apps/kde4-apps/tellico2/DETAILS
b/kde5-apps/kde4-apps/tellico2/DETAILS
deleted file mode 100755
index b10b5a1..0000000
--- a/kde5-apps/kde4-apps/tellico2/DETAILS
+++ /dev/null
@@ -1,8 +0,0 @@
- SPELL=tellico2
- VERSION=0
- PATCHLEVEL=9999
- SHORT="deprecated"
-cat << EOF
-deprecated spell [replaced by tellico]
-EOF
-
diff --git a/kde5-apps/kde4-apps/tellico2/DOWNLOAD
b/kde5-apps/kde4-apps/tellico2/DOWNLOAD
deleted file mode 100755
index 27ba77d..0000000
--- a/kde5-apps/kde4-apps/tellico2/DOWNLOAD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/kde5-apps/kde4-apps/tellico2/HISTORY
b/kde5-apps/kde4-apps/tellico2/HISTORY
deleted file mode 100644
index ee9736d..0000000
--- a/kde5-apps/kde4-apps/tellico2/HISTORY
+++ /dev/null
@@ -1,4 +0,0 @@
-2016-11-11 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 0
- PATCHLEVEL=9999
- spell deprecated [replaced by tellico]
diff --git a/kde5-apps/kde4-apps/tellico2/INSTALL
b/kde5-apps/kde4-apps/tellico2/INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/kde5-apps/kde4-apps/tellico2/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/kde5-apps/kde4-apps/tellico2/PRE_BUILD
b/kde5-apps/kde4-apps/tellico2/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/kde5-apps/kde4-apps/tellico2/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/kde5-apps/kde4-apps/tellico2/UP_TRIGGERS
b/kde5-apps/kde4-apps/tellico2/UP_TRIGGERS
deleted file mode 100755
index 24e3feb..0000000
--- a/kde5-apps/kde4-apps/tellico2/UP_TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-up_trigger tellico cast_self



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

Archive powered by MHonArc 2.6.24.

Top of Page