From owner-dev-commits-ports-all@freebsd.org Thu Aug 19 19:08:03 2021 Return-Path: Delivered-To: dev-commits-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 E4B9B66A251; Thu, 19 Aug 2021 19:08:03 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GrDmz6580z3h4g; Thu, 19 Aug 2021 19:08:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B295027F5; Thu, 19 Aug 2021 19:08:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 17JJ83Jk051852; Thu, 19 Aug 2021 19:08:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 17JJ83Pt051851; Thu, 19 Aug 2021 19:08:03 GMT (envelope-from git) Date: Thu, 19 Aug 2021 19:08:03 GMT Message-Id: <202108191908.17JJ83Pt051851@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: 5b40ab6b2fa8 - main - irc/quassel*: update to 0.14-rc1 snapshot (+) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5b40ab6b2fa808cb98febc1cfb00b8c74360c82a Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Aug 2021 19:08:04 -0000 The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=5b40ab6b2fa808cb98febc1cfb00b8c74360c82a commit 5b40ab6b2fa808cb98febc1cfb00b8c74360c82a Author: Dima Panov AuthorDate: 2021-08-19 19:00:48 +0000 Commit: Dima Panov CommitDate: 2021-08-19 19:07:49 +0000 irc/quassel*: update to 0.14-rc1 snapshot (+) Quassel 0.14-rc1 pre-release have full support for Qt 5.5+ While here, adopt port and add some KDE/KF5 integration options --- irc/quassel-core/Makefile | 4 ++- irc/quassel/Makefile | 45 +++++++++++++++++++++++------- irc/quassel/distinfo | 6 ++-- irc/quassel/files/patch-src_common_types.h | 23 --------------- irc/quassel/pkg-plist | 25 +++++++++++++++++ 5 files changed, 66 insertions(+), 37 deletions(-) diff --git a/irc/quassel-core/Makefile b/irc/quassel-core/Makefile index 3acb719a7167..2eca71a75e6b 100644 --- a/irc/quassel-core/Makefile +++ b/irc/quassel-core/Makefile @@ -4,7 +4,9 @@ PKGNAMESUFFIX= -core COMMENT= Qt 5 based distributed IRC client (core/server only) -OPTIONS_EXCLUDE=CLIENT MONO NLS +CMAKE_OFF= ENABLE_SHARED + +OPTIONS_EXCLUDE=CLIENT KDE MONO SPELL NLS OPTIONS_SLAVE= CORE .include "${MASTERDIR}/Makefile" diff --git a/irc/quassel/Makefile b/irc/quassel/Makefile index 5f2e14902691..79fbd6eb5aae 100644 --- a/irc/quassel/Makefile +++ b/irc/quassel/Makefile @@ -1,54 +1,68 @@ # Created by: Martin Wilke PORTNAME= quassel -PORTVERSION= 0.13.1 -PORTREVISION= 5 +DISTVERSION= 0.14-rc1 CATEGORIES= irc -MAINTAINER= ports@FreeBSD.org +MAINTAINER= fluffy@FreeBSD.org COMMENT?= Qt 5 based distributed IRC client (client and monolithic binary) LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -USES= cmake compiler:c++11-lib cpe pkgconfig qt:5 tar:bzip2 +USES= cmake compiler:c++11-lib cpe pkgconfig qca qt:5 tar:bzip2 USE_GITHUB= yes +USE_OPENLDAP= yes USE_QT= buildtools_build core network qmake_build -CMAKE_ARGS= -DWITH_KDE=off \ - -DUSE_QT5=on CPE_VENDOR= quassel-irc CPE_PRODUCT= quassel_irc OPTIONS_DEFINE= NLS OPTIONS_MULTI= MODULE DB +OPTIONS_GROUP= UI MODULE_DESC= Quassel components +UI_DESC= Spellcheck and KDE integration for GUI app DB_DESC= Database for Quassel core / monolithic OPTIONS_MULTI_MODULE= CLIENT CORE MONO OPTIONS_MULTI_DB= PGSQL SQLITE3 +OPTIONS_GROUP_UI= KDE SPELL OPTIONS_DEFAULT= CLIENT MONO SQLITE3 OPTIONS_SUB= yes CLIENT_DESC= Quassel client (for use with core) CLIENT_CMAKE_BOOL= WANT_QTCLIENT -CLIENT_USE= qt=dbus,gui,phonon4,webkit,widgets openldap=yes +CLIENT_USE= qt=dbus,gui,multimedia,phonon4,webkit,widgets CLIENT_LIB_DEPENDS= libdbusmenu-qt5.so:devel/libdbusmenu-qt +CLIENT_PREVENTS= CORE +CLIENT_PREVENTS_MSG= Quassel core server should be installed via irc/quassel-core port CORE_DESC= Quassel core server (for use with client) CORE_CMAKE_BOOL= WANT_CORE CORE_USE= qt=script,sql -CORE_USES= qca CORE_SUB_FILES= pkg-message CORE_VARS= use_rc_subr=quasselcore \ users=quasselcore \ groups=quasselcore \ plist=${NONEXISTENT} # allow core to override PLIST_FILES CORE_PLIST_FILES= bin/quasselcore +CORE_PREVENTS= CLIENT MONO KDE SPELL MONO_DESC= Quassel standalone (monolithic binary: core+client combined) MONO_CMAKE_BOOL= WANT_MONO -MONO_USE= qt=script,sql -MONO_USES= qca +MONO_USE= qt=dbus,gui,multimedia,phonon4,script,sql,webkit,widgets +MONO_LIB_DEPENDS= libdbusmenu-qt5.so:devel/libdbusmenu-qt +MONO_PREVENTS= CORE +MONO_PREVENTS_MSG= Quassel core server should be installed via irc/quassel-core port + +KDE_DESC= Enable KDE integration for client / monolitic +KDE_CMAKE_BOOL= WITH_KDE +KDE_USE= kde=configwidgets,coreaddons,notifications,notifyconfig,textwidgets,widgetsaddons,xmlgui,ecm_build +KDE_USES= kde:5 + +SPELL_DESC= Enable spellcheck in client / monolitic via KF5Sonnet +SPELL_USE= kde=sonnet,ecm_build +SPELL_USES= kde:5 NLS_USE= QT=linguisttools_build @@ -56,6 +70,17 @@ PGSQL_USE= qt=sql-pgsql SQLITE3_USE= qt=sql-sqlite3_run +_LIBVERSION= 0.13.90 +PLIST_SUB= LIBVERSION=${_LIBVERSION} + +.include + +.if ${PORT_OPTIONS:MCLIENT} || ${PORT_OPTIONS:MMONO} +PLIST_SUB+= GUI="" +.else +PLIST_SUB+= GUI="@comment " +.endif + post-patch-NLS-off: ${REINPLACE_CMD} -e '/add_subdirectory(po)/d' \ ${WRKSRC}/CMakeLists.txt diff --git a/irc/quassel/distinfo b/irc/quassel/distinfo index 14794fb3f93f..1e44e75f97bb 100644 --- a/irc/quassel/distinfo +++ b/irc/quassel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1565217514 -SHA256 (quassel-quassel-0.13.1_GH0.tar.gz) = 24c25cf5f1dbfe18bc3d89746f0c9fe538e2c2581ce8af37a5ba595303113d1e -SIZE (quassel-quassel-0.13.1_GH0.tar.gz) = 5453255 +TIMESTAMP = 1629209900 +SHA256 (quassel-quassel-0.14-rc1_GH0.tar.gz) = b3863e07748a1e8d452702837cd13d336653636b96b027fa124b2538607bb289 +SIZE (quassel-quassel-0.14-rc1_GH0.tar.gz) = 5873009 diff --git a/irc/quassel/files/patch-src_common_types.h b/irc/quassel/files/patch-src_common_types.h deleted file mode 100644 index 41f20298dc3f..000000000000 --- a/irc/quassel/files/patch-src_common_types.h +++ /dev/null @@ -1,23 +0,0 @@ -Fix with Qt5-5.14 - -Obtained from: - https://github.com/quassel/quassel/commit/579e559a6322209df7cd51c34801fecff5fe734b - ---- src/common/types.h.orig 2020-04-04 10:50:56 UTC -+++ src/common/types.h -@@ -140,6 +140,7 @@ Q_DECLARE_METATYPE(QHostAddress) - typedef QList MsgIdList; - typedef QList BufferIdList; - -+#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) - /** - * Catch-all stream serialization operator for enum types. - * -@@ -169,6 +170,7 @@ QDataStream &operator>>(QDataStream &in, T &value) { - value = static_cast(v); - return in; - } -+#endif - - // Exceptions - diff --git a/irc/quassel/pkg-plist b/irc/quassel/pkg-plist index 0bf1848823e4..b002354b16bc 100644 --- a/irc/quassel/pkg-plist +++ b/irc/quassel/pkg-plist @@ -1,5 +1,15 @@ %%MONO%%bin/quassel %%CLIENT%%bin/quasselclient +%%GUI%%lib/libquassel-client.so +%%GUI%%lib/libquassel-client.so.%%LIBVERSION%% +lib/libquassel-common.so +lib/libquassel-common.so.%%LIBVERSION%% +%%MONO%%lib/libquassel-core.so +%%MONO%%lib/libquassel-core.so.%%LIBVERSION%% +%%GUI%%lib/libquassel-qtui.so +%%GUI%%lib/libquassel-qtui.so.%%LIBVERSION%% +%%GUI%%lib/libquassel-uisupport.so +%%GUI%%lib/libquassel-uisupport.so.%%LIBVERSION%% %%MONO%%share/applications/quassel.desktop %%CLIENT%%share/applications/quasselclient.desktop %%DATADIR%%/icons/breeze-dark/AUTHORS @@ -27,6 +37,7 @@ %%DATADIR%%/icons/breeze-dark/actions/16/format-text-bold.svg %%DATADIR%%/icons/breeze-dark/actions/16/format-text-color.svg %%DATADIR%%/icons/breeze-dark/actions/16/format-text-italic.svg +%%DATADIR%%/icons/breeze-dark/actions/16/format-text-strikethrough.svg %%DATADIR%%/icons/breeze-dark/actions/16/format-text-underline.svg %%DATADIR%%/icons/breeze-dark/actions/16/go-down.svg %%DATADIR%%/icons/breeze-dark/actions/16/go-next-view.svg @@ -82,6 +93,7 @@ %%DATADIR%%/icons/breeze-dark/actions/22/format-text-bold.svg %%DATADIR%%/icons/breeze-dark/actions/22/format-text-color.svg %%DATADIR%%/icons/breeze-dark/actions/22/format-text-italic.svg +%%DATADIR%%/icons/breeze-dark/actions/22/format-text-strikethrough.svg %%DATADIR%%/icons/breeze-dark/actions/22/format-text-underline.svg %%DATADIR%%/icons/breeze-dark/actions/22/go-down.svg %%DATADIR%%/icons/breeze-dark/actions/22/go-next-view.svg @@ -143,6 +155,7 @@ %%DATADIR%%/icons/breeze-dark/actions/24/format-text-bold.svg %%DATADIR%%/icons/breeze-dark/actions/24/format-text-color.svg %%DATADIR%%/icons/breeze-dark/actions/24/format-text-italic.svg +%%DATADIR%%/icons/breeze-dark/actions/24/format-text-strikethrough.svg %%DATADIR%%/icons/breeze-dark/actions/24/format-text-underline.svg %%DATADIR%%/icons/breeze-dark/actions/24/go-down.svg %%DATADIR%%/icons/breeze-dark/actions/24/go-next-view.svg @@ -205,6 +218,10 @@ %%DATADIR%%/icons/breeze-dark/apps/64/quassel.svg %%DATADIR%%/icons/breeze-dark/devices/16/network-wired.svg %%DATADIR%%/icons/breeze-dark/devices/22/network-wired.svg +%%DATADIR%%/icons/breeze-dark/emblems/16/emblem-information.svg +%%DATADIR%%/icons/breeze-dark/emblems/16/emblem-question.svg +%%DATADIR%%/icons/breeze-dark/emblems/16/emblem-success.svg +%%DATADIR%%/icons/breeze-dark/emblems/16/emblem-unavailable.svg %%DATADIR%%/icons/breeze-dark/index.theme %%DATADIR%%/icons/breeze-dark/preferences/32/help-about.svg %%DATADIR%%/icons/breeze-dark/scalable/actions/connect-quassel.svg @@ -279,6 +296,7 @@ %%DATADIR%%/icons/breeze/actions/16/format-text-bold.svg %%DATADIR%%/icons/breeze/actions/16/format-text-color.svg %%DATADIR%%/icons/breeze/actions/16/format-text-italic.svg +%%DATADIR%%/icons/breeze/actions/16/format-text-strikethrough.svg %%DATADIR%%/icons/breeze/actions/16/format-text-underline.svg %%DATADIR%%/icons/breeze/actions/16/go-down.svg %%DATADIR%%/icons/breeze/actions/16/go-next-view.svg @@ -334,6 +352,7 @@ %%DATADIR%%/icons/breeze/actions/22/format-text-bold.svg %%DATADIR%%/icons/breeze/actions/22/format-text-color.svg %%DATADIR%%/icons/breeze/actions/22/format-text-italic.svg +%%DATADIR%%/icons/breeze/actions/22/format-text-strikethrough.svg %%DATADIR%%/icons/breeze/actions/22/format-text-underline.svg %%DATADIR%%/icons/breeze/actions/22/go-down.svg %%DATADIR%%/icons/breeze/actions/22/go-next-view.svg @@ -395,6 +414,7 @@ %%DATADIR%%/icons/breeze/actions/24/format-text-bold.svg %%DATADIR%%/icons/breeze/actions/24/format-text-color.svg %%DATADIR%%/icons/breeze/actions/24/format-text-italic.svg +%%DATADIR%%/icons/breeze/actions/24/format-text-strikethrough.svg %%DATADIR%%/icons/breeze/actions/24/format-text-underline.svg %%DATADIR%%/icons/breeze/actions/24/go-down.svg %%DATADIR%%/icons/breeze/actions/24/go-next-view.svg @@ -457,6 +477,10 @@ %%DATADIR%%/icons/breeze/apps/64/quassel.svg %%DATADIR%%/icons/breeze/devices/16/network-wired.svg %%DATADIR%%/icons/breeze/devices/22/network-wired.svg +%%DATADIR%%/icons/breeze/emblems/16/emblem-information.svg +%%DATADIR%%/icons/breeze/emblems/16/emblem-question.svg +%%DATADIR%%/icons/breeze/emblems/16/emblem-success.svg +%%DATADIR%%/icons/breeze/emblems/16/emblem-unavailable.svg %%DATADIR%%/icons/breeze/index.theme %%DATADIR%%/icons/breeze/preferences/32/help-about.svg %%DATADIR%%/icons/breeze/scalable/actions/connect-quassel.svg @@ -553,3 +577,4 @@ share/icons/hicolor/22x22/apps/quassel.png share/icons/hicolor/32x32/apps/quassel.png share/icons/hicolor/48x48/apps/quassel.png share/icons/hicolor/64x64/apps/quassel.png +%%KDE%%share/knotifications5/quassel.notifyrc