Skip to Content.
Sympa Menu

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

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 (b05589aba6d343cb9a0ec839f1f712b01c1630ee)
  • Date: Tue, 30 Jan 2018 15:44:21 +0000

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

kde5-apps/calligra/DEPENDS | 22 +++++----
kde5-apps/calligra/HISTORY | 4 +
kde5-apps/calligra/patches/0003-kross-optional.patch | 43
+++++++++++++++++++
kde5-apps/kstars/DETAILS | 2
kde5-apps/kstars/HISTORY | 3 +
libs/vc/DETAILS | 4 -
libs/vc/HISTORY | 3 +
7 files changed, 68 insertions(+), 13 deletions(-)

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

calligra - make kross optional

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

vc: => 1.3.3

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

kstars: => 2.9.2

diff --git a/kde5-apps/calligra/DEPENDS b/kde5-apps/calligra/DEPENDS
index ef603a4..a341cec 100755
--- a/kde5-apps/calligra/DEPENDS
+++ b/kde5-apps/calligra/DEPENDS
@@ -4,6 +4,7 @@ depends perl &&
depends zlib &&
depends OPENGL &&
depends boost &&
+#depends libgit2 &&
depends sqlite &&
depends shared-mime-info &&

@@ -26,7 +27,6 @@ depends kjobwidgets &&
depends knotifications &&
depends knotifyconfig &&
depends kparts &&
-depends kross &&
depends kservice &&
depends ktextwidgets &&
depends kwidgetsaddons &&
@@ -38,21 +38,23 @@ optional_depends fontconfig '' '' '' &&

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

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 '' ' -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 '' ' -DWITH_KChart=OFF -DWITH_KGantt=OFF'
'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 kdiagram '' ' -DWITH_KChart=OFF -DWITH_KGantt=OFF'
'charting' &&
+# optional_depends kcalcore '' '' 'PIM support' &&
+# optional_depends kcontacts '' '' 'PIM support' &&
+# optional_depends kholidays '' '' 'Public holidays (Plan)' &&
+# 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
@@ -73,9 +75,9 @@ 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 - Web browser'
+#optional_depends WEBKIT_QT '' \
+# ' -DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebKit=1
-DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebKitWidgets=1'\
+# 'Stage - Web browser'

#Karbon
optional_depends openjpeg '' '' 'Karbon' &&
diff --git a/kde5-apps/calligra/HISTORY b/kde5-apps/calligra/HISTORY
index 99bdd60..9522339 100644
--- a/kde5-apps/calligra/HISTORY
+++ b/kde5-apps/calligra/HISTORY
@@ -1,3 +1,7 @@
+2018-01-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * patches/0003-kross-optional.patch: added
+ * DEPENDS: cleanup, kross optional
+
2018-01-27 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.1.0
* patches/*: updated
diff --git a/kde5-apps/calligra/patches/0003-kross-optional.patch
b/kde5-apps/calligra/patches/0003-kross-optional.patch
new file mode 100644
index 0000000..1c26100
--- /dev/null
+++ b/kde5-apps/calligra/patches/0003-kross-optional.patch
@@ -0,0 +1,43 @@
+From 245cb04154ecb7b1dda4723679034fa007f15fae Mon Sep 17 00:00:00 2001
+From: Treeve Jelbert <treeve AT sourcemage.org>
+Date: Tue, 30 Jan 2018 16:24:13 +0100
+Subject: [PATCH 3/3] kross optional
+
+---
+ CMakeLists.txt | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 012bb7d8..76954886 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -213,7 +213,6 @@ find_package(KF5 ${REQUIRED_KF5_VERSION} REQUIRED
+ KCMUtils
+ KDELibs4Support
+ KIO
+- Kross
+ Notifications
+ NotifyConfig
+ Parts
+@@ -227,6 +226,7 @@ find_package(KF5 ${REQUIRED_KF5_VERSION} REQUIRED
+
+ find_package(KF5Activities)
+ find_package(KF5KHtml)
++find_package(KF5Kross)
+
+ set_package_properties(KF5Activities PROPERTIES
+ TYPE OPTIONAL
+@@ -235,6 +235,10 @@ set_package_properties(KF5KHtml PROPERTIES
+ PURPOSE "Required for HTML2ODS import filter"
+ TYPE OPTIONAL
+ )
++set_package_properties(KF5Kross PROPERTIES
++ PURPOSE "scripting support"
++ TYPE OPTIONAL
++)
+
+ if(KF5Activities_FOUND)
+ set(HAVE_KACTIVITIES TRUE)
+--
+2.16.0
+
diff --git a/kde5-apps/kstars/DETAILS b/kde5-apps/kstars/DETAILS
index 02243f3..709505c 100755
--- a/kde5-apps/kstars/DETAILS
+++ b/kde5-apps/kstars/DETAILS
@@ -1,5 +1,5 @@
SPELL=kstars
- VERSION=2.9.1
+ VERSION=2.9.2
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_URL=https://download.kde.org/stable/$SPELL/$SOURCE
SOURCE2=$SOURCE.sig
diff --git a/kde5-apps/kstars/HISTORY b/kde5-apps/kstars/HISTORY
index f916414..732d4af 100644
--- a/kde5-apps/kstars/HISTORY
+++ b/kde5-apps/kstars/HISTORY
@@ -1,3 +1,6 @@
+2018-01-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.9.2
+
2018-01-11 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.9.1

diff --git a/libs/vc/DETAILS b/libs/vc/DETAILS
index ac32ac2..b8e4a7d 100755
--- a/libs/vc/DETAILS
+++ b/libs/vc/DETAILS
@@ -1,6 +1,6 @@
SPELL=vc
- VERSION=1.3.2
-
SOURCE_HASH=sha512:fc7b7fceaac5acfcb0d46caeadc9823fe849d0cd0d7199875f850bed7c4bc6d3ea8a15ec59e4fa3c2735e15c00177c43c21e1bfa28487ac506c0b2dd184a5ba6
+ VERSION=1.3.3
+
SOURCE_HASH=sha512:dbc6f5bc723c52d3116301798b600b08bde510cff9e6777312d1970c61ad1b71fd83335ce65e9993a9f582a20b9de73984d553039452908ef229c4bde3b334f2
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/Vc-$VERSION
WEB_SITE=https://github.com/VcDevel/Vc
diff --git a/libs/vc/HISTORY b/libs/vc/HISTORY
index 16f9fbc..599fd30 100644
--- a/libs/vc/HISTORY
+++ b/libs/vc/HISTORY
@@ -1,3 +1,6 @@
+2018-01-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.3.3
+
2017-06-03 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.3.2




  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (b05589aba6d343cb9a0ec839f1f712b01c1630ee), Treeve Jelbert, 01/30/2018

Archive powered by MHonArc 2.6.24.

Top of Page