From owner-freebsd-gnome@FreeBSD.ORG Fri Aug 10 20:00:12 2007 Return-Path: Delivered-To: gnome@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BF34F16A418 for ; Fri, 10 Aug 2007 20:00:12 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id AB55E13C491 for ; Fri, 10 Aug 2007 20:00:12 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.1/8.14.1) with ESMTP id l7AK0C9L032348 for ; Fri, 10 Aug 2007 20:00:12 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.1/8.14.1/Submit) id l7AK0CUO032347; Fri, 10 Aug 2007 20:00:12 GMT (envelope-from gnats) Date: Fri, 10 Aug 2007 20:00:12 GMT Message-Id: <200708102000.l7AK0CUO032347@freefall.freebsd.org> To: gnome@FreeBSD.org From: "Jeremy Messenger" Cc: Subject: Re: ports/115127: [PATCH] x11-toolkits/scintilla: update to 1.74, take maintainership X-BeenThere: freebsd-gnome@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Jeremy Messenger List-Id: GNOME for FreeBSD -- porting and maintaining List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Aug 2007 20:00:12 -0000 The following reply was made to PR ports/115127; it has been noted by GNATS. From: "Jeremy Messenger" To: "Naram Qashat" , bug-followup@freebsd.org Cc: Subject: Re: ports/115127: [PATCH] x11-toolkits/scintilla: update to 1.74, take maintainership Date: Fri, 10 Aug 2007 14:59:09 -0500 On Fri, 10 Aug 2007 14:46:50 -0500, Naram Qashat = wrote: > I figured out what was going on (I was manually doing each file instea= d = > of > just running diff -ruN on both directories), so I'm attaching the = > patch. I > tested it on the current port in /usr/ports and it applied cleanly thi= s > time. A lot better, it applied fine. Thanks! One thing that I noticed you bring the "-Os" back in. You shouldn't. It = = should respect our CXXFLAGS. I will removing it when I commit it. Cheers, Mezz > Thanks, > Naram Qashat > > ----- Original Message ----- > From: "Jeremy Messenger" > To: "Naram Qashat" ; > Sent: Friday, August 10, 2007 2:55 PM > Subject: Re: ports/115127: [PATCH] x11-toolkits/scintilla: update to = > 1.74, > take maintainership > > > On Fri, 10 Aug 2007 12:39:10 -0500, Naram Qashat = > > wrote: > >> This is (hopefully) the last patch I'll need to do to get this commit= ted >> and >> working with the ports tree as best as possible. I took your suggest= ion >> 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/sc= ite >> 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.re= j > =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" >> To: "Naram Qashat" ; >> 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 >>> >>> 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 = am >>> > 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 o= n >> 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 gt= k1 >>> then create ${PREFIX}/include/scintilla/.scintilla-gtk1 and if with = = >>> gtk2 >>> then create ${PREFIX}/include/scintilla/.scintilla-gtk2. The other = >>> ports >>> 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 th= e >>> name >>> of library to libfoo-gtk2.so that way both gtk1 and gtk2 versions ca= n = >>> be >>> install together. There will be no block for any apps to be install.= >>> >>> Also, you can do something like x11-toolkits/scintilla only insta= ll >>> header files if they don't change, then create two new scintilla-gtk= 1 >>> (without change name of file) and scintilla-gtk2 ports. To do this, = you >>> will have to hack in the every ports that depend on scintilla-gtk2 (= for >>> change name of libraries). If you want to do this, don't forget to = >>> tweak >>> 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 = = >>> both >>> scintilla-gtk* depend on scintilla-header. Have scintilla depend on >>> scintilla-gtk1 by default without have to tweak other ports that dep= end >>> 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. >>> >>> >>> 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" >>> > To: ; >>> > Sent: Wednesday, August 08, 2007 9:47 PM >>> > Subject: Re: ports/115127: [PATCH] x11-toolkits/scintilla: update = to >>> > 1.74, >>> > take maintainership >>> > >>> > >>> >> There is a problem with if you switch the default of GTK. It migh= t >> break >>> >> other ports. Althought, some of them might be safe to be remove d= ue >>> 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