Skip to Content.
Sympa Menu

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

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 (3f579cb585ea27a3998050e061957def36a6f06e)
  • Date: Mon, 15 May 2023 17:54:35 +0000

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

crypto/keepassx/BUILD | 2 +-
crypto/keepassx/CONFLICTS | 1 +
crypto/keepassx/DEPENDS | 11 -----------
crypto/keepassx/DETAILS | 15 +++++----------
crypto/keepassx/DOWNLOAD | 1 +
crypto/keepassx/HISTORY | 34 ++++------------------------------
crypto/keepassx/INSTALL | 5 +----
crypto/keepassx/PRE_BUILD | 4 +---
crypto/keepassx/UP_TRIGGERS | 1 +
crypto/keepassx/qt5.9.patch | 23 -----------------------
crypto/keepassxc/DETAILS | 4 ++--
crypto/keepassxc/HISTORY | 3 +++
kde5-extra/ktextaddons/DETAILS | 4 ++--
kde5-extra/ktextaddons/HISTORY | 3 +++
14 files changed, 25 insertions(+), 86 deletions(-)

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

ktextaddons: => 1.3.1

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

deprecate crypto/keepassx [replaced by keepassxc]

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

keepassxc: => 2.7.5

diff --git a/crypto/keepassx/BUILD b/crypto/keepassx/BUILD
index 7f792da..27ba77d 100755
--- a/crypto/keepassx/BUILD
+++ b/crypto/keepassx/BUILD
@@ -1 +1 @@
-OPTS="-DCMAKE_INSTALL_PREFIX=$INSTALL_ROOT/usr $OPTS" qt5_cmake_build
+true
diff --git a/crypto/keepassx/CONFLICTS b/crypto/keepassx/CONFLICTS
new file mode 100755
index 0000000..78e4dd6
--- /dev/null
+++ b/crypto/keepassx/CONFLICTS
@@ -0,0 +1 @@
+conflicts keepassx y
diff --git a/crypto/keepassx/DEPENDS b/crypto/keepassx/DEPENDS
deleted file mode 100755
index f782c16..0000000
--- a/crypto/keepassx/DEPENDS
+++ /dev/null
@@ -1,11 +0,0 @@
-depends -sub CXX gcc &&
-depends qtbase &&
-depends cmake &&
-depends libgcrypt &&
-depends zlib &&
-depends patchelf &&
-
-optional_depends libxtst '' '' 'for auto-type support' &&
-if is_depends_enabled $SPELL libxtst; then
- depends libxi
-fi
diff --git a/crypto/keepassx/DETAILS b/crypto/keepassx/DETAILS
index 8c029f1..da3c30f 100755
--- a/crypto/keepassx/DETAILS
+++ b/crypto/keepassx/DETAILS
@@ -1,13 +1,8 @@
SPELL=keepassx
- 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
- SHORT="cross platform password manager"
+ VERSION=0
+ PATCHLEVEL=9999
+ SHORT="deprecated"
cat << EOF
-Cross Platform Password Manager.
+deprecated spell [replaced by keepassxc]
EOF
+
diff --git a/crypto/keepassx/DOWNLOAD b/crypto/keepassx/DOWNLOAD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/crypto/keepassx/DOWNLOAD
@@ -0,0 +1 @@
+true
diff --git a/crypto/keepassx/HISTORY b/crypto/keepassx/HISTORY
index f88bb21..f792c73 100644
--- a/crypto/keepassx/HISTORY
+++ b/crypto/keepassx/HISTORY
@@ -1,30 +1,4 @@
-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 <bwlf AT bandrate.org>
- * DETAILS: version 2.0.3
-
-2015-12-12 Florian Franzmann <bwlf AT bandrate.org>
- * DEPENDS, DETAILS: version 2.0
- * 0001-add-missing-includes.patch, PRE_BUILD: removed
-
-2015-07-05 Florian Franzmann <bwlf AT bandrate.org>
- * INSTALL, DEPENDS: fix rpath of executable so all libraries are found
-
-2015-06-28 Florian Franzmann <bwlf AT bandrate.org>
- * BUILD, DEPENDS: use cmake, install to /usr instead of to /opt/qt4
-
-2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
- * DETAILS: remove SOURCEFORGE_URL usage (automated)
-
-2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
- * DEPENDS: depends -sub CXX gcc (half-automated)
-
-2013-02-06 Florian Franzmann <bwlf AT bandrate.org>
- * PRE_BUILD, 0001-add-missing-includes.patch: fix missing includes
-
-2010-07-06 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS, DEPENDS, BUILD: spell created, version 0.4.3
-
+2023-05-15 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0
+ PATCHLEVEL=9999
+ spell deprecated [replaced by keepassxc]
diff --git a/crypto/keepassx/INSTALL b/crypto/keepassx/INSTALL
index d018c7f..27ba77d 100755
--- a/crypto/keepassx/INSTALL
+++ b/crypto/keepassx/INSTALL
@@ -1,4 +1 @@
-default_install &&
-message "$MESSAGE_COLOR patchelf --set-rpath /opt/qt4/lib
${SOURCE_DIRECTORY}/build/src/keepassx $DEFAULT_COLOR" &&
-patchelf --set-rpath /opt/qt4/lib ${INSTALL_ROOT}/usr/bin/keepassx
-
+true
diff --git a/crypto/keepassx/PRE_BUILD b/crypto/keepassx/PRE_BUILD
index 044259c..27ba77d 100755
--- a/crypto/keepassx/PRE_BUILD
+++ b/crypto/keepassx/PRE_BUILD
@@ -1,3 +1 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-patch -p1 < "$SCRIPT_DIRECTORY/qt5.9.patch"
+true
diff --git a/crypto/keepassx/UP_TRIGGERS b/crypto/keepassx/UP_TRIGGERS
new file mode 100755
index 0000000..25208fb
--- /dev/null
+++ b/crypto/keepassx/UP_TRIGGERS
@@ -0,0 +1 @@
+up_trigger keepassxc cast_self
diff --git a/crypto/keepassx/qt5.9.patch b/crypto/keepassx/qt5.9.patch
deleted file mode 100644
index 7644303..0000000
--- a/crypto/keepassx/qt5.9.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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/crypto/keepassxc/DETAILS b/crypto/keepassxc/DETAILS
index 3ceafd8..3d50bf6 100755
--- a/crypto/keepassxc/DETAILS
+++ b/crypto/keepassxc/DETAILS
@@ -1,9 +1,9 @@
source $GRIMOIRE/CMAKE_FUNCTIONS
SPELL=keepassxc
- VERSION=2.7.4
+ VERSION=2.7.5
SOURCE="${SPELL}-${VERSION}.tar.gz"

