Skip to Content.
Sympa Menu

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

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 (d9e9757d7ed0198096758eae0448cb33d1054edc)
  • Date: Fri, 24 Apr 2020 11:44:04 +0000

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

kde5-apps/calligra/DEPENDS | 20
+++-
kde5-apps/calligra/DETAILS | 2
kde5-apps/calligra/HISTORY | 5
+
kde5-apps/calligra/patches/0001-do-not-run-update_xdg_mimetypes.patch | 34
+------
kde5-apps/calligra/patches/0002-do-not-downgrade-C.patch | 39
---------
kde5-apps/calligra/patches/0002-kross-optional.patch | 43
++++++++++
kde5-apps/calligra/patches/0003-kross-optional.patch | 43
----------
7 files changed, 67 insertions(+), 119 deletions(-)

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

calligra - update patches

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

calligra: => 3.2.0

diff --git a/kde5-apps/calligra/DEPENDS b/kde5-apps/calligra/DEPENDS
index 7da2aac..3ca257f 100755
--- a/kde5-apps/calligra/DEPENDS
+++ b/kde5-apps/calligra/DEPENDS
@@ -1,4 +1,6 @@
source $GRIMOIRE/KDE5_DEPENDS &&
+depends qtdeclarative &&
+depends qtquickcontrols2 &&
depends qtsvg &&
depends perl &&
depends zlib &&
@@ -22,6 +24,7 @@ depends kguiaddons &&
depends ki18n &&
depends kiconthemes &&
depends kio &&
+depends kirigami2 &&
depends kitemviews &&
depends kjobwidgets &&
depends knotifications &&
@@ -36,15 +39,18 @@ depends threadweaver &&
optional_depends freetype2 '' '' 'font support' &&
optional_depends fontconfig '' '' '' &&

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

-optional_depends poppler -sub QT5 '' '' 'PDF support' &&
+optional_depends -sub 'QT5 XPDF_HEADERS' poppler \
+ '' ' -DCMAKE_DISABLE_FIND_PACKAGE_Poppler=1' \
+ 'PDF import in Karbon' &&
optional_depends khtml '' '
-DCMAKE_DISABLE_FIND_PACKAGE_KF5KHtml=1' 'HTML2ODS import filter' &&
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 qca-qt5 '' ' -DWITH_Qca-Qt5=OFF' 'Crypto support' &&
optional_depends libodfgen '' '' 'various import filters' &&
optional_depends librevenge '' '' 'various document import filters' &&

@@ -58,13 +64,13 @@ optional_depends gsl '' '' 'improved maths'
&&
#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 libwps '' '' 'Quatro/Lotus/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 - Web browser'
+optional_depends libgit2 '' '' 'Gemini' &&
+optional_depends qtwebkit '' \
+ ' -DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebKit=1
-DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebKitWidgets=1'\
+ 'Braindump - Web browser' &&

