diff --git a/net-im/quaternion/additional-files/quaternion.rdef.in b/net-im/quaternion/additional-files/quaternion.rdef.in index 0393bd6c4..dd4468390 100644 --- a/net-im/quaternion/additional-files/quaternion.rdef.in +++ b/net-im/quaternion/additional-files/quaternion.rdef.in @@ -6,8 +6,8 @@ resource app_version { middle = @MIDDLE@, minor = @MINOR@, - variety = B_APPV_FINAL, - internal = 0, + variety = B_APPV_BETA, + internal = @INTERNAL@, short_info = "Quaternion", long_info = "@LONG_INFO@" diff --git a/net-im/quaternion/patches/quaternion-0.0.9.4e.patchset b/net-im/quaternion/patches/quaternion-0.0.9.4e.patchset deleted file mode 100644 index 46a7a5363..000000000 --- a/net-im/quaternion/patches/quaternion-0.0.9.4e.patchset +++ /dev/null @@ -1,29 +0,0 @@ -From 72cfaefa34858cb539ebb927753e4f45a85af1c4 Mon Sep 17 00:00:00 2001 -From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Sun, 2 Jun 2019 23:31:42 +1000 -Subject: Find translations in application dir - - -diff --git a/client/main.cpp b/client/main.cpp -index df16b6b..b463cff 100644 ---- a/client/main.cpp -+++ b/client/main.cpp -@@ -90,10 +90,15 @@ int main( int argc, char* argv[] ) - app.installTranslator(&qtTranslator); - - QTranslator appTranslator; -+#ifdef __HAIKU__ -+ if (!appTranslator.load(QLocale(), "quaternion", "_")) -+ appTranslator.load(QLocale(), "quaternion", "_", QCoreApplication::applicationDirPath() + "/translations"); -+#else - if (!appTranslator.load(QLocale(), "quaternion", "_")) - appTranslator.load(QLocale(), "quaternion", "_", - QStandardPaths::locate(QStandardPaths::AppLocalDataLocation, - "translations", QStandardPaths::LocateDirectory)); -+#endif - app.installTranslator(&appTranslator); - - QMatrixClient::NetworkSettings().setupApplicationProxy(); --- -2.21.0 - diff --git a/net-im/quaternion/patches/quaternion-0.0.95~beta4.patchset b/net-im/quaternion/patches/quaternion-0.0.95~beta4.patchset new file mode 100644 index 000000000..8a5175616 --- /dev/null +++ b/net-im/quaternion/patches/quaternion-0.0.95~beta4.patchset @@ -0,0 +1,23 @@ +From 1fa3e683303636f066cc876edd9d9ff887594741 Mon Sep 17 00:00:00 2001 +From: Pascal Abresch +Date: Fri, 26 Feb 2021 19:22:26 +0100 +Subject: Find translations in application dir + + +diff --git a/client/main.cpp b/client/main.cpp +index a21dc66..b7b3274 100644 +--- a/client/main.cpp ++++ b/client/main.cpp +@@ -41,7 +41,8 @@ void loadTranslations( + bool loaded = false; + // Check the current directory then configPath + if (translator->load(QLocale(), configName, "_") +- || translator->load(QLocale(), configName, "_", configPath)) { ++ || translator->load(QLocale(), configName, "_", configPath) ++ || translator->load(QLocale(), configName, "_", QCoreApplication::applicationDirPath() + "/translations")) { + auto path = + #if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)) + translator->filePath(); +-- +2.30.0 + diff --git a/net-im/quaternion/quaternion-0.0.9.4e.recipe b/net-im/quaternion/quaternion-0.0.95~beta4.recipe similarity index 82% rename from net-im/quaternion/quaternion-0.0.9.4e.recipe rename to net-im/quaternion/quaternion-0.0.95~beta4.recipe index 6306dd302..caafff4d6 100644 --- a/net-im/quaternion/quaternion-0.0.9.4e.recipe +++ b/net-im/quaternion/quaternion-0.0.95~beta4.recipe @@ -2,18 +2,17 @@ SUMMARY="A Qt5-based IM client for Matrix" DESCRIPTION="Quaternion is a cross-platform Qt5-based desktop IM client for Matrix, \ a reference desktop application using libQMatrixClient." HOMEPAGE="https://github.com/QMatrixClient/Quaternion/" -COPYRIGHT="2017-2020 QMatrixClient team" +COPYRIGHT="2017-2021 QMatrixClient team" LICENSE="GNU GPL v3 - GNU LGPL v2.1 - " + GNU LGPL v2.1" REVISION="1" -SOURCE_URI="https://github.com/QMatrixClient/Quaternion/archive/${portVersion}.tar.gz" -CHECKSUM_SHA256="7c04f62f6420af87c1df9e5e7f01250a1f4da33c9627e5f6e7f772e2f62864f0" +SOURCE_URI="https://github.com/QMatrixClient/Quaternion/archive/${portVersion/\~beta4/-beta4}.tar.gz" +CHECKSUM_SHA256="058c6fe9c94ca7af5d467379bfe87603a5429b09fe8427d0b2c2f6824deaf1fe" SOURCE_FILENAME="Quaternion-${portVersion}.tar.gz" -SOURCE_DIR="Quaternion-${portVersion}" -libVersion="0.5.3.2" +SOURCE_DIR="Quaternion-${portVersion/\~beta4/-beta4}" +libVersion="0.6.5" SOURCE_URI_2="https://github.com/QMatrixClient/libqmatrixclient/archive/$libVersion.tar.gz" -CHECKSUM_SHA256_2="80f7dac61a38c7d3441b6af693d40373fd817974b970c9b0edcb761aca2bf7d9" +CHECKSUM_SHA256_2="a22738fd6fd90c662174ca31348934c75f29fdbfcf7d86f471d2fcbf628c36ea" SOURCE_FILENAME_2="libqmatrixclient-$libVersion.tar.gz" SOURCE_DIR_2="libQuotient-$libVersion" @@ -74,13 +73,15 @@ INSTALL() local APP_SIGNATURE="application/x-vnd.quaternion" local MAJOR="`echo "$portVersion" | cut -d. -f1`" local MIDDLE="`echo "$portVersion" | cut -d. -f2`" - local MINOR="`echo "$portVersion" | cut -d. -f3`" + local MINOR="`echo "$portVersion" | cut -d. -f3 | cut -d~ -f1`" + local INTERNAL="4" sed \ -e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \ -e "s|@MAJOR@|$MAJOR|" \ -e "s|@MIDDLE@|$MIDDLE|" \ -e "s|@MINOR@|$MINOR|" \ - -e "s|@LONG_INFO@|$LONG_INFO|" \ + -e "s|@INTERNAL@|$INTERNAL|" \ + -e "s|@LONG_INFO@|$SUMMARY|" \ $portDir/additional-files/quaternion.rdef.in > quaternion.rdef addResourcesToBinaries quaternion.rdef $appsDir/Quaternion/Quaternion