From nobody Fri Nov 3 07:07:21 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 4SMBdP5r49z50Ct6; Fri, 3 Nov 2023 07:07:21 +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 4SMBdP2k51z3GXY; Fri, 3 Nov 2023 07:07:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698995241; 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=cyprxyhItfEyvj5b5rlwmkZqJUzxwc3y6mjonnOhVKw=; b=kZd5XdI4Ox1ChR06wXtI4uvkrE93h8/Z5JlKjUue87uyfnqgsen0pjopJUc6mS2XyPjBYY jIXxuKE1jtjMwsKqtoMxDMtJWQ2VzY1HtAuCBaHXZZBhC7GYCKu6J6N30A8zYiBN5k8/nX VL5vcNd6cXH0uLGsKKT66T7odLrxHvrZn4QxJ+bNS2klwtNa9ClzPJr1m54lIIYj4g4MLU sFq5CWjHCHmkg4Uhvj++DWvTrwvZYxd3YYayEJTpZmlXsIVIztofl5k/SDuLYAZtNGMF3s VBbN5R8CLdj3WNpVR+dPPRArQkS0R1IJ0ErEqmIMy4iOrJOfRjnd7WWcjeguog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698995241; 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=cyprxyhItfEyvj5b5rlwmkZqJUzxwc3y6mjonnOhVKw=; b=R4WgQD6GBqGjoSAGh+LQuGjhkOMCXKzrTh+SM/Fay+9REpAJmuoG6PNuwH40Arm/CLroUv BBtisrLFd7hSSt7oS17HvSv98YlA74QgN8cOXg17YTCcw0YmaKGoO4oroU7ns0IvYpf7FT foJBGgf7NL+yRJQq9OwaMZ9HgdO7pdE/Mk9V4crs8u8LUnQe0W00OQZE7LaCr5GuiFnrDz CN+PyUJrT4CaK0vBMWMGQEe+JpBkD+rkvvswj5ySJC1pzY/MoNR4QZmvGe0UtlPDpZ2YOS XGpJRr19r1zUFy9FBMZr0ScrNeDY9u/EkMLGxex/srImdkaWpMF1Qz6Y6HRGjQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698995241; a=rsa-sha256; cv=none; b=h/u8AaDQNr5j/oiII3xeQkxZ4q++6bqMFcskv3S6A7nGkHPiTPv9ViLalCCBV0caiv/iVE QvB315nyAlUyxqkaZ4VmiggzsZ3V52u17s8+8kAwnf7xFuJ6DlrzP1ZsfZx+koeFeB59U0 Rysch/gcn0mM2LfFZ0ZXfHshwbcF3T0bW07HOVJx9iAL6vbBQOuYriOYOYmG1M8xVqxQ6x pc/FLzW7I7dhAkWfwiJvSGJzUyPU9dG9ozN8/kOUr4sKL3CYiIzXkkDvoOrDVjxj49LHsG 0szOIXTkut4R85WegkJxljrM9B56wRpJ7HKlYg9b/oYJHvxypeJs9+gUrRf4OA== 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 4SMBdP1Z66z12Q8; Fri, 3 Nov 2023 07:07:21 +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 3A377L88079730; Fri, 3 Nov 2023 07:07:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A377L7r079727; Fri, 3 Nov 2023 07:07:21 GMT (envelope-from git) Date: Fri, 3 Nov 2023 07:07:21 GMT Message-Id: <202311030707.3A377L7r079727@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: 9c026564885a - main - www/dooble: Fix build with upcoming Qt 6.6.0 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: 9c026564885a4cf9b0e976b8adb810fd89ddc97c Auto-Submitted: auto-generated The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=9c026564885a4cf9b0e976b8adb810fd89ddc97c commit 9c026564885a4cf9b0e976b8adb810fd89ddc97c Author: Jason E. Hale AuthorDate: 2023-11-03 04:23:16 +0000 Commit: Jason E. Hale CommitDate: 2023-11-03 06:56:58 +0000 www/dooble: Fix build with upcoming Qt 6.6.0 This port builds with -Werror, and due to QSqlDataBase::exec() being finally marked as deprecated in Qt 6.6.0 [1], it fails to build due to deprecation warnings. Add upstreamed patch to fix this issue. [2] Port builds perfectly fine with previous versions of Qt, including 5.x, as it took 12 years for the soft deprecation in the API notes [3] to actually take effect. Upstream notes this was an automatic-completion error. [2] While here: clean up USE_QT for both the qt5 and qt6 flavors and remove checks for long unsupported (3+ years) versions of Qt 5.x. [4] [1] https://doc.qt.io/qt-6/qsqldatabase-obsolete.html [2] https://github.com/textbrowser/dooble/pull/199 [3] https://doc.qt.io/qt-5/qsqldatabase.html Approved by: portmgr (blanket) With hat: kde@ [4] --- www/dooble/Makefile | 23 ++++++++++------------- www/dooble/distinfo | 4 +++- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/www/dooble/Makefile b/www/dooble/Makefile index 1e266c545575..598c5eb6fdff 100644 --- a/www/dooble/Makefile +++ b/www/dooble/Makefile @@ -1,7 +1,11 @@ PORTNAME= dooble DISTVERSION= 2023.08.30 +PORTREVISION= 1 CATEGORIES= www +PATCH_SITES= https://github.com/textbrowser/dooble/commit/ +PATCHFILES+= 95c0d3277d714ea1dba658ff4433bde3eb29ef76.patch:-p1 # Fix build with Qt 6.6.0 + MAINTAINER= eric@camachat.org COMMENT= Dooble Web Browser WWW= https://textbrowser.github.io/dooble/ @@ -21,11 +25,13 @@ GH_ACCOUNT= textbrowser USE_GL= gl .if ${FLAVOR} == qt5 PKGNAMESUFFIX= -${FLAVOR} -USE_QT= concurrent core declarative gui location network printsupport \ - sql webchannel webengine widgets xml sql-sqlite3:run \ +USE_QT= charts concurrent core declarative gui location network \ + printsupport sql webchannel webengine widgets xml \ + sql-sqlite3:run \ buildtools:build qmake:build . elif ${FLAVOR} == qt6 -USE_QT= base charts sqldriver-sqlite webchannel webengine +USE_QT= base charts declarative positioning webchannel webengine \ + sqldriver-sqlite:run .endif USE_XORG= xcb @@ -35,15 +41,6 @@ PLIST_FILES= ${PREFIX}/share/applications/${PORTNAME}.desktop \ ${PREFIX}/share/pixmaps/${PORTNAME}.png \ bin/${PORTNAME} -.include - -.if ${FLAVOR:U} == qt5 -QT5_VER_MINOR= ${QT5_VERSION:C/^[0-9]+\.//:C/\..+$//} -.if ${QT5_VER_MINOR} < 15 -BROKEN= Qt 5.15 or higher required, using 5.${QT5_VER_MINOR} now -.endif -.endif - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/Dooble ${STAGEDIR}${PREFIX}/bin/${PORTNAME} ${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps @@ -53,4 +50,4 @@ do-install: desktop-file-edit --set-icon=${PREFIX}/share/pixmaps/${PORTNAME}.png ${WRKSRC}/${PORTNAME}.desktop ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.desktop ${STAGEDIR}${PREFIX}/share/applications/${PORTNAME}.desktop -.include +.include diff --git a/www/dooble/distinfo b/www/dooble/distinfo index 991d0b0620d5..1d230049d02e 100644 --- a/www/dooble/distinfo +++ b/www/dooble/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1693251481 +TIMESTAMP = 1698972535 SHA256 (textbrowser-dooble-2023.08.30_GH0.tar.gz) = d430cbc8fcbe7627d7494bd995d7e88beb728cd94bf4d3039cb3718e685391a7 SIZE (textbrowser-dooble-2023.08.30_GH0.tar.gz) = 90239922 +SHA256 (95c0d3277d714ea1dba658ff4433bde3eb29ef76.patch) = 44f46c147340cd0e883cda35b714e1ecb68535fd569c70052f1e57e5fba67705 +SIZE (95c0d3277d714ea1dba658ff4433bde3eb29ef76.patch) = 904