From owner-freebsd-gnome@FreeBSD.ORG Tue Feb 10 19:53:28 2004 Return-Path: Delivered-To: freebsd-gnome@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BF72816A4CE; Tue, 10 Feb 2004 19:53:28 -0800 (PST) Received: from lakemtao07.cox.net (lakemtao07.cox.net [68.1.17.114]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0B34043D41; Tue, 10 Feb 2004 19:53:28 -0800 (PST) (envelope-from mezz7@cox.net) Received: from mezz.mezzweb.com ([68.103.32.11]) by lakemtao07.cox.net (InterMail vM.5.01.06.05 201-253-122-130-105-20030824) with ESMTP id <20040211035324.QFZM2432.lakemtao07.cox.net@mezz.mezzweb.com>; Tue, 10 Feb 2004 22:53:24 -0500 Date: Tue, 10 Feb 2004 21:52:25 -0600 To: Joe Marcus Clarke References: <1076231925.915.8.camel@shumai.marcuscom.com> <1076314663.766.16.camel@localhost> <1076352014.830.61.camel@gyros> <1076399479.1054.3.camel@localhost> <1076442051.733.87.camel@gyros> <1076443069.733.89.camel@gyros> <1076455070.819.2.camel@gyros> From: Jeremy Messenger Content-Type: multipart/mixed; boundary=----------Co6WSLOBzKtVEuG25qgc4z MIME-Version: 1.0 Message-ID: In-Reply-To: <1076455070.819.2.camel@gyros> User-Agent: Opera7.23/Linux M2 build 518 X-Content-Filtered-By: Mailman/MimeDel 2.1.1 cc: "Vladimir B. Grebenschikov" cc: gnome Subject: Re: Looking for GNOME users with KDE X-BeenThere: freebsd-gnome@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: GNOME for FreeBSD -- porting and maintaining List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Feb 2004 03:53:28 -0000 ------------Co6WSLOBzKtVEuG25qgc4z Content-Type: text/plain; format=flowed; charset=utf-8 Content-Transfer-Encoding: 8bit On Tue, 10 Feb 2004 18:18:53 -0500, Joe Marcus Clarke wrote: > Now this is what I'm talking about! Awesome. Let me know when you have > something you like. Thanks a lot for looking at this. Here are two attaches of kde-menus.png and gnomevfs2.diff; I think it's done. Only one very small issue is that there are a lot of KDE icons (*.desktop) don't have the 'Categories'. The menu read 'Categories' line in the *.desktop files, so it's why there has three icons (see kde-menus.png for yellow square) that are out of order. It will be nice if it's possible to put the in the KDE's and any general icon can be in the KDE menu rather than outside. At least, it looks much cleaner than before. :-) P.S. Can one of committer take a look at ports/62489? Cheers, Mezz > Joe -- bsdforums.org 's moderator, mezz. ------------Co6WSLOBzKtVEuG25qgc4z Content-Disposition: attachment; filename=gnomevfs2.diff Content-Type: text/plain; name=gnomevfs2.diff Content-Transfer-Encoding: 8bit diff -urN gnomevfs2.orig/Makefile gnomevfs2/Makefile --- gnomevfs2.orig/Makefile Sun Feb 8 15:01:38 2004 +++ gnomevfs2/Makefile Tue Feb 10 20:59:14 2004 @@ -44,6 +44,9 @@ .if !defined(WITHOUT_KDE_MENUS) EXTRA_PATCHES= ${FILESDIR}/modules_vfolder_applications-all-users.vfolder-info.in +PLIST_SUB+= KDEMENUS="" +.else +PLIST_SUB+= KDEMENUS="@comment " .endif .if exists(${LOCALBASE}/lib/libcdda_paranoia.a) @@ -72,6 +75,11 @@ PLIST_SUB+= SAMBA="@comment " .endif +.if !defined(WITHOUT_KDE_MENUS) +post-extract: + @${CP} ${FILESDIR}/KDE.directory ${WRKSRC} +.endif + post-patch: @${FIND} ${WRKSRC} -name "*info.in" | ${XARGS} ${REINPLACE_CMD} -e \ 's|\@datadir\@/gnome|\@datadir\@|g' @@ -79,7 +87,16 @@ ${WRKSRC}/libgnomevfs/Makefile.in \ ${WRKSRC}/libgnomevfs/xdgmime.c \ ${WRKSRC}/modules/vfolder/applications-all-users.vfolder-info.in +.if !defined(WITHOUT_KDE_MENUS) + @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ + ${WRKSRC}/KDE.directory +.endif @${REINPLACE_CMD} -e "/^SUBDIRS =/s/test//" \ ${WRKSRC}/Makefile.in + +.if !defined(WITHOUT_KDE_MENUS) +post-install: + @${INSTALL_DATA} ${WRKSRC}/KDE.directory ${PREFIX}/share/gnome/vfolders/ +.endif .include diff -urN gnomevfs2.orig/files/KDE.directory gnomevfs2/files/KDE.directory --- gnomevfs2.orig/files/KDE.directory Wed Dec 31 18:00:00 1969 +++ gnomevfs2/files/KDE.directory Tue Feb 10 20:11:16 2004 @@ -0,0 +1,5 @@ +[Desktop Entry] +Name=KDE +Comment=Some comment about KDE menu +Icon=/usr/local/share/icons/kdeclassic/48x48/apps/kmenu.png +Type=Directory diff -urN gnomevfs2.orig/files/modules_vfolder_applications-all-users.vfolder-info.in gnomevfs2/files/modules_vfolder_applications-all-users.vfolder-info.in --- gnomevfs2.orig/files/modules_vfolder_applications-all-users.vfolder-info.in Sun Feb 8 13:57:49 2004 +++ gnomevfs2/files/modules_vfolder_applications-all-users.vfolder-info.in Tue Feb 10 19:59:29 2004 @@ -1,5 +1,5 @@ ---- modules/vfolder/applications-all-users.vfolder-info.in.orig Sun Feb 8 14:02:33 2004 -+++ modules/vfolder/applications-all-users.vfolder-info.in Sun Feb 8 14:00:32 2004 +--- modules/vfolder/applications-all-users.vfolder-info.in.orig Tue Feb 10 19:49:19 2004 ++++ modules/vfolder/applications-all-users.vfolder-info.in Tue Feb 10 19:59:22 2004 @@ -19,7 +19,14 @@ /usr/share/gnome/apps/ @@ -16,3 +16,269 @@ +@@ -34,10 +41,12 @@ + + + Core +- +- ++ ++ ++ Qt ++ KDE ++ ++ + + + +@@ -47,6 +56,12 @@ + Accessories.directory + + ++ ++ ++ Qt ++ KDE ++ ++ + Application + Utility + +@@ -63,6 +78,12 @@ + Accessibility.directory + + ++ ++ ++ Qt ++ KDE ++ ++ + Application + Accessibility + +@@ -80,6 +101,12 @@ + + + ++ ++ ++ Qt ++ KDE ++ ++ + Application + + Settings +@@ -101,6 +128,12 @@ + Development.directory + + ++ ++ ++ Qt ++ KDE ++ ++ + Application + Development + +@@ -114,6 +147,12 @@ + Games.directory + + ++ ++ ++ Qt ++ KDE ++ ++ + Application + Game + +@@ -127,6 +166,12 @@ + Graphics.directory + + ++ ++ ++ Qt ++ KDE ++ ++ + Application + Graphics + +@@ -140,6 +185,12 @@ + Internet.directory + + ++ ++ ++ Qt ++ KDE ++ ++ + Application + Network + +@@ -153,6 +204,12 @@ + Multimedia.directory + + ++ ++ ++ Qt ++ KDE ++ ++ + Application + AudioVideo + +@@ -170,6 +227,12 @@ + Office.directory + + ++ ++ ++ Qt ++ KDE ++ ++ + Application + + Office +@@ -195,6 +258,12 @@ + System.directory + + ++ ++ ++ Qt ++ KDE ++ ++ + Application + + Settings +@@ -204,6 +273,117 @@ + + + +- ++ ++ ++ ++ KDE ++ KDE.directory ++ ++ ++ ++ Accessories ++ Accessories.directory ++ ++ ++ ++ Qt ++ KDE ++ ++ Utility ++ ++ ++ ++ ++ ++ ++ ++ Programming ++ Development.directory ++ ++ ++ ++ Qt ++ KDE ++ ++ Development ++ ++ ++ ++ ++ ++ ++ ++ Graphics ++ Graphics.directory ++ ++ ++ ++ Qt ++ KDE ++ ++ Graphics ++ ++ ++ ++ ++ ++ ++ ++ Internet ++ Internet.directory ++ ++ ++ ++ Qt ++ KDE ++ ++ Network ++ ++ ++ ++ /usr/local/share/applnk/konqueror.desktop ++ ++ ++ ++ ++ ++ ++ Multimedia ++ Multimedia.directory ++ ++ ++ ++ Qt ++ KDE ++ ++ AudioVideo ++ ++ ++ ++ ++ ++ ++ ++ Office ++ Office.directory ++ ++ ++ ++ Qt ++ KDE ++ ++ ++ Office ++ Spreadsheet ++ WordProcessor ++ Calendar ++ ProjectManagement ++ ++ ++ ++ ++ ++ ++ + + diff -urN gnomevfs2.orig/pkg-plist gnomevfs2/pkg-plist --- gnomevfs2.orig/pkg-plist Sun Feb 8 15:01:38 2004 +++ gnomevfs2/pkg-plist Tue Feb 10 20:59:06 2004 @@ -147,6 +147,7 @@ share/doc/gnome-vfs-2.0/left.png share/doc/gnome-vfs-2.0/right.png share/doc/gnome-vfs-2.0/up.png +%%KDEMENUS%%share/gnome/vfolders/KDE.directory share/locale/am/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/ar/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/az/LC_MESSAGES/gnome-vfs-2.0.mo ------------Co6WSLOBzKtVEuG25qgc4z--