diff options
| author | Adriaan de Groot <adridg@FreeBSD.org> | 2020-11-20 21:16:19 +0000 |
|---|---|---|
| committer | Adriaan de Groot <adridg@FreeBSD.org> | 2020-11-20 21:16:19 +0000 |
| commit | b480d075d30573111295ad0e28592543154c290a (patch) | |
| tree | 92d09bdafc60777c9233c63301d1c3ac26063c56 | |
| parent | 3bf4a03a7bbdfcede0cb835188b924939d242b92 (diff) | |
| download | freebsd-ports-b480d075d30573111295ad0e28592543154c290a.zip | |
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.
| -rw-r--r-- | net-im/quaternion/Makefile | 8 | ||||
| -rw-r--r-- | net-im/quaternion/distinfo | 6 | ||||
| -rw-r--r-- | net-im/quaternion/files/patch-CMakeLists.txt | 15 | ||||
| -rw-r--r-- | net-im/quaternion/files/patch-git-423538250ec302f23755c5e9dc13f17dfc2b70c8.diff | 12 | ||||
| -rw-r--r-- | net-im/quaternion/pkg-plist | 9 |
5 files changed, 38 insertions, 12 deletions
diff --git a/net-im/quaternion/Makefile b/net-im/quaternion/Makefile index af43d4d77ba4..cbde9e79fb98 100644 --- a/net-im/quaternion/Makefile +++ b/net-im/quaternion/Makefile @@ -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> diff --git a/net-im/quaternion/distinfo b/net-im/quaternion/distinfo index f20dcfb6ea49..9eed1abfd44e 100644 --- a/net-im/quaternion/distinfo +++ b/net-im/quaternion/distinfo @@ -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 diff --git a/net-im/quaternion/files/patch-CMakeLists.txt b/net-im/quaternion/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..92b7722fed95 --- /dev/null +++ b/net-im/quaternion/files/patch-CMakeLists.txt @@ -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) diff --git a/net-im/quaternion/files/patch-git-423538250ec302f23755c5e9dc13f17dfc2b70c8.diff b/net-im/quaternion/files/patch-git-423538250ec302f23755c5e9dc13f17dfc2b70c8.diff new file mode 100644 index 000000000000..ac2026a391b6 --- /dev/null +++ b/net-im/quaternion/files/patch-git-423538250ec302f23755c5e9dc13f17dfc2b70c8.diff @@ -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> diff --git a/net-im/quaternion/pkg-plist b/net-im/quaternion/pkg-plist index 4039880402a7..9d3589576b24 100644 --- a/net-im/quaternion/pkg-plist +++ b/net-im/quaternion/pkg-plist @@ -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 |