svn commit: r319360 - in head/www/chromium: . files

[Rene Ladan]

Author: rene
Date: Wed May 29 08:41:47 2013
New Revision: 319360
URL: http://svnweb.freebsd.org/changeset/ports/319360

Log:
  Manually install the desktop file instead of using DESKTOP_ENTRIES, this
  allows to set the MimeTypes.
  
  PR:		ports/175369 (still open)
  Submitted by:	Lawrence Chen (lchen at zen.lhaven.homeip.net)
  		The BSD Dreamer (beastie at tardisi.com)

Added:
  head/www/chromium/files/chromium-browser.desktop.in   (contents, props changed)
Modified:
  head/www/chromium/Makefile
  head/www/chromium/pkg-plist

Modified: head/www/chromium/Makefile
==============================================================================
--- head/www/chromium/Makefile	Wed May 29 08:30:12 2013	(r319359)
+++ head/www/chromium/Makefile	Wed May 29 08:41:47 2013	(r319360)
@@ -42,7 +42,7 @@ RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/l
 
 ONLY_FOR_ARCHS=	i386 amd64
 USE_XZ=		yes
-USES=		bison pkgconfig
+USES=		bison pkgconfig desktop-file-utils
 USE_GMAKE=	yes
 USE_PERL5_BUILD=	yes
 USE_PYTHON_BUILD=	2.6+
@@ -50,9 +50,6 @@ USE_XORG=	scrnsaverproto x11 xproto xscr
 USE_GNOME=	glib20 gtk20 dconf libxslt
 MAN1=		chrome.1
 
-DESKTOP_ENTRIES="Chromium" "Web browser" "${DATADIR}/product_logo_48.png" \
-		"chrome %U" "Network;WebBrowser;GTK;" true
-
 ALL_TARGET=	chrome
 
 # See build/common.gypi for all the available variables.
@@ -78,6 +75,10 @@ GYP_DEFINES+=	use_cups=1 \
 		prefix_dir=${LOCALBASE} \
 		python_ver=${PYTHON_VER}
 
+SUB_FILES=	chromium-browser.desktop
+SUB_LIST=	COMMENT="${COMMENT}" \
+		DATADIR=${DATADIR}
+
 OPTIONS_DEFINE=	CODECS GCONF PULSEAUDIO CLANG DEBUG
 
 CODECS_DESC=	Compile and enable patented codecs like H.264
@@ -196,6 +197,7 @@ do-install:
 .endfor
 	cd ${WRKSRC}/out/${BUILDTYPE} && \
 		${COPYTREE_SHARE} "locales resources" ${DATADIR}
+	${INSTALL_DATA} ${WRKDIR}/chromium-browser.desktop ${DESKTOPDIR}
 	${LN} -sf ${DATADIR}/chrome ${PREFIX}/bin
 
 post-install:

Added: head/www/chromium/files/chromium-browser.desktop.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/chromium-browser.desktop.in	Wed May 29 08:41:47 2013	(r319360)
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Type=Application
+Version=1.0
+Encoding=UTF-8
+Name=Chromium
+Comment=%%COMMENT%%
+Icon=%%DATADIR%%/product_logo_48.png
+Exec=chrome %U
+Categories=Application;Network;WebBrowser;
+MimeType=text/html;text/xml;application/xhtml+xml;x-scheme-handler/http;/x-scheme-handler/https;x-scheme-handler/ftp;
+StartupNotify=true

Modified: head/www/chromium/pkg-plist
==============================================================================
--- head/www/chromium/pkg-plist	Wed May 29 08:30:12 2013	(r319359)
+++ head/www/chromium/pkg-plist	Wed May 29 08:41:47 2013	(r319360)
@@ -1,4 +1,5 @@
 bin/chrome
+share/applications/chromium-browser.desktop
 %%DATADIR%%/chrome
 %%DATADIR%%/chrome-wrapper
 %%DATADIR%%/chrome.pak