[30058] trunk/dports/kde/kdelibs3

source_changes at macosforge.org source_changes at macosforge.org
Fri Oct 19 00:11:48 PDT 2007


Revision: 30058
          http://trac.macosforge.org/projects/macports/changeset/30058
Author:   takanori at macports.org
Date:     2007-10-19 00:11:48 -0700 (Fri, 19 Oct 2007)

Log Message:
-----------
KDE 3.5.8.

Modified Paths:
--------------
    trunk/dports/kde/kdelibs3/Portfile
    trunk/dports/kde/kdelibs3/files/CompileScript.sh
    trunk/dports/kde/kdelibs3/files/InstallScript.sh
    trunk/dports/kde/kdelibs3/files/kdelibs3-unified.patch

Modified: trunk/dports/kde/kdelibs3/Portfile
===================================================================
--- trunk/dports/kde/kdelibs3/Portfile	2007-10-19 07:09:56 UTC (rev 30057)
+++ trunk/dports/kde/kdelibs3/Portfile	2007-10-19 07:11:48 UTC (rev 30058)
@@ -1,11 +1,11 @@
 # $Id$
 
-#Synced with Fink, Version 3.5.7-1021
+#Synced with Fink, Version 3.5.8-1022
 
 PortSystem 1.0
 name		kdelibs3
-version		3.5.7
-set kdeadmin	kde-admindir-790
+version		3.5.8
+set kdeadmin	kde-admindir-1009
 categories	kde
 maintainers	nomaintainer at macports.org
 description	Essential libraries for KDE applications. \
@@ -13,16 +13,14 @@
 long_description ${description}
 platforms	darwin
 homepage	http://www.kde.org/
-master_sites	kde:stable/${version}/src/:kde357 \
-		http://ranger.users.finkproject.org/distfiles/:admin \
-		http://ranger.befunk.com/fink/:admin \
-		http://astrange.ithinksw.net/~astrange/ranger-fink/:admin \
-		http://www.southofheaven.net/befunk/:admin
-#		opendarwin::kde357
-#		opendarwin::admin
+master_sites	kde:stable/${version}/src/:kde358 \
+		http://ranger.users.finkproject.org/distfiles/kde-admindir/:admin \
+		http://ranger.befunk.com/fink/kde-admindir/:admin \
+		http://astrange.ithinksw.net/~astrange/ranger-fink/kde-admindir/:admin \
+		http://www.southofheaven.net/befunk/kde-admindir/:admin
 use_bzip2	yes
 distname	kdelibs-${version}
-distfiles	${distname}.tar.bz2:kde357 \
+distfiles	${distname}.tar.bz2:kde358 \
 		${kdeadmin}.tar.bz2:admin
 depends_build	port:autoconf \
 		port:unsermake
@@ -59,9 +57,10 @@
 #		port:dbus
 #		port:dbus-qt3
 #		port:hal
+#depends_run	port:shared-mime-info
 
-checksums	${distname}.tar.bz2 md5 50ed644f2ec91963570fe2b155652957 \
-		${kdeadmin}.tar.bz2 md5 8a098eeb808331ddf5912f7a8a184dd5
+checksums	${distname}.tar.bz2 md5 acaa37e79e840d10dca326277a20863c \
+		${kdeadmin}.tar.bz2 md5 d03f14acde189186fbac313f35316572
 
 extract.only	${distname}.tar.bz2
 post-extract	{ system "cd ${worksrcpath} && bzcat -dc ${distpath}/${kdeadmin}.tar.bz2 | tar xf -" }
@@ -91,9 +90,10 @@
 		}
 		foreach f {kdeglobals konsolerc} {
 			# Monaco CY is not a standard font in Tiger.
-			reinplace "s|Monaco CY|Monaco|g" ${worksrcpath}/darwin/${f}
+			reinplace "s|Monaco CY|Bitstream Vera Sans Mono|g" ${worksrcpath}/darwin/${f}
+			reinplace "s|Baghdad|Bitstream Vera Sans|g" ${worksrcpath}/darwin/${f}
 		}
