From nobody Sun Jul 02 21:13:50 2023 X-Original-To: dev-commits-ports-all@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 4QvMHM0CZ1z4lSKs; Sun, 2 Jul 2023 21:13:51 +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 4QvMHL6tbWz47WS; Sun, 2 Jul 2023 21:13:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688332431; 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=6j0H8Ecg9kRKJ77ruCgfgo5xjHdhppQT9upj8BhzC1U=; b=k3iOQJXUj2KTamceZiaLzhPiR0VZOPfv+s0cxHhHGESo04oZ6Hd/6XSswaGhWlX2s8jZo8 LUcu62J5u7/Gk9KGRXwDcrv8rat9X+/kECiYuPEDNTfueXRdO+7jvwyjDDivXRQiJuNJzd qi89W4H9EPILS0FtQGj0zMV0VxCxIFblHK6ICdl5iDZ0fkVUK5z5a1JfC15Ciuv/M/8LS1 xfSix+VCLniWOCEdevjmKnUjo5aqnO39/Ig/yBG+1/fRGRG4s2i4afEcq7V0VDprd28+fq GQ0vBimFxBnutSFtrc/hbCCI7sXdfrTPOtWRkS7DP4lBbJLRJz2MuNiRi75UMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688332431; 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=6j0H8Ecg9kRKJ77ruCgfgo5xjHdhppQT9upj8BhzC1U=; b=peA/pMdksNcAdYcDmJlNBh+Td2LUSASeFxkvSeCAprMczea1WSZk/GEsrLrwp+SsSIXMn4 t74PNUgKLVgsBfKaPPh0Z9PTb9l+A6GlkiExN+eVRUHfKKpVe7LhpIu9eo1gPNb7fsc06A JDkocwOMa7jFeGx7S8/9uHaNLb6DseUbxLc9exXPG2AsDM8on+v/6kgfCSSTwZeZTcXJQU i3QRB/ujpcArQY1OFjQV2N2/TujrAbeiY5BJLUiLoRpN7wp0k7aCABVEiIQYkKeqSBPpSJ gIQmC6Bqi4PRHlmXtmWCunijov8efUxfD3S5Q3j/6MU8isDs/sIF7ug3aSZ/IQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688332431; a=rsa-sha256; cv=none; b=WUUc/u8nYZuuHmXcR1GKgpO0A8dYcqcdz2lZ3PWWaJvFgXPvCwTI016RgiACV29iE+pRjg Q94+0ZS4vo9JX+ZqpZoZ3NcTdny+FHYU3TXF9rzxQExvthshQ8XOtTwG+M5eZF3C4fE+Pv DwlsRu3hRVrREx0e2eEUf6KvaGQw9FOqyhj3CP8TLfMdOYpaUnaEGJ6pic6+lB4kbjRA5f EqirToo7Y+lRC94YhT/06uKV0SCphGbCnjwKf/bofO3fkOhfmwApxctgJ1bsWvlBrMuLQ6 PrtthSvJmAHZA1yHl1xgziew6W5/LBACqf6r3pqg9Cc1OsZQbAVaymb4gN/4sg== 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 4QvMHL5yz1zNVV; Sun, 2 Jul 2023 21:13:50 +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 362LDoUs032376; Sun, 2 Jul 2023 21:13:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 362LDoFY032375; Sun, 2 Jul 2023 21:13:50 GMT (envelope-from git) Date: Sun, 2 Jul 2023 21:13:50 GMT Message-Id: <202307022113.362LDoFY032375@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: "Jason E. Hale" Subject: git: c4f66cef920d - 2023Q3 - audio/strawberry: Fix qt6 flavor crash upon start List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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/2023Q3 X-Git-Reftype: branch X-Git-Commit: c4f66cef920d5867739381608f08f630a6b17bf3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q3 has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=c4f66cef920d5867739381608f08f630a6b17bf3 commit c4f66cef920d5867739381608f08f630a6b17bf3 Author: Jason E. Hale AuthorDate: 2023-07-02 21:07:20 +0000 Commit: Jason E. Hale CommitDate: 2023-07-02 21:13:20 +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 (cherry picked from commit 2e8b882d18f0661626e28911cee98192ca72a0c7) --- 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