Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/kde
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv14180

Modified Files:
        kdeedu3.info kdeedu3.patch kdelibs3-unified.info 
        kdelibs3-unified.patch 
Log Message:
fixes from unstable

Index: kdeedu3.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/kde/kdeedu3.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- kdeedu3.patch       26 Oct 2007 16:19:49 -0000      1.2
+++ kdeedu3.patch       14 Nov 2007 17:01:02 -0000      1.3
@@ -1,4 +1,4 @@
-diff -uNr kdeedu-3.5.8/kalzium/src/Makefile.am 
kdeedu-3.5.8-new/kalzium/src/Makefile.am
+
 --- kdeedu-3.5.8/kalzium/src/Makefile.am       2005-09-10 10:24:07.000000000 
-0400
 +++ kdeedu-3.5.8-new/kalzium/src/Makefile.am   2007-10-24 22:24:41.000000000 
-0400
 @@ -1,8 +1,11 @@
@@ -33,7 +33,6 @@
  
  #this RegExp-monster grep for <name origin=foo">bar</name> and puts the 
i18n() around foo and bar
  messages-old: rc.cpp
-diff -uNr kdeedu-3.5.8/kalzium/src/main.cpp 
kdeedu-3.5.8-new/kalzium/src/main.cpp
 --- kdeedu-3.5.8/kalzium/src/main.cpp  2006-10-01 13:24:17.000000000 -0400
 +++ kdeedu-3.5.8-new/kalzium/src/main.cpp      2007-10-24 22:24:41.000000000 
-0400
 @@ -43,7 +43,7 @@