-		system "echo \"\[FMSettings\]\nStandardFont=Sans,10,-1,5,50,0,0,0,0,0\" > ${worksrcpath}/darwin/kdesktoprc"
+		system "echo \"\[FMSettings\]\nStandardFont=Bitstream Vera Sans,10,-1,5,50,0,0,0,0,0\" > ${worksrcpath}/darwin/kdesktoprc"
 }
 
 configure.args --enable-cups --with-ldap=framework --with-gssapi=framework --with-distribution='MacPorts/Mac OS X' --without-arts

Modified: trunk/dports/kde/kdelibs3/files/CompileScript.sh
===================================================================
--- trunk/dports/kde/kdelibs3/files/CompileScript.sh	2007-10-19 07:09:56 UTC (rev 30057)
+++ trunk/dports/kde/kdelibs3/files/CompileScript.sh	2007-10-19 07:11:48 UTC (rev 30058)
@@ -1,19 +1,22 @@
 #!/bin/sh -ev
 
-        export PREFIX="%p" USE_UNSERMAKE=1
-        . ./environment-helper.sh
+	export PREFIX="%p" USE_UNSERMAKE=1
+	. ./environment-helper.sh
 
-        case $SW_VERSION in 
-                6*|7*)
-                        export CPPFLAGS="$CPPFLAGS -DHAVE_SYS_EXEC_H=1"
-                        ;; 
-        esac
+	case $SW_VERSION in 
+		6*|7*)
+			export CPPFLAGS="$CPPFLAGS -DHAVE_SYS_EXEC_H=1"
+			;; 
+	esac
 
-        #export CPPFLAGS="-I/usr/include/gssapi -I%p/lib/fam/include $CPPFLAGS"
-        #export LDFLAGS="-L%p/lib/fam/lib $LDFLAGS"
-        export CPPFLAGS="-I/usr/include/gssapi $CPPFLAGS"
+	export CPPFLAGS="-I/usr/include/gssapi $CPPFLAGS"
 
-        ./build-helper.sh cvs       %N %v %r make -f admin/Makefile.common cvs
-        ./build-helper.sh configure %N %v %r ./configure %c $CONFIGURE_PARAMS
-        ./build-helper.sh make      %N %v %r unsermake $UNSERMAKEFLAGS
+	./build-helper.sh cvs       %N %v %r make -f admin/Makefile.common cvs
+	./build-helper.sh configure %N %v %r ./configure %c $CONFIGURE_PARAMS
+
+	perl -pi -e 's/-Xlinker -framework -Xlinker /-Wl,-framework,/g' Makefile
+	perl -pi -e 's/-framework /-Wl,-framework,/g' Makefile
+	perl -pi -e 's/-weak_framework /-Wl,-weak_framework,/g' Makefile
+
+	./build-helper.sh make      %N %v %r unsermake $UNSERMAKEFLAGS
 #apidox#./build-helper.sh apidox    %N %v %r make apidox all_libraries="$ALL_LIBRARIES"

Modified: trunk/dports/kde/kdelibs3/files/InstallScript.sh
===================================================================
--- trunk/dports/kde/kdelibs3/files/InstallScript.sh	2007-10-19 07:09:56 UTC (rev 30057)
+++ trunk/dports/kde/kdelibs3/files/InstallScript.sh	2007-10-19 07:11:48 UTC (rev 30058)
@@ -1,21 +1,38 @@
 #!/bin/sh -ev
 
-        export PREFIX="%p" USE_UNSERMAKE=1
-        . ./environment-helper.sh
+	export PREFIX="%p" USE_UNSERMAKE=1
+	. ./environment-helper.sh
 
-        ./build-helper.sh install        %N %v %r unsermake -p -j1 install DESTDIR=%d
-#apidox#./build-helper.sh install-apidox %N %v %r make -j1 install-apidox install-apidox-recurse DESTDIR=%d
+	./build-helper.sh install        %N %v %r unsermake -p -j1 install DESTDIR=%d
 
-        rm -rf %i/share/icons/hicolor/index.theme
+#fink
+#	cat <<END >%i/bin/kde-update-caches.sh
+##!/bin/sh
+#
+#	if [ \`id -un\` != 'root' ]; then
+#		echo "you must run this script as root!"
+#		echo ""
+#		exit 1
+#	fi
+#
+#	ENV="env KDEDIR= KDEDIRS= HOME=/tmp XDG_CACHE_HOME=/tmp/kb/cache XDG_CONFIG_HOME=/tmp/kb/config XDG_DATA_HOME=/tmp/kb/share HISTFILE=/tmp/kb/.bash_history USER=root LOGNAME=root"
+#	\$ENV %p/bin/update-mime-database %p/share/mime
+#	\$ENV %p/bin/kbuildsycoca --global --noincremental --nosignal
+#END
+#	chmod 755 %i/bin/kde-update-caches.sh
+#macports
+#
 
