On 02/25 08:24, Landry Breuil wrote:
> On Mon, Feb 25, 2008 at 10:48:22AM -0800, Jeremy Evans wrote:
> > On 02/24 10:30, viq wrote:
> > > On Sat, Feb 23, 2008 at 07:35:34PM -0800, Jeremy Evans wrote:
> > > > On 02/24 01:08, viq wrote:
> > > > > Is there any chance of audio/aqualung being shipped with the .desktop
> > > > > file, like for example firefox is, so it would appear in the menus?
> > > >
> > > > I don't think aqualung comes with one. I'm not sure how to create one,
> > > > but if you point me in the right direction I'll give it a shot.
> > >
> > > www/mozilla-firefox/files/firefox.desktop and they do some trickery with
> > > it too. Quite obviously you won't be able to fill in all the languages
> > > ;) But I think english should do, and google might turn up something
> > > useful.
> >
> > Thanks to you and Stuart Henderson for the examples. I can't confirm
> > that this works (I use Fluxbox and manually configure the menu), but
> > below is my attempt at a patch. Most of the aqualung.desktop file was
> > taken from http://wiki.zenwalk.org/index.php?title=Aqualung.desktop, but
> > I changed some of it to better comply with the freedesktop.org specs.
>
> When adding a .desktop file, you also need to add
> update-desktop-database goos to PLIST, and RUN_DEPENDS on
> desktop-file-utils.
>
> Other than that, looks good to me. But as we're in freeze, i think it
> may go in after unlock.
I'm not sure if the update-desktop-database PLIST goo is correct, but
here's my attempt:
Index: Makefile
===================================================================
RCS file: /cvs/ports/audio/aqualung/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- Makefile 15 Feb 2008 15:52:02 -0000 1.1.1.1
+++ Makefile 5 Mar 2008 21:31:32 -0000
@@ -3,6 +3,7 @@
COMMENT= advanced music player
DISTNAME= aqualung-0.9beta9.1
+PKGNAME= ${DISTNAME}p0
CATEGORIES= audio
HOMEPAGE= http://aqualung.factorial.hu/
@@ -32,6 +33,8 @@
avcodec,avformat,avutil::graphics/ffmpeg \
vorbis,vorbisfile,vorbisenc::audio/libvorbis \
bz2::archivers/bzip2
+
+RUN_DEPENDS= ::devel/desktop-file-utils
WANTLIB= X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes Xi \
Xinerama Xrandr Xrender c expat freetype fontconfig atk-1.0 \
@@ -78,5 +81,9 @@
post-install:
mv ${PREFIX}/share/aqualung/doc ${PREFIX}/share/doc/aqualung
+ mkdir -p ${PREFIX}/share/applications
+ sed -e 's+%%PREFIX%%+${TRUEPREFIX}+' ${FILESDIR}/aqualung.desktop > \
+ ${PREFIX}/share/applications/aqualung.desktop
+
.include <bsd.port.mk>
Index: files/aqualung.desktop
===================================================================
RCS file: files/aqualung.desktop
diff -N files/aqualung.desktop
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/aqualung.desktop 5 Mar 2008 21:31:32 -0000
@@ -0,0 +1,14 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Encoding=UTF-8
+Name=Aqualung
+Name[de]=Aqualung
+Name[fi]=Aqualung
+GenericName=Music Player
+GenericName[de]=Musik-Wiedergabe
+GenericName[fi]=musiikkisoitin
+Icon=%%PREFIX%%/share/aqualung/icon_64.png
+Exec=aqualung
+Terminal=false
+Categories=Application;AudioVideo;Audio;Player;
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/audio/aqualung/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PLIST
--- pkg/PLIST 15 Feb 2008 15:52:02 -0000 1.1.1.1
+++ pkg/PLIST 5 Mar 2008 21:31:32 -0000
@@ -1,6 +1,8 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2008/02/15 15:52:02 steven Exp $
bin/aqualung
@man man/man1/aqualung.1
+share/applications/
+share/applications/aqualung.desktop
share/aqualung/
share/aqualung/appearance.png
share/aqualung/cdda.png
@@ -140,3 +142,5 @@
share/locale/it/LC_MESSAGES/aqualung.mo
share/locale/ru/LC_MESSAGES/aqualung.mo
share/locale/uk/LC_MESSAGES/aqualung.mo
[EMAIL PROTECTED] %D/bin/update-desktop-database
[EMAIL PROTECTED] %D/bin/update-desktop-database
