Skip to Content.
Sympa Menu

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

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 (ac7ddcb288a5a214221450395f4913b4d8cd8fc3)
  • Date: Tue, 2 May 2017 14:28:33 +0000

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

graphics/gl2ps/DETAILS | 4
graphics/gl2ps/HISTORY | 3
kde5-apps/calligra/DEPENDS | 5
kde5-apps/calligra/HISTORY | 5
kde5-apps/calligra/PRE_BUILD | 4
kde5-apps/calligra/patches/0001-do-not-run-update_xdg_mimetypes.patch | 65
++++++++++
kde5-apps/calligra/patches/0002-do-not-downgrade-c-version.patch | 31
++++
kde5-apps/calligra/patches/0003-find-openjpeg-2.1.patch | 34
+++++
kde5-apps/calligra/vc.diff | 19
--
kde5-apps/krita/DETAILS | 4
kde5-apps/krita/HISTORY | 3
kernels/kmod/DETAILS | 4
kernels/kmod/HISTORY | 3
libs/libgudev/BUILD | 2
libs/libgudev/DETAILS | 4
libs/libgudev/HISTORY | 4
libs/orc/DETAILS | 11
+
libs/orc/HISTORY | 4
x11/colord/DETAILS | 2
x11/colord/HISTORY | 3
20 files changed, 178 insertions(+), 36 deletions(-)

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

kmod: => 24

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

orc: => 0.4.26

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

gl2ps: => 1.4.0

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

colord: => 1.3.5

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

libgudev: => 231

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

calligra - minor patches

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

krita: => 3.1.3

diff --git a/graphics/gl2ps/DETAILS b/graphics/gl2ps/DETAILS
index 087d84e..f15c54a 100755
--- a/graphics/gl2ps/DETAILS
+++ b/graphics/gl2ps/DETAILS
@@ -1,6 +1,6 @@
SPELL=gl2ps
- VERSION=1.3.9
-
SOURCE_HASH=sha512:e6770c27d4832a300b4e16a9f98deb8557e7875460e7aa7e655fdb796f5dfffd5eccdc8b15f5a3ae151713fc46f97dacad48ee7550c41373b6fc8cfd21a437cb
+ VERSION=1.4.0
+
SOURCE_HASH=sha512:420b21a5b4397c9a9a2323a8686b8635c2683354c94762d2d0172c661fc36c4298042498dd8ef2323adf32f45aa4e0a3dba146058ccde597e5a46c2027cbf7ce
SOURCE="${SPELL}-${VERSION}.tgz"
SOURCE_URL[0]=http://geuz.org/${SPELL}/src/${SOURCE}
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}-source"
diff --git a/graphics/gl2ps/HISTORY b/graphics/gl2ps/HISTORY
index eac7041..b156adc 100644
--- a/graphics/gl2ps/HISTORY
+++ b/graphics/gl2ps/HISTORY
@@ -1,3 +1,6 @@
+2017-05-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.4.0
+
2016-02-07 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.3.9
* DEPENDS: add cmake; texlive is optional
diff --git a/kde5-apps/calligra/DEPENDS b/kde5-apps/calligra/DEPENDS
index 1e0c79d..ef603a4 100755
--- a/kde5-apps/calligra/DEPENDS
+++ b/kde5-apps/calligra/DEPENDS
@@ -73,8 +73,11 @@ optional_depends libwps '' '' 'MS Works import'
#
optional_depends qtdeclarative '' '' 'Gemini' &&
optional_depends qtquick1 '' '' ' Gemini' &&
-optional_depends WEBKIT_QT '' ' -DWITH_Qt5WebKit=OFF
-DWITH_Qt5WebKitWidgets=OFF' 'Stage/Braindump'
+optional_depends WEBKIT_QT '' \
+ ' -DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebKit=1
-DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebKitWidgets=1'\
+ 'Stage - Web browser'

#Karbon
+optional_depends openjpeg '' '' 'Karbon' &&
suggest_depends pstoedit 'Karbon eps import filter'

