Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 603670 - games-engines/scummvm: installs two equivalent .desktop entries
Summary: games-engines/scummvm: installs two equivalent .desktop entries
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal QA (vote)
Assignee: Gentoo Games
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2016-12-25 07:55 UTC by Michał Górny
Modified: 2019-04-13 22:21 UTC (History)
1 user (show)

See Also:
Package list:
Runtime testing required: ---


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Michał Górny archtester Gentoo Infrastructure gentoo-dev Security 2016-12-25 07:55:35 UTC
(the main result is that ScummVM shows in the menu twice)

$ qlist scummvm | grep desktop
/usr/share/applications/scummvm.desktop
/usr/share/applications/scummvm-scummvm.desktop
$ diff -dup /usr/share/applications/scummvm.desktop /usr/share/applications/scummvm-scummvm.desktop
--- /usr/share/applications/scummvm.desktop	2016-12-10 09:33:19.264306209 +0100
+++ /usr/share/applications/scummvm-scummvm.desktop	2016-12-10 09:33:19.612281177 +0100
@@ -1,15 +1,8 @@
 [Desktop Entry]
 Name=ScummVM
-Comment=Interpreter for several adventure games
-Comment[pl]=Interpreter graficznych gier przygodowych
-Comment[sv]=Tolk för flera äventyrsspel
-Comment[he]=פרשן למספר משחקי הרפתקאות
-Comment[de]=Interpreter für diverse Abenteuerspiele
-Comment[es]=Intérprete para varias aventuras gráficas
-Comment[ca]=Intèrpret per diverses aventures gràfiques
+Type=Application
+Comment=Reimplementation of the SCUMM game engine used in Lucasarts adventures
 Exec=scummvm
+TryExec=scummvm
 Icon=scummvm
-Terminal=false
-Type=Application
 Categories=Game;AdventureGame;
-StartupNotify=false
Comment 1 Michael 'veremitz' Everitt 2016-12-25 08:19:08 UTC
Adding @dgturner for upstream visibility if necessary.
Comment 2 Michał Górny archtester Gentoo Infrastructure gentoo-dev Security 2016-12-25 10:21:39 UTC
It seems that the other file is created by ebuild.
Comment 3 David Turner 2016-12-25 11:30:00 UTC
The desktop file is created by the "make install" target during scummmvm build/install on POSIX. See:
https://github.com/scummvm/scummvm/blob/master/ports.mk#L22

The duplication which @mgorny indicated is occurring because you are calling default in the ebuild src_install() which AFAIK installs all files present in the compiled output so both are installed:
https://gitweb.gentoo.org/repo/gentoo.git/tree/games-engines/scummvm/scummvm-1.9.0.ebuild#n90

I would suggest to resolve this remove line 90 from the ebuild and use the upstream desktop file. If this is not acceptable or finer control of the installed files from the upstream is required, I think you need to stop using default and explicitly "doins" each installed file, but these do change slightly over installs so a bit of work to list these out would be needed.
Comment 4 David Turner 2017-12-24 04:31:02 UTC
The latest ebuild for ScummVM v2.0.0 release has removed the make_desktop_entry call from src_install which was causing this duplicate entry, relying on the upstream make install version:
https://gitweb.gentoo.org/repo/gentoo.git/tree/games-engines/scummvm/scummvm-2.0.0.ebuild#n89

I would suggest removing this from v1.9.0 ebuild and bumping this to v1.9.0-r1, but in any case, this bug can be closed after that.
Comment 5 Pacho Ramos gentoo-dev 2019-04-13 22:21:56 UTC
1.9 was dropped