sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[[SM-Commit] ] GIT changes to master grimoire by Treeve Jelbert (733f304389fa77f1cbd0409406490090e8ecf4c6)
- From: Treeve Jelbert <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org, sm-commit AT lists.sourcemage.org
- Subject: [[SM-Commit] ] GIT changes to master grimoire by Treeve Jelbert (733f304389fa77f1cbd0409406490090e8ecf4c6)
- Date: Sun, 22 Dec 2024 12:02:06 +0000
GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:
chat-im/psi/BUILD | 4 ----
chat-im/psi/CONFIGURE | 1 +
chat-im/psi/DEPENDS | 18 +++++++++++-------
chat-im/psi/DETAILS | 33 +++++++++------------------------
chat-im/psi/HISTORY | 8 ++++++++
chat-im/psi/PREPARE | 1 -
libs/libportal/BUILD | 8 +++++++-
libs/libportal/CONFIGURE | 4 +---
libs/libportal/DEPENDS | 25 +++++++++++++++++--------
libs/libportal/DETAILS | 4 ++--
libs/libportal/HISTORY | 5 +++++
11 files changed, 61 insertions(+), 50 deletions(-)
New commits:
commit 733f304389fa77f1cbd0409406490090e8ecf4c6
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
libportal: => 0.9.0
commit f0d4621090e640b5e4397a80f6447c624782e561
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
psi: => 1.5
diff --git a/chat-im/psi/BUILD b/chat-im/psi/BUILD
deleted file mode 100755
index a1dfea6..0000000
--- a/chat-im/psi/BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-QTDIR=$QT4DIR
-PKG_CONFIG_PATH="$QT4DIR/lib/pkgconfig"
-./configure --prefix=$INSTALL_ROOT/usr $OPTS &&
-make
diff --git a/chat-im/psi/CONFIGURE b/chat-im/psi/CONFIGURE
new file mode 100755
index 0000000..b2f02c3
--- /dev/null
+++ b/chat-im/psi/CONFIGURE
@@ -0,0 +1 @@
+source $GRIMOIRE/CMAKE_CONFIGURE
diff --git a/chat-im/psi/DEPENDS b/chat-im/psi/DEPENDS
index fb6f7e4..acd28f3 100755
--- a/chat-im/psi/DEPENDS
+++ b/chat-im/psi/DEPENDS
@@ -1,8 +1,12 @@
-depends -sub CXX gcc &&
-depends qt4 &&
+source $GRIMOIRE/QT_DEPENDS &&
+#depends -sub CXX gcc &&
+#depends qtbase &&
depends zlib &&
-depends qca2 &&
-optional_depends aspell '' '--disable-aspell' 'spell checking' &&
-optional_depends enchant '' '--disable-enchant' 'spell checking' &&
-optional_depends libxscrnsaver '' '--disable-xss' 'screen saver' &&
-optional_depends qca-openssl '' '' 'voice support'
+depends qca &&
+optional_depends hunspell ' -DUSE_HUNSPELL=1' ' -DUSE_HUNSPELL=0'
'spell checking' &&
+optional_depends enchant ' -DUSE_ENCHANT=1' ' -DUSE_ENCHANT=0' 'spell
checking' &&
+#optional_depends libxscrnsaver '' '--disable-xss' 'screen saver' &&
+optional_depends qtwebengine \
+ ' -DUSE_WEBENGINE=1 -DENABLE_WEBKIT=0' \
+ ' -DUSE_WEBENGINE=0 -DENABLE_WEBKIT=0' \
+ 'browser support'
diff --git a/chat-im/psi/DETAILS b/chat-im/psi/DETAILS
index 4faa4ff..8f0f3be 100755
--- a/chat-im/psi/DETAILS
+++ b/chat-im/psi/DETAILS
@@ -1,31 +1,16 @@
+source $GRIMOIRE/CMAKE_FUNCTIONS
SPELL=psi
-if [ "$DEVEL" == "y" ]; then
- VERSION=0.15
-
SOURCE_HASH=sha512:17e972adc8dfc541977e3717c21eb694f4e1268e4719e97432f260682867290d7034b98a345b6efd73026f98a425493e9159fef9c0e0af4c83b02e07d29a704a
+ VERSION=1.5
+
SOURCE_HASH=sha512:c2e17dad346b5f7e8c97dc8959d99eaf4c30c1ba11c2d04b562af7b30482d5dbdc3a86508c4c29881ea0fc72db5a9d5fb4017768732cafee6a1d3025a39d8520
SECURITY_PATCH=1
- SOURCE=$SPELL-$VERSION.tar.bz2
-
SOURCE_URL[0]=http://downloads.sourceforge.net/sourceforge/${SPELL}/${SOURCE}
+ SOURCE=${SPELL}-${VERSION}.tar.xz
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
-else
- VERSION=0.15
-
SOURCE_HASH=sha512:17e972adc8dfc541977e3717c21eb694f4e1268e4719e97432f260682867290d7034b98a345b6efd73026f98a425493e9159fef9c0e0af4c83b02e07d29a704a
- SECURITY_PATCH=1
- SOURCE=${SPELL}-${VERSION}.tar.bz2
-
SOURCE_URL[0]=http://downloads.sourceforge.net/sourceforge/${SPELL}/${SOURCE}
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
-
SOURCE_URL[0]=http://downloads.sourceforge.net/sourceforge/${SPELL}/${SOURCE}
-fi
- WEB_SITE=http://psi-im.org/
+
SOURCE_URL[0]=https://github.com/psi-im/psi/releases/download/$VERSION/$SOURCE
+ WEB_SITE=https://psi-im.org
LICENSE=GPL
ENTERED=20020806
- KEYWORDS="jabber messaging chat"
- SHORT="Psi is a client for the Jabber system."
+ KEYWORDS="xmpp messaging chat"
+ SHORT="XMPP client"
cat << EOF
-Psi is a client for the Jabber system. Written in C++ and based on the
-Qt library, there are versions available for Linux (and other flavors of
-unix/X11), Microsoft Windows, and Apple MacOS X.
-
-Psi is released under the GNU General Public License, so you know
-that it's truly free, and will remain so.
-
+Psi is an XMPP client designed for experienced users
EOF
diff --git a/chat-im/psi/HISTORY b/chat-im/psi/HISTORY
index fb462bf..8637a15 100644
--- a/chat-im/psi/HISTORY
+++ b/chat-im/psi/HISTORY
@@ -1,3 +1,11 @@
+2024-04-24 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.5
+ download for github
+ * PREPARE: deleted
+ * DEPENDS: qt5 support, add cmake
+ * CONFIGURE: added
+ * *: use cmake
+
2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: remove SOURCEFORGE_URL usage (automated)
diff --git a/chat-im/psi/PREPARE b/chat-im/psi/PREPARE
deleted file mode 100755
index 92bf7dc..0000000
--- a/chat-im/psi/PREPARE
+++ /dev/null
@@ -1 +0,0 @@
-config_query DEVEL "Build DEVEL version?" n
diff --git a/libs/libportal/BUILD b/libs/libportal/BUILD
index 236d480..103b5d8 100755
--- a/libs/libportal/BUILD
+++ b/libs/libportal/BUILD
@@ -1,2 +1,8 @@
-OPTS=" backends=${BACKENDS// /,} docs=false" &&
+OPTS+=" docs=false" &&
+OPTS+=" tests=false" &&
+if is_depends_enabled $SPELL qt6base; then
+ export QT6DIR=$INSTALL_ROOT/opt/qt6
+ export PKG_CONFIG_PATH="$QT6DIR/lib/pkgconfig"
+fi &&
+
default_build
diff --git a/libs/libportal/CONFIGURE b/libs/libportal/CONFIGURE
index 230d810..0c76820 100755
--- a/libs/libportal/CONFIGURE
+++ b/libs/libportal/CONFIGURE
@@ -1,3 +1 @@
-. $GRIMOIRE/MESON_CONFIGURE &&
-. $GRIMOIRE/config_query_multi.function &&
-config_query_multi BACKENDS "Which backends do you want to build?" gtk3 gtk4
qt5
+. $GRIMOIRE/MESON_CONFIGURE
diff --git a/libs/libportal/DEPENDS b/libs/libportal/DEPENDS
index 26ccc47..db8c5fd 100755
--- a/libs/libportal/DEPENDS
+++ b/libs/libportal/DEPENDS
@@ -2,16 +2,25 @@ source $GRIMOIRE/MESON_DEPENDS &&
depends glib2 &&
depends PKG-CONFIG &&
-if list_find "$BACKENDS" gtk3;then
- depends gtk+3
-fi &&
-if list_find "$BACKENDS" gtk4;then
- depends gtk+4
-fi &&
-if list_find "$BACKENDS" qt5;then
- depends qtbase &&
+optional_depends qt6base \
+ backend-qt6=enabled \
+ backend-qt6=disabled \
+ 'build qt6 backend' &&
+optional_depends qtbase \
+ backend-qt5=enabled \
+ backend-qt5=disabled \
+ 'build qt5 backend' &&
+if is_depends_enabled $SPELL qtbase;then
depends qtx11extras
fi &&
+optional_depends gtk+3 \
+ backend-gtk3=enabled \
+ backend-gtk3=disabled \
+ 'build gtk3 backend' &&
+optional_depends gtk+4 \
+ backend-gtk4=enabled \
+ backend-gtk4=disabled \
+ 'build gtk4 backend' &&
optional_depends vala \
'' \
diff --git a/libs/libportal/DETAILS b/libs/libportal/DETAILS
index 6f1347a..c5acde2 100755
--- a/libs/libportal/DETAILS
+++ b/libs/libportal/DETAILS
@@ -1,7 +1,7 @@
source $GRIMOIRE/MESON_FUNCTIONS
SPELL=libportal
- VERSION=0.6
-
SOURCE_HASH=sha256:88a12c3ba71bc31acff7238c280de697d609cebc50830c3766776ec35abc6566
+ VERSION=0.9.0
+
SOURCE_HASH=sha256:113910f06f39387328805397053d20c7acafb7388d8e6cd5e06e05efb9690735
SOURCE=${SPELL}-${VERSION}.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=https://github.com/flatpak/${SPELL}/releases/download/${VERSION}/${SPELL}-${VERSION}.tar.xz
diff --git a/libs/libportal/HISTORY b/libs/libportal/HISTORY
index d7d0fde..65920fd 100644
--- a/libs/libportal/HISTORY
+++ b/libs/libportal/HISTORY
@@ -1,3 +1,8 @@
+2024-12-22 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.9.0
+ * CONFIGURE DEPENDS BUILD: adjust to upstream
+ add qt6 support
+
2022-11-18 Conner Clere <connerclere AT gmail.com>
* BUILD, CONFIGURE, DEPENDS, DETAILS: version 0.6
spell created
- [[SM-Commit] ] GIT changes to master grimoire by Treeve Jelbert (733f304389fa77f1cbd0409406490090e8ecf4c6), Treeve Jelbert, 12/22/2024
Archive powered by MHonArc 2.6.24.