From nobody Fri Oct 22 20:24:24 2021 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 A3474181DFC3; Fri, 22 Oct 2021 20:24:24 +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 4HbbRX4CWWz4nFl; Fri, 22 Oct 2021 20:24:24 +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 70C3F15425; Fri, 22 Oct 2021 20:24:24 +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 19MKOOvP065132; Fri, 22 Oct 2021 20:24:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19MKOOTO065131; Fri, 22 Oct 2021 20:24:24 GMT (envelope-from git) Date: Fri, 22 Oct 2021 20:24:24 GMT Message-Id: <202110222024.19MKOOTO065131@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Steven Kreuzer Subject: git: f21bde9e383f - main - deskutils/taskwarrior: Update to version 2.6.1 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: skreuzer X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f21bde9e383f3cd5056472746c9d7bafcd71a3e9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by skreuzer: URL: https://cgit.FreeBSD.org/ports/commit/?id=f21bde9e383f3cd5056472746c9d7bafcd71a3e9 commit f21bde9e383f3cd5056472746c9d7bafcd71a3e9 Author: Steven Kreuzer AuthorDate: 2021-10-22 18:50:24 +0000 Commit: Steven Kreuzer CommitDate: 2021-10-22 20:24:04 +0000 deskutils/taskwarrior: Update to version 2.6.1 - TW #2619 Fish autocompletion fails when completing tag removal - TW #2620 Old-style context definition should only be interpreted as read context. - TW #2622 Tags and dependencies appear as orphaned UDAs. - TW #2626 Waiting report lists deleted and/or completed tasks. - TW #2629 New-style context definition should take precedence over old-style even if the new-style is an empty string. - TW #2632 Cannot build on Cygwin - TW #2639 Unable to use ranges for some tasks with IDs above 1000. --- deskutils/taskwarrior/Makefile | 7 ++++--- deskutils/taskwarrior/distinfo | 10 +++++----- deskutils/taskwarrior/files/patch-CMakeLists.txt | 21 +++++++++++++++++++++ deskutils/taskwarrior/pkg-plist | 15 ++++++++++----- 4 files changed, 40 insertions(+), 13 deletions(-) diff --git a/deskutils/taskwarrior/Makefile b/deskutils/taskwarrior/Makefile index a1faa126ae16..9127b4065aea 100644 --- a/deskutils/taskwarrior/Makefile +++ b/deskutils/taskwarrior/Makefile @@ -1,7 +1,7 @@ # Created by: gahr PORTNAME= taskwarrior -PORTVERSION= 2.5.3 +PORTVERSION= 2.6.1 DISTVERSIONPREFIX= v CATEGORIES= deskutils @@ -19,12 +19,13 @@ USES= compiler:c++11-lib cmake python:test shebangfix USE_GITHUB= yes GH_ACCOUNT= GothenburgBitFactory GH_PROJECT= taskwarrior libshared:libshared -GH_TAGNAME= 418a187:libshared +GH_TAGNAME= 8baf2db:libshared GH_SUBDIR= src/libshared:libshared CMAKE_ARGS+= -DTASK_DOCDIR:STRING=${DATADIR:S/${PREFIX}\///} \ -DTASK_MAN1DIR:STRING=man/man1 \ - -DTASK_MAN5DIR:STRING=man/man5 + -DTASK_MAN5DIR:STRING=man/man5 \ + -DCMAKE_BUILD_TYPE=release SHEBANG_FILES= scripts/*/*.pl \ doc/rc/refresh \ diff --git a/deskutils/taskwarrior/distinfo b/deskutils/taskwarrior/distinfo index f12fb035c222..b436938593ac 100644 --- a/deskutils/taskwarrior/distinfo +++ b/deskutils/taskwarrior/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1614095986 -SHA256 (GothenburgBitFactory-taskwarrior-v2.5.3_GH0.tar.gz) = 6bc876578ff4313cd6412596b33fb7533a4e766f66920d0bbd713353d5b8d38a -SIZE (GothenburgBitFactory-taskwarrior-v2.5.3_GH0.tar.gz) = 1292564 -SHA256 (GothenburgBitFactory-libshared-418a187_GH0.tar.gz) = 279e7b7a2b9c910df27ee91c53799ca92add34221dead78b6d7147b4ad7af2c8 -SIZE (GothenburgBitFactory-libshared-418a187_GH0.tar.gz) = 149891 +TIMESTAMP = 1634927357 +SHA256 (GothenburgBitFactory-taskwarrior-v2.6.1_GH0.tar.gz) = 5369a1fa706b8f4126d6dbe24b00b6e5f921296bc30cd088270544da9817d4ab +SIZE (GothenburgBitFactory-taskwarrior-v2.6.1_GH0.tar.gz) = 1343146 +SHA256 (GothenburgBitFactory-libshared-8baf2db_GH0.tar.gz) = c93a30bf53a0751f10cc137c42bd05f1fa47477f2803ae45d684a14202238b63 +SIZE (GothenburgBitFactory-libshared-8baf2db_GH0.tar.gz) = 161275 diff --git a/deskutils/taskwarrior/files/patch-CMakeLists.txt b/deskutils/taskwarrior/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..dada2d267657 --- /dev/null +++ b/deskutils/taskwarrior/files/patch-CMakeLists.txt @@ -0,0 +1,21 @@ +--- CMakeLists.txt.orig 2021-10-22 18:31:30 UTC ++++ CMakeLists.txt +@@ -165,18 +165,6 @@ foreach (doc_FILE ${doc_FILES}) + install (FILES ${doc_FILE} DESTINATION ${TASK_DOCDIR}) + endforeach (doc_FILE) + +-add_custom_command(OUTPUT run-review +- COMMAND docker build -q --build-arg PR=$(PR) --build-arg LIBPR=$(LIBPR) -t taskwarrior-review:$(PR)s$(LIBPR) - < scripts/review-dockerfile +- COMMAND docker run --rm --memory 1g --hostname pr-$(PR)s$(LIBPR) -it taskwarrior-review:$(PR)s$(LIBPR) bash || : +-) +-add_custom_target(review DEPENDS run-review) +- +-add_custom_command(OUTPUT run-reproduce +- COMMAND docker build -q --build-arg RELEASE=$(RELEASE) -t taskwarrior-reproduce:$(RELEASE) - < scripts/reproduce-dockerfile +- COMMAND docker run --rm --memory 1g --hostname tw-$(RELEASE) -it taskwarrior-reproduce:$(RELEASE) bash || : +-) +-add_custom_target(reproduce DEPENDS run-reproduce) +- + # --- + + set (CPACK_SOURCE_GENERATOR "TGZ") diff --git a/deskutils/taskwarrior/pkg-plist b/deskutils/taskwarrior/pkg-plist index 90aec2244330..228e4a7a0a75 100644 --- a/deskutils/taskwarrior/pkg-plist +++ b/deskutils/taskwarrior/pkg-plist @@ -4,11 +4,12 @@ man/man5/task-color.5.gz man/man5/task-sync.5.gz man/man5/taskrc.5.gz %%DATADIR%%/AUTHORS -%%DATADIR%%/ChangeLog %%DATADIR%%/COPYING +%%DATADIR%%/ChangeLog %%DATADIR%%/INSTALL %%DATADIR%%/LICENSE %%DATADIR%%/NEWS +%%DATADIR%%/README.md %%DATADIR%%/rc/dark-16.theme %%DATADIR%%/rc/dark-256.theme %%DATADIR%%/rc/dark-blue-256.theme @@ -34,8 +35,10 @@ man/man5/taskrc.5.gz %%DATADIR%%/rc/holidays.es-US.rc %%DATADIR%%/rc/holidays.fi-FI.rc %%DATADIR%%/rc/holidays.fr-BE.rc +%%DATADIR%%/rc/holidays.fr-CA.rc %%DATADIR%%/rc/holidays.fr-FR.rc %%DATADIR%%/rc/holidays.hr-HR.rc +%%DATADIR%%/rc/holidays.hu-HU.rc %%DATADIR%%/rc/holidays.is-IS.rc %%DATADIR%%/rc/holidays.it-IT.rc %%DATADIR%%/rc/holidays.nb-NO.rc @@ -43,8 +46,11 @@ man/man5/taskrc.5.gz %%DATADIR%%/rc/holidays.nl-NL.rc %%DATADIR%%/rc/holidays.pl-PL.rc %%DATADIR%%/rc/holidays.por-PRT.rc +%%DATADIR%%/rc/holidays.pt-BR.rc %%DATADIR%%/rc/holidays.pt-PT.rc %%DATADIR%%/rc/holidays.ru-RU.rc +%%DATADIR%%/rc/holidays.sk-SK.rc +%%DATADIR%%/rc/holidays.sv-FI.rc %%DATADIR%%/rc/holidays.sv-SE.rc %%DATADIR%%/rc/holidays.tr-TR.rc %%DATADIR%%/rc/light-16.theme @@ -53,22 +59,21 @@ man/man5/taskrc.5.gz %%DATADIR%%/rc/refresh %%DATADIR%%/rc/solarized-dark-256.theme %%DATADIR%%/rc/solarized-light-256.theme -%%DATADIR%%/README.md %%DATADIR%%/scripts/add-ons/README %%DATADIR%%/scripts/add-ons/update-holidays.pl %%DATADIR%%/scripts/bash/task.sh %%DATADIR%%/scripts/fish/task.fish +%%DATADIR%%/scripts/hooks/README %%DATADIR%%/scripts/hooks/on-add %%DATADIR%%/scripts/hooks/on-add.the %%DATADIR%%/scripts/hooks/on-exit %%DATADIR%%/scripts/hooks/on-exit.shadow-file %%DATADIR%%/scripts/hooks/on-launch %%DATADIR%%/scripts/hooks/on-modify -%%DATADIR%%/scripts/hooks/README -%%DATADIR%%/scripts/vim/ftdetect/task.vim %%DATADIR%%/scripts/vim/README +%%DATADIR%%/scripts/vim/ftdetect/task.vim %%DATADIR%%/scripts/vim/syntax/taskdata.vim %%DATADIR%%/scripts/vim/syntax/taskedit.vim %%DATADIR%%/scripts/vim/syntax/taskrc.vim -%%DATADIR%%/scripts/zsh/_task %%DATADIR%%/task-ref.pdf +share/zsh/site-functions/_task