#Karbon
optional_depends openjpeg '' '' 'Karbon' &&
diff --git a/kde5-apps/calligra/DETAILS b/kde5-apps/calligra/DETAILS
index ec62436..c0557af 100755
--- a/kde5-apps/calligra/DETAILS
+++ b/kde5-apps/calligra/DETAILS
@@ -1,5 +1,5 @@
SPELL=calligra
- VERSION=3.1.0
+ VERSION=3.2.0
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_URL=https://download.kde.org/stable/${SPELL}/${VERSION}/$SOURCE
SOURCE2=$SOURCE.sig
diff --git a/kde5-apps/calligra/HISTORY b/kde5-apps/calligra/HISTORY
index ab066ea..4fc11a2 100644
--- a/kde5-apps/calligra/HISTORY
+++ b/kde5-apps/calligra/HISTORY
@@ -1,3 +1,8 @@
+2020-04-24 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.2.0
+ * DEPENDS: tweak
+ * patches/*: update
+
2018-03-23 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: WEBKIT_QT => qtwebkit

diff --git
a/kde5-apps/calligra/patches/0001-do-not-run-update_xdg_mimetypes.patch
b/kde5-apps/calligra/patches/0001-do-not-run-update_xdg_mimetypes.patch
index ec98424..5acd623 100644
--- a/kde5-apps/calligra/patches/0001-do-not-run-update_xdg_mimetypes.patch
+++ b/kde5-apps/calligra/patches/0001-do-not-run-update_xdg_mimetypes.patch
@@ -1,37 +1,13 @@
-From ee2a5181fdce38f813f5d3a6d225d8c88a0a8584 Mon Sep 17 00:00:00 2001
+From 02a6b043f1a6def2141e05d244f74f7158c2ff9e Mon Sep 17 00:00:00 2001
From: Treeve Jelbert <treeve AT sourcemage.org>
Date: Mon, 10 Jun 2013 20:05:49 +0200
Subject: [PATCH 1/2] do not run update_xdg_mimetypes

---
- filters/libmsooxml/CMakeLists.txt | 1 -
- filters/stage/keynote/import/CMakeLists.txt | 1 -
- filters/words/wiki/CMakeLists.txt | 1 -
- plugins/vectorshape/CMakeLists.txt | 1 -
- 4 files changed, 4 deletions(-)
+ filters/words/wiki/CMakeLists.txt | 1 -
+ plugins/vectorshape/CMakeLists.txt | 1 -
+ 2 files changed, 2 deletions(-)

-diff --git a/filters/libmsooxml/CMakeLists.txt
b/filters/libmsooxml/CMakeLists.txt
-index 8652b7e0..196b61e9 100644
---- a/filters/libmsooxml/CMakeLists.txt
-+++ b/filters/libmsooxml/CMakeLists.txt
-@@ -62,7 +62,6 @@ install(TARGETS komsooxml ${INSTALL_TARGETS_DEFAULT_ARGS})
-
- if (SharedMimeInfo_FOUND)
- install(FILES msooxml-all.xml DESTINATION ${XDG_MIME_INSTALL_DIR})
-- update_xdg_mimetypes(${XDG_MIME_INSTALL_DIR})
- endif()
-
- if (FALSE) # these headers are private for now
-diff --git a/filters/stage/keynote/import/CMakeLists.txt
b/filters/stage/keynote/import/CMakeLists.txt
-index 9aa5c7ed..4dfdda08 100644
---- a/filters/stage/keynote/import/CMakeLists.txt
-+++ b/filters/stage/keynote/import/CMakeLists.txt
-@@ -26,5 +26,4 @@ endif()
-
- if (SharedMimeInfo_FOUND)
- install(FILES x-iwork-keynote-sffkey.xml DESTINATION
${XDG_MIME_INSTALL_DIR})
-- update_xdg_mimetypes(${XDG_MIME_INSTALL_DIR})
- endif ()
diff --git a/filters/words/wiki/CMakeLists.txt
b/filters/words/wiki/CMakeLists.txt
index cad8f44a..ee9b7731 100644
--- a/filters/words/wiki/CMakeLists.txt
@@ -57,5 +33,5 @@ index 7a4e70b8..a9267d66 100644

########### subdirectories ###############
--
-2.16.1
+2.26.2

diff --git a/kde5-apps/calligra/patches/0002-do-not-downgrade-C.patch
b/kde5-apps/calligra/patches/0002-do-not-downgrade-C.patch
deleted file mode 100644
index de71203..0000000
--- a/kde5-apps/calligra/patches/0002-do-not-downgrade-C.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 83b108bc2d40c9e1374d7a3df6d7a896a6c88e3b Mon Sep 17 00:00:00 2001
-From: Treeve Jelbert <treeve AT sourcemage.org>
-Date: Wed, 22 Mar 2017 16:33:37 +0100
-Subject: [PATCH 2/2] do not downgrade C++
-
----
- CMakeLists.txt | 16 ----------------
- 1 file changed, 16 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 65d0cb1c..012bb7d8 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -608,22 +608,6 @@ if (BUILD_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)
-- else()
-- set(${_objs} ${_src})
-- endif()
-- endmacro()
--
- macro(ko_compile_for_all_implementations _objs _src)
- if(PACKAGERS_BUILD)
- vc_compile_for_all_implementations(${_objs} ${_src} FLAGS
${ADDITIONAL_VC_FLAGS} ONLY Scalar SSE2 SSSE3 SSE4_1 AVX AVX2+FMA+BMI2)
---
-2.16.1
-
diff --git a/kde5-apps/calligra/patches/0002-kross-optional.patch
b/kde5-apps/calligra/patches/0002-kross-optional.patch
new file mode 100644
index 0000000..18824c6
--- /dev/null
+++ b/kde5-apps/calligra/patches/0002-kross-optional.patch
@@ -0,0 +1,43 @@
+From 06056dbf542ed5f87f57ad1cda4cdec915279c36 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 2/2] kross optional
+
+---
+ CMakeLists.txt | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a302e498..fed3055a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -220,7 +220,6 @@ find_package(KF5 ${REQUIRED_KF5_VERSION} REQUIRED
+ KCMUtils
+ KDELibs4Support
+ KIO
+- Kross
+ Notifications
+ NotifyConfig
+ Parts
+@@ -234,6 +233,7 @@ find_package(KF5 ${REQUIRED_KF5_VERSION} REQUIRED
+
+ find_package(KF5Activities)
+ find_package(KF5KHtml)
++find_package(KF5Kross)
+
+ set_package_properties(KF5Activities PROPERTIES
+ TYPE OPTIONAL
+@@ -242,6 +242,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.26.2
+
diff --git a/kde5-apps/calligra/patches/0003-kross-optional.patch
b/kde5-apps/calligra/patches/0003-kross-optional.patch
deleted file mode 100644
index 1c26100..0000000
--- a/kde5-apps/calligra/patches/0003-kross-optional.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-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
-



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (d9e9757d7ed0198096758eae0448cb33d1054edc), Treeve Jelbert, 04/24/2020

Archive powered by MHonArc 2.6.24.

Top of Page