[20182] trunk/dports/kde/kdelibs3
source_changes at macosforge.org
source_changes at macosforge.org
Fri Oct 27 11:19:58 PDT 2006
Revision: 20182
http://trac.macosforge.org/projects/macports/changeset/20182
Author: takanori at macports.org
Date: 2006-10-27 11:19:57 -0700 (Fri, 27 Oct 2006)
Log Message:
-----------
Version 3.5.4.
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
Removed Paths:
-------------
trunk/dports/kde/kdelibs3/files/patch-ipprequest.cpp
Modified: trunk/dports/kde/kdelibs3/Portfile
===================================================================
--- trunk/dports/kde/kdelibs3/Portfile 2006-10-27 18:05:41 UTC (rev 20181)
+++ trunk/dports/kde/kdelibs3/Portfile 2006-10-27 18:19:57 UTC (rev 20182)
@@ -1,28 +1,28 @@
# $Id$
-#Synced with Fink, Version 3.5.1-1024
+#Synced with Fink, Version 3.5.4-1021
PortSystem 1.0
name kdelibs3
-version 3.5.1
-revision 4
-set kdeadmin kde-admindir-3.5.1
+version 3.5.4
+set kdeadmin kde-admindir-252
categories kde
maintainers ben at macports.org takanori at macports.org
description Essential libraries for KDE applications. \
NB No KDE sound support.
+long_description ${description}
platforms darwin
-master_sites opendarwin::kde351 \
+homepage http://www.kde.org/
+master_sites opendarwin::kde354 \
opendarwin::admin
# kde:stable/${version}/src
# http://ranger.befunk.com/fink/:admin
-extract.suffix .tar.bz2
use_bzip2 yes
distname kdelibs-${version}
-distfiles ${distname}.tar.bz2:kde351 \
+distfiles ${distname}.tar.bz2:kde354 \
${kdeadmin}.tar.bz2:admin
depends_build port:autoconf \
- port:automake
+ port:unsermake
depends_lib lib:libpoll:poll-emulator \
lib:libX11.6:XFree86 \
port:aspell \
@@ -32,6 +32,7 @@
port:fontconfig \
port:freetype \
port:gettext \
+ port:glib2 \
port:hicolor-icon-theme \
port:jasper \
port:jpeg \
@@ -52,32 +53,31 @@
port:Xft2 \
port:xrender \
port:zlib
+# port:dbus
+# port:dbus-qt3
+# port:hal
-checksums ${distname}.tar.bz2 md5 2a22193ae7c23f3759b02723dab02d30 \
- ${kdeadmin}.tar.bz2 md5 b6115a7310f8e8533af91be02e225d0e
+checksums ${distname}.tar.bz2 md5 979d056ca0e21c12caed270126e60e3e \
+ ${kdeadmin}.tar.bz2 md5 54a89925e71bd32f759c81b312ad0b9e
-extract.only ${distname}.tar.bz2
-post-extract { system "cd ${worksrcpath} && bzcat -dc ${distpath}/${kdeadmin}.tar.bz2 | tar xf -" }
+extract.only ${distname}.tar.bz2
+post-extract { system "cd ${worksrcpath} && bzcat -dc ${distpath}/${kdeadmin}.tar.bz2 | tar xf -" }
-patchfiles kdelibs3-unified.patch patch-ipprequest.cpp patch-CVE-2006-4811
+patchfiles kdelibs3-unified.patch patch-CVE-2006-4811
patch {
cd ${worksrcpath}
foreach file $patchfiles {
- system "sed -e 's, at FINKPREFIX@,${prefix},g' ${portpath}/${filesdir}/${file} | patch -p1"
+ system "sed -e 's, at FINKPREFIX@,${prefix},g' ${filespath}/${file} | patch -p1"
}
+ system "perl -pi -e 's,-O2,-Os,g; s,doc/HTML,doc/kde,g; s,/usr/share/doc/packages/qt3/html,${prefix}/share/doc/qt3/html,g;' admin/*"
}
-post-patch {
- reinplace "s|lib/freetype219/||g" ${worksrcpath}/environment-helper.sh
- reinplace "s|include/qt|include/qt3|g" ${worksrcpath}/environment-helper.sh
+post-patch {
+ reinplace "s|/lib/freetype219||g" ${worksrcpath}/environment-helper.sh
reinplace "s|--with-ssl-dir=/usr|--with-ssl-dir=\$PREFIX|g" ${worksrcpath}/environment-helper.sh
- reinplace "s|2.5\\*|2.\[56\]\\*|g" ${worksrcpath}/admin/cvs.sh
- foreach file [glob ${worksrcpath}/admin/*] {
- reinplace "s|-O2|-Os|g" $file
- reinplace "s|doc/HTML|doc/kde|g" $file
- reinplace "s|/usr/share/doc/packages/qt3/html|${prefix}/share/doc/qt3/html|g" $file
- }
+ reinplace "s|HOME=/tmp|HOME=${workpath}|g" ${worksrcpath}/environment-helper.sh
+ reinplace "s|/tmp/buildlog|${workpath}/buildlog|g" ${worksrcpath}/build-helper.sh
foreach file {CompileScript.sh InstallScript.sh} {
- file copy ${portpath}/${filesdir}/${file} ${worksrcpath}
+ file copy ${filespath}/${file} ${worksrcpath}
reinplace "s|%p|${prefix}|g" ${worksrcpath}/${file}
reinplace "s|%N|${name}|g" ${worksrcpath}/${file}
reinplace "s|%v|${version}|g" ${worksrcpath}/${file}
@@ -89,7 +89,7 @@
}
}
-configure.args --enable-cups --with-ldap=framework --with-gssapi=framework --with-distribution='DarwinPorts/Mac OS X' --without-arts
+configure.args --enable-cups --with-ldap=framework --with-gssapi=framework --with-distribution='MacPorts/Mac OS X' --without-arts
configure {
if {[file exists ${prefix}/bin/cups-config]} {
@@ -101,7 +101,7 @@
build { system "cd ${worksrcpath} && ./CompileScript.sh" }
destroot { system "cd ${worksrcpath} && ./InstallScript.sh" }
-post-destroot {
+post-destroot {
xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
xinstall -m 644 -W ${worksrcpath} COPYING COPYING.LIB INSTALL ${destroot}${prefix}/share/doc/${name}
}
@@ -117,7 +117,7 @@
exit 1
}
-variant apidox {
- depends_lib-append port:doxygen
- post-patch { foreach f {CompileScript.sh InstallScript.sh} { reinplace "s|#apidox#||g" ${worksrcpath}/${f} }}
+variant apidox {
+ 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/CompileScript.sh
===================================================================
--- trunk/dports/kde/kdelibs3/files/CompileScript.sh 2006-10-27 18:05:41 UTC (rev 20181)
+++ trunk/dports/kde/kdelibs3/files/CompileScript.sh 2006-10-27 18:19:57 UTC (rev 20182)
@@ -1,15 +1,9 @@
#!/bin/sh -e
- export HOME=/tmp PREFIX="%p" QTDOCDIR="%p/share/doc/qt3/html"
- export lt_cv_sys_max_cmd_len=65536
+ export PREFIX="%p" USE_UNSERMAKE=1
. ./environment-helper.sh
-#darwinports
- export UNSERMAKE="no"
-
- PRODUCT_VERSION=`uname -r`
-
- case $PRODUCT_VERSION in
+ case $SW_VERSION in
6*|7*)
export CPPFLAGS="$CPPFLAGS -DHAVE_SYS_EXEC_H=1"
;;
@@ -17,9 +11,7 @@
export CPPFLAGS="-I/usr/include/gssapi $CPPFLAGS"
- export CC=gcc CXX=g++
-
./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 make all all_libraries="$ALL_LIBRARIES"
+ ./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 2006-10-27 18:05:41 UTC (rev 20181)
+++ trunk/dports/kde/kdelibs3/files/InstallScript.sh 2006-10-27 18:19:57 UTC (rev 20182)
@@ -1,12 +1,9 @@
#!/bin/sh -e
- export HOME=/tmp PREFIX="%p" QTDOCDIR="%p/share/doc/qt3/html"
+ export PREFIX="%p" USE_UNSERMAKE=1
. ./environment-helper.sh
-#darwinports
- export UNSERMAKE="no"
-
- ./build-helper.sh install %N %v %r make -j1 install DESTDIR=%d
+ ./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
rm -rf %i/share/icons/hicolor/index.theme
Modified: trunk/dports/kde/kdelibs3/files/kdelibs3-unified.patch
===================================================================
--- trunk/dports/kde/kdelibs3/files/kdelibs3-unified.patch 2006-10-27 18:05:41 UTC (rev 20181)
+++ trunk/dports/kde/kdelibs3/files/kdelibs3-unified.patch 2006-10-27 18:19:57 UTC (rev 20182)
@@ -1,22 +1,18 @@
---- kdelibs-3.5.0/darwin/kcmartsrc 1969-12-31 19:00:00.000000000 -0500
-+++ kdelibs-3.5.0-new/darwin/kcmartsrc 2005-11-13 08:18:01.000000000 -0500
-@@ -0,0 +1,14 @@
+
+--- kdelibs-3.5.4/darwin/kcmartsrc 1969-12-31 16:00:00.000000000 -0800
++++ kdelibs-3.5.4-new/darwin/kcmartsrc 2006-07-27 10:33:34.000000000 -0700
+@@ -0,0 +1,9 @@
+[Arts]
-+AddOptions=
-+Arguments=\s-F 10 -S 4096 -a esd -s 60 -m artsmessage -c drkonqi -l 3 -f
++Arguments=\s-F 10 -S 4096 -a esd -d -b 16 -s 60 -m artsmessage -c drkonqi -l 3 -f
++Bits=16
++FullDuplex=true
+AudioIO=esd
-+AutoSuspend=true
-+Bits=0
-+DeviceName=
-+FullDuplex=false
-+Latency=250
-+NetworkTransparent=false
-+SamplingRate=0
++NetworkTransparent=true
+StartRealtime=false
-+StartServer=true
++StartServer=false
+SuspendTime=60
---- kdelibs-3.5.0/darwin/kdeglobals 1969-12-31 19:00:00.000000000 -0500
-+++ kdelibs-3.5.0-new/darwin/kdeglobals 2005-11-13 08:18:01.000000000 -0500
+--- kdelibs-3.5.4/darwin/kdeglobals 1969-12-31 16:00:00.000000000 -0800
++++ kdelibs-3.5.4-new/darwin/kdeglobals 2006-07-27 10:33:34.000000000 -0700
@@ -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
@@ -147,8 +143,16 @@
+
+[WM]
+activeFont=Baghdad,12,-1,5,50,0,0,0,0,0
---- kdelibs-3.5.0/darwin/konsolerc 1969-12-31 19:00:00.000000000 -0500
-+++ kdelibs-3.5.0-new/darwin/konsolerc 2005-11-13 08:18:01.000000000 -0500
+--- kdelibs-3.5.4/darwin/knotifyrc 1969-12-31 16:00:00.000000000 -0800
++++ kdelibs-3.5.4-new/darwin/knotifyrc 2006-07-27 10:33:34.000000000 -0700
+@@ -0,0 +1,5 @@
++[Misc]
++External player=@FINKPREFIX@/bin/mplayer
++LastConfiguredApp=knotify
++Use external player=false
++Volume=100
+--- kdelibs-3.5.4/darwin/konsolerc 1969-12-31 16:00:00.000000000 -0800
++++ kdelibs-3.5.4-new/darwin/konsolerc 2006-07-27 10:33:34.000000000 -0700
@@ -0,0 +1,19 @@
+[Desktop Entry]
+ActiveSession=0
@@ -169,19 +173,8 @@
+schema=Linux.schema
+scrollbar=2
+tabbar=2
---- kdelibs-3.5.0/kabc/Makefile.am 2005-09-10 04:27:01.000000000 -0400
-+++ kdelibs-3.5.0-new/kabc/Makefile.am 2005-11-13 08:18:01.000000000 -0500
-@@ -2,7 +2,7 @@
-
- # Make sure $(all_includes) remains last!
- INCLUDES = -I$(top_builddir)/kabc -I$(top_srcdir)/kabc -I$(top_srcdir)/kab \
-- -I$(srcdir)/vcardparser/ -I$(srcdir)/vcard/include \
-+ -I$(srcdir)/vcard/include -I$(srcdir)/vcardparser/ \
- -I$(srcdir)/vcard/include/generated \
- -I$(srcdir)/vcardparser $(all_includes)
-
---- kdelibs-3.5.0/kdecore/Makefile.am 2005-10-10 11:06:02.000000000 -0400
-+++ kdelibs-3.5.0-new/kdecore/Makefile.am 2005-11-13 08:18:01.000000000 -0500
+--- kdelibs-3.5.4/kdecore/Makefile.am 2005-10-10 08:06:02.000000000 -0700
++++ kdelibs-3.5.4-new/kdecore/Makefile.am 2006-07-27 10:33:34.000000000 -0700
@@ -24,7 +24,7 @@
if include_SVGICONS
@@ -200,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.0/kdecore/kglobalsettings.cpp 2005-10-10 11:06:03.000000000 -0400
-+++ kdelibs-3.5.0-new/kdecore/kglobalsettings.cpp 2005-11-13 08:18:01.000000000 -0500
+--- kdelibs-3.5.4/kdecore/kglobalsettings.cpp 2005-10-10 08:06:03.000000000 -0700
++++ kdelibs-3.5.4-new/kdecore/kglobalsettings.cpp 2006-07-27 10:33:34.000000000 -0700
@@ -491,7 +491,7 @@
s_desktopPath->append('/');
@@ -211,8 +204,8 @@
*s_trashPath = g.readPathEntry( "Trash" , *s_trashPath);
*s_trashPath = QDir::cleanDirPath( *s_trashPath );
if ( !s_trashPath->endsWith("/") )
---- kdelibs-3.5.0/kdecore/ksocks.cpp 2005-10-10 11:06:03.000000000 -0400
-+++ kdelibs-3.5.0-new/kdecore/ksocks.cpp 2005-11-13 08:18:01.000000000 -0500
+--- kdelibs-3.5.4/kdecore/ksocks.cpp 2005-10-10 08:06:03.000000000 -0700
++++ kdelibs-3.5.4-new/kdecore/ksocks.cpp 2006-07-27 10:33:34.000000000 -0700
@@ -480,7 +480,7 @@
ksocklen_t addrlen) {
if (_useSocks && F_connect)
@@ -283,8 +276,8 @@
}
---- kdelibs-3.5.0/kdecore/kstandarddirs.cpp 2005-10-10 11:06:02.000000000 -0400
-+++ kdelibs-3.5.0-new/kdecore/kstandarddirs.cpp 2005-11-13 08:18:01.000000000 -0500
+--- kdelibs-3.5.4/kdecore/kstandarddirs.cpp 2005-10-10 08:06:02.000000000 -0700
++++ kdelibs-3.5.4-new/kdecore/kstandarddirs.cpp 2006-07-27 10:33:34.000000000 -0700
@@ -1020,7 +1020,7 @@
if (!strcmp(type, "data"))
return "share/apps/";
@@ -294,19 +287,9 @@
if (!strcmp(type, "icon"))
return "share/icons/";
if (!strcmp(type, "config"))
---- kdelibs-3.5.0/kdecore/network/kresolvermanager.cpp 2005-09-10 04:27:10.000000000 -0400
-+++ kdelibs-3.5.0-new/kdecore/network/kresolvermanager.cpp 2005-11-13 08:18:01.000000000 -0500
-@@ -31,6 +31,7 @@
-
- #ifdef HAVE_RES_INIT
- # include <sys/stat.h>
-+# include <nameser.h>
- extern "C" {
- # include <arpa/nameser.h>
- }
---- kdelibs-3.5.0/kdecore/network/ksocketdevice.cpp 2005-09-10 04:27:10.000000000 -0400
-+++ kdelibs-3.5.0-new/kdecore/network/ksocketdevice.cpp 2005-11-13 08:18:01.000000000 -0500
-@@ -311,7 +311,7 @@
+--- kdelibs-3.5.4/kdecore/network/ksocketdevice.cpp 2006-01-19 09:06:14.000000000 -0800
++++ kdelibs-3.5.4-new/kdecore/network/ksocketdevice.cpp 2006-07-27 10:33:34.000000000 -0700
+@@ -316,7 +316,7 @@
}
struct sockaddr sa;
@@ -315,7 +298,7 @@
int newfd = kde_accept(m_sockfd, &sa, &len);
if (newfd == -1)
{
-@@ -385,7 +385,7 @@
+@@ -390,7 +390,7 @@
static int do_read_common(int sockfd, char *data, Q_ULONG maxlen, KSocketAddress* from, ssize_t &retval, bool peek = false)
{
@@ -324,26 +307,26 @@
if (from)
{
from->setLength(len = 128); // arbitrary length
-@@ -527,7 +527,7 @@
- if (m_sockfd == -1)
- return KSocketAddress(); // not open, empty value
+@@ -535,7 +535,7 @@
+ if (d->local.family() != AF_UNSPEC)
+ return d->local;
- socklen_t len;
+ kde_socklen_t len;
KSocketAddress localAddress;
localAddress.setLength(len = 32); // arbitrary value
if (kde_getsockname(m_sockfd, localAddress.address(), &len) == -1)
-@@ -556,7 +556,7 @@
- if (m_sockfd == -1)
- return KSocketAddress(); // not open, empty value
+@@ -567,7 +567,7 @@
+ if (d->peer.family() != AF_UNSPEC)
+ return d->peer;
- socklen_t len;
+ kde_socklen_t len;
KSocketAddress peerAddress;
peerAddress.setLength(len = 32); // arbitrary value
if (kde_getpeername(m_sockfd, peerAddress.address(), &len) == -1)
---- kdelibs-3.5.0/kdecore/network/syssocket.h 2005-09-10 04:27:10.000000000 -0400
-+++ kdelibs-3.5.0-new/kdecore/network/syssocket.h 2005-11-13 08:18:01.000000000 -0500
+--- kdelibs-3.5.4/kdecore/network/syssocket.h 2005-09-10 01:27:10.000000000 -0700
++++ kdelibs-3.5.4-new/kdecore/network/syssocket.h 2006-07-27 10:33:34.000000000 -0700
@@ -53,7 +53,7 @@
}
@@ -383,8 +366,37 @@
{
return ::getsockname(fd, sa, len);
}
---- kdelibs-3.5.0/kdeprint/configure.in.in 2005-09-10 04:27:43.000000000 -0400
-+++ kdelibs-3.5.0-new/kdeprint/configure.in.in 2005-11-13 08:18:01.000000000 -0500
+--- kdelibs-3.5.4/kded/Makefile.am 2005-10-10 08:06:29.000000000 -0700
++++ kdelibs-3.5.4-new/kded/Makefile.am 2006-07-27 10:33:35.000000000 -0700
+@@ -58,7 +58,10 @@
+ servicetype_DATA = kdedmodule.desktop
+ servicetypedir = $(kde_servicetypesdir)
+
+-xdg_menu_DATA = applications.menu
++kde-applications.menu: applications.menu
++ cat applications.menu > kde-applications.menu
++
++xdg_menu_DATA = kde-applications.menu
+
+ update_DATA = kded.upd
+ updatedir = $(kde_datadir)/kconf_update
+--- kdelibs-3.5.4/kded/kbuildsycoca.cpp 2005-11-08 14:39:36.000000000 -0800
++++ kdelibs-3.5.4-new/kded/kbuildsycoca.cpp 2006-07-27 10:33:35.000000000 -0700
+@@ -379,7 +379,11 @@
+ connect(g_vfolder, SIGNAL(newService(const QString &, KService **)),
+ this, SLOT(slotCreateEntry(const QString &, KService **)));
+
+- VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("applications.menu", true);
++ VFolderMenu::SubMenu *kdeMenu;
++ if ( QFile::exists( "@FINKPREFIX@/etc/xdg/menus/kde-applications.menu" ) )
++ kdeMenu = g_vfolder->parseMenu("kde-applications.menu", true);
++ else
++ kdeMenu = g_vfolder->parseMenu("applications.menu", true);
+
+ KServiceGroup *entry = g_bsgf->addNew("/", kdeMenu->directoryFile, 0, false);
+ entry->setLayoutInfo(kdeMenu->layoutList);
+--- kdelibs-3.5.4/kdeprint/configure.in.in 2005-09-10 01:27:43.000000000 -0700
++++ kdelibs-3.5.4-new/kdeprint/configure.in.in 2006-07-27 10:33:35.000000000 -0700
@@ -80,7 +80,7 @@
dnl check if CUPS is at least 1.1.20
@@ -394,27 +406,8 @@
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.0/kdesu/su.cpp 2005-09-10 04:27:02.000000000 -0400
-+++ kdelibs-3.5.0-new/kdesu/su.cpp 2005-11-13 08:19:28.000000000 -0500
-@@ -75,6 +75,8 @@
-
- QCStringList args;
-
-+ args += "-c";
-+ args += "staff";
- if ((m_Scheduler != SchedNormal) || (m_Priority > 50))
- args += "root";
- else
-@@ -82,7 +84,6 @@
-
- args += "-c";
- args += QCString(__KDE_BINDIR) + "/kdesu_stub";
-- args += "-";
-
- QCString command = __PATH_SU;
- if (::access(__PATH_SU, X_OK) != 0)
---- kdelibs-3.5.0/kdeui/Makefile.am 2005-10-10 11:06:38.000000000 -0400
-+++ kdelibs-3.5.0-new/kdeui/Makefile.am 2005-11-13 08:18:02.000000000 -0500
+--- kdelibs-3.5.4/kdeui/Makefile.am 2005-10-10 08:06:38.000000000 -0700
++++ kdelibs-3.5.4-new/kdeui/Makefile.am 2006-07-27 10:33:35.000000000 -0700
@@ -27,10 +27,10 @@
AM_LDFLAGS = $(LDFLAGS_AS_NEEDED) $(LDFLAGS_NEW_DTAGS)
@@ -428,8 +421,8 @@
libkspell_la_LIBADD = libkdeui.la
libkspell_la_SOURCES = dummy.cpp
---- kdelibs-3.5.0/kimgio/Makefile.am 2005-09-10 04:26:42.000000000 -0400
-+++ kdelibs-3.5.0-new/kimgio/Makefile.am 2005-11-13 08:18:02.000000000 -0500
+--- kdelibs-3.5.4/kimgio/Makefile.am 2005-09-10 01:26:42.000000000 -0700
++++ kdelibs-3.5.4-new/kimgio/Makefile.am 2006-07-27 10:33:35.000000000 -0700
@@ -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
@@ -439,8 +432,8 @@
kimg_tiff_la_SOURCES = tiffr.cpp
kimg_tiff_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
---- kdelibs-3.5.0/kinit/Makefile.am 2005-10-10 11:05:37.000000000 -0400
-+++ kdelibs-3.5.0-new/kinit/Makefile.am 2005-11-13 08:18:02.000000000 -0500
+--- kdelibs-3.5.4/kinit/Makefile.am 2005-10-10 08:05:37.000000000 -0700
++++ kdelibs-3.5.4-new/kinit/Makefile.am 2006-07-27 10:33:35.000000000 -0700
@@ -15,7 +15,7 @@
# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
# Boston, MA 02110-1301, USA.
@@ -450,9 +443,9 @@
SUBDIRS = . tests
---- kdelibs-3.5.0/kio/kssl/kopenssl.cc 2005-10-10 11:05:44.000000000 -0400
-+++ kdelibs-3.5.0-new/kio/kssl/kopenssl.cc 2005-11-13 08:18:02.000000000 -0500
-@@ -322,6 +322,7 @@
+--- kdelibs-3.5.4/kio/kssl/kopenssl.cc 2006-07-22 01:16:39.000000000 -0700
++++ kdelibs-3.5.4-new/kio/kssl/kopenssl.cc 2006-07-27 10:33:35.000000000 -0700
+@@ -323,6 +323,7 @@
#elif defined(_AIX)
<< "libssl.a(libssl.so.0)"
#elif defined(__APPLE__)
@@ -460,7 +453,7 @@
<< "libssl.dylib"
<< "libssl.0.9.dylib"
#else
-@@ -339,6 +340,7 @@
+@@ -340,6 +341,7 @@
#elif defined(_AIX)
<< "libcrypto.a(libcrypto.so.0)"
#elif defined(__APPLE__)
@@ -468,8 +461,8 @@
<< "libcrypto.dylib"
<< "libcrypto.0.9.dylib"
#else
---- kdelibs-3.5.0/kio/misc/kpac/Makefile.am 2005-09-10 04:26:47.000000000 -0400
-+++ kdelibs-3.5.0-new/kio/misc/kpac/Makefile.am 2005-11-13 08:20:00.000000000 -0500
+--- kdelibs-3.5.4/kio/misc/kpac/Makefile.am 2005-09-10 01:26:47.000000000 -0700
++++ kdelibs-3.5.4-new/kio/misc/kpac/Makefile.am 2006-07-27 10:33:35.000000000 -0700
@@ -10,7 +10,7 @@
kded_proxyscout_la_SOURCES = proxyscout.skel proxyscout.cpp script.cpp \
downloader.cpp discovery.cpp
@@ -479,40 +472,3 @@
kpac_dhcp_helper_SOURCES = kpac_dhcp_helper.c
kpac_dhcp_helper_CFLAGS = $(KDE_USE_FPIE)
---- kdelibs-3.5.0/kwallet/backend/sha1.cc 2005-11-08 17:39:19.000000000 -0500
-+++ kdelibs-3.5.0-new/kwallet/backend/sha1.cc 2005-11-13 08:18:03.000000000 -0500
-@@ -23,6 +23,9 @@
- #ifdef HAVE_SYS_TYPES_H
- #include <sys/types.h>
- #endif
-+#ifdef HAVE_STDINT_H
-+#include <stdint.h> /* For uintXX_t on OSX */
-+#endif
- #ifdef HAVE_SYS_BITYPES_H
- #include <sys/bitypes.h> /* For uintXX_t on Tru64 */
- #endif
---- kdelibs-3.5.0/kded/kbuildsycoca.cpp Tue Nov 8 17:39:36 2005
-+++ kdelibs-3.5.0-new/kded/kbuildsycoca.cpp Mon Dec 12 14:39:41 2005
-@@ -379,7 +379,7 @@
- connect(g_vfolder, SIGNAL(newService(const QString &, KService **)),
- this, SLOT(slotCreateEntry(const QString &, KService **)));
-
-- VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("applications.menu", true);
-+ VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("kde-applications.menu", true);
-
- KServiceGroup *entry = g_bsgf->addNew("/", kdeMenu->directoryFile, 0, false);
- entry->setLayoutInfo(kdeMenu->layoutList);
---- kdelibs-3.5.1/kded/Makefile.am Mon Oct 10 11:06:29 2005
-+++ kdelibs-3.5.1-new/kded/Makefile.am Sun Jan 22 10:14:31 2006
-@@ -58,7 +58,10 @@
- servicetype_DATA = kdedmodule.desktop
- servicetypedir = $(kde_servicetypesdir)
-
--xdg_menu_DATA = applications.menu
-+kde-applications.menu: applications.menu
-+ cat applications.menu > kde-applications.menu
-+
-+xdg_menu_DATA = kde-applications.menu
-
- update_DATA = kded.upd
- updatedir = $(kde_datadir)/kconf_update
Deleted: trunk/dports/kde/kdelibs3/files/patch-ipprequest.cpp
===================================================================
--- trunk/dports/kde/kdelibs3/files/patch-ipprequest.cpp 2006-10-27 18:05:41 UTC (rev 20181)
+++ trunk/dports/kde/kdelibs3/files/patch-ipprequest.cpp 2006-10-27 18:19:57 UTC (rev 20182)
@@ -1,19 +0,0 @@
---- kdelibs-3.5.1/kdeprint/cups/ipprequest.cpp~ 2005-10-11 00:06:30.000000000 +0900
-+++ kdelibs-3.5.1/kdeprint/cups/ipprequest.cpp 2006-08-17 17:38:42.000000000 +0900
-@@ -511,6 +511,10 @@
- cupsFreeOptions(n, options);
-
- // find an remove that annoying "document-format" attribute
-+#if CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2
-+ ipp_attribute_t *attr = ippFindAttribute(request_, "document-format", IPP_TAG_NAME);
-+ ippDeleteAttribute(request_, attr);
-+#else
- ipp_attribute_t *attr = request_->attrs;
- while (attr)
- {
-@@ -523,4 +527,5 @@
- }
- attr = attr->next;
- }
-+#endif
- }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20061027/03bb18e0/attachment.html
More information about the macports-changes
mailing list