From e671157a04adc6b0e80a5708052e5658f7edf3d8 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Tue, 18 May 2021 18:02:31 +0200 Subject: [PATCH] quaternion, bump (#5923) Authored-by: Pascal Abresch (nephele) --- .../patches/quaternion-0.0.95~beta4.patchset | 23 -------- ....recipe => quaternion-0.0.95~beta5.recipe} | 52 +++++++++---------- 2 files changed, 25 insertions(+), 50 deletions(-) delete mode 100644 net-im/quaternion/patches/quaternion-0.0.95~beta4.patchset rename net-im/quaternion/{quaternion-0.0.95~beta4.recipe => quaternion-0.0.95~beta5.recipe} (63%) diff --git a/net-im/quaternion/patches/quaternion-0.0.95~beta4.patchset b/net-im/quaternion/patches/quaternion-0.0.95~beta4.patchset deleted file mode 100644 index 8a5175616..000000000 --- a/net-im/quaternion/patches/quaternion-0.0.95~beta4.patchset +++ /dev/null @@ -1,23 +0,0 @@ -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.95~beta4.recipe b/net-im/quaternion/quaternion-0.0.95~beta5.recipe similarity index 63% rename from net-im/quaternion/quaternion-0.0.95~beta4.recipe rename to net-im/quaternion/quaternion-0.0.95~beta5.recipe index e966e561d..c018641ab 100644 --- a/net-im/quaternion/quaternion-0.0.95~beta4.recipe +++ b/net-im/quaternion/quaternion-0.0.95~beta5.recipe @@ -2,21 +2,13 @@ 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://matrix.org/docs/projects/client/quaternion/" -COPYRIGHT="2017-2021 QMatrixClient team" -LICENSE="GNU GPL v3 - GNU LGPL v2.1" -REVISION="2" -SOURCE_URI="https://github.com/QMatrixClient/Quaternion/archive/${portVersion/\~beta4/-beta4}.tar.gz" -CHECKSUM_SHA256="058c6fe9c94ca7af5d467379bfe87603a5429b09fe8427d0b2c2f6824deaf1fe" +COPYRIGHT="Quotient contributors" +LICENSE="GNU GPL v3" +REVISION="1" +SOURCE_URI="https://github.com/QMatrixClient/Quaternion/archive/${portVersion/\~beta5/-beta5}.tar.gz" +CHECKSUM_SHA256="8a8e469df29622af7c61fe501068dd6ff26bd02bf8a12096d3f9ebbb0179e82b" SOURCE_FILENAME="Quaternion-${portVersion}.tar.gz" -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="a22738fd6fd90c662174ca31348934c75f29fdbfcf7d86f471d2fcbf628c36ea" -SOURCE_FILENAME_2="libqmatrixclient-$libVersion.tar.gz" -SOURCE_DIR_2="libQuotient-$libVersion" - -PATCHES="quaternion-$portVersion.patchset" +SOURCE_DIR="Quaternion-${portVersion/\~beta5/-beta5}" ADDITIONAL_FILES="quaternion.rdef.in" ARCHITECTURES="!x86_gcc2 x86 x86_64" @@ -31,44 +23,48 @@ REQUIRES=" lib:libGL$secondaryArchSuffix lib:libQt5Core$secondaryArchSuffix lib:libQt5Gui$secondaryArchSuffix + lib:libqt5keychain$secondaryArchSuffix lib:libQt5Network$secondaryArchSuffix lib:libQt5Widgets$secondaryArchSuffix lib:libQt5Xml$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 devel:libz$secondaryArchSuffix + devel:libquotient$secondaryArchSuffix >= 0.6.6 " BUILD_PREREQUIRES=" - cmd:g++$secondaryArchSuffix cmd:cmake + cmd:g++$secondaryArchSuffix + cmd:linguist$secondaryArchSuffix >= 5 cmd:lrelease$secondaryArchSuffix >= 5 cmd:make " BUILD() { - rm -rf lib - ln -sfn $sourceDir2 lib - mkdir -p build - cd build - cmake .. -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=$appsDir/Quaternion - make $jobArgs + cmake -B build \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_BINDIR=$appsDir \ + -DCMAKE_INSTALL_DATADIR=$dataDir + cmake --build build } INSTALL() { - mkdir -p $appsDir/Quaternion/translations - cp build/quaternion $appsDir/Quaternion/Quaternion - cp build/*.qm $appsDir/Quaternion/translations + cmake --install build + + # we are not linux + rm -rf $dataDir/{applications,metainfo,icons} local APP_SIGNATURE="application/x-vnd.quaternion" local MAJOR="`echo "$portVersion" | cut -d. -f1`" @@ -84,6 +80,8 @@ INSTALL() -e "s|@LONG_INFO@|$SUMMARY|" \ $portDir/additional-files/quaternion.rdef.in > quaternion.rdef - addResourcesToBinaries quaternion.rdef $appsDir/Quaternion/Quaternion - addAppDeskbarSymlink $appsDir/Quaternion/Quaternion + mv $appsDir/quaternion $appsDir/Quaternion + + addResourcesToBinaries quaternion.rdef $appsDir/Quaternion + addAppDeskbarSymlink $appsDir/Quaternion }