Re: UPDATE: kdiff3-0.9.97

2012-10-09 Thread Amit Kulkarni
On Tue, Oct 9, 2012 at 3:56 AM, Federico Schwindt wrote: >> [..] >> I tested it and then removed the diff from my ports tree... I need >> this patch to go in because kdelibs 4.9.2 is complaining about the >> same thing i.e Cannot load library icui18n >> >> will somebody commit this after approval?

Re: UPDATE: kdiff3-0.9.97

2012-10-09 Thread Federico Schwindt
On Tue, Oct 9, 2012 at 2:16 PM, Marc Espie wrote: > On Tue, Oct 09, 2012 at 02:01:26PM +0100, Federico Schwindt wrote: >> I sent this patch quickly before I left for work so I didn't have time >> to write anything but I'd like to make my stance clear. >> >> I rewrote this patch because espie doesn

Re: UPDATE: kdiff3-0.9.97

2012-10-09 Thread Marc Espie
On Tue, Oct 09, 2012 at 02:01:26PM +0100, Federico Schwindt wrote: > I sent this patch quickly before I left for work so I didn't have time > to write anything but I'd like to make my stance clear. > > I rewrote this patch because espie doesn't believe the original > approach was correct and he is

Re: UPDATE: kdiff3-0.9.97

2012-10-09 Thread Federico Schwindt
On Tue, Oct 9, 2012 at 11:46 AM, Stuart Henderson wrote: > On 2012/10/09 12:10, Marc Espie wrote: >> No, because qt4 won't be really tied to the icu4c version. >> >> Consider: >> >> install icu4c with shared lib .so.N.0 >> install qt4 compiled for icu4 shared lib .so.N.0 >> >> update icu4 to share

Re: UPDATE: kdiff3-0.9.97

2012-10-09 Thread Stuart Henderson
On 2012/10/09 12:10, Marc Espie wrote: > No, because qt4 won't be really tied to the icu4c version. > > Consider: > > install icu4c with shared lib .so.N.0 > install qt4 compiled for icu4 shared lib .so.N.0 > > update icu4 to shared libs .so.N+1.0 which is not guaranteed to be compatible > with

Re: UPDATE: kdiff3-0.9.97

2012-10-09 Thread Marc Espie
On Tue, Oct 09, 2012 at 12:14:58PM +0200, David Coppa wrote: > On Tue, Oct 9, 2012 at 12:10 PM, Marc Espie wrote: > > On Tue, Oct 09, 2012 at 10:45:25AM +0100, Stuart Henderson wrote: > >> On 2012/10/09 09:56, Federico Schwindt wrote: > >> > > [..] > >> > > I tested it and then removed the diff fr

Re: UPDATE: kdiff3-0.9.97

2012-10-09 Thread David Coppa
On Tue, Oct 9, 2012 at 12:10 PM, Marc Espie wrote: > On Tue, Oct 09, 2012 at 10:45:25AM +0100, Stuart Henderson wrote: >> On 2012/10/09 09:56, Federico Schwindt wrote: >> > > [..] >> > > I tested it and then removed the diff from my ports tree... I need >> > > this patch to go in because kdelibs 4

Re: UPDATE: kdiff3-0.9.97

2012-10-09 Thread Marc Espie
On Tue, Oct 09, 2012 at 10:45:25AM +0100, Stuart Henderson wrote: > On 2012/10/09 09:56, Federico Schwindt wrote: > > > [..] > > > I tested it and then removed the diff from my ports tree... I need > > > this patch to go in because kdelibs 4.9.2 is complaining about the > > > same thing i.e Cannot

Re: UPDATE: kdiff3-0.9.97

2012-10-09 Thread Stuart Henderson
On 2012/10/09 09:56, Federico Schwindt wrote: > > [..] > > I tested it and then removed the diff from my ports tree... I need > > this patch to go in because kdelibs 4.9.2 is complaining about the > > same thing i.e Cannot load library icui18n > > > > will somebody commit this after approval? marc?

Re: UPDATE: kdiff3-0.9.97

2012-10-09 Thread David Coppa
On Tue, Oct 9, 2012 at 10:56 AM, Federico Schwindt wrote: >> [..] >> I tested it and then removed the diff from my ports tree... I need >> this patch to go in because kdelibs 4.9.2 is complaining about the >> same thing i.e Cannot load library icui18n >> >> will somebody commit this after approval

Re: UPDATE: kdiff3-0.9.97

2012-10-09 Thread Federico Schwindt
> [..] > I tested it and then removed the diff from my ports tree... I need > this patch to go in because kdelibs 4.9.2 is complaining about the > same thing i.e Cannot load library icui18n > > will somebody commit this after approval? marc? new (untested yet) diff attached. this should be OK with

Re: UPDATE: kdiff3-0.9.97

