[26987] trunk/dports/kde/kdelibs3
source_changes at macosforge.org
source_changes at macosforge.org
Sun Jul 15 07:25:52 PDT 2007
Revision: 26987
http://trac.macosforge.org/projects/macports/changeset/26987
Author: takanori at macports.org
Date: 2007-07-15 07:25:52 -0700 (Sun, 15 Jul 2007)
Log Message:
-----------
KDE 3.5.7.
Modified Paths:
--------------
trunk/dports/kde/kdelibs3/Portfile
trunk/dports/kde/kdelibs3/files/kdelibs3-unified.patch
Modified: trunk/dports/kde/kdelibs3/Portfile
===================================================================
--- trunk/dports/kde/kdelibs3/Portfile 2007-07-15 14:25:03 UTC (rev 26986)
+++ trunk/dports/kde/kdelibs3/Portfile 2007-07-15 14:25:52 UTC (rev 26987)
@@ -1,11 +1,11 @@
# $Id$
-#Synced with Fink, Version 3.5.6-1022
+#Synced with Fink, Version 3.5.7-1021
PortSystem 1.0
name kdelibs3
-version 3.5.6
-set kdeadmin kde-admindir-429
+version 3.5.7
+set kdeadmin kde-admindir-790
categories kde
maintainers nomaintainer at macports.org
description Essential libraries for KDE applications. \
@@ -13,16 +13,16 @@
long_description ${description}
platforms darwin
homepage http://www.kde.org/
-master_sites kde:stable/${version}/src/:kde356 \
+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::kde356
+# opendarwin::kde357
# opendarwin::admin
use_bzip2 yes
distname kdelibs-${version}
-distfiles ${distname}.tar.bz2:kde356 \
+distfiles ${distname}.tar.bz2:kde357 \
${kdeadmin}.tar.bz2:admin
depends_build port:autoconf \
port:unsermake
@@ -60,8 +60,8 @@
# port:dbus-qt3
# port:hal
-checksums ${distname}.tar.bz2 md5 e4d137879a66e92b895b3de5413a61d8 \
- ${kdeadmin}.tar.bz2 md5 73186bf0bdabf96c9f7d559de56d3772
+checksums ${distname}.tar.bz2 md5 50ed644f2ec91963570fe2b155652957 \
+ ${kdeadmin}.tar.bz2 md5 8a098eeb808331ddf5912f7a8a184dd5
extract.only ${distname}.tar.bz2
post-extract { system "cd ${worksrcpath} && bzcat -dc ${distpath}/${kdeadmin}.tar.bz2 | tar xf -" }
@@ -126,6 +126,8 @@
exit 1
}
+universal_variant no
+
variant with_doxygen {
depends_lib-append port:doxygen
post-patch { foreach f {CompileScript.sh InstallScript.sh} { reinplace "s|#apidox#||g" ${worksrcpath}/${f} }}
Modified: trunk/dports/kde/kdelibs3/files/kdelibs3-unified.patch
===================================================================
--- trunk/dports/kde/kdelibs3/files/kdelibs3-unified.patch 2007-07-15 14:25:03 UTC (rev 26986)
+++ trunk/dports/kde/kdelibs3/files/kdelibs3-unified.patch 2007-07-15 14:25:52 UTC (rev 26987)
@@ -421,26 +421,6 @@
libkspell_la_LIBADD = libkdeui.la
libkspell_la_SOURCES = dummy.cpp
---- kdelibs-3.5.6/khtml/html/htmltokenizer.cpp 2007-01-15 06:34:00.000000000 -0500
-+++ kdelibs-3.5.6-new/khtml/html/htmltokenizer.cpp 2007-02-08 15:36:15.000000000 -0500
-@@ -316,7 +316,7 @@
- while ( !src.isEmpty() ) {
- checkScriptBuffer();
- unsigned char ch = src->latin1();
-- if ( !scriptCodeResync && !brokenComments && !textarea && !xmp && !title && ch == '-' && scriptCodeSize >= 3 && !src.escaped() && QConstString( scriptCode+scriptCodeSize-3, 3 ).string() == "<!-" ) {
-+ if ( !scriptCodeResync && !brokenComments && !textarea && !xmp && ch == '-' && scriptCodeSize >= 3 && !src.escaped() && QConstString( scriptCode+scriptCodeSize-3, 3 ).string() == "<!-" ) {
- comment = true;
- scriptCode[ scriptCodeSize++ ] = ch;
- ++src;
-@@ -495,7 +495,7 @@
-
- if (canClose || handleBrokenComments || scriptEnd ){
- ++src;
-- if ( !( script || xmp || textarea || style) ) {
-+ if ( !( title || script || xmp || textarea || style) ) {
- #ifdef COMMENTS_IN_DOM
- checkScriptBuffer();
- scriptCode[ scriptCodeSize ] = 0;
--- 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
@@ -21,7 +21,7 @@
@@ -492,88 +472,3 @@
kpac_dhcp_helper_SOURCES = kpac_dhcp_helper.c
kpac_dhcp_helper_CFLAGS = $(KDE_USE_FPIE)
---- kdelibs-3.5.6/khtml/ecma/kjs_html.cpp 2007-01-15 06:34:04.000000000 -0500
-+++ kdelibs-3.5.6-new/khtml/ecma/kjs_html.cpp 2007-03-10 10:18:17.000000000 -0500
-@@ -1862,10 +1862,12 @@
- getDOMNode(exec, frameElement.contentDocument()) : Undefined();
- case FrameContentWindow: {
- KHTMLPart* part = static_cast<DOM::HTMLFrameElementImpl*>(frameElement.handle())->contentPart();
-- if (part)
-- return Value(Window::retrieveWindow(part));
-- else
-- return Undefined();
-+ if (part) {
-+ Window *w = Window::retrieveWindow(part);
-+ if (w)
-+ return Value(w);
-+ }
-+ return Undefined();
- }
- case FrameFrameBorder: return String(frameElement.frameBorder());
- case FrameLongDesc: return String(frameElement.longDesc());
-@@ -1895,10 +1897,12 @@
- getDOMNode(exec, iFrame.contentDocument()) : Undefined();
- case IFrameContentWindow: {
- KHTMLPart* part = static_cast<DOM::HTMLIFrameElementImpl*>(iFrame.handle())->contentPart();
-- if (part)
-- return Value(Window::retrieveWindow(part));
-- else
-- return Undefined();
-+ if (part) {
-+ Window *w = Window::retrieveWindow(part);
-+ if (w)
-+ return Value(w);
-+ }
-+ return Undefined();
- }
- case IFrameFrameBorder: return String(iFrame.frameBorder());
- case IFrameHeight: return String(iFrame.height());
---- kdelibs/kioslave/ftp/ftp.cc
-+++ kdelibs/kioslave/ftp/ftp.cc
-@@ -58,6 +58,7 @@
- #include <kmimemagic.h>
- #include <kmimetype.h>
- #include <ksockaddr.h>
-+#include <ksocketaddress.h>
- #include <kio/ioslave_defaults.h>
- #include <kio/slaveconfig.h>
- #include <kremoteencoding.h>
-@@ -835,7 +836,6 @@ bool Ftp::ftpSendCmd( const QCString& cm
- return true;
- }
-
--
- /*
- * ftpOpenPASVDataConnection - set up data connection, using PASV mode
- *
-@@ -853,6 +853,8 @@ int Ftp::ftpOpenPASVDataConnection()
- if (sa != NULL && sa->family() != PF_INET)
- return ERR_INTERNAL; // no PASV for non-PF_INET connections
-
-+ const KInetSocketAddress *sin = static_cast<const KInetSocketAddress*>(sa);
-+
- if (m_extControl & pasvUnknown)
- return ERR_INTERNAL; // already tried and got "unknown command"
-
-@@ -886,14 +888,17 @@ int Ftp::ftpOpenPASVDataConnection()
- }
-
- // Make hostname and port number ...
-- QString host;
-- host.sprintf("%d.%d.%d.%d", i[0], i[1], i[2], i[3]);
- int port = i[4] << 8 | i[5];
-
-+ // we ignore the host part on purpose for two reasons
-+ // a) it might be wrong anyway
-+ // b) it would make us being suceptible to a port scanning attack
-+
- // now connect the data socket ...
- m_data = new FtpSocket("PASV");
-- m_data->setAddress(host, port);
-- kdDebug(7102) << "Connecting to " << host << " on port " << port << endl;
-+ m_data->setAddress(sin->nodeName(), port);
-+
-+ kdDebug(7102) << "Connecting to " << sin->nodeName() << " on port " << port << endl;
- return m_data->connectSocket(connectTimeout(), false);
- }
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070715/59f6a373/attachment.html
More information about the macports-changes
mailing list