From nobody Sun Jul 02 21:12:09 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QvMFP3KBgz4lRGl; Sun, 2 Jul 2023 21:12:09 +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 4QvMFP1sDtz4799; Sun, 2 Jul 2023 21:12:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688332329; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3t88jeDLGXgHloLF8PoG3V/Mz1A9JvIJ11Ih8uvZvrk=; b=ZlADaDSJkNYqswWYafcVCHA96ceKWBTEzzWkhO/ZVVLLXNAGDi7dOWdnEkYmhkeA11VO4E iM1Scy8tiM5TwG8BKzh4Fsr6GI0v0HYix3WBLITPiFthKEaBsZ+vp2GbJKclkwPnZxsIuT +ssYENw2aLWeaAqR6AP/yjaKLw3F9fBwKDBqT2ljyL2FLXyvDndCR3cYPWOqUxtyj/4aOc qqY5Z14kt3BQiAMMyvuKPO4khxTui3MF2I15NvVg96OP5Dc1jlufnN90SAKTPm3swgL5nB 4E6bws+jQ4MSNPdzL3Ad2/TTIbvyoWwDa/Fho1uzqAoHLt8MEbL9s/ohzaQVSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688332329; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3t88jeDLGXgHloLF8PoG3V/Mz1A9JvIJ11Ih8uvZvrk=; b=eAS4Pi+fEUmFP4aZ8S/pWU9gb0hCgmhalz36cQLbgi1TgDjPWWCFCkABvO2EtvL/atXHLN /CVo5BeRAwWj09lJRmepSRboT6m3zB7rOAYogVuQ6D9m9ItIDr6SP7bF8UGCEJ5oaJzwDb Vjr0YyXdmk3Gz5ejF4hCf8nACCH0nFfdAY7olSsp/VOYuJIHIWg3sUMZMy+lVY4xHEVCF5 ALvCUv22wqAiS/z1uNBHnouA5wYml7O0497e6ZyMr5FINJNMu1M0TBh2aafBBBHly64Mt2 I0z3G/E+rAlEB7GH2wUjLSE0cw1jgxVmp7RnO0pV9NLa1l76N1XspQEJl4lsOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688332329; a=rsa-sha256; cv=none; b=tXppzuoDhaLlXJI30WKCtwmhtdmzjbp+w8qLP7fkKZeXoloLU5RbBIGBQDnCTjQFXmtB1Q xrO9Zz2/JHCD/GMjfOY5jWLsj3ZMJO/4OjigrtNdhufGT8lsOP8yZKIcV+4C9AYVYP+E8R CMh/fYrLTdkbojl5ap92ubk5GkW0i1nKQVn2hfOSMKl3+659RV/SWq40dmYcn8DmtisTgB gsIlB+v36UxbTxAwhZ6cAdw2/O3h1iKoYfUXw+y4c8IaONA1pgcdyXuCRwbjt/XDVTR6El 7W0emETWDibwwK64099uv0ECZTr89gL0PSBHhr0JaD5lHbn3R7nmiFRoCvYQ1Q== 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 4QvMFP0vr3zNVR; Sun, 2 Jul 2023 21:12:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 362LC9qe030889; Sun, 2 Jul 2023 21:12:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 362LC9sc030888; Sun, 2 Jul 2023 21:12:09 GMT (envelope-from git) Date: Sun, 2 Jul 2023 21:12:09 GMT Message-Id: <202307022112.362LC9sc030888@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason E. Hale" Subject: git: 2e8b882d18f0 - main - audio/strawberry: Fix qt6 flavor crash upon start List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhale X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2e8b882d18f0661626e28911cee98192ca72a0c7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=2e8b882d18f0661626e28911cee98192ca72a0c7 commit 2e8b882d18f0661626e28911cee98192ca72a0c7 Author: Jason E. Hale AuthorDate: 2023-07-02 21:07:20 +0000 Commit: Jason E. Hale CommitDate: 2023-07-02 21:11:53 +0000 audio/strawberry: Fix qt6 flavor crash upon start The Qt6 SQL drivers were split out of devel/qt6-base in 0f24404c0a02 and put into databases/qt6-base_sqldriver in fe629e0d7c4b, respectively. Strawberry needs the sqlite driver to run or will crash upon startup. For the qt5 flavor, make the sqlite driver a runtime only dependency. It is not needed for the build. MFH: 2023Q3 --- audio/strawberry/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/audio/strawberry/Makefile b/audio/strawberry/Makefile index b3bf30d4e0a8..dd729a0eb35c 100644 --- a/audio/strawberry/Makefile +++ b/audio/strawberry/Makefile @@ -1,5 +1,6 @@ PORTNAME= strawberry DISTVERSION= 1.0.17 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= https://github.com/strawberrymusicplayer/${PORTNAME}/releases/download/${DISTVERSION}/ \ https://files.jkvinge.net/packages/strawberry/ @@ -26,9 +27,9 @@ USES= cmake compiler:c++17-lang desktop-file-utils gettext-runtime \ gnome pkgconfig qt:${FLAVOR:S/qt//} sqlite tar:xz xorg USE_GNOME= glib20 -_USE_QT5= concurrent core dbus gui network sql sql-sqlite3 widgets \ +_USE_QT5= concurrent core dbus gui network sql sql-sqlite3:run widgets \ x11extras buildtools:build linguisttools:build qmake:build -_USE_QT6= base tools:build +_USE_QT6= base sqldriver-sqlite:run tools:build USE_QT= ${_USE_QT${FLAVOR:S/qt//}} USE_XORG= ice sm x11 xcb xext