2012-10-08 Thread Amit Kulkarni
On Mon, Oct 1, 2012 at 5:28 PM, Federico Schwindt wrote: > On Mon, Oct 1, 2012 at 4:02 PM, David Coppa wrote: >> On Mon, Oct 1, 2012 at 4:59 PM, Stuart Henderson >> wrote: >>> On 2012/10/01 15:08, Federico Schwindt wrote: > The diff below should do the trick (not tested, qt4 is such a beas

Re: qt4 and dlopen'ed libraries (was Re: UPDATE: kdiff3-0.9.97)

2012-10-08 Thread Marc Espie
On Mon, Oct 08, 2012 at 10:41:03AM +0200, David Coppa wrote: > On Tue, Oct 2, 2012 at 12:28 AM, Federico Schwindt wrote: > > On Mon, Oct 1, 2012 at 4:02 PM, David Coppa wrote: > >> On Mon, Oct 1, 2012 at 4:59 PM, Stuart Henderson > >> wrote: > >>> On 2012/10/01 15:08, Federico Schwindt wrote: >

qt4 and dlopen'ed libraries (was Re: UPDATE: kdiff3-0.9.97)

2012-10-08 Thread David Coppa
On Tue, Oct 2, 2012 at 12:28 AM, Federico Schwindt wrote: > On Mon, Oct 1, 2012 at 4:02 PM, David Coppa wrote: >> On Mon, Oct 1, 2012 at 4:59 PM, Stuart Henderson >> wrote: >>> On 2012/10/01 15:08, Federico Schwindt wrote: > The diff below should do the trick (not tested, qt4 is such a bea

Re: UPDATE: kdiff3-0.9.97

2012-10-01 Thread Amit Kulkarni
On Mon, Oct 1, 2012 at 5:28 PM, Federico Schwindt wrote: > On Mon, Oct 1, 2012 at 4:02 PM, David Coppa wrote: >> On Mon, Oct 1, 2012 at 4:59 PM, Stuart Henderson >> wrote: >>> On 2012/10/01 15:08, Federico Schwindt wrote: > The diff below should do the trick (not tested, qt4 is such a beas

Re: UPDATE: kdiff3-0.9.97

2012-10-01 Thread Federico Schwindt
On Mon, Oct 1, 2012 at 4:02 PM, David Coppa wrote: > On Mon, Oct 1, 2012 at 4:59 PM, Stuart Henderson wrote: >> On 2012/10/01 15:08, Federico Schwindt wrote: >>> > The diff below should do the trick (not tested, qt4 is such a beast to >>> > build)... >>> > >>> > Grepping for "QLibrary ", finds o

Re: UPDATE: kdiff3-0.9.97

2012-10-01 Thread David Coppa
On Mon, Oct 1, 2012 at 4:59 PM, Stuart Henderson wrote: > On 2012/10/01 15:08, Federico Schwindt wrote: >> > The diff below should do the trick (not tested, qt4 is such a beast to >> > build)... >> > >> > Grepping for "QLibrary ", finds other occurrences that maybe we should >> > also fix. >> >>

Re: UPDATE: kdiff3-0.9.97

2012-10-01 Thread Stuart Henderson
On 2012/10/01 15:08, Federico Schwindt wrote: > > The diff below should do the trick (not tested, qt4 is such a beast to > > build)... > > > > Grepping for "QLibrary ", finds other occurrences that maybe we should also > > fix. > > I'm not sure about this. It seems to me that this: > > >> dlope

Re: UPDATE: kdiff3-0.9.97

2012-10-01 Thread Federico Schwindt
On Mon, Oct 1, 2012 at 12:18 PM, David Coppa wrote: > On Mon, 01 Oct 2012, Stuart Henderson wrote: > >> OK for the update. >> >> Looks like there's a slight problem with qt4 though (noticed when testing >> this, but it affects other things), this is printed on the console at >> startup: >> >> Una

Re: UPDATE: kdiff3-0.9.97

2012-10-01 Thread David Coppa
On Mon, 01 Oct 2012, Stuart Henderson wrote: > OK for the update. > > Looks like there's a slight problem with qt4 though (noticed when testing > this, but it affects other things), this is printed on the console at startup: > > Unable to load library icui18n "Cannot load library icui18n: (File

Re: UPDATE: kdiff3-0.9.97

2012-10-01 Thread Stuart Henderson
OK for the update. Looks like there's a slight problem with qt4 though (noticed when testing this, but it affects other things), this is printed on the console at startup: Unable to load library icui18n "Cannot load library icui18n: (File not found)" Bit more with LD_DEBUG set, ... entry point:

UPDATE: kdiff3-0.9.97

2012-09-29 Thread Lawrence Teo
This diff updates kdiff3 from 0.9.96 to 0.9.97, plus these changes: * Fix WANTLIB * Fix CXXFLAGS * Update my email address A few highlights of kdiff3 0.9.97: * Memory usage optimized for comparison of large directories. * In overview for two way diff show if only one side contains text