-        install -c -m 644 darwin/* %i/share/config
+	rm -rf %i/share/icons/hicolor/index.theme
 
-        mkdir -p %i/share/doc/installed-packages
-        touch %i/share/doc/installed-packages/%N
+	install -c -m 644 darwin/* %i/share/config
 
-        touch %i/share/doc/installed-packages/kdelibs3
-        touch %i/share/doc/installed-packages/kdelibs3-shlibs
-        touch %i/share/doc/installed-packages/kdelibs3-dev
-        touch %i/share/doc/installed-packages/kdelibs3-ssl
-        touch %i/share/doc/installed-packages/kdelibs3-ssl-shlibs
-        touch %i/share/doc/installed-packages/kdelibs3-ssl-dev
+	mkdir -p %i/share/doc/installed-packages
+	touch %i/share/doc/installed-packages/%N
+
+	touch %i/share/doc/installed-packages/kdelibs3
+	touch %i/share/doc/installed-packages/kdelibs3-shlibs
+	touch %i/share/doc/installed-packages/kdelibs3-dev
+	touch %i/share/doc/installed-packages/kdelibs3-ssl
+	touch %i/share/doc/installed-packages/kdelibs3-ssl-shlibs
+	touch %i/share/doc/installed-packages/kdelibs3-ssl-dev

Modified: trunk/dports/kde/kdelibs3/files/kdelibs3-unified.patch
===================================================================
--- trunk/dports/kde/kdelibs3/files/kdelibs3-unified.patch	2007-10-19 07:09:56 UTC (rev 30057)
+++ trunk/dports/kde/kdelibs3/files/kdelibs3-unified.patch	2007-10-19 07:11:48 UTC (rev 30058)
@@ -1,6 +1,6 @@
 
---- kdelibs-3.5.6/darwin/kcmartsrc	1969-12-31 19:00:00.000000000 -0500
-+++ kdelibs-3.5.6-new/darwin/kcmartsrc	2007-02-08 15:33:22.000000000 -0500
+--- kdelibs-3.5.8/darwin/kcmartsrc	1969-12-31 19:00:00.000000000 -0500
++++ kdelibs-3.5.8-new/darwin/kcmartsrc	2007-10-15 20:17:10.000000000 -0400
 @@ -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
@@ -11,8 +11,8 @@
 +StartRealtime=false
 +StartServer=false
 +SuspendTime=60
---- kdelibs-3.5.6/darwin/kdeglobals	1969-12-31 19:00:00.000000000 -0500
-+++ kdelibs-3.5.6-new/darwin/kdeglobals	2007-02-08 15:33:22.000000000 -0500
+--- kdelibs-3.5.8/darwin/kdeglobals	1969-12-31 19:00:00.000000000 -0500
++++ kdelibs-3.5.8-new/darwin/kdeglobals	2007-10-15 20:17:10.000000000 -0400
 @@ -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
@@ -143,16 +143,16 @@
 +
 +[WM]
 +activeFont=Baghdad,12,-1,5,50,0,0,0,0,0
---- kdelibs-3.5.6/darwin/knotifyrc	1969-12-31 19:00:00.000000000 -0500
-+++ kdelibs-3.5.6-new/darwin/knotifyrc	2007-02-08 15:33:22.000000000 -0500
+--- kdelibs-3.5.8/darwin/knotifyrc	1969-12-31 19:00:00.000000000 -0500
++++ kdelibs-3.5.8-new/darwin/knotifyrc	2007-10-15 20:17:10.000000000 -0400
 @@ -0,0 +1,5 @@
 +[Misc]
 +External player=@FINKPREFIX@/bin/mplayer
 +LastConfiguredApp=knotify
 +Use external player=false
 +Volume=100
---- kdelibs-3.5.6/darwin/konsolerc	1969-12-31 19:00:00.000000000 -0500
-+++ kdelibs-3.5.6-new/darwin/konsolerc	2007-02-08 15:33:22.000000000 -0500
+--- kdelibs-3.5.8/darwin/konsolerc	1969-12-31 19:00:00.000000000 -0500
++++ kdelibs-3.5.8-new/darwin/konsolerc	2007-10-15 20:17:10.000000000 -0400
 @@ -0,0 +1,19 @@
 +[Desktop Entry]
 +ActiveSession=0
@@ -173,8 +173,8 @@
 +schema=Linux.schema
 +scrollbar=2
 +tabbar=2
---- kdelibs-3.5.6/kdecore/Makefile.am	2006-10-01 13:33:38.000000000 -0400
-+++ kdelibs-3.5.6-new/kdecore/Makefile.am	2007-02-08 15:33:22.000000000 -0500
+--- 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-15 20:17:10.000000000 -0400
 @@ -24,7 +24,7 @@
  
  if include_SVGICONS
@@ -193,8 +193,8 @@
  libkdecore_la_NMCHECK = $(srcdir)/libkdecore.nmcheck
  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.6/kdecore/kglobalsettings.cpp	2005-10-10 11:06:03.000000000 -0400
-+++ kdelibs-3.5.6-new/kdecore/kglobalsettings.cpp	2007-02-08 15:33:22.000000000 -0500
+--- 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-15 20:17:10.000000000 -0400
 @@ -491,7 +491,7 @@
        s_desktopPath->append('/');
  
@@ -204,8 +204,8 @@
      *s_trashPath = g.readPathEntry( "Trash" , *s_trashPath);
      *s_trashPath = QDir::cleanDirPath( *s_trashPath );
      if ( !s_trashPath->endsWith("/") )
---- kdelibs-3.5.6/kdecore/ksocks.cpp	2005-10-10 11:06:03.000000000 -0400
-+++ kdelibs-3.5.6-new/kdecore/ksocks.cpp	2007-02-08 15:33:22.000000000 -0500
+--- 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-15 20:17:10.000000000 -0400
 @@ -480,7 +480,7 @@
                                                     ksocklen_t addrlen) {
     if (_useSocks && F_connect)
@@ -276,8 +276,8 @@
  }
  
  
---- kdelibs-3.5.6/kdecore/kstandarddirs.cpp	2007-01-15 06:34:17.000000000 -0500
-+++ kdelibs-3.5.6-new/kdecore/kstandarddirs.cpp	2007-02-08 15:33:22.000000000 -0500
+--- 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-15 20:53:07.000000000 -0400
 @@ -1021,7 +1021,7 @@
      if (!strcmp(type, "data"))
  	return "share/apps/";
@@ -287,8 +287,17 @@
      if (!strcmp(type, "icon"))
  	return "share/icons/";
      if (!strcmp(type, "config"))
---- kdelibs-3.5.6/kdecore/network/ksocketdevice.cpp	2007-01-15 06:34:17.000000000 -0500
-+++ kdelibs-3.5.6-new/kdecore/network/ksocketdevice.cpp	2007-02-08 15:33:22.000000000 -0500
+@@ -1315,7 +1315,7 @@
+     }
+     else
+     {
+-       localKdeDir =  QDir::homeDirPath() + "/.kde/";
++       localKdeDir =  QDir::homeDirPath() + "/.kde/";
+     }
+ 
+     if (localKdeDir != "-/")
+--- 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-15 20:17:10.000000000 -0400
 @@ -316,7 +316,7 @@
      }
  
@@ -325,8 +334,8 @@
    KSocketAddress peerAddress;
    peerAddress.setLength(len = 32);	// arbitrary value
    if (kde_getpeername(m_sockfd, peerAddress.address(), &len) == -1)
---- kdelibs-3.5.6/kdecore/network/syssocket.h	2005-09-10 04:27:10.000000000 -0400
-+++ kdelibs-3.5.6-new/kdecore/network/syssocket.h	2007-02-08 15:33:22.000000000 -0500
+--- 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-15 20:17:10.000000000 -0400
 @@ -53,7 +53,7 @@
    }
  
@@ -366,8 +375,8 @@
    {
      return ::getsockname(fd, sa, len);
    }
---- kdelibs-3.5.6/kded/Makefile.am	2005-10-10 11:06:29.000000000 -0400
-+++ kdelibs-3.5.6-new/kded/Makefile.am	2007-02-08 15:33:22.000000000 -0500
+--- 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-15 20:17:10.000000000 -0400
 @@ -58,7 +58,10 @@
  servicetype_DATA = kdedmodule.desktop
  servicetypedir = $(kde_servicetypesdir)
@@ -380,8 +389,8 @@
  
  update_DATA = kded.upd
  updatedir = $(kde_datadir)/kconf_update
---- kdelibs-3.5.6/kded/kbuildsycoca.cpp	2005-11-08 17:39:36.000000000 -0500
-+++ kdelibs-3.5.6-new/kded/kbuildsycoca.cpp	2007-02-08 15:33:23.000000000 -0500
+--- 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-15 20:17:10.000000000 -0400
 @@ -379,7 +379,11 @@
       connect(g_vfolder, SIGNAL(newService(const QString &, KService **)),
               this, SLOT(slotCreateEntry(const QString &, KService **)));
@@ -395,8 +404,8 @@
  
       KServiceGroup *entry = g_bsgf->addNew("/", kdeMenu->directoryFile, 0, false);
       entry->setLayoutInfo(kdeMenu->layoutList);
---- kdelibs-3.5.6/kdeprint/configure.in.in	2005-09-10 04:27:43.000000000 -0400
-+++ kdelibs-3.5.6-new/kdeprint/configure.in.in	2007-02-08 15:33:23.000000000 -0500
+--- 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-15 20:17:10.000000000 -0400
 @@ -80,7 +80,7 @@
  
        dnl check if CUPS is at least 1.1.20
@@ -406,8 +415,34 @@
        if test "$ac_have_new_cups" = "yes"; then
   	AC_DEFINE(HAVE_CUPS_NO_PWD_CACHE, 1, CUPS doesn't have password caching)
        fi
---- kdelibs-3.5.6/kdeui/Makefile.am	2005-10-10 11:06:38.000000000 -0400
-+++ kdelibs-3.5.6-new/kdeui/Makefile.am	2007-02-08 15:33:23.000000000 -0500
+--- 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-15 20:17:10.000000000 -0400
+@@ -14,8 +14,8 @@
+ 				  imagepreview.cpp imageposition.cpp kpimagepage.cpp \
+ 				  kptextpage.cpp kphpgl2page.cpp cupsaddsmb2.cpp kmwother.cpp ippreportdlg.cpp \
+ 				  kptagspage.cpp
+-kdeprint_cups_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+-kdeprint_cups_la_LIBADD = $(top_builddir)/kdeprint/management/libkdeprint_management.la $(LIB_KIO) $(LIB_CUPS) $(top_builddir)/kdecore/libkdefakes.la
++kdeprint_cups_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined $(LIB_CUPS)
++kdeprint_cups_la_LIBADD = $(top_builddir)/kdeprint/management/libkdeprint_management.la $(LIB_KIO) $(top_builddir)/kdecore/libkdefakes.la
+ kdeprint_cups_la_METASOURCES = AUTO
+ 
+ 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-15 20:17:10.000000000 -0400
+@@ -14,8 +14,8 @@
+ 			  locationdialog.cpp addressdialog.cpp cups-util.c \
+ 			  qdirmultilineedit.cpp sizewidget.cpp main.cpp
+ cupsdconf_la_METASOURCES = AUTO
+-cupsdconf_la_LDFLAGS = -avoid-version -module $(all_libraries) $(KDE_RPATH)
+-cupsdconf_la_LIBADD = $(LIB_KIO) $(LIB_CUPS)
++cupsdconf_la_LDFLAGS = -avoid-version -module $(all_libraries) $(KDE_RPATH) $(LIB_CUPS)
++cupsdconf_la_LIBADD = $(LIB_KIO)
+ 
+ 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-15 20:17:10.000000000 -0400
 @@ -27,10 +27,10 @@
  AM_LDFLAGS = $(LDFLAGS_AS_NEEDED) $(LDFLAGS_NEW_DTAGS)
  
@@ -421,8 +456,8 @@
  libkspell_la_LIBADD = libkdeui.la
  libkspell_la_SOURCES = dummy.cpp
  
---- kdelibs-3.5.6/kimgio/Makefile.am	2005-09-10 04:26:42.000000000 -0400
-+++ kdelibs-3.5.6-new/kimgio/Makefile.am	2007-02-08 15:33:23.000000000 -0500
+--- 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-15 20:17:10.000000000 -0400
 @@ -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
@@ -432,8 +467,8 @@
  
  kimg_tiff_la_SOURCES = tiffr.cpp
  kimg_tiff_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
---- kdelibs-3.5.6/kinit/Makefile.am	2007-01-15 06:33:56.000000000 -0500
-+++ kdelibs-3.5.6-new/kinit/Makefile.am	2007-02-08 15:33:23.000000000 -0500
+--- 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-15 20:17:10.000000000 -0400
 @@ -15,7 +15,7 @@
  #    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  #    Boston, MA 02110-1301, USA.
@@ -443,8 +478,36 @@
  
  SUBDIRS = . tests
  
---- kdelibs-3.5.6/kio/kssl/kopenssl.cc	2006-07-22 04:16:39.000000000 -0400
-+++ kdelibs-3.5.6-new/kio/kssl/kopenssl.cc	2007-02-08 15:33:23.000000000 -0500
+--- 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-15 20:23:03.000000000 -0400
+@@ -50,9 +50,9 @@
+          close( 0 ); /* stdin */
+          dup2( pipes[ 0 ], 0 );
+          close( pipes[ 0 ] );
+-         argv[ 0 ] = (char*)"start_kdeinit";
+-         execvp("start_kdeinit", argv);
+-         perror("start_kdeinit");
++         argv[ 0 ] = (char*)"@FINKPREFIX@/bin/start_kdeinit";
++         execvp("@FINKPREFIX@/bin/start_kdeinit", argv);
++         perror("@FINKPREFIX@/bin/start_kdeinit");
+          return 1;
+       case 0: { /* child, pass env and exit */
+          extern char** environ;
+@@ -84,9 +84,9 @@
+ {
+    if(argc == 0)
+       return 1;
+-   argv[0] = "start_kdeinit";
+-   execv("start_kdeinit",argv);
+-   perror("start_kdeinit");
++   argv[0] = "@FINKPREFIX@/bin/start_kdeinit";
++   execv("@FINKPREFIX@/bin/start_kdeinit",argv);
++   perror("@FINKPREFIX@/bin/start_kdeinit");
+    return 1;
+ }
+ #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-15 20:17:10.000000000 -0400
 @@ -323,6 +323,7 @@
               #elif defined(_AIX)
               << "libssl.a(libssl.so.0)"
@@ -461,8 +524,8 @@
  	     << "libcrypto.dylib"
  	     << "libcrypto.0.9.dylib"
  	     #else
---- kdelibs-3.5.6/kio/misc/kpac/Makefile.am	2005-09-10 04:26:47.000000000 -0400
-+++ kdelibs-3.5.6-new/kio/misc/kpac/Makefile.am	2007-02-08 15:33:23.000000000 -0500
+--- 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-15 20:17:10.000000000 -0400
 @@ -10,7 +10,7 @@
  kded_proxyscout_la_SOURCES = proxyscout.skel proxyscout.cpp script.cpp \
                               downloader.cpp discovery.cpp
@@ -472,3 +535,27 @@
  
  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-17 07:53:51.000000000 -0400
+@@ -3409,10 +3409,6 @@
+ 
+   } while (!m_bEOF && (len || noHeader) && (headerSize < maxHeaderSize) && (gets(buffer, sizeof(buffer)-1)));
+ 
+-  // Send the current response before processing starts or it
+-  // might never get sent...
+-  forwardHttpResponseHeader();
+-
+   // Now process the HTTP/1.1 upgrade
+   QStringList::Iterator opt = upgradeOffers.begin();
+   for( ; opt != upgradeOffers.end(); ++opt) {
+@@ -3818,6 +3814,10 @@
+     mimeType( m_strMimeType );
+   }
+ 
++  // Do not move send response header before any redirection as it seems
++  // to screw up some sites. See BR# 150904.
++  forwardHttpResponseHeader();
++
+   if (m_request.method == HTTP_HEAD)
+      return true;
+ 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20071019/61481c97/attachment-0001.html


More information about the macports-changes mailing list