Date: Fri, 1 Sep 2006 09:32:29 -0400 From: "michael johnson" <ahze@ahze.net> To: "Joe Marcus Clarke" <marcus@marcuscom.com> Cc: gnome@freebsd.org, Andy Fawcett <andy@athame.co.uk>, kde@freebsd.org, kde-freebsd@freebsd.kde.org Subject: Re: [kde-freebsd] Re: Conflict between KDE and GNOME in a prefix... Message-ID: <b2203fed0609010632j423e26f9j8b63ba0fd67e41d7@mail.gmail.com> In-Reply-To: <1157087686.99321.31.camel@shumai.marcuscom.com> References: <op.tevui9ub9aq2h7@mezz.mezzweb.com> <1156614644.475.15.camel@shumai.marcuscom.com> <200608281824.03189.andy@athame.co.uk> <44F30B08.6000902@marcuscom.com> <op.tez92bix9aq2h7@mezz.mezzweb.com> <op.te6miro39aq2h7@mezz.mezzweb.com> <1157087686.99321.31.camel@shumai.marcuscom.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On 9/1/06, Joe Marcus Clarke <marcus@marcuscom.com> wrote: > > On Thu, 2006-08-31 at 23:24 -0500, Jeremy Messenger wrote: > > On Mon, 28 Aug 2006 13:09:37 -0500, Jeremy Messenger <mezz7@cox.net> > wrote: > > > > > On Mon, 28 Aug 2006 10:26:00 -0500, Joe Marcus Clarke > > > <marcus@marcuscom.com> wrote: > > > > > >> -----BEGIN PGP SIGNED MESSAGE----- > > >> Hash: SHA1 > > >> > > >> Andy Fawcett wrote: > > >>> Hi Joe, Mezz, Gnome, KDE, > > >>> > > >>> On Saturday 26 August 2006 20:50, Joe Marcus Clarke wrote: > > >>>> On Sat, 2006-08-26 at 03:43 -0500, Jeremy Messenger wrote: > > >>>>> Hello folks, > > >>>>> > > >>>>> We, FreeBSD GNOME Team, have successed to move GNOME from X11BASE > > >>>>> to LOCALBASE. There are three files that are conflict between KDE > > >>>>> and GNOME. The two files that need to be fix in the KDE side and > > >>>>> another file that is need to be fix both in the GNOME and KDE > > >>>>> sides. > > >>>>> > > >>>>> http://people.freebsd.org/~mezz/conflict_prefix.txt > > >>>>> > > >>>>> etc/xdg/menus/applications.menu: > > >>>>> ============================================= > > >>>>> GNOME and KDE teams will have to figure how to solve this problem. > > >>>>> Take the looks at the other Linux distros or so would be a good > > >>>>> start. If you have any good suggest, let us know. > > >>>> We might need to create a small port that just handles conflicting > > >>>> files such as this one. applications.menu is not huge, and should > be > > >>>> interchangeable between GNOME and KDE. > > >>> > > >>> How different are the versions installed by Gnome & KDE? > > >>> > > >>> But yes, possibly we need an 'xdg-menu' port to cover such files. > > >> > > >> mezz could probably better answer this. They should be comparable > since > > >> we're using the same xdg stuff. > > > <snip> > > > > > > http://people.freebsd.org/~mezz/menu/ > > > > > > Both KDE and GNOME applications.menu are in ~mezz/menu/, so you can > > > compare the difference. We can either merge both of applications.menu > > > into one or try to rename applications.menu to > > > (kde|gnome)-applications.menu. I am not sure about <MergeFile> > > > stuff...so.. What I have in my mind is something like this below, but > I > > > have no idea if it will working. If that don't work, then do either > > > merge into one or hack all apps for rename of applications.menu. > > > > It doesn't work, I tried to play with it for about two hours and still > no > > luck with <MergeFile>. Either I need to learn more or it is limited. > > However, it looks like that leave us two choices: > > > > 1) Rename both of applications.menu and hack > > in the ports to teach them about the new > > name. > > 2) Create our own applications.menu that will > > working for the general desktop. > > I think option 2 would be best as who knows how much future hacking will > be required if we rename the files. I was also poking around NetBSD and > Gentoo to see how they handle this. These menu files are substantially > different enough to cause some problems. I wonder if there is a better > solution that we're missing. Does anyone have any insight into what > other platforms are doing? Debian renames these files See the following diffs http://ftp.debian.org/debian/pool/main/g/gnome-menus/gnome-menus_2.15.91-1.diff.gz http://ftp.debian.org/debian/pool/main/k/kdelibs/kdelibs_3.5.4-3.diff.gz or pages http://packages.debian.org/experimental/gnome/gnome-menus http://packages.debian.org/unstable/libs/kdelibs gnome-menus: + if (len (menu_files) < 1): +- menu_files = ["applications.menu", "settings.menu"] ++ menu_files = ["gnome-applications.menu", "gnome-settings.menu "] kde-libs: +- VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu(" applications.menu",true); ++ VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu(" kde-applications.menu", true); + Suse renames the files also http://download.opensuse.org/distribution/SL-10.1/inst-source/suse/src/kdelibs3-3.5.1-47.src.rpm http://download.opensuse.org/distribution/SL-10.1/inst-source/suse/src/gnome-menus-2.12.0-29.src.rpm >From gnome-menus.spec file rm $RPM_BUILD_ROOT%{sysconfdir}/xdg/menus/applications.menu cp %{S:2} $RPM_BUILD_ROOT%{sysconfdir}/xdg/menus/applications.menu.gnome >From kdelibs.spec file mv $RPM_BUILD_ROOT/etc/xdg/menus/applications.menu \ $RPM_BUILD_ROOT/etc/xdg/menus/applications.menu.kde IMHO I probably think we should also rename these files, it doesn't look like it will cause much pain to maintain from looking at the diff's from debian & suse. Michael Joe > > -- > PGP Key : http://www.marcuscom.com/pgp.asc > > >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?b2203fed0609010632j423e26f9j8b63ba0fd67e41d7>