Skip to Content.
Sympa Menu

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

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 (30b37c9e0a25b104171ad56a4ac9d2b560c408fb)
  • Date: Sat, 15 Apr 2017 07:26:52 +0000

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

ChangeLog | 3 +++
kde-frameworks/khtml/HISTORY | 3 +++
kde-frameworks/khtml/PRE_BUILD | 3 +++
kde.gpg |binary
kde5-apps/konversation/DETAILS | 11 +++++++----
kde5-apps/konversation/HISTORY | 4 ++++
6 files changed, 20 insertions(+), 4 deletions(-)

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

konversation: => 1.7

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

kde.gpg - add Eike Hein

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

khtml - fix build with qt-5.9

diff --git a/ChangeLog b/ChangeLog
index aaec96c..231f2a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2017-04-15 Treeve Jelbert <treeve AT sourcemage.org>
+ * kde.gpg: add C632316E "Eike Hein <hein AT kde.org>"
+
2017-04-10 Pavel Vinogradov <public AT sourcemage.org>
* gnu.gpg: added Phil Nelson's key (for GNU bc)

diff --git a/kde-frameworks/khtml/HISTORY b/kde-frameworks/khtml/HISTORY
index f11a7d8..a8f96ca 100644
--- a/kde-frameworks/khtml/HISTORY
+++ b/kde-frameworks/khtml/HISTORY
@@ -1,3 +1,6 @@
+2017-04-11 Treeve Jelbert <treeve AT sourcemage.org>
+ * PRE_BUILD: added, fix build with qt-5.9
+
2017-04-08 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.33.0

diff --git a/kde-frameworks/khtml/PRE_BUILD b/kde-frameworks/khtml/PRE_BUILD
new file mode 100755
index 0000000..217a20e
--- /dev/null
+++ b/kde-frameworks/khtml/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+sed -i "/Q_PLUGIN_METADATA/s/FILE//" src/khtml_factory.h
diff --git a/kde.gpg b/kde.gpg
index 15fa619..3110d5b 100644
Binary files a/kde.gpg and b/kde.gpg differ
diff --git a/kde5-apps/konversation/DETAILS b/kde5-apps/konversation/DETAILS
index 9fb5d82..001e044 100755
--- a/kde5-apps/konversation/DETAILS
+++ b/kde5-apps/konversation/DETAILS
@@ -1,10 +1,13 @@
SPELL=konversation
- VERSION=1.6.2
-
SOURCE_HASH=sha512:c4c2515fd6ea02a07250492151887be842c0d6ccdf6ea66075d0cd757ed26c3ed506852049e20b38c535bae9557f313a0b8fc3cd8616ad10c6b60f9a047b9e63
+ VERSION=1.7
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://download.kde.org/stable/$SPELL/$VERSION/src/$SOURCE
- WEB_SITE=http://konversation.kde.org
+ SOURCE_URL[0]=https://download.kde.org/stable/$SPELL/$VERSION/src/$SOURCE
+ SOURCE2=$SOURCE.sig
+ SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
+ SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
+ SOURCE2_IGNORE=signature
+ WEB_SITE=https://konversation.kde.org
ENTERED=20040918
LICENSE[0]=GPL
KEYWORDS="irc kde5"
diff --git a/kde5-apps/konversation/HISTORY b/kde5-apps/konversation/HISTORY
index 2ed5ad5..65dbda3 100644
--- a/kde5-apps/konversation/HISTORY
+++ b/kde5-apps/konversation/HISTORY
@@ -1,3 +1,7 @@
+2017-04-15 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.7
+ * DETAILS: add gpg checking
+
2016-08-05 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.6.2




  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (30b37c9e0a25b104171ad56a4ac9d2b560c408fb), Treeve Jelbert, 04/15/2017

Archive powered by MHonArc 2.6.24.

Top of Page