Author: ranger Date: Wed Nov 7 05:44:50 2007 New Revision: 1051 URL: http://svn.finkproject.org/websvn/listing.php?sc=1&rev=1051&repname=user%3a+ranger Log: fixed kdelibs kuniqueapplications
Modified: trunk/experimental/10.4/main/finkinfo/kde/kdelibs3-unified.info trunk/experimental/10.4/main/finkinfo/kde/kdelibs3-unified.patch trunk/experimental/common/main/finkinfo/kde/kdelibs3-unified.info trunk/experimental/common/main/finkinfo/kde/kdelibs3-unified.patch Modified: trunk/experimental/10.4/main/finkinfo/kde/kdelibs3-unified.info URL: http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/kde/kdelibs3-unified.info&rev=1051&repname=user%3a+ranger ============================================================================== --- trunk/experimental/10.4/main/finkinfo/kde/kdelibs3-unified.info (original) +++ trunk/experimental/10.4/main/finkinfo/kde/kdelibs3-unified.info Wed Nov 7 05:44:50 2007 @@ -1,3 +1,4 @@ +Info3: << Package: kdelibs3-unified Version: 3.5.8 Revision: 1023 @@ -29,6 +30,7 @@ expat1, fink (>= 0.26.0-1), flex-devel, + # fontconfig2-dev (>= 2.4.1-1), freetype219, libgettext3-dev, gettext-tools, @@ -166,7 +168,7 @@ touch %i/share/doc/installed-packages/kdelibs3-ssl-dev << DocFiles: COPYING COPYING.LIB INSTALL -RuntimeVars: KDEDIR: %p +RuntimeVars: KDEDIR: %p SplitOff: << Package: %N-shlibs Description: KDE - essential shared libraries @@ -908,18 +910,18 @@ << PostInstScript: << - chmod u+s %p/bin/kgrantpty %p/bin/kpac_dhcp_helper %p/bin/fileshareset - if [ -e "%p/etc/xdg/menus/applications.menu" ] && [ ! -L "%p/etc/xdg/menus/applications.menu" ]; then - mv "%p/etc/xdg/menus/applications.menu" "%p/etc/xdg/menus/applications.menu.bak" - fi - update-alternatives --install "%p/etc/xdg/menus/applications.menu" "applications.menu" "%p/etc/xdg/menus/kde-applications.menu" 10 - %p/bin/kde-update-caches.sh >/dev/null 2>&1 || : +chmod u+s %p/bin/kgrantpty %p/bin/kpac_dhcp_helper %p/bin/fileshareset +if [ -e "%p/etc/xdg/menus/applications.menu" ] && [ ! -L "%p/etc/xdg/menus/applications.menu" ]; then + mv "%p/etc/xdg/menus/applications.menu" "%p/etc/xdg/menus/applications.menu.bak" +fi +update-alternatives --install "%p/etc/xdg/menus/applications.menu" "applications.menu" "%p/etc/xdg/menus/kde-applications.menu" 10 +%p/bin/kde-update-caches.sh >/dev/null 2>&1 || : << PostRmScript: << - if [ -e "%p/etc/xdg/menus/applications.menu" ] && [ ! -L "%p/etc/xdg/menus/applications.menu" ]; then - mv "%p/etc/xdg/menus/applications.menu" "%p/etc/xdg/menus/applications.menu.bak" - fi - update-alternatives --remove "applications.menu" "%p/etc/xdg/menus/kde-applications.menu" +if [ -e "%p/etc/xdg/menus/applications.menu" ] && [ ! -L "%p/etc/xdg/menus/applications.menu" ]; then + mv "%p/etc/xdg/menus/applications.menu" "%p/etc/xdg/menus/applications.menu.bak" +fi +update-alternatives --remove "applications.menu" "%p/etc/xdg/menus/kde-applications.menu" << DescDetail: << @@ -985,4 +987,5 @@ sudo apt-get remove kdenetwork3-base << - +<< + Modified: trunk/experimental/10.4/main/finkinfo/kde/kdelibs3-unified.patch URL: http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/kde/kdelibs3-unified.patch&rev=1051&repname=user%3a+ranger ============================================================================== --- trunk/experimental/10.4/main/finkinfo/kde/kdelibs3-unified.patch (original) +++ trunk/experimental/10.4/main/finkinfo/kde/kdelibs3-unified.patch Wed Nov 7 05:44:50 2007 @@ -1,6 +1,6 @@ --- kdelibs-3.5.8/darwin/kcmartsrc 1969-12-31 19:00:00.000000000 -0500 -+++ kdelibs-3.5.8-new/darwin/kcmartsrc 2007-10-29 16:05:39.000000000 -0400 ++++ kdelibs-3.5.8-new/darwin/kcmartsrc 2007-11-06 23:28:11.000000000 -0500 @@ -0,0 +1,9 @@ +[Arts] +Arguments=\s-F 10 -S 4096 -a esd -d -b 16 -s 60 -m artsmessage -c drkonqi -l 3 -f @@ -12,7 +12,7 @@ +StartServer=false +SuspendTime=60 --- kdelibs-3.5.8/darwin/kdeglobals 1969-12-31 19:00:00.000000000 -0500 -+++ kdelibs-3.5.8-new/darwin/kdeglobals 2007-10-29 16:05:39.000000000 -0400 ++++ kdelibs-3.5.8-new/darwin/kdeglobals 2007-11-06 23:28:11.000000000 -0500 @@ -0,0 +1,129 @@ +[$Version] +update_info=kaccel.upd:kde3.3/r1,kded.upd:kde3.0,klippershortcuts.upd:04112002,kwin.upd:kde3.2Xinerama,socks.upd:kde3.0/r1 @@ -144,7 +144,7 @@ +[WM] +activeFont=Baghdad,12,-1,5,50,0,0,0,0,0 --- kdelibs-3.5.8/darwin/knotifyrc 1969-12-31 19:00:00.000000000 -0500 -+++ kdelibs-3.5.8-new/darwin/knotifyrc 2007-10-29 16:05:39.000000000 -0400 ++++ kdelibs-3.5.8-new/darwin/knotifyrc 2007-11-06 23:28:11.000000000 -0500 @@ -0,0 +1,5 @@ +[Misc] +External [EMAIL PROTECTED]@/bin/mplayer @@ -152,7 +152,7 @@ +Use external player=false +Volume=100 --- kdelibs-3.5.8/darwin/konsolerc 1969-12-31 19:00:00.000000000 -0500 -+++ kdelibs-3.5.8-new/darwin/konsolerc 2007-10-29 16:05:39.000000000 -0400 ++++ kdelibs-3.5.8-new/darwin/konsolerc 2007-11-06 23:28:11.000000000 -0500 @@ -0,0 +1,19 @@ +[Desktop Entry] +ActiveSession=0 @@ -174,7 +174,7 @@ +scrollbar=2 +tabbar=2 --- kdelibs-3.5.8/dcop/dcopc.c 2006-05-22 14:14:21.000000000 -0400 -+++ kdelibs-3.5.8-new/dcop/dcopc.c 2007-10-29 16:12:43.000000000 -0400 ++++ kdelibs-3.5.8-new/dcop/dcopc.c 2007-11-06 23:28:11.000000000 -0500 @@ -674,6 +674,9 @@ while((i = strchr(displayName, ':')) != NULL) *i = '_'; @@ -186,7 +186,7 @@ if (NULL == dcopServer) { --- kdelibs-3.5.8/dcop/dcopclient.cpp 2007-10-08 05:52:08.000000000 -0400 -+++ kdelibs-3.5.8-new/dcop/dcopclient.cpp 2007-10-29 16:14:32.000000000 -0400 ++++ kdelibs-3.5.8-new/dcop/dcopclient.cpp 2007-11-06 23:28:11.000000000 -0500 @@ -270,6 +270,8 @@ { while( (i = disp.find(KPATH_SEPARATOR)) >= 0) @@ -197,7 +197,7 @@ fName += "/.DCOPserver_"; --- kdelibs-3.5.8/dcop/dcopserver_shutdown.c 2005-10-10 11:06:13.000000000 -0400 -+++ kdelibs-3.5.8-new/dcop/dcopserver_shutdown.c 2007-10-29 16:14:15.000000000 -0400 ++++ kdelibs-3.5.8-new/dcop/dcopserver_shutdown.c 2007-11-06 23:28:11.000000000 -0500 @@ -118,6 +118,8 @@ strncat(dcop_file_old,display, n); while((i = strchr(display, ':'))) @@ -208,7 +208,7 @@ free(display); --- kdelibs-3.5.8/kdecore/Makefile.am 2006-10-01 13:33:38.000000000 -0400 -+++ kdelibs-3.5.8-new/kdecore/Makefile.am 2007-10-29 16:05:39.000000000 -0400 ++++ kdelibs-3.5.8-new/kdecore/Makefile.am 2007-11-06 23:28:11.000000000 -0500 @@ -24,7 +24,7 @@ if include_SVGICONS @@ -228,7 +228,7 @@ libkdecore_la_NMCHECKWEAK = $(srcdir)/libkdecore_weak.nmcheck $(srcdir)/libqt-mt_weak.nmcheck \ $(top_srcdir)/dcop/libDCOP_weak.nmcheck $(top_srcdir)/kdecore/standard_weak.nmcheck --- kdelibs-3.5.8/kdecore/kglobalsettings.cpp 2005-10-10 11:06:03.000000000 -0400 -+++ kdelibs-3.5.8-new/kdecore/kglobalsettings.cpp 2007-10-29 16:05:39.000000000 -0400 ++++ kdelibs-3.5.8-new/kdecore/kglobalsettings.cpp 2007-11-06 23:28:11.000000000 -0500 @@ -491,7 +491,7 @@ s_desktopPath->append('/'); @@ -239,7 +239,7 @@ *s_trashPath = QDir::cleanDirPath( *s_trashPath ); if ( !s_trashPath->endsWith("/") ) --- kdelibs-3.5.8/kdecore/ksocks.cpp 2005-10-10 11:06:03.000000000 -0400 -+++ kdelibs-3.5.8-new/kdecore/ksocks.cpp 2007-10-29 16:05:39.000000000 -0400 ++++ kdelibs-3.5.8-new/kdecore/ksocks.cpp 2007-11-06 23:28:11.000000000 -0500 @@ -480,7 +480,7 @@ ksocklen_t addrlen) { if (_useSocks && F_connect) @@ -311,7 +311,7 @@ --- kdelibs-3.5.8/kdecore/kstandarddirs.cpp 2007-01-15 06:34:17.000000000 -0500 -+++ kdelibs-3.5.8-new/kdecore/kstandarddirs.cpp 2007-10-29 16:05:39.000000000 -0400 ++++ kdelibs-3.5.8-new/kdecore/kstandarddirs.cpp 2007-11-06 23:28:11.000000000 -0500 @@ -1021,7 +1021,7 @@ if (!strcmp(type, "data")) return "share/apps/"; @@ -321,8 +321,166 @@ if (!strcmp(type, "icon")) return "share/icons/"; if (!strcmp(type, "config")) +--- kdelibs-3.5.8/kdecore/kuniqueapplication.cpp 2005-11-08 17:39:22.000000000 -0500 ++++ kdelibs-3.5.8-new/kdecore/kuniqueapplication.cpp 2007-11-06 23:28:33.000000000 -0500 +@@ -59,6 +59,10 @@ + # endif + #endif + ++#ifdef __APPLE__ ++#include <crt_externs.h> ++#endif ++ + bool KUniqueApplication::s_nofork = false; + bool KUniqueApplication::s_multipleInstances = false; + bool KUniqueApplication::s_uniqueTestDone = false; +@@ -123,7 +127,7 @@ + startKdeinit(); + if(dcopClient()->registerAs(appName, false).isEmpty()) { + kdError() << "KUniqueApplication: Can't setup DCOP communication." << endl; +- ::exit(255); ++ ::_exit(255); + } + } + #endif +@@ -131,19 +135,52 @@ + // We'll call newInstance in the constructor. Do nothing here. + return true; + } ++ ++#ifdef Q_OS_DARWIN ++ else { ++ // we need to reexec ourselves because of stupid OSX crap crappity crap ++ int argc = *_NSGetArgc(); ++ char ** argv = *_NSGetArgv(); ++ char * newargv[argc+2]; ++ ++ for (int i = 0; i < argc; i++) { ++ newargv[i] = argv[i]; ++ } ++ newargv[argc] = "--nofork"; ++ newargv[argc+1] = NULL; ++ ++ int fork_result = fork(); ++ switch(fork_result) { ++ case -1: ++ kdError() << "KUniqueAPplication: Mac OS X workaround fork() failed!" << endl; ++ ::_exit(255); ++ break; ++ case 0: ++ // Child ++ execvp(argv[0], newargv); ++ break; ++ default: ++ // Parent ++ _exit(0); ++ break; ++ } ++ } ++#endif ++ + DCOPClient *dc; + int fd[2]; + signed char result; + if (0 > pipe(fd)) + { + kdError() << "KUniqueApplication: pipe() failed!" << endl; +- ::exit(255); ++ ::_exit(255); + } ++ + int fork_result = fork(); + switch(fork_result) { + case -1: + kdError() << "KUniqueApplication: fork() failed!" << endl; +- ::exit(255); ++ ::_exit(255); + break; + case 0: + // Child +@@ -161,7 +198,7 @@ + kdError() << "KUniqueApplication: Can't determine DISPLAY. Aborting." << endl; + result = -1; // Error + ::write(fd[1], &result, 1); +- ::exit(255); ++ ::_exit(255); + } + + // Try to launch kdeinit. +@@ -173,7 +210,7 @@ + result = -1; + delete dc; // Clean up DCOP commmunication + ::write(fd[1], &result, 1); +- ::exit(255); ++ ::_exit(255); + } + } + if (regName != appName) +@@ -247,25 +284,25 @@ + if (n == 0) + { + kdError() << "KUniqueApplication: Pipe closed unexpectedly." << endl; +- ::exit(255); ++ ::_exit(255); + } + if (errno != EINTR) + { + kdError() << "KUniqueApplication: Error reading from pipe." << endl; +- ::exit(255); ++ ::_exit(255); + } + } + ::close(fd[0]); + + if (result != 0) +- ::exit(result); // Error occurred in child. ++ ::_exit(result); // Error occurred in child. + + dc = new DCOPClient(); + if (!dc->attach()) + { + kdError() << "KUniqueApplication: Parent process can't attach to DCOP." << endl; + delete dc; // Clean up DCOP commmunication +- ::exit(255); ++ ::_exit(255); + } + if (!dc->isApplicationRegistered(appName)) { + kdError() << "KUniqueApplication: Registering failed!" << endl; +@@ -294,20 +331,20 @@ + { + kdError() << "Communication problem with " << KCmdLineArgs::about->appName() << ", it probably crashed." << endl; + delete dc; // Clean up DCOP commmunication +- ::exit(255); ++ ::_exit(255); + } + dc->setPriorityCall(false); + if (replyType != "int") + { + kdError() << "KUniqueApplication: DCOP communication error!" << endl; + delete dc; // Clean up DCOP commmunication +- ::exit(255); ++ ::_exit(255); + } + QDataStream rs(reply, IO_ReadOnly); + int exitCode; + rs >> exitCode; + delete dc; // Clean up DCOP commmunication +- ::exit(exitCode); ++ ::_exit(exitCode); + break; + } + return false; // make insure++ happy +@@ -361,7 +398,7 @@ + } + if( !start()) + // Already running +- ::exit( 0 ); ++ ::_exit( 0 ); + return inst; + } + --- kdelibs-3.5.8/kdecore/network/ksocketdevice.cpp 2007-01-15 06:34:17.000000000 -0500 -+++ kdelibs-3.5.8-new/kdecore/network/ksocketdevice.cpp 2007-10-29 16:05:39.000000000 -0400 ++++ kdelibs-3.5.8-new/kdecore/network/ksocketdevice.cpp 2007-11-06 23:28:11.000000000 -0500 @@ -316,7 +316,7 @@ } @@ -360,7 +518,7 @@ peerAddress.setLength(len = 32); // arbitrary value if (kde_getpeername(m_sockfd, peerAddress.address(), &len) == -1) --- kdelibs-3.5.8/kdecore/network/syssocket.h 2005-09-10 04:27:10.000000000 -0400 -+++ kdelibs-3.5.8-new/kdecore/network/syssocket.h 2007-10-29 16:05:39.000000000 -0400 ++++ kdelibs-3.5.8-new/kdecore/network/syssocket.h 2007-11-06 23:28:11.000000000 -0500 @@ -53,7 +53,7 @@ } @@ -401,7 +559,7 @@ return ::getsockname(fd, sa, len); } --- kdelibs-3.5.8/kded/Makefile.am 2005-10-10 11:06:29.000000000 -0400 -+++ kdelibs-3.5.8-new/kded/Makefile.am 2007-10-29 16:05:39.000000000 -0400 ++++ kdelibs-3.5.8-new/kded/Makefile.am 2007-11-06 23:28:11.000000000 -0500 @@ -58,7 +58,10 @@ servicetype_DATA = kdedmodule.desktop servicetypedir = $(kde_servicetypesdir) @@ -415,7 +573,7 @@ update_DATA = kded.upd updatedir = $(kde_datadir)/kconf_update --- kdelibs-3.5.8/kded/kbuildsycoca.cpp 2007-05-14 03:52:43.000000000 -0400 -+++ kdelibs-3.5.8-new/kded/kbuildsycoca.cpp 2007-10-29 16:05:40.000000000 -0400 ++++ kdelibs-3.5.8-new/kded/kbuildsycoca.cpp 2007-11-06 23:28:11.000000000 -0500 @@ -379,7 +379,11 @@ connect(g_vfolder, SIGNAL(newService(const QString &, KService **)), this, SLOT(slotCreateEntry(const QString &, KService **))); @@ -430,7 +588,7 @@ KServiceGroup *entry = g_bsgf->addNew("/", kdeMenu->directoryFile, 0, false); entry->setLayoutInfo(kdeMenu->layoutList); --- kdelibs-3.5.8/kdeprint/configure.in.in 2005-09-10 04:27:43.000000000 -0400 -+++ kdelibs-3.5.8-new/kdeprint/configure.in.in 2007-10-29 16:05:40.000000000 -0400 ++++ kdelibs-3.5.8-new/kdeprint/configure.in.in 2007-11-06 23:28:11.000000000 -0500 @@ -80,7 +80,7 @@ dnl check if CUPS is at least 1.1.20 @@ -441,7 +599,7 @@ AC_DEFINE(HAVE_CUPS_NO_PWD_CACHE, 1, CUPS doesn't have password caching) fi --- kdelibs-3.5.8/kdeprint/cups/Makefile.am 2006-10-02 06:46:55.000000000 -0400 -+++ kdelibs-3.5.8-new/kdeprint/cups/Makefile.am 2007-10-29 16:05:40.000000000 -0400 ++++ kdelibs-3.5.8-new/kdeprint/cups/Makefile.am 2007-11-06 23:28:11.000000000 -0500 @@ -14,8 +14,8 @@ imagepreview.cpp imageposition.cpp kpimagepage.cpp \ kptextpage.cpp kphpgl2page.cpp cupsaddsmb2.cpp kmwother.cpp ippreportdlg.cpp \ @@ -454,7 +612,7 @@ noinst_HEADERS = cupsinfos.h ipprequest.h kmcupsjobmanager.h kmcupsmanager.h kmcupsuimanager.h \ --- kdelibs-3.5.8/kdeprint/cups/cupsdconf2/Makefile.am 2005-09-10 04:27:41.000000000 -0400 -+++ kdelibs-3.5.8-new/kdeprint/cups/cupsdconf2/Makefile.am 2007-10-29 16:05:40.000000000 -0400 ++++ kdelibs-3.5.8-new/kdeprint/cups/cupsdconf2/Makefile.am 2007-11-06 23:28:11.000000000 -0500 @@ -14,8 +14,8 @@ locationdialog.cpp addressdialog.cpp cups-util.c \ qdirmultilineedit.cpp sizewidget.cpp main.cpp @@ -467,7 +625,7 @@ noinst_HEADERS = cupsdconf.h cupsdpage.h cupsddialog.h cupsdcomment.h cupsdsplash.h \ cupsdserverpage.h cupsdlogpage.h cupsdjobspage.h cupsdfilterpage.h \ --- kdelibs-3.5.8/kdeui/Makefile.am 2007-10-08 05:52:12.000000000 -0400 -+++ kdelibs-3.5.8-new/kdeui/Makefile.am 2007-10-29 16:05:40.000000000 -0400 ++++ kdelibs-3.5.8-new/kdeui/Makefile.am 2007-11-06 23:28:11.000000000 -0500 @@ -27,10 +27,10 @@ AM_LDFLAGS = $(LDFLAGS_AS_NEEDED) $(LDFLAGS_NEW_DTAGS) @@ -482,7 +640,7 @@ libkspell_la_SOURCES = dummy.cpp --- kdelibs-3.5.8/kimgio/Makefile.am 2005-09-10 04:26:42.000000000 -0400 -+++ kdelibs-3.5.8-new/kimgio/Makefile.am 2007-10-29 16:05:41.000000000 -0400 ++++ kdelibs-3.5.8-new/kimgio/Makefile.am 2007-11-06 23:28:11.000000000 -0500 @@ -21,7 +21,7 @@ kimg_pcx.la kimg_tga.la kimg_rgb.la kimg_xcf.la kimg_dds.la $(KIMGIO_EXR_MODULES) \ kimg_psd.la kimg_hdr.la @@ -493,7 +651,7 @@ kimg_tiff_la_SOURCES = tiffr.cpp kimg_tiff_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries) --- kdelibs-3.5.8/kinit/Makefile.am 2007-10-08 05:52:03.000000000 -0400 -+++ kdelibs-3.5.8-new/kinit/Makefile.am 2007-10-29 16:05:41.000000000 -0400 ++++ kdelibs-3.5.8-new/kinit/Makefile.am 2007-11-06 23:28:11.000000000 -0500 @@ -15,7 +15,7 @@ # the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, # Boston, MA 02110-1301, USA. @@ -503,8 +661,22 @@ SUBDIRS = . tests +--- kdelibs-3.5.8/kinit/kinit.cpp 2007-10-08 05:52:03.000000000 -0400 ++++ kdelibs-3.5.8-new/kinit/kinit.cpp 2007-11-06 23:28:11.000000000 -0500 +@@ -593,6 +593,11 @@ + if ( getenv("KDE_IS_PRELINKED") && !execpath.isEmpty() && !launcher) + libpath.truncate(0); + ++#ifdef Q_OS_DARWIN ++ if (!execpath.isEmpty()) ++ libpath.truncate(0); ++#endif ++ + if ( !libpath.isEmpty() ) + { + d.handle = lt_dlopen( QFile::encodeName(libpath) ); --- kdelibs-3.5.8/kinit/start_kdeinit_wrapper.c 2007-10-08 05:52:03.000000000 -0400 -+++ kdelibs-3.5.8-new/kinit/start_kdeinit_wrapper.c 2007-10-29 16:05:41.000000000 -0400 ++++ kdelibs-3.5.8-new/kinit/start_kdeinit_wrapper.c 2007-11-06 23:28:11.000000000 -0500 @@ -50,9 +50,9 @@ close( 0 ); /* stdin */ dup2( pipes[ 0 ], 0 ); @@ -532,7 +704,7 @@ } #endif --- kdelibs-3.5.8/kio/kssl/kopenssl.cc 2006-07-22 04:16:39.000000000 -0400 -+++ kdelibs-3.5.8-new/kio/kssl/kopenssl.cc 2007-10-29 16:05:41.000000000 -0400 ++++ kdelibs-3.5.8-new/kio/kssl/kopenssl.cc 2007-11-06 23:28:11.000000000 -0500 @@ -323,6 +323,7 @@ #elif defined(_AIX) << "libssl.a(libssl.so.0)" @@ -550,7 +722,7 @@ << "libcrypto.0.9.dylib" #else --- kdelibs-3.5.8/kio/misc/kpac/Makefile.am 2005-09-10 04:26:47.000000000 -0400 -+++ kdelibs-3.5.8-new/kio/misc/kpac/Makefile.am 2007-10-29 16:05:41.000000000 -0400 ++++ kdelibs-3.5.8-new/kio/misc/kpac/Makefile.am 2007-11-06 23:28:11.000000000 -0500 @@ -10,7 +10,7 @@ kded_proxyscout_la_SOURCES = proxyscout.skel proxyscout.cpp script.cpp \ downloader.cpp discovery.cpp @@ -561,7 +733,7 @@ kpac_dhcp_helper_SOURCES = kpac_dhcp_helper.c kpac_dhcp_helper_CFLAGS = $(KDE_USE_FPIE) --- kdelibs-3.5.8/kioslave/http/http.cc 2007-10-08 05:52:02.000000000 -0400 -+++ kdelibs-3.5.8-new/kioslave/http/http.cc 2007-10-29 16:05:41.000000000 -0400 ++++ kdelibs-3.5.8-new/kioslave/http/http.cc 2007-11-06 23:28:11.000000000 -0500 @@ -3409,10 +3409,6 @@ } while (!m_bEOF && (len || noHeader) && (headerSize < maxHeaderSize) && (gets(buffer, sizeof(buffer)-1))); Modified: trunk/experimental/common/main/finkinfo/kde/kdelibs3-unified.info URL: http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/kde/kdelibs3-unified.info&rev=1051&repname=user%3a+ranger ============================================================================== --- trunk/experimental/common/main/finkinfo/kde/kdelibs3-unified.info (original) +++ trunk/experimental/common/main/finkinfo/kde/kdelibs3-unified.info Wed Nov 7 05:44:50 2007 @@ -1,3 +1,4 @@ +Info3: << Package: kdelibs3-unified Version: 3.5.8 Revision: 1023 @@ -20,6 +21,7 @@ expat1, fink (>= 0.26.0-1), flex-devel, +# fontconfig2-dev (>= 2.4.1-1), freetype219, libgettext3-dev, gettext-tools, @@ -72,7 +74,7 @@ ktts (<< 3.5.0-1) << Recommends: mplayer -GCC: 3.3 +GCC: 4.0 CustomMirror: RangerMirror Source: mirror:kde:stable/%v/src/kdelibs-%v.tar.bz2 @@ -408,3 +410,4 @@ kspell (spelling checker), jscript (javascript), kab (addressbook), and kimgio (image manipulation). << +<< Modified: trunk/experimental/common/main/finkinfo/kde/kdelibs3-unified.patch URL: http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/kde/kdelibs3-unified.patch&rev=1051&repname=user%3a+ranger ============================================================================== --- trunk/experimental/common/main/finkinfo/kde/kdelibs3-unified.patch (original) +++ trunk/experimental/common/main/finkinfo/kde/kdelibs3-unified.patch Wed Nov 7 05:44:50 2007 @@ -1,6 +1,6 @@ diff -uNr kdelibs-3.5.8/darwin/kcmartsrc kdelibs-3.5.8-new/darwin/kcmartsrc --- kdelibs-3.5.8/darwin/kcmartsrc 1969-12-31 19:00:00.000000000 -0500 -+++ kdelibs-3.5.8-new/darwin/kcmartsrc 2007-10-29 16:05:39.000000000 -0400 ++++ kdelibs-3.5.8-new/darwin/kcmartsrc 2007-11-06 23:28:11.000000000 -0500 @@ -0,0 +1,9 @@ +[Arts] +Arguments=\s-F 10 -S 4096 -a esd -d -b 16 -s 60 -m artsmessage -c drkonqi -l 3 -f @@ -13,7 +13,7 @@ +SuspendTime=60 diff -uNr kdelibs-3.5.8/darwin/kdeglobals kdelibs-3.5.8-new/darwin/kdeglobals --- kdelibs-3.5.8/darwin/kdeglobals 1969-12-31 19:00:00.000000000 -0500 -+++ kdelibs-3.5.8-new/darwin/kdeglobals 2007-10-29 16:05:39.000000000 -0400 ++++ kdelibs-3.5.8-new/darwin/kdeglobals 2007-11-06 23:28:11.000000000 -0500 @@ -0,0 +1,129 @@ +[$Version] +update_info=kaccel.upd:kde3.3/r1,kded.upd:kde3.0,klippershortcuts.upd:04112002,kwin.upd:kde3.2Xinerama,socks.upd:kde3.0/r1 @@ -146,7 +146,7 @@ +activeFont=Baghdad,12,-1,5,50,0,0,0,0,0 diff -uNr kdelibs-3.5.8/darwin/knotifyrc kdelibs-3.5.8-new/darwin/knotifyrc --- kdelibs-3.5.8/darwin/knotifyrc 1969-12-31 19:00:00.000000000 -0500 -+++ kdelibs-3.5.8-new/darwin/knotifyrc 2007-10-29 16:05:39.000000000 -0400 ++++ kdelibs-3.5.8-new/darwin/knotifyrc 2007-11-06 23:28:11.000000000 -0500 @@ -0,0 +1,5 @@ +[Misc] +External [EMAIL PROTECTED]@/bin/mplayer @@ -155,7 +155,7 @@ +Volume=100 diff -uNr kdelibs-3.5.8/darwin/konsolerc kdelibs-3.5.8-new/darwin/konsolerc --- kdelibs-3.5.8/darwin/konsolerc 1969-12-31 19:00:00.000000000 -0500 -+++ kdelibs-3.5.8-new/darwin/konsolerc 2007-10-29 16:05:39.000000000 -0400 ++++ kdelibs-3.5.8-new/darwin/konsolerc 2007-11-06 23:28:11.000000000 -0500 @@ -0,0 +1,19 @@ +[Desktop Entry] +ActiveSession=0 @@ -178,7 +178,7 @@ +tabbar=2 diff -uNr kdelibs-3.5.8/dcop/dcopc.c kdelibs-3.5.8-new/dcop/dcopc.c --- kdelibs-3.5.8/dcop/dcopc.c 2006-05-22 14:14:21.000000000 -0400 -+++ kdelibs-3.5.8-new/dcop/dcopc.c 2007-10-29 16:12:43.000000000 -0400 ++++ kdelibs-3.5.8-new/dcop/dcopc.c 2007-11-06 23:28:11.000000000 -0500 @@ -674,6 +674,9 @@ while((i = strchr(displayName, ':')) != NULL) *i = '_'; @@ -191,7 +191,7 @@ if (NULL == dcopServer) { diff -uNr kdelibs-3.5.8/dcop/dcopclient.cpp kdelibs-3.5.8-new/dcop/dcopclient.cpp --- kdelibs-3.5.8/dcop/dcopclient.cpp 2007-10-08 05:52:08.000000000 -0400 -+++ kdelibs-3.5.8-new/dcop/dcopclient.cpp 2007-10-29 16:14:32.000000000 -0400 ++++ kdelibs-3.5.8-new/dcop/dcopclient.cpp 2007-11-06 23:28:11.000000000 -0500 @@ -270,6 +270,8 @@ { while( (i = disp.find(KPATH_SEPARATOR)) >= 0) @@ -203,7 +203,7 @@ fName += "/.DCOPserver_"; diff -uNr kdelibs-3.5.8/dcop/dcopserver_shutdown.c kdelibs-3.5.8-new/dcop/dcopserver_shutdown.c --- kdelibs-3.5.8/dcop/dcopserver_shutdown.c 2005-10-10 11:06:13.000000000 -0400 -+++ kdelibs-3.5.8-new/dcop/dcopserver_shutdown.c 2007-10-29 16:14:15.000000000 -0400 ++++ kdelibs-3.5.8-new/dcop/dcopserver_shutdown.c 2007-11-06 23:28:11.000000000 -0500 @@ -118,6 +118,8 @@ strncat(dcop_file_old,display, n); while((i = strchr(display, ':'))) @@ -215,7 +215,7 @@ diff -uNr kdelibs-3.5.8/kdecore/Makefile.am kdelibs-3.5.8-new/kdecore/Makefile.am --- kdelibs-3.5.8/kdecore/Makefile.am 2006-10-01 13:33:38.000000000 -0400 -+++ kdelibs-3.5.8-new/kdecore/Makefile.am 2007-10-29 16:05:39.000000000 -0400 ++++ kdelibs-3.5.8-new/kdecore/Makefile.am 2007-11-06 23:28:11.000000000 -0500 @@ -24,7 +24,7 @@ if include_SVGICONS @@ -236,7 +236,7 @@ $(top_srcdir)/dcop/libDCOP_weak.nmcheck $(top_srcdir)/kdecore/standard_weak.nmcheck diff -uNr kdelibs-3.5.8/kdecore/kglobalsettings.cpp kdelibs-3.5.8-new/kdecore/kglobalsettings.cpp --- kdelibs-3.5.8/kdecore/kglobalsettings.cpp 2005-10-10 11:06:03.000000000 -0400 -+++ kdelibs-3.5.8-new/kdecore/kglobalsettings.cpp 2007-10-29 16:05:39.000000000 -0400 ++++ kdelibs-3.5.8-new/kdecore/kglobalsettings.cpp 2007-11-06 23:28:11.000000000 -0500 @@ -491,7 +491,7 @@ s_desktopPath->append('/'); @@ -248,7 +248,7 @@ if ( !s_trashPath->endsWith("/") ) diff -uNr kdelibs-3.5.8/kdecore/ksocks.cpp kdelibs-3.5.8-new/kdecore/ksocks.cpp --- kdelibs-3.5.8/kdecore/ksocks.cpp 2005-10-10 11:06:03.000000000 -0400 -+++ kdelibs-3.5.8-new/kdecore/ksocks.cpp 2007-10-29 16:05:39.000000000 -0400 ++++ kdelibs-3.5.8-new/kdecore/ksocks.cpp 2007-11-06 23:28:11.000000000 -0500 @@ -480,7 +480,7 @@ ksocklen_t addrlen) { if (_useSocks && F_connect) @@ -321,7 +321,7 @@ diff -uNr kdelibs-3.5.8/kdecore/kstandarddirs.cpp kdelibs-3.5.8-new/kdecore/kstandarddirs.cpp --- kdelibs-3.5.8/kdecore/kstandarddirs.cpp 2007-01-15 06:34:17.000000000 -0500 -+++ kdelibs-3.5.8-new/kdecore/kstandarddirs.cpp 2007-10-29 16:05:39.000000000 -0400 ++++ kdelibs-3.5.8-new/kdecore/kstandarddirs.cpp 2007-11-06 23:28:11.000000000 -0500 @@ -1021,7 +1021,7 @@ if (!strcmp(type, "data")) return "share/apps/"; @@ -331,9 +331,168 @@ if (!strcmp(type, "icon")) return "share/icons/"; if (!strcmp(type, "config")) +diff -uNr kdelibs-3.5.8/kdecore/kuniqueapplication.cpp kdelibs-3.5.8-new/kdecore/kuniqueapplication.cpp +--- kdelibs-3.5.8/kdecore/kuniqueapplication.cpp 2005-11-08 17:39:22.000000000 -0500 ++++ kdelibs-3.5.8-new/kdecore/kuniqueapplication.cpp 2007-11-06 23:28:33.000000000 -0500 +@@ -59,6 +59,10 @@ + # endif + #endif + ++#ifdef __APPLE__ ++#include <crt_externs.h> ++#endif ++ + bool KUniqueApplication::s_nofork = false; + bool KUniqueApplication::s_multipleInstances = false; + bool KUniqueApplication::s_uniqueTestDone = false; +@@ -123,7 +127,7 @@ + startKdeinit(); + if(dcopClient()->registerAs(appName, false).isEmpty()) { + kdError() << "KUniqueApplication: Can't setup DCOP communication." << endl; +- ::exit(255); ++ ::_exit(255); + } + } + #endif +@@ -131,19 +135,52 @@ + // We'll call newInstance in the constructor. Do nothing here. + return true; + } ++ ++#ifdef Q_OS_DARWIN ++ else { ++ // we need to reexec ourselves because of stupid OSX crap crappity crap ++ int argc = *_NSGetArgc(); ++ char ** argv = *_NSGetArgv(); ++ char * newargv[argc+2]; ++ ++ for (int i = 0; i < argc; i++) { ++ newargv[i] = argv[i]; ++ } ++ newargv[argc] = "--nofork"; ++ newargv[argc+1] = NULL; ++ ++ int fork_result = fork(); ++ switch(fork_result) { ++ case -1: ++ kdError() << "KUniqueAPplication: Mac OS X workaround fork() failed!" << endl; ++ ::_exit(255); ++ break; ++ case 0: ++ // Child ++ execvp(argv[0], newargv); ++ break; ++ default: ++ // Parent ++ _exit(0); ++ break; ++ } ++ } ++#endif ++ + DCOPClient *dc; + int fd[2]; + signed char result; + if (0 > pipe(fd)) + { + kdError() << "KUniqueApplication: pipe() failed!" << endl; +- ::exit(255); ++ ::_exit(255); + } ++ + int fork_result = fork(); + switch(fork_result) { + case -1: + kdError() << "KUniqueApplication: fork() failed!" << endl; +- ::exit(255); ++ ::_exit(255); + break; + case 0: + // Child +@@ -161,7 +198,7 @@ + kdError() << "KUniqueApplication: Can't determine DISPLAY. Aborting." << endl; + result = -1; // Error + ::write(fd[1], &result, 1); +- ::exit(255); ++ ::_exit(255); + } + + // Try to launch kdeinit. +@@ -173,7 +210,7 @@ + result = -1; + delete dc; // Clean up DCOP commmunication + ::write(fd[1], &result, 1); +- ::exit(255); ++ ::_exit(255); + } + } + if (regName != appName) +@@ -247,25 +284,25 @@ + if (n == 0) + { + kdError() << "KUniqueApplication: Pipe closed unexpectedly." << endl; +- ::exit(255); ++ ::_exit(255); + } + if (errno != EINTR) + { + kdError() << "KUniqueApplication: Error reading from pipe." << endl; +- ::exit(255); ++ ::_exit(255); + } + } + ::close(fd[0]); + + if (result != 0) +- ::exit(result); // Error occurred in child. ++ ::_exit(result); // Error occurred in child. + + dc = new DCOPClient(); + if (!dc->attach()) + { + kdError() << "KUniqueApplication: Parent process can't attach to DCOP." << endl; + delete dc; // Clean up DCOP commmunication +- ::exit(255); ++ ::_exit(255); + } + if (!dc->isApplicationRegistered(appName)) { + kdError() << "KUniqueApplication: Registering failed!" << endl; +@@ -294,20 +331,20 @@ + { + kdError() << "Communication problem with " << KCmdLineArgs::about->appName() << ", it probably crashed." << endl; + delete dc; // Clean up DCOP commmunication +- ::exit(255); ++ ::_exit(255); + } + dc->setPriorityCall(false); + if (replyType != "int") + { + kdError() << "KUniqueApplication: DCOP communication error!" << endl; + delete dc; // Clean up DCOP commmunication +- ::exit(255); ++ ::_exit(255); + } + QDataStream rs(reply, IO_ReadOnly); + int exitCode; + rs >> exitCode; + delete dc; // Clean up DCOP commmunication +- ::exit(exitCode); ++ ::_exit(exitCode); + break; + } + return false; // make insure++ happy +@@ -361,7 +398,7 @@ + } + if( !start()) + // Already running +- ::exit( 0 ); ++ ::_exit( 0 ); + return inst; + } + diff -uNr kdelibs-3.5.8/kdecore/network/ksocketdevice.cpp kdelibs-3.5.8-new/kdecore/network/ksocketdevice.cpp --- kdelibs-3.5.8/kdecore/network/ksocketdevice.cpp 2007-01-15 06:34:17.000000000 -0500 -+++ kdelibs-3.5.8-new/kdecore/network/ksocketdevice.cpp 2007-10-29 16:05:39.000000000 -0400 ++++ kdelibs-3.5.8-new/kdecore/network/ksocketdevice.cpp 2007-11-06 23:28:11.000000000 -0500 @@ -316,7 +316,7 @@ } @@ -372,7 +531,7 @@ if (kde_getpeername(m_sockfd, peerAddress.address(), &len) == -1) diff -uNr kdelibs-3.5.8/kdecore/network/syssocket.h kdelibs-3.5.8-new/kdecore/network/syssocket.h --- kdelibs-3.5.8/kdecore/network/syssocket.h 2005-09-10 04:27:10.000000000 -0400 -+++ kdelibs-3.5.8-new/kdecore/network/syssocket.h 2007-10-29 16:05:39.000000000 -0400 ++++ kdelibs-3.5.8-new/kdecore/network/syssocket.h 2007-11-06 23:28:11.000000000 -0500 @@ -53,7 +53,7 @@ } @@ -414,7 +573,7 @@ } diff -uNr kdelibs-3.5.8/kded/Makefile.am kdelibs-3.5.8-new/kded/Makefile.am --- kdelibs-3.5.8/kded/Makefile.am 2005-10-10 11:06:29.000000000 -0400 -+++ kdelibs-3.5.8-new/kded/Makefile.am 2007-10-29 16:05:39.000000000 -0400 ++++ kdelibs-3.5.8-new/kded/Makefile.am 2007-11-06 23:28:11.000000000 -0500 @@ -58,7 +58,10 @@ servicetype_DATA = kdedmodule.desktop servicetypedir = $(kde_servicetypesdir) @@ -429,7 +588,7 @@ updatedir = $(kde_datadir)/kconf_update diff -uNr kdelibs-3.5.8/kded/kbuildsycoca.cpp kdelibs-3.5.8-new/kded/kbuildsycoca.cpp --- kdelibs-3.5.8/kded/kbuildsycoca.cpp 2007-05-14 03:52:43.000000000 -0400 -+++ kdelibs-3.5.8-new/kded/kbuildsycoca.cpp 2007-10-29 16:05:40.000000000 -0400 ++++ kdelibs-3.5.8-new/kded/kbuildsycoca.cpp 2007-11-06 23:28:11.000000000 -0500 @@ -379,7 +379,11 @@ connect(g_vfolder, SIGNAL(newService(const QString &, KService **)), this, SLOT(slotCreateEntry(const QString &, KService **))); @@ -445,7 +604,7 @@ entry->setLayoutInfo(kdeMenu->layoutList); diff -uNr kdelibs-3.5.8/kdeprint/configure.in.in kdelibs-3.5.8-new/kdeprint/configure.in.in --- kdelibs-3.5.8/kdeprint/configure.in.in 2005-09-10 04:27:43.000000000 -0400 -+++ kdelibs-3.5.8-new/kdeprint/configure.in.in 2007-10-29 16:05:40.000000000 -0400 ++++ kdelibs-3.5.8-new/kdeprint/configure.in.in 2007-11-06 23:28:11.000000000 -0500 @@ -80,7 +80,7 @@ dnl check if CUPS is at least 1.1.20 @@ -457,7 +616,7 @@ fi diff -uNr kdelibs-3.5.8/kdeprint/cups/Makefile.am kdelibs-3.5.8-new/kdeprint/cups/Makefile.am --- kdelibs-3.5.8/kdeprint/cups/Makefile.am 2006-10-02 06:46:55.000000000 -0400 -+++ kdelibs-3.5.8-new/kdeprint/cups/Makefile.am 2007-10-29 16:05:40.000000000 -0400 ++++ kdelibs-3.5.8-new/kdeprint/cups/Makefile.am 2007-11-06 23:28:11.000000000 -0500 @@ -14,8 +14,8 @@ imagepreview.cpp imageposition.cpp kpimagepage.cpp \ kptextpage.cpp kphpgl2page.cpp cupsaddsmb2.cpp kmwother.cpp ippreportdlg.cpp \ @@ -471,7 +630,7 @@ noinst_HEADERS = cupsinfos.h ipprequest.h kmcupsjobmanager.h kmcupsmanager.h kmcupsuimanager.h \ diff -uNr kdelibs-3.5.8/kdeprint/cups/cupsdconf2/Makefile.am kdelibs-3.5.8-new/kdeprint/cups/cupsdconf2/Makefile.am --- kdelibs-3.5.8/kdeprint/cups/cupsdconf2/Makefile.am 2005-09-10 04:27:41.000000000 -0400 -+++ kdelibs-3.5.8-new/kdeprint/cups/cupsdconf2/Makefile.am 2007-10-29 16:05:40.000000000 -0400 ++++ kdelibs-3.5.8-new/kdeprint/cups/cupsdconf2/Makefile.am 2007-11-06 23:28:11.000000000 -0500 @@ -14,8 +14,8 @@ locationdialog.cpp addressdialog.cpp cups-util.c \ qdirmultilineedit.cpp sizewidget.cpp main.cpp @@ -485,7 +644,7 @@ cupsdserverpage.h cupsdlogpage.h cupsdjobspage.h cupsdfilterpage.h \ diff -uNr kdelibs-3.5.8/kdeui/Makefile.am kdelibs-3.5.8-new/kdeui/Makefile.am --- kdelibs-3.5.8/kdeui/Makefile.am 2007-10-08 05:52:12.000000000 -0400 -+++ kdelibs-3.5.8-new/kdeui/Makefile.am 2007-10-29 16:05:40.000000000 -0400 ++++ kdelibs-3.5.8-new/kdeui/Makefile.am 2007-11-06 23:28:11.000000000 -0500 @@ -27,10 +27,10 @@ AM_LDFLAGS = $(LDFLAGS_AS_NEEDED) $(LDFLAGS_NEW_DTAGS) @@ -501,7 +660,7 @@ diff -uNr kdelibs-3.5.8/kimgio/Makefile.am kdelibs-3.5.8-new/kimgio/Makefile.am --- kdelibs-3.5.8/kimgio/Makefile.am 2005-09-10 04:26:42.000000000 -0400 -+++ kdelibs-3.5.8-new/kimgio/Makefile.am 2007-10-29 16:05:41.000000000 -0400 ++++ kdelibs-3.5.8-new/kimgio/Makefile.am 2007-11-06 23:28:11.000000000 -0500 @@ -21,7 +21,7 @@ kimg_pcx.la kimg_tga.la kimg_rgb.la kimg_xcf.la kimg_dds.la $(KIMGIO_EXR_MODULES) \ kimg_psd.la kimg_hdr.la @@ -513,7 +672,7 @@ kimg_tiff_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries) diff -uNr kdelibs-3.5.8/kinit/Makefile.am kdelibs-3.5.8-new/kinit/Makefile.am --- kdelibs-3.5.8/kinit/Makefile.am 2007-10-08 05:52:03.000000000 -0400 -+++ kdelibs-3.5.8-new/kinit/Makefile.am 2007-10-29 16:05:41.000000000 -0400 ++++ kdelibs-3.5.8-new/kinit/Makefile.am 2007-11-06 23:28:11.000000000 -0500 @@ -15,7 +15,7 @@ # the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, # Boston, MA 02110-1301, USA. @@ -523,9 +682,24 @@ SUBDIRS = . tests +diff -uNr kdelibs-3.5.8/kinit/kinit.cpp kdelibs-3.5.8-new/kinit/kinit.cpp +--- kdelibs-3.5.8/kinit/kinit.cpp 2007-10-08 05:52:03.000000000 -0400 ++++ kdelibs-3.5.8-new/kinit/kinit.cpp 2007-11-06 23:28:11.000000000 -0500 +@@ -593,6 +593,11 @@ + if ( getenv("KDE_IS_PRELINKED") && !execpath.isEmpty() && !launcher) + libpath.truncate(0); + ++#ifdef Q_OS_DARWIN ++ if (!execpath.isEmpty()) ++ libpath.truncate(0); ++#endif ++ + if ( !libpath.isEmpty() ) + { + d.handle = lt_dlopen( QFile::encodeName(libpath) ); diff -uNr kdelibs-3.5.8/kinit/start_kdeinit_wrapper.c kdelibs-3.5.8-new/kinit/start_kdeinit_wrapper.c --- kdelibs-3.5.8/kinit/start_kdeinit_wrapper.c 2007-10-08 05:52:03.000000000 -0400 -+++ kdelibs-3.5.8-new/kinit/start_kdeinit_wrapper.c 2007-10-29 16:05:41.000000000 -0400 ++++ kdelibs-3.5.8-new/kinit/start_kdeinit_wrapper.c 2007-11-06 23:28:11.000000000 -0500 @@ -50,9 +50,9 @@ close( 0 ); /* stdin */ dup2( pipes[ 0 ], 0 ); @@ -554,7 +728,7 @@ #endif diff -uNr kdelibs-3.5.8/kio/kssl/kopenssl.cc kdelibs-3.5.8-new/kio/kssl/kopenssl.cc --- kdelibs-3.5.8/kio/kssl/kopenssl.cc 2006-07-22 04:16:39.000000000 -0400 -+++ kdelibs-3.5.8-new/kio/kssl/kopenssl.cc 2007-10-29 16:05:41.000000000 -0400 ++++ kdelibs-3.5.8-new/kio/kssl/kopenssl.cc 2007-11-06 23:28:11.000000000 -0500 @@ -323,6 +323,7 @@ #elif defined(_AIX) << "libssl.a(libssl.so.0)" @@ -573,7 +747,7 @@ #else diff -uNr kdelibs-3.5.8/kio/misc/kpac/Makefile.am kdelibs-3.5.8-new/kio/misc/kpac/Makefile.am --- kdelibs-3.5.8/kio/misc/kpac/Makefile.am 2005-09-10 04:26:47.000000000 -0400 -+++ kdelibs-3.5.8-new/kio/misc/kpac/Makefile.am 2007-10-29 16:05:41.000000000 -0400 ++++ kdelibs-3.5.8-new/kio/misc/kpac/Makefile.am 2007-11-06 23:28:11.000000000 -0500 @@ -10,7 +10,7 @@ kded_proxyscout_la_SOURCES = proxyscout.skel proxyscout.cpp script.cpp \ downloader.cpp discovery.cpp @@ -585,7 +759,7 @@ kpac_dhcp_helper_CFLAGS = $(KDE_USE_FPIE) diff -uNr kdelibs-3.5.8/kioslave/http/http.cc kdelibs-3.5.8-new/kioslave/http/http.cc --- kdelibs-3.5.8/kioslave/http/http.cc 2007-10-08 05:52:02.000000000 -0400 -+++ kdelibs-3.5.8-new/kioslave/http/http.cc 2007-10-29 16:05:41.000000000 -0400 ++++ kdelibs-3.5.8-new/kioslave/http/http.cc 2007-11-06 23:28:11.000000000 -0500 @@ -3409,10 +3409,6 @@ } while (!m_bEOF && (len || noHeader) && (headerSize < maxHeaderSize) && (gets(buffer, sizeof(buffer)-1))); ------------------------------------------------------------------------- This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs