From nobody@FreeBSD.org  Wed Jan 27 16:48:59 2010
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0BEE81065698
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 27 Jan 2010 16:48:59 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id EF9A38FC22
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 27 Jan 2010 16:48:58 +0000 (UTC)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o0RGmwxN070733
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 27 Jan 2010 16:48:58 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id o0RGmwmc070732;
	Wed, 27 Jan 2010 16:48:58 GMT
	(envelope-from nobody)
Message-Id: <201001271648.o0RGmwmc070732@www.freebsd.org>
Date: Wed, 27 Jan 2010 16:48:58 GMT
From: Anatoly Borodin <anatoly.borodin@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: editors/py-room: desktop file should be patched
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         143296
>Category:       ports
>Synopsis:       editors/py-room: desktop file should be patched
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    amdmi3
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jan 27 16:50:02 UTC 2010
>Closed-Date:    Wed Feb 17 17:06:59 UTC 2010
>Last-Modified:  Wed Feb 17 17:10:02 UTC 2010
>Originator:     Anatoly Borodin
>Release:        
>Organization:
>Environment:
>Description:
The desktop file contains Linux-style path for the icon and the executable. See possible patch.

Or should DESKTOP_ENTRIES be used instead?
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

From a5b3a56a009e9621b2404e750672ddeb3aabd0fc Mon Sep 17 00:00:00 2001
From: Anatoly Borodin <anatoly.borodin@gmail.com>
Date: Tue, 19 Jan 2010 22:51:43 +0100
Subject: [PATCH 21/21] editors/py-room: .desktop file fixed.

---
 editors/py-room/Makefile                   |    3 ++-
 editors/py-room/files/patch-pyroom.desktop |   14 ++++++++++++++
 2 files changed, 16 insertions(+), 1 deletions(-)
 create mode 100644 editors/py-room/files/patch-pyroom.desktop

diff --git editors/py-room/Makefile editors/py-room/Makefile
index ff161e5..aa69fd5 100644
--- editors/py-room/Makefile
+++ editors/py-room/Makefile
@@ -29,6 +29,7 @@ post-patch:
 	@${REINPLACE_CMD} -e \
 		's|%%LOCALBASE%%|${LOCALBASE}|g' \
 			${WRKSRC}/setup.py ${WRKSRC}/PyRoom/preferences.py \
-				${WRKSRC}/PyRoom/gui.py
+				${WRKSRC}/PyRoom/gui.py \
+				${WRKSRC}/pyroom.desktop
 
 .include <bsd.port.mk>
diff --git editors/py-room/files/patch-pyroom.desktop editors/py-room/files/patch-pyroom.desktop
new file mode 100644
index 0000000..fa8b8b8
--- /dev/null
+++ editors/py-room/files/patch-pyroom.desktop
@@ -0,0 +1,14 @@
+--- pyroom.desktop	2009-04-06 10:32:56.000000000 +0200
++++ pyroom.desktop	2009-04-06 10:32:56.000000000 +0200
+@@ -1,9 +1,9 @@
+ [Desktop Entry]
+ Version=1.0
+ Name=PyRoom
+-Icon=/usr/share/pyroom/pyroom.png
++Icon=%%LOCALBASE%%/share/pyroom/pyroom.png
+ Comment=Distraction free full-screen text editor
+-Exec=/usr/bin/pyroom %F
++Exec=%%LOCALBASE%%/bin/pyroom %F
+ Terminal=false
+ Type=Application
+ Categories=GNOME;GTK;Office;
-- 
1.6.6.1



>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-bugs->freebsd-ports-bugs 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Wed Jan 27 18:35:06 UTC 2010 
Responsible-Changed-Why:  
ports PR. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=143296 

From: Alexander Best <alexbestms@wwu.de>
To: <bug-followup@FreeBSD.org>
Cc: Anatoly Borodin <anatoly.borodin@gmail.com>
Subject: Re: ports/143296: editors/py-room: desktop file should be patched
Date: Sun, 07 Feb 2010 15:19:06 +0100 (CET)

 maintainer approves patch.
 
 thanks. :)
 alex
Responsible-Changed-From-To: freebsd-ports-bugs->amdmi3 
Responsible-Changed-By: amdmi3 
Responsible-Changed-When: Sun Feb 14 02:43:07 UTC 2010 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=143296 

