Update of /cvsroot/fink/experimental/rangerrick/10.3/crypto/finkinfo
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25026/10.3/crypto/finkinfo
Modified Files:
bundle-kde-ssl.info kdebase3-ssl.info kdebase3-ssl.patch
kdelibs3-ssl.info kdelibs3-ssl.patch kdenetwork3.info
kdenetwork3.patch
Log Message:
still working on this stuff =)
Index: kdebase3-ssl.info
===================================================================
RCS file:
/cvsroot/fink/experimental/rangerrick/10.3/crypto/finkinfo/kdebase3-ssl.info,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- kdebase3-ssl.info 9 Sep 2004 20:46:51 -0000 1.36
+++ kdebase3-ssl.info 13 Oct 2004 20:50:04 -0000 1.37
@@ -1,14 +1,14 @@
Package: kdebase3-ssl
-Version: 3.3.0
+Version: 3.3.1
Revision: 21
Description: KDE - base system (with SSL)
License: GPL/LGPL
Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
Depends: %N-shlibs (>= %v-%r), kdelibs3-ssl (>= %v-21), lesstif-shlibs (>=
0.93.18-6), libart2-shlibs, libjpeg-shlibs, libpng3-shlibs (>= 1.2.5-4), qt3-shlibs
(>= 3.3.2-21), x11, xfontpath
-BuildDepends: pcre, arts-dev (>= 1.3.0-21), audiofile, cctools (>= 446-1) |
cctools-single-module, cups-dev, esound, fink (>= 0.20.2.1-1), kdelibs3-ssl-dev (>=
%v-21), gettext-dev, glib2 (>= 2.2.1-4), glib2-dev (>= 2.2.1-4), lesstif (>=
0.93.18-6), libart2, libiconv-dev, libjpeg, libogg, libpng3 (>= 1.2.5-4), libvorbis0,
libmad, openssl097-dev, qt3 (>= 3.3.2-21), qt3-doc, x11-dev, xfontpath
+BuildDepends: pcre, arts-dev (>= 1.3.1-21), audiofile, cctools (>= 446-1) |
cctools-single-module, cups-dev, esound, fink (>= 0.20.2.1-1), kdelibs3-ssl-dev (>=
%v-21), gettext-dev, glib2 (>= 2.2.1-4), glib2-dev (>= 2.2.1-4), lesstif (>=
0.93.18-6), libart2, libiconv-dev, libjpeg, libogg, libpng3 (>= 1.2.5-4), libvorbis0,
libmad, openssl097-dev, qt3 (>= 3.3.2-21), qt3-doc, x11-dev, xfontpath
Conflicts: bundle-kde, kdelibs3, kdelibs3-dev, kdebase3, kdebase3-dev, kio-fish
-Replaces: kdebase3-ssl, kdebase3-ssl-dev, kdebase3-ssl-shlibs, kio-fish, lisa,
kdenetwork3 (<< 3.2.0-1), kdepasswd (<< 3.3.0-1)
+Replaces: kdebase3-ssl, kdebase3-ssl-dev, kdebase3-ssl-shlibs, kio-fish, lisa,
kdenetwork3 (<< 3.2.0-1), kdepasswd (<< 3.3.1-1)
Provides: kate, kdm, konqueror, konsole, kwrite
GCC: 3.3
@@ -17,8 +17,8 @@
nam-US: http://astrange.ithinksw.net/~astrange/ranger-fink
nam-CA: http://www.southofheaven.net/befunk
<<
-Source: mirror:kde:stable/3.3/src/kdebase-%v.tar.bz2
-Source-MD5: e8fc098ffb09fcc0a8fdc4446149a8e3
+Source: mirror:kde:stable/%v/src/kdebase-%v.tar.bz2
+Source-MD5: c8d2cf86adaaa253a90f3934c1954df3
Source2: mirror:custom:kde-build-20040821.tar.bz2
Source2-MD5: 5f222ad99ea992cf9a84d14ae12918cf
Source2ExtractDir: kdebase-%v
@@ -92,7 +92,7 @@
Depends: %N (>= %v-%r), %N-shlibs (>= %v-%r)
Conflicts: bundle-kde, kdelibs3, kdelibs3-dev, kdebase3, kdebase3-dev
Replaces: kdebase3, kdebase3-dev, %N (<< %v-1), %N-dev (<< %v-1)
- Recommends: arts-dev (>= 1.3.0-1), audiofile, cups-dev, esound, kdelibs3-ssl-dev
(>= %v-1), lesstif (>= 0.93.18-6), libart2, libjpeg, libogg, libpng3 (>= 1.2.5-4),
libvorbis0, libmad, qt3 (>= 3.3.2-1), qt3-doc, x11-dev, xfontpath
+ Recommends: arts-dev (>= 1.3.1-1), audiofile, cups-dev, esound, kdelibs3-ssl-dev
(>= %v-1), lesstif (>= 0.93.18-6), libart2, libjpeg, libogg, libpng3 (>= 1.2.5-4),
libvorbis0, libmad, qt3 (>= 3.3.2-1), qt3-doc, x11-dev, xfontpath
BuildDependsOnly: true
Files: <<
include
@@ -108,7 +108,7 @@
SplitOff2: <<
Package: %N-shlibs
Description: KDE - base shared libraries
- Depends: arts-shlibs (>= 1.3.0-21), audiofile-shlibs, esound-shlibs, gettext,
glib2-shlibs (>= 2.2.1-4), kdelibs3-ssl-shlibs (>= %v-20), libart2-shlibs, libiconv,
libjpeg-shlibs, libmad-shlibs, libogg-shlibs, libpng3-shlibs (>= 1.2.5-4),
libvorbis0-shlibs, pcre-shlibs, qt3-shlibs (>= 3.3.2-21), x11
+ Depends: arts-shlibs (>= 1.3.1-21), audiofile-shlibs, esound-shlibs, gettext,
glib2-shlibs (>= 2.2.1-4), kdelibs3-ssl-shlibs (>= %v-20), libart2-shlibs, libiconv,
libjpeg-shlibs, libmad-shlibs, libogg-shlibs, libpng3-shlibs (>= 1.2.5-4),
libvorbis0-shlibs, pcre-shlibs, qt3-shlibs (>= 3.3.2-21), x11
Conflicts: bundle-kde, kdelibs3, kdelibs-shlibs, kdelibs3-dev, kdebase3,
kdebase3-shlibs, kdebase3-dev
Replaces: kdebase3, kdebase3-ssl, kdebase3-dev
Recommends: %N (>= %v-%r)
Index: kdenetwork3.info
===================================================================
RCS file: /cvsroot/fink/experimental/rangerrick/10.3/crypto/finkinfo/kdenetwork3.info,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- kdenetwork3.info 29 Aug 2004 21:45:01 -0000 1.32
+++ kdenetwork3.info 13 Oct 2004 20:50:04 -0000 1.33
@@ -1,12 +1,12 @@
Package: kdenetwork3
-Version: 3.3.0
+Version: 3.3.1
Revision: 21
Description: KDE - networking
License: GPL/LGPL
Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
Depends: %N-misc (>= %v-%r), dcoprss (>= %v-%r), kget (>= %v-%r), knewsticker (>=
%v-%r), kopete (>= %v-%r), kpf (>= %v-%r), krdc (>= %v-%r), krfb (>= %v-%r), ksirc (>=
%v-%r), ktalk (>= %v-%r), lisa (>= %v-%r)
-BuildDepends: arts-dev (>= 1.3.0-21), cctools (>= 446-1) | cctools-single-module,
ekg-ssl-dev (>= 1.5-1), fink (>= 0.20.2.1-1), gettext-dev, gtk+, kdelibs3-ssl-dev (>=
%v-21) | kdelibs3-dev (>= %v-21), libart2, libjpeg, libiconv-dev, libpng3 (>=
1.2.5-4), libxml2, libxslt, openslp-ssl-dev | openslp-dev, openssl097, openssl097-dev,
pcre, qca, qt3 (>= 3.3.2-21), xmms (>= 1.2.7-3), x11-dev
+BuildDepends: arts-dev (>= 1.3.1-21), cctools (>= 446-1) | cctools-single-module,
ekg-ssl-dev (>= 1.5-1), fink (>= 0.20.2.1-1), gettext-dev, gtk+, kdelibs3-ssl-dev (>=
%v-21) | kdelibs3-dev (>= %v-21), libart2, libjpeg, libiconv-dev, libpng3 (>=
1.2.5-4), libxml2, libxslt, openslp-ssl-dev | openslp-dev, openssl097, openssl097-dev,
pcre, qca, qt3 (>= 3.3.2-21), xmms (>= 1.2.7-3), x11-dev
Replaces: %N-common (<< %v-%r), %N-dev (<< %v-%r), kmail (<< %v-1)
GCC: 3.3
@@ -15,8 +15,8 @@
nam-US: http://astrange.ithinksw.net/~astrange/ranger-fink
nam-CA: http://www.southofheaven.net/befunk
<<
-Source: mirror:kde:stable/3.3/src/kdenetwork-%v.tar.bz2
-Source-MD5: ae7d989594ec2a7c073478e4535c284b
+Source: mirror:kde:stable/%v/src/kdenetwork-%v.tar.bz2
+Source-MD5: 4b35a9e23ef555b47e9423082856ca80
Source2: mirror:custom:kde-build-20040821.tar.bz2
Source2-MD5: 5f222ad99ea992cf9a84d14ae12918cf
Source2ExtractDir: kdenetwork-%v
@@ -67,7 +67,7 @@
Description: network development libraries and headers
Depends: %N (>= %v-%r), %N-base (>= %v-%r)
Replaces: %N (<< %v-%r), %N-common (<< %v-1)
- Recommends: arts-dev (>= 1.3.0-1), fink (>= 0.20.2.1-1), kdelibs3-ssl-dev (>= %v-1)
| kdelibs3-dev (>= %v-1), libart2, libjpeg, libpng3 (>= 1.2.5-4), openslp-ssl-dev |
openslp-dev, qt3 (>= 3.3.2-1), x11-dev
+ Recommends: arts-dev (>= 1.3.1-1), fink (>= 0.20.2.1-1), kdelibs3-ssl-dev (>= %v-1)
| kdelibs3-dev (>= %v-1), libart2, libjpeg, libpng3 (>= 1.2.5-4), openslp-ssl-dev |
openslp-dev, qt3 (>= 3.3.2-1), x11-dev
BuildDependsOnly: true
Files: <<
include
Index: kdenetwork3.patch
===================================================================
RCS file:
/cvsroot/fink/experimental/rangerrick/10.3/crypto/finkinfo/kdenetwork3.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- kdenetwork3.patch 29 Aug 2004 19:05:26 -0000 1.3
+++ kdenetwork3.patch 13 Oct 2004 20:50:04 -0000 1.4
@@ -125,3 +125,21 @@
#include <sys/types.h>
#endif
#ifdef HAVE_INTTYPES_H
+--- kdelibs-3.3.1/admin/ltmain.sh Tue Jun 15 12:47:06 2004
++++ kdelibs-3.3.1-new/admin/ltmain.sh Wed Oct 13 11:34:12 2004
+@@ -4397,6 +4397,7 @@
+ # We should set the shlibpath_var
+ rpath=
+ for dir in $temp_rpath; do
++ if test "$dir" != "/sw/lib"; then
+ case $dir in
+ [\\/]* | [A-Za-z]:[\\/]*)
+ # Absolute path.
+@@ -4407,6 +4408,7 @@
+ rpath="$rpath\$thisdir/$dir:"
+ ;;
+ esac
++ fi
+ done
+ temp_rpath="$rpath"
+ fi
Index: kdelibs3-ssl.info
===================================================================
RCS file:
/cvsroot/fink/experimental/rangerrick/10.3/crypto/finkinfo/kdelibs3-ssl.info,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- kdelibs3-ssl.info 9 Sep 2004 20:46:51 -0000 1.40
+++ kdelibs3-ssl.info 13 Oct 2004 20:50:04 -0000 1.41
@@ -1,14 +1,14 @@
Package: kdelibs3-ssl
-Version: 3.3.0
+Version: 3.3.1
Revision: 21
Description: KDE - essential libraries (with SSL)
License: GPL/LGPL
Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
Depends: %N-shlibs (>= %v-%r), aspell, libart2-shlibs, libjpeg-shlibs, libpng3-shlibs
(>= 1.2.5-4), pcre-shlibs, qt3-shlibs (>= 3.3.2-21), x11
-BuildDepends: arts-dev (>= 1.3.0-21), aspell-dev, audiofile, bzip2-dev, cctools (>=
446-1) | cctools-single-module, cups-dev, doxygen (>= 1.3.4-1), esound, fink (>=
0.20.2.1-1), flex-devel, gettext-dev, glib2 (>= 2.2.1-4), glib2-dev (>= 2.2.1-4),
libart2, libiconv-dev, libidn (>= 0.5.1-1), libjpeg, libogg, libpng3 (>= 1.2.5-4),
libtiff, libvorbis0, libxml2, libxslt, libmad, openexr-dev, openslp-ssl-dev |
openslp-dev, openssl097-dev, pcre, pcre-bin, qt3 (>= 3.3.2-21), qt3-doc, x11-dev
+BuildDepends: arts-dev (>= 1.3.1-21), aspell-dev, audiofile, bzip2-dev, cctools (>=
446-1) | cctools-single-module, cups-dev, doxygen (>= 1.3.4-1), esound, fink (>=
0.20.2.1-1), flex-devel, gettext-dev, glib2 (>= 2.2.1-4), glib2-dev (>= 2.2.1-4),
libart2, libiconv-dev, libidn (>= 0.5.1-1), libjpeg, libogg, libpng3 (>= 1.2.5-4),
libtiff, libvorbis0, libxml2, libxslt, libmad, openexr-dev, openslp-ssl-dev |
openslp-dev, openssl097-dev, pcre, pcre-bin, qt3 (>= 3.3.2-21), qt3-doc, x11-dev
Conflicts: bundle-kde, kdelibs3, kdelibs3-shlibs, kdelibs3-dev, kdebase3,
kdebase3-shlibs, kdebase3-dev
-Replaces: kdelibs3, kdelibs3-ssl-dev, kdelibs3-dev, keramik, kde-icons-crystal,
conectiva-crystal, kdeartwork3, kdebase3, kdebase3-ssl, kbabel (<< 3.1.90-1),
korganizer (<< 3.3.0-1), kdepim3-common (<< 3.3.0-1), kdepim3 (<< 3.3.0-1)
+Replaces: kdelibs3, kdelibs3-ssl-dev, kdelibs3-dev, keramik, kde-icons-crystal,
conectiva-crystal, kdeartwork3, kdebase3, kdebase3-ssl, kbabel (<< 3.1.90-1),
korganizer (<< 3.3.1-1), kdepim3-common (<< 3.3.1-1), kdepim3 (<< 3.3.1-1)
GCC: 3.3
CustomMirror: <<
@@ -16,8 +16,8 @@
nam-US: http://astrange.ithinksw.net/~astrange/ranger-fink
nam-CA: http://www.southofheaven.net/befunk
<<
-Source: mirror:kde:stable/3.3/src/kdelibs-%v.tar.bz2
-Source-MD5: 1c208724987433fc1929d22928c1a358
+Source: mirror:kde:stable/%v/src/kdelibs-%v.tar.bz2
+Source-MD5: 8636c93405b20eceadb12af5c5483508
Source3: mirror:custom:kde-build-20040821.tar.bz2
Source3-MD5: 5f222ad99ea992cf9a84d14ae12918cf
Source3ExtractDir: kdelibs-%v
@@ -62,9 +62,9 @@
SplitOff: <<
Package: %N-shlibs
Description: KDE - essential shared libraries
- Depends: arts-shlibs (>= 1.3.0-21), aspell-shlibs, audiofile-shlibs, bzip2-shlibs,
esound-shlibs, gettext, glib2-shlibs (>= 2.2.1-4), libart2-shlibs, libiconv,
libidn-shlibs (>= 0.5.1-1), libjpeg-shlibs, libmad-shlibs, libogg-shlibs,
libpng3-shlibs (>= 1.2.5-4), libtiff-shlibs, libvorbis0-shlibs, libxml2-shlibs (>=
2.5.2-1), libxslt-shlibs (>= 1.0.27-1), openssl097-shlibs, pcre-shlibs, qt3-shlibs (>=
3.3.2-21), x11
+ Depends: arts-shlibs (>= 1.3.1-21), aspell-shlibs, audiofile-shlibs, bzip2-shlibs,
esound-shlibs, gettext, glib2-shlibs (>= 2.2.1-4), libart2-shlibs, libiconv,
libidn-shlibs (>= 0.5.1-1), libjpeg-shlibs, libmad-shlibs, libogg-shlibs,
libpng3-shlibs (>= 1.2.5-4), libtiff-shlibs, libvorbis0-shlibs, libxml2-shlibs (>=
2.5.2-1), libxslt-shlibs (>= 1.0.27-1), openssl097-shlibs, pcre-shlibs, qt3-shlibs (>=
3.3.2-21), x11
Conflicts: bundle-kde, kdelibs3, kdelibs-shlibs, kdelibs3-dev, kdebase3,
kdebase3-shlibs, kdebase3-dev
- Replaces: kdelibs3, kdelibs3-ssl, kdelibs3-shlibs, kdepim3-common (<< 3.3.0-1)
+ Replaces: kdelibs3, kdelibs3-ssl, kdelibs3-shlibs, kdepim3-common (<< 3.3.1-1)
Recommends: %N (>= %v-%r)
Files: <<
lib/kde3/kabc*.so
@@ -147,7 +147,7 @@
%p/lib/libkmdi.1.dylib 2.0.0 %N-shlibs (>= 3.2.0-1)
%p/lib/libkmediaplayer.0.dylib 1.0.0 %N-shlibs (>= 3.2.0-1)
%p/lib/libkmid.0.dylib 1.0.0 %N-shlibs (>= 3.2.0-1)
- %p/lib/libknewstuff.1.dylib 2.0.0 %N-shlibs (>= 3.3.0-1)
+ %p/lib/libknewstuff.1.dylib 2.0.0 %N-shlibs (>= 3.3.1-1)
%p/lib/libkparts.2.dylib 4.0.0 %N-shlibs (>= 3.2.0-1)
%p/lib/libkresources.1.dylib 4.0.0 %N-shlibs (>= 3.2.0-1)
%p/lib/libkscript.0.dylib 1.0.0 %N-shlibs (>= 3.2.0-1)
@@ -165,8 +165,8 @@
Description: KDE - essential development libraries and headers
Depends: %N-shlibs (>= %v-%r), %N (>= %v-%r)
Conflicts: bundle-kde, kdelibs3, kdelibs-shlibs, kdelibs3-dev, kdebase3,
kdebase3-shlibs, kdebase3-dev
- Replaces: kdelibs3, kdelibs3-dev, kdelibs3-ssl, kde-icons-crystal, keramik,
kdeartwork3, kdebase3-dev, kdebase3-ssl-dev, kdepim3-dev (<< 3.3.0-1)
- Recommends: arts-dev (>= 1.3.0-1), audiofile, cups-dev, doxygen, esound, fink (>=
0.20.2.1-1), flex, libart2, libjpeg, libogg, libpng3 (>= 1.2.5-4), libtiff,
libvorbis0, libxml2, libxslt, libmad, openslp-ssl-dev | openslp-dev, pcre, pcre-bin,
qt3 (>= 3.3.2-1), qt3-doc, x11
+ Replaces: kdelibs3, kdelibs3-dev, kdelibs3-ssl, kde-icons-crystal, keramik,
kdeartwork3, kdebase3-dev, kdebase3-ssl-dev, kdepim3-dev (<< 3.3.1-1)
+ Recommends: arts-dev (>= 1.3.1-1), audiofile, cups-dev, doxygen, esound, fink (>=
0.20.2.1-1), flex, libart2, libjpeg, libogg, libpng3 (>= 1.2.5-4), libtiff,
libvorbis0, libxml2, libxslt, libmad, openslp-ssl-dev | openslp-dev, pcre, pcre-bin,
qt3 (>= 3.3.2-1), qt3-doc, x11
BuildDependsOnly: true
Files: <<
bin/dcopidl*
Index: kdebase3-ssl.patch
===================================================================
RCS file:
/cvsroot/fink/experimental/rangerrick/10.3/crypto/finkinfo/kdebase3-ssl.patch,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- kdebase3-ssl.patch 27 Aug 2004 17:54:37 -0000 1.13
+++ kdebase3-ssl.patch 13 Oct 2004 20:50:04 -0000 1.14
@@ -1,6 +1,27 @@
+diff -uNr kdebase-3.3.0/configure kdebase-3.3.0-new/configure
--- kdebase-3.3.0/configure Mon Aug 16 05:24:19 2004
-+++ kdebase-3.3.0-new/configure Sun Aug 22 16:36:47 2004
-@@ -9636,10 +9636,21 @@
++++ kdebase-3.3.0-new/configure Sun Sep 5 14:31:36 2004
+@@ -7993,6 +7993,19 @@
+ lt_cv_sys_max_cmd_len=8192;
+ ;;
+
++ netbsd* | freebsd* | openbsd* | darwin* )
++ # This has been around since 386BSD, at least. Likely further.
++ if test -x /sbin/sysctl; then
++ lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
++ elif test -x /usr/sbin/sysctl; then
++ lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
++ else
++ lt_cv_sys_max_cmd_len=65536 # usable default for *BSD
++ fi
++ # And add a safety zone
++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
++ ;;
++
+ *)
+ # If test is not a shell built-in, we'll probably end up computing a
+ # maximum length that is only half of the actual maximum length, but
+@@ -9636,10 +9649,21 @@
archive_cmds_need_lc=no
case "$host_os" in
rhapsody* | darwin1.[012])
@@ -24,7 +45,7 @@
;;
esac
lt_int_apple_cc_single_mod=no
-@@ -11486,10 +11497,21 @@
+@@ -11486,10 +11510,21 @@
archive_cmds_need_lc=no
case "$host_os" in
rhapsody* | darwin1.[012])
@@ -48,7 +69,7 @@
;;
esac
output_verbose_link_cmd='echo'
-@@ -12537,10 +12559,21 @@
+@@ -12537,10 +12572,21 @@
archive_cmds_need_lc_CXX=no
case "$host_os" in
rhapsody* | darwin1.[012])
@@ -72,7 +93,7 @@
;;
esac
lt_int_apple_cc_single_mod=no
-@@ -16360,10 +16393,21 @@
+@@ -16360,10 +16406,21 @@
archive_cmds_need_lc_F77=no
case "$host_os" in
rhapsody* | darwin1.[012])
@@ -96,7 +117,7 @@
;;
esac
lt_int_apple_cc_single_mod=no
-@@ -18642,10 +18686,21 @@
+@@ -18642,10 +18699,21 @@
archive_cmds_need_lc_GCJ=no
case "$host_os" in
rhapsody* | darwin1.[012])
@@ -120,8 +141,9 @@
;;
esac
lt_int_apple_cc_single_mod=no
+diff -uNr kdebase-3.3.0/kdeprint/kprinter/printwrapper.cpp
kdebase-3.3.0-new/kdeprint/kprinter/printwrapper.cpp
--- kdebase-3.3.0/kdeprint/kprinter/printwrapper.cpp Sat May 22 16:26:46 2004
-+++ kdebase-3.3.0-new/kdeprint/kprinter/printwrapper.cpp Sat Aug 21 20:22:43
2004
++++ kdebase-3.3.0-new/kdeprint/kprinter/printwrapper.cpp Sun Sep 5 14:31:29
2004
@@ -137,10 +137,6 @@
{
KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
@@ -144,8 +166,9 @@
# if defined(HAVE_SIGSET)
sigset(SIGHUP, signal_handler);
+diff -uNr kdebase-3.3.0/kioslave/Makefile.in kdebase-3.3.0-new/kioslave/Makefile.in
--- kdebase-3.3.0/kioslave/Makefile.in Mon Aug 16 05:23:45 2004
-+++ kdebase-3.3.0-new/kioslave/Makefile.in Sat Aug 21 20:21:41 2004
++++ kdebase-3.3.0-new/kioslave/Makefile.in Sun Sep 5 14:31:29 2004
@@ -64,7 +64,7 @@
uninstall-recursive nmcheck-recursive bcheck-recursive
ETAGS = etags
@@ -164,8 +187,9 @@
sftp tar finger thumbnail $(LDAP_SUBDIR) $(SMB_SUBDIR) $(DEVICES_SUBDIR) settings
#>- all: all-recursive
+diff -uNr kdebase-3.3.0/kioslave/info/kde-info2html.conf
kdebase-3.3.0-new/kioslave/info/kde-info2html.conf
--- kdebase-3.3.0/kioslave/info/kde-info2html.conf Sat May 22 16:26:52 2004
-+++ kdebase-3.3.0-new/kioslave/info/kde-info2html.conf Sat Aug 21 20:23:06 2004
++++ kdebase-3.3.0-new/kioslave/info/kde-info2html.conf Sun Sep 5 14:31:29 2004
@@ -25,6 +25,7 @@
#-- location of info files.
@@ -174,8 +198,9 @@
"/usr/share/info",
"/usr/info",
"/usr/lib/info",
+diff -uNr kdebase-3.3.0/kioslave/man/kio_man.cpp
kdebase-3.3.0-new/kioslave/man/kio_man.cpp
--- kdebase-3.3.0/kioslave/man/kio_man.cpp Thu Aug 5 14:57:13 2004
-+++ kdebase-3.3.0-new/kioslave/man/kio_man.cpp Sat Aug 21 20:24:08 2004
++++ kdebase-3.3.0-new/kioslave/man/kio_man.cpp Sun Sep 5 14:31:29 2004
@@ -50,7 +50,7 @@
MANProtocol *MANProtocol::_self = 0;
@@ -193,8 +218,9 @@
NULL };
+diff -uNr kdebase-3.3.0/ksysguard/ksysguardd/ksysguardd.c
kdebase-3.3.0-new/ksysguard/ksysguardd/ksysguardd.c
--- kdebase-3.3.0/ksysguard/ksysguardd/ksysguardd.c Sat Jul 17 13:52:09 2004
-+++ kdebase-3.3.0-new/ksysguard/ksysguardd/ksysguardd.c Sun Aug 22 12:22:09
2004
++++ kdebase-3.3.0-new/ksysguard/ksysguardd/ksysguardd.c Sun Sep 5 14:31:29
2004
@@ -433,7 +433,7 @@
if ( FD_ISSET( socketNo, fds ) ) {
int clientsocket;
@@ -204,8 +230,9 @@
/* a new connection */
if ( ( clientsocket = accept( socketNo, &addr, &addr_len ) ) < 0 ) {
+diff -uNr kdebase-3.3.0/libkonq/Makefile.in kdebase-3.3.0-new/libkonq/Makefile.in
--- kdebase-3.3.0/libkonq/Makefile.in Mon Aug 16 05:24:15 2004
-+++ kdebase-3.3.0-new/libkonq/Makefile.in Sat Aug 21 20:24:37 2004
++++ kdebase-3.3.0-new/libkonq/Makefile.in Sun Sep 5 14:31:29 2004
@@ -588,7 +588,7 @@
#>- libkonq_la_LDFLAGS = $(all_libraries) -version-info 6:0:2 -no-undefined
#>+ 1
@@ -215,8 +242,9 @@
#>- libkonq_la_SOURCES = konq_popupmenu.cc knewmenu.cc \
#>- konq_xmlguiclient.cc\
#>- kfileivi.cc konq_iconviewwidget.cc konq_settings.cc konq_drag.cc \
+diff -uNr kdebase-3.3.0/startkde kdebase-3.3.0-new/startkde
--- kdebase-3.3.0/startkde Thu Aug 5 14:56:53 2004
-+++ kdebase-3.3.0-new/startkde Sat Aug 21 20:27:02 2004
++++ kdebase-3.3.0-new/startkde Sun Sep 5 14:31:29 2004
@@ -3,6 +3,8 @@
# DEFAULT KDE STARTUP SCRIPT ( KDE-3.3 )
#
@@ -266,3 +294,21 @@
kwrapper ksmserver $KDEWM
if test $? -eq 255; then
# Startup error
+--- kdelibs-3.3.1/admin/ltmain.sh Tue Jun 15 12:47:06 2004
++++ kdelibs-3.3.1-new/admin/ltmain.sh Wed Oct 13 11:34:12 2004
+@@ -4397,6 +4397,7 @@
+ # We should set the shlibpath_var
+ rpath=
+ for dir in $temp_rpath; do
++ if test "$dir" != "/sw/lib"; then
+ case $dir in
+ [\\/]* | [A-Za-z]:[\\/]*)
+ # Absolute path.
+@@ -4407,6 +4408,7 @@
+ rpath="$rpath\$thisdir/$dir:"
+ ;;
+ esac
++ fi
+ done
+ temp_rpath="$rpath"
+ fi
Index: kdelibs3-ssl.patch
===================================================================
RCS file:
/cvsroot/fink/experimental/rangerrick/10.3/crypto/finkinfo/kdelibs3-ssl.patch,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- kdelibs3-ssl.patch 5 Sep 2004 22:38:33 -0000 1.14
+++ kdelibs3-ssl.patch 13 Oct 2004 20:50:04 -0000 1.15
@@ -1,7 +1,26 @@
-diff -uNr kdelibs-3.3.0/configure kdelibs-3.3.0-new/configure
---- kdelibs-3.3.0/configure Fri Aug 13 20:25:11 2004
-+++ kdelibs-3.3.0-new/configure Sun Sep 5 14:25:12 2004
-@@ -7894,6 +7894,19 @@
+diff -uNr kdelibs-3.3.1/admin/ltmain.sh kdelibs-3.3.1-new/admin/ltmain.sh
+--- kdelibs-3.3.1/admin/ltmain.sh Tue Jun 15 12:47:06 2004
++++ kdelibs-3.3.1-new/admin/ltmain.sh Wed Oct 13 11:34:12 2004
+@@ -4397,6 +4397,7 @@
+ # We should set the shlibpath_var
+ rpath=
+ for dir in $temp_rpath; do
++ if test "$dir" != "/sw/lib"; then
+ case $dir in
+ [\\/]* | [A-Za-z]:[\\/]*)
+ # Absolute path.
+@@ -4407,6 +4408,7 @@
+ rpath="$rpath\$thisdir/$dir:"
+ ;;
+ esac
++ fi
+ done
+ temp_rpath="$rpath"
+ fi
+diff -uNr kdelibs-3.3.1/configure kdelibs-3.3.1-new/configure
+--- kdelibs-3.3.1/configure Fri Oct 8 09:54:21 2004
++++ kdelibs-3.3.1-new/configure Wed Oct 13 11:33:52 2004
+@@ -7899,6 +7899,19 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -21,7 +40,7 @@
*)
# If test is not a shell built-in, we'll probably end up computing a
# maximum length that is only half of the actual maximum length, but
-@@ -9537,10 +9550,21 @@
+@@ -9542,10 +9555,21 @@
archive_cmds_need_lc=no
case "$host_os" in
rhapsody* | darwin1.[012])
@@ -45,7 +64,7 @@
;;
esac
lt_int_apple_cc_single_mod=no
-@@ -11390,7 +11414,18 @@
+@@ -11395,7 +11419,18 @@
allow_undefined_flag='-undefined suppress'
;;
*) # Darwin 1.3 on
@@ -65,7 +84,7 @@
;;
esac
output_verbose_link_cmd='echo'
-@@ -12441,7 +12476,18 @@
+@@ -12446,7 +12481,18 @@
allow_undefined_flag_CXX='-undefined suppress'
;;
*) # Darwin 1.3 on
@@ -85,7 +104,7 @@
;;
esac
lt_int_apple_cc_single_mod=no
-@@ -16264,7 +16310,18 @@
+@@ -16269,7 +16315,18 @@
allow_undefined_flag_F77='-undefined suppress'
;;
*) # Darwin 1.3 on
@@ -105,7 +124,7 @@
;;
esac
lt_int_apple_cc_single_mod=no
-@@ -18546,7 +18603,18 @@
+@@ -18551,7 +18608,18 @@
allow_undefined_flag_GCJ='-undefined suppress'
;;
*) # Darwin 1.3 on
@@ -125,7 +144,7 @@
;;
esac
lt_int_apple_cc_single_mod=no
-@@ -42601,8 +42669,8 @@
+@@ -42611,8 +42679,8 @@
kde_save_libs="$LIBS"
LIBS="$all_libraries $USER_LDFLAGS $kde_cups_libs"
CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
@@ -136,7 +155,7 @@
kde_save_link=$ac_link
ac_link='${CC} $CFLAGS -o conftest conftest.c $LIBS 1>&5'
cat > conftest.c <<EOF
-@@ -42612,7 +42680,7 @@
+@@ -42622,7 +42690,7 @@
{
if (CUPS_VERSION <
EOF
@@ -145,7 +164,7 @@
cat >> conftest.c <<EOF
)
printf("no\n");
-@@ -45091,7 +45159,7 @@
+@@ -45101,7 +45169,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -154,9 +173,9 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-diff -uNr kdelibs-3.3.0/dcop/dcopclient.cpp kdelibs-3.3.0-new/dcop/dcopclient.cpp
---- kdelibs-3.3.0/dcop/dcopclient.cpp Sat Jul 17 15:22:23 2004
-+++ kdelibs-3.3.0-new/dcop/dcopclient.cpp Sun Sep 5 14:25:13 2004
+diff -uNr kdelibs-3.3.1/dcop/dcopclient.cpp kdelibs-3.3.1-new/dcop/dcopclient.cpp
+--- kdelibs-3.3.1/dcop/dcopclient.cpp Sat Jul 17 15:22:23 2004
++++ kdelibs-3.3.1-new/dcop/dcopclient.cpp Wed Oct 13 11:33:53 2004
@@ -675,7 +675,7 @@
static bool peerIsUs(int sockfd)
{
@@ -166,10 +185,10 @@
if (getsockopt(sockfd, SOL_SOCKET, SO_PEERCRED, &cred, &siz) != 0)
return false;
return (cred.uid == getuid());
-diff -uNr kdelibs-3.3.0/kdecore/Makefile.in kdelibs-3.3.0-new/kdecore/Makefile.in
---- kdelibs-3.3.0/kdecore/Makefile.in Fri Aug 13 20:25:00 2004
-+++ kdelibs-3.3.0-new/kdecore/Makefile.in Sun Sep 5 14:25:13 2004
-@@ -635,7 +635,7 @@
+diff -uNr kdelibs-3.3.1/kdecore/Makefile.in kdelibs-3.3.1-new/kdecore/Makefile.in
+--- kdelibs-3.3.1/kdecore/Makefile.in Fri Oct 8 09:54:02 2004
++++ kdelibs-3.3.1-new/kdecore/Makefile.in Wed Oct 13 11:33:53 2004
+@@ -637,7 +637,7 @@
xdg_menudir = @xdg_menudir@
INCLUDES = -I$(top_srcdir)/kdefx -I$(top_srcdir)/kdecore/network $(all_includes)
$(LIBART_CFLAGS)
@[EMAIL PROTECTED] = svgicons
@@ -178,9 +197,9 @@
SUBDIRS = malloc network $(SVGICONS) . kconfig_compiler tests
lib_LTLIBRARIES = libkdefakes.la libkdecore.la
lib_LIBRARIES = libkdefakes_nonpic.a
-diff -uNr kdelibs-3.3.0/kdecore/kextsock.cpp kdelibs-3.3.0-new/kdecore/kextsock.cpp
---- kdelibs-3.3.0/kdecore/kextsock.cpp Sat Jul 17 15:22:32 2004
-+++ kdelibs-3.3.0-new/kdecore/kextsock.cpp Sun Sep 5 14:25:13 2004
+diff -uNr kdelibs-3.3.1/kdecore/kextsock.cpp kdelibs-3.3.1-new/kdecore/kextsock.cpp
+--- kdelibs-3.3.1/kdecore/kextsock.cpp Sun Oct 3 03:40:15 2004
++++ kdelibs-3.3.1-new/kdecore/kextsock.cpp Wed Oct 13 11:33:53 2004
@@ -534,7 +534,7 @@
return d->addressReusable;
@@ -208,7 +227,7 @@
retval = getsockopt(sockfd, SOL_SOCKET, SO_ERROR, (char*)&errcode,
&len);
if (retval == -1 || errcode != 0)
-@@ -1770,7 +1770,7 @@
+@@ -1780,7 +1780,7 @@
// our socket has activity
// find out what it was
int retval;
@@ -217,9 +236,9 @@
retval = getsockopt(sockfd, SOL_SOCKET, SO_ERROR, (char*)&errcode, &len);
if (retval == -1 || errcode != 0)
-diff -uNr kdelibs-3.3.0/kdecore/kglobalsettings.cpp
kdelibs-3.3.0-new/kdecore/kglobalsettings.cpp
---- kdelibs-3.3.0/kdecore/kglobalsettings.cpp Sat May 22 16:55:09 2004
-+++ kdelibs-3.3.0-new/kdecore/kglobalsettings.cpp Sun Sep 5 14:25:13 2004
+diff -uNr kdelibs-3.3.1/kdecore/kglobalsettings.cpp
kdelibs-3.3.1-new/kdecore/kglobalsettings.cpp
+--- kdelibs-3.3.1/kdecore/kglobalsettings.cpp Sat May 22 16:55:09 2004
++++ kdelibs-3.3.1-new/kdecore/kglobalsettings.cpp Wed Oct 13 11:33:53 2004
@@ -466,7 +466,7 @@
s_desktopPath->append('/');
@@ -229,9 +248,9 @@
*s_trashPath = config->readPathEntry( "Trash" , *s_trashPath);
*s_trashPath = QDir::cleanDirPath( *s_trashPath );
if ( !s_trashPath->endsWith("/") )
-diff -uNr kdelibs-3.3.0/kdecore/ksocks.cpp kdelibs-3.3.0-new/kdecore/ksocks.cpp
---- kdelibs-3.3.0/kdecore/ksocks.cpp Sat May 22 16:55:10 2004
-+++ kdelibs-3.3.0-new/kdecore/ksocks.cpp Sun Sep 5 14:25:13 2004
+diff -uNr kdelibs-3.3.1/kdecore/ksocks.cpp kdelibs-3.3.1-new/kdecore/ksocks.cpp
+--- kdelibs-3.3.1/kdecore/ksocks.cpp Sat May 22 16:55:10 2004
++++ kdelibs-3.3.1-new/kdecore/ksocks.cpp Wed Oct 13 11:33:53 2004
@@ -475,7 +475,7 @@
ksocklen_t addrlen) {
if (_useSocks && F_connect)
@@ -302,9 +321,9 @@
}
-diff -uNr kdelibs-3.3.0/kdecore/kstandarddirs.cpp
kdelibs-3.3.0-new/kdecore/kstandarddirs.cpp
---- kdelibs-3.3.0/kdecore/kstandarddirs.cpp Sat Jul 17 15:22:33 2004
-+++ kdelibs-3.3.0-new/kdecore/kstandarddirs.cpp Sun Sep 5 14:25:13 2004
+diff -uNr kdelibs-3.3.1/kdecore/kstandarddirs.cpp
kdelibs-3.3.1-new/kdecore/kstandarddirs.cpp
+--- kdelibs-3.3.1/kdecore/kstandarddirs.cpp Sun Oct 3 03:40:15 2004
++++ kdelibs-3.3.1-new/kdecore/kstandarddirs.cpp Wed Oct 13 11:33:53 2004
@@ -922,7 +922,7 @@
if (!strcmp(type, "data"))
return "share/apps/";
@@ -314,9 +333,9 @@
if (!strcmp(type, "icon"))
return "share/icons/";
if (!strcmp(type, "config"))
-diff -uNr kdelibs-3.3.0/kdecore/network/kresolvermanager.cpp
kdelibs-3.3.0-new/kdecore/network/kresolvermanager.cpp
---- kdelibs-3.3.0/kdecore/network/kresolvermanager.cpp Sat Jul 17 15:22:34 2004
-+++ kdelibs-3.3.0-new/kdecore/network/kresolvermanager.cpp Sun Sep 5 14:25:13
2004
+diff -uNr kdelibs-3.3.1/kdecore/network/kresolvermanager.cpp
kdelibs-3.3.1-new/kdecore/network/kresolvermanager.cpp
+--- kdelibs-3.3.1/kdecore/network/kresolvermanager.cpp Sun Oct 3 03:40:16 2004
++++ kdelibs-3.3.1-new/kdecore/network/kresolvermanager.cpp Wed Oct 13 11:33:53
2004
@@ -31,6 +31,7 @@
#ifdef HAVE_RES_INIT
@@ -325,10 +344,10 @@
# include <resolv.h>
#endif
-diff -uNr kdelibs-3.3.0/kdecore/network/ksocketdevice.cpp
kdelibs-3.3.0-new/kdecore/network/ksocketdevice.cpp
---- kdelibs-3.3.0/kdecore/network/ksocketdevice.cpp Thu Aug 5 15:23:48 2004
-+++ kdelibs-3.3.0-new/kdecore/network/ksocketdevice.cpp Sun Sep 5 14:25:13
2004
-@@ -307,7 +307,7 @@
+diff -uNr kdelibs-3.3.1/kdecore/network/ksocketdevice.cpp
kdelibs-3.3.1-new/kdecore/network/ksocketdevice.cpp
+--- kdelibs-3.3.1/kdecore/network/ksocketdevice.cpp Sun Oct 3 03:40:16 2004
++++ kdelibs-3.3.1-new/kdecore/network/ksocketdevice.cpp Wed Oct 13 11:33:54
2004
+@@ -311,7 +311,7 @@
}
struct sockaddr sa;
@@ -337,7 +356,7 @@
int newfd = kde_accept(m_sockfd, &sa, &len);
if (newfd == -1)
{
-@@ -381,7 +381,7 @@
+@@ -385,7 +385,7 @@
static int do_read_common(int sockfd, char *data, Q_ULONG maxlen, KSocketAddress*
from, ssize_t &retval, bool peek = false)
{
@@ -346,7 +365,7 @@
if (from)
{
from->setLength(len = 128); // arbitrary length
-@@ -519,7 +519,7 @@
+@@ -523,7 +523,7 @@
if (m_sockfd == -1)
return KSocketAddress(); // not open, empty value
@@ -355,7 +374,7 @@
KSocketAddress localAddress;
localAddress.setLength(len = 32); // arbitrary value
if (kde_getsockname(m_sockfd, localAddress.address(), &len) == -1)
-@@ -548,7 +548,7 @@
+@@ -552,7 +552,7 @@
if (m_sockfd == -1)
return KSocketAddress(); // not open, empty value
@@ -364,48 +383,9 @@
KSocketAddress peerAddress;
peerAddress.setLength(len = 32); // arbitrary value
if (kde_getpeername(m_sockfd, peerAddress.address(), &len) == -1)
-diff -uNr kdelibs-3.3.0/kdecore/network/ksockssocketdevice.cpp
kdelibs-3.3.0-new/kdecore/network/ksockssocketdevice.cpp
---- kdelibs-3.3.0/kdecore/network/ksockssocketdevice.cpp Sat Jun 12 12:43:39
2004
-+++ kdelibs-3.3.0-new/kdecore/network/ksockssocketdevice.cpp Sun Sep 5 14:25:13
2004
-@@ -153,7 +153,7 @@
- }
-
- struct sockaddr sa;
-- socklen_t len = sizeof(sa);
-+ kde_socklen_t len = sizeof(sa);
- int newfd = KSocks::self()->accept(m_sockfd, &sa, &len);
- if (newfd == -1)
- {
-@@ -169,7 +169,7 @@
-
- static int socks_read_common(int sockfd, char *data, Q_ULONG maxlen, KSocketAddress*
from, ssize_t &retval, bool peek = false)
- {
-- socklen_t len;
-+ kde_socklen_t len;
- if (from)
- {
- from->setLength(len = 128); // arbitrary length
-@@ -307,7 +307,7 @@
- if (m_sockfd == -1)
- return KSocketAddress(); // not open, empty value
-
-- socklen_t len;
-+ kde_socklen_t len;
- KSocketAddress localAddress;
- localAddress.setLength(len = 32); // arbitrary value
- if (KSocks::self()->getsockname(m_sockfd, localAddress.address(), &len) == -1)
-@@ -336,7 +336,7 @@
- if (m_sockfd == -1)
- return KSocketAddress(); // not open, empty value
-
-- socklen_t len;
-+ kde_socklen_t len;
- KSocketAddress peerAddress;
- peerAddress.setLength(len = 32); // arbitrary value
- if (KSocks::self()->getpeername(m_sockfd, peerAddress.address(), &len) == -1)
-diff -uNr kdelibs-3.3.0/kdecore/network/syssocket.h
kdelibs-3.3.0-new/kdecore/network/syssocket.h
---- kdelibs-3.3.0/kdecore/network/syssocket.h Tue May 25 22:34:35 2004
-+++ kdelibs-3.3.0-new/kdecore/network/syssocket.h Sun Sep 5 14:25:13 2004
+diff -uNr kdelibs-3.3.1/kdecore/network/syssocket.h
kdelibs-3.3.1-new/kdecore/network/syssocket.h
+--- kdelibs-3.3.1/kdecore/network/syssocket.h Tue May 25 22:34:35 2004
++++ kdelibs-3.3.1-new/kdecore/network/syssocket.h Wed Oct 13 11:33:54 2004
@@ -53,7 +53,7 @@
}
@@ -445,9 +425,9 @@
{
return ::getsockname(fd, sa, len);
}
-diff -uNr kdelibs-3.3.0/kdecore/tests/kresolvertest.cpp
kdelibs-3.3.0-new/kdecore/tests/kresolvertest.cpp
---- kdelibs-3.3.0/kdecore/tests/kresolvertest.cpp Sat May 22 16:55:11 2004
-+++ kdelibs-3.3.0-new/kdecore/tests/kresolvertest.cpp Sun Sep 5 14:25:13 2004
+diff -uNr kdelibs-3.3.1/kdecore/tests/kresolvertest.cpp
kdelibs-3.3.1-new/kdecore/tests/kresolvertest.cpp
+--- kdelibs-3.3.1/kdecore/tests/kresolvertest.cpp Sat May 22 16:55:11 2004
++++ kdelibs-3.3.1-new/kdecore/tests/kresolvertest.cpp Wed Oct 13 11:33:54 2004
@@ -164,7 +164,7 @@
#else
int sock;
@@ -457,9 +437,9 @@
printf("\tAF_INET6 == %d\n", AF_INET6);
printf("\tTrying to create an IPv6 socket...");
-diff -uNr kdelibs-3.3.0/kdesu/client.cpp kdelibs-3.3.0-new/kdesu/client.cpp
---- kdelibs-3.3.0/kdesu/client.cpp Wed Jun 25 10:56:23 2003
-+++ kdelibs-3.3.0-new/kdesu/client.cpp Sun Sep 5 14:25:13 2004
+diff -uNr kdelibs-3.3.1/kdesu/client.cpp kdelibs-3.3.1-new/kdesu/client.cpp
+--- kdelibs-3.3.1/kdesu/client.cpp Wed Jun 25 10:56:23 2003
++++ kdelibs-3.3.1-new/kdesu/client.cpp Wed Oct 13 11:33:54 2004
@@ -42,7 +42,7 @@
};
@@ -478,9 +458,9 @@
// Security: if socket exists, we must own it
if (getsockopt(sockfd, SOL_SOCKET, SO_PEERCRED, &cred, &siz) == 0)
-diff -uNr kdelibs-3.3.0/kdesu/su.cpp kdelibs-3.3.0-new/kdesu/su.cpp
---- kdelibs-3.3.0/kdesu/su.cpp Sat May 22 16:55:16 2004
-+++ kdelibs-3.3.0-new/kdesu/su.cpp Sun Sep 5 14:25:13 2004
+diff -uNr kdelibs-3.3.1/kdesu/su.cpp kdelibs-3.3.1-new/kdesu/su.cpp
+--- kdelibs-3.3.1/kdesu/su.cpp Sat May 22 16:55:16 2004
++++ kdelibs-3.3.1-new/kdesu/su.cpp Wed Oct 13 11:33:54 2004
@@ -74,13 +74,14 @@
setTerminal(true);
@@ -497,10 +477,10 @@
QCString command = __PATH_SU;
if (::access(__PATH_SU, X_OK) != 0)
-diff -uNr kdelibs-3.3.0/kdeui/Makefile.in kdelibs-3.3.0-new/kdeui/Makefile.in
---- kdelibs-3.3.0/kdeui/Makefile.in Fri Aug 13 20:25:02 2004
-+++ kdelibs-3.3.0-new/kdeui/Makefile.in Sun Sep 5 14:25:13 2004
-@@ -589,11 +589,11 @@
+diff -uNr kdelibs-3.3.1/kdeui/Makefile.in kdelibs-3.3.1-new/kdeui/Makefile.in
+--- kdelibs-3.3.1/kdeui/Makefile.in Fri Oct 8 09:54:06 2004
++++ kdelibs-3.3.1-new/kdeui/Makefile.in Wed Oct 13 11:33:54 2004
+@@ -591,11 +591,11 @@
lib_LTLIBRARIES = libkdeui.la libkspell.la
#>- libkdeui_la_LDFLAGS = $(KDE_MT_LDFLAGS) -no-undefined -version-info 6:0:2
#>+ 1
@@ -514,10 +494,10 @@
libkspell_la_LIBADD = libkdeui.la
libkspell_la_SOURCES = dummy.cpp
picsdir = $(kde_datadir)/kdeui/pics
-diff -uNr kdelibs-3.3.0/kio/misc/kpac/Makefile.in
kdelibs-3.3.0-new/kio/misc/kpac/Makefile.in
---- kdelibs-3.3.0/kio/misc/kpac/Makefile.in Fri Aug 13 20:25:06 2004
-+++ kdelibs-3.3.0-new/kio/misc/kpac/Makefile.in Sun Sep 5 14:25:13 2004
-@@ -515,7 +515,7 @@
+diff -uNr kdelibs-3.3.1/kio/misc/kpac/Makefile.in
kdelibs-3.3.1-new/kio/misc/kpac/Makefile.in
+--- kdelibs-3.3.1/kio/misc/kpac/Makefile.in Fri Oct 8 09:54:12 2004
++++ kdelibs-3.3.1-new/kio/misc/kpac/Makefile.in Wed Oct 13 11:33:54 2004
+@@ -517,7 +517,7 @@
downloader.cpp discovery.cpp proxyscout_skel.cpp
kded_proxyscout_la_LDFLAGS = $(all_libraries) -module -avoid-version
@@ -526,9 +506,9 @@
kpac_dhcp_helper_SOURCES = kpac_dhcp_helper.c
kpac_dhcp_helper_LDADD = $(LIBSOCKET)
noinst_HEADERS = proxyscout.h script.h downloader.h discovery.h
-diff -uNr kdelibs-3.3.0/kioslave/ftp/ftp.cc kdelibs-3.3.0-new/kioslave/ftp/ftp.cc
---- kdelibs-3.3.0/kioslave/ftp/ftp.cc Sat Jul 17 15:22:58 2004
-+++ kdelibs-3.3.0-new/kioslave/ftp/ftp.cc Sun Sep 5 14:25:13 2004
+diff -uNr kdelibs-3.3.1/kioslave/ftp/ftp.cc kdelibs-3.3.1-new/kioslave/ftp/ftp.cc
+--- kdelibs-3.3.1/kioslave/ftp/ftp.cc Sun Oct 3 03:40:52 2004
++++ kdelibs-3.3.1-new/kioslave/ftp/ftp.cc Wed Oct 13 11:33:55 2004
@@ -283,7 +283,7 @@
textClear();
}
@@ -538,9 +518,9 @@
{
return (setsockopt(sock(), SOL_SOCKET, opt, arg, len) != -1);
}
-diff -uNr kdelibs-3.3.0/kioslave/ftp/ftp.h kdelibs-3.3.0-new/kioslave/ftp/ftp.h
---- kdelibs-3.3.0/kioslave/ftp/ftp.h Tue Jun 22 13:36:42 2004
-+++ kdelibs-3.3.0-new/kioslave/ftp/ftp.h Sun Sep 5 14:25:13 2004
+diff -uNr kdelibs-3.3.1/kioslave/ftp/ftp.h kdelibs-3.3.1-new/kioslave/ftp/ftp.h
+--- kdelibs-3.3.1/kioslave/ftp/ftp.h Tue Jun 22 13:36:42 2004
++++ kdelibs-3.3.1-new/kioslave/ftp/ftp.h Wed Oct 13 11:33:55 2004
@@ -196,7 +196,7 @@
/**
* utility to simplify calls to ::setsockopt(). Uses sock().
@@ -550,9 +530,9 @@
/**
* utility to read data from the effective socket, see sock()
-diff -uNr kdelibs-3.3.0/libltdl/Makefile.in kdelibs-3.3.0-new/libltdl/Makefile.in
---- kdelibs-3.3.0/libltdl/Makefile.in Fri Aug 13 20:25:08 2004
-+++ kdelibs-3.3.0-new/libltdl/Makefile.in Sun Sep 5 14:25:13 2004
+diff -uNr kdelibs-3.3.1/libltdl/Makefile.in kdelibs-3.3.1-new/libltdl/Makefile.in
+--- kdelibs-3.3.1/libltdl/Makefile.in Fri Oct 8 09:54:17 2004
++++ kdelibs-3.3.1-new/libltdl/Makefile.in Wed Oct 13 11:33:55 2004
@@ -50,9 +50,7 @@
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -787,195 +767,7 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_INCLUDES = @X_INCLUDES@
X_LDFLAGS = @X_LDFLAGS@
-@@ -296,165 +258,71 @@
- am__quote = @am__quote@
- am__tar = @am__tar@
- am__untar = @am__untar@
--arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
--arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
-+artsc_SUBDIR_included_FALSE = @artsc_SUBDIR_included_FALSE@
-+artsc_SUBDIR_included_TRUE = @artsc_SUBDIR_included_TRUE@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
--cups_modeldir = @cups_modeldir@
- datadir = @datadir@
--dcop_SUBDIR_included_FALSE = @dcop_SUBDIR_included_FALSE@
--dcop_SUBDIR_included_TRUE = @dcop_SUBDIR_included_TRUE@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+examples_SUBDIR_included_FALSE = @examples_SUBDIR_included_FALSE@
-+examples_SUBDIR_included_TRUE = @examples_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-+flow_SUBDIR_included_FALSE = @flow_SUBDIR_included_FALSE@
-+flow_SUBDIR_included_TRUE = @flow_SUBDIR_included_TRUE@
-+gmcop_SUBDIR_included_FALSE = @gmcop_SUBDIR_included_FALSE@
-+gmcop_SUBDIR_included_TRUE = @gmcop_SUBDIR_included_TRUE@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
--include_ARTS_FALSE = @include_ARTS_FALSE@
--include_ARTS_TRUE = @include_ARTS_TRUE@
--include_BZIP2_FALSE = @include_BZIP2_FALSE@
--include_BZIP2_TRUE = @include_BZIP2_TRUE@
--include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
--include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
--include_JP2_MODULES_FALSE = @include_JP2_MODULES_FALSE@
--include_JP2_MODULES_TRUE = @include_JP2_MODULES_TRUE@
--include_SVGICONS_FALSE = @include_SVGICONS_FALSE@
--include_SVGICONS_TRUE = @include_SVGICONS_TRUE@
--include_TIFF_MODULES_FALSE = @include_TIFF_MODULES_FALSE@
--include_TIFF_MODULES_TRUE = @include_TIFF_MODULES_TRUE@
--include_VERSION_SCRIPT_FALSE = @include_VERSION_SCRIPT_FALSE@
--include_VERSION_SCRIPT_TRUE = @include_VERSION_SCRIPT_TRUE@
--include_aspell_plugin_FALSE = @include_aspell_plugin_FALSE@
--include_aspell_plugin_TRUE = @include_aspell_plugin_TRUE@
--include_bzip2_FALSE = @include_bzip2_FALSE@
--include_bzip2_TRUE = @include_bzip2_TRUE@
--include_cups_SUBDIR_FALSE = @include_cups_SUBDIR_FALSE@
--include_cups_SUBDIR_TRUE = @include_cups_SUBDIR_TRUE@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
--interfaces_SUBDIR_included_FALSE = @interfaces_SUBDIR_included_FALSE@
--interfaces_SUBDIR_included_TRUE = @interfaces_SUBDIR_included_TRUE@
--kab_SUBDIR_included_FALSE = @kab_SUBDIR_included_FALSE@
--kab_SUBDIR_included_TRUE = @kab_SUBDIR_included_TRUE@
--kabc_SUBDIR_included_FALSE = @kabc_SUBDIR_included_FALSE@
--kabc_SUBDIR_included_TRUE = @kabc_SUBDIR_included_TRUE@
--kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
--kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
--kcert_SUBDIR_included_FALSE = @kcert_SUBDIR_included_FALSE@
--kcert_SUBDIR_included_TRUE = @kcert_SUBDIR_included_TRUE@
--kconf_update_SUBDIR_included_FALSE = @kconf_update_SUBDIR_included_FALSE@
--kconf_update_SUBDIR_included_TRUE = @kconf_update_SUBDIR_included_TRUE@
--kde_appsdir = @kde_appsdir@
--kde_bindir = @kde_bindir@
--kde_confdir = @kde_confdir@
--kde_cups_config = @kde_cups_config@
--kde_datadir = @kde_datadir@
--kde_htmldir = @kde_htmldir@
--kde_icondir = @kde_icondir@
- kde_includes = @kde_includes@
--kde_kcfgdir = @kde_kcfgdir@
- kde_libraries = @kde_libraries@
--kde_locale = @kde_locale@
--kde_mimedir = @kde_mimedir@
--kde_moduledir = @kde_moduledir@
- kde_qtver = @kde_qtver@
--kde_servicesdir = @kde_servicesdir@
--kde_servicetypesdir = @kde_servicetypesdir@
--kde_sounddir = @kde_sounddir@
--kde_styledir = @kde_styledir@
--kde_templatesdir = @kde_templatesdir@
--kde_wallpaperdir = @kde_wallpaperdir@
--kde_widgetdir = @kde_widgetdir@
--kdecore_SUBDIR_included_FALSE = @kdecore_SUBDIR_included_FALSE@
--kdecore_SUBDIR_included_TRUE = @kdecore_SUBDIR_included_TRUE@
--kded_SUBDIR_included_FALSE = @kded_SUBDIR_included_FALSE@
--kded_SUBDIR_included_TRUE = @kded_SUBDIR_included_TRUE@
--kdefx_SUBDIR_included_FALSE = @kdefx_SUBDIR_included_FALSE@
--kdefx_SUBDIR_included_TRUE = @kdefx_SUBDIR_included_TRUE@
--kdeinitdir = @kdeinitdir@
--kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
--kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
--kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
--kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
--kdeui_SUBDIR_included_FALSE = @kdeui_SUBDIR_included_FALSE@
--kdeui_SUBDIR_included_TRUE = @kdeui_SUBDIR_included_TRUE@
--kdewidgets_SUBDIR_included_FALSE = @kdewidgets_SUBDIR_included_FALSE@
--kdewidgets_SUBDIR_included_TRUE = @kdewidgets_SUBDIR_included_TRUE@
--kdoctools_SUBDIR_included_FALSE = @kdoctools_SUBDIR_included_FALSE@
--kdoctools_SUBDIR_included_TRUE = @kdoctools_SUBDIR_included_TRUE@
--khtml_SUBDIR_included_FALSE = @khtml_SUBDIR_included_FALSE@
--khtml_SUBDIR_included_TRUE = @khtml_SUBDIR_included_TRUE@
--kimgio_SUBDIR_included_FALSE = @kimgio_SUBDIR_included_FALSE@
--kimgio_SUBDIR_included_TRUE = @kimgio_SUBDIR_included_TRUE@
--kinit_SUBDIR_included_FALSE = @kinit_SUBDIR_included_FALSE@
--kinit_SUBDIR_included_TRUE = @kinit_SUBDIR_included_TRUE@
--kio_SUBDIR_included_FALSE = @kio_SUBDIR_included_FALSE@
--kio_SUBDIR_included_TRUE = @kio_SUBDIR_included_TRUE@
--kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
--kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
--kjs_SUBDIR_included_FALSE = @kjs_SUBDIR_included_FALSE@
--kjs_SUBDIR_included_TRUE = @kjs_SUBDIR_included_TRUE@
--kmdi_SUBDIR_included_FALSE = @kmdi_SUBDIR_included_FALSE@
--kmdi_SUBDIR_included_TRUE = @kmdi_SUBDIR_included_TRUE@
--knewstuff_SUBDIR_included_FALSE = @knewstuff_SUBDIR_included_FALSE@
--knewstuff_SUBDIR_included_TRUE = @knewstuff_SUBDIR_included_TRUE@
--kparts_SUBDIR_included_FALSE = @kparts_SUBDIR_included_FALSE@
--kparts_SUBDIR_included_TRUE = @kparts_SUBDIR_included_TRUE@
--kresources_SUBDIR_included_FALSE = @kresources_SUBDIR_included_FALSE@
--kresources_SUBDIR_included_TRUE = @kresources_SUBDIR_included_TRUE@
--ksmartcard_SUBDIR_included_FALSE = @ksmartcard_SUBDIR_included_FALSE@
--ksmartcard_SUBDIR_included_TRUE = @ksmartcard_SUBDIR_included_TRUE@
--kspell2_SUBDIR_included_FALSE = @kspell2_SUBDIR_included_FALSE@
--kspell2_SUBDIR_included_TRUE = @kspell2_SUBDIR_included_TRUE@
--kstyles_SUBDIR_included_FALSE = @kstyles_SUBDIR_included_FALSE@
--kstyles_SUBDIR_included_TRUE = @kstyles_SUBDIR_included_TRUE@
--kutils_SUBDIR_included_FALSE = @kutils_SUBDIR_included_FALSE@
--kutils_SUBDIR_included_TRUE = @kutils_SUBDIR_included_TRUE@
--kwallet_SUBDIR_included_FALSE = @kwallet_SUBDIR_included_FALSE@
--kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
--libkmid_SUBDIR_included_FALSE = @libkmid_SUBDIR_included_FALSE@
--libkmid_SUBDIR_included_TRUE = @libkmid_SUBDIR_included_TRUE@
--libkscreensaver_SUBDIR_included_FALSE = @libkscreensaver_SUBDIR_included_FALSE@
--libkscreensaver_SUBDIR_included_TRUE = @libkscreensaver_SUBDIR_included_TRUE@
- libltdl_SUBDIR_included_FALSE = @libltdl_SUBDIR_included_FALSE@
- libltdl_SUBDIR_included_TRUE = @libltdl_SUBDIR_included_TRUE@
--licenses_SUBDIR_included_FALSE = @licenses_SUBDIR_included_FALSE@
--licenses_SUBDIR_included_TRUE = @licenses_SUBDIR_included_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
--mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
--mimetypes_SUBDIR_included_TRUE = @mimetypes_SUBDIR_included_TRUE@
-+mcop_SUBDIR_included_FALSE = @mcop_SUBDIR_included_FALSE@
-+mcop_SUBDIR_included_TRUE = @mcop_SUBDIR_included_TRUE@
-+mcop_mt_SUBDIR_included_FALSE = @mcop_mt_SUBDIR_included_FALSE@
-+mcop_mt_SUBDIR_included_TRUE = @mcop_mt_SUBDIR_included_TRUE@
-+mcopidl_SUBDIR_included_FALSE = @mcopidl_SUBDIR_included_FALSE@
-+mcopidl_SUBDIR_included_TRUE = @mcopidl_SUBDIR_included_TRUE@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
--path_su = @path_su@
--pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
--pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
-+qtmcop_SUBDIR_included_FALSE = @qtmcop_SUBDIR_included_FALSE@
-+qtmcop_SUBDIR_included_TRUE = @qtmcop_SUBDIR_included_TRUE@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+soundserver_SUBDIR_included_FALSE = @soundserver_SUBDIR_included_FALSE@
-+soundserver_SUBDIR_included_TRUE = @soundserver_SUBDIR_included_TRUE@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
-+tests_SUBDIR_included_FALSE = @tests_SUBDIR_included_FALSE@
-+tests_SUBDIR_included_TRUE = @tests_SUBDIR_included_TRUE@
-+x11_SUBDIR_included_FALSE = @x11_SUBDIR_included_FALSE@
-+x11_SUBDIR_included_TRUE = @x11_SUBDIR_included_TRUE@
- x_includes = @x_includes@
- x_libraries = @x_libraries@
--xdg_appsdir = @xdg_appsdir@
--xdg_directorydir = @xdg_directorydir@
--xdg_menudir = @xdg_menudir@
- AUTOMAKE_OPTIONS = no-dependencies foreign
- noinst_HEADERS = ltdl.h
- noinst_LTLIBRARIES = libltdlc.la
-@@ -723,7 +591,7 @@
+@@ -725,7 +687,7 @@
.NOEXPORT:
#>+ 2
@@ -984,9 +776,9 @@
#>+ 2
docs-am:
-diff -uNr kdelibs-3.3.0/libltdl/ltdl.c kdelibs-3.3.0-new/libltdl/ltdl.c
---- kdelibs-3.3.0/libltdl/ltdl.c Fri Apr 2 08:48:51 2004
-+++ kdelibs-3.3.0-new/libltdl/ltdl.c Sun Sep 5 14:25:13 2004
+diff -uNr kdelibs-3.3.1/libltdl/ltdl.c kdelibs-3.3.1-new/libltdl/ltdl.c
+--- kdelibs-3.3.1/libltdl/ltdl.c Fri Apr 2 08:48:51 2004
++++ kdelibs-3.3.1-new/libltdl/ltdl.c Wed Oct 13 11:33:55 2004
@@ -29,12 +29,22 @@
# include <config.h>
#endif
@@ -5922,9 +5714,9 @@
-}
-
-#endif /* _AIX */
-diff -uNr kdelibs-3.3.0/libltdl/ltdl.h kdelibs-3.3.0-new/libltdl/ltdl.h
---- kdelibs-3.3.0/libltdl/ltdl.h Thu Apr 5 23:56:42 2001
-+++ kdelibs-3.3.0-new/libltdl/ltdl.h Sun Sep 5 14:25:13 2004
+diff -uNr kdelibs-3.3.1/libltdl/ltdl.h kdelibs-3.3.1-new/libltdl/ltdl.h
+--- kdelibs-3.3.1/libltdl/ltdl.h Thu Apr 5 23:56:42 2001
++++ kdelibs-3.3.1-new/libltdl/ltdl.h Wed Oct 13 11:33:55 2004
@@ -34,6 +34,9 @@
/* --- MACROS FOR PORTABILITY --- */
Index: bundle-kde-ssl.info
===================================================================
RCS file:
/cvsroot/fink/experimental/rangerrick/10.3/crypto/finkinfo/bundle-kde-ssl.info,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- bundle-kde-ssl.info 29 Aug 2004 19:05:26 -0000 1.13
+++ bundle-kde-ssl.info 13 Oct 2004 20:50:03 -0000 1.14
@@ -1,11 +1,11 @@
Package: bundle-kde-ssl
-Version: 3.3.0
+Version: 3.3.1
Revision: 21
Description: KDE - convenience package: KDE 3.3 (SSL support)
Type: bundle
Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
-Depends: arts (>= 1.3.0-21), kdelibs3-ssl (>= %v-21), kdebase3-ssl (>= %v-21),
kdeaccessibility3 (>= %v-21), kdeartwork3 (>= %v-21), kdeedu3 (>= %v-21), kdegames3
(>= %v-21), kdegraphics3 (>= %v-21), kdenetwork3 (>= %v-21), kdepim3 (>= %v-21),
kdesdk3 (>= %v-21), kdetoys3 (>= %v-21), kdeutils3 (>= %v-21), kdewebdev3 (>= %v-21),
koffice (>= 1.3.2-1)
+Depends: arts (>= 1.3.1-21), kdelibs3-ssl (>= %v-21), kdebase3-ssl (>= %v-21),
kdeaccessibility3 (>= %v-21), kdeartwork3 (>= %v-21), kdeedu3 (>= %v-21), kdegames3
(>= %v-21), kdegraphics3 (>= %v-21), kdenetwork3 (>= %v-21), kdepim3 (>= %v-21),
kdesdk3 (>= %v-21), kdetoys3 (>= %v-21), kdeutils3 (>= %v-21), kdewebdev3 (>= %v-21),
koffice (>= 1.3.3-1)
BuildDepends: arts-dev (>= 1.3.0-21), kdelibs3-ssl-dev (>= %v-21), kdebase3-ssl-dev
(>= %v-21)
Conflicts: bundle-kde, kdelibs3, kdelibs3-dev, kdebase3, kdebase3-dev
-------------------------------------------------------
This SF.net email is sponsored by: IT Product Guide on ITManagersJournal
Use IT products in your business? Tell us what you think of them. Give us
Your Opinions, Get Free ThinkGeek Gift Certificates! Click to find out more
http://productguide.itmanagersjournal.com/guidepromo.tmpl
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits
