Date: Fri, 10 Aug 2007 19:00:12 GMT From: "Jeremy Messenger" <mezz7@cox.net> To: gnome@FreeBSD.org Subject: Re: ports/115127: [PATCH] x11-toolkits/scintilla: update to 1.74, take maintainership Message-ID: <200708101900.l7AJ0CA0029660@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/115127; it has been noted by GNATS. From: "Jeremy Messenger" <mezz7@cox.net> To: "Naram Qashat" <cyberbotx@cyberbotx.com>, bug-followup@freebsd.org Cc: Subject: Re: ports/115127: [PATCH] x11-toolkits/scintilla: update to 1.74, take maintainership Date: Fri, 10 Aug 2007 13:55:08 -0500 On Fri, 10 Aug 2007 12:39:10 -0500, Naram Qashat <cyberbotx@cyberbotx.co= m> = wrote: > This is (hopefully) the last patch I'll need to do to get this committ= ed = > and > working with the ports tree as best as possible. I took your suggesti= on = > to > using the .scintilla-gtk(1|2) file in the include directory, and I = > submitted > a patch to x11-toolkits/gtkscintilla so it'll only be allowed if = > Scintilla > was built with GTK1. I will be submitting a new patch for editors/sci= te > that checks the same thing, but for GTK2 instead. > > The new patch is attached. Can you create a new patch? It doesn't apply clean: =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D Patching file scintilla/files/patch-aa using Plan A... Hunk #1 succeeded at 1 with fuzz 1. Hunk #2 failed at 29. Hunk #3 succeeded at 72 with fuzz 1. 1 out of 3 hunks failed--saving rejects to scintilla/files/patch-aa.rej =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D Cheers, Mezz > Thanks, > Naram Qashat > > ----- Original Message ----- > From: "Jeremy Messenger" <mezz7@cox.net> > To: "Naram Qashat" <cyberbotx@cyberbotx.com>; <bug-followup@freebsd.or= g> > Sent: Thursday, August 09, 2007 12:37 PM > Subject: Re: ports/115127: [PATCH] x11-toolkits/scintilla: update to = > 1.74, > take maintainership > > >> On Thu, 09 Aug 2007 09:04:27 -0500, Naram Qashat = >> <cyberbotx@cyberbotx.com> >> wrote: >> >> > I looked into it, and there's only one port = >> (x11-toolkits/gtkscintilla) >> > that >> > uses scintilla other than SciTE, and it is a GTK1.x wrapper, so I a= m >> > putting >> > the WITH_GTK2 knob back in. I filed a bug report regarding SciTE = >> being >> > unable to compile with GTK1, though, so I'm waiting to here back on= > that. >> > >> > As an aside, what would be the best way for the editors/scite port = to >> > check >> > if x11-toolkits/scintilla was built using GTK1 or GTK2? >> >> There are two different ways. >> >> - Add a touch of an empty file something like if it compiles with gtk= 1 >> then create ${PREFIX}/include/scintilla/.scintilla-gtk1 and if with g= tk2 >> then create ${PREFIX}/include/scintilla/.scintilla-gtk2. The other po= rts >> can check on if .scintilla-gtk(1|2) exists then mark it as IGNORE. >> >> - Create a slave port like x11-toolkits/scintilla-gtk2 and rename the= = >> name >> of library to libfoo-gtk2.so that way both gtk1 and gtk2 versions can= be >> install together. There will be no block for any apps to be install. >> >> Also, you can do something like x11-toolkits/scintilla only instal= l >> header files if they don't change, then create two new scintilla-gtk1= >> (without change name of file) and scintilla-gtk2 ports. To do this, y= ou >> will have to hack in the every ports that depend on scintilla-gtk2 (f= or >> change name of libraries). If you want to do this, don't forget to tw= eak >> the dependencies. >> >> Or you can do something like x11-toolkits/scintilla (meta-port), >> x11-toolkits/scintilla-header (install headers), >> x11-toolkits/scintilla-gtk1 (unchange, has gtk1 libraries) and >> x11-toolkits/scintilla-gtk2 (change name, has gtk2 libraries). Have b= oth >> scintilla-gtk* depend on scintilla-header. Have scintilla depend on >> scintilla-gtk1 by default without have to tweak other ports that depe= nd = >> on >> old x11-toolkits/scintilla. SciTE depends on scintilla-gtk2. You can = = >> check >> on graphics/gimp, gimp-apps and etc for example. >> >> There are different ways, you can play with it and find which is = >> better >> for these ports. >> >> > Here's the updated patch. >> <snip> >> >> I will checking your patch in another email that you have resend and = I = >> can >> commit it in this afternoon. >> >> Cheers, >> Mezz >> >> > Naram Qashat >> > >> > ----- Original Message ----- >> > From: "Jeremy Messenger" <mezz7@cox.net> >> > To: <bug-followup@freebsd.org>; <cyberbotx@cyberbotx.com> >> > Sent: Wednesday, August 08, 2007 9:47 PM >> > Subject: Re: ports/115127: [PATCH] x11-toolkits/scintilla: update t= o >> > 1.74, >> > take maintainership >> > >> > >> >> There is a problem with if you switch the default of GTK. It might= > break >> >> other ports. Althought, some of them might be safe to be remove du= e = >> to >> >> out >> >> of date or too old, so this method is simpler. If you are willing = to = >> do >> >> the more tasks and we shall reward you the maintainership. >> >> >> >> Cheers, >> >> Mezz -- = mezz7@cox.net - mezz@FreeBSD.org FreeBSD GNOME Team - FreeBSD Multimedia Hat (ports, not src) http://www.FreeBSD.org/gnome/ - gnome@FreeBSD.org http://wiki.freebsd.org/multimedia - multimedia@FreeBSD.org
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200708101900.l7AJ0CA0029660>