Skip to Content.
Sympa Menu

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

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 (e6d3a893e9ae09bcf19df130210b90c1606dc8a9)
  • Date: Wed, 26 Feb 2020 08:49:33 +0000

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

kde-frameworks/purpose/DEPENDS | 6 ++++--
kde-frameworks/purpose/HISTORY | 3 +++
qt5-cmake/qca-qt5/DETAILS | 7 +++++--
qt5-cmake/qca-qt5/HISTORY | 5 +++++
qt5-cmake/qca-qt5/PRE_BUILD | 3 ---
qt5-cmake/qca-qt5/patches/libressl.patch | 24 ------------------------
6 files changed, 17 insertions(+), 31 deletions(-)

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

qca-qt5: => 2.3.0

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

purpose - tweak depends

diff --git a/kde-frameworks/purpose/DEPENDS b/kde-frameworks/purpose/DEPENDS
index 5f646a6..cf88b69 100755
--- a/kde-frameworks/purpose/DEPENDS
+++ b/kde-frameworks/purpose/DEPENDS
@@ -3,7 +3,9 @@ depends kconfig &&
depends kcoreaddons &&
depends kdeclarative &&
depends ki18n &&
-depends kwallet5 &&
+depends kio &&
+depends kirigami2 &&
+depends knotifications &&
depends kwidgetsaddons &&
-optional_depends kaccounts-integration '' '' 'quick login' &&
+optional_depends kaccounts-integration '' '' 'quick login to YouTube' &&
optional_depends kdeconnect '' '' 'connect to smartphone'
diff --git a/kde-frameworks/purpose/HISTORY b/kde-frameworks/purpose/HISTORY
index 6d5ee10b..7d84226 100644
--- a/kde-frameworks/purpose/HISTORY
+++ b/kde-frameworks/purpose/HISTORY
@@ -1,3 +1,6 @@
+2020-02-25 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: add kirigami2, kio, knotifications; delete kwallet5
+
2020-02-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.67.0

diff --git a/qt5-cmake/qca-qt5/DETAILS b/qt5-cmake/qca-qt5/DETAILS
index 68464de..85fe943 100755
--- a/qt5-cmake/qca-qt5/DETAILS
+++ b/qt5-cmake/qca-qt5/DETAILS
@@ -1,10 +1,13 @@
SPELL=qca-qt5
SPELLX=qca
- VERSION=2.2.1
-
SOURCE_HASH=sha512:3a0e8aa7cf3ea9a7244facaf1d521ebca2753af37636e7bf5f21c57ae880ac9682ae7d6d9fa5ce41b73568ff9538214956b89cd41228c2cb828d9068c2031a9c
+ VERSION=2.3.0
SOURCE=$SPELLX-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
SOURCE_URL[0]=https://download.kde.org/stable/$SPELLX/$VERSION/$SOURCE
+ SOURCE2=$SOURCE.sig
+ SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
+ SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
+ SOURCE2_IGNORE=signature
LICENSE[0]=GPL
WEB_SITE=https://delta.affinix.com/qca
ENTERED=20141229
diff --git a/qt5-cmake/qca-qt5/HISTORY b/qt5-cmake/qca-qt5/HISTORY
index 2bb750c..84eeaa3 100644
--- a/qt5-cmake/qca-qt5/HISTORY
+++ b/qt5-cmake/qca-qt5/HISTORY
@@ -1,3 +1,8 @@
+2020-02-26 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: add gpg checking
+ * DETAILS: version 2.3.0
+ * PRE_BUILD patched/*: deleted
+
2019-04-26 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.2.1
* PRE_BUILD libressl.fix: added
diff --git a/qt5-cmake/qca-qt5/PRE_BUILD b/qt5-cmake/qca-qt5/PRE_BUILD
deleted file mode 100755
index 922c0ab..0000000
--- a/qt5-cmake/qca-qt5/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-apply_patch_dir patches
diff --git a/qt5-cmake/qca-qt5/patches/libressl.patch
b/qt5-cmake/qca-qt5/patches/libressl.patch
deleted file mode 100644
index baa09c4..0000000
--- a/qt5-cmake/qca-qt5/patches/libressl.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -uNr qca-2.2.1/plugins/qca-ossl/ossl110-compat.h
qca-2.2.1.fix/plugins/qca-ossl/ossl110-compat.h
---- qca-2.2.1/plugins/qca-ossl/ossl110-compat.h 2019-04-24
14:58:14.000000000 +0200
-+++ qca-2.2.1.fix/plugins/qca-ossl/ossl110-compat.h 2019-04-26
18:43:23.371501310 +0200
-@@ -25,7 +25,7 @@
- #include <openssl/rsa.h>
- #include <openssl/dsa.h>
-
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- #define RSA_F_RSA_METH_DUP 161
-
- static void DSA_SIG_get0(const DSA_SIG *sig, const BIGNUM **pr, const
BIGNUM **ps)
-diff -uNr qca-2.2.1/plugins/qca-ossl/qca-ossl.cpp
qca-2.2.1.fix/plugins/qca-ossl/qca-ossl.cpp
---- qca-2.2.1/plugins/qca-ossl/qca-ossl.cpp 2019-04-24 14:58:14.000000000
+0200
-+++ qca-2.2.1.fix/plugins/qca-ossl/qca-ossl.cpp 2019-04-26
18:42:11.179426042 +0200
-@@ -57,7 +57,7 @@
- ((_STACK*) (1 ? p : (type*)0))
- #endif
-
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !
defined(LIBRESSL_VERSION_NUMBER)
- #define OSSL_110
- #endif
-



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (e6d3a893e9ae09bcf19df130210b90c1606dc8a9), Treeve Jelbert, 02/26/2020

Archive powered by MHonArc 2.6.24.

Top of Page