Bug 275324 - emulators/qmc2: Update from git-master, and switch from QWebKit to QWebengine
Summary: emulators/qmc2: Update from git-master, and switch from QWebKit to QWebengine
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Jason E. Hale
URL:
Keywords:
: 275530 (view as bug list)
Depends on:
Blocks:
 
Reported: 2023-11-25 05:45 UTC by Alastair Hogge
Modified: 2023-12-11 09:29 UTC (History)
2 users (show)

See Also:


Attachments
Update from git-master, and switch from QWebKit to QWebengine (38.76 KB, patch)
2023-11-25 05:45 UTC, Alastair Hogge
no flags Details | Diff
Update from git-master, and switch from QWebKit to QWebengine (38.75 KB, patch)
2023-11-27 01:38 UTC, Alastair Hogge
no flags Details | Diff
emulators/qmc2: Sync with upstream; switch to QWebengine (39.19 KB, patch)
2023-12-06 05:54 UTC, Alastair Hogge
no flags Details | Diff
emulators/qmc2: Sync with upstream; switch to QWebengine (38.82 KB, patch)
2023-12-06 22:33 UTC, Alastair Hogge
agh: maintainer-approval+
Details | Diff
emulators/qmc2: Sync with upstream; switch to QWebengine (39.11 KB, patch)
2023-12-06 23:03 UTC, Alastair Hogge
agh: maintainer-approval+
Details | Diff
emulators/qmc2: Sync with upstream; switch to QWebengine (39.06 KB, patch)
2023-12-06 23:19 UTC, Alastair Hogge
agh: maintainer-approval+
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Alastair Hogge 2023-11-25 05:45:37 UTC
Created attachment 246555 [details]
Update from git-master, and switch from QWebKit to QWebengine

Hello,

The original author of qmc2, Rene, passed away back on the 3rd of February 2023[1]. Before Rene passed, they had committed initial work to move qmc2 to QWebengine. Unfortunately, no release was tagged, however, fortunately, the committed work compiles and runs OK.

Attached is a patch to update qmc2 with upstream, and move the Port to depend on QWebengine. I have no idea what do with ${DISTVERSION}, I just incremented ${PORTREVISION} for now.

poudriere-tesport:
> 12.4-{amd64,i386}-release: OK
> 13.2-{amd64,i386}-release: OK
> 14.0-{amd64,i386}-release: OK
> main-{amd64,i386}:         OK

Thanks.

1: https://forums.bannister.org/ubbthreads.php?ubb=showflat&Number=121983#Post121983
Comment 1 Alastair Hogge 2023-11-27 01:38:44 UTC
Created attachment 246594 [details]
Update from git-master, and switch from QWebKit to QWebengine

Actually fix ${COMMENT} and drop superfluous term, frontend.
Comment 2 Jason E. Hale freebsd_committer freebsd_triage 2023-12-05 00:14:20 UTC
*** Bug 275530 has been marked as a duplicate of this bug. ***
Comment 3 Alastair Hogge 2023-12-06 05:54:48 UTC
Created attachment 246813 [details]
emulators/qmc2: Sync with upstream; switch to QWebengine

* Sync patch with Ports.
* Incorporate Jason's work from bug #275530

Will make maintainer-approval (+) when poudriere-testport finishes, I have however tested directly on 15-CURRENT with MAME-0.260 and 0.261.
Comment 4 Alastair Hogge 2023-12-06 05:56:18 UTC
Jason I do not understand the method you used to update the distinfo and Port distversion, I initially used GH_TAGNAME, however, the most recent patch utilises your methods.

