sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (25bd925c68427c1a0c8155173f6f909bacdf1b9f)
- 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 (25bd925c68427c1a0c8155173f6f909bacdf1b9f)
- Date: Thu, 12 Jan 2017 08:53:50 +0000
GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:
ChangeLog | 3 +++
kde5-apps/calligra/DEPENDS | 2 +-
kde5-apps/calligra/HISTORY | 3 +++
xorg-xserver/xorg-server/DETAILS | 2 +-
xorg-xserver/xorg-server/HISTORY | 3 +++
xorg.gpg |binary
6 files changed, 11 insertions(+), 2 deletions(-)
New commits:
commit 25bd925c68427c1a0c8155173f6f909bacdf1b9f
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
xorg,gpg - add Adam Jackson
commit dff120568525d2c304a9d1e6165609d21cf8b578
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
xorg-server: => 1.19.1
commit 3db7d8493959e33e7126fdfac6e87b30c01e4579
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
calligra - tweak depends
diff --git a/ChangeLog b/ChangeLog
index d788712..2782e0a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2017-01-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * xorg.gpg: add A0ECD0D3 "Adam Jackson <ajax AT benzedrine.nwnk.net>"
+
2017-01-08 Pavel Vinogradov <public AT sourcemage.org>
* libs/ivykis: new spell, asynchronous I/O-assisting library
diff --git a/kde5-apps/calligra/DEPENDS b/kde5-apps/calligra/DEPENDS
index f8c2b97..bc61455 100755
--- a/kde5-apps/calligra/DEPENDS
+++ b/kde5-apps/calligra/DEPENDS
@@ -73,7 +73,7 @@ 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'
+optional_depends WEBKIT_QT '' ' -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/HISTORY b/kde5-apps/calligra/HISTORY
index 9c84068..8285106 100644
--- a/kde5-apps/calligra/HISTORY
+++ b/kde5-apps/calligra/HISTORY
@@ -1,3 +1,6 @@
+2017-01-11 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: qtwebkit => WEBKIT_QT
+
2017-01-03 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.0.0.1
diff --git a/xorg-xserver/xorg-server/DETAILS
b/xorg-xserver/xorg-server/DETAILS
index a20db12..7bf9af1 100755
--- a/xorg-xserver/xorg-server/DETAILS
+++ b/xorg-xserver/xorg-server/DETAILS
@@ -1,5 +1,5 @@
SPELL=xorg-server
- VERSION=1.19.0
+ VERSION=1.19.1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=https://xorg.freedesktop.org/releases/individual/xserver/$SOURCE
SOURCE2=$SOURCE.sig
diff --git a/xorg-xserver/xorg-server/HISTORY
b/xorg-xserver/xorg-server/HISTORY
index b211f93..e01d175 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -1,3 +1,6 @@
+2017-01-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.19.1
+
2016-11-22 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: add wayland-protocols
diff --git a/xorg.gpg b/xorg.gpg
index 9f3b318..9aec4e3 100644
Binary files a/xorg.gpg and b/xorg.gpg differ
- [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (25bd925c68427c1a0c8155173f6f909bacdf1b9f), Treeve Jelbert, 01/12/2017
Archive powered by MHonArc 2.6.24.