Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (0644788a484a15b0db4db03ce9d0ede1cf6df6d4)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (0644788a484a15b0db4db03ce9d0ede1cf6df6d4)
  • Date: Wed, 27 Sep 2017 20:23:25 +0000

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

crypto/keepassx/BUILD | 2 +-
crypto/keepassx/DEPENDS | 2 +-
crypto/keepassx/DETAILS | 10 +++++-----
crypto/keepassx/HISTORY | 5 +++++
crypto/keepassx/PRE_BUILD | 3 +++
crypto/keepassx/qt5.9.patch | 23 +++++++++++++++++++++++
libs/pyqt5/DETAILS | 2 +-
libs/pyqt5/HISTORY | 3 +++
8 files changed, 42 insertions(+), 8 deletions(-)

New commits:
commit 0644788a484a15b0db4db03ce9d0ede1cf6df6d4
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

keepassx: switch to a git snapshot to get it to build with qt5

commit 2512e155e36534a6b6970f8a23c58da3995a786b
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

pyqt5: make it possibly work (bad SOURCE_DIRECTORY)

diff --git a/crypto/keepassx/BUILD b/crypto/keepassx/BUILD
index 0886051..7f792da 100755
--- a/crypto/keepassx/BUILD
+++ b/crypto/keepassx/BUILD
@@ -1 +1 @@
-OPTS="-DCMAKE_INSTALL_PREFIX=$INSTALL_ROOT/usr $OPTS" qt4_cmake_build
+OPTS="-DCMAKE_INSTALL_PREFIX=$INSTALL_ROOT/usr $OPTS" qt5_cmake_build
diff --git a/crypto/keepassx/DEPENDS b/crypto/keepassx/DEPENDS
index e8b58ec..f782c16 100755
--- a/crypto/keepassx/DEPENDS
+++ b/crypto/keepassx/DEPENDS
@@ -1,5 +1,5 @@
depends -sub CXX gcc &&
-depends qt4 &&
+depends qtbase &&
depends cmake &&
depends libgcrypt &&
depends zlib &&
diff --git a/crypto/keepassx/DETAILS b/crypto/keepassx/DETAILS
index 673f798..8c029f1 100755
--- a/crypto/keepassx/DETAILS
+++ b/crypto/keepassx/DETAILS
@@ -1,9 +1,9 @@
SPELL=keepassx
- VERSION=2.0.3
- SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=https://www.keepassx.org/releases/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:bf1a4ffa49fc4a6b7a27e6292981c9c13920712b4cd86759a99976f7e0593a243ea14575c57d664ba7e55d2449b5d83bc3d43a64a9a6972335e52234da79d773
+ VERSION=2.0.3+55869e8
+ SOURCE=$SPELL-$VERSION.zip
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-master
+ SOURCE_URL[0]=http://sobukus.de/keepassx/$SOURCE
+
SOURCE_HASH=sha512:49de208fd8405a1541999da6dfb87b3ca245d22ac0442eb4b47fdead4d86ca44dc8555bf5c7432e1f11b7b96daabe2dcdb171f020908d2e7ffe7d6dfda8fad68
LICENSE[0]=GPL
WEB_SITE=http://www.keepassx.org/
ENTERED=20100706
diff --git a/crypto/keepassx/HISTORY b/crypto/keepassx/HISTORY
index 837f37b..58deeda 100644
--- a/crypto/keepassx/HISTORY
+++ b/crypto/keepassx/HISTORY
@@ -1,3 +1,8 @@
+2017-09-27 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: switch to a git snapshot for Qt5 support
+ * BUILD: Qt5
+ * PRE_BUILD, qt5.9.patch: a fix on top for current Qt5
+
2017-01-13 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 2.0.3

diff --git a/crypto/keepassx/PRE_BUILD b/crypto/keepassx/PRE_BUILD
new file mode 100755
index 0000000..044259c
--- /dev/null
+++ b/crypto/keepassx/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+patch -p1 < "$SCRIPT_DIRECTORY/qt5.9.patch"
diff --git a/crypto/keepassx/qt5.9.patch b/crypto/keepassx/qt5.9.patch
new file mode 100644
index 0000000..7644303
--- /dev/null
+++ b/crypto/keepassx/qt5.9.patch
@@ -0,0 +1,23 @@
+From 83900e35bd18807ce17c779a570b3c52a182fa95 Mon Sep 17 00:00:00 2001
+From: Aleix Pol <aleixpol AT kde.org>
+Date: Wed, 29 Mar 2017 01:17:12 +0200
+Subject: [PATCH] Fix build with Qt branch 5.9
+
+keepassx/tests/modeltest.cpp:451: undefined reference to `bool
QTest::qCompare<int, unsigned int>(int const&, unsigned int const&, char
const*, char const*, char const*, int)'
+---
+ tests/modeltest.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/modeltest.cpp b/tests/modeltest.cpp
+index 360a7bef..3e2b3c73 100644
+--- a/tests/modeltest.cpp
++++ b/tests/modeltest.cpp
+@@ -447,7 +447,7 @@ void ModelTest::data()
+ // Check that the alignment is one we know about
+ QVariant textAlignmentVariant = model->data ( model->index ( 0, 0 ),
Qt::TextAlignmentRole );
+ if ( textAlignmentVariant.isValid() ) {
+- int alignment = textAlignmentVariant.toInt();
++ const uint alignment = textAlignmentVariant.toUInt();
+ QCOMPARE( alignment, ( alignment & ( Qt::AlignHorizontal_Mask |
Qt::AlignVertical_Mask ) ) );
+ }
+
diff --git a/libs/pyqt5/DETAILS b/libs/pyqt5/DETAILS
index 5811c50..8c1380b 100755
--- a/libs/pyqt5/DETAILS
+++ b/libs/pyqt5/DETAILS
@@ -3,7 +3,7 @@
VERSION=5.8.2

SOURCE_HASH=sha512:8b765b9ae6210b7312a2dc6ed94d2664ae569625fe8a27443bae4230d9d9c00e0cf3b4be6904c66ebceff5cd5bbd19a5a9794a0b3222c8098a55f0b94fc8d89b
SOURCE=$SPELLX-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX_$VERSION
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION

SOURCE_URL[0]=https://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-${VERSION}/${SOURCE}
WEB_SITE=https://www.riverbankcomputing.co.uk/software/pyqt/
ENTERED=20140213
diff --git a/libs/pyqt5/HISTORY b/libs/pyqt5/HISTORY
index 4861dc9..c92ebf7 100644
--- a/libs/pyqt5/HISTORY
+++ b/libs/pyqt5/HISTORY
@@ -1,3 +1,6 @@
+2017-09-27 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: fix SOURCE_DIRECTORY ... never possibly worked!
+
2017-04-04 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.8.2




  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (0644788a484a15b0db4db03ce9d0ede1cf6df6d4), Thomas Orgis, 09/27/2017

Archive powered by MHonArc 2.6.24.

Top of Page