Thanks.
Comment 5 Jason E. Hale freebsd_committer freebsd_triage 2023-12-06 06:03:30 UTC
(In reply to Alastair Hogge from comment #4)
Please see Example 18 in the USE_GITHUB section of the PHB.
https://docs.freebsd.org/en/books/porters-handbook/book/#makefile-master_sites-github
Comment 6 Jason E. Hale freebsd_committer freebsd_triage 2023-12-06 20:47:54 UTC
A few notes:

> +	${MKDIR} ${STAGEDIR}${DATADIR}

All ${MKDIR} commands should be silenced like they were before.

> +@dir %%DATADIR%%/cab
> +@dir %%DATADIR%%/ctl
> +@dir %%DATADIR%%/fly
> +@dir %%DATADIR%%/ico
> +@dir %%DATADIR%%/man
> +@dir %%DATADIR%%/mrq
> +@dir %%DATADIR%%/pcb
> +@dir %%DATADIR%%/prv
> +@dir %%DATADIR%%/sws
> +@dir %%DATADIR%%/ttl
> +@dir %%DATADIR%%/vdo

Is there a reason for all of these new empty directories?
Comment 7 Alastair Hogge 2023-12-06 22:11:39 UTC
(In reply to Jason E. Hale from comment #5)

Awesome thanks. I see I have also made an error copy-pasting too.
Comment 8 Alastair Hogge 2023-12-06 22:32:15 UTC
(In reply to Jason E. Hale from comment #6)

> All ${MKDIR} commands should be silenced like they were before.

I was preferring a verbose build log to a silenced one.

> Is there a reason for all of these new empty directories?

They were for additional media/info on software titles, and hardware platforms.
Comment 9 Alastair Hogge 2023-12-06 22:33:37 UTC
Created attachment 246830 [details]
emulators/qmc2: Sync with upstream; switch to QWebengine

Remove extra dirs, and silence ${MKDIR} from build logs.
Build tested only on 15-CURRENT.
Comment 10 Alastair Hogge 2023-12-06 23:03:29 UTC
Created attachment 246831 [details]
emulators/qmc2: Sync with upstream; switch to QWebengine

Include accidentally dropped patch to use libarchive from Ports, and not base.
Comment 11 Alastair Hogge 2023-12-06 23:19:44 UTC
Created attachment 246832 [details]
emulators/qmc2: Sync with upstream; switch to QWebengine

archivers/libarchive support for real this time.
Comment 12 Alastair Hogge 2023-12-06 23:29:54 UTC
Comment on attachment 246832 [details]
emulators/qmc2: Sync with upstream; switch to QWebengine

poudriere-tesport:
> 12.4-{amd64,i386}-release: OK
> 13.2-{amd64,i386}-release: OK
> 14.0-{amd64,i386}-release: OK
> main-{amd64,i386}        : OK
Comment 13 commit-hook freebsd_committer freebsd_triage 2023-12-11 05:33:08 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=85ef627cb4809d2a7674c9f71f661da49b094db0

commit 85ef627cb4809d2a7674c9f71f661da49b094db0
Author:     Alastair Hogge <agh@riseup.net>
AuthorDate: 2023-12-06 01:13:46 +0000
Commit:     Jason E. Hale <jhale@FreeBSD.org>
CommitDate: 2023-12-11 05:32:34 +0000

    emulators/qmc2: Sync with upstream; switch to QWebengine

    - Sync with upstream
    - Switch browser from QWebKit to QWebengine and remove DEPRECATED/
      EXPIRATION_DATE
    - Pet port(clippy|lint)(1)
    - Simplify COMMENT
    - Move to external dependencies archivers/libarchive and
      archivers/minizip-ng
    - Drop desktop-file-utils from USES -- the port does not register
      any MIME Types
    - Move some post-patch target work to static patching
    - Remove hard-coded binary and manpage names in do-install target
    - Add patches to better integrate with system-wide configuration
    - Bump minimum runtime requirement on MAME to 0.259

    In memoriam of René Reucher, author of qmc and respected MAME community
    member: May his labour in bringing nostalgia and making perhaps the best
    era of arcade entertainment accessible to the masses be forever inscribed
    upon this digital stele.

    On behalf of the FreeBSD Project, we greatly appreciate his contributions
    to the FOSS community and offer our belated condolences to his family
    and friends.

    PR:             275324

 emulators/qmc2/Makefile                            |  86 ++---
 emulators/qmc2/distinfo                            |   6 +-
 emulators/qmc2/files/patch-Makefile (new)          |  11 +
 .../patch-inst_qchdman.desktop.template (new)      |  10 +
 .../patch-inst_qmc2-arcade.desktop.template (new)  |  10 +
 .../files/patch-inst_qmc2.desktop.template (new)   |  10 +
 .../qmc2/files/patch-inst_qmc2.ini.template (new)  |  61 ++++
 emulators/qmc2/files/patch-qmc2.pro (new)          |  21 ++
 .../files/patch-src_arcade_qmc2-arcade.pro (new)   |  11 +
 emulators/qmc2/files/patch-src_macros.h (new)      |  18 +
 emulators/qmc2/files/patch-src_qmc2main.cpp (new)  |  15 +
 emulators/qmc2/pkg-plist                           | 391 ++++++++++++++++++++-
 12 files changed, 591 insertions(+), 59 deletions(-)
Comment 14 Jason E. Hale freebsd_committer freebsd_triage 2023-12-11 05:34:52 UTC
Committed, thanks!
Comment 15 Alastair Hogge 2023-12-11 09:29:00 UTC
Oh that is so wonderful, brings a tear or 40 to my eye. Thanks.