Author: ranger
Date: Sun Aug 5 23:13:23 2007
New Revision: 925
URL:
http://svn.finkproject.org/websvn/listing.php?sc=1&rev=925&repname=user%3a+ranger
Log:
maybe this will help?
Modified:
trunk/experimental/10.3/main/finkinfo/kde/kdelibs3-unified.patch
trunk/experimental/10.4/main/finkinfo/kde/kdelibs3-unified.patch
trunk/experimental/common/main/finkinfo/kde/kdelibs3-unified.patch
Modified: trunk/experimental/10.3/main/finkinfo/kde/kdelibs3-unified.patch
URL:
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.3/main/finkinfo/kde/kdelibs3-unified.patch&rev=925&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/10.3/main/finkinfo/kde/kdelibs3-unified.patch (original)
+++ trunk/experimental/10.3/main/finkinfo/kde/kdelibs3-unified.patch Sun Aug 5
23:13:23 2007
@@ -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.7/darwin/kcmartsrc 1969-12-31 18:00:00.000000000 -0600
++++ kdelibs-3.5.7-new/darwin/kcmartsrc 2007-08-05 16:11:44.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
@@ -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.7/darwin/kdeglobals 1969-12-31 18:00:00.000000000 -0600
++++ kdelibs-3.5.7-new/darwin/kdeglobals 2007-08-05 16:11:44.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
@@ -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.7/darwin/knotifyrc 1969-12-31 18:00:00.000000000 -0600
++++ kdelibs-3.5.7-new/darwin/knotifyrc 2007-08-05 16:11:44.000000000 -0500
@@ -0,0 +1,5 @@
+[Misc]
+External [EMAIL PROTECTED]@/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.7/darwin/konsolerc 1969-12-31 18:00:00.000000000 -0600
++++ kdelibs-3.5.7-new/darwin/konsolerc 2007-08-05 16:11:44.000000000 -0500
@@ -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.7/kdecore/Makefile.am 2006-10-01 12:33:38.000000000 -0500
++++ kdelibs-3.5.7-new/kdecore/Makefile.am 2007-08-05 16:11:44.000000000
-0500
@@ -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.7/kdecore/kglobalsettings.cpp 2005-10-10 10:06:03.000000000
-0500
++++ kdelibs-3.5.7-new/kdecore/kglobalsettings.cpp 2007-08-05
16:11:44.000000000 -0500
@@ -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.7/kdecore/ksocks.cpp 2005-10-10 10:06:03.000000000 -0500
++++ kdelibs-3.5.7-new/kdecore/ksocks.cpp 2007-08-05 16:11:44.000000000
-0500
@@ -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.7/kdecore/kstandarddirs.cpp 2007-01-15 05:34:17.000000000
-0600
++++ kdelibs-3.5.7-new/kdecore/kstandarddirs.cpp 2007-08-05
16:11:44.000000000 -0500
@@ -1021,7 +1021,7 @@
if (!strcmp(type, "data"))
return "share/apps/";
@@ -287,8 +287,8 @@
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
+--- kdelibs-3.5.7/kdecore/network/ksocketdevice.cpp 2007-01-15
05:34:17.000000000 -0600
++++ kdelibs-3.5.7-new/kdecore/network/ksocketdevice.cpp 2007-08-05
16:11:44.000000000 -0500
@@ -316,7 +316,7 @@
}
@@ -325,8 +325,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.7/kdecore/network/syssocket.h 2005-09-10 03:27:10.000000000
-0500
++++ kdelibs-3.5.7-new/kdecore/network/syssocket.h 2007-08-05
16:11:44.000000000 -0500
@@ -53,7 +53,7 @@
}
@@ -366,8 +366,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.7/kded/Makefile.am 2005-10-10 10:06:29.000000000 -0500
++++ kdelibs-3.5.7-new/kded/Makefile.am 2007-08-05 16:11:44.000000000 -0500
@@ -58,7 +58,10 @@
servicetype_DATA = kdedmodule.desktop
servicetypedir = $(kde_servicetypesdir)
@@ -380,8 +380,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.7/kded/kbuildsycoca.cpp 2007-05-14 02:52:43.000000000
-0500
++++ kdelibs-3.5.7-new/kded/kbuildsycoca.cpp 2007-08-05 16:11:44.000000000
-0500
@@ -379,7 +379,11 @@
connect(g_vfolder, SIGNAL(newService(const QString &, KService **)),
this, SLOT(slotCreateEntry(const QString &, KService **)));
@@ -395,8 +395,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.7/kdeprint/configure.in.in 2005-09-10 03:27:43.000000000
-0500
++++ kdelibs-3.5.7-new/kdeprint/configure.in.in 2007-08-05 16:11:44.000000000
-0500
@@ -80,7 +80,7 @@
dnl check if CUPS is at least 1.1.20
@@ -406,8 +406,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.7/kdeprint/cups/Makefile.am 2006-10-02 05:46:55.000000000
-0500
++++ kdelibs-3.5.7-new/kdeprint/cups/Makefile.am 2007-08-05
16:12:03.000000000 -0500
+@@ -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.7/kdeprint/cups/cupsdconf2/Makefile.am 2005-09-10
03:27:41.000000000 -0500
++++ kdelibs-3.5.7-new/kdeprint/cups/cupsdconf2/Makefile.am 2007-08-05
16:12:16.000000000 -0500
+@@ -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.7/kdeui/Makefile.am 2005-10-10 10:06:38.000000000 -0500
++++ kdelibs-3.5.7-new/kdeui/Makefile.am 2007-08-05 16:11:44.000000000
-0500
@@ -27,10 +27,10 @@
AM_LDFLAGS = $(LDFLAGS_AS_NEEDED) $(LDFLAGS_NEW_DTAGS)
@@ -421,8 +447,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.7/kimgio/Makefile.am 2005-09-10 03:26:42.000000000 -0500
++++ kdelibs-3.5.7-new/kimgio/Makefile.am 2007-08-05 16:11:44.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
@@ -432,8 +458,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.7/kinit/Makefile.am 2007-01-15 05:33:56.000000000 -0600
++++ kdelibs-3.5.7-new/kinit/Makefile.am 2007-08-05 16:11:44.000000000
-0500
@@ -15,7 +15,7 @@
# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
# Boston, MA 02110-1301, USA.
@@ -443,8 +469,8 @@
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.7/kio/kssl/kopenssl.cc 2006-07-22 03:16:39.000000000 -0500
++++ kdelibs-3.5.7-new/kio/kssl/kopenssl.cc 2007-08-05 16:11:44.000000000
-0500
@@ -323,6 +323,7 @@
#elif defined(_AIX)
<< "libssl.a(libssl.so.0)"
@@ -461,8 +487,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.7/kio/misc/kpac/Makefile.am 2005-09-10 03:26:47.000000000
-0500
++++ kdelibs-3.5.7-new/kio/misc/kpac/Makefile.am 2007-08-05
16:11:44.000000000 -0500
@@ -10,7 +10,7 @@
kded_proxyscout_la_SOURCES = proxyscout.skel proxyscout.cpp script.cpp \
downloader.cpp discovery.cpp
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=925&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 Sun Aug 5
23:13:23 2007
@@ -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.7/darwin/kcmartsrc 1969-12-31 18:00:00.000000000 -0600
++++ kdelibs-3.5.7-new/darwin/kcmartsrc 2007-08-05 16:11:44.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
@@ -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.7/darwin/kdeglobals 1969-12-31 18:00:00.000000000 -0600
++++ kdelibs-3.5.7-new/darwin/kdeglobals 2007-08-05 16:11:44.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
@@ -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.7/darwin/knotifyrc 1969-12-31 18:00:00.000000000 -0600
++++ kdelibs-3.5.7-new/darwin/knotifyrc 2007-08-05 16:11:44.000000000 -0500
@@ -0,0 +1,5 @@
+[Misc]
+External [EMAIL PROTECTED]@/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.7/darwin/konsolerc 1969-12-31 18:00:00.000000000 -0600
++++ kdelibs-3.5.7-new/darwin/konsolerc 2007-08-05 16:11:44.000000000 -0500
@@ -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.7/kdecore/Makefile.am 2006-10-01 12:33:38.000000000 -0500
++++ kdelibs-3.5.7-new/kdecore/Makefile.am 2007-08-05 16:11:44.000000000
-0500
@@ -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.7/kdecore/kglobalsettings.cpp 2005-10-10 10:06:03.000000000
-0500
++++ kdelibs-3.5.7-new/kdecore/kglobalsettings.cpp 2007-08-05
16:11:44.000000000 -0500
@@ -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.7/kdecore/ksocks.cpp 2005-10-10 10:06:03.000000000 -0500
++++ kdelibs-3.5.7-new/kdecore/ksocks.cpp 2007-08-05 16:11:44.000000000
-0500
@@ -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.7/kdecore/kstandarddirs.cpp 2007-01-15 05:34:17.000000000
-0600
++++ kdelibs-3.5.7-new/kdecore/kstandarddirs.cpp 2007-08-05
16:11:44.000000000 -0500
@@ -1021,7 +1021,7 @@
if (!strcmp(type, "data"))
return "share/apps/";
@@ -287,8 +287,8 @@
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
+--- kdelibs-3.5.7/kdecore/network/ksocketdevice.cpp 2007-01-15
05:34:17.000000000 -0600
++++ kdelibs-3.5.7-new/kdecore/network/ksocketdevice.cpp 2007-08-05
16:11:44.000000000 -0500
@@ -316,7 +316,7 @@
}
@@ -325,8 +325,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.7/kdecore/network/syssocket.h 2005-09-10 03:27:10.000000000
-0500
++++ kdelibs-3.5.7-new/kdecore/network/syssocket.h 2007-08-05
16:11:44.000000000 -0500
@@ -53,7 +53,7 @@
}
@@ -366,8 +366,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.7/kded/Makefile.am 2005-10-10 10:06:29.000000000 -0500
++++ kdelibs-3.5.7-new/kded/Makefile.am 2007-08-05 16:11:44.000000000 -0500
@@ -58,7 +58,10 @@
servicetype_DATA = kdedmodule.desktop
servicetypedir = $(kde_servicetypesdir)
@@ -380,8 +380,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.7/kded/kbuildsycoca.cpp 2007-05-14 02:52:43.000000000
-0500
++++ kdelibs-3.5.7-new/kded/kbuildsycoca.cpp 2007-08-05 16:11:44.000000000
-0500
@@ -379,7 +379,11 @@
connect(g_vfolder, SIGNAL(newService(const QString &, KService **)),
this, SLOT(slotCreateEntry(const QString &, KService **)));
@@ -395,8 +395,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.7/kdeprint/configure.in.in 2005-09-10 03:27:43.000000000
-0500
++++ kdelibs-3.5.7-new/kdeprint/configure.in.in 2007-08-05 16:11:44.000000000
-0500
@@ -80,7 +80,7 @@
dnl check if CUPS is at least 1.1.20
@@ -406,8 +406,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.7/kdeprint/cups/Makefile.am 2006-10-02 05:46:55.000000000
-0500
++++ kdelibs-3.5.7-new/kdeprint/cups/Makefile.am 2007-08-05
16:12:03.000000000 -0500
+@@ -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.7/kdeprint/cups/cupsdconf2/Makefile.am 2005-09-10
03:27:41.000000000 -0500
++++ kdelibs-3.5.7-new/kdeprint/cups/cupsdconf2/Makefile.am 2007-08-05
16:12:16.000000000 -0500
+@@ -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.7/kdeui/Makefile.am 2005-10-10 10:06:38.000000000 -0500
++++ kdelibs-3.5.7-new/kdeui/Makefile.am 2007-08-05 16:11:44.000000000
-0500
@@ -27,10 +27,10 @@
AM_LDFLAGS = $(LDFLAGS_AS_NEEDED) $(LDFLAGS_NEW_DTAGS)
@@ -421,8 +447,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.7/kimgio/Makefile.am 2005-09-10 03:26:42.000000000 -0500
++++ kdelibs-3.5.7-new/kimgio/Makefile.am 2007-08-05 16:11:44.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
@@ -432,8 +458,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.7/kinit/Makefile.am 2007-01-15 05:33:56.000000000 -0600
++++ kdelibs-3.5.7-new/kinit/Makefile.am 2007-08-05 16:11:44.000000000
-0500
@@ -15,7 +15,7 @@
# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
# Boston, MA 02110-1301, USA.
@@ -443,8 +469,8 @@
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.7/kio/kssl/kopenssl.cc 2006-07-22 03:16:39.000000000 -0500
++++ kdelibs-3.5.7-new/kio/kssl/kopenssl.cc 2007-08-05 16:11:44.000000000
-0500
@@ -323,6 +323,7 @@
#elif defined(_AIX)
<< "libssl.a(libssl.so.0)"
@@ -461,8 +487,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.7/kio/misc/kpac/Makefile.am 2005-09-10 03:26:47.000000000
-0500
++++ kdelibs-3.5.7-new/kio/misc/kpac/Makefile.am 2007-08-05
16:11:44.000000000 -0500
@@ -10,7 +10,7 @@
kded_proxyscout_la_SOURCES = proxyscout.skel proxyscout.cpp script.cpp \
downloader.cpp discovery.cpp
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=925&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/common/main/finkinfo/kde/kdelibs3-unified.patch
(original)
+++ trunk/experimental/common/main/finkinfo/kde/kdelibs3-unified.patch Sun Aug
5 23:13:23 2007
@@ -1,6 +1,6 @@
-diff -uNr kdelibs-3.5.6/darwin/kcmartsrc kdelibs-3.5.6-new/darwin/kcmartsrc
---- 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
+diff -uNr kdelibs-3.5.7/darwin/kcmartsrc kdelibs-3.5.7-new/darwin/kcmartsrc
+--- kdelibs-3.5.7/darwin/kcmartsrc 1969-12-31 18:00:00.000000000 -0600
++++ kdelibs-3.5.7-new/darwin/kcmartsrc 2007-08-05 16:11:44.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
@@ -11,9 +11,9 @@
+StartRealtime=false
+StartServer=false
+SuspendTime=60
-diff -uNr kdelibs-3.5.6/darwin/kdeglobals kdelibs-3.5.6-new/darwin/kdeglobals
---- 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
+diff -uNr kdelibs-3.5.7/darwin/kdeglobals kdelibs-3.5.7-new/darwin/kdeglobals
+--- kdelibs-3.5.7/darwin/kdeglobals 1969-12-31 18:00:00.000000000 -0600
++++ kdelibs-3.5.7-new/darwin/kdeglobals 2007-08-05 16:11:44.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,18 +144,18 @@
+
+[WM]
+activeFont=Baghdad,12,-1,5,50,0,0,0,0,0
-diff -uNr kdelibs-3.5.6/darwin/knotifyrc kdelibs-3.5.6-new/darwin/knotifyrc
---- 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
+diff -uNr kdelibs-3.5.7/darwin/knotifyrc kdelibs-3.5.7-new/darwin/knotifyrc
+--- kdelibs-3.5.7/darwin/knotifyrc 1969-12-31 18:00:00.000000000 -0600
++++ kdelibs-3.5.7-new/darwin/knotifyrc 2007-08-05 16:11:44.000000000 -0500
@@ -0,0 +1,5 @@
+[Misc]
+External [EMAIL PROTECTED]@/bin/mplayer
+LastConfiguredApp=knotify
+Use external player=false
+Volume=100
-diff -uNr kdelibs-3.5.6/darwin/konsolerc kdelibs-3.5.6-new/darwin/konsolerc
---- 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
+diff -uNr kdelibs-3.5.7/darwin/konsolerc kdelibs-3.5.7-new/darwin/konsolerc
+--- kdelibs-3.5.7/darwin/konsolerc 1969-12-31 18:00:00.000000000 -0600
++++ kdelibs-3.5.7-new/darwin/konsolerc 2007-08-05 16:11:44.000000000 -0500
@@ -0,0 +1,19 @@
+[Desktop Entry]
+ActiveSession=0
@@ -176,9 +176,9 @@
+schema=Linux.schema
+scrollbar=2
+tabbar=2
-diff -uNr kdelibs-3.5.6/kdecore/Makefile.am
kdelibs-3.5.6-new/kdecore/Makefile.am
---- 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
+diff -uNr kdelibs-3.5.7/kdecore/Makefile.am
kdelibs-3.5.7-new/kdecore/Makefile.am
+--- kdelibs-3.5.7/kdecore/Makefile.am 2006-10-01 12:33:38.000000000 -0500
++++ kdelibs-3.5.7-new/kdecore/Makefile.am 2007-08-05 16:11:44.000000000
-0500
@@ -24,7 +24,7 @@
if include_SVGICONS
@@ -197,9 +197,9 @@
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
-diff -uNr kdelibs-3.5.6/kdecore/kglobalsettings.cpp
kdelibs-3.5.6-new/kdecore/kglobalsettings.cpp
---- 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
+diff -uNr kdelibs-3.5.7/kdecore/kglobalsettings.cpp
kdelibs-3.5.7-new/kdecore/kglobalsettings.cpp
+--- kdelibs-3.5.7/kdecore/kglobalsettings.cpp 2005-10-10 10:06:03.000000000
-0500
++++ kdelibs-3.5.7-new/kdecore/kglobalsettings.cpp 2007-08-05
16:11:44.000000000 -0500
@@ -491,7 +491,7 @@
s_desktopPath->append('/');
@@ -209,9 +209,9 @@
*s_trashPath = g.readPathEntry( "Trash" , *s_trashPath);
*s_trashPath = QDir::cleanDirPath( *s_trashPath );
if ( !s_trashPath->endsWith("/") )
-diff -uNr kdelibs-3.5.6/kdecore/ksocks.cpp kdelibs-3.5.6-new/kdecore/ksocks.cpp
---- 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
+diff -uNr kdelibs-3.5.7/kdecore/ksocks.cpp kdelibs-3.5.7-new/kdecore/ksocks.cpp
+--- kdelibs-3.5.7/kdecore/ksocks.cpp 2005-10-10 10:06:03.000000000 -0500
++++ kdelibs-3.5.7-new/kdecore/ksocks.cpp 2007-08-05 16:11:44.000000000
-0500
@@ -480,7 +480,7 @@
ksocklen_t addrlen) {
if (_useSocks && F_connect)
@@ -282,9 +282,9 @@
}
-diff -uNr kdelibs-3.5.6/kdecore/kstandarddirs.cpp
kdelibs-3.5.6-new/kdecore/kstandarddirs.cpp
---- 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
+diff -uNr kdelibs-3.5.7/kdecore/kstandarddirs.cpp
kdelibs-3.5.7-new/kdecore/kstandarddirs.cpp
+--- kdelibs-3.5.7/kdecore/kstandarddirs.cpp 2007-01-15 05:34:17.000000000
-0600
++++ kdelibs-3.5.7-new/kdecore/kstandarddirs.cpp 2007-08-05
16:11:44.000000000 -0500
@@ -1021,7 +1021,7 @@
if (!strcmp(type, "data"))
return "share/apps/";
@@ -294,9 +294,9 @@
if (!strcmp(type, "icon"))
return "share/icons/";
if (!strcmp(type, "config"))
-diff -uNr kdelibs-3.5.6/kdecore/network/ksocketdevice.cpp
kdelibs-3.5.6-new/kdecore/network/ksocketdevice.cpp
---- 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
+diff -uNr kdelibs-3.5.7/kdecore/network/ksocketdevice.cpp
kdelibs-3.5.7-new/kdecore/network/ksocketdevice.cpp
+--- kdelibs-3.5.7/kdecore/network/ksocketdevice.cpp 2007-01-15
05:34:17.000000000 -0600
++++ kdelibs-3.5.7-new/kdecore/network/ksocketdevice.cpp 2007-08-05
16:11:44.000000000 -0500
@@ -316,7 +316,7 @@
}
@@ -333,9 +333,9 @@
KSocketAddress peerAddress;
peerAddress.setLength(len = 32); // arbitrary value
if (kde_getpeername(m_sockfd, peerAddress.address(), &len) == -1)
-diff -uNr kdelibs-3.5.6/kdecore/network/syssocket.h
kdelibs-3.5.6-new/kdecore/network/syssocket.h
---- 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
+diff -uNr kdelibs-3.5.7/kdecore/network/syssocket.h
kdelibs-3.5.7-new/kdecore/network/syssocket.h
+--- kdelibs-3.5.7/kdecore/network/syssocket.h 2005-09-10 03:27:10.000000000
-0500
++++ kdelibs-3.5.7-new/kdecore/network/syssocket.h 2007-08-05
16:11:44.000000000 -0500
@@ -53,7 +53,7 @@
}
@@ -375,9 +375,9 @@
{
return ::getsockname(fd, sa, len);
}
-diff -uNr kdelibs-3.5.6/kded/Makefile.am kdelibs-3.5.6-new/kded/Makefile.am
---- 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
+diff -uNr kdelibs-3.5.7/kded/Makefile.am kdelibs-3.5.7-new/kded/Makefile.am
+--- kdelibs-3.5.7/kded/Makefile.am 2005-10-10 10:06:29.000000000 -0500
++++ kdelibs-3.5.7-new/kded/Makefile.am 2007-08-05 16:11:44.000000000 -0500
@@ -58,7 +58,10 @@
servicetype_DATA = kdedmodule.desktop
servicetypedir = $(kde_servicetypesdir)
@@ -390,9 +390,9 @@
update_DATA = kded.upd
updatedir = $(kde_datadir)/kconf_update
-diff -uNr kdelibs-3.5.6/kded/kbuildsycoca.cpp
kdelibs-3.5.6-new/kded/kbuildsycoca.cpp
---- 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
+diff -uNr kdelibs-3.5.7/kded/kbuildsycoca.cpp
kdelibs-3.5.7-new/kded/kbuildsycoca.cpp
+--- kdelibs-3.5.7/kded/kbuildsycoca.cpp 2007-05-14 02:52:43.000000000
-0500
++++ kdelibs-3.5.7-new/kded/kbuildsycoca.cpp 2007-08-05 16:11:44.000000000
-0500
@@ -379,7 +379,11 @@
connect(g_vfolder, SIGNAL(newService(const QString &, KService **)),
this, SLOT(slotCreateEntry(const QString &, KService **)));
@@ -406,9 +406,9 @@
KServiceGroup *entry = g_bsgf->addNew("/", kdeMenu->directoryFile, 0,
false);
entry->setLayoutInfo(kdeMenu->layoutList);
-diff -uNr kdelibs-3.5.6/kdeprint/configure.in.in
kdelibs-3.5.6-new/kdeprint/configure.in.in
---- 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
+diff -uNr kdelibs-3.5.7/kdeprint/configure.in.in
kdelibs-3.5.7-new/kdeprint/configure.in.in
+--- kdelibs-3.5.7/kdeprint/configure.in.in 2005-09-10 03:27:43.000000000
-0500
++++ kdelibs-3.5.7-new/kdeprint/configure.in.in 2007-08-05 16:11:44.000000000
-0500
@@ -80,7 +80,7 @@
dnl check if CUPS is at least 1.1.20
@@ -418,9 +418,37 @@
if test "$ac_have_new_cups" = "yes"; then
AC_DEFINE(HAVE_CUPS_NO_PWD_CACHE, 1, CUPS doesn't have password caching)
fi
-diff -uNr kdelibs-3.5.6/kdeui/Makefile.am kdelibs-3.5.6-new/kdeui/Makefile.am
---- 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
+diff -uNr kdelibs-3.5.7/kdeprint/cups/Makefile.am
kdelibs-3.5.7-new/kdeprint/cups/Makefile.am
+--- kdelibs-3.5.7/kdeprint/cups/Makefile.am 2006-10-02 05:46:55.000000000
-0500
++++ kdelibs-3.5.7-new/kdeprint/cups/Makefile.am 2007-08-05
16:12:03.000000000 -0500
+@@ -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 \
+diff -uNr kdelibs-3.5.7/kdeprint/cups/cupsdconf2/Makefile.am
kdelibs-3.5.7-new/kdeprint/cups/cupsdconf2/Makefile.am
+--- kdelibs-3.5.7/kdeprint/cups/cupsdconf2/Makefile.am 2005-09-10
03:27:41.000000000 -0500
++++ kdelibs-3.5.7-new/kdeprint/cups/cupsdconf2/Makefile.am 2007-08-05
16:12:16.000000000 -0500
+@@ -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 \
+diff -uNr kdelibs-3.5.7/kdeui/Makefile.am kdelibs-3.5.7-new/kdeui/Makefile.am
+--- kdelibs-3.5.7/kdeui/Makefile.am 2005-10-10 10:06:38.000000000 -0500
++++ kdelibs-3.5.7-new/kdeui/Makefile.am 2007-08-05 16:11:44.000000000
-0500
@@ -27,10 +27,10 @@
AM_LDFLAGS = $(LDFLAGS_AS_NEEDED) $(LDFLAGS_NEW_DTAGS)
@@ -434,9 +462,9 @@
libkspell_la_LIBADD = libkdeui.la
libkspell_la_SOURCES = dummy.cpp
-diff -uNr kdelibs-3.5.6/kimgio/Makefile.am kdelibs-3.5.6-new/kimgio/Makefile.am
---- 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
+diff -uNr kdelibs-3.5.7/kimgio/Makefile.am kdelibs-3.5.7-new/kimgio/Makefile.am
+--- kdelibs-3.5.7/kimgio/Makefile.am 2005-09-10 03:26:42.000000000 -0500
++++ kdelibs-3.5.7-new/kimgio/Makefile.am 2007-08-05 16:11:44.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
@@ -446,9 +474,9 @@
kimg_tiff_la_SOURCES = tiffr.cpp
kimg_tiff_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
-diff -uNr kdelibs-3.5.6/kinit/Makefile.am kdelibs-3.5.6-new/kinit/Makefile.am
---- 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
+diff -uNr kdelibs-3.5.7/kinit/Makefile.am kdelibs-3.5.7-new/kinit/Makefile.am
+--- kdelibs-3.5.7/kinit/Makefile.am 2007-01-15 05:33:56.000000000 -0600
++++ kdelibs-3.5.7-new/kinit/Makefile.am 2007-08-05 16:11:44.000000000
-0500
@@ -15,7 +15,7 @@
# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
# Boston, MA 02110-1301, USA.
@@ -458,9 +486,9 @@
SUBDIRS = . tests
-diff -uNr kdelibs-3.5.6/kio/kssl/kopenssl.cc
kdelibs-3.5.6-new/kio/kssl/kopenssl.cc
---- 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
+diff -uNr kdelibs-3.5.7/kio/kssl/kopenssl.cc
kdelibs-3.5.7-new/kio/kssl/kopenssl.cc
+--- kdelibs-3.5.7/kio/kssl/kopenssl.cc 2006-07-22 03:16:39.000000000 -0500
++++ kdelibs-3.5.7-new/kio/kssl/kopenssl.cc 2007-08-05 16:11:44.000000000
-0500
@@ -323,6 +323,7 @@
#elif defined(_AIX)
<< "libssl.a(libssl.so.0)"
@@ -477,9 +505,9 @@
<< "libcrypto.dylib"
<< "libcrypto.0.9.dylib"
#else
-diff -uNr kdelibs-3.5.6/kio/misc/kpac/Makefile.am
kdelibs-3.5.6-new/kio/misc/kpac/Makefile.am
---- 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
+diff -uNr kdelibs-3.5.7/kio/misc/kpac/Makefile.am
kdelibs-3.5.7-new/kio/misc/kpac/Makefile.am
+--- kdelibs-3.5.7/kio/misc/kpac/Makefile.am 2005-09-10 03:26:47.000000000
-0500
++++ kdelibs-3.5.7-new/kio/misc/kpac/Makefile.am 2007-08-05
16:11:44.000000000 -0500
@@ -10,7 +10,7 @@
kded_proxyscout_la_SOURCES = proxyscout.skel proxyscout.cpp script.cpp \
downloader.cpp discovery.cpp
-------------------------------------------------------------------------
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
https://lists.sourceforge.net/lists/listinfo/fink-commits
