From 2354e3faa0d7b05efb5472b8f3f095ff8d305770 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Thu, 7 Mar 2019 21:57:24 +0000 Subject: [PATCH] Update net-im/libqmatrixclient and net-im/quaternion in tandem. New release of libqmatrixclient (which breaks API compatibility) and a beta for quaternion (its only client). https://github.com/QMatrixClient/libqmatrixclient/releases/tag/0.5.0 https://github.com/QMatrixClient/Quaternion/releases/tag/0.0.9.4-beta1 Summarized: - (packaging) QtMultimedia (video support) and QtKeychain (for secure storage) are now added as dependencies. - (user-visible) Many UI improvements. This could use some work on the BUILD_DEPENDS to make sure that quaternion is upgraded together with the static library it depends on. --- net-im/libqmatrixclient/Makefile | 7 +++---- net-im/libqmatrixclient/distinfo | 6 +++--- net-im/libqmatrixclient/pkg-plist | 8 ++++++++ net-im/quaternion/Makefile | 7 ++++--- net-im/quaternion/distinfo | 6 +++--- net-im/quaternion/pkg-plist | 3 +++ 6 files changed, 24 insertions(+), 13 deletions(-) diff --git a/net-im/libqmatrixclient/Makefile b/net-im/libqmatrixclient/Makefile index 8725a81dd731..039c5442719b 100644 --- a/net-im/libqmatrixclient/Makefile +++ b/net-im/libqmatrixclient/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= libqmatrixclient -DISTVERSIONPREFIX= v -DISTVERSION= 0.4.2.1 +DISTVERSION= 0.5.0 CATEGORIES= net-im MAINTAINER= adridg@FreeBSD.org @@ -11,8 +10,8 @@ COMMENT= Matrix IM support library using Qt technologies LICENSE= LGPL21 LICENSE_FILES= ${WRKSRC}/COPYING -USES= cmake compiler:c++11-lang qt:5 tar:xz -USE_QT= core gui network \ +USES= cmake compiler:c++14-lang qt:5 tar:xz +USE_QT= core gui multimedia network \ buildtools_build qmake_build USE_GITHUB= yes diff --git a/net-im/libqmatrixclient/distinfo b/net-im/libqmatrixclient/distinfo index a24560ceec66..f4fb978234bf 100644 --- a/net-im/libqmatrixclient/distinfo +++ b/net-im/libqmatrixclient/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1550754351 -SHA256 (QMatrixClient-libqmatrixclient-v0.4.2.1_GH0.tar.gz) = 0efe7050ba8b866b0bf6046a9c57779173cf3d68f546d8f082ce081e8e299bc8 -SIZE (QMatrixClient-libqmatrixclient-v0.4.2.1_GH0.tar.gz) = 496515 +TIMESTAMP = 1551992314 +SHA256 (QMatrixClient-libqmatrixclient-0.5.0_GH0.tar.gz) = 4b1dd5e3510d96d9eb4e2e27df8074d48bea7aa08b82a93f78e3234e3d6c8b17 +SIZE (QMatrixClient-libqmatrixclient-0.5.0_GH0.tar.gz) = 517804 diff --git a/net-im/libqmatrixclient/pkg-plist b/net-im/libqmatrixclient/pkg-plist index c2a94b56abc3..078154209c7a 100644 --- a/net-im/libqmatrixclient/pkg-plist +++ b/net-im/libqmatrixclient/pkg-plist @@ -11,6 +11,7 @@ include/csapi/admin.h include/csapi/administrative_contact.h include/csapi/appservice_room_directory.h include/csapi/banning.h +include/csapi/capabilities.h include/csapi/content-repo.h include/csapi/create_room.h include/csapi/definitions/auth_data.h @@ -24,6 +25,7 @@ include/csapi/definitions/push_ruleset.h include/csapi/definitions/room_event_filter.h include/csapi/definitions/sync_filter.h include/csapi/definitions/user_identifier.h +include/csapi/definitions/wellknown/full.h include/csapi/definitions/wellknown/homeserver.h include/csapi/definitions/wellknown/identity_server.h include/csapi/device_management.h @@ -54,8 +56,10 @@ include/csapi/registration.h include/csapi/report_content.h include/csapi/room_send.h include/csapi/room_state.h +include/csapi/room_upgrades.h include/csapi/rooms.h include/csapi/search.h +include/csapi/sso_login_redirect.h include/csapi/tags.h include/csapi/third_party_lookup.h include/csapi/third_party_membership.h @@ -79,9 +83,11 @@ include/events/eventloader.h include/events/receiptevent.h include/events/redactionevent.h include/events/roomavatarevent.h +include/events/roomcreateevent.h include/events/roomevent.h include/events/roommemberevent.h include/events/roommessageevent.h +include/events/roomtombstoneevent.h include/events/simplestateevents.h include/events/stateevent.h include/events/typingevent.h @@ -98,8 +104,10 @@ include/joinstate.h include/logging.h include/networkaccessmanager.h include/networksettings.h +include/qt_connection_util.h include/room.h include/settings.h +include/syncdata.h include/user.h include/util.h lib/cmake/QMatrixClient/QMatrixClientConfig.cmake diff --git a/net-im/quaternion/Makefile b/net-im/quaternion/Makefile index 0c4abfe6d185..9209ce881d32 100644 --- a/net-im/quaternion/Makefile +++ b/net-im/quaternion/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME= Quaternion -DISTVERSIONPREFIX= v -DISTVERSION= 0.0.9.3 +DISTVERSION= 0.0.9.4 +DISTVERSIONSUFFIX= -beta1 CATEGORIES= net-im MAINTAINER= adridg@FreeBSD.org @@ -14,9 +14,10 @@ LICENSE_FILES= ${WRKSRC}/COPYING USE_GITHUB= yes GH_ACCOUNT= QMatrixClient +LIB_DEPENDS= libqt5keychain.so:security/qtkeychain@qt5 BUILD_DEPENDS= ${LOCALBASE}/lib/libQMatrixClient.a:net-im/libqmatrixclient -USES= cmake qt:5 tar:xz +USES= cmake compiler:c++17-lang localbase:ldflags qt:5 tar:xz USE_QT= core declarative gui network widgets \ buildtools_build linguist_build qmake_build diff --git a/net-im/quaternion/distinfo b/net-im/quaternion/distinfo index 343e53e81d6c..7adbe4b9cbb1 100644 --- a/net-im/quaternion/distinfo +++ b/net-im/quaternion/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1550755841 -SHA256 (QMatrixClient-Quaternion-v0.0.9.3_GH0.tar.gz) = 7f92c3acc73bb7e44efe94bd1085ae9fd5b58efa51efc28a931cace131c22230 -SIZE (QMatrixClient-Quaternion-v0.0.9.3_GH0.tar.gz) = 350366 +TIMESTAMP = 1551992742 +SHA256 (QMatrixClient-Quaternion-0.0.9.4-beta1_GH0.tar.gz) = 30926f47c7941ae25d4d758ce376d81bbe574cbe32497b37371f2a1075b00b5a +SIZE (QMatrixClient-Quaternion-0.0.9.4-beta1_GH0.tar.gz) = 1010611 diff --git a/net-im/quaternion/pkg-plist b/net-im/quaternion/pkg-plist index 5714f683e4a1..1ae3975b664a 100644 --- a/net-im/quaternion/pkg-plist +++ b/net-im/quaternion/pkg-plist @@ -1,6 +1,9 @@ bin/quaternion share/QMatrixClient/quaternion/translations/quaternion_de_DE.qm share/QMatrixClient/quaternion/translations/quaternion_en.qm +share/QMatrixClient/quaternion/translations/quaternion_en_GB.qm +share/QMatrixClient/quaternion/translations/quaternion_pl.qm +share/QMatrixClient/quaternion/translations/quaternion_ru.qm share/applications/quaternion.desktop share/icons/hicolor/128x128/apps/quaternion.png share/icons/hicolor/16x16/apps/quaternion.png