From kde-commits Mon Jan 30 22:23:59 2006 From: George Staikos Date: Mon, 30 Jan 2006 22:23:59 +0000 To: kde-commits Subject: Re: KDE/kdelibs Message-Id: <200601301723.59249.staikos () kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=113865987416961 On Monday 30 January 2006 16:07, Maksim Orlovich wrote: > >> > work around some kjs stuff that assumes __APPLE__ == WEBKIT, also fix > >> > definitions for QT_AND_KDECORE_LIBS to get -L and -F > >> > > >> > M +3 -3 cmake/modules/FindKDE4.cmake > >> > M +1 -1 kjs/internal.h > >> > >> A better fix is probably to s/__APPLE__/APPLE_CHANGES/, no? > > > > No, I will clobber those with my next commit again. > > Please don't, I am almost done with doing a proper merge. And most of the > removal of those is broken. I won't any time soon... > For example, do you want us to require a fork > of libPCRE? No. > > The better fix is to > > determine what is specific to webkit (there shouldn't be much) and wrap > > it with something that says so. -- And do it in webkit too. > > Right, that's what APPLE_CHANGES means :-) APPLE_CHANGES makes no sense anymore. Maybe WEBCORE or SAFARI... -- George Staikos KDE Developer http://www.kde.org/ Staikos Computing Services Inc. http://www.staikos.net/