From owner-svn-ports-all@freebsd.org Fri Nov 20 21:16:20 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 712D446E23A; Fri, 20 Nov 2020 21:16:20 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Cd8VX2hnzz4dhX; Fri, 20 Nov 2020 21:16:20 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4FD041CC05; Fri, 20 Nov 2020 21:16:20 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0AKLGKuc054103; Fri, 20 Nov 2020 21:16:20 GMT (envelope-from adridg@FreeBSD.org) Received: (from adridg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0AKLGJxh054099; Fri, 20 Nov 2020 21:16:19 GMT (envelope-from adridg@FreeBSD.org) Message-Id: <202011202116.0AKLGJxh054099@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adridg set sender to adridg@FreeBSD.org using -f From: Adriaan de Groot Date: Fri, 20 Nov 2020 21:16:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r555789 - in head/net-im/quaternion: . files X-SVN-Group: ports-head X-SVN-Commit-Author: adridg X-SVN-Commit-Paths: in head/net-im/quaternion: . files X-SVN-Commit-Revision: 555789 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Nov 2020 21:16:20 -0000 Author: adridg Date: Fri Nov 20 21:16:19 2020 New Revision: 555789 URL: https://svnweb.freebsd.org/changeset/ports/555789 Log: 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. Added: head/net-im/quaternion/files/ head/net-im/quaternion/files/patch-CMakeLists.txt (contents, props changed) head/net-im/quaternion/files/patch-git-423538250ec302f23755c5e9dc13f17dfc2b70c8.diff (contents, props changed) Modified: head/net-im/quaternion/Makefile head/net-im/quaternion/distinfo head/net-im/quaternion/pkg-plist Modified: head/net-im/quaternion/Makefile ============================================================================== --- head/net-im/quaternion/Makefile Fri Nov 20 21:16:09 2020 (r555788) +++ head/net-im/quaternion/Makefile Fri Nov 20 21:16:19 2020 (r555789) @@ -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 buildtools_build linguist_build qmake_build USE_GITHUB= yes -GH_ACCOUNT= QMatrixClient +GH_ACCOUNT= quotient-im .include Modified: head/net-im/quaternion/distinfo ============================================================================== --- head/net-im/quaternion/distinfo Fri Nov 20 21:16:09 2020 (r555788) +++ head/net-im/quaternion/distinfo Fri Nov 20 21:16:19 2020 (r555789) @@ -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 Added: head/net-im/quaternion/files/patch-CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-im/quaternion/files/patch-CMakeLists.txt Fri Nov 20 21:16:19 2020 (r555789) @@ -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 ) ++ if (USE_INTREE_LIBQMC) ++ target_precompile_headers(${PROJECT_NAME} PRIVATE ) ++ else() ++ target_precompile_headers(${PROJECT_NAME} PRIVATE ) ++ endif() + endif () + target_link_libraries(${PROJECT_NAME} + Quotient Qt5::Widgets Qt5::Quick Qt5::Qml Qt5::Gui Qt5::Network) Added: head/net-im/quaternion/files/patch-git-423538250ec302f23755c5e9dc13f17dfc2b70c8.diff ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-im/quaternion/files/patch-git-423538250ec302f23755c5e9dc13f17dfc2b70c8.diff Fri Nov 20 21:16:19 2020 (r555789) @@ -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 ++#include + + #include + #include Modified: head/net-im/quaternion/pkg-plist ============================================================================== --- head/net-im/quaternion/pkg-plist Fri Nov 20 21:16:09 2020 (r555788) +++ head/net-im/quaternion/pkg-plist Fri Nov 20 21:16:19 2020 (r555789) @@ -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