From a060181ac3a221dedc796c33a0f84a5a455fee8f Mon Sep 17 00:00:00 2001 From: fake Date: Mon, 4 Apr 2005 09:33:25 +0000 Subject: [PATCH] fake: update kde to 3.4, arts to 1.4.0, baghira to 0.6d (fixing build), qt to 3.3.4, k3b to 0.11.22 (fix), kdebluetooth to 1.0beta1, ... no errors in refbuild. [2005032220411019731] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@5847 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/fake/kdebluetooth/kdebluetooth.conf | 11 +-- package/fake/kdebluetooth/kdebluetooth.desc | 4 +- package/kde/arts/arts.desc | 4 +- package/kde/k3b/k3b.desc | 4 +- package/kde/kde-i18n-de/kde-i18n-de.desc | 4 +- package/kde/kde-i18n-es/kde-i18n-es.desc | 4 +- package/kde/kde-i18n-fr/kde-i18n-fr.desc | 4 +- package/kde/kde-i18n-it/kde-i18n-it.desc | 4 +- .../kdeaccessibility/kdeaccessibility.desc | 4 +- package/kde/kdeaddons/kdeaddons.desc | 4 +- package/kde/kdeadmin/kdeadmin.desc | 4 +- package/kde/kdeartwork/kdeartwork.desc | 4 +- package/kde/kdebase/kdebase.conf | 4 +- package/kde/kdebase/kdebase.desc | 4 +- .../post-3.3.2-kdebase-htmlframes2.patch | 58 -------------- package/kde/kdebase/sasl2-location.patch | 77 +++++++++++++++++++ package/kde/kdebindings/kdebindings.desc | 4 +- package/kde/kdeedu/kdeedu.desc | 4 +- package/kde/kdegames/kdegames.desc | 4 +- package/kde/kdegraphics/kdegraphics.desc | 4 +- package/kde/kdelibs/kdelibs.desc | 4 +- .../post-3.3.2-kdelibs-htmlframes2.patch | 45 ----------- .../kde/kdelibs/post-3.3.2-kdelibs-kio.patch | 46 ----------- .../kdelibs/post-3.3.2-kdelibs-kioslave.patch | 36 --------- package/kde/kdemultimedia/kdemultimedia.desc | 4 +- package/kde/kdenetwork/kdenetwork.desc | 4 +- .../kde/kdepim/fix-imap-resource-type.patch | 33 ++++++++ package/kde/kdepim/kdepim.conf | 1 + package/kde/kdepim/kdepim.desc | 5 +- package/kde/kdepim/sasl2-location.patch | 55 +++++++++++++ package/kde/kdesdk/kdesdk.desc | 4 +- package/kde/kdetoys/kdetoys.desc | 4 +- package/kde/kdeutils/kdeutils.desc | 4 +- package/kde/kdevelop/kdevelop.desc | 4 +- package/kde/kdewebdev/kdewebdev.desc | 4 +- package/kde/qt/qt.desc | 4 +- package/sirkull/baghira/baghira.desc | 4 +- 37 files changed, 223 insertions(+), 252 deletions(-) delete mode 100644 package/kde/kdebase/post-3.3.2-kdebase-htmlframes2.patch create mode 100644 package/kde/kdebase/sasl2-location.patch delete mode 100644 package/kde/kdelibs/post-3.3.2-kdelibs-htmlframes2.patch delete mode 100644 package/kde/kdelibs/post-3.3.2-kdelibs-kio.patch delete mode 100644 package/kde/kdelibs/post-3.3.2-kdelibs-kioslave.patch create mode 100644 package/kde/kdepim/fix-imap-resource-type.patch create mode 100644 package/kde/kdepim/sasl2-location.patch diff --git a/package/fake/kdebluetooth/kdebluetooth.conf b/package/fake/kdebluetooth/kdebluetooth.conf index 9b47ec0cb..f9ec9810a 100644 --- a/package/fake/kdebluetooth/kdebluetooth.conf +++ b/package/fake/kdebluetooth/kdebluetooth.conf @@ -22,13 +22,4 @@ . $base/package/*/*/kde-3.conf -kdebl_main() { - cd kdeextragear-3 - make -f Makefile.cvs - eval ./configure $confopt $extraconfopt - cd kdebluetooth - eval $MAKE $makeopt - eval $MAKE $makeinstopt -} - -custmain="kdebl_main" +var_append confopt ' ' '--enable-irmcsynckonnector' diff --git a/package/fake/kdebluetooth/kdebluetooth.desc b/package/fake/kdebluetooth/kdebluetooth.desc index 371d94b93..d5729e521 100644 --- a/package/fake/kdebluetooth/kdebluetooth.desc +++ b/package/fake/kdebluetooth/kdebluetooth.desc @@ -37,8 +37,8 @@ [L] GPL [S] Beta -[V] 2004-11-27 +[V] 1.0_beta1 [P] X -?---5---9 173.000 -[D] 1012120025 kdebluetooth-2004-11-27.tar.bz2 http://www.rocklinux.net/people/fake/kdebluetooth/ +[D] 3738643708 kdebluetooth-1.0_beta1.tar.bz2 http://dl.sourceforge.net/kde-bluetooth/ diff --git a/package/kde/arts/arts.desc b/package/kde/arts/arts.desc index cac484946..e420e6ac2 100644 --- a/package/kde/arts/arts.desc +++ b/package/kde/arts/arts.desc @@ -40,8 +40,8 @@ [L] GPL [S] Stable -[V] 1.3.2 +[V] 1.4.0 [P] X -?---5---9 126.500 -[D] 2958364310 arts-1.3.2.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.3.2/src/ +[D] 4153513417 arts-1.4.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.4/src/ diff --git a/package/kde/k3b/k3b.desc b/package/kde/k3b/k3b.desc index 7622d9315..b106da2c0 100644 --- a/package/kde/k3b/k3b.desc +++ b/package/kde/k3b/k3b.desc @@ -38,8 +38,8 @@ [L] GPL [S] Beta -[V] 0.11.20 +[V] 0.11.22 [P] X -?---5---9 173.100 -[D] 399183401 k3b-0.11.20.tar.bz2 http://dl.sourceforge.net/sourceforge/k3b/ +[D] 2713022175 k3b-0.11.22.tar.bz2 http://dl.sourceforge.net/sourceforge/k3b/ diff --git a/package/kde/kde-i18n-de/kde-i18n-de.desc b/package/kde/kde-i18n-de/kde-i18n-de.desc index 759671755..43dc3f4ce 100644 --- a/package/kde/kde-i18n-de/kde-i18n-de.desc +++ b/package/kde/kde-i18n-de/kde-i18n-de.desc @@ -38,8 +38,8 @@ [L] GPL [S] Stable -[V] 3.3.2 +[V] 3.4.0 [P] X -?---5---9 166.500 -[D] 2273728381 kde-i18n-de-3.3.2.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.3.2/src/kde-i18n/ +[D] 615558956 kde-i18n-de-3.4.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.4/src/kde-i18n/ diff --git a/package/kde/kde-i18n-es/kde-i18n-es.desc b/package/kde/kde-i18n-es/kde-i18n-es.desc index 2b69dbe3e..dc33325b5 100644 --- a/package/kde/kde-i18n-es/kde-i18n-es.desc +++ b/package/kde/kde-i18n-es/kde-i18n-es.desc @@ -38,8 +38,8 @@ [L] GPL [S] Stable -[V] 3.3.2 +[V] 3.4.0 [P] X -?---5---9 166.900 -[D] 2418838714 kde-i18n-es-3.3.2.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.3.2/src/kde-i18n/ +[D] 2945271304 kde-i18n-es-3.4.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.4/src/kde-i18n/ diff --git a/package/kde/kde-i18n-fr/kde-i18n-fr.desc b/package/kde/kde-i18n-fr/kde-i18n-fr.desc index cc14f94c0..de2d02e38 100644 --- a/package/kde/kde-i18n-fr/kde-i18n-fr.desc +++ b/package/kde/kde-i18n-fr/kde-i18n-fr.desc @@ -38,8 +38,8 @@ [L] GPL [S] Stable -[V] 3.3.2 +[V] 3.4.0 [P] X -?---5---9 167.100 -[D] 1248898508 kde-i18n-fr-3.3.2.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.3.2/src/kde-i18n/ +[D] 1969298277 kde-i18n-fr-3.4.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.4/src/kde-i18n/ diff --git a/package/kde/kde-i18n-it/kde-i18n-it.desc b/package/kde/kde-i18n-it/kde-i18n-it.desc index 24538cd0c..06c49daa7 100644 --- a/package/kde/kde-i18n-it/kde-i18n-it.desc +++ b/package/kde/kde-i18n-it/kde-i18n-it.desc @@ -38,8 +38,8 @@ [L] GPL [S] Stable -[V] 3.3.2 +[V] 3.4.0 [P] X -?---5---9 166.600 -[D] 2045425712 kde-i18n-it-3.3.2.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.3.2/src/kde-i18n/ +[D] 975043074 kde-i18n-it-3.4.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.4/src/kde-i18n/ diff --git a/package/kde/kdeaccessibility/kdeaccessibility.desc b/package/kde/kdeaccessibility/kdeaccessibility.desc index a1fa9a8ec..063f3f6c1 100644 --- a/package/kde/kdeaccessibility/kdeaccessibility.desc +++ b/package/kde/kdeaccessibility/kdeaccessibility.desc @@ -39,8 +39,8 @@ [L] GPL [S] Stable -[V] 3.3.2 +[V] 3.4.0 [P] X -?---5---9 171.700 -[D] 1418196485 kdeaccessibility-3.3.2.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.3.2/src/ +[D] 958566811 kdeaccessibility-3.4.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.4/src/ diff --git a/package/kde/kdeaddons/kdeaddons.desc b/package/kde/kdeaddons/kdeaddons.desc index 5ed62491f..a84feb967 100644 --- a/package/kde/kdeaddons/kdeaddons.desc +++ b/package/kde/kdeaddons/kdeaddons.desc @@ -41,8 +41,8 @@ [L] GPL [S] Stable -[V] 3.3.2 +[V] 3.4.0 [P] X -?---5---9 196.700 -[D] 2578165462 kdeaddons-3.3.2.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.3.2/src/ +[D] 3465674190 kdeaddons-3.4.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.4/src/ diff --git a/package/kde/kdeadmin/kdeadmin.desc b/package/kde/kdeadmin/kdeadmin.desc index c5d35e086..84c42a34e 100644 --- a/package/kde/kdeadmin/kdeadmin.desc +++ b/package/kde/kdeadmin/kdeadmin.desc @@ -42,8 +42,8 @@ [L] GPL [S] Stable -[V] 3.3.2 +[V] 3.4.0 [P] X -?---5---9 162.200 -[D] 4072928226 kdeadmin-3.3.2.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.3.2/src/ +[D] 3008992303 kdeadmin-3.4.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.4/src/ diff --git a/package/kde/kdeartwork/kdeartwork.desc b/package/kde/kdeartwork/kdeartwork.desc index a58a5fdae..73220a782 100644 --- a/package/kde/kdeartwork/kdeartwork.desc +++ b/package/kde/kdeartwork/kdeartwork.desc @@ -41,8 +41,8 @@ [L] GPL [S] Stable -[V] 3.3.2 +[V] 3.4.0 [P] X -?---5---9 166.100 -[D] 2981978797 kdeartwork-3.3.2.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.3.2/src/ +[D] 2456379921 kdeartwork-3.4.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.4/src/ diff --git a/package/kde/kdebase/kdebase.conf b/package/kde/kdebase/kdebase.conf index 1457b9d90..040f1f0f0 100644 --- a/package/kde/kdebase/kdebase.conf +++ b/package/kde/kdebase/kdebase.conf @@ -27,8 +27,8 @@ pkginstalled samba && var_append confopt " " \ kde_base_pi() { - register_xdm kdm 'KDE v3.3 display manager' $bindir/kdm - register_wm kde 'KDE v3.3' /$prefix/bin/startkde + register_xdm kdm 'KDE v3.4 display manager' $bindir/kdm + register_wm kde 'KDE v3.4' /$prefix/bin/startkde cp -fv $confdir/kdm.cron $root/etc/cron.daily/90-kdm chmod +x $root/etc/cron.daily/90-kdm diff --git a/package/kde/kdebase/kdebase.desc b/package/kde/kdebase/kdebase.desc index 5ceb4c4b1..1c995462f 100644 --- a/package/kde/kdebase/kdebase.desc +++ b/package/kde/kdebase/kdebase.desc @@ -43,8 +43,8 @@ [L] GPL [S] Stable -[V] 3.3.2 +[V] 3.4.0 [P] X -?---5---9 161.900 -[D] 4133167626 kdebase-3.3.2.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.3.2/src/ +[D] 1281117348 kdebase-3.4.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.4/src/ diff --git a/package/kde/kdebase/post-3.3.2-kdebase-htmlframes2.patch b/package/kde/kdebase/post-3.3.2-kdebase-htmlframes2.patch deleted file mode 100644 index bf5456a41..000000000 --- a/package/kde/kdebase/post-3.3.2-kdebase-htmlframes2.patch +++ /dev/null @@ -1,58 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/kde/kdebase/post-3.3.2-kdebase-htmlframes2.patch -# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - -Index: konq_mainwindow.cc -=================================================================== -RCS file: /home/kde/kdebase/konqueror/konq_mainwindow.cc,v -retrieving revision 1.1342.2.14 -diff -u -p -r1.1342.2.14 konq_mainwindow.cc ---- ./konqueror/konq_mainwindow.cc 24 Nov 2004 18:29:51 -0000 1.1342.2.14 -+++ ./konqueror/konq_mainwindow.cc 12 Dec 2004 15:54:46 -0000 -@@ -2252,6 +2252,17 @@ KonqView * KonqMainWindow::childView( KP - QString viewName = view->viewName(); - kdDebug() << " - viewName=" << viewName << " " - << "frame names:" << view->frameNames().join( "," ) << endl; -+ -+ // First look for a hostextension containing this frame name -+ KParts::BrowserHostExtension *ext = KParts::BrowserHostExtension::childObject( view->part() ); -+ if ( ext ) -+ { -+ ext = ext->findFrameParent(callingPart, name); -+ kdDebug() << "BrowserHostExtension found part " << ext << endl; -+ if (!ext) -+ continue; // Don't use this window -+ } -+ - if ( !viewName.isEmpty() && viewName == name ) - { - kdDebug() << "found existing view by name: " << view << endl; -@@ -2262,13 +2273,6 @@ KonqView * KonqMainWindow::childView( KP - return view; - } - -- // First look for a hostextension containing this frame name -- KParts::BrowserHostExtension *ext = KParts::BrowserHostExtension::childObject( view->part() ); -- if ( ext ) -- { -- ext = ext->findFrameParent(callingPart, name); -- } -- - // KParts::BrowserHostExtension* ext = KonqView::hostExtension( view->part(), name ); - - if ( ext ) diff --git a/package/kde/kdebase/sasl2-location.patch b/package/kde/kdebase/sasl2-location.patch new file mode 100644 index 000000000..8fa656123 --- /dev/null +++ b/package/kde/kdebase/sasl2-location.patch @@ -0,0 +1,77 @@ +--- ./configure.orig 2005-03-21 12:35:09.000000000 +0100 ++++ ./configure 2005-03-21 12:36:27.000000000 +0100 +@@ -48988,7 +48988,7 @@ + + + +-for ac_header in sasl/sasl.h ++for ac_header in sasl2/sasl.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` + if eval "test \"\${$as_ac_Header+set}\" = set"; then +--- ./configure.in.orig 2005-03-21 12:35:40.000000000 +0100 ++++ ./configure.in 2005-03-04 14:11:05.000000000 +0100 +@@ -1177,7 +1177,7 @@ + SASL2_LIBS="" + + KDE_CHECK_HEADERS(sasl.h)dnl SASL1 header is enough for kio_ldap +-KDE_CHECK_HEADERS(sasl/sasl.h, sasl2_header="yes") ++KDE_CHECK_HEADERS(sasl2/sasl.h, sasl2_header="yes") + if test "$sasl2_header" = "yes" ; then + KDE_CHECK_LIB(sasl2, sasl_client_init, SASL2_LIBS="-lsasl2") + fi +--- ./kioslave/configure.in.in.orig 2004-09-30 00:30:49.000000000 +0200 ++++ ./kioslave/configure.in.in 2005-03-22 14:33:43.000000000 +0100 +@@ -4,7 +4,7 @@ + SASL2_LIBS="" + + KDE_CHECK_HEADERS(sasl.h)dnl SASL1 header is enough for kio_ldap +-KDE_CHECK_HEADERS(sasl/sasl.h, sasl2_header="yes") ++KDE_CHECK_HEADERS(sasl2/sasl.h, sasl2_header="yes") + if test "$sasl2_header" = "yes" ; then + KDE_CHECK_LIB(sasl2, sasl_client_init, SASL2_LIBS="-lsasl2") + fi +--- ./kioslave/ldap/kio_ldap.cpp.orig 2005-03-22 14:35:20.000000000 +0100 ++++ ./kioslave/ldap/kio_ldap.cpp 2005-03-22 14:36:19.000000000 +0100 +@@ -22,7 +22,7 @@ + #include + + #ifdef HAVE_SASL_SASL_H //prefer libsasl2 +-#include ++#include + #else + #ifdef HAVE_SASL_H + #include +--- ./kioslave/pop3/pop3.cc.orig 2005-03-22 12:08:08.000000000 +0100 ++++ ./kioslave/pop3/pop3.cc 2005-03-22 12:08:23.000000000 +0100 +@@ -43,7 +43,7 @@ + + #ifdef HAVE_LIBSASL2 + extern "C" { +-#include ++#include + } + #endif + +--- ./kioslave/smtp/command.h.orig 2005-03-22 14:35:48.000000000 +0100 ++++ ./kioslave/smtp/command.h 2005-03-22 14:36:33.000000000 +0100 +@@ -38,7 +38,7 @@ + + #ifdef HAVE_LIBSASL2 + extern "C" { +-#include ++#include + } + #endif + +--- ./kioslave/smtp/smtp.cc.orig 2005-03-22 14:35:56.000000000 +0100 ++++ ./kioslave/smtp/smtp.cc 2005-03-22 14:36:50.000000000 +0100 +@@ -32,7 +32,7 @@ + + #ifdef HAVE_LIBSASL2 + extern "C" { +-#include ++#include + } + #endif + diff --git a/package/kde/kdebindings/kdebindings.desc b/package/kde/kdebindings/kdebindings.desc index 35c4a4627..7eb3433e6 100644 --- a/package/kde/kdebindings/kdebindings.desc +++ b/package/kde/kdebindings/kdebindings.desc @@ -39,8 +39,8 @@ [L] GPL [S] Stable -[V] 3.3.2 +[V] 3.4.0 [P] X -?---5---9 202.700 -[D] 2783939926 kdebindings-3.3.2.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.3.2/src/ +[D] 3362431737 kdebindings-3.4.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.4/src/ diff --git a/package/kde/kdeedu/kdeedu.desc b/package/kde/kdeedu/kdeedu.desc index 4525388cd..ae49a6602 100644 --- a/package/kde/kdeedu/kdeedu.desc +++ b/package/kde/kdeedu/kdeedu.desc @@ -41,8 +41,8 @@ [L] GPL [S] Stable -[V] 3.3.2 +[V] 3.4.0 [P] X -?---5---9 166.400 -[D] 118754794 kdeedu-3.3.2.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.3.2/src/ +[D] 3949774953 kdeedu-3.4.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.4/src/ diff --git a/package/kde/kdegames/kdegames.desc b/package/kde/kdegames/kdegames.desc index dfcfa511f..bce49fb65 100644 --- a/package/kde/kdegames/kdegames.desc +++ b/package/kde/kdegames/kdegames.desc @@ -41,8 +41,8 @@ [L] GPL [S] Stable -[V] 3.3.2 +[V] 3.4.0 [P] X -?---5---9 166.200 -[D] 467416419 kdegames-3.3.2.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.3.2/src/ +[D] 3986547436 kdegames-3.4.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.4/src/ diff --git a/package/kde/kdegraphics/kdegraphics.desc b/package/kde/kdegraphics/kdegraphics.desc index 7776e5c4b..84ce7a151 100644 --- a/package/kde/kdegraphics/kdegraphics.desc +++ b/package/kde/kdegraphics/kdegraphics.desc @@ -41,8 +41,8 @@ [L] GPL [S] Stable -[V] 3.3.2 +[V] 3.4.0 [P] X -?---5---9 206.200 -[D] 313221748 kdegraphics-3.3.2.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.3.2/src/ +[D] 3446781236 kdegraphics-3.4.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.4/src/ diff --git a/package/kde/kdelibs/kdelibs.desc b/package/kde/kdelibs/kdelibs.desc index e3411745b..925aaecaf 100644 --- a/package/kde/kdelibs/kdelibs.desc +++ b/package/kde/kdelibs/kdelibs.desc @@ -41,8 +41,8 @@ [L] GPL [S] Stable -[V] 3.3.2 +[V] 3.4.0 [P] X -?---5---9 142.200 -[D] 2102249592 kdelibs-3.3.2.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.3.2/src/ +[D] 2284615174 kdelibs-3.4.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.4/src/ diff --git a/package/kde/kdelibs/post-3.3.2-kdelibs-htmlframes2.patch b/package/kde/kdelibs/post-3.3.2-kdelibs-htmlframes2.patch deleted file mode 100644 index d08cd5115..000000000 --- a/package/kde/kdelibs/post-3.3.2-kdelibs-htmlframes2.patch +++ /dev/null @@ -1,45 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/kde/kdelibs/post-3.3.2-kdelibs-htmlframes2.patch -# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - -Index: khtml_part.cpp -=================================================================== -RCS file: /home/kde/kdelibs/khtml/khtml_part.cpp,v -retrieving revision 1.1015.2.12 -diff -u -p -r1.1015.2.12 khtml_part.cpp ---- ./khtml/khtml_part.cpp 17 Nov 2004 13:46:56 -0000 1.1015.2.12 -+++ ./khtml/khtml_part.cpp 12 Dec 2004 15:55:30 -0000 -@@ -4758,7 +4758,7 @@ KHTMLPart * - KHTMLPart::findFrameParent( KParts::ReadOnlyPart *callingPart, const QString &f, khtml::ChildFrame **childFrame ) - { - #ifdef DEBUG_FINDFRAME -- kdDebug(6050) << "KHTMLPart::findFrameParent: this = " << this << " URL = " << m_url << " findFrameParent( " << f << " )" << endl; -+ kdDebug(6050) << "KHTMLPart::findFrameParent: this = " << this << " URL = " << m_url << " name = " << name() << " findFrameParent( " << f << " )" << endl; - #endif - // Check access - KHTMLPart* const callingHtmlPart = dynamic_cast(callingPart); -@@ -4766,6 +4766,9 @@ KHTMLPart::findFrameParent( KParts::Read - if (!checkFrameAccess(callingHtmlPart)) - return 0; - -+ if (!childFrame && !parentPart() && (name() == f)) -+ return this; -+ - FrameIt it = d->m_frames.find( f ); - const FrameIt end = d->m_frames.end(); - if ( it != end ) diff --git a/package/kde/kdelibs/post-3.3.2-kdelibs-kio.patch b/package/kde/kdelibs/post-3.3.2-kdelibs-kio.patch deleted file mode 100644 index c7cd2d712..000000000 --- a/package/kde/kdelibs/post-3.3.2-kdelibs-kio.patch +++ /dev/null @@ -1,46 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/kde/kdelibs/post-3.3.2-kdelibs-kio.patch -# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - -Index: job.cpp -=================================================================== -RCS file: /home/kde/kdelibs/kio/kio/job.cpp,v -retrieving revision 1.397.2.5 -retrieving revision 1.397.2.8 -diff -u -5 -d -p -r1.397.2.5 -r1.397.2.8 ---- ./kio/kio/job.cpp 9 Nov 2004 00:50:35 -0000 1.397.2.5 -+++ ./kio/kio/job.cpp 8 Dec 2004 01:08:15 -0000 1.397.2.8 -@@ -3119,14 +3119,14 @@ void CopyJob::copyNextFile() - if ( f.open( IO_ReadWrite ) ) - { - f.close(); - KSimpleConfig config( path ); - config.setDesktopGroup(); -- config.writePathEntry( QString::fromLatin1("URL"), (*it).uSource.url() ); -- KURL urlName = (*it).uSource; -- urlName.setPass( "" ); -- config.writeEntry( QString::fromLatin1("Name"), urlName.url() ); -+ KURL url = (*it).uSource; -+ url.setPass( "" ); -+ config.writePathEntry( QString::fromLatin1("URL"), url.url() ); -+ config.writeEntry( QString::fromLatin1("Name"), url.url() ); - config.writeEntry( QString::fromLatin1("Type"), QString::fromLatin1("Link") ); - QString protocol = (*it).uSource.protocol(); - if ( protocol == QString::fromLatin1("ftp") ) - config.writeEntry( QString::fromLatin1("Icon"), QString::fromLatin1("ftp") ); - else if ( protocol == QString::fromLatin1("http") ) diff --git a/package/kde/kdelibs/post-3.3.2-kdelibs-kioslave.patch b/package/kde/kdelibs/post-3.3.2-kdelibs-kioslave.patch deleted file mode 100644 index a607a7f05..000000000 --- a/package/kde/kdelibs/post-3.3.2-kdelibs-kioslave.patch +++ /dev/null @@ -1,36 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/kde/kdelibs/post-3.3.2-kdelibs-kioslave.patch -# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- ./kioslave/ftp/ftp.cc 21 Sep 2004 16:17:56 -0000 1.213.2.1 -+++ ./kioslave/ftp/ftp.cc 26 Dec 2004 00:29:54 -0000 1.213.2.2 -@@ -751,6 +751,14 @@ bool Ftp::ftpSendCmd( const QCString& cm - { - assert(m_control != NULL); // must have control connection socket - -+ if ( cmd.find( '\r' ) != -1 || cmd.find( '\n' ) != -1) -+ { -+ kdWarning(7102) << "Invalid command received (contains CR or LF): " -+ << cmd.data() << endl; -+ error( ERR_UNSUPPORTED_ACTION, m_host ); -+ return false; -+ } -+ - // Don't print out the password... - bool isPassCmd = (cmd.left(4).lower() == "pass"); - if ( !isPassCmd ) diff --git a/package/kde/kdemultimedia/kdemultimedia.desc b/package/kde/kdemultimedia/kdemultimedia.desc index 74b9096c5..fe852c9bf 100644 --- a/package/kde/kdemultimedia/kdemultimedia.desc +++ b/package/kde/kdemultimedia/kdemultimedia.desc @@ -41,8 +41,8 @@ [L] GPL [S] Stable -[V] 3.3.2 +[V] 3.4.0 [P] X -?---5---9 194.000 -[D] 1363202172 kdemultimedia-3.3.2.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.3.2/src/ +[D] 337989350 kdemultimedia-3.4.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.4/src/ diff --git a/package/kde/kdenetwork/kdenetwork.desc b/package/kde/kdenetwork/kdenetwork.desc index b372e4e37..f9d7595ab 100644 --- a/package/kde/kdenetwork/kdenetwork.desc +++ b/package/kde/kdenetwork/kdenetwork.desc @@ -41,8 +41,8 @@ [L] GPL [S] Stable -[V] 3.3.2 +[V] 3.4.0 [P] X -?---5---9 171.800 -[D] 4277302089 kdenetwork-3.3.2.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.3.2/src/ +[D] 535096324 kdenetwork-3.4.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.4/src/ diff --git a/package/kde/kdepim/fix-imap-resource-type.patch b/package/kde/kdepim/fix-imap-resource-type.patch new file mode 100644 index 000000000..bc77d77bb --- /dev/null +++ b/package/kde/kdepim/fix-imap-resource-type.patch @@ -0,0 +1,33 @@ +--- ./kresources/kolab/kabc/resourcekolab.cpp 19 Jan 2005 15:18:12 -0000 1.17 ++++ ./kresources/kolab/kabc/resourcekolab.cpp 13 Mar 2005 15:42:21 -0000 +@@ -80,7 +80,7 @@ KABC::ResourceKolab::ResourceKolab( cons + Kolab::ResourceKolabBase( "ResourceKolab-KABC" ), + mCachedSubresource( QString::null ), mLocked( false ) + { +- setType( "kolab" ); ++ setType( "imap" ); + } + + KABC::ResourceKolab::~ResourceKolab() +--- ./kresources/kolab/kcal/resourcekolab.cpp 22 Jan 2005 11:19:19 -0000 1.26 ++++ ./kresources/kolab/kcal/resourcekolab.cpp 13 Mar 2005 15:42:21 -0000 +@@ -68,7 +68,7 @@ ResourceKolab::ResourceKolab( const KCon + : ResourceCalendar( config ), ResourceKolabBase( "ResourceKolab-libkcal" ), + mOpen( false ) + { +- setType( "kolab" ); ++ setType( "imap" ); + connect( &mResourceChangedTimer, SIGNAL( timeout() ), + this, SLOT( slotEmitResourceChanged() ) ); + } +--- ./kresources/kolab/knotes/resourcekolab.cpp 21 Feb 2005 23:33:09 -0000 1.12 ++++ ./kresources/kolab/knotes/resourcekolab.cpp 13 Mar 2005 15:42:21 -0000 +@@ -52,7 +52,7 @@ static const char* inlineMimeType = "tex + ResourceKolab::ResourceKolab( const KConfig *config ) + : ResourceNotes( config ), ResourceKolabBase( "ResourceKolab-KNotes" ) + { +- setType( "kolab" ); ++ setType( "imap" ); + } + + ResourceKolab::~ResourceKolab() diff --git a/package/kde/kdepim/kdepim.conf b/package/kde/kdepim/kdepim.conf index dedcf8504..b0bb589ce 100644 --- a/package/kde/kdepim/kdepim.conf +++ b/package/kde/kdepim/kdepim.conf @@ -21,3 +21,4 @@ # --- ROCK-COPYRIGHT-NOTE-END --- . $base/package/*/*/kde-3.conf + diff --git a/package/kde/kdepim/kdepim.desc b/package/kde/kdepim/kdepim.desc index 3dd5e870d..bc4bd297f 100644 --- a/package/kde/kdepim/kdepim.desc +++ b/package/kde/kdepim/kdepim.desc @@ -41,8 +41,7 @@ [L] GPL [S] Stable -[V] 3.3.2 +[V] 3.4.0 [P] X -?---5---9 162.700 -[D] 349130558 kdepim-3.3.2.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.3.2/src/ - +[D] 2410306616 kdepim-3.4.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.4/src/ diff --git a/package/kde/kdepim/sasl2-location.patch b/package/kde/kdepim/sasl2-location.patch new file mode 100644 index 000000000..a49b72cd6 --- /dev/null +++ b/package/kde/kdepim/sasl2-location.patch @@ -0,0 +1,55 @@ +--- ./kioslaves/imap4/imap4.cc.orig 2005-03-22 17:30:32.000000000 +0100 ++++ ./kioslaves/imap4/imap4.cc 2005-03-22 17:31:55.000000000 +0100 +@@ -66,7 +66,7 @@ + + #ifdef HAVE_LIBSASL2 + extern "C" { +-#include ++#include + } + #endif + +--- ./kioslaves/imap4/imapparser.cc.orig 2005-03-22 17:30:39.000000000 +0100 ++++ ./kioslaves/imap4/imapparser.cc 2005-03-22 17:32:07.000000000 +0100 +@@ -43,7 +43,7 @@ + + #ifdef HAVE_LIBSASL2 + extern "C" { +-#include ++#include + } + #endif + +--- ./kioslaves/sieve/sieve.cpp.orig 2005-03-22 17:30:57.000000000 +0100 ++++ ./kioslaves/sieve/sieve.cpp 2005-03-22 17:32:21.000000000 +0100 +@@ -29,7 +29,7 @@ + #endif + + extern "C" { +-#include ++#include + } + #include "sieve.h" + +--- ./kioslaves/configure.in.in.orig 2005-03-22 17:30:51.000000000 +0100 ++++ ./kioslaves/configure.in.in 2005-03-22 17:32:33.000000000 +0100 +@@ -3,7 +3,7 @@ + sasl2_header="no" + SASL2_LIBS="" + +-KDE_CHECK_HEADERS(sasl/sasl.h, sasl2_header="yes") ++KDE_CHECK_HEADERS(sasl2/sasl.h, sasl2_header="yes") + if test "$sasl2_header" = "yes" ; then + KDE_CHECK_LIB(sasl2, sasl_client_init, SASL2_LIBS="-lsasl2") + fi +--- ./configure.in.orig 2005-03-22 17:30:24.000000000 +0100 ++++ ./configure.in 2005-03-22 17:31:35.000000000 +0100 +@@ -223,7 +223,7 @@ + sasl2_header="no" + SASL2_LIBS="" + +-KDE_CHECK_HEADERS(sasl/sasl.h, sasl2_header="yes") ++KDE_CHECK_HEADERS(sasl2/sasl.h, sasl2_header="yes") + if test "$sasl2_header" = "yes" ; then + KDE_CHECK_LIB(sasl2, sasl_client_init, SASL2_LIBS="-lsasl2") + fi diff --git a/package/kde/kdesdk/kdesdk.desc b/package/kde/kdesdk/kdesdk.desc index 6bef6d18c..9e7af6f01 100644 --- a/package/kde/kdesdk/kdesdk.desc +++ b/package/kde/kdesdk/kdesdk.desc @@ -39,8 +39,8 @@ [L] GPL [S] Stable -[V] 3.3.2 +[V] 3.4.0 [P] X -?---5---9 167.900 -[D] 4144368182 kdesdk-3.3.2.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.3.2/src/ +[D] 3030400049 kdesdk-3.4.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.4/src/ diff --git a/package/kde/kdetoys/kdetoys.desc b/package/kde/kdetoys/kdetoys.desc index a81565493..1c474a01c 100644 --- a/package/kde/kdetoys/kdetoys.desc +++ b/package/kde/kdetoys/kdetoys.desc @@ -41,8 +41,8 @@ [L] GPL [S] Stable -[V] 3.3.2 +[V] 3.4.0 [P] X -?---5---9 194.200 -[D] 1180800311 kdetoys-3.3.2.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.3.2/src/ +[D] 2197107287 kdetoys-3.4.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.4/src/ diff --git a/package/kde/kdeutils/kdeutils.desc b/package/kde/kdeutils/kdeutils.desc index 2007aaac0..5b0f67ba8 100644 --- a/package/kde/kdeutils/kdeutils.desc +++ b/package/kde/kdeutils/kdeutils.desc @@ -41,8 +41,8 @@ [L] GPL [S] Stable -[V] 3.3.2 +[V] 3.4.0 [P] X -?---5---9 162.100 -[D] 961275283 kdeutils-3.3.2.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.3.2/src/ +[D] 2528585081 kdeutils-3.4.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.4/src/ diff --git a/package/kde/kdevelop/kdevelop.desc b/package/kde/kdevelop/kdevelop.desc index 30757aa9f..b6e48c958 100644 --- a/package/kde/kdevelop/kdevelop.desc +++ b/package/kde/kdevelop/kdevelop.desc @@ -35,8 +35,8 @@ [L] GPL [S] Stable -[V] 3.1.2 +[V] 3.2.0 [P] X -?---5---9 208.500 -[D] 708086980 kdevelop-3.1.2.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.3.2/src/ +[D] 3717313136 kdevelop-3.2.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.4/src/ diff --git a/package/kde/kdewebdev/kdewebdev.desc b/package/kde/kdewebdev/kdewebdev.desc index a13a8b5d1..d67238e92 100644 --- a/package/kde/kdewebdev/kdewebdev.desc +++ b/package/kde/kdewebdev/kdewebdev.desc @@ -37,8 +37,8 @@ [L] GPL [S] Stable -[V] 3.3.2 +[V] 3.4.0 [P] X -?---5---9 166.700 -[D] 1391504279 kdewebdev-3.3.2.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.3.2/src/ +[D] 1844494222 kdewebdev-3.4.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.4/src/ diff --git a/package/kde/qt/qt.desc b/package/kde/qt/qt.desc index 76f439ef1..b5c4abd8c 100644 --- a/package/kde/qt/qt.desc +++ b/package/kde/qt/qt.desc @@ -37,8 +37,8 @@ [L] GPL [S] Stable -[V] 3.3.3 +[V] 3.3.4 [P] X -?---5---9 125.300 -[D] 959193637 qt-x11-free-3.3.3.tar.bz2 ftp://ftp.trolltech.com/qt/source/ +[D] 1097100408 qt-x11-free-3.3.4.tar.bz2 ftp://ftp.trolltech.com/qt/source/ diff --git a/package/sirkull/baghira/baghira.desc b/package/sirkull/baghira/baghira.desc index 2208a400f..b53eaab1b 100644 --- a/package/sirkull/baghira/baghira.desc +++ b/package/sirkull/baghira/baghira.desc @@ -35,10 +35,10 @@ [L] GPL [S] Stable -[V] 0.6c +[V] 0.6d [P] X -?---5---9 168.500 -[D] 192864975 baghira-0.6c.tar.bz2 http://dl.sf.net/sourceforge/baghira/ +[D] 3067679361 baghira-0.6d.tar.bz2 http://dl.sf.net/sourceforge/baghira/ [O] . $base/package/*/*/kde-3.conf