diff --git a/net-im/quaternion/patches/quaternion-0.0.95.1.patchset b/net-im/quaternion/patches/quaternion-0.0.95.1.patchset deleted file mode 100644 index e1f0d0425..000000000 --- a/net-im/quaternion/patches/quaternion-0.0.95.1.patchset +++ /dev/null @@ -1,35 +0,0 @@ -From 324f93f89a779015d4ea1d26af837173a9170098 Mon Sep 17 00:00:00 2001 -From: Pascal Abresch -Date: Fri, 24 Sep 2021 10:59:08 +0200 -Subject: Fix build from git message for haikuports - - -diff --git a/client/mainwindow.cpp b/client/mainwindow.cpp -index 2ac245a..bf6dbd8 100644 ---- a/client/mainwindow.cpp -+++ b/client/mainwindow.cpp -@@ -1020,21 +1020,7 @@ void MainWindow::showAboutWindow() - new QLabel("Copyright (C) 2016-2021 " - % tr("Quaternion project contributors"))); - --#ifdef GIT_SHA1 -- auto* commitLabel = new QLabel(tr("Built from Git, commit SHA:") + '\n' + -- QStringLiteral(GIT_SHA1)); -- commitLabel->setTextInteractionFlags(Qt::TextSelectableByKeyboard| -- Qt::TextSelectableByMouse); -- layout->addWidget(commitLabel); --#endif - --#ifdef LIB_GIT_SHA1 -- auto* libCommitLabel = new QLabel(tr("Library commit SHA:") + '\n' + -- QStringLiteral(LIB_GIT_SHA1)); -- libCommitLabel->setTextInteractionFlags(Qt::TextSelectableByKeyboard| -- Qt::TextSelectableByMouse); -- layout->addWidget(libCommitLabel); --#endif - } - { - auto* thanksLabel = new QLabel( --- -2.30.2 - diff --git a/net-im/quaternion/quaternion-0.0.95.1.recipe b/net-im/quaternion/quaternion-0.0.97~beta1.recipe similarity index 56% rename from net-im/quaternion/quaternion-0.0.95.1.recipe rename to net-im/quaternion/quaternion-0.0.97~beta1.recipe index b32303102..b1562087a 100644 --- a/net-im/quaternion/quaternion-0.0.95.1.recipe +++ b/net-im/quaternion/quaternion-0.0.97~beta1.recipe @@ -1,16 +1,15 @@ -SUMMARY="A Qt5-based IM client for Matrix" -DESCRIPTION="Quaternion is a cross-platform Qt5-based desktop IM client for Matrix, \ +SUMMARY="A Qt6-based IM client for Matrix" +DESCRIPTION="Quaternion is a cross-platform Qt6-based desktop IM client for Matrix, \ a reference desktop application using libQMatrixClient." HOMEPAGE="https://matrix.org/docs/projects/client/quaternion/" COPYRIGHT="Quotient contributors" LICENSE="GNU GPL v3" -REVISION="3" -SOURCE_URI="https://github.com/QMatrixClient/Quaternion/archive/${portVersion}.tar.gz" -CHECKSUM_SHA256="69f034241dddc8d9436a895bb76b022e492e61e2f49d9a80ed8d79ab12b63a0e" -SOURCE_FILENAME="Quaternion-${portVersion}.tar.gz" -SOURCE_DIR="Quaternion-${portVersion}" +REVISION="1" +SOURCE_URI="https://github.com/QMatrixClient/Quaternion/archive/${portVersion/\~/-}.tar.gz" +CHECKSUM_SHA256="da770a45a357aa5d081849be3f57357a6b10b36b8e3d11c3a4ad752dd0a89f5f" +SOURCE_FILENAME="Quaternion-${portVersion/\~/-}.tar.gz" +SOURCE_DIR="Quaternion-${portVersion/\~/-}" ADDITIONAL_FILES="quaternion.rdef.in" -PATCHES="quaternion-0.0.95.1.patchset" ARCHITECTURES="?all !x86_gcc2" SECONDARY_ARCHITECTURES="?x86" @@ -22,32 +21,40 @@ PROVIDES=" REQUIRES=" haiku$secondaryArchSuffix lib:libGL$secondaryArchSuffix - lib:libQt5Core$secondaryArchSuffix - lib:libQt5Gui$secondaryArchSuffix - lib:libqt5keychain$secondaryArchSuffix - lib:libQt5Network$secondaryArchSuffix - lib:libQt5Widgets$secondaryArchSuffix - lib:libQt5Xml$secondaryArchSuffix + lib:libolm$secondaryArchSuffix + lib:libQt6Core$secondaryArchSuffix + lib:libQt6Gui$secondaryArchSuffix + lib:libQt6keychain$secondaryArchSuffix + lib:libQt6Network$secondaryArchSuffix + lib:libQt6Qml$secondaryArchSuffix + lib:libQt6Quick$secondaryArchSuffix + lib:libQt6Widgets$secondaryArchSuffix + lib:libQt6Xml$secondaryArchSuffix + lib:libQuotientQt6$secondaryArchSuffix lib:libz$secondaryArchSuffix - lib:libquotient$secondaryArchSuffix " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - devel:libQt5Core$secondaryArchSuffix - devel:libQt5Gui$secondaryArchSuffix - devel:libqt5keychain$secondaryArchSuffix - devel:libQt5Network$secondaryArchSuffix - devel:libQt5Widgets$secondaryArchSuffix - devel:libQt5Xml$secondaryArchSuffix + qt6_tools${secondaryArchSuffix}_devel + devel:libQt6Core$secondaryArchSuffix + devel:libQt6Gui$secondaryArchSuffix + devel:libQt6keychain$secondaryArchSuffix + devel:libQt6Multimedia$secondaryArchSuffix + devel:libQt6Network$secondaryArchSuffix + devel:libQt6Widgets$secondaryArchSuffix + devel:libQt6Qml$secondaryArchSuffix + devel:libQt6Quick$secondaryArchSuffix + devel:libQt6Xml$secondaryArchSuffix + devel:libQuotientQt6$secondaryArchSuffix >= 0.9 + devel:libssl$secondaryArchSuffix >= 3 devel:libz$secondaryArchSuffix - devel:libquotient$secondaryArchSuffix >= 0.6.6 " BUILD_PREREQUIRES=" cmd:cmake cmd:g++$secondaryArchSuffix - cmd:linguist$secondaryArchSuffix >= 5 - cmd:lrelease$secondaryArchSuffix >= 5 +# cmd:linguist$secondaryArchSuffix >= 5 +# cmd:lrelease$secondaryArchSuffix >= 5 cmd:make "