Author: ranger
Date: Thu Sep 10 16:03:43 2009
New Revision: 1608
URL:
<http://svn.finkproject.org/websvn/listing.php?sc=1&rev=1608&repname=user%3a+ranger>
Log:
various updates
Added:
trunk/experimental/common/main/finkinfo/libs/qca.patch
Modified:
trunk/experimental/10.4/main/finkinfo/kde/kdelibs3-apidox.info
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/devel/ant-base.info
trunk/experimental/common/main/finkinfo/devel/ant-contrib.info
trunk/experimental/common/main/finkinfo/devel/ant-junit.info
trunk/experimental/common/main/finkinfo/devel/ant-optional.info
trunk/experimental/common/main/finkinfo/kde/kdelibs3-unified.info
trunk/experimental/common/main/finkinfo/kde/kdelibs3-unified.patch
trunk/experimental/common/main/finkinfo/libs/qca.info
trunk/experimental/common/main/finkinfo/libs/stylebook.info
Modified: trunk/experimental/10.4/main/finkinfo/kde/kdelibs3-apidox.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/kde/kdelibs3-apidox.info&rev=1608&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/kde/kdelibs3-apidox.info (original)
+++ trunk/experimental/10.4/main/finkinfo/kde/kdelibs3-apidox.info Thu Sep 10
16:03:43 2009
@@ -64,8 +64,8 @@
<<
Source: mirror:kde:stable/%v/src/kdelibs-%v.tar.bz2
Source-MD5: 43cd55ed15f63b5738d620ef9f9fd568
-Source2: mirror:custom:kde-admindir/kde-admindir-1601.tar.bz2
-Source2-MD5: 117613f49e3aeb4568b15d7121d02b78
+Source2: mirror:custom:kde-admindir/kde-admindir-1605.tar.bz2
+Source2-MD5: e2dccadc3d36718ef9a7e3c7789e2bdf
Source2ExtractDir: kdelibs-%v
SourceDirectory: kdelibs-%v
PatchScript: perl -pi -e 's,-O2,-Os,g; s,doc/HTML,doc/kde,g;
s,/usr/share/doc/packages/qt3/html,%p/share/doc/qt3/html,g;' admin/*
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=1608&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 Thu Sep 10
16:03:43 2009
@@ -1,7 +1,7 @@
Info3: <<
Package: kdelibs3-unified
Version: 3.5.10
-Revision: 1
+Revision: 2
Description: KDE - essential libraries
License: GPL/LGPL
Maintainer: Benjamin Reed <kdeli...@fink.racoonfink.com>
@@ -94,8 +94,8 @@
<<
Source: mirror:kde:stable/%v/src/kdelibs-%v.tar.bz2
Source-MD5: 43cd55ed15f63b5738d620ef9f9fd568
-Source2: mirror:custom:kde-admindir/kde-admindir-1601.tar.bz2
-Source2-MD5: 117613f49e3aeb4568b15d7121d02b78
+Source2: mirror:custom:kde-admindir/kde-admindir-1605.tar.bz2
+Source2-MD5: e2dccadc3d36718ef9a7e3c7789e2bdf
Source2ExtractDir: kdelibs-%v
SourceDirectory: kdelibs-%v
PatchScript: <<
@@ -103,7 +103,7 @@
perl -pi -e 's,-O2,-Os,g; s,doc/HTML,doc/kde,g;
s,/usr/share/doc/packages/qt3/html,%p/share/doc/qt3/html,g;' admin/*
<<
PatchFile: kdelibs3-unified.patch
-PatchFile-MD5: c52b8015137e596dd6830d404b203c34
+PatchFile-MD5: 8d312ecc7eab8d66e3b1bb16fabe29a7
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
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=1608&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 Thu Sep 10
16:03:43 2009
@@ -1,6 +1,6 @@
-diff -Nurd kdelibs-3.5.9/darwin/kcmartsrc kdelibs-3.5.9-new/darwin/kcmartsrc
---- kdelibs-3.5.9/darwin/kcmartsrc 1969-12-31 19:00:00.000000000 -0500
-+++ kdelibs-3.5.9-new/darwin/kcmartsrc 2008-02-13 21:00:34.000000000 -0500
+diff -Nurd kdelibs-3.5.10/darwin/kcmartsrc kdelibs-3.5.10-new/darwin/kcmartsrc
+--- kdelibs-3.5.10/darwin/kcmartsrc 1969-12-31 19:00:00.000000000 -0500
++++ kdelibs-3.5.10-new/darwin/kcmartsrc 2009-09-08 23:03:22.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,9 +11,9 @@
+StartRealtime=false
+StartServer=false
+SuspendTime=60
-diff -Nurd kdelibs-3.5.9/darwin/kdeglobals kdelibs-3.5.9-new/darwin/kdeglobals
---- kdelibs-3.5.9/darwin/kdeglobals 1969-12-31 19:00:00.000000000 -0500
-+++ kdelibs-3.5.9-new/darwin/kdeglobals 2008-02-13 21:00:34.000000000
-0500
+diff -Nurd kdelibs-3.5.10/darwin/kdeglobals
kdelibs-3.5.10-new/darwin/kdeglobals
+--- kdelibs-3.5.10/darwin/kdeglobals 1969-12-31 19:00:00.000000000 -0500
++++ kdelibs-3.5.10-new/darwin/kdeglobals 2009-09-08 23:03:22.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
@@ -144,18 +144,18 @@
+
+[WM]
+activeFont=Baghdad,12,-1,5,50,0,0,0,0,0
-diff -Nurd kdelibs-3.5.9/darwin/knotifyrc kdelibs-3.5.9-new/darwin/knotifyrc
---- kdelibs-3.5.9/darwin/knotifyrc 1969-12-31 19:00:00.000000000 -0500
-+++ kdelibs-3.5.9-new/darwin/knotifyrc 2008-02-13 21:00:34.000000000 -0500
+diff -Nurd kdelibs-3.5.10/darwin/knotifyrc kdelibs-3.5.10-new/darwin/knotifyrc
+--- kdelibs-3.5.10/darwin/knotifyrc 1969-12-31 19:00:00.000000000 -0500
++++ kdelibs-3.5.10-new/darwin/knotifyrc 2009-09-08 23:03:22.000000000
-0400
@@ -0,0 +1,5 @@
+[Misc]
+External play...@finkprefix@/bin/mplayer
+LastConfiguredApp=knotify
+Use external player=false
+Volume=100
-diff -Nurd kdelibs-3.5.9/darwin/konsolerc kdelibs-3.5.9-new/darwin/konsolerc
---- kdelibs-3.5.9/darwin/konsolerc 1969-12-31 19:00:00.000000000 -0500
-+++ kdelibs-3.5.9-new/darwin/konsolerc 2008-02-13 21:00:34.000000000 -0500
+diff -Nurd kdelibs-3.5.10/darwin/konsolerc kdelibs-3.5.10-new/darwin/konsolerc
+--- kdelibs-3.5.10/darwin/konsolerc 1969-12-31 19:00:00.000000000 -0500
++++ kdelibs-3.5.10-new/darwin/konsolerc 2009-09-08 23:03:22.000000000
-0400
@@ -0,0 +1,19 @@
+[Desktop Entry]
+ActiveSession=0
@@ -176,9 +176,9 @@
+schema=Linux.schema
+scrollbar=2
+tabbar=2
-diff -Nurd kdelibs-3.5.9/dcop/dcopc.c kdelibs-3.5.9-new/dcop/dcopc.c
---- kdelibs-3.5.9/dcop/dcopc.c 2006-05-22 14:14:21.000000000 -0400
-+++ kdelibs-3.5.9-new/dcop/dcopc.c 2008-02-13 21:00:34.000000000 -0500
+diff -Nurd kdelibs-3.5.10/dcop/dcopc.c kdelibs-3.5.10-new/dcop/dcopc.c
+--- kdelibs-3.5.10/dcop/dcopc.c 2006-05-22 14:14:21.000000000 -0400
++++ kdelibs-3.5.10-new/dcop/dcopc.c 2009-09-08 23:03:22.000000000 -0400
@@ -674,6 +674,9 @@
while((i = strchr(displayName, ':')) != NULL)
*i = '_';
@@ -189,9 +189,9 @@
dcopServer = getenv("DCOPSERVER");
if (NULL == dcopServer) {
-diff -Nurd kdelibs-3.5.9/dcop/dcopclient.cpp
kdelibs-3.5.9-new/dcop/dcopclient.cpp
---- kdelibs-3.5.9/dcop/dcopclient.cpp 2007-10-08 05:52:08.000000000 -0400
-+++ kdelibs-3.5.9-new/dcop/dcopclient.cpp 2008-02-13 21:00:34.000000000
-0500
+diff -Nurd kdelibs-3.5.10/dcop/dcopclient.cpp
kdelibs-3.5.10-new/dcop/dcopclient.cpp
+--- kdelibs-3.5.10/dcop/dcopclient.cpp 2007-10-08 05:52:08.000000000 -0400
++++ kdelibs-3.5.10-new/dcop/dcopclient.cpp 2009-09-08 23:03:22.000000000
-0400
@@ -270,6 +270,8 @@
{
while( (i = disp.find(KPATH_SEPARATOR)) >= 0)
@@ -201,9 +201,9 @@
}
fName += "/.DCOPserver_";
-diff -Nurd kdelibs-3.5.9/dcop/dcopserver_shutdown.c
kdelibs-3.5.9-new/dcop/dcopserver_shutdown.c
---- kdelibs-3.5.9/dcop/dcopserver_shutdown.c 2005-10-10 11:06:13.000000000
-0400
-+++ kdelibs-3.5.9-new/dcop/dcopserver_shutdown.c 2008-02-13
21:00:34.000000000 -0500
+diff -Nurd kdelibs-3.5.10/dcop/dcopserver_shutdown.c
kdelibs-3.5.10-new/dcop/dcopserver_shutdown.c
+--- kdelibs-3.5.10/dcop/dcopserver_shutdown.c 2005-10-10 11:06:13.000000000
-0400
++++ kdelibs-3.5.10-new/dcop/dcopserver_shutdown.c 2009-09-08
23:03:22.000000000 -0400
@@ -118,6 +118,8 @@
strncat(dcop_file_old,display, n);
while((i = strchr(display, ':')))
@@ -213,9 +213,9 @@
strncat(dcop_file, display, n);
free(display);
-diff -Nurd kdelibs-3.5.9/kdecore/Makefile.am
kdelibs-3.5.9-new/kdecore/Makefile.am
---- kdelibs-3.5.9/kdecore/Makefile.am 2006-10-01 13:33:38.000000000 -0400
-+++ kdelibs-3.5.9-new/kdecore/Makefile.am 2008-02-13 21:00:34.000000000
-0500
+diff -Nurd kdelibs-3.5.10/kdecore/Makefile.am
kdelibs-3.5.10-new/kdecore/Makefile.am
+--- kdelibs-3.5.10/kdecore/Makefile.am 2006-10-01 13:33:38.000000000 -0400
++++ kdelibs-3.5.10-new/kdecore/Makefile.am 2009-09-08 23:03:22.000000000
-0400
@@ -24,7 +24,7 @@
if include_SVGICONS
@@ -234,9 +234,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 -Nurd kdelibs-3.5.9/kdecore/kglobalsettings.cpp
kdelibs-3.5.9-new/kdecore/kglobalsettings.cpp
---- kdelibs-3.5.9/kdecore/kglobalsettings.cpp 2005-10-10 11:06:03.000000000
-0400
-+++ kdelibs-3.5.9-new/kdecore/kglobalsettings.cpp 2008-02-13
21:00:34.000000000 -0500
+diff -Nurd kdelibs-3.5.10/kdecore/kglobalsettings.cpp
kdelibs-3.5.10-new/kdecore/kglobalsettings.cpp
+--- kdelibs-3.5.10/kdecore/kglobalsettings.cpp 2005-10-10 11:06:03.000000000
-0400
++++ kdelibs-3.5.10-new/kdecore/kglobalsettings.cpp 2009-09-08
23:03:22.000000000 -0400
@@ -491,7 +491,7 @@
s_desktopPath->append('/');
@@ -246,9 +246,9 @@
*s_trashPath = g.readPathEntry( "Trash" , *s_trashPath);
*s_trashPath = QDir::cleanDirPath( *s_trashPath );
if ( !s_trashPath->endsWith("/") )
-diff -Nurd kdelibs-3.5.9/kdecore/ksocks.cpp
kdelibs-3.5.9-new/kdecore/ksocks.cpp
---- kdelibs-3.5.9/kdecore/ksocks.cpp 2005-10-10 11:06:03.000000000 -0400
-+++ kdelibs-3.5.9-new/kdecore/ksocks.cpp 2008-02-13 21:00:34.000000000
-0500
+diff -Nurd kdelibs-3.5.10/kdecore/ksocks.cpp
kdelibs-3.5.10-new/kdecore/ksocks.cpp
+--- kdelibs-3.5.10/kdecore/ksocks.cpp 2005-10-10 11:06:03.000000000 -0400
++++ kdelibs-3.5.10-new/kdecore/ksocks.cpp 2009-09-08 23:03:22.000000000
-0400
@@ -480,7 +480,7 @@
ksocklen_t addrlen) {
if (_useSocks && F_connect)
@@ -319,9 +319,9 @@
}
-diff -Nurd kdelibs-3.5.9/kdecore/kstandarddirs.cpp
kdelibs-3.5.9-new/kdecore/kstandarddirs.cpp
---- kdelibs-3.5.9/kdecore/kstandarddirs.cpp 2008-02-13 04:41:08.000000000
-0500
-+++ kdelibs-3.5.9-new/kdecore/kstandarddirs.cpp 2008-02-13
21:00:34.000000000 -0500
+diff -Nurd kdelibs-3.5.10/kdecore/kstandarddirs.cpp
kdelibs-3.5.10-new/kdecore/kstandarddirs.cpp
+--- kdelibs-3.5.10/kdecore/kstandarddirs.cpp 2008-02-13 04:41:08.000000000
-0500
++++ kdelibs-3.5.10-new/kdecore/kstandarddirs.cpp 2009-09-08
23:03:22.000000000 -0400
@@ -1021,7 +1021,7 @@
if (!strcmp(type, "data"))
return "share/apps/";
@@ -331,9 +331,9 @@
if (!strcmp(type, "icon"))
return "share/icons/";
if (!strcmp(type, "config"))
-diff -Nurd kdelibs-3.5.9/kdecore/kuniqueapplication.cpp
kdelibs-3.5.9-new/kdecore/kuniqueapplication.cpp
---- kdelibs-3.5.9/kdecore/kuniqueapplication.cpp 2005-11-08
17:39:22.000000000 -0500
-+++ kdelibs-3.5.9-new/kdecore/kuniqueapplication.cpp 2008-02-13
21:00:34.000000000 -0500
+diff -Nurd kdelibs-3.5.10/kdecore/kuniqueapplication.cpp
kdelibs-3.5.10-new/kdecore/kuniqueapplication.cpp
+--- kdelibs-3.5.10/kdecore/kuniqueapplication.cpp 2005-11-08
17:39:22.000000000 -0500
++++ kdelibs-3.5.10-new/kdecore/kuniqueapplication.cpp 2009-09-08
23:03:22.000000000 -0400
@@ -59,6 +59,10 @@
# endif
#endif
@@ -490,9 +490,9 @@
return inst;
}
-diff -Nurd kdelibs-3.5.9/kdecore/network/ksocketdevice.cpp
kdelibs-3.5.9-new/kdecore/network/ksocketdevice.cpp
---- kdelibs-3.5.9/kdecore/network/ksocketdevice.cpp 2007-01-15
06:34:17.000000000 -0500
-+++ kdelibs-3.5.9-new/kdecore/network/ksocketdevice.cpp 2008-02-13
21:00:34.000000000 -0500
+diff -Nurd kdelibs-3.5.10/kdecore/network/ksocketdevice.cpp
kdelibs-3.5.10-new/kdecore/network/ksocketdevice.cpp
+--- kdelibs-3.5.10/kdecore/network/ksocketdevice.cpp 2007-01-15
06:34:17.000000000 -0500
++++ kdelibs-3.5.10-new/kdecore/network/ksocketdevice.cpp 2009-09-08
23:03:22.000000000 -0400
@@ -316,7 +316,7 @@
}
@@ -529,9 +529,9 @@
KSocketAddress peerAddress;
peerAddress.setLength(len = 32); // arbitrary value
if (kde_getpeername(m_sockfd, peerAddress.address(), &len) == -1)
-diff -Nurd kdelibs-3.5.9/kdecore/network/syssocket.h
kdelibs-3.5.9-new/kdecore/network/syssocket.h
---- kdelibs-3.5.9/kdecore/network/syssocket.h 2005-09-10 04:27:10.000000000
-0400
-+++ kdelibs-3.5.9-new/kdecore/network/syssocket.h 2008-02-13
21:00:34.000000000 -0500
+diff -Nurd kdelibs-3.5.10/kdecore/network/syssocket.h
kdelibs-3.5.10-new/kdecore/network/syssocket.h
+--- kdelibs-3.5.10/kdecore/network/syssocket.h 2005-09-10 04:27:10.000000000
-0400
++++ kdelibs-3.5.10-new/kdecore/network/syssocket.h 2009-09-08
23:03:22.000000000 -0400
@@ -53,7 +53,7 @@
}
@@ -571,9 +571,9 @@
{
return ::getsockname(fd, sa, len);
}
-diff -Nurd kdelibs-3.5.9/kded/Makefile.am kdelibs-3.5.9-new/kded/Makefile.am
---- kdelibs-3.5.9/kded/Makefile.am 2005-10-10 11:06:29.000000000 -0400
-+++ kdelibs-3.5.9-new/kded/Makefile.am 2008-02-13 21:00:34.000000000 -0500
+diff -Nurd kdelibs-3.5.10/kded/Makefile.am kdelibs-3.5.10-new/kded/Makefile.am
+--- kdelibs-3.5.10/kded/Makefile.am 2005-10-10 11:06:29.000000000 -0400
++++ kdelibs-3.5.10-new/kded/Makefile.am 2009-09-08 23:03:22.000000000
-0400
@@ -58,7 +58,10 @@
servicetype_DATA = kdedmodule.desktop
servicetypedir = $(kde_servicetypesdir)
@@ -586,9 +586,9 @@
update_DATA = kded.upd
updatedir = $(kde_datadir)/kconf_update
-diff -Nurd kdelibs-3.5.9/kded/kbuildsycoca.cpp
kdelibs-3.5.9-new/kded/kbuildsycoca.cpp
---- kdelibs-3.5.9/kded/kbuildsycoca.cpp 2007-05-14 03:52:43.000000000
-0400
-+++ kdelibs-3.5.9-new/kded/kbuildsycoca.cpp 2008-02-13 21:00:34.000000000
-0500
+diff -Nurd kdelibs-3.5.10/kded/kbuildsycoca.cpp
kdelibs-3.5.10-new/kded/kbuildsycoca.cpp
+--- kdelibs-3.5.10/kded/kbuildsycoca.cpp 2007-05-14 03:52:43.000000000
-0400
++++ kdelibs-3.5.10-new/kded/kbuildsycoca.cpp 2009-09-08 23:03:22.000000000
-0400
@@ -379,7 +379,11 @@
connect(g_vfolder, SIGNAL(newService(const QString &, KService **)),
this, SLOT(slotCreateEntry(const QString &, KService **)));
@@ -602,9 +602,9 @@
KServiceGroup *entry = g_bsgf->addNew("/", kdeMenu->directoryFile, 0,
false);
entry->setLayoutInfo(kdeMenu->layoutList);
-diff -Nurd kdelibs-3.5.9/kdeprint/configure.in.in
kdelibs-3.5.9-new/kdeprint/configure.in.in
---- kdelibs-3.5.9/kdeprint/configure.in.in 2005-09-10 04:27:43.000000000
-0400
-+++ kdelibs-3.5.9-new/kdeprint/configure.in.in 2008-02-13 21:00:34.000000000
-0500
+diff -Nurd kdelibs-3.5.10/kdeprint/configure.in.in
kdelibs-3.5.10-new/kdeprint/configure.in.in
+--- kdelibs-3.5.10/kdeprint/configure.in.in 2005-09-10 04:27:43.000000000
-0400
++++ kdelibs-3.5.10-new/kdeprint/configure.in.in 2009-09-08
23:03:22.000000000 -0400
@@ -80,7 +80,7 @@
dnl check if CUPS is at least 1.1.20
@@ -614,9 +614,9 @@
if test "$ac_have_new_cups" = "yes"; then
AC_DEFINE(HAVE_CUPS_NO_PWD_CACHE, 1, CUPS doesn't have password caching)
fi
-diff -Nurd kdelibs-3.5.9/kdeprint/cups/Makefile.am
kdelibs-3.5.9-new/kdeprint/cups/Makefile.am
---- kdelibs-3.5.9/kdeprint/cups/Makefile.am 2006-10-02 06:46:55.000000000
-0400
-+++ kdelibs-3.5.9-new/kdeprint/cups/Makefile.am 2008-02-13
21:00:34.000000000 -0500
+diff -Nurd kdelibs-3.5.10/kdeprint/cups/Makefile.am
kdelibs-3.5.10-new/kdeprint/cups/Makefile.am
+--- kdelibs-3.5.10/kdeprint/cups/Makefile.am 2006-10-02 06:46:55.000000000
-0400
++++ kdelibs-3.5.10-new/kdeprint/cups/Makefile.am 2009-09-08
23:03:22.000000000 -0400
@@ -14,8 +14,8 @@
imagepreview.cpp imageposition.cpp
kpimagepage.cpp \
kptextpage.cpp kphpgl2page.cpp
cupsaddsmb2.cpp kmwother.cpp ippreportdlg.cpp \
@@ -628,9 +628,9 @@
kdeprint_cups_la_METASOURCES = AUTO
noinst_HEADERS = cupsinfos.h ipprequest.h kmcupsjobmanager.h kmcupsmanager.h
kmcupsuimanager.h \
-diff -Nurd kdelibs-3.5.9/kdeprint/cups/cupsdconf2/Makefile.am
kdelibs-3.5.9-new/kdeprint/cups/cupsdconf2/Makefile.am
---- kdelibs-3.5.9/kdeprint/cups/cupsdconf2/Makefile.am 2005-09-10
04:27:41.000000000 -0400
-+++ kdelibs-3.5.9-new/kdeprint/cups/cupsdconf2/Makefile.am 2008-02-13
21:00:34.000000000 -0500
+diff -Nurd kdelibs-3.5.10/kdeprint/cups/cupsdconf2/Makefile.am
kdelibs-3.5.10-new/kdeprint/cups/cupsdconf2/Makefile.am
+--- kdelibs-3.5.10/kdeprint/cups/cupsdconf2/Makefile.am 2005-09-10
04:27:41.000000000 -0400
++++ kdelibs-3.5.10-new/kdeprint/cups/cupsdconf2/Makefile.am 2009-09-08
23:03:22.000000000 -0400
@@ -14,8 +14,8 @@
locationdialog.cpp addressdialog.cpp cups-util.c \
qdirmultilineedit.cpp sizewidget.cpp main.cpp
@@ -642,9 +642,9 @@
noinst_HEADERS = cupsdconf.h cupsdpage.h cupsddialog.h cupsdcomment.h
cupsdsplash.h \
cupsdserverpage.h cupsdlogpage.h cupsdjobspage.h
cupsdfilterpage.h \
-diff -Nurd kdelibs-3.5.9/kdeui/Makefile.am kdelibs-3.5.9-new/kdeui/Makefile.am
---- kdelibs-3.5.9/kdeui/Makefile.am 2007-10-08 05:52:12.000000000 -0400
-+++ kdelibs-3.5.9-new/kdeui/Makefile.am 2008-02-13 21:00:34.000000000
-0500
+diff -Nurd kdelibs-3.5.10/kdeui/Makefile.am
kdelibs-3.5.10-new/kdeui/Makefile.am
+--- kdelibs-3.5.10/kdeui/Makefile.am 2008-08-20 07:49:41.000000000 -0400
++++ kdelibs-3.5.10-new/kdeui/Makefile.am 2009-09-08 23:03:22.000000000
-0400
@@ -27,10 +27,10 @@
AM_LDFLAGS = $(LDFLAGS_AS_NEEDED) $(LDFLAGS_NEW_DTAGS)
@@ -658,9 +658,9 @@
libkspell_la_LIBADD = libkdeui.la
libkspell_la_SOURCES = dummy.cpp
-diff -Nurd kdelibs-3.5.9/kimgio/Makefile.am
kdelibs-3.5.9-new/kimgio/Makefile.am
---- kdelibs-3.5.9/kimgio/Makefile.am 2005-09-10 04:26:42.000000000 -0400
-+++ kdelibs-3.5.9-new/kimgio/Makefile.am 2008-02-13 21:00:34.000000000
-0500
+diff -Nurd kdelibs-3.5.10/kimgio/Makefile.am
kdelibs-3.5.10-new/kimgio/Makefile.am
+--- kdelibs-3.5.10/kimgio/Makefile.am 2005-09-10 04:26:42.000000000 -0400
++++ kdelibs-3.5.10-new/kimgio/Makefile.am 2009-09-08 23:03:22.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
@@ -670,9 +670,9 @@
kimg_tiff_la_SOURCES = tiffr.cpp
kimg_tiff_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
-diff -Nurd kdelibs-3.5.9/kinit/Makefile.am kdelibs-3.5.9-new/kinit/Makefile.am
---- kdelibs-3.5.9/kinit/Makefile.am 2007-10-08 05:52:03.000000000 -0400
-+++ kdelibs-3.5.9-new/kinit/Makefile.am 2008-02-13 21:00:34.000000000
-0500
+diff -Nurd kdelibs-3.5.10/kinit/Makefile.am
kdelibs-3.5.10-new/kinit/Makefile.am
+--- kdelibs-3.5.10/kinit/Makefile.am 2007-10-08 05:52:03.000000000 -0400
++++ kdelibs-3.5.10-new/kinit/Makefile.am 2009-09-08 23:03:22.000000000
-0400
@@ -15,7 +15,7 @@
# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
# Boston, MA 02110-1301, USA.
@@ -682,9 +682,9 @@
SUBDIRS = . tests
-diff -Nurd kdelibs-3.5.9/kinit/kinit.cpp kdelibs-3.5.9-new/kinit/kinit.cpp
---- kdelibs-3.5.9/kinit/kinit.cpp 2007-10-08 05:52:03.000000000 -0400
-+++ kdelibs-3.5.9-new/kinit/kinit.cpp 2008-02-13 21:00:34.000000000 -0500
+diff -Nurd kdelibs-3.5.10/kinit/kinit.cpp kdelibs-3.5.10-new/kinit/kinit.cpp
+--- kdelibs-3.5.10/kinit/kinit.cpp 2007-10-08 05:52:03.000000000 -0400
++++ kdelibs-3.5.10-new/kinit/kinit.cpp 2009-09-08 23:03:22.000000000 -0400
@@ -593,6 +593,11 @@
if ( getenv("KDE_IS_PRELINKED") && !execpath.isEmpty() && !launcher)
libpath.truncate(0);
@@ -697,9 +697,9 @@
if ( !libpath.isEmpty() )
{
d.handle = lt_dlopen( QFile::encodeName(libpath) );
-diff -Nurd kdelibs-3.5.9/kinit/start_kdeinit_wrapper.c
kdelibs-3.5.9-new/kinit/start_kdeinit_wrapper.c
---- kdelibs-3.5.9/kinit/start_kdeinit_wrapper.c 2008-02-13
04:41:06.000000000 -0500
-+++ kdelibs-3.5.9-new/kinit/start_kdeinit_wrapper.c 2008-02-13
21:01:39.000000000 -0500
+diff -Nurd kdelibs-3.5.10/kinit/start_kdeinit_wrapper.c
kdelibs-3.5.10-new/kinit/start_kdeinit_wrapper.c
+--- kdelibs-3.5.10/kinit/start_kdeinit_wrapper.c 2008-02-13
04:41:06.000000000 -0500
++++ kdelibs-3.5.10-new/kinit/start_kdeinit_wrapper.c 2009-09-08
23:03:22.000000000 -0400
@@ -50,9 +50,9 @@
close( 0 ); /* stdin */
dup2( pipes[ 0 ], 0 );
@@ -726,9 +726,9 @@
return 1;
}
#endif
-diff -Nurd kdelibs-3.5.9/kio/kssl/kopenssl.cc
kdelibs-3.5.9-new/kio/kssl/kopenssl.cc
---- kdelibs-3.5.9/kio/kssl/kopenssl.cc 2006-07-22 04:16:39.000000000 -0400
-+++ kdelibs-3.5.9-new/kio/kssl/kopenssl.cc 2008-02-13 21:00:34.000000000
-0500
+diff -Nurd kdelibs-3.5.10/kio/kssl/kopenssl.cc
kdelibs-3.5.10-new/kio/kssl/kopenssl.cc
+--- kdelibs-3.5.10/kio/kssl/kopenssl.cc 2006-07-22 04:16:39.000000000
-0400
++++ kdelibs-3.5.10-new/kio/kssl/kopenssl.cc 2009-09-08 23:03:22.000000000
-0400
@@ -323,6 +323,7 @@
#elif defined(_AIX)
<< "libssl.a(libssl.so.0)"
@@ -745,9 +745,9 @@
<< "libcrypto.dylib"
<< "libcrypto.0.9.dylib"
#else
-diff -Nurd kdelibs-3.5.9/kio/misc/kpac/Makefile.am
kdelibs-3.5.9-new/kio/misc/kpac/Makefile.am
---- kdelibs-3.5.9/kio/misc/kpac/Makefile.am 2005-09-10 04:26:47.000000000
-0400
-+++ kdelibs-3.5.9-new/kio/misc/kpac/Makefile.am 2008-02-13
21:00:34.000000000 -0500
+diff -Nurd kdelibs-3.5.10/kio/misc/kpac/Makefile.am
kdelibs-3.5.10-new/kio/misc/kpac/Makefile.am
+--- kdelibs-3.5.10/kio/misc/kpac/Makefile.am 2005-09-10 04:26:47.000000000
-0400
++++ kdelibs-3.5.10-new/kio/misc/kpac/Makefile.am 2009-09-08
23:03:22.000000000 -0400
@@ -10,7 +10,7 @@
kded_proxyscout_la_SOURCES = proxyscout.skel proxyscout.cpp script.cpp \
downloader.cpp discovery.cpp
@@ -757,3 +757,25 @@
kpac_dhcp_helper_SOURCES = kpac_dhcp_helper.c
kpac_dhcp_helper_CFLAGS = $(KDE_USE_FPIE)
+diff -Nurd kdelibs-3.5.10/kio/misc/kpac/configure.in.in
kdelibs-3.5.10-new/kio/misc/kpac/configure.in.in
+--- kdelibs-3.5.10/kio/misc/kpac/configure.in.in 2005-09-10
04:26:47.000000000 -0400
++++ kdelibs-3.5.10-new/kio/misc/kpac/configure.in.in 2009-09-08
23:04:10.000000000 -0400
+@@ -23,4 +23,4 @@
+ AC_DEFINE(HAVE_SHORTSETGROUPS,1,[if setgroups() takes short *as second
arg])
+ fi
+
+-AC_CHECK_HEADERS(arpa/nameser8_compat.h sys/param.h)
++AC_CHECK_HEADERS(arpa/nameser8_compat.h arpa/nameser_compat.h sys/param.h)
+diff -Nurd kdelibs-3.5.10/kio/misc/kpac/discovery.cpp
kdelibs-3.5.10-new/kio/misc/kpac/discovery.cpp
+--- kdelibs-3.5.10/kio/misc/kpac/discovery.cpp 2005-10-10 11:05:43.000000000
-0400
++++ kdelibs-3.5.10-new/kio/misc/kpac/discovery.cpp 2009-09-08
23:04:32.000000000 -0400
+@@ -32,6 +32,9 @@
+ #ifdef HAVE_ARPA_NAMESER8_COMPAT_H
+ #include <arpa/nameser8_compat.h>
+ #endif
++#ifdef HAVE_ARPA_NAMESER_COMPAT_H
++#include <arpa/nameser_compat.h>
++#endif
+ #ifdef HAVE_SYS_PARAM_H
+ // Basically, the BSDs need this before resolv.h
+ #include <sys/param.h>
Modified: trunk/experimental/common/main/finkinfo/devel/ant-base.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/devel/ant-base.info&rev=1608&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/devel/ant-base.info (original)
+++ trunk/experimental/common/main/finkinfo/devel/ant-base.info Thu Sep 10
16:03:43 2009
@@ -1,7 +1,7 @@
Package: ant-base
Version: 1.7.1
Revision: 2
-Type: java(1.5)
+Type: java
Maintainer: Benjamin Reed <ant-b...@fink.racoonfink.com>
#
BuildDepends: fink (>= 0.22.2-1), fink-mirrors (>= 0.22.1.1-1),
system-java-dev (>= 1.5-1)
@@ -12,6 +12,7 @@
Replaces: ant (<< 1.6.5-1)
PatchScript: <<
perl -pi -e 's,target name="test-jar",target name="test-jar"
if="blah",' build.xml
+ perl -pi -e 's,java.util.ServiceLoader,fail.util.ServiceLoader,g'
build.xml
<<
CompileScript: env CLASSPATH= ./build.sh -Ddist.name=ant -Dchmod.fail=false
dist
InstallScript: <<
Modified: trunk/experimental/common/main/finkinfo/devel/ant-contrib.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/devel/ant-contrib.info&rev=1608&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/devel/ant-contrib.info (original)
+++ trunk/experimental/common/main/finkinfo/devel/ant-contrib.info Thu Sep 10
16:03:43 2009
@@ -1,7 +1,7 @@
Package: ant-contrib
Version: 1.0
Revision: 2
-Type: java(1.5)
+Type: java
Maintainer: Benjamin Reed <ant-cont...@fink.racoonfink.com>
BuildDepends: ant-base (>= 1.7.0-1), bcel (>= 5.1-1), junit, system-java-dev
(>= 1.5-1)
Depends: ant-base (>= 1.7.0-1), bcel (>= 5.1-1), system-java (>= 1.5-1)
Modified: trunk/experimental/common/main/finkinfo/devel/ant-junit.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/devel/ant-junit.info&rev=1608&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/devel/ant-junit.info (original)
+++ trunk/experimental/common/main/finkinfo/devel/ant-junit.info Thu Sep 10
16:03:43 2009
@@ -3,12 +3,13 @@
Revision: 2
Maintainer: Benjamin Reed <ant-ju...@fink.racoonfink.com>
#
-Type: java(1.5)
+Type: java
BuildDepends: fink (>= 0.22.2-1), fink-mirrors (>= 0.22.1.1-1), junit (>=
3.8.1-4), system-java-dev (>= 1.5-1)
Depends: ant-base (>= %v-1), junit (>= 3.8.1-4), system-java (>= 1.5-1)
Source: mirror:apache:ant/source/apache-ant-%v-src.tar.bz2
Source-MD5: 0d68db4a1ada5c91bcbf53cefd0c2fd7
SourceDirectory: apache-ant-%v
+PatchScript: perl -pi -e 's,java.util.ServiceLoader,fail.util.ServiceLoader,g'
build.xml
CompileScript: env CLASSPATH=%p/share/java/junit/junit.jar ./build.sh
-Ddist.name=ant -Dchmod.fail=false dist
InstallScript: <<
#!/bin/sh -ex
Modified: trunk/experimental/common/main/finkinfo/devel/ant-optional.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/devel/ant-optional.info&rev=1608&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/devel/ant-optional.info (original)
+++ trunk/experimental/common/main/finkinfo/devel/ant-optional.info Thu Sep 10
16:03:43 2009
@@ -1,7 +1,7 @@
Package: ant-optional
Version: 1.7.1
Revision: 2
-Type: java(1.5)
+Type: java
Maintainer: Benjamin Reed <ant-optio...@fink.racoonfink.com>
BuildDepends: <<
ant-base (>= %v-1),
@@ -50,6 +50,7 @@
Source: mirror:apache:ant/source/apache-ant-%v-src.tar.bz2
Source-MD5: 0d68db4a1ada5c91bcbf53cefd0c2fd7
SourceDirectory: apache-ant-%v
+PatchScript: perl -pi -e 's,java.util.ServiceLoader,fail.util.ServiceLoader,g'
build.xml
CompileScript: ./build.sh -Ddist.name=ant -Dchmod.fail=false dist
InstallScript: <<
#!/bin/sh -ex
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=1608&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/kde/kdelibs3-unified.info (original)
+++ trunk/experimental/common/main/finkinfo/kde/kdelibs3-unified.info Thu Sep
10 16:03:43 2009
@@ -1,7 +1,7 @@
Info3: <<
Package: kdelibs3-unified
Version: 3.5.10
-Revision: 1
+Revision: 2
Description: KDE - essential libraries
License: GPL/LGPL
Maintainer: Benjamin Reed <kdeli...@fink.racoonfink.com>
@@ -99,7 +99,7 @@
Source2ExtractDir: kdelibs-%v
SourceDirectory: kdelibs-%v
PatchFile: kdelibs3-unified.patch
-PatchFile-MD5: c52b8015137e596dd6830d404b203c34
+PatchFile-MD5: 8d312ecc7eab8d66e3b1bb16fabe29a7
PatchScript: <<
sed -e 's,@FINKPREFIX@,%p,g' %{PatchFile} | patch -p1
perl -pi -e 's,-O2,-Os,g; s,doc/HTML,doc/kde,g;
s,/usr/share/doc/packages/qt3/html,%p/share/doc/qt3/html,g;' admin/*
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=1608&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/kde/kdelibs3-unified.patch
(original)
+++ trunk/experimental/common/main/finkinfo/kde/kdelibs3-unified.patch Thu Sep
10 16:03:43 2009
@@ -1,6 +1,6 @@
-diff -Nurd kdelibs-3.5.9/darwin/kcmartsrc kdelibs-3.5.9-new/darwin/kcmartsrc
---- kdelibs-3.5.9/darwin/kcmartsrc 1969-12-31 19:00:00.000000000 -0500
-+++ kdelibs-3.5.9-new/darwin/kcmartsrc 2008-02-13 21:00:34.000000000 -0500
+diff -Nurd kdelibs-3.5.10/darwin/kcmartsrc kdelibs-3.5.10-new/darwin/kcmartsrc
+--- kdelibs-3.5.10/darwin/kcmartsrc 1969-12-31 19:00:00.000000000 -0500
++++ kdelibs-3.5.10-new/darwin/kcmartsrc 2009-09-10 09:37:23.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,9 +11,9 @@
+StartRealtime=false
+StartServer=false
+SuspendTime=60
-diff -Nurd kdelibs-3.5.9/darwin/kdeglobals kdelibs-3.5.9-new/darwin/kdeglobals
---- kdelibs-3.5.9/darwin/kdeglobals 1969-12-31 19:00:00.000000000 -0500
-+++ kdelibs-3.5.9-new/darwin/kdeglobals 2008-02-13 21:00:34.000000000
-0500
+diff -Nurd kdelibs-3.5.10/darwin/kdeglobals
kdelibs-3.5.10-new/darwin/kdeglobals
+--- kdelibs-3.5.10/darwin/kdeglobals 1969-12-31 19:00:00.000000000 -0500
++++ kdelibs-3.5.10-new/darwin/kdeglobals 2009-09-10 09:37:23.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
@@ -144,18 +144,18 @@
+
+[WM]
+activeFont=Baghdad,12,-1,5,50,0,0,0,0,0
-diff -Nurd kdelibs-3.5.9/darwin/knotifyrc kdelibs-3.5.9-new/darwin/knotifyrc
---- kdelibs-3.5.9/darwin/knotifyrc 1969-12-31 19:00:00.000000000 -0500
-+++ kdelibs-3.5.9-new/darwin/knotifyrc 2008-02-13 21:00:34.000000000 -0500
+diff -Nurd kdelibs-3.5.10/darwin/knotifyrc kdelibs-3.5.10-new/darwin/knotifyrc
+--- kdelibs-3.5.10/darwin/knotifyrc 1969-12-31 19:00:00.000000000 -0500
++++ kdelibs-3.5.10-new/darwin/knotifyrc 2009-09-10 09:37:23.000000000
-0400
@@ -0,0 +1,5 @@
+[Misc]
+External play...@finkprefix@/bin/mplayer
+LastConfiguredApp=knotify
+Use external player=false
+Volume=100
-diff -Nurd kdelibs-3.5.9/darwin/konsolerc kdelibs-3.5.9-new/darwin/konsolerc
---- kdelibs-3.5.9/darwin/konsolerc 1969-12-31 19:00:00.000000000 -0500
-+++ kdelibs-3.5.9-new/darwin/konsolerc 2008-02-13 21:00:34.000000000 -0500
+diff -Nurd kdelibs-3.5.10/darwin/konsolerc kdelibs-3.5.10-new/darwin/konsolerc
+--- kdelibs-3.5.10/darwin/konsolerc 1969-12-31 19:00:00.000000000 -0500
++++ kdelibs-3.5.10-new/darwin/konsolerc 2009-09-10 09:37:23.000000000
-0400
@@ -0,0 +1,19 @@
+[Desktop Entry]
+ActiveSession=0
@@ -176,9 +176,9 @@
+schema=Linux.schema
+scrollbar=2
+tabbar=2
-diff -Nurd kdelibs-3.5.9/dcop/dcopc.c kdelibs-3.5.9-new/dcop/dcopc.c
---- kdelibs-3.5.9/dcop/dcopc.c 2006-05-22 14:14:21.000000000 -0400
-+++ kdelibs-3.5.9-new/dcop/dcopc.c 2008-02-13 21:00:34.000000000 -0500
+diff -Nurd kdelibs-3.5.10/dcop/dcopc.c kdelibs-3.5.10-new/dcop/dcopc.c
+--- kdelibs-3.5.10/dcop/dcopc.c 2006-05-22 14:14:21.000000000 -0400
++++ kdelibs-3.5.10-new/dcop/dcopc.c 2009-09-10 09:37:23.000000000 -0400
@@ -674,6 +674,9 @@
while((i = strchr(displayName, ':')) != NULL)
*i = '_';
@@ -189,9 +189,9 @@
dcopServer = getenv("DCOPSERVER");
if (NULL == dcopServer) {
-diff -Nurd kdelibs-3.5.9/dcop/dcopclient.cpp
kdelibs-3.5.9-new/dcop/dcopclient.cpp
---- kdelibs-3.5.9/dcop/dcopclient.cpp 2007-10-08 05:52:08.000000000 -0400
-+++ kdelibs-3.5.9-new/dcop/dcopclient.cpp 2008-02-13 21:00:34.000000000
-0500
+diff -Nurd kdelibs-3.5.10/dcop/dcopclient.cpp
kdelibs-3.5.10-new/dcop/dcopclient.cpp
+--- kdelibs-3.5.10/dcop/dcopclient.cpp 2007-10-08 05:52:08.000000000 -0400
++++ kdelibs-3.5.10-new/dcop/dcopclient.cpp 2009-09-10 09:37:23.000000000
-0400
@@ -270,6 +270,8 @@
{
while( (i = disp.find(KPATH_SEPARATOR)) >= 0)
@@ -201,9 +201,9 @@
}
fName += "/.DCOPserver_";
-diff -Nurd kdelibs-3.5.9/dcop/dcopserver_shutdown.c
kdelibs-3.5.9-new/dcop/dcopserver_shutdown.c
---- kdelibs-3.5.9/dcop/dcopserver_shutdown.c 2005-10-10 11:06:13.000000000
-0400
-+++ kdelibs-3.5.9-new/dcop/dcopserver_shutdown.c 2008-02-13
21:00:34.000000000 -0500
+diff -Nurd kdelibs-3.5.10/dcop/dcopserver_shutdown.c
kdelibs-3.5.10-new/dcop/dcopserver_shutdown.c
+--- kdelibs-3.5.10/dcop/dcopserver_shutdown.c 2005-10-10 11:06:13.000000000
-0400
++++ kdelibs-3.5.10-new/dcop/dcopserver_shutdown.c 2009-09-10
09:37:23.000000000 -0400
@@ -118,6 +118,8 @@
strncat(dcop_file_old,display, n);
while((i = strchr(display, ':')))
@@ -213,9 +213,9 @@
strncat(dcop_file, display, n);
free(display);
-diff -Nurd kdelibs-3.5.9/kdecore/Makefile.am
kdelibs-3.5.9-new/kdecore/Makefile.am
---- kdelibs-3.5.9/kdecore/Makefile.am 2006-10-01 13:33:38.000000000 -0400
-+++ kdelibs-3.5.9-new/kdecore/Makefile.am 2008-02-13 21:00:34.000000000
-0500
+diff -Nurd kdelibs-3.5.10/kdecore/Makefile.am
kdelibs-3.5.10-new/kdecore/Makefile.am
+--- kdelibs-3.5.10/kdecore/Makefile.am 2006-10-01 13:33:38.000000000 -0400
++++ kdelibs-3.5.10-new/kdecore/Makefile.am 2009-09-10 09:37:23.000000000
-0400
@@ -24,7 +24,7 @@
if include_SVGICONS
@@ -234,9 +234,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 -Nurd kdelibs-3.5.9/kdecore/kglobalsettings.cpp
kdelibs-3.5.9-new/kdecore/kglobalsettings.cpp
---- kdelibs-3.5.9/kdecore/kglobalsettings.cpp 2005-10-10 11:06:03.000000000
-0400
-+++ kdelibs-3.5.9-new/kdecore/kglobalsettings.cpp 2008-02-13
21:00:34.000000000 -0500
+diff -Nurd kdelibs-3.5.10/kdecore/kglobalsettings.cpp
kdelibs-3.5.10-new/kdecore/kglobalsettings.cpp
+--- kdelibs-3.5.10/kdecore/kglobalsettings.cpp 2005-10-10 11:06:03.000000000
-0400
++++ kdelibs-3.5.10-new/kdecore/kglobalsettings.cpp 2009-09-10
09:37:23.000000000 -0400
@@ -491,7 +491,7 @@
s_desktopPath->append('/');
@@ -246,9 +246,9 @@
*s_trashPath = g.readPathEntry( "Trash" , *s_trashPath);
*s_trashPath = QDir::cleanDirPath( *s_trashPath );
if ( !s_trashPath->endsWith("/") )
-diff -Nurd kdelibs-3.5.9/kdecore/ksocks.cpp
kdelibs-3.5.9-new/kdecore/ksocks.cpp
---- kdelibs-3.5.9/kdecore/ksocks.cpp 2005-10-10 11:06:03.000000000 -0400
-+++ kdelibs-3.5.9-new/kdecore/ksocks.cpp 2008-02-13 21:00:34.000000000
-0500
+diff -Nurd kdelibs-3.5.10/kdecore/ksocks.cpp
kdelibs-3.5.10-new/kdecore/ksocks.cpp
+--- kdelibs-3.5.10/kdecore/ksocks.cpp 2005-10-10 11:06:03.000000000 -0400
++++ kdelibs-3.5.10-new/kdecore/ksocks.cpp 2009-09-10 09:37:23.000000000
-0400
@@ -480,7 +480,7 @@
ksocklen_t addrlen) {
if (_useSocks && F_connect)
@@ -319,9 +319,9 @@
}
-diff -Nurd kdelibs-3.5.9/kdecore/kstandarddirs.cpp
kdelibs-3.5.9-new/kdecore/kstandarddirs.cpp
---- kdelibs-3.5.9/kdecore/kstandarddirs.cpp 2008-02-13 04:41:08.000000000
-0500
-+++ kdelibs-3.5.9-new/kdecore/kstandarddirs.cpp 2008-02-13
21:00:34.000000000 -0500
+diff -Nurd kdelibs-3.5.10/kdecore/kstandarddirs.cpp
kdelibs-3.5.10-new/kdecore/kstandarddirs.cpp
+--- kdelibs-3.5.10/kdecore/kstandarddirs.cpp 2008-02-13 04:41:08.000000000
-0500
++++ kdelibs-3.5.10-new/kdecore/kstandarddirs.cpp 2009-09-10
09:37:23.000000000 -0400
@@ -1021,7 +1021,7 @@
if (!strcmp(type, "data"))
return "share/apps/";
@@ -331,9 +331,9 @@
if (!strcmp(type, "icon"))
return "share/icons/";
if (!strcmp(type, "config"))
-diff -Nurd kdelibs-3.5.9/kdecore/kuniqueapplication.cpp
kdelibs-3.5.9-new/kdecore/kuniqueapplication.cpp
---- kdelibs-3.5.9/kdecore/kuniqueapplication.cpp 2005-11-08
17:39:22.000000000 -0500
-+++ kdelibs-3.5.9-new/kdecore/kuniqueapplication.cpp 2008-02-13
21:00:34.000000000 -0500
+diff -Nurd kdelibs-3.5.10/kdecore/kuniqueapplication.cpp
kdelibs-3.5.10-new/kdecore/kuniqueapplication.cpp
+--- kdelibs-3.5.10/kdecore/kuniqueapplication.cpp 2005-11-08
17:39:22.000000000 -0500
++++ kdelibs-3.5.10-new/kdecore/kuniqueapplication.cpp 2009-09-10
09:37:23.000000000 -0400
@@ -59,6 +59,10 @@
# endif
#endif
@@ -490,9 +490,9 @@
return inst;
}
-diff -Nurd kdelibs-3.5.9/kdecore/network/ksocketdevice.cpp
kdelibs-3.5.9-new/kdecore/network/ksocketdevice.cpp
---- kdelibs-3.5.9/kdecore/network/ksocketdevice.cpp 2007-01-15
06:34:17.000000000 -0500
-+++ kdelibs-3.5.9-new/kdecore/network/ksocketdevice.cpp 2008-02-13
21:00:34.000000000 -0500
+diff -Nurd kdelibs-3.5.10/kdecore/network/ksocketdevice.cpp
kdelibs-3.5.10-new/kdecore/network/ksocketdevice.cpp
+--- kdelibs-3.5.10/kdecore/network/ksocketdevice.cpp 2007-01-15
06:34:17.000000000 -0500
++++ kdelibs-3.5.10-new/kdecore/network/ksocketdevice.cpp 2009-09-10
09:37:23.000000000 -0400
@@ -316,7 +316,7 @@
}
@@ -529,9 +529,9 @@
KSocketAddress peerAddress;
peerAddress.setLength(len = 32); // arbitrary value
if (kde_getpeername(m_sockfd, peerAddress.address(), &len) == -1)
-diff -Nurd kdelibs-3.5.9/kdecore/network/syssocket.h
kdelibs-3.5.9-new/kdecore/network/syssocket.h
---- kdelibs-3.5.9/kdecore/network/syssocket.h 2005-09-10 04:27:10.000000000
-0400
-+++ kdelibs-3.5.9-new/kdecore/network/syssocket.h 2008-02-13
21:00:34.000000000 -0500
+diff -Nurd kdelibs-3.5.10/kdecore/network/syssocket.h
kdelibs-3.5.10-new/kdecore/network/syssocket.h
+--- kdelibs-3.5.10/kdecore/network/syssocket.h 2005-09-10 04:27:10.000000000
-0400
++++ kdelibs-3.5.10-new/kdecore/network/syssocket.h 2009-09-10
09:37:23.000000000 -0400
@@ -53,7 +53,7 @@
}
@@ -571,9 +571,9 @@
{
return ::getsockname(fd, sa, len);
}
-diff -Nurd kdelibs-3.5.9/kded/Makefile.am kdelibs-3.5.9-new/kded/Makefile.am
---- kdelibs-3.5.9/kded/Makefile.am 2005-10-10 11:06:29.000000000 -0400
-+++ kdelibs-3.5.9-new/kded/Makefile.am 2008-02-13 21:00:34.000000000 -0500
+diff -Nurd kdelibs-3.5.10/kded/Makefile.am kdelibs-3.5.10-new/kded/Makefile.am
+--- kdelibs-3.5.10/kded/Makefile.am 2005-10-10 11:06:29.000000000 -0400
++++ kdelibs-3.5.10-new/kded/Makefile.am 2009-09-10 09:37:23.000000000
-0400
@@ -58,7 +58,10 @@
servicetype_DATA = kdedmodule.desktop
servicetypedir = $(kde_servicetypesdir)
@@ -586,9 +586,9 @@
update_DATA = kded.upd
updatedir = $(kde_datadir)/kconf_update
-diff -Nurd kdelibs-3.5.9/kded/kbuildsycoca.cpp
kdelibs-3.5.9-new/kded/kbuildsycoca.cpp
---- kdelibs-3.5.9/kded/kbuildsycoca.cpp 2007-05-14 03:52:43.000000000
-0400
-+++ kdelibs-3.5.9-new/kded/kbuildsycoca.cpp 2008-02-13 21:00:34.000000000
-0500
+diff -Nurd kdelibs-3.5.10/kded/kbuildsycoca.cpp
kdelibs-3.5.10-new/kded/kbuildsycoca.cpp
+--- kdelibs-3.5.10/kded/kbuildsycoca.cpp 2007-05-14 03:52:43.000000000
-0400
++++ kdelibs-3.5.10-new/kded/kbuildsycoca.cpp 2009-09-10 09:37:23.000000000
-0400
@@ -379,7 +379,11 @@
connect(g_vfolder, SIGNAL(newService(const QString &, KService **)),
this, SLOT(slotCreateEntry(const QString &, KService **)));
@@ -602,9 +602,9 @@
KServiceGroup *entry = g_bsgf->addNew("/", kdeMenu->directoryFile, 0,
false);
entry->setLayoutInfo(kdeMenu->layoutList);
-diff -Nurd kdelibs-3.5.9/kdeprint/configure.in.in
kdelibs-3.5.9-new/kdeprint/configure.in.in
---- kdelibs-3.5.9/kdeprint/configure.in.in 2005-09-10 04:27:43.000000000
-0400
-+++ kdelibs-3.5.9-new/kdeprint/configure.in.in 2008-02-13 21:00:34.000000000
-0500
+diff -Nurd kdelibs-3.5.10/kdeprint/configure.in.in
kdelibs-3.5.10-new/kdeprint/configure.in.in
+--- kdelibs-3.5.10/kdeprint/configure.in.in 2005-09-10 04:27:43.000000000
-0400
++++ kdelibs-3.5.10-new/kdeprint/configure.in.in 2009-09-10
09:37:23.000000000 -0400
@@ -80,7 +80,7 @@
dnl check if CUPS is at least 1.1.20
@@ -614,9 +614,9 @@
if test "$ac_have_new_cups" = "yes"; then
AC_DEFINE(HAVE_CUPS_NO_PWD_CACHE, 1, CUPS doesn't have password caching)
fi
-diff -Nurd kdelibs-3.5.9/kdeprint/cups/Makefile.am
kdelibs-3.5.9-new/kdeprint/cups/Makefile.am
---- kdelibs-3.5.9/kdeprint/cups/Makefile.am 2006-10-02 06:46:55.000000000
-0400
-+++ kdelibs-3.5.9-new/kdeprint/cups/Makefile.am 2008-02-13
21:00:34.000000000 -0500
+diff -Nurd kdelibs-3.5.10/kdeprint/cups/Makefile.am
kdelibs-3.5.10-new/kdeprint/cups/Makefile.am
+--- kdelibs-3.5.10/kdeprint/cups/Makefile.am 2006-10-02 06:46:55.000000000
-0400
++++ kdelibs-3.5.10-new/kdeprint/cups/Makefile.am 2009-09-10
09:37:23.000000000 -0400
@@ -14,8 +14,8 @@
imagepreview.cpp imageposition.cpp
kpimagepage.cpp \
kptextpage.cpp kphpgl2page.cpp
cupsaddsmb2.cpp kmwother.cpp ippreportdlg.cpp \
@@ -628,9 +628,9 @@
kdeprint_cups_la_METASOURCES = AUTO
noinst_HEADERS = cupsinfos.h ipprequest.h kmcupsjobmanager.h kmcupsmanager.h
kmcupsuimanager.h \
-diff -Nurd kdelibs-3.5.9/kdeprint/cups/cupsdconf2/Makefile.am
kdelibs-3.5.9-new/kdeprint/cups/cupsdconf2/Makefile.am
---- kdelibs-3.5.9/kdeprint/cups/cupsdconf2/Makefile.am 2005-09-10
04:27:41.000000000 -0400
-+++ kdelibs-3.5.9-new/kdeprint/cups/cupsdconf2/Makefile.am 2008-02-13
21:00:34.000000000 -0500
+diff -Nurd kdelibs-3.5.10/kdeprint/cups/cupsdconf2/Makefile.am
kdelibs-3.5.10-new/kdeprint/cups/cupsdconf2/Makefile.am
+--- kdelibs-3.5.10/kdeprint/cups/cupsdconf2/Makefile.am 2005-09-10
04:27:41.000000000 -0400
++++ kdelibs-3.5.10-new/kdeprint/cups/cupsdconf2/Makefile.am 2009-09-10
09:37:23.000000000 -0400
@@ -14,8 +14,8 @@
locationdialog.cpp addressdialog.cpp cups-util.c \
qdirmultilineedit.cpp sizewidget.cpp main.cpp
@@ -642,9 +642,9 @@
noinst_HEADERS = cupsdconf.h cupsdpage.h cupsddialog.h cupsdcomment.h
cupsdsplash.h \
cupsdserverpage.h cupsdlogpage.h cupsdjobspage.h
cupsdfilterpage.h \
-diff -Nurd kdelibs-3.5.9/kdeui/Makefile.am kdelibs-3.5.9-new/kdeui/Makefile.am
---- kdelibs-3.5.9/kdeui/Makefile.am 2007-10-08 05:52:12.000000000 -0400
-+++ kdelibs-3.5.9-new/kdeui/Makefile.am 2008-02-13 21:00:34.000000000
-0500
+diff -Nurd kdelibs-3.5.10/kdeui/Makefile.am
kdelibs-3.5.10-new/kdeui/Makefile.am
+--- kdelibs-3.5.10/kdeui/Makefile.am 2008-08-20 07:49:41.000000000 -0400
++++ kdelibs-3.5.10-new/kdeui/Makefile.am 2009-09-10 09:37:23.000000000
-0400
@@ -27,10 +27,10 @@
AM_LDFLAGS = $(LDFLAGS_AS_NEEDED) $(LDFLAGS_NEW_DTAGS)
@@ -658,9 +658,9 @@
libkspell_la_LIBADD = libkdeui.la
libkspell_la_SOURCES = dummy.cpp
-diff -Nurd kdelibs-3.5.9/kimgio/Makefile.am
kdelibs-3.5.9-new/kimgio/Makefile.am
---- kdelibs-3.5.9/kimgio/Makefile.am 2005-09-10 04:26:42.000000000 -0400
-+++ kdelibs-3.5.9-new/kimgio/Makefile.am 2008-02-13 21:00:34.000000000
-0500
+diff -Nurd kdelibs-3.5.10/kimgio/Makefile.am
kdelibs-3.5.10-new/kimgio/Makefile.am
+--- kdelibs-3.5.10/kimgio/Makefile.am 2005-09-10 04:26:42.000000000 -0400
++++ kdelibs-3.5.10-new/kimgio/Makefile.am 2009-09-10 09:37:23.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
@@ -670,9 +670,9 @@
kimg_tiff_la_SOURCES = tiffr.cpp
kimg_tiff_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
-diff -Nurd kdelibs-3.5.9/kinit/Makefile.am kdelibs-3.5.9-new/kinit/Makefile.am
---- kdelibs-3.5.9/kinit/Makefile.am 2007-10-08 05:52:03.000000000 -0400
-+++ kdelibs-3.5.9-new/kinit/Makefile.am 2008-02-13 21:00:34.000000000
-0500
+diff -Nurd kdelibs-3.5.10/kinit/Makefile.am
kdelibs-3.5.10-new/kinit/Makefile.am
+--- kdelibs-3.5.10/kinit/Makefile.am 2007-10-08 05:52:03.000000000 -0400
++++ kdelibs-3.5.10-new/kinit/Makefile.am 2009-09-10 09:37:23.000000000
-0400
@@ -15,7 +15,7 @@
# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
# Boston, MA 02110-1301, USA.
@@ -682,9 +682,9 @@
SUBDIRS = . tests
-diff -Nurd kdelibs-3.5.9/kinit/kinit.cpp kdelibs-3.5.9-new/kinit/kinit.cpp
---- kdelibs-3.5.9/kinit/kinit.cpp 2007-10-08 05:52:03.000000000 -0400
-+++ kdelibs-3.5.9-new/kinit/kinit.cpp 2008-02-13 21:00:34.000000000 -0500
+diff -Nurd kdelibs-3.5.10/kinit/kinit.cpp kdelibs-3.5.10-new/kinit/kinit.cpp
+--- kdelibs-3.5.10/kinit/kinit.cpp 2007-10-08 05:52:03.000000000 -0400
++++ kdelibs-3.5.10-new/kinit/kinit.cpp 2009-09-10 09:37:23.000000000 -0400
@@ -593,6 +593,11 @@
if ( getenv("KDE_IS_PRELINKED") && !execpath.isEmpty() && !launcher)
libpath.truncate(0);
@@ -697,9 +697,9 @@
if ( !libpath.isEmpty() )
{
d.handle = lt_dlopen( QFile::encodeName(libpath) );
-diff -Nurd kdelibs-3.5.9/kinit/start_kdeinit_wrapper.c
kdelibs-3.5.9-new/kinit/start_kdeinit_wrapper.c
---- kdelibs-3.5.9/kinit/start_kdeinit_wrapper.c 2008-02-13
04:41:06.000000000 -0500
-+++ kdelibs-3.5.9-new/kinit/start_kdeinit_wrapper.c 2008-02-13
21:01:39.000000000 -0500
+diff -Nurd kdelibs-3.5.10/kinit/start_kdeinit_wrapper.c
kdelibs-3.5.10-new/kinit/start_kdeinit_wrapper.c
+--- kdelibs-3.5.10/kinit/start_kdeinit_wrapper.c 2008-02-13
04:41:06.000000000 -0500
++++ kdelibs-3.5.10-new/kinit/start_kdeinit_wrapper.c 2009-09-10
09:37:23.000000000 -0400
@@ -50,9 +50,9 @@
close( 0 ); /* stdin */
dup2( pipes[ 0 ], 0 );
@@ -726,9 +726,9 @@
return 1;
}
#endif
-diff -Nurd kdelibs-3.5.9/kio/kssl/kopenssl.cc
kdelibs-3.5.9-new/kio/kssl/kopenssl.cc
---- kdelibs-3.5.9/kio/kssl/kopenssl.cc 2006-07-22 04:16:39.000000000 -0400
-+++ kdelibs-3.5.9-new/kio/kssl/kopenssl.cc 2008-02-13 21:00:34.000000000
-0500
+diff -Nurd kdelibs-3.5.10/kio/kssl/kopenssl.cc
kdelibs-3.5.10-new/kio/kssl/kopenssl.cc
+--- kdelibs-3.5.10/kio/kssl/kopenssl.cc 2006-07-22 04:16:39.000000000
-0400
++++ kdelibs-3.5.10-new/kio/kssl/kopenssl.cc 2009-09-10 09:37:23.000000000
-0400
@@ -323,6 +323,7 @@
#elif defined(_AIX)
<< "libssl.a(libssl.so.0)"
@@ -745,9 +745,9 @@
<< "libcrypto.dylib"
<< "libcrypto.0.9.dylib"
#else
-diff -Nurd kdelibs-3.5.9/kio/misc/kpac/Makefile.am
kdelibs-3.5.9-new/kio/misc/kpac/Makefile.am
---- kdelibs-3.5.9/kio/misc/kpac/Makefile.am 2005-09-10 04:26:47.000000000
-0400
-+++ kdelibs-3.5.9-new/kio/misc/kpac/Makefile.am 2008-02-13
21:00:34.000000000 -0500
+diff -Nurd kdelibs-3.5.10/kio/misc/kpac/Makefile.am
kdelibs-3.5.10-new/kio/misc/kpac/Makefile.am
+--- kdelibs-3.5.10/kio/misc/kpac/Makefile.am 2005-09-10 04:26:47.000000000
-0400
++++ kdelibs-3.5.10-new/kio/misc/kpac/Makefile.am 2009-09-10
09:37:23.000000000 -0400
@@ -10,7 +10,7 @@
kded_proxyscout_la_SOURCES = proxyscout.skel proxyscout.cpp script.cpp \
downloader.cpp discovery.cpp
@@ -757,3 +757,31 @@
kpac_dhcp_helper_SOURCES = kpac_dhcp_helper.c
kpac_dhcp_helper_CFLAGS = $(KDE_USE_FPIE)
+diff -Nurd kdelibs-3.5.10/kio/misc/kpac/configure.in.in
kdelibs-3.5.10-new/kio/misc/kpac/configure.in.in
+--- kdelibs-3.5.10/kio/misc/kpac/configure.in.in 2005-09-10
04:26:47.000000000 -0400
++++ kdelibs-3.5.10-new/kio/misc/kpac/configure.in.in 2009-09-10
09:37:23.000000000 -0400
+@@ -23,4 +23,4 @@
+ AC_DEFINE(HAVE_SHORTSETGROUPS,1,[if setgroups() takes short *as second
arg])
+ fi
+
+-AC_CHECK_HEADERS(arpa/nameser8_compat.h sys/param.h)
++AC_CHECK_HEADERS(arpa/nameser8_compat.h arpa/nameser_compat.h sys/param.h)
+diff -Nurd kdelibs-3.5.10/kio/misc/kpac/discovery.cpp
kdelibs-3.5.10-new/kio/misc/kpac/discovery.cpp
+--- kdelibs-3.5.10/kio/misc/kpac/discovery.cpp 2005-10-10 11:05:43.000000000
-0400
++++ kdelibs-3.5.10-new/kio/misc/kpac/discovery.cpp 2009-09-10
09:38:26.000000000 -0400
+@@ -29,9 +29,15 @@
+ #include <netinet/in.h>
+ #endif
+ #include <arpa/nameser.h>
++
++#ifdef HAVE_ARPA_NAMESER_COMPAT_H
++#include <arpa/nameser_compat.h>
++#else
+ #ifdef HAVE_ARPA_NAMESER8_COMPAT_H
+ #include <arpa/nameser8_compat.h>
+ #endif
++#endif
++
+ #ifdef HAVE_SYS_PARAM_H
+ // Basically, the BSDs need this before resolv.h
+ #include <sys/param.h>
Modified: trunk/experimental/common/main/finkinfo/libs/qca.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/libs/qca.info&rev=1608&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/qca.info (original)
+++ trunk/experimental/common/main/finkinfo/libs/qca.info Thu Sep 10 16:03:43
2009
@@ -1,8 +1,13 @@
Package: qca
Version: 1.0
-Revision: 3
+Revision: 1024
Depends: %N-shlibs
-BuildDepends: cyrus-sasl2-dev, system-openssl-dev, qt3 (>= 3.3.3-4)
+BuildDepends: <<
+ fink (>= 0.28.0-1),
+ cyrus-sasl2-dev,
+ system-openssl-dev,
+ qt3 (>= 3.3.3-4)
+<<
BuildDependsOnly: true
Source: http://delta.affinix.com/qca/qca-%v.tar.bz2
@@ -11,48 +16,58 @@
Source2-MD5: 886b1f60fc31de3b1a0bd93281e27b73
Source3: http://delta.affinix.com/qca/qca-sasl-%v.tar.bz2
Source3-MD5: 2e324cb45706f37a8d2b196f43428023
+PatchFile: %n.patch
+PatchFile-MD5: fb804ac32c99a1ebb17e8e9ad44d8e84
GCC: 4.0
+
+PatchScript: <<
+ cd ..; patch -p0 < %{PatchFile}
+<<
CompileScript: <<
#!/bin/sh -ex
- export lt_cv_sys_max_cmd_len=65536
- ./configure --prefix=%p --qtdir=%p
- make
+ if [ -x /usr/bin/gcc-4.2 ]; then
+ export CC=gcc-4.2 CXX=g++-4.2 CPP=cpp-4.2
+ fi
- pushd ../qca-sasl-%v
- ./configure --with-sasl-inc=%p/include --with-sasl-lib=%p/lib --qtdir=%p
- make
- popd
+ export lt_cv_sys_max_cmd_len=65536
+ ./configure --prefix=%p --qtdir=%p
+ make
- pushd ../qca-tls-%v
- ./configure --qtdir=%p --with-openssl-inc=%p/lib/system-openssl/include
--with-openssl-lib=%p/lib/system-openssl/lib
- make LIBS='-L%p/lib/system-openssl/lib -lssl -lcrypto -L%p/lib -lqt-mt
$(SUBLIBS)'
- popd
+ pushd ../qca-sasl-%v
+ ./configure --with-sasl-inc=%p/include --with-sasl-lib=%p/lib --qtdir=%p
+ make
+ popd
+
+ pushd ../qca-tls-%v
+ ./configure --qtdir=%p --with-openssl-inc=%p/lib/system-openssl/include
--with-openssl-lib=%p/lib/system-openssl/lib
+ make LIBS='-L%p/lib/system-openssl/lib -lssl -lcrypto -L%p/lib -lqt-mt
$(SUBLIBS)'
+ popd
<<
InstallScript: <<
#!/bin/sh -ex
- install -d -m 755 %i/include/qt
- install -d -m 755 %i/lib
- install -d %i/lib/qt3-plugins/crypto
- install -d -m 755 %i/share/doc/%N/
+ install -d -m 755 %i/include/qt
+ install -d -m 755 %i/lib
+ install -d %i/lib/qt3-plugins/crypto
+ install -d -m 755 %i/share/doc/%N/
- mv *.dylib %i/lib/
- mv src/*.h %i/include/qt/
- cp -pR examples %i/share/doc/%N/
+ mv *.dylib %i/lib/
+ mv src/*.h %i/include/qt/
+ cp -pR examples %i/share/doc/%N/
- install -c -m 755 ../qca-*-%v/*.so %i/lib/qt3-plugins/crypto/
+ install -c -m 755 ../qca-*-%v/*.so %i/lib/qt3-plugins/crypto/
<<
SplitOff: <<
- Package: %N-shlibs
- Depends: cyrus-sasl2-shlibs, qt3-shlibs (>= 3.3.0-1)
- Files: <<
- lib/libqca.*.dylib
- lib/qt3-plugins
- <<
- Shlibs: %p/lib/libqca.1.dylib 1.0.0 %n (>= 1.0-1)
- DocFiles: COPYING*
+ Package: %N-shlibs
+ Depends: cyrus-sasl2-shlibs, qt3-shlibs (>= 3.3.0-1)
+ Files: <<
+ lib/libqca.*.dylib
+ lib/qt3-plugins
+ <<
+ Shlibs: %p/lib/libqca.1.dylib 1.0.0 %n (>= 1.0-1)
+ DocFiles: COPYING*
<<
DocFiles: COPYING INSTALL README TODO
Description: Qt Cryptographic Architecture
Added: trunk/experimental/common/main/finkinfo/libs/qca.patch
URL:
<http://svn.finkproject.org/websvn/filedetails.php?path=/trunk/experimental/common/main/finkinfo/libs/qca.patch&rev=1608&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/qca.patch (added)
+++ trunk/experimental/common/main/finkinfo/libs/qca.patch Thu Sep 10 16:03:43
2009
@@ -1,0 +1,28 @@
+diff -Nurd qca-tls-1.0/qca-tls.cpp qca-tls-1.0/qca-tls.cpp
+--- qca-tls-1.0/qca-tls.cpp 2003-12-10 11:53:57.000000000 -0500
++++ qca-tls-1.0-new/qca-tls.cpp 2009-09-09 07:59:41.000000000 -0400
+@@ -454,7 +454,11 @@
+ if(!r) {
+ // try this other public function, for whatever
reason
+ p = (void *)in;
++#ifdef OSSL_097
++ r = d2i_RSA_PUBKEY(NULL, (const unsigned char
**)&p, len);
++#else
+ r = d2i_RSA_PUBKEY(NULL, (unsigned char **)&p,
len);
++#endif
+ }
+ if(r) {
+ if(pub) {
+@@ -799,7 +803,11 @@
+ bool createFromDER(const char *in, unsigned int len)
+ {
+ unsigned char *p = (unsigned char *)in;
+- X509 *t = d2i_X509(NULL, &p, len);
++#ifdef OSSL_097
++ X509 *t = d2i_X509(NULL, (const unsigned char**)&p, len);
++#else
++ X509 *t = d2i_X509(NULL, (unsigned char**)&p, len);
++#endif
+ if(!t)
+ return false;
+ fromX509(t);
Modified: trunk/experimental/common/main/finkinfo/libs/stylebook.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/libs/stylebook.info&rev=1608&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/stylebook.info (original)
+++ trunk/experimental/common/main/finkinfo/libs/stylebook.info Thu Sep 10
16:03:43 2009
@@ -1,7 +1,11 @@
Package: stylebook
Version: 1.0
-Revision: 0.b3.3
-CustomMirror: RangerMirror
+Revision: 0.b3.4
+CustomMirror: <<
+ nam-US: http://ranger.befunk.com/fink
+ nam-US: http://astrange.ithinksw.net/ranger-fink
+ nam-CA: http://www.southofheaven.net/befunk
+<<
Source: mirror:custom:xml-%n-%v-b2-src.tar.gz
Source-MD5: d7f037e1d0a9d36b7b541f5e7bbeedda
SourceDirectory: xml-%n
@@ -11,12 +15,12 @@
PatchScript: perl -pi -e 's,<javac,<javac target="1.4" source="1.4",g'
build.xml
BuildDepends: ant-base (>= 1.6.5-1), fink (>= 0.22.2-1), fink-mirrors (>=
0.22.1.1-1), xalan-j (>= 2.0-1), xerces-j (>= 2.0-1), system-java-dev (>= 1.4-1)
Depends: xalan-j (>= 2.0-1), xerces-j (>= 2.0-1), system-java (>= 1.4-1)
-Type: java(1.4)
+Type: java
CompileScript: <<
#!/bin/sh -ex
ant package2
- $JAVA_HOME/bin/javadoc -sourcepath src -d api `find src -name \*.java`
+ $JAVA_HOME/bin/javadoc -source 1.4 -sourcepath src -d api `find src
-name \*.java`
<<
JarFiles: bin/stylebook-1.0-b3*.jar
InstallScript: <<
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
