Re: flameshot 0.10 broken .desktop (Re: CVS: cvs.openbsd.org: ports)

On Wed, Oct 27, 2021 at 03:33:35PM +0100, Jeremie Courreges-Anglas wrote:
> On Wed, Oct 27 2021, Antoine Jacoutot <ajacoutot@bsdfrog.org> wrote:
> > On Wed, Oct 27, 2021 at 02:16:35PM +0100, Matthieu Herrb wrote:
> >> On Mon, Jul 26, 2021 at 09:04:55AM +0200, Matthieu Herrb wrote:
> >> > On Sun, Jul 25, 2021 at 06:16:05PM +0200, Matthieu Herrb wrote:
> >> > > On Fri, Jul 16, 2021 at 10:47:39AM -0600, Denis Fondras wrote:
> >> > > > CVSROOT: /cvs
> >> > > > Module name: ports
> >> > > > Changes by: denis@cvs.openbsd.org 2021/07/16 10:47:39
> >> > > >
> >> > > > Modified files:
> >> > > > graphics/flameshot: Makefile distinfo
> >> > > > graphics/flameshot/pkg: PLIST
> >> > > > Added files:
> >> > > > graphics/flameshot/patches: patch-src_CMakeLists_txt
> >> > > >
> >> > > > Log message:
> >> > > > Update to 0.10.0
> >> > > >
> >> > > > Patch by Stefan Hagen <sh+openbsd-ports codevoid de>
> >> > > > Help and OK sthen@
> >> > >
> >> > > Hi,
> >> > >
> >> > >
> >> > > Looks like this broke the .desktop file
> >> > > (/usr/local/share/applications/org.flameshot.Flameshot.desktop).
> >> > > It now contains:
> >> > >
> >> > > Exec=/usr/bin/flameshot
> >> > >
> >> > > Which obviously doesn't work.
> >> > >
> >> >
> >> > Possible fix:
> >>
> >> Ping with updated patch.
> >>
> >> diff --git a/graphics/flameshot/Makefile b/graphics/flameshot/Makefile
> >> index 3da3ba32700..1716eae60e3 100644
> >> --- a/graphics/flameshot/Makefile
> >> +++ b/graphics/flameshot/Makefile
> >> @@ -6,6 +6,7 @@ CATEGORIES = graphics x11
> >> GH_ACCOUNT = flameshot-org
> >> GH_PROJECT = flameshot
> >> GH_TAGNAME = v0.10.1
> >> +REVISION = 0
> >>
> >> HOMEPAGE = https://flameshot.org/
> >> MAINTAINER = Denis Fondras <denis@openbsd.org>
> >> @@ -26,6 +27,10 @@ RUN_DEPENDS = devel/desktop-file-utils \
> >>
> >> CONFIGURE_ARGS += -DENABLE_CACHE=OFF
> >>
> >> +post-patch:
> >> + perl -pi -e 's,/usr/bin/,${LOCALBASE}/bin/,' \
> >> + ${WRKSRC}/data/desktopEntry/package/org.flameshot.Flameshot.desktop
> >
> > Could you do it in pre-configure and use TRUEPREFIX instead of LOCALBASE?
>
> Didn't we decide that we shouldn't care about LOCALBASE vs TRUEPREFIX
> any more? (In Bucarest IIRC)

We never validated it and no one came up with a diff.

--
Antoine