Re: UPDATE: devel/kdiff3

2021-12-05 Thread Aaron Bieber
Rafael Sadowski writes: > Update kdiff3 to 1.9.4 > > diff --git a/devel/kdiff3/Makefile b/devel/kdiff3/Makefile > index 15e05de6a67..75e710975d0 100644 > --- a/devel/kdiff3/Makefile > +++ b/devel/kdiff3/Makefile > @@ -2,7 +2,7 @@ > > COMMENT =compares a

UPDATE: devel/kdiff3

2021-12-04 Thread Rafael Sadowski
Update kdiff3 to 1.9.4 diff --git a/devel/kdiff3/Makefile b/devel/kdiff3/Makefile index 15e05de6a67..75e710975d0 100644 --- a/devel/kdiff3/Makefile +++ b/devel/kdiff3/Makefile @@ -2,7 +2,7 @@ COMMENT = compares and merges multiple files or directories -DISTNAME = kdiff3-1.9.3

Re: UPDATE: devel/kdiff3

2019-05-14 Thread Klemens Nanni
On Tue, May 14, 2019 at 09:00:57PM +0200, Rafael Sadowski wrote: > Please find below a simple diff to update kdiff3 to 1.8, This update get > rid of Qt3 and switch to the moder KDE framework 5. Looks good. > Very short and little tested, need real world users. Works fine on amd64. OK kn

UPDATE: devel/kdiff3

2019-05-14 Thread Rafael Sadowski
Please find below a simple diff to update kdiff3 to 1.8, This update get rid of Qt3 and switch to the moder KDE framework 5. Very short and little tested, need real world users. Cheers, RS Index: Makefile === RCS file: /cvs/ports

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
# ifdef Q_OS_MAC >>>> if (!fullVersion.isEmpty()) { >>>> >>>> f.- >>> >>> I haven't tested yet, but this seems a much better approach than >>> patching the callers. >> >> Sure, I also think Federico got it right. > > Ok, attached. Ttested with keepassx and a demo for the cups patch removal. > The gtk patch removal still needs testing. Anyone? > > f.- i just applied your patch and lawrence's original kdiff3 submission. kdiff3 works fine.

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
ui18n.so rather than just icui18n) sometime but if anyone wants to beat me to it, be my guest :) On 2012/09/29 23:15, Lawrence Teo wrote: > This diff updates kdiff3 from 0.9.96 to 0.9.97, plus these changes: > > * Fix WANTLIB > * Fix CXXFLAGS > * Update my email addres

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

maintainer update: kdiff3 0.9.96

2011-09-06 Thread Lawrence Teo
This updates kdiff3 to 0.9.96, which fixes a number of bugs. Full changelog at http://kdiff3.sourceforge.net/ChangeLog Tested on i386. Thank you, Lawrence Index: Makefile === RCS file: /cvs/ports/devel/kdiff3/Makefile,v

Re: kdiff3

2011-08-18 Thread Marco Peereboom
in in in! <3 kdiff3 On Thu, Aug 18, 2011 at 10:31:56PM -0400, Lawrence Teo wrote: > On Thu, Aug 18, 2011 at 08:54:12PM +, Stuart Henderson wrote: > > On 2011-08-18, Lawrence Teo wrote: > > > Here's another cleaned up version that removes unneeded dependencies, &g

Re: kdiff3

2011-08-18 Thread Lawrence Teo
add x11/kde to CATEGORIES (keeping devel as well), otherwise > OK with me. Thank you for reviewing. I have added x11/kde to CATEGORIES and kept devel. There are no other changes. Lawrence kdiff3.tar.gz Description: application/tar-gz

Re: kdiff3

2011-08-18 Thread Stuart Henderson
On 2011-08-18, Lawrence Teo wrote: > Here's another cleaned up version that removes unneeded dependencies, > makes WANTLIB pass lib-depends-check, and makes the port obey $PREFIX. please add x11/kde to CATEGORIES (keeping devel as well), otherwise OK with me.

Re: kdiff3

2011-08-18 Thread Marco Peereboom
011 at 10:48:32PM -0500, Marco Peereboom wrote: > > > > On Wed, Aug 17, 2011 at 08:39:27PM -0500, Marco Peereboom wrote: > > > > > I used to use kdiff3 a long time ago and kinda liked it. I wanted to > > > > > give it another go but couldn't find it in ports.

Re: kdiff3

2011-08-18 Thread Lawrence Teo
ereboom wrote: > > > > I used to use kdiff3 a long time ago and kinda liked it. I wanted to > > > > give it another go but couldn't find it in ports. Anyone got one by any > > > > chance? > > > > > > Alright stole a little here and t

Re: kdiff3

2011-08-18 Thread Marco Peereboom
works for me. On Thu, Aug 18, 2011 at 10:57:53AM -0400, Lawrence Teo wrote: > On Wed, Aug 17, 2011 at 10:48:32PM -0500, Marco Peereboom wrote: > > On Wed, Aug 17, 2011 at 08:39:27PM -0500, Marco Peereboom wrote: > > > I used to use kdiff3 a long time ago and kinda like

Re: kdiff3

2011-08-18 Thread Lawrence Teo
On Wed, Aug 17, 2011 at 10:48:32PM -0500, Marco Peereboom wrote: > On Wed, Aug 17, 2011 at 08:39:27PM -0500, Marco Peereboom wrote: > > I used to use kdiff3 a long time ago and kinda liked it. I wanted to > > give it another go but couldn't find it in ports. Anyone got o

Re: kdiff3

2011-08-17 Thread Marco Peereboom
On Wed, Aug 17, 2011 at 08:39:27PM -0500, Marco Peereboom wrote: > I used to use kdiff3 a long time ago and kinda liked it. I wanted to > give it another go but couldn't find it in ports. Anyone got one by any > chance? Alright stole a little here and there and came up with this f

kdiff3

2011-08-17 Thread Marco Peereboom
I used to use kdiff3 a long time ago and kinda liked it. I wanted to give it another go but couldn't find it in ports. Anyone got one by any chance?