diff --git a/kde5-apps/calligra/HISTORY b/kde5-apps/calligra/HISTORY
index 99ecab0..1cfed43 100644
--- a/kde5-apps/calligra/HISTORY
+++ b/kde5-apps/calligra/HISTORY
@@ -1,3 +1,8 @@
+2017-05-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * PRE_BUILD: use apply_patch_dir
+ * patches/*: added
+ * DEPENDS: fix qtwebkit flags, add openjpeg
+
2017-04-03 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.0.1
* DEPENDS: fix khtml flags
diff --git a/kde5-apps/calligra/PRE_BUILD b/kde5-apps/calligra/PRE_BUILD
index 48a084d..4604ffc 100755
--- a/kde5-apps/calligra/PRE_BUILD
+++ b/kde5-apps/calligra/PRE_BUILD
@@ -1,5 +1,3 @@
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 &&
-patch -p1 < $SPELL_DIRECTORY/vc.diff
+apply_patch_dir patches
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
new file mode 100644
index 0000000..7564f9c
--- /dev/null
+++ b/kde5-apps/calligra/patches/0001-do-not-run-update_xdg_mimetypes.patch
@@ -0,0 +1,65 @@
+From abf442deb59b8134cc9aedc78a5583727f1bba2f 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
+
+---
+ filters/libmsooxml/CMakeLists.txt | 5 +----
+ 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(-)
+
+diff --git a/filters/libmsooxml/CMakeLists.txt
b/filters/libmsooxml/CMakeLists.txt
+index 39fd2017..7eafb97b 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})
+
+-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})
+
+ 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
++++ 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
++++ b/filters/words/wiki/CMakeLists.txt
+@@ -3,7 +3,6 @@
+ if(SHOULD_BUILD_FILTER_ODT_TO_WIKI)
+ if (SharedMimeInfo_FOUND)
+ install(FILES wiki-format.xml DESTINATION ${XDG_MIME_INSTALL_DIR})
+- update_xdg_mimetypes(${XDG_MIME_INSTALL_DIR})
+ endif()
+
+ add_subdirectory(export)
+diff --git a/plugins/vectorshape/CMakeLists.txt
b/plugins/vectorshape/CMakeLists.txt
+index 7a4e70b8..a9267d66 100644
+--- a/plugins/vectorshape/CMakeLists.txt
++++ b/plugins/vectorshape/CMakeLists.txt
+@@ -37,7 +37,6 @@ install(TARGETS calligra_shape_vector DESTINATION
${PLUGIN_INSTALL_DIR}/calligra
+
+ if (SharedMimeInfo_FOUND)
+ install(FILES calligra_svm.xml DESTINATION ${XDG_MIME_INSTALL_DIR})
+- update_xdg_mimetypes(${XDG_MIME_INSTALL_DIR})
+ endif ()
+
+ ########### subdirectories ###############
+--
+2.12.2
+
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
new file mode 100644
index 0000000..a377db5
--- /dev/null
+++ b/kde5-apps/calligra/patches/0002-do-not-downgrade-c-version.patch
@@ -0,0 +1,31 @@
+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
new file mode 100644
index 0000000..4ec0191
--- /dev/null
+++ b/kde5-apps/calligra/patches/0003-find-openjpeg-2.1.patch
@@ -0,0 +1,34 @@
+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
+
diff --git a/kde5-apps/calligra/vc.diff b/kde5-apps/calligra/vc.diff
deleted file mode 100644
index a07374f..0000000
--- a/kde5-apps/calligra/vc.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-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)
diff --git a/kde5-apps/krita/DETAILS b/kde5-apps/krita/DETAILS
index d20381c..ba9ca8f 100755
--- a/kde5-apps/krita/DETAILS
+++ b/kde5-apps/krita/DETAILS
@@ -1,7 +1,7 @@
SPELL=krita
- VERSION=3.1.2.1
+ VERSION=3.1.3
SOURCE=$SPELL-$VERSION.tar.gz
- SOURCE_URL=http://download.kde.org/stable/krita/${VERSION%.?}/$SOURCE
+ SOURCE_URL=https://download.kde.org/stable/krita/${VERSION%.?}/$SOURCE
SOURCE2=$SOURCE.sig
SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
diff --git a/kde5-apps/krita/HISTORY b/kde5-apps/krita/HISTORY
index a55e66d..ff74e7b 100644
--- a/kde5-apps/krita/HISTORY
+++ b/kde5-apps/krita/HISTORY
@@ -1,3 +1,6 @@
+2017-05-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.1.3
+
2017-02-01 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.1.2.1

diff --git a/kernels/kmod/DETAILS b/kernels/kmod/DETAILS
index 5fda0b9..691424f 100755
--- a/kernels/kmod/DETAILS
+++ b/kernels/kmod/DETAILS
@@ -1,6 +1,6 @@
SPELL=kmod
- VERSION=23
-
SOURCE_HASH=sha512:84b18d35117b33c48fd9b732a584a9f94caef553e371bd4e68953540f46fc6c7145c8c7163df898875437ad56e1a47e89be26531314299bce0026c46da9dd3c0
+ VERSION=24
+
SOURCE_HASH=sha512:58c8da100418b6325de1595bceee4115cbdd7151d03a028c0b1f6d5d3e6611c667e27f3a0245d29781125581849fd1e854fa8d87b63c4b8fa3f196d0a97e1779
SOURCE=$SPELL-$VERSION.tar.xz
# SOURCE2=$SOURCE.sign
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/kernels/kmod/HISTORY b/kernels/kmod/HISTORY
index 60ead6f..aa5d9b3 100644
--- a/kernels/kmod/HISTORY
+++ b/kernels/kmod/HISTORY
@@ -1,3 +1,6 @@
+2017-05-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 24
+
2016-07-27 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 23

diff --git a/libs/libgudev/BUILD b/libs/libgudev/BUILD
new file mode 100755
index 0000000..913deb0
--- /dev/null
+++ b/libs/libgudev/BUILD
@@ -0,0 +1,2 @@
+OPTS+="--disable-umockdev" &&
+default_build
diff --git a/libs/libgudev/DETAILS b/libs/libgudev/DETAILS
index c7487b3..60900f6 100755
--- a/libs/libgudev/DETAILS
+++ b/libs/libgudev/DETAILS
@@ -1,6 +1,6 @@
SPELL=libgudev
- VERSION=230
-
SOURCE_HASH=sha512:682e08f1a406bd323a59268d9d2fde9efd015a7e0cd5958c5c4e0bc94b593d071a9b824c8b9dfc104c93e555342b1a74a63da91834e10558a9646c9195ef6fbd
+ VERSION=231
+
SOURCE_HASH=sha512:3989025168c9e7e5e3f7813ee903a63f697ad390d3060121d0f45ee31031014c23a26f4287f3e6ad97d582131d0d568be31baa0b68f6f64ae337e926b3fe2625
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=https://download.gnome.org/sources/libgudev/$VERSION/$SOURCE
diff --git a/libs/libgudev/HISTORY b/libs/libgudev/HISTORY
index beecaaa..c37cefe 100644
--- a/libs/libgudev/HISTORY
+++ b/libs/libgudev/HISTORY
@@ -1,3 +1,7 @@
+2017-05-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 231
+ * BUILD: added, fixbuild without umockdev
+
2015-11-24 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 230
spell created
diff --git a/libs/orc/DETAILS b/libs/orc/DETAILS
index cb47e06..a19cb88 100755
--- a/libs/orc/DETAILS
+++ b/libs/orc/DETAILS
@@ -1,10 +1,13 @@
SPELL=orc
- VERSION=0.4.25
-
SOURCE_HASH=sha512:13f636e3ab86e725e15f885462db1944744b8389f263b7afa2279c0e68fb8e71344a646ecb8b7a7fce03e93ab78351a1b79d5eaef106ab8e1d808e82b514316a
+ VERSION=0.4.26
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
- SOURCE_URL[0]=http://gstreamer.freedesktop.org/data/src/orc/$SOURCE
- WEB_SITE=http://code.entropywave.com/projects/orc/
+ SOURCE_URL[0]=https://gstreamer.freedesktop.org/data/src/orc/$SOURCE
+ SOURCE2=$SOURCE.asc
+ SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
+ SOURCE_GPG=freedesktop.gpg:$SOURCE.asc:UPSTREAM_KEY
+ SOURCE2_IGNORE=signature
+ WEB_SITE=https://code.entropywave.com/projects/orc/
ENTERED=20100310
LICENSE[0]=GPL
SHORT="Optimized Inner Loops Runtime Compiler"
diff --git a/libs/orc/HISTORY b/libs/orc/HISTORY
index 7839d1b..3373128 100644
--- a/libs/orc/HISTORY
+++ b/libs/orc/HISTORY
@@ -1,3 +1,7 @@
+2017-05-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.4.26
+ * DETAILS: add gpg checking
+
2016-033-06 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.4.25

diff --git a/x11/colord/DETAILS b/x11/colord/DETAILS
index 9e0188f..8df7bf0 100755
--- a/x11/colord/DETAILS
+++ b/x11/colord/DETAILS
@@ -1,5 +1,5 @@
SPELL=colord
- VERSION=1.3.4
+ VERSION=1.3.5
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE2=$SOURCE.asc
SOURCE2_IGNORE=signature
diff --git a/x11/colord/HISTORY b/x11/colord/HISTORY
index be0cecf..706ac15 100644
--- a/x11/colord/HISTORY
+++ b/x11/colord/HISTORY
@@ -1,3 +1,6 @@
+2017-05-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.3.5
+
2017-02-26 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.3.4




  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (ac7ddcb288a5a214221450395f4913b4d8cd8fc3), Treeve Jelbert, 05/02/2017

Archive powered by MHonArc 2.6.24.

Top of Page