From nobody Tue Oct 22 20:16:44 2024 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 4XY3Ns00hcz5ZKcQ; Tue, 22 Oct 2024 20:16:45 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XY3Nr6YDXz44K7; Tue, 22 Oct 2024 20:16:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729628204; 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=GyyI4oyGws1/S6dtFa74VJ+aS/Sys5xfLladEruaAc0=; b=HIPDcKo4DfeArSkytemmEKhSdm+d3p+i67rlszsJHE6WajTXpO6st65qeUHuGtL3BCm03B 2eqxnK/nCa6ISMBD44FqOQcTRvQs6eTPT/53kBcZ+oasqfltCam2X8mTd8xm75FD6HiCYA 5sEy2MsIS9fJCGjzjkGvFcA6ikWjG728ykcno7/SZetJC/hOzUiYcXFs3AVcBlAbyBSkx5 p2jG/aQm9KXpZ61gdyrvfLNzb5cWUY4VhCseOZJG3rodxFijgFCigIhhsocYs0Ju3WXQS6 4TNpx+RKnlVcK1McLm4Wk+BtucTzDH0/9OTq8W2q2are/vvb/J4zTqsqXeivQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729628204; 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=GyyI4oyGws1/S6dtFa74VJ+aS/Sys5xfLladEruaAc0=; b=s1KAkfmW04pmJlcm89XCg0/gCJsznCyri9oewwrlf57wi7irqIp5a8PWyNic9eLUeoq8yb yGnsnLupptlK/G5o90j0LRh6j0SU/iiVBSGGrMUB/2SRQ/TwFGvI1P+cAd4JGhI0hzCdIf DGpi0yVXcbr7T+2WdRvyE0mA2fxfWzw3p6l80GrhBscgtrjrZPZoo6HHdkchUjQGUyMNzK r1qy1XCncpQjChCDbZge4S1NPKHerx99zaWrSf6YNuHfdgFs1RqnTm9n65B/FhCHZ7PJl5 piXKwqQh8DR7/ED1vkVUe5YADuxyg65RjRXEJzd4RdPiTr+ER8xwvYMnjtWueQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729628204; a=rsa-sha256; cv=none; b=ZZWqtlSjcsuz47nTa9iuC2QgnehBcUCo/c1ZtVN3CdxvN+RZ1I+bUSFyP4wPN4XDxrhjYR C59jJ5obU3avnlG+Zik3hYcnKlVj4RV6Rxdezn5E/3a6SofIOKyGB0DUoBDXLNstGN4+tj 3Q6yDdYxx81G20THTfXVUFoRbgKipRBAaQxe+y3gzTyb6x6IU2MordbBT+dBCNXrzk67eq wEDVqLdDYXsCJLcbWdEx73+Q4RETZtdgKC9aqwCcApgrssJL0Wr+R7oFEYl/WjxtAIxTg5 sbC2IwVfYJ1cqGezEddsHthYesER54QYZWPhKoavjwMXVxeSboVNA3AcetTDIQ== 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 4XY3Nr63KQzT4P; Tue, 22 Oct 2024 20:16:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49MKGi3J093860; Tue, 22 Oct 2024 20:16:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49MKGioV093857; Tue, 22 Oct 2024 20:16:44 GMT (envelope-from git) Date: Tue, 22 Oct 2024 20:16:44 GMT Message-Id: <202410222016.49MKGioV093857@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: 352476893ff7 - main - devel/gitqlient: Improve port 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 352476893ff7eb64bdf145c60a3561ab5fc392e3 Auto-Submitted: auto-generated The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=352476893ff7eb64bdf145c60a3561ab5fc392e3 commit 352476893ff7eb64bdf145c60a3561ab5fc392e3 Author: Daniel Engberg AuthorDate: 2024-10-22 20:14:59 +0000 Commit: Daniel Engberg CommitDate: 2024-10-22 20:16:17 +0000 devel/gitqlient: Improve port * Use upstream release archive as recommended by Porters Handbook and simplifies port * Fix usage of USE_GL helper * Add missing dependency USE_QT= network * Remove usage of git during build * Define version and sha checksum for build PR: 282093 Reviewed by: adridg (maintainer) --- devel/gitqlient/Makefile | 32 +++++++++++---------------- devel/gitqlient/distinfo | 14 +++--------- devel/gitqlient/files/patch-GitQlient.pro | 36 +++++++++++++++++++++++++++++++ 3 files changed, 51 insertions(+), 31 deletions(-) diff --git a/devel/gitqlient/Makefile b/devel/gitqlient/Makefile index e6b216c908dc..d088dcc08941 100644 --- a/devel/gitqlient/Makefile +++ b/devel/gitqlient/Makefile @@ -1,7 +1,9 @@ PORTNAME= gitqlient -DISTVERSIONPREFIX= v DISTVERSION= 1.6.3 +PORTREVISION= 1 CATEGORIES= devel +MASTER_SITES= https://github.com/francescmm/GitQlient/releases/download/v${DISTVERSION}/ +DISTNAME= ${PORTNAME}_${DISTVERSION} MAINTAINER= adridg@FreeBSD.org COMMENT= Graphical interface to git repositories @@ -10,27 +12,17 @@ WWW= https://francescmm.github.io/GitQlient/ LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/LICENSE -USES= compiler:c++11-lang cpe qmake:outsource qt:5 -USE_GL+= gl -USE_QT= core gui widgets \ +USES= compiler:c++17-lang cpe gl qmake:outsource qt:5 +USE_GL= gl +USE_QT= core gui network widgets \ buildtools:build -USE_GITHUB= yes -GH_ACCOUNT= francescmm -GH_PROJECT= GitQlient \ - QPinnableTabWidget:widget \ - QLogger:logger \ - AuxiliarCustomWidgets:aux \ - git:git -GH_TAGNAME= 06da655529e288ccd354c08092c21984352e0400:widget \ - 36cde545bf3554589b79f6afb2360eb0f80b9f80:logger \ - c400e91ec23317714a55ccf7d7cebe6cafa559f1:aux \ - 62f9899415d8b20e2c2814d666536b75dd06c890:git -GH_SUBDIR= src/QPinnableTabWidget:widget \ - src/QLogger:logger \ - src/AuxiliarCustomWidgets:aux \ - src/git:git - QMAKE_SOURCE_PATH= ${WRKSRC}/GitQlient.pro +post-patch: + @${REINPLACE_CMD} -e 's|%%DISTVERSION%%|${DISTVERSION}|g' \ + ${PATCH_WRKSRC}/GitQlient.pro + @${REINPLACE_CMD} -e 's|%%SHASHORT%%|faf286e|g' \ + ${PATCH_WRKSRC}/GitQlient.pro + .include diff --git a/devel/gitqlient/distinfo b/devel/gitqlient/distinfo index 54474f851549..d5a438d31cc0 100644 --- a/devel/gitqlient/distinfo +++ b/devel/gitqlient/distinfo @@ -1,11 +1,3 @@ -TIMESTAMP = 1728942157 -SHA256 (francescmm-GitQlient-v1.6.3_GH0.tar.gz) = c4416af5f0fcaa1440bc529d81d488811d5a5a22a25ed66a82929c5d4068d885 -SIZE (francescmm-GitQlient-v1.6.3_GH0.tar.gz) = 4514603 -SHA256 (francescmm-QPinnableTabWidget-06da655529e288ccd354c08092c21984352e0400_GH0.tar.gz) = eea4538bbd480a533e12a328f97108abfffc225caa1c8b58406bb70483bd7221 -SIZE (francescmm-QPinnableTabWidget-06da655529e288ccd354c08092c21984352e0400_GH0.tar.gz) = 13454 -SHA256 (francescmm-QLogger-36cde545bf3554589b79f6afb2360eb0f80b9f80_GH0.tar.gz) = 07bf7ba9a35b42093f7b628390f58e3a53b0f32592bf956b6f0d75535c35ce38 -SIZE (francescmm-QLogger-36cde545bf3554589b79f6afb2360eb0f80b9f80_GH0.tar.gz) = 20357 -SHA256 (francescmm-AuxiliarCustomWidgets-c400e91ec23317714a55ccf7d7cebe6cafa559f1_GH0.tar.gz) = 361dccc7d53699ed35d9212a97973bd1c6aeda4ea73c1d05db257390959a5ed4 -SIZE (francescmm-AuxiliarCustomWidgets-c400e91ec23317714a55ccf7d7cebe6cafa559f1_GH0.tar.gz) = 440350 -SHA256 (francescmm-git-62f9899415d8b20e2c2814d666536b75dd06c890_GH0.tar.gz) = 3cd3a328a4906156edb771daef9ba12c0eb9998240dbcb3a65661d7130595e17 -SIZE (francescmm-git-62f9899415d8b20e2c2814d666536b75dd06c890_GH0.tar.gz) = 29933 +TIMESTAMP = 1728945397 +SHA256 (gitqlient_1.6.3.tar.gz) = 93b68ff1d717db1b745469238d88fdca9a29e87d4b25e97a0410fa8fc7f558d4 +SIZE (gitqlient_1.6.3.tar.gz) = 5033798 diff --git a/devel/gitqlient/files/patch-GitQlient.pro b/devel/gitqlient/files/patch-GitQlient.pro new file mode 100644 index 000000000000..f58b8d154a4e --- /dev/null +++ b/devel/gitqlient/files/patch-GitQlient.pro @@ -0,0 +1,36 @@ +--- GitQlient.pro.orig 2024-10-14 22:38:13 UTC ++++ GitQlient.pro +@@ -4,11 +4,6 @@ DEFINES += QT_DEPRECATED_WARNINGS + QT += widgets core network gui + DEFINES += QT_DEPRECATED_WARNINGS + +-if (!exists(src/git/.git) || !exists(src/AuxiliarCustomWidgets/.git) || !exists(src/QLogger/.git) || !exists(src/QPinnableTabWidget/.git)) { +- message("Submodule update:") +- system(git submodule update --init --recursive) +-} +- + unix:!macos { + TARGET = gitqlient + QMAKE_LFLAGS += -no-pie +@@ -57,19 +52,9 @@ OTHER_FILES += \ + OTHER_FILES += \ + $$PWD/LICENSE + +- +-isEmpty(VERSION) { +- VERSION = $$system(git describe --abbrev=0) +- VERSION = $$replace(VERSION, "v", "") +-} +- +-!defined(GQ_SHA, var) { +- GQ_SHA = $$system(git rev-parse --short HEAD) +-} +- + DEFINES += \ +- VER=\\\"$$VERSION\\\" \ +- SHA_VER=\\\"$$GQ_SHA\\\" ++ VER=\\\"%%DISTVERSION%%\\\" \ ++ SHA_VER=\\\"%%SHASHORT%%\\\" + + !win32-msvc* { + debug {