ports/115127: [PATCH] x11-toolkits/scintilla: update to 1.74,
take maintainership
Jeremy Messenger
mezz7 at cox.net
Fri Aug 10 20:00:12 UTC 2007
The following reply was made to PR ports/115127; it has been noted by GNATS.
From: "Jeremy Messenger" <mezz7 at cox.net>
To: "Naram Qashat" <cyberbotx at cyberbotx.com>, bug-followup at 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 <cyberbotx at cyberbotx.co=
m> =
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" <mezz7 at cox.net>
> To: "Naram Qashat" <cyberbotx at cyberbotx.com>; <bug-followup at freebsd.or=
g>
> 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 =
> <cyberbotx at cyberbotx.com>
> 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" <mezz7 at cox.net>
>> To: "Naram Qashat" <cyberbotx at cyberbotx.com>; <bug-followup at freebsd.o=
rg>
>> 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 at 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 =
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.
>>> <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 at cox.net>
>>> > To: <bug-followup at freebsd.org>; <cyberbotx at cyberbotx.com>
>>> > 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 at cox.net - mezz at FreeBSD.org
FreeBSD GNOME Team - FreeBSD Multimedia Hat (ports, not src)
http://www.FreeBSD.org/gnome/ - gnome at FreeBSD.org
http://wiki.freebsd.org/multimedia - multimedia at FreeBSD.org
More information about the freebsd-gnome
mailing list