Update net-im/quaternion to latest upstream

Release notes:
	https://github.com/quotient-im/Quaternion/releases/tag/0.0.9.5-beta1

Quaternion is the reference implementation of a Matrix client using
libQuotient; now that the latest Quotient is in-tree, switch the
reference consumer as well.
This commit is contained in:
Adriaan de Groot 2020-11-20 21:16:19 +00:00
parent 3bf4a03a7b
commit b480d075d3
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=555789
5 changed files with 38 additions and 12 deletions

View File

@ -1,9 +1,7 @@
# $FreeBSD$
PORTNAME= Quaternion
DISTVERSION= 0.0.9.4
DISTVERSIONSUFFIX= e
PORTREVISION= 7
DISTVERSION= 0.0.9.5-beta1
CATEGORIES= net-im
MAINTAINER= adridg@FreeBSD.org
@ -14,7 +12,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libqt5keychain.so:security/qtkeychain \
libsecret-1.so:security/libsecret
BUILD_DEPENDS= libqmatrixclient>=0.5.3.2:net-im/libqmatrixclient
BUILD_DEPENDS= libquotient>=0.6.2:net-im/libquotient
USES= cmake compiler:c++17-lang gettext-runtime gnome \
localbase:ldflags qt:5 tar:xz
@ -24,6 +22,6 @@ USE_QT= core dbus declarative gui multimedia network widgets \
buildtools_build linguist_build qmake_build
USE_GITHUB= yes
GH_ACCOUNT= QMatrixClient
GH_ACCOUNT= quotient-im
.include <bsd.port.mk>

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1586638654
SHA256 (QMatrixClient-Quaternion-0.0.9.4e_GH0.tar.gz) = 7c04f62f6420af87c1df9e5e7f01250a1f4da33c9627e5f6e7f772e2f62864f0
SIZE (QMatrixClient-Quaternion-0.0.9.4e_GH0.tar.gz) = 999309
TIMESTAMP = 1605904883
SHA256 (quotient-im-Quaternion-0.0.9.5-beta1_GH0.tar.gz) = c804b955b2a3b7bcc87db8d7be5a2385816321605dd34ea4d1faf67e96feeef0
SIZE (quotient-im-Quaternion-0.0.9.5-beta1_GH0.tar.gz) = 1041042

View File

@ -0,0 +1,15 @@
--- CMakeLists.txt.orig 2020-11-20 20:57:10 UTC
+++ CMakeLists.txt
@@ -229,7 +229,11 @@ target_compile_definitions(${PROJECT_NAME} PRIVATE
target_compile_definitions(${PROJECT_NAME} PRIVATE QT_NO_JAVA_STYLE_ITERATORS)
if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.16.0"
AND NOT CMAKE_CXX_COMPILER_ID STREQUAL GNU) # https://bugzilla.redhat.com/show_bug.cgi?id=1721553
- target_precompile_headers(${PROJECT_NAME} PRIVATE <lib/room.h>)
+ if (USE_INTREE_LIBQMC)
+ target_precompile_headers(${PROJECT_NAME} PRIVATE <lib/room.h>)
+ else()
+ target_precompile_headers(${PROJECT_NAME} PRIVATE <room.h>)
+ endif()
endif ()
target_link_libraries(${PROJECT_NAME}
Quotient Qt5::Widgets Qt5::Quick Qt5::Qml Qt5::Gui Qt5::Network)

View File

@ -0,0 +1,12 @@
diff --git client/htmlfilter.cpp client/htmlfilter.cpp
index 43f7bde2..6f47bb22 100644
--- client/htmlfilter.cpp
+++ client/htmlfilter.cpp
@@ -1,6 +1,6 @@
#include "htmlfilter.h"
-#include <lib/util.h>
+#include <util.h>
#include <QtCore/QRegularExpression>
#include <QtCore/QXmlStreamReader>

View File

@ -1,8 +1,9 @@
bin/quaternion
share/QMatrixClient/quaternion/translations/quaternion_de_DE.qm
share/QMatrixClient/quaternion/translations/quaternion_en_GB.qm
share/QMatrixClient/quaternion/translations/quaternion_pl.qm
share/QMatrixClient/quaternion/translations/quaternion_ru.qm
share/Quotient/quaternion/translations/quaternion_de.qm
share/Quotient/quaternion/translations/quaternion_en_GB.qm
share/Quotient/quaternion/translations/quaternion_es.qm
share/Quotient/quaternion/translations/quaternion_pl.qm
share/Quotient/quaternion/translations/quaternion_ru.qm
share/applications/com.github.quaternion.desktop
share/icons/hicolor/128x128/apps/quaternion.png
share/icons/hicolor/16x16/apps/quaternion.png