@@ -45,7 +44,6 @@
  {
  #ifdef HAVE_FACILE
      caml_startup(argv);
-diff -uNr kdeedu-3.5.8/kbruch/src/Makefile.am 
kdeedu-3.5.8-new/kbruch/src/Makefile.am
 --- kdeedu-3.5.8/kbruch/src/Makefile.am        2005-09-10 04:18:00.000000000 
-0400
 +++ kdeedu-3.5.8-new/kbruch/src/Makefile.am    2007-10-24 22:24:41.000000000 
-0400
 @@ -1,10 +1,14 @@
@@ -68,7 +66,6 @@
  
  EXTRA_DIST = kbruch.cpp kbruch.h kbruch.desktop hi32-app-kbruch.png 
hi16-app-kbruch.png lo32-app-kbruch.png lo16-app-kbruch.png mainqtwidget.cpp 
mainqtwidget.h primenumber.cpp primenumber.h statisticsview.cpp 
statisticsview.h exercisebase.cpp exercisebase.h taskview.cpp taskview.h 
ratio.cpp ratio.h task.cpp task.h taskwidget.cpp taskwidget.h 
fractionbasewidget.cpp fractionbasewidget.h resultwidget.cpp resultwidget.h 
exercisecompare.cpp exercisecompare.h ratiowidget.cpp ratiowidget.h 
rationalwidget.cpp rationalwidget.h exerciseconvert.cpp exerciseconvert.h 
exercisefactorize.cpp exercisefactorize.h factorizedwidget.cpp 
factorizedwidget.h kbruch.rc taskvieweroptionsbase.ui
  
-diff -uNr kdeedu-3.5.8/kbruch/src/kbruch.cpp 
kdeedu-3.5.8-new/kbruch/src/kbruch.cpp
 --- kdeedu-3.5.8/kbruch/src/kbruch.cpp 2007-05-14 03:38:52.000000000 -0400
 +++ kdeedu-3.5.8-new/kbruch/src/kbruch.cpp     2007-10-24 22:24:41.000000000 
-0400
 @@ -29,7 +29,7 @@
@@ -80,7 +77,6 @@
  {
        // init random generator
        srand(time(NULL));
-diff -uNr kdeedu-3.5.8/keduca/keduca/Makefile.am 
kdeedu-3.5.8-new/keduca/keduca/Makefile.am
 --- kdeedu-3.5.8/keduca/keduca/Makefile.am     2005-09-10 04:17:25.000000000 
-0400
 +++ kdeedu-3.5.8-new/keduca/keduca/Makefile.am 2007-10-24 22:24:41.000000000 
-0400
 @@ -1,11 +1,13 @@
@@ -102,7 +98,6 @@
  
  # Convenience library
  #noinst_LTLIBRARIES = libkeduca_common.la
-diff -uNr kdeedu-3.5.8/keduca/keduca/main.cpp 
kdeedu-3.5.8-new/keduca/keduca/main.cpp
 --- kdeedu-3.5.8/keduca/keduca/main.cpp        2005-09-10 04:17:25.000000000 
-0400
 +++ kdeedu-3.5.8-new/keduca/keduca/main.cpp    2007-10-24 22:24:41.000000000 
-0400
 @@ -31,7 +31,7 @@
@@ -114,7 +109,6 @@
  {
      KAboutData aboutData( "keduca", I18N_NOOP("KEduca"),
                            version, description, KAboutData::License_GPL,
-diff -uNr kdeedu-3.5.8/keduca/keducabuilder/Makefile.am 
kdeedu-3.5.8-new/keduca/keducabuilder/Makefile.am
 --- kdeedu-3.5.8/keduca/keducabuilder/Makefile.am      2005-09-10 
04:17:25.000000000 -0400
 +++ kdeedu-3.5.8-new/keduca/keducabuilder/Makefile.am  2007-10-24 
22:24:41.000000000 -0400
 @@ -1,6 +1,10 @@
@@ -146,7 +140,6 @@
  
  # Uncomment the following two lines if you add a ui.rc file for your 
application to make use of
  # KDE´s XML GUI builing
-diff -uNr kdeedu-3.5.8/keduca/keducabuilder/main.cpp 
kdeedu-3.5.8-new/keduca/keducabuilder/main.cpp
 --- kdeedu-3.5.8/keduca/keducabuilder/main.cpp 2005-09-10 04:17:25.000000000 
-0400
 +++ kdeedu-3.5.8-new/keduca/keducabuilder/main.cpp     2007-10-24 
22:24:41.000000000 -0400
 @@ -32,7 +32,7 @@
@@ -158,7 +151,6 @@
  {
      KAboutData aboutData( "keduca", I18N_NOOP("KEducaBuilder"),
                            version, description, KAboutData::License_GPL,
-diff -uNr kdeedu-3.5.8/khangman/khangman/Makefile.am 
kdeedu-3.5.8-new/khangman/khangman/Makefile.am
 --- kdeedu-3.5.8/khangman/khangman/Makefile.am 2005-09-10 04:16:50.000000000 
-0400
 +++ kdeedu-3.5.8-new/khangman/khangman/Makefile.am     2007-10-24 
22:24:41.000000000 -0400
 @@ -1,7 +1,11 @@
@@ -185,7 +177,6 @@
  
  rc_DATA = khangmanui.rc
  rcdir = $(kde_datadir)/khangman
-diff -uNr kdeedu-3.5.8/khangman/khangman/main.cpp 
kdeedu-3.5.8-new/khangman/khangman/main.cpp
 --- kdeedu-3.5.8/khangman/khangman/main.cpp    2007-01-15 06:20:03.000000000 
-0500
 +++ kdeedu-3.5.8-new/khangman/khangman/main.cpp        2007-10-24 
22:24:41.000000000 -0400
 @@ -39,7 +39,7 @@
@@ -197,7 +188,6 @@
  {
      KAboutData aboutData( "khangman", I18N_NOOP("KHangMan"),
                                KHM_VERSION, description, 
KAboutData::License_GPL,
-diff -uNr kdeedu-3.5.8/kig/kig/Makefile.am kdeedu-3.5.8-new/kig/kig/Makefile.am
 --- kdeedu-3.5.8/kig/kig/Makefile.am   2005-09-10 04:17:20.000000000 -0400
 +++ kdeedu-3.5.8-new/kig/kig/Makefile.am       2007-10-24 22:24:41.000000000 
-0400
 @@ -19,12 +19,14 @@
@@ -219,7 +209,6 @@
  
  # this is where the desktop file will go 
  xdg_apps_DATA = kig.desktop
-diff -uNr kdeedu-3.5.8/kig/kig/main.cpp kdeedu-3.5.8-new/kig/kig/main.cpp
 --- kdeedu-3.5.8/kig/kig/main.cpp      2005-10-10 10:55:35.000000000 -0400
 +++ kdeedu-3.5.8-new/kig/kig/main.cpp  2007-10-24 22:24:41.000000000 -0400
 @@ -101,7 +101,7 @@
@@ -231,7 +220,6 @@
  {
    KAboutData *about = kigAboutData( "kig", I18N_NOOP("Kig") );
  
-diff -uNr kdeedu-3.5.8/kiten/Makefile.am kdeedu-3.5.8-new/kiten/Makefile.am
 --- kdeedu-3.5.8/kiten/Makefile.am     2005-09-10 04:17:15.000000000 -0400
 +++ kdeedu-3.5.8-new/kiten/Makefile.am 2007-10-24 22:24:41.000000000 -0400
 @@ -2,15 +2,16 @@
@@ -255,7 +243,6 @@
  
  libkiten_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined 
-version-info 1:0:0
  libkiten_la_LIBADD = $(LIB_KDEUI) $(LIB_KDEPRINT)
-diff -uNr kdeedu-3.5.8/kiten/main.cpp kdeedu-3.5.8-new/kiten/main.cpp
 --- kdeedu-3.5.8/kiten/main.cpp        2005-10-10 10:55:32.000000000 -0400
 +++ kdeedu-3.5.8-new/kiten/main.cpp    2007-10-24 22:24:41.000000000 -0400
 @@ -37,7 +37,7 @@
@@ -267,7 +254,6 @@
  {
        qInstallMsgHandler(noMessageOutput);
        KAboutData aboutData( "kiten", I18N_NOOP("Kiten"),
-diff -uNr kdeedu-3.5.8/kiten/xjdxgen.c kdeedu-3.5.8-new/kiten/xjdxgen.c
 --- kdeedu-3.5.8/kiten/xjdxgen.c       2006-05-22 14:03:43.000000000 -0400
 +++ kdeedu-3.5.8-new/kiten/xjdxgen.c   2007-10-25 07:53:21.000000000 -0400
 @@ -23,6 +23,7 @@
@@ -278,7 +264,6 @@
  #include <inttypes.h>
  #include <sys/stat.h>
  #include <unistd.h>
-diff -uNr kdeedu-3.5.8/klatin/klatin/Makefile.am 
kdeedu-3.5.8-new/klatin/klatin/Makefile.am
 --- kdeedu-3.5.8/klatin/klatin/Makefile.am     2005-09-10 04:17:24.000000000 
-0400
 +++ kdeedu-3.5.8-new/klatin/klatin/Makefile.am 2007-10-24 22:24:41.000000000 
-0400
 @@ -6,19 +6,21 @@
@@ -307,7 +292,6 @@
        klatinchoose.ui settings.kcfgc klatingrammarwidget.ui 
klatinvocabwidget.ui klatinverbswidget.ui \
        klatinresultsdialog.ui klatinsettings_vocabpage.ui
  
-diff -uNr kdeedu-3.5.8/klatin/klatin/main.cpp 
kdeedu-3.5.8-new/klatin/klatin/main.cpp
 --- kdeedu-3.5.8/klatin/klatin/main.cpp        2005-09-10 04:17:24.000000000 
-0400
 +++ kdeedu-3.5.8-new/klatin/klatin/main.cpp    2007-10-24 22:24:41.000000000 
-0400
 @@ -29,7 +29,7 @@
@@ -319,7 +303,6 @@
  {
  
        KAboutData aboutData( "klatin", I18N_NOOP("KLatin"),
-diff -uNr kdeedu-3.5.8/klettres/klettres/Makefile.am 
kdeedu-3.5.8-new/klettres/klettres/Makefile.am
 --- kdeedu-3.5.8/klettres/klettres/Makefile.am 2005-09-10 04:16:56.000000000 
-0400
 +++ kdeedu-3.5.8-new/klettres/klettres/Makefile.am     2007-10-24 
22:24:41.000000000 -0400
 @@ -1,10 +1,13 @@
@@ -348,7 +331,6 @@
  
  messages: rc.cpp
        $(XGETTEXT) *.cpp -o $(podir)/klettres.pot;
-diff -uNr kdeedu-3.5.8/klettres/klettres/main.cpp 
kdeedu-3.5.8-new/klettres/klettres/main.cpp
 --- kdeedu-3.5.8/klettres/klettres/main.cpp    2007-01-15 06:20:04.000000000 
-0500
 +++ kdeedu-3.5.8-new/klettres/klettres/main.cpp        2007-10-24 
22:24:41.000000000 -0400
 @@ -43,7 +43,7 @@
@@ -360,7 +342,6 @@
  {
      KAboutData about("klettres", I18N_NOOP("KLettres"), KLETTRES_VERSION, 
description,
                       KAboutData::License_GPL, "(C) 2001-2006 Anne-Marie 
Mahfouf",0, "http://edu.kde.org/klettres";, "[EMAIL PROTECTED]");
-diff -uNr kdeedu-3.5.8/kmplot/kmplot/Makefile.am 
kdeedu-3.5.8-new/kmplot/kmplot/Makefile.am
 --- kdeedu-3.5.8/kmplot/kmplot/Makefile.am     2005-09-10 04:17:09.000000000 
-0400
 +++ kdeedu-3.5.8-new/kmplot/kmplot/Makefile.am 2007-10-24 22:24:41.000000000 
-0400
 @@ -21,12 +21,14 @@
@@ -382,7 +363,6 @@
  
  # this is where the desktop file will go
  appmimedir = $(kde_mimedir)/application
-diff -uNr kdeedu-3.5.8/kmplot/kmplot/main.cpp 
kdeedu-3.5.8-new/kmplot/kmplot/main.cpp
 --- kdeedu-3.5.8/kmplot/kmplot/main.cpp        2005-10-10 10:55:30.000000000 
-0400
 +++ kdeedu-3.5.8-new/kmplot/kmplot/main.cpp    2007-10-24 22:24:41.000000000 
-0400
 @@ -50,7 +50,7 @@
@@ -394,7 +374,6 @@
  {
        KAboutData aboutData(
            "kmplot",
-diff -uNr kdeedu-3.5.8/kpercentage/kpercentage/Makefile.am 
kdeedu-3.5.8-new/kpercentage/kpercentage/Makefile.am
 --- kdeedu-3.5.8/kpercentage/kpercentage/Makefile.am   2005-09-10 
04:16:51.000000000 -0400
 +++ kdeedu-3.5.8-new/kpercentage/kpercentage/Makefile.am       2007-10-24 
22:24:41.000000000 -0400
 @@ -1,6 +1,10 @@
@@ -420,7 +399,6 @@
  
  
  stringstocpp:
-diff -uNr kdeedu-3.5.8/kpercentage/kpercentage/main.cpp 
kdeedu-3.5.8-new/kpercentage/kpercentage/main.cpp
 --- kdeedu-3.5.8/kpercentage/kpercentage/main.cpp      2005-09-10 
04:16:51.000000000 -0400
 +++ kdeedu-3.5.8-new/kpercentage/kpercentage/main.cpp  2007-10-24 
22:24:41.000000000 -0400
 @@ -34,7 +34,7 @@
@@ -432,7 +410,6 @@
  {
      KAboutData aboutData
      (
-diff -uNr kdeedu-3.5.8/kstars/kstars/Makefile.am 
kdeedu-3.5.8-new/kstars/kstars/Makefile.am
 --- kdeedu-3.5.8/kstars/kstars/Makefile.am     2005-09-10 04:17:55.000000000 
-0400
 +++ kdeedu-3.5.8-new/kstars/kstars/Makefile.am 2007-10-24 22:24:41.000000000 
-0400
 @@ -1,6 +1,8 @@
@@ -471,7 +448,6 @@
  
  # Uncomment the following two lines if you add a ui.rc file for your 
application to make use of
  # KDE
-diff -uNr kdeedu-3.5.8/kstars/kstars/indi/apmount.cpp 
kdeedu-3.5.8-new/kstars/kstars/indi/apmount.cpp
 --- kdeedu-3.5.8/kstars/kstars/indi/apmount.cpp        2005-10-10 
10:55:39.000000000 -0400
 +++ kdeedu-3.5.8-new/kstars/kstars/indi/apmount.cpp    2007-10-24 
22:24:41.000000000 -0400
 @@ -39,8 +39,9 @@
@@ -486,7 +462,6 @@
  #endif
  
  static inline double timezoneOffset()
-diff -uNr kdeedu-3.5.8/kstars/kstars/indi/fli_ccd.c 
kdeedu-3.5.8-new/kstars/kstars/indi/fli_ccd.c
 --- kdeedu-3.5.8/kstars/kstars/indi/fli_ccd.c  2005-10-10 10:55:39.000000000 
-0400
 +++ kdeedu-3.5.8-new/kstars/kstars/indi/fli_ccd.c      2007-10-24 
22:24:41.000000000 -0400
 @@ -19,6 +19,7 @@
@@ -497,7 +472,6 @@
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
-diff -uNr kdeedu-3.5.8/kstars/kstars/indi/lx200generic.cpp 
kdeedu-3.5.8-new/kstars/kstars/indi/lx200generic.cpp
 --- kdeedu-3.5.8/kstars/kstars/indi/lx200generic.cpp   2005-10-10 
10:55:39.000000000 -0400
 +++ kdeedu-3.5.8-new/kstars/kstars/indi/lx200generic.cpp       2007-10-24 
22:24:41.000000000 -0400
 @@ -41,7 +41,7 @@
@@ -509,7 +483,6 @@
  #endif
  
  static inline double timezoneOffset()
-diff -uNr kdeedu-3.5.8/kstars/kstars/indi/webcam/Makefile.am 
kdeedu-3.5.8-new/kstars/kstars/indi/webcam/Makefile.am
 --- kdeedu-3.5.8/kstars/kstars/indi/webcam/Makefile.am 2005-09-10 
04:17:35.000000000 -0400
 +++ kdeedu-3.5.8-new/kstars/kstars/indi/webcam/Makefile.am     2007-10-24 
22:24:41.000000000 -0400
 @@ -1,7 +1,7 @@
@@ -521,7 +494,6 @@
  endif
  
  noinst_LTLIBRARIES = libwebcam.la $(libwebcam_linux)
-diff -uNr kdeedu-3.5.8/kstars/kstars/main.cpp 
kdeedu-3.5.8-new/kstars/kstars/main.cpp
 --- kdeedu-3.5.8/kstars/kstars/main.cpp        2007-10-08 05:48:19.000000000 
-0400
 +++ kdeedu-3.5.8-new/kstars/kstars/main.cpp    2007-10-24 22:24:41.000000000 
-0400
 @@ -49,7 +49,7 @@
@@ -533,7 +505,6 @@
  {
        KAboutData aboutData( "kstars", I18N_NOOP("KStars"),
                KSTARS_VERSION, description, KAboutData::License_GPL,
-diff -uNr kdeedu-3.5.8/ktouch/src/Makefile.am 
kdeedu-3.5.8-new/ktouch/src/Makefile.am
 --- kdeedu-3.5.8/ktouch/src/Makefile.am        2006-05-22 14:03:38.000000000 
-0400
 +++ kdeedu-3.5.8-new/ktouch/src/Makefile.am    2007-10-24 22:24:41.000000000 
-0400
 @@ -26,7 +26,7 @@
@@ -574,7 +545,6 @@
  
  rcdir = $(kde_datadir)/ktouch
  rc_DATA = ktouchui.rc
-diff -uNr kdeedu-3.5.8/ktouch/src/main.cpp kdeedu-3.5.8-new/ktouch/src/main.cpp
 --- kdeedu-3.5.8/ktouch/src/main.cpp   2006-05-22 14:03:38.000000000 -0400
 +++ kdeedu-3.5.8-new/ktouch/src/main.cpp       2007-10-24 22:24:41.000000000 
-0400
 @@ -26,7 +26,7 @@
@@ -586,7 +556,6 @@
  {
      KAboutData about("ktouch",
                       I18N_NOOP("KTouch"),
-diff -uNr kdeedu-3.5.8/kturtle/src/Makefile.am 
kdeedu-3.5.8-new/kturtle/src/Makefile.am
 --- kdeedu-3.5.8/kturtle/src/Makefile.am       2005-09-10 04:16:51.000000000 
-0400
 +++ kdeedu-3.5.8-new/kturtle/src/Makefile.am   2007-10-24 22:24:41.000000000 
-0400
 @@ -6,20 +6,22 @@
@@ -617,7 +586,6 @@
  
  # these are the headers for your project
  noinst_HEADERS = kturtle.h canvas.h dialogs.cpp value.h lexer.h parser.h 
executer.h treenode.h token.h translate.h
-diff -uNr kdeedu-3.5.8/kturtle/src/main.cpp 
kdeedu-3.5.8-new/kturtle/src/main.cpp
 --- kdeedu-3.5.8/kturtle/src/main.cpp  2005-10-10 10:55:19.000000000 -0400
 +++ kdeedu-3.5.8-new/kturtle/src/main.cpp      2007-10-24 22:24:41.000000000 
-0400
 @@ -43,7 +43,7 @@
@@ -629,7 +597,6 @@
  {
        KAboutData about("kturtle", I18N_NOOP("KTurtle"), version, description, 
KAboutData::License_GPL, copyright, 0, website);
        about.addAuthor("Cies Breijs",
-diff -uNr kdeedu-3.5.8/kverbos/kverbos/Makefile.am 
kdeedu-3.5.8-new/kverbos/kverbos/Makefile.am
 --- kdeedu-3.5.8/kverbos/kverbos/Makefile.am   2005-09-10 04:17:22.000000000 
-0400
 +++ kdeedu-3.5.8-new/kverbos/kverbos/Makefile.am       2007-10-24 
22:24:41.000000000 -0400
 @@ -1,8 +1,11 @@
@@ -656,7 +623,6 @@
  
  rcdir = $(kde_datadir)/kverbos
  rc_DATA = kverbosui.rc
-diff -uNr kdeedu-3.5.8/kverbos/kverbos/main.cpp 
kdeedu-3.5.8-new/kverbos/kverbos/main.cpp
 --- kdeedu-3.5.8/kverbos/kverbos/main.cpp      2005-09-10 04:17:22.000000000 
-0400
 +++ kdeedu-3.5.8-new/kverbos/kverbos/main.cpp  2007-10-24 22:24:41.000000000 
-0400
 @@ -32,7 +32,7 @@
@@ -668,7 +634,6 @@
  {
  
        KAboutData aboutData( "kverbos", I18N_NOOP("KVerbos"),
-diff -uNr kdeedu-3.5.8/kwordquiz/src/Makefile.am 
kdeedu-3.5.8-new/kwordquiz/src/Makefile.am
 --- kdeedu-3.5.8/kwordquiz/src/Makefile.am     2007-05-14 03:38:51.000000000 
-0400
 +++ kdeedu-3.5.8-new/kwordquiz/src/Makefile.am 2007-10-24 22:24:41.000000000 
-0400
 @@ -1,9 +1,11 @@
@@ -703,7 +668,6 @@
  
  rcdir = $(kde_datadir)/kwordquiz
  rc_DATA = kwordquizui.rc eventsrc
-diff -uNr kdeedu-3.5.8/kwordquiz/src/main.cpp 
kdeedu-3.5.8-new/kwordquiz/src/main.cpp
 --- kdeedu-3.5.8/kwordquiz/src/main.cpp        2005-10-10 10:55:21.000000000 
-0400
 +++ kdeedu-3.5.8-new/kwordquiz/src/main.cpp    2007-10-24 22:24:41.000000000 
-0400
 @@ -33,7 +33,7 @@

Index: kdeedu3.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/kde/kdeedu3.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- kdeedu3.info        31 Oct 2007 15:22:41 -0000      1.5
+++ kdeedu3.info        14 Nov 2007 17:01:02 -0000      1.6
@@ -27,7 +27,7 @@
        kturtle (>= %v-%r)
 <<
 BuildDepends: <<
-       arts-dev (>= 1.5.5-1021),
+       arts-dev (>= 1.5.8-1021),
        audiofile,
        autoconf (>= 2.60-1),
        cctools-single-module,
@@ -1351,7 +1351,7 @@
                kstars (<< %v-%r)
        <<
        Recommends: <<
-               arts-dev (>= 1.5.3-1021),
+               arts-dev (>= 1.5.8-1021),
                kdelibs3-unified-dev (>= %v-1021),
                libart2,
                libpng3 (>= 1.2.8-1),

Index: kdelibs3-unified.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/stable/main/finkinfo/kde/kdelibs3-unified.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- kdelibs3-unified.info       31 Oct 2007 15:22:42 -0000      1.5
+++ kdelibs3-unified.info       14 Nov 2007 17:01:03 -0000      1.6
@@ -1,6 +1,7 @@
+Info3: <<
 Package: kdelibs3-unified
 Version: 3.5.8
-Revision: 1022
+Revision: 1023
 Description: KDE - essential libraries
 License: GPL/LGPL
 Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
@@ -29,6 +30,7 @@
        expat1,
        fink (>= 0.26.0-1),
        flex-devel,
+       #       fontconfig2-dev (>= 2.4.1-1),
        freetype219,
        libgettext3-dev,
        gettext-tools,
@@ -166,7 +168,7 @@
        touch %i/share/doc/installed-packages/kdelibs3-ssl-dev
 <<
 DocFiles: COPYING COPYING.LIB INSTALL
-RuntimeVars:   KDEDIR: %p
+RuntimeVars: KDEDIR: %p
 SplitOff: <<
        Package: %N-shlibs
        Description: KDE - essential shared libraries
@@ -398,7 +400,7 @@
                %N (<< %v-%r)
        <<
        Recommends: <<
-               arts-dev (>= 1.5.3-1021),
+               arts-dev (>= 1.5.8-1021),
                audiofile,
                cups-dev,
                doxygen,
@@ -908,18 +910,18 @@
 <<
 
 PostInstScript: <<
-       chmod u+s %p/bin/kgrantpty %p/bin/kpac_dhcp_helper %p/bin/fileshareset
-       if [ -e "%p/etc/xdg/menus/applications.menu" ] && [ ! -L 
"%p/etc/xdg/menus/applications.menu" ]; then
-               mv "%p/etc/xdg/menus/applications.menu" 
"%p/etc/xdg/menus/applications.menu.bak"
-       fi
-       update-alternatives --install "%p/etc/xdg/menus/applications.menu" 
"applications.menu" "%p/etc/xdg/menus/kde-applications.menu" 10
-       %p/bin/kde-update-caches.sh >/dev/null 2>&1 || :
+chmod u+s %p/bin/kgrantpty %p/bin/kpac_dhcp_helper %p/bin/fileshareset
+if [ -e "%p/etc/xdg/menus/applications.menu" ] && [ ! -L 
"%p/etc/xdg/menus/applications.menu" ]; then
+       mv "%p/etc/xdg/menus/applications.menu" 
"%p/etc/xdg/menus/applications.menu.bak"
+fi
+update-alternatives --install "%p/etc/xdg/menus/applications.menu" 
"applications.menu" "%p/etc/xdg/menus/kde-applications.menu" 10
+%p/bin/kde-update-caches.sh >/dev/null 2>&1 || :
 <<
 PostRmScript: <<
-       if [ -e "%p/etc/xdg/menus/applications.menu" ] && [ ! -L 
"%p/etc/xdg/menus/applications.menu" ]; then
-               mv "%p/etc/xdg/menus/applications.menu" 
"%p/etc/xdg/menus/applications.menu.bak"
-       fi
-       update-alternatives --remove "applications.menu" 
"%p/etc/xdg/menus/kde-applications.menu"
+if [ -e "%p/etc/xdg/menus/applications.menu" ] && [ ! -L 
"%p/etc/xdg/menus/applications.menu" ]; then
+       mv "%p/etc/xdg/menus/applications.menu" 
"%p/etc/xdg/menus/applications.menu.bak"
+fi
+update-alternatives --remove "applications.menu" 
"%p/etc/xdg/menus/kde-applications.menu"
 <<
 
 DescDetail: <<
@@ -985,4 +987,5 @@
 
   sudo apt-get remove kdenetwork3-base
 <<
+<<
 

Index: kdelibs3-unified.patch
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/stable/main/finkinfo/kde/kdelibs3-unified.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- kdelibs3-unified.patch      26 Oct 2007 16:19:50 -0000      1.3
+++ kdelibs3-unified.patch      14 Nov 2007 17:01:03 -0000      1.4
@@ -1,6 +1,6 @@
 
 --- kdelibs-3.5.8/darwin/kcmartsrc     1969-12-31 19:00:00.000000000 -0500
-+++ kdelibs-3.5.8-new/darwin/kcmartsrc 2007-10-15 20:17:10.000000000 -0400
++++ kdelibs-3.5.8-new/darwin/kcmartsrc 2007-11-06 23:28:11.000000000 -0500
 @@ -0,0 +1,9 @@
 +[Arts]
 +Arguments=\s-F 10 -S 4096 -a esd -d -b 16 -s 60 -m artsmessage -c drkonqi -l 
3 -f
@@ -12,7 +12,7 @@
 +StartServer=false
 +SuspendTime=60
 --- kdelibs-3.5.8/darwin/kdeglobals    1969-12-31 19:00:00.000000000 -0500
-+++ kdelibs-3.5.8-new/darwin/kdeglobals        2007-10-15 20:17:10.000000000 
-0400
++++ kdelibs-3.5.8-new/darwin/kdeglobals        2007-11-06 23:28:11.000000000 
-0500
 @@ -0,0 +1,129 @@
 +[$Version]
 
+update_info=kaccel.upd:kde3.3/r1,kded.upd:kde3.0,klippershortcuts.upd:04112002,kwin.upd:kde3.2Xinerama,socks.upd:kde3.0/r1
@@ -144,7 +144,7 @@
 +[WM]
 +activeFont=Baghdad,12,-1,5,50,0,0,0,0,0
 --- kdelibs-3.5.8/darwin/knotifyrc     1969-12-31 19:00:00.000000000 -0500
-+++ kdelibs-3.5.8-new/darwin/knotifyrc 2007-10-15 20:17:10.000000000 -0400
++++ kdelibs-3.5.8-new/darwin/knotifyrc 2007-11-06 23:28:11.000000000 -0500
 @@ -0,0 +1,5 @@
 +[Misc]
 +External [EMAIL PROTECTED]@/bin/mplayer
@@ -152,7 +152,7 @@
 +Use external player=false
 +Volume=100
 --- kdelibs-3.5.8/darwin/konsolerc     1969-12-31 19:00:00.000000000 -0500
-+++ kdelibs-3.5.8-new/darwin/konsolerc 2007-10-15 20:17:10.000000000 -0400
++++ kdelibs-3.5.8-new/darwin/konsolerc 2007-11-06 23:28:11.000000000 -0500
 @@ -0,0 +1,19 @@
 +[Desktop Entry]
 +ActiveSession=0
@@ -173,8 +173,42 @@
 +schema=Linux.schema
 +scrollbar=2
 +tabbar=2
+--- kdelibs-3.5.8/dcop/dcopc.c 2006-05-22 14:14:21.000000000 -0400
++++ kdelibs-3.5.8-new/dcop/dcopc.c     2007-11-06 23:28:11.000000000 -0500
+@@ -674,6 +674,9 @@
+   while((i = strchr(displayName, ':')) != NULL)
+      *i = '_';
+ 
++  while((i = strchr(displayName, '/')) != NULL)
++     *i = '_';
++
+   dcopServer = getenv("DCOPSERVER");
+ 
+   if (NULL == dcopServer) {
+--- kdelibs-3.5.8/dcop/dcopclient.cpp  2007-10-08 05:52:08.000000000 -0400
++++ kdelibs-3.5.8-new/dcop/dcopclient.cpp      2007-11-06 23:28:11.000000000 
-0500
+@@ -270,6 +270,8 @@
+     {
+         while( (i = disp.find(KPATH_SEPARATOR)) >= 0)
+             disp[i] = '_';
++        while( (i = disp.find('/')) >= 0)
++            disp[i] = '_';
+     }
+ 
+     fName += "/.DCOPserver_";
+--- kdelibs-3.5.8/dcop/dcopserver_shutdown.c   2005-10-10 11:06:13.000000000 
-0400
++++ kdelibs-3.5.8-new/dcop/dcopserver_shutdown.c       2007-11-06 
23:28:11.000000000 -0500
+@@ -118,6 +118,8 @@
+   strncat(dcop_file_old,display, n);
+   while((i = strchr(display, ':')))
+      *i = '_';
++  while((i = strchr(display, '/')))
++     *i = '_';
+   strncat(dcop_file, display, n);
+   free(display);
+ 
 --- kdelibs-3.5.8/kdecore/Makefile.am  2006-10-01 13:33:38.000000000 -0400
-+++ kdelibs-3.5.8-new/kdecore/Makefile.am      2007-10-15 20:17:10.000000000 
-0400
++++ kdelibs-3.5.8-new/kdecore/Makefile.am      2007-11-06 23:28:11.000000000 
-0500
 @@ -24,7 +24,7 @@
  
  if include_SVGICONS
@@ -194,7 +228,7 @@
  libkdecore_la_NMCHECKWEAK = $(srcdir)/libkdecore_weak.nmcheck 
$(srcdir)/libqt-mt_weak.nmcheck \
        $(top_srcdir)/dcop/libDCOP_weak.nmcheck 
$(top_srcdir)/kdecore/standard_weak.nmcheck
 --- kdelibs-3.5.8/kdecore/kglobalsettings.cpp  2005-10-10 11:06:03.000000000 
-0400
-+++ kdelibs-3.5.8-new/kdecore/kglobalsettings.cpp      2007-10-15 
20:17:10.000000000 -0400
++++ kdelibs-3.5.8-new/kdecore/kglobalsettings.cpp      2007-11-06 
23:28:11.000000000 -0500
 @@ -491,7 +491,7 @@
        s_desktopPath->append('/');
  
@@ -205,7 +239,7 @@
      *s_trashPath = QDir::cleanDirPath( *s_trashPath );
      if ( !s_trashPath->endsWith("/") )
 --- kdelibs-3.5.8/kdecore/ksocks.cpp   2005-10-10 11:06:03.000000000 -0400
-+++ kdelibs-3.5.8-new/kdecore/ksocks.cpp       2007-10-15 20:17:10.000000000 
-0400
++++ kdelibs-3.5.8-new/kdecore/ksocks.cpp       2007-11-06 23:28:11.000000000 
-0500
 @@ -480,7 +480,7 @@
                                                     ksocklen_t addrlen) {
     if (_useSocks && F_connect)
@@ -277,7 +311,7 @@
  
  
 --- kdelibs-3.5.8/kdecore/kstandarddirs.cpp    2007-01-15 06:34:17.000000000 
-0500
-+++ kdelibs-3.5.8-new/kdecore/kstandarddirs.cpp        2007-10-15 
20:53:07.000000000 -0400
++++ kdelibs-3.5.8-new/kdecore/kstandarddirs.cpp        2007-11-06 
23:28:11.000000000 -0500
 @@ -1021,7 +1021,7 @@
      if (!strcmp(type, "data"))
        return "share/apps/";
@@ -287,17 +321,166 @@
      if (!strcmp(type, "icon"))
        return "share/icons/";
      if (!strcmp(type, "config"))
-@@ -1315,7 +1315,7 @@
-     }
-     else
-     {
--       localKdeDir =  QDir::homeDirPath() + "/.kde/";
-+       localKdeDir =  QDir::homeDirPath() + "/.kde/";
-     }
+--- kdelibs-3.5.8/kdecore/kuniqueapplication.cpp       2005-11-08 
17:39:22.000000000 -0500
++++ kdelibs-3.5.8-new/kdecore/kuniqueapplication.cpp   2007-11-06 
23:28:33.000000000 -0500
+@@ -59,6 +59,10 @@
+ #  endif
+ #endif
+ 
++#ifdef __APPLE__
++#include <crt_externs.h>
++#endif
++
+ bool KUniqueApplication::s_nofork = false;
+ bool KUniqueApplication::s_multipleInstances = false;
+ bool KUniqueApplication::s_uniqueTestDone = false;
+@@ -123,7 +127,7 @@
+         startKdeinit();
+         if(dcopClient()->registerAs(appName, false).isEmpty()) {
+            kdError() << "KUniqueApplication: Can't setup DCOP communication." 
<< endl;
+-           ::exit(255);
++           ::_exit(255);
+         }           
+      }
+ #endif
+@@ -131,19 +135,52 @@
+      // We'll call newInstance in the constructor. Do nothing here.
+      return true;
+   }
++
++#ifdef Q_OS_DARWIN
++  else {
++    // we need to reexec ourselves because of stupid OSX crap crappity crap
++    int argc = *_NSGetArgc();
++    char ** argv = *_NSGetArgv();
++    char * newargv[argc+2];
++
++    for (int i = 0; i < argc; i++) {
++      newargv[i] = argv[i];
++    }
++    newargv[argc] = "--nofork";
++    newargv[argc+1] = NULL;
++
++    int fork_result = fork();
++    switch(fork_result) {
++      case -1:
++        kdError() << "KUniqueAPplication: Mac OS X workaround fork() failed!" 
<< endl;
++        ::_exit(255);
++        break;
++      case 0:
++        // Child
++        execvp(argv[0], newargv);
++        break;
++      default:
++        // Parent
++        _exit(0);
++        break;
++    }
++  }
++#endif
++
+   DCOPClient *dc;
+   int fd[2];
+   signed char result;
+   if (0 > pipe(fd))
+   {
+      kdError() << "KUniqueApplication: pipe() failed!" << endl;
+-     ::exit(255);
++     ::_exit(255);
+   }
++
+   int fork_result = fork();
+   switch(fork_result) {
+   case -1:
+      kdError() << "KUniqueApplication: fork() failed!" << endl;
+-     ::exit(255);
++     ::_exit(255);
+      break;
+   case 0:
+      // Child
+@@ -161,7 +198,7 @@
+               kdError() << "KUniqueApplication: Can't determine DISPLAY. 
Aborting." << endl;
+               result = -1; // Error
+               ::write(fd[1], &result, 1);
+-              ::exit(255);
++              ::_exit(255);
+            }
+ 
+            // Try to launch kdeinit.
+@@ -173,7 +210,7 @@
+               result = -1;
+               delete dc;      // Clean up DCOP commmunication
+               ::write(fd[1], &result, 1);
+-              ::exit(255);
++              ::_exit(255);
+            }
+         }
+         if (regName != appName)
+@@ -247,25 +284,25 @@
+        if (n == 0)
+        {
+           kdError() << "KUniqueApplication: Pipe closed unexpectedly." << 
endl;
+-          ::exit(255);
++          ::_exit(255);
+        }
+        if (errno != EINTR)
+        {
+           kdError() << "KUniqueApplication: Error reading from pipe." << endl;
+-          ::exit(255);
++          ::_exit(255);
+        }
+      }
+      ::close(fd[0]);
+ 
+      if (result != 0)
+-        ::exit(result); // Error occurred in child.
++        ::_exit(result); // Error occurred in child.
+ 
+      dc = new DCOPClient();
+      if (!dc->attach())
+      {
+         kdError() << "KUniqueApplication: Parent process can't attach to 
DCOP." << endl;
+         delete dc;    // Clean up DCOP commmunication
+-        ::exit(255);
++        ::_exit(255);
+      }
+      if (!dc->isApplicationRegistered(appName)) {
+         kdError() << "KUniqueApplication: Registering failed!" << endl;
+@@ -294,20 +331,20 @@
+      {
+         kdError() << "Communication problem with " << 
KCmdLineArgs::about->appName() << ", it probably crashed." << endl;
+         delete dc;    // Clean up DCOP commmunication
+-        ::exit(255);
++        ::_exit(255);
+      }
+      dc->setPriorityCall(false);
+      if (replyType != "int")
+      {
+         kdError() << "KUniqueApplication: DCOP communication error!" << endl;
+         delete dc;    // Clean up DCOP commmunication
+-        ::exit(255);
++        ::_exit(255);
+      }
+      QDataStream rs(reply, IO_ReadOnly);
+      int exitCode;
+      rs >> exitCode;
+      delete dc;       // Clean up DCOP commmunication
+-     ::exit(exitCode);
++     ::_exit(exitCode);
+      break;
+   }
+   return false; // make insure++ happy
+@@ -361,7 +398,7 @@
+   }
+   if( !start())
+          // Already running
+-      ::exit( 0 );
++      ::_exit( 0 );
+   return inst;
+ }
  
-     if (localKdeDir != "-/")
 --- kdelibs-3.5.8/kdecore/network/ksocketdevice.cpp    2007-01-15 
06:34:17.000000000 -0500
-+++ kdelibs-3.5.8-new/kdecore/network/ksocketdevice.cpp        2007-10-15 
20:17:10.000000000 -0400
++++ kdelibs-3.5.8-new/kdecore/network/ksocketdevice.cpp        2007-11-06 
23:28:11.000000000 -0500
 @@ -316,7 +316,7 @@
      }
  
@@ -335,7 +518,7 @@
    peerAddress.setLength(len = 32);    // arbitrary value
    if (kde_getpeername(m_sockfd, peerAddress.address(), &len) == -1)
 --- kdelibs-3.5.8/kdecore/network/syssocket.h  2005-09-10 04:27:10.000000000 
-0400
-+++ kdelibs-3.5.8-new/kdecore/network/syssocket.h      2007-10-15 
20:17:10.000000000 -0400
++++ kdelibs-3.5.8-new/kdecore/network/syssocket.h      2007-11-06 
23:28:11.000000000 -0500
 @@ -53,7 +53,7 @@
    }
  
@@ -376,7 +559,7 @@
      return ::getsockname(fd, sa, len);
    }
 --- kdelibs-3.5.8/kded/Makefile.am     2005-10-10 11:06:29.000000000 -0400
-+++ kdelibs-3.5.8-new/kded/Makefile.am 2007-10-15 20:17:10.000000000 -0400
++++ kdelibs-3.5.8-new/kded/Makefile.am 2007-11-06 23:28:11.000000000 -0500
 @@ -58,7 +58,10 @@
  servicetype_DATA = kdedmodule.desktop
  servicetypedir = $(kde_servicetypesdir)
@@ -390,7 +573,7 @@
  update_DATA = kded.upd
  updatedir = $(kde_datadir)/kconf_update
 --- kdelibs-3.5.8/kded/kbuildsycoca.cpp        2007-05-14 03:52:43.000000000 
-0400
-+++ kdelibs-3.5.8-new/kded/kbuildsycoca.cpp    2007-10-15 20:17:10.000000000 
-0400
++++ kdelibs-3.5.8-new/kded/kbuildsycoca.cpp    2007-11-06 23:28:11.000000000 
-0500
 @@ -379,7 +379,11 @@
       connect(g_vfolder, SIGNAL(newService(const QString &, KService **)),
               this, SLOT(slotCreateEntry(const QString &, KService **)));
@@ -405,7 +588,7 @@
       KServiceGroup *entry = g_bsgf->addNew("/", kdeMenu->directoryFile, 0, 
false);
       entry->setLayoutInfo(kdeMenu->layoutList);
 --- kdelibs-3.5.8/kdeprint/configure.in.in     2005-09-10 04:27:43.000000000 
-0400
-+++ kdelibs-3.5.8-new/kdeprint/configure.in.in 2007-10-15 20:17:10.000000000 
-0400
++++ kdelibs-3.5.8-new/kdeprint/configure.in.in 2007-11-06 23:28:11.000000000 
-0500
 @@ -80,7 +80,7 @@
  
        dnl check if CUPS is at least 1.1.20
@@ -416,7 +599,7 @@
        AC_DEFINE(HAVE_CUPS_NO_PWD_CACHE, 1, CUPS doesn't have password caching)
        fi
 --- kdelibs-3.5.8/kdeprint/cups/Makefile.am    2006-10-02 06:46:55.000000000 
-0400
-+++ kdelibs-3.5.8-new/kdeprint/cups/Makefile.am        2007-10-15 
20:17:10.000000000 -0400
++++ kdelibs-3.5.8-new/kdeprint/cups/Makefile.am        2007-11-06 
23:28:11.000000000 -0500
 @@ -14,8 +14,8 @@
                                  imagepreview.cpp imageposition.cpp 
kpimagepage.cpp \
                                  kptextpage.cpp kphpgl2page.cpp 
cupsaddsmb2.cpp kmwother.cpp ippreportdlg.cpp \
@@ -429,7 +612,7 @@
  
  noinst_HEADERS = cupsinfos.h ipprequest.h kmcupsjobmanager.h kmcupsmanager.h 
kmcupsuimanager.h \
 --- kdelibs-3.5.8/kdeprint/cups/cupsdconf2/Makefile.am 2005-09-10 
04:27:41.000000000 -0400
-+++ kdelibs-3.5.8-new/kdeprint/cups/cupsdconf2/Makefile.am     2007-10-15 
20:17:10.000000000 -0400
++++ kdelibs-3.5.8-new/kdeprint/cups/cupsdconf2/Makefile.am     2007-11-06 
23:28:11.000000000 -0500
 @@ -14,8 +14,8 @@
                          locationdialog.cpp addressdialog.cpp cups-util.c \
                          qdirmultilineedit.cpp sizewidget.cpp main.cpp
@@ -442,7 +625,7 @@
  noinst_HEADERS = cupsdconf.h cupsdpage.h cupsddialog.h cupsdcomment.h 
cupsdsplash.h \
                 cupsdserverpage.h cupsdlogpage.h cupsdjobspage.h 
cupsdfilterpage.h \
 --- kdelibs-3.5.8/kdeui/Makefile.am    2007-10-08 05:52:12.000000000 -0400
-+++ kdelibs-3.5.8-new/kdeui/Makefile.am        2007-10-15 20:17:10.000000000 
-0400
++++ kdelibs-3.5.8-new/kdeui/Makefile.am        2007-11-06 23:28:11.000000000 
-0500
 @@ -27,10 +27,10 @@
  AM_LDFLAGS = $(LDFLAGS_AS_NEEDED) $(LDFLAGS_NEW_DTAGS)
  
@@ -457,7 +640,7 @@
  libkspell_la_SOURCES = dummy.cpp
  
 --- kdelibs-3.5.8/kimgio/Makefile.am   2005-09-10 04:26:42.000000000 -0400
-+++ kdelibs-3.5.8-new/kimgio/Makefile.am       2007-10-15 20:17:10.000000000 
-0400
++++ kdelibs-3.5.8-new/kimgio/Makefile.am       2007-11-06 23:28:11.000000000 
-0500
 @@ -21,7 +21,7 @@
               kimg_pcx.la kimg_tga.la kimg_rgb.la kimg_xcf.la kimg_dds.la 
$(KIMGIO_EXR_MODULES) \
                         kimg_psd.la kimg_hdr.la
@@ -468,7 +651,7 @@
  kimg_tiff_la_SOURCES = tiffr.cpp
  kimg_tiff_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
 --- kdelibs-3.5.8/kinit/Makefile.am    2007-10-08 05:52:03.000000000 -0400
-+++ kdelibs-3.5.8-new/kinit/Makefile.am        2007-10-15 20:17:10.000000000 
-0400
++++ kdelibs-3.5.8-new/kinit/Makefile.am        2007-11-06 23:28:11.000000000 
-0500
 @@ -15,7 +15,7 @@
  #    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  #    Boston, MA 02110-1301, USA.
@@ -478,8 +661,22 @@
  
  SUBDIRS = . tests
  
+--- kdelibs-3.5.8/kinit/kinit.cpp      2007-10-08 05:52:03.000000000 -0400
++++ kdelibs-3.5.8-new/kinit/kinit.cpp  2007-11-06 23:28:11.000000000 -0500
+@@ -593,6 +593,11 @@
+      if ( getenv("KDE_IS_PRELINKED") && !execpath.isEmpty() && !launcher)
+          libpath.truncate(0);
+ 
++#ifdef Q_OS_DARWIN
++     if (!execpath.isEmpty())
++         libpath.truncate(0);
++#endif
++
+      if ( !libpath.isEmpty() )
+      {
+        d.handle = lt_dlopen( QFile::encodeName(libpath) );
 --- kdelibs-3.5.8/kinit/start_kdeinit_wrapper.c        2007-10-08 
05:52:03.000000000 -0400
-+++ kdelibs-3.5.8-new/kinit/start_kdeinit_wrapper.c    2007-10-15 
20:23:03.000000000 -0400
++++ kdelibs-3.5.8-new/kinit/start_kdeinit_wrapper.c    2007-11-06 
23:28:11.000000000 -0500
 @@ -50,9 +50,9 @@
           close( 0 ); /* stdin */
           dup2( pipes[ 0 ], 0 );
@@ -507,7 +704,7 @@
  }
  #endif
 --- kdelibs-3.5.8/kio/kssl/kopenssl.cc 2006-07-22 04:16:39.000000000 -0400
-+++ kdelibs-3.5.8-new/kio/kssl/kopenssl.cc     2007-10-15 20:17:10.000000000 
-0400
++++ kdelibs-3.5.8-new/kio/kssl/kopenssl.cc     2007-11-06 23:28:11.000000000 
-0500
 @@ -323,6 +323,7 @@
               #elif defined(_AIX)
               << "libssl.a(libssl.so.0)"
@@ -525,7 +722,7 @@
             << "libcrypto.0.9.dylib"
             #else
 --- kdelibs-3.5.8/kio/misc/kpac/Makefile.am    2005-09-10 04:26:47.000000000 
-0400
-+++ kdelibs-3.5.8-new/kio/misc/kpac/Makefile.am        2007-10-15 
20:17:10.000000000 -0400
++++ kdelibs-3.5.8-new/kio/misc/kpac/Makefile.am        2007-11-06 
23:28:11.000000000 -0500
 @@ -10,7 +10,7 @@
  kded_proxyscout_la_SOURCES = proxyscout.skel proxyscout.cpp script.cpp \
                               downloader.cpp discovery.cpp
@@ -536,7 +733,7 @@
  kpac_dhcp_helper_SOURCES = kpac_dhcp_helper.c
  kpac_dhcp_helper_CFLAGS = $(KDE_USE_FPIE)
 --- kdelibs-3.5.8/kioslave/http/http.cc        2007-10-08 05:52:02.000000000 
-0400
-+++ kdelibs-3.5.8-new/kioslave/http/http.cc    2007-10-17 07:53:51.000000000 
-0400
++++ kdelibs-3.5.8-new/kioslave/http/http.cc    2007-11-06 23:28:11.000000000 
-0500
 @@ -3409,10 +3409,6 @@
  
    } while (!m_bEOF && (len || noHeader) && (headerSize < maxHeaderSize) && 
(gets(buffer, sizeof(buffer)-1)));


-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to