Bug 264641 - astro/merkaartor: Fix about-dialog and terminology
Summary: astro/merkaartor: Fix about-dialog and terminology
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Some People
Assignee: Fernando Apesteguía
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2022-06-12 20:02 UTC by Oliver Heesakkers
Modified: 2022-06-17 05:27 UTC (History)
1 user (show)

See Also:

Attachments
patch (13.40 KB, patch)
2022-06-12 20:02 UTC, Oliver Heesakkers 		dev2: maintainer-approval+
Details | Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Oliver Heesakkers 2022-06-12 20:02:04 UTC 
Created attachment 234648 [details]
patch

As the maintainer for Merkaartor, I received a report from a user. The About-dialog in his case shows a curious string as the Merkaartor version. There is code to determine this by running `git describe`. I'm not sure whether he installed the pkg or build the port, but the GH distfile download doesn't qualify as a git repo, so it really makes no sense for the FreeBSD port to rely on git and, as we see here, potentially mess up the version string.

So for the purpose of getting a reliable string in the about-dialog I've decided to get rid of the `git describe` lines in Config.prio.

Also, while I'm here, I might as well include the terminology-fix from https://github.com/openstreetmap/merkaartor/pull/260, since I have no idea how long it will be before upstream decides to make a new release.

Poudriere build:
https://heesakkers.info/showandtell/merkaartor-0.19.0_4.log

Package (showing the correct string)
https://heesakkers.info/showandtell/merkaartor-0.19.0_4.pkg

Credits for reporting: Friedrich Volkmann
Comment 1 Fernando Apesteguía freebsd_committer freebsd_triage 2022-06-16 16:40:28 UTC 
^Triage: Please set the maintainer-approval attachment flag (to +) on patches for ports you maintain to signify approval.
--
Attachment -> Details -> maintainer-approval [+]

^Triage: Maintainer-feedback flag (+) not required unless requested (?) first.


Thanks!
Comment 2 Fernando Apesteguía freebsd_committer freebsd_triage 2022-06-17 05:27:19 UTC 
Committed,

Thanks!
Comment 3 commit-hook freebsd_committer freebsd_triage 2022-06-17 05:27:41 UTC 
A commit in branch main references this bug:

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

commit b796796f022213e8cd30660d82c77789823700b1
Author:     Oliver Heesakkers <dev2@heesakkers.info>
AuthorDate: 2022-06-16 16:38:30 +0000
Commit:     Fernando Apesteguía <fernape@FreeBSD.org>
CommitDate: 2022-06-17 05:24:06 +0000

    astro/merkaartor: Fix about-dialog and terminology

     * Get rid of the `git describe` lines
     * Include terminology fix[1]

    [1] https://github.com/openstreetmap/merkaartor/pull/260

    PR:     264641
    Reported by:    dev2@heesakkers.info (maintainer)

 astro/merkaartor/Makefile                          |   2 +-
 astro/merkaartor/files/patch-src_Config.pri (new)  |  16 +++
 .../patch-src_ImportExport_ImportOSM.cpp (new)     |  21 ++++
 .../files/patch-src_Sync_DirtyList.cpp (new)       | 128 +++++++++++++++++++++
 .../patch-src_Sync_DirtyListExecutorOSC.cpp (new)  |  74 ++++++++++++
 5 files changed, 240 insertions(+), 1 deletion(-)