Created attachment 231779 [details] patch bringing back audio/solfege Since removing the port related to the python 2.7 EOL upstream development picked up speed again adding support for python 3 as well as other minor improvements. - resurrect port and update to version 3.23.5pre2 - set maintainer to submitter
Created attachment 237090 [details] Updated patch following recent WWW change
Hi, I think the recommended procedure for a revive is revert removed port, apply changes and commit. --- git log -- audio/solfege git revert <tag> aplly changes commit. --- I'm I correct? https://lists.freebsd.org/archives/freebsd-ports/2022-July/002199.html Thanks
(In reply to Nuno Teixeira from comment #2) That does indeed sound like the proper way in principle. However, the commit in question would be https://cgit.freebsd.org/ports/commit/?id=aa2769119334a5045d38419995aca597ea24b1f1 , making that a rather daunting task. But I'll see what I can do.
Created attachment 237118 [details] Alternative patch with explicite revert of aa2769119334a5045d38419995aca597ea24b1f1 I played around a little with reverting the commit removing the port. I'm still not too convinced about it, as stating to revert aa2769119334a5045d38419995aca597ea24b1f1 while not touching most of it seems a bit misleading. In any case, here it is.
Created attachment 237119 [details] consolidated patch Submitted the wrong one before, sorry about that.
(In reply to Martin Neubauer from comment #4)(In reply to Martin Neubauer from comment #4) You need to choose a commit related only to port not a general one that affects other ports like aa27691 "Remove expired ports:". Maybe choosing one of these: --- commit 2b7586353bcd1cb789b017087f6c9724da12a21f Author: John Marino <marino@FreeBSD.org> Date: Mon Jan 18 00:08:44 2016 +0000 audio/solfege: USES-= display I don't believe xvfb has been a build requirement for years. Solfege builds fine without USES=display, so let's remove it. Notes: svn path=/head/; revision=406540 commit 4c0cc5a159d7c6a0f31af9a928b8ad111dc9c27e Author: Pawel Pekala <pawel@FreeBSD.org> Date: Fri Jun 12 17:51:11 2015 +0000 - Remove GNOME option, according to port Changelog file this program is no longer GNOME app for at least few years. Also it uses USE_GNOME=pygnomeextras removed in r372768 - Correct spelling in COMMENT, "ear training" is used all over homepage and project documentation --- And then make changes and upload diff. Let me know what commit you revert so I can apply diff later.
(In reply to Martin Neubauer from comment #5) Ok, could you revert and then send diff of chenges on that revert? I will need to know what commit was reverted.
Created attachment 237129 [details] Patch with more targeted commit to revert The new patch reverts 2b7586353bcd1cb789b017087f6c9724da12a21f
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=8fb47782c8d06e9cb967e63df7b1b25b7341136c commit 8fb47782c8d06e9cb967e63df7b1b25b7341136c Author: Nuno Teixeira <eduardo@FreeBSD.org> AuthorDate: 2022-10-07 11:56:49 +0000 Commit: Nuno Teixeira <eduardo@FreeBSD.org> CommitDate: 2022-10-07 13:19:38 +0000 audio/solfege: Revive port. Update to 3.23.5pre2 Since removing the port related to the python 2.7 EOL upstream development picked up speed again adding support for python 3 as well as other minor improvements. - resurrect port and update to version 3.23.5pre2 - set maintainer to submitter PR: 261915 Revert "audio/solfege: USES-= display" This reverts commit 2b7586353bcd1cb789b017087f6c9724da12a21f. MOVED | 1 - audio/Makefile | 1 + audio/solfege/Makefile (new) | 53 ++ audio/solfege/distinfo (new) | 3 + audio/solfege/pkg-descr (new) | 16 + audio/solfege/pkg-plist (new) | 1575 +++++++++++++++++++++++++++++++++++++++++ 6 files changed, 1648 insertions(+), 1 deletion(-)
Thinking if the best way to rivive is doing a git checkout to get all files from a specific commit since revert only fetched Makefile in this case. portlint -C: --- FATAL: /usr/home/nunotex/Work/freebsd/ports/audio/solfege/pkg-plist: [4]: this port installs .desktop files. Please add `desktop-file-utils` to USES. WARN: Makefile: Consider adding support for a NLS knob to conditionally disable gettext support. --- Maybe it's better to add USES desktop-file-utils to pet portlint and check if it is possible an NLS knob on this port: https://docs.freebsd.org/en/books/porters-handbook/book/#using-gettext-optional Committed, thanks!