Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (0c67ab6f9617d366d711d12034923b74dbaf305a)

Chronological Thread  
    < 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 (0c67ab6f9617d366d711d12034923b74dbaf305a)
  • Date: Sat, 27 Jan 2018 11:01:45 +0000
GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

kde5-apps/calligra/DETAILS | 2
kde5-apps/calligra/HISTORY | 4
+
kde5-apps/calligra/patches/0001-do-not-run-update_xdg_mimetypes.patch | 24
++----
kde5-apps/calligra/patches/0002-do-not-downgrade-C.patch | 39
++++++++++
kde5-apps/calligra/patches/0002-do-not-downgrade-c-version.patch | 31
-------
kde5-apps/calligra/patches/0003-find-openjpeg-2.1.patch | 34
--------
6 files changed, 54 insertions(+), 80 deletions(-)

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

calligra: => 3.1.0

diff --git a/kde5-apps/calligra/DETAILS b/kde5-apps/calligra/DETAILS
index a2fb00e..6c817d4 100755
--- a/kde5-apps/calligra/DETAILS
+++ b/kde5-apps/calligra/DETAILS
@@ -1,5 +1,5 @@
SPELL=calligra
- VERSION=3.0.1
+ VERSION=3.1.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 1cfed43..99bdd60 100644
--- a/kde5-apps/calligra/HISTORY
+++ b/kde5-apps/calligra/HISTORY
@@ -1,3 +1,7 @@
+2018-01-27 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.1.0
+ * patches/*: updated
+
2017-05-02 Treeve Jelbert <treeve AT sourcemage.org>
* PRE_BUILD: use apply_patch_dir
* patches/*: added
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 7564f9c..ec98424 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,31 +1,27 @@
-From abf442deb59b8134cc9aedc78a5583727f1bba2f Mon Sep 17 00:00:00 2001
+From ee2a5181fdce38f813f5d3a6d225d8c88a0a8584 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/3] do not run update_xdg_mimetypes
+Subject: [PATCH 1/2] do not run update_xdg_mimetypes

---
- filters/libmsooxml/CMakeLists.txt | 5 +----
+ 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, 1 insertion(+), 7 deletions(-)
+ 4 files changed, 4 deletions(-)

diff --git a/filters/libmsooxml/CMakeLists.txt
b/filters/libmsooxml/CMakeLists.txt
-index 39fd2017..7eafb97b 100644
+index 8652b7e0..196b61e9 100644
--- a/filters/libmsooxml/CMakeLists.txt
+++ b/filters/libmsooxml/CMakeLists.txt
-@@ -61,10 +61,7 @@ endif()
- set_target_properties(komsooxml PROPERTIES VERSION
${GENERIC_CALLIGRA_LIB_VERSION} SOVERSION ${GENERIC_CALLIGRA_LIB_SOVERSION} )
- install(TARGETS komsooxml ${INSTALL_TARGETS_DEFAULT_ARGS})
+@@ -62,7 +62,6 @@ install(TARGETS komsooxml ${INSTALL_TARGETS_DEFAULT_ARGS})

--if (SharedMimeInfo_FOUND)
-- install(FILES msooxml-all.xml DESTINATION ${XDG_MIME_INSTALL_DIR})
+ if (SharedMimeInfo_FOUND)
+ install(FILES msooxml-all.xml DESTINATION ${XDG_MIME_INSTALL_DIR})
- update_xdg_mimetypes(${XDG_MIME_INSTALL_DIR})
--endif()
-+install(FILES msooxml-all.xml DESTINATION ${XDG_MIME_INSTALL_DIR})
+ endif()

if (FALSE) # these headers are private for now
- install( FILES
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
@@ -61,5 +57,5 @@ index 7a4e70b8..a9267d66 100644

########### subdirectories ###############
--
-2.12.2
+2.16.1

diff --git a/kde5-apps/calligra/patches/0002-do-not-downgrade-C.patch
b/kde5-apps/calligra/patches/0002-do-not-downgrade-C.patch
new file mode 100644
index 0000000..de71203
--- /dev/null
+++ b/kde5-apps/calligra/patches/0002-do-not-downgrade-C.patch
@@ -0,0 +1,39 @@
+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-do-not-downgrade-c-version.patch
b/kde5-apps/calligra/patches/0002-do-not-downgrade-c-version.patch
deleted file mode 100644
index a377db5..0000000
--- a/kde5-apps/calligra/patches/0002-do-not-downgrade-c-version.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 7475911ad9ca9332e20fcc1d96aa4042a852406c Mon Sep 17 00:00:00 2001
-From: Treeve Jelbert <treeve AT sourcemage.org>
-Date: Thu, 2 Jun 2016 16:57:44 +0200
-Subject: [PATCH 2/3] do not downgrade c++ version
-
----
- CMakeLists.txt | 8 --------
- 1 file changed, 8 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 75902164..5020c387 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -599,14 +599,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)
---
-2.12.2
-
diff --git a/kde5-apps/calligra/patches/0003-find-openjpeg-2.1.patch
b/kde5-apps/calligra/patches/0003-find-openjpeg-2.1.patch
deleted file mode 100644
index 4ec0191..0000000
--- a/kde5-apps/calligra/patches/0003-find-openjpeg-2.1.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From f399f12f26aa0c1983b7ab333843e94cbdd6bb1f Mon Sep 17 00:00:00 2001
-From: Treeve Jelbert <treeve AT sourcemage.org>
-Date: Tue, 2 May 2017 10:02:41 +0200
-Subject: [PATCH 3/3] find openjpeg-2.1
-
----
- cmake/modules/FindOpenJPEG.cmake | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/cmake/modules/FindOpenJPEG.cmake
b/cmake/modules/FindOpenJPEG.cmake
-index ae859572..eedf7811 100644
---- a/cmake/modules/FindOpenJPEG.cmake
-+++ b/cmake/modules/FindOpenJPEG.cmake
-@@ -14,14 +14,14 @@ PATHS
- /usr/local/include/openjpeg
- /usr/local/include
- /usr/include/openjpeg
-- /usr/include/openjpeg-1.5
-+ /usr/include/openjpeg-2.1
- /usr/include
- PATH_SUFFIXES
-- openjpeg-1.5
-+ openjpeg-2.1
- openjpeg
- )
-
--set(OPENJPEG_NAMES ${OPENJPEG_NAMES} openjpeg)
-+set(OPENJPEG_NAMES ${OPENJPEG_NAMES} openjp2)
- find_library(OPENJPEG_LIBRARY
- NAMES ${OPENJPEG_NAMES}
- PATHS
---
-2.12.2
-


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

Archive powered by MHonArc 2.6.24.

Top of Page