SOURCE_URL[0]=https://github.com/keepassxreboot/${SPELL}/archive/${VERSION}.tar.gz
-
SOURCE_HASH=sha512:85202c1c270757bc9ef47b58d8fb3801c35dd55298b8304dca326bec104ddb6da2b4050b22edddac453bb9a0b507a9dee07e842f1b8e957d96fd9337d5efdf38
+
SOURCE_HASH=sha512:9714b39c34bdf6964088ae34f61a7b75ba57a63d5e0551b7aefcf9267e7813093a84d54e2413f999f77c077a2dae2785e3b8d1c23cc96f3f0ac60d906435090e
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="https://keepassxc.org/";
LICENSE[0]=GPL
diff --git a/crypto/keepassxc/HISTORY b/crypto/keepassxc/HISTORY
index 7aad044..bcf86f8 100644
--- a/crypto/keepassxc/HISTORY
+++ b/crypto/keepassxc/HISTORY
@@ -1,3 +1,6 @@
+2023-05-15 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.7.5
+
2023-02-22 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.7.4
* DEPENDS: add botan
diff --git a/kde5-extra/ktextaddons/DETAILS b/kde5-extra/ktextaddons/DETAILS
index 4f5dbdf..bb7137f 100755
--- a/kde5-extra/ktextaddons/DETAILS
+++ b/kde5-extra/ktextaddons/DETAILS
@@ -1,6 +1,6 @@
SPELL=ktextaddons
- VERSION=1.3.0
-
SOURCE_HASH=sha512:0fb2c523547087a8732e40158318a5984729d56faf25318878f059c1dfb7b12fdb45e165e61fe259ee5379d40c24cd79464aac8af39802e25390d22a3a77eca4
+ VERSION=1.3.1
+
SOURCE_HASH=sha512:1a137abe91a86c748bddc152241e29b36c8e4045f1be9d9cd8e6c8a04ecc1e3088db62fa510a1cd8c94a56038b2850b62e9cc7be51aefa14c3614c641dd87be0
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_URL=https://download.kde.org/stable/ktextaddons/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/kde5-extra/ktextaddons/HISTORY b/kde5-extra/ktextaddons/HISTORY
index fd9f343..c6fd1a6 100644
--- a/kde5-extra/ktextaddons/HISTORY
+++ b/kde5-extra/ktextaddons/HISTORY
@@ -1,3 +1,6 @@
+2023-05-15 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.3.1
+
2023-04-30 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.3.0




  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (3f579cb585ea27a3998050e061957def36a6f06e), Treeve Jelbert, 05/15/2023

Archive powered by MHonArc 2.6.24.

Top of Page