From: Dmitry Marakasov <amdmi3@amdmi3.ru>
To: Alexander Best <alexbestms@wwu.de>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/143296: editors/py-room: desktop file should be patched
Date: Sun, 14 Feb 2010 06:03:20 +0300

 * Alexander Best (alexbestms@wwu.de) wrote:
 
 >  maintainer approves patch.
 
 I'd like to also change LOCALBASE substitutions to PREFIX here -
 it's more correct as the PREFIX is where the port is installed,
 while LOCALBASE is where is searches for dependencies. Please
 approve.
 
 --- pyroom.patch begins here ---
 Index: Makefile
 ===================================================================
 RCS file: /home/amdmi3/projects/freebsd/FreeBSD.cvs/ports/editors/py-room/Makefile,v
 retrieving revision 1.3
 diff -u -r1.3 Makefile
 --- Makefile	5 Feb 2010 11:36:40 -0000	1.3
 +++ Makefile	14 Feb 2010 02:41:59 -0000
 @@ -27,8 +27,8 @@
  
  post-patch:
  	@${REINPLACE_CMD} -e \
 -		's|%%LOCALBASE%%|${LOCALBASE}|g' \
 +		's|%%PREFIX%%|${PREFIX}|g' \
  			${WRKSRC}/setup.py ${WRKSRC}/PyRoom/preferences.py \
 -				${WRKSRC}/PyRoom/gui.py
 +			${WRKSRC}/PyRoom/gui.py ${WRKSRC}/pyroom.desktop
  
  .include <bsd.port.mk>
 Index: files/patch-PyRoom-gui.py
 ===================================================================
 RCS file: /home/amdmi3/projects/freebsd/FreeBSD.cvs/ports/editors/py-room/files/patch-PyRoom-gui.py,v
 retrieving revision 1.1
 diff -u -r1.1 patch-PyRoom-gui.py
 --- files/patch-PyRoom-gui.py	17 Nov 2009 09:12:42 -0000	1.1
 +++ files/patch-PyRoom-gui.py	14 Feb 2010 02:42:12 -0000
 @@ -5,7 +5,7 @@
           order of preference is homedir, global dir, source dir (if available)"""
           local_directory = os.path.join(data_home, 'pyroom', 'themes')
  -        global_directory = '/usr/share/pyroom/themes' # FIXME: platform
 -+        global_directory = '%%LOCALBASE%%/share/pyroom/themes' # FIXME: platform
 ++        global_directory = '%%PREFIX%%/share/pyroom/themes' # FIXME: platform
           # in case PyRoom is run without installation
           fallback_directory = os.path.join(
               os.path.dirname(os.path.abspath(__file__)),
 Index: files/patch-PyRoom-preferences.py
 ===================================================================
 RCS file: /home/amdmi3/projects/freebsd/FreeBSD.cvs/ports/editors/py-room/files/patch-PyRoom-preferences.py,v
 retrieving revision 1.1
 diff -u -r1.1 patch-PyRoom-preferences.py
 --- files/patch-PyRoom-preferences.py	17 Nov 2009 09:12:42 -0000	1.1
 +++ files/patch-PyRoom-preferences.py	14 Feb 2010 02:42:21 -0000
 @@ -5,7 +5,7 @@
           self.data_dir = os.path.join(data_home, 'pyroom')
           self.themes_dir  = os.path.join(self.data_dir, 'themes')
  -        self.global_themes_dir = '/usr/share/pyroom/themes'
 -+        self.global_themes_dir = '%%LOCALBASE%%/share/pyroom/themes'
 ++        self.global_themes_dir = '%%PREFIX%%/share/pyroom/themes'
           # if we are not using a global installation,
           # take the themes directly from sources
           if not os.path.isdir(self.global_themes_dir) :
 Index: files/patch-pyroom.desktop
 ===================================================================
 RCS file: files/patch-pyroom.desktop
 diff -N files/patch-pyroom.desktop
 --- /dev/null	1 Jan 1970 00:00:00 -0000
 +++ files/patch-pyroom.desktop	14 Feb 2010 02:40:57 -0000
 @@ -0,0 +1,14 @@
 +--- pyroom.desktop	2009-04-06 10:32:56.000000000 +0200
 ++++ pyroom.desktop	2009-04-06 10:32:56.000000000 +0200
 +@@ -1,9 +1,9 @@
 + [Desktop Entry]
 + Version=1.0
 + Name=PyRoom
 +-Icon=/usr/share/pyroom/pyroom.png
 ++Icon=%%PREFIX%%/share/pyroom/pyroom.png
 + Comment=Distraction free full-screen text editor
 +-Exec=/usr/bin/pyroom %F
 ++Exec=%%PREFIX%%/bin/pyroom %F
 + Terminal=false
 + Type=Application
 + Categories=GNOME;GTK;Office;
 Index: files/patch-setup.py
 ===================================================================
 RCS file: /home/amdmi3/projects/freebsd/FreeBSD.cvs/ports/editors/py-room/files/patch-setup.py,v
 retrieving revision 1.1
 diff -u -r1.1 patch-setup.py
 --- files/patch-setup.py	17 Nov 2009 09:12:42 -0000	1.1
 +++ files/patch-setup.py	14 Feb 2010 02:42:32 -0000
 @@ -7,9 +7,9 @@
  -    ('/usr/share/pyroom/themes', glob.glob('themes/*.theme')),
  -    ('/usr/share/pyroom', ['pyroom.png']),
  -    ('/usr/share/applications', ['pyroom.desktop'])
 -+    ('%%LOCALBASE%%/share/pyroom/themes', glob.glob('themes/*.theme')),
 -+    ('%%LOCALBASE%%/share/pyroom', ['pyroom.png']),
 -+    ('%%LOCALBASE%%/share/applications', ['pyroom.desktop'])
 ++    ('%%PREFIX%%/share/pyroom/themes', glob.glob('themes/*.theme')),
 ++    ('%%PREFIX%%/share/pyroom', ['pyroom.png']),
 ++    ('%%PREFIX%%/share/applications', ['pyroom.desktop'])
       ],
     scripts=['pyroom',],
     cmdclass={'install_data': InstallData},
 --- pyroom.patch ends here ---
 
 -- 
 Dmitry Marakasov   .   55B5 0596 FF1E 8D84 5F56  9510 D35A 80DD F9D2 F77D
 amdmi3@amdmi3.ru  ..:  jabber: amdmi3@jabber.ru    http://www.amdmi3.ru

From: Alexander Best <alexbestms@wwu.de>
To: Dmitry Marakasov <amdmi3@amdmi3.ru>
Cc: <bug-followup@FreeBSD.org>
Subject: Re: ports/143296: editors/py-room: desktop file should be patched
Date: Tue, 16 Feb 2010 22:19:59 +0100 (CET)

 looking good.
 
 approved. :)
 
 cheers.
 alex
State-Changed-From-To: open->closed 
State-Changed-By: amdmi3 
State-Changed-When: Wed Feb 17 17:06:57 UTC 2010 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=143296 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/143296: commit references a PR
Date: Wed, 17 Feb 2010 17:07:02 +0000 (UTC)

 amdmi3      2010-02-17 17:06:53 UTC
 
   FreeBSD ports repository
 
   Modified files:
     editors/py-room      Makefile 
     editors/py-room/files patch-PyRoom-gui.py 
                           patch-PyRoom-preferences.py 
                           patch-setup.py 
   Added files:
     editors/py-room/files patch-pyroom.desktop 
   Log:
   - Fix paths to icon and executable in .desktop file
   - Fix LOCALBASE/PREFIX misuse
   
   PR:             143296
   Submitted by:   Anatoly Borodin <anatoly.borodin@gmail.com>
   Approved by:    Alexander Best <alexbestms@wwu.de> (maintainer)
   Feature safe:   yes
   
   Revision  Changes    Path
   1.4       +2 -2      ports/editors/py-room/Makefile
   1.2       +1 -1      ports/editors/py-room/files/patch-PyRoom-gui.py
   1.2       +1 -1      ports/editors/py-room/files/patch-PyRoom-preferences.py
   1.1       +14 -0     ports/editors/py-room/files/patch-pyroom.desktop (new)
   1.2       +3 -3      ports/editors/py-room/files/patch-setup.py
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
