From 9db30104d6c7eb490e9fb474f585f1c7c724448e Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Mon, 1 Nov 2021 22:00:39 +0100
Subject: [PATCH] Review quaternion 95 (#6358)

* libQuotient version 0.6.11

* Quaternion version 0.0.95.1

Co-authored-by: Pascal Abresch <nep@packageloss.eu>
---
 .../patches/quaternion-0.0.95.1.patchset      | 35 +++++++++++++++++++
 ...~rc4.recipe => quaternion-0.0.95.1.recipe} |  7 ++--
 ...0.6.6.recipe => libquotient-0.6.11.recipe} |  4 +--
 3 files changed, 41 insertions(+), 5 deletions(-)
 create mode 100644 net-im/quaternion/patches/quaternion-0.0.95.1.patchset
 rename net-im/quaternion/{quaternion-0.0.95~rc4.recipe => quaternion-0.0.95.1.recipe} (92%)
 rename net-libs/libquotient/{libquotient-0.6.6.recipe => libquotient-0.6.11.recipe} (95%)

diff --git a/net-im/quaternion/patches/quaternion-0.0.95.1.patchset b/net-im/quaternion/patches/quaternion-0.0.95.1.patchset
new file mode 100644
index 000000000..e1f0d0425
--- /dev/null
+++ b/net-im/quaternion/patches/quaternion-0.0.95.1.patchset
@@ -0,0 +1,35 @@
+From 324f93f89a779015d4ea1d26af837173a9170098 Mon Sep 17 00:00:00 2001
+From: Pascal Abresch <nep@packageloss.eu>
+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~rc4.recipe b/net-im/quaternion/quaternion-0.0.95.1.recipe
similarity index 92%
rename from net-im/quaternion/quaternion-0.0.95~rc4.recipe
rename to net-im/quaternion/quaternion-0.0.95.1.recipe
index 3003be2ce..0f35bc41d 100644
--- a/net-im/quaternion/quaternion-0.0.95~rc4.recipe
+++ b/net-im/quaternion/quaternion-0.0.95.1.recipe
@@ -5,11 +5,12 @@ HOMEPAGE="https://matrix.org/docs/projects/client/quaternion/"
 COPYRIGHT="Quotient contributors"
 LICENSE="GNU GPL v3"
 REVISION="1"
-SOURCE_URI="https://github.com/QMatrixClient/Quaternion/archive/${portVersion/\~rc4/-rc4}.tar.gz"
-CHECKSUM_SHA256="1c6cfc385c163efaffeb3b24cdcdc357ebea36f15ef8d355f2d4f5be5736e054"
+SOURCE_URI="https://github.com/QMatrixClient/Quaternion/archive/${portVersion}.tar.gz"
+CHECKSUM_SHA256="69f034241dddc8d9436a895bb76b022e492e61e2f49d9a80ed8d79ab12b63a0e"
 SOURCE_FILENAME="Quaternion-${portVersion}.tar.gz"
-SOURCE_DIR="Quaternion-${portVersion/\~rc4/-rc4}"
+SOURCE_DIR="Quaternion-${portVersion}"
 ADDITIONAL_FILES="quaternion.rdef.in"
+PATCHES="quaternion-0.0.95.1.patchset"
 
 ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
diff --git a/net-libs/libquotient/libquotient-0.6.6.recipe b/net-libs/libquotient/libquotient-0.6.11.recipe
similarity index 95%
rename from net-libs/libquotient/libquotient-0.6.6.recipe
rename to net-libs/libquotient/libquotient-0.6.11.recipe
index b0543623e..de12efe41 100644
--- a/net-libs/libquotient/libquotient-0.6.6.recipe
+++ b/net-libs/libquotient/libquotient-0.6.11.recipe
@@ -7,9 +7,9 @@ Versions 0.5.x and older use the previous name - libQMatrixClient."
 HOMEPAGE="https://github.com/quotient-im/libQuotient"
 COPYRIGHT="Quotient contributors"
 LICENSE="GNU LGPL v2.1"
-REVISION="2"
+REVISION="1"
 SOURCE_URI="https://github.com/quotient-im/libQuotient/archive/refs/tags/$portVersion.tar.gz"
-CHECKSUM_SHA256="33d3da5a7045bbe2611dd73104279986dd8356b24de339dd10874c1a9417bba7"
+CHECKSUM_SHA256="12b15d1296e630477d5e8f4d32c821dc724b3c5b99d15d383417ba7d88f03c46"
 SOURCE_DIR="libQuotient-$portVersion"
 
 ARCHITECTURES="all !x86_gcc2"