Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 12 Jul 2011 18:25:56 -0400
From:      Jung-uk Kim <jkim@FreeBSD.org>
To:        freebsd-ports@FreeBSD.org
Cc:        Pav Lucistnik <pav@freebsd.org>, Stephen Montgomery-Smith <stephen@freebsd.org>
Subject:   [RFC] A trivial change for DESKTOP_ENTRIES
Message-ID:  <201107121826.00020.jkim@FreeBSD.org>

next in thread | raw e-mail | index | archive | help

--Boundary-00=_3nMHOYijZsxjJVq
Content-Type: text/plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

After I updated x11-wm/compiz, GNOME was not able to start the window 
manager.  Basically, it complained that compiz-manager was not found.  
Then, I realized compiz-manager.desktop was automagically replaced by 
compizmanager.desktop.  Now I tracked it down to this commit:

Sat Nov 27 17:42:46 2010 UTC (7 months, 2 weeks ago) by pav

- DESKTOP_ENTRIES: commandline is used to name installed .desktop 
file, this can lead to files containing whitespace and funny 
characters; thus strip all non-alphanumeric characters

http://www.freebsd.org/cgi/cvsweb.cgi/ports/Mk/bsd.port.mk.diff?r1=1.656;r2=1.657

To me, it looks far too restrictive.  At least, I'd like to allow '-' 
and '_'.  Please see the attached patch.

Any objections?

Jung-uk Kim

--Boundary-00=_3nMHOYijZsxjJVq
Content-Type: text/plain;
  charset="iso-8859-1";
  name="port.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename="port.diff"

Index: bsd.port.mk
===================================================================
RCS file: /home/pcvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.687
diff -u -r1.687 bsd.port.mk
--- bsd.port.mk	3 Jul 2011 15:51:18 -0000	1.687
+++ bsd.port.mk	12 Jul 2011 21:58:02 -0000
@@ -6432,7 +6432,7 @@
 		${ECHO_CMD} "@cwd ${DESKTOPDIR}" >> ${TMPPLIST}; \
 	fi; \
 	while [ $$# -gt 6 ]; do \
-		filename="`${ECHO_CMD} "$$4" | ${TR} -cd [:alnum:]`.desktop"; \
+		filename="`${ECHO_CMD} "$$4" | ${TR} -cd "[:alnum:]-_"`.desktop"; \
 		pathname="${DESKTOPDIR}/$$filename"; \
 		categories="$$5"; \
 		if [ -z "$$categories" ]; then \

--Boundary-00=_3nMHOYijZsxjJVq--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201107121826.00020.jkim>