The KDE on FreeBSD team is pleased to update the KDE4 ports to 4.7.3.

This is an incremental update and should be much easier to handle than
the transition from 4.6.5 to 4.7.2 in the ports tree.

The official release notes can be found at
http://www.kde.org/announcements/announce-4.7.3.php.

Approved by:	avilla (mentor), makc (mentor), portmgr (miwi)
Feature safe:	yes

5 files changed, 74 insertions, 68 deletions

diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo
index 24c7a546bfd..1922804c845 100644
--- a/x11/kdelibs4/distinfo
+++ b/x11/kdelibs4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/kdelibs-4.7.2.tar.bz2) = bfa70b33d2153c209a21735d73ae061772c59696c1715881191da7a3993f8b38
-SIZE (KDE/kdelibs-4.7.2.tar.bz2) = 12066803
+SHA256 (KDE/kdelibs-4.7.3.tar.bz2) = 00ef65295134e998e8bc1123b0bd64245811106e827ab90458378ea4ab5b0e66
+SIZE (KDE/kdelibs-4.7.3.tar.bz2) = 12071229
diff --git a/x11/kdelibs4/files/patch-kio__CMakeLists.txt b/x11/kdelibs4/files/patch-kio__CMakeLists.txt
new file mode 100644
index 00000000000..67a570c2f1f
--- /dev/null
+++ b/x11/kdelibs4/files/patch-kio__CMakeLists.txt
@@ -0,0 +1,49 @@
+--- ./kio/CMakeLists.txt.orig	2011-10-28 00:41:28.000000000 -0700
++++ ./kio/CMakeLists.txt	2011-11-03 01:06:07.267271376 -0700
+@@ -17,22 +17,6 @@
+    set(KIO_NO_SOPRANO TRUE)
+ endif(NOT SOPRANO_FOUND)
+ 
+-if(OPENSSL_FOUND)
+-   set(KSSL_HAVE_SSL 1)
+-   include_directories(${OPENSSL_INCLUDE_DIR})
+-endif(OPENSSL_FOUND)
+-
+-if(NOT KIO_NO_NEPOMUK)
+-    include_directories(
+-       ${SOPRANO_INCLUDE_DIR}
+-       ${CMAKE_SOURCE_DIR}/nepomuk/
+-       ${CMAKE_SOURCE_DIR}/nepomuk/core/
+-       ${CMAKE_SOURCE_DIR}/nepomuk/types/    
+-       ${CMAKE_SOURCE_DIR}/nepomuk/ui/
+-       ${CMAKE_SOURCE_DIR}/nepomuk/query/
+-    )
+-endif(NOT KIO_NO_NEPOMUK)
+-
+ # This applies to all subdirs; let's put kio's dependencies (and own dirs) here, once and for all
+ include_directories(
+    ${CMAKE_CURRENT_SOURCE_DIR}/bookmarks
+@@ -48,6 +32,23 @@
+    ${ZLIB_INCLUDE_DIR}
+ 
+    )
++
++if(OPENSSL_FOUND)
++   set(KSSL_HAVE_SSL 1)
++   include_directories(${OPENSSL_INCLUDE_DIR})
++endif(OPENSSL_FOUND)
++
++if(NOT KIO_NO_NEPOMUK)
++    include_directories(
++       ${SOPRANO_INCLUDE_DIR}
++       ${CMAKE_SOURCE_DIR}/nepomuk/
++       ${CMAKE_SOURCE_DIR}/nepomuk/core/
++       ${CMAKE_SOURCE_DIR}/nepomuk/types/
++       ${CMAKE_SOURCE_DIR}/nepomuk/ui/
++       ${CMAKE_SOURCE_DIR}/nepomuk/query/
++    )
++endif(NOT KIO_NO_NEPOMUK)
++
+ if (NOT KIO_NO_STRIGI)
+    include_directories(${STRIGI_INCLUDE_DIR})
+    set(KIO_EXTRA_LIBS ${KIO_EXTRA_LIBS} ${STRIGI_STREAMANALYZER_LIBRARY} ${STRIGI_STREAMS_LIBRARY})
diff --git a/x11/kdelibs4/files/patch-kparts__statusbarextension.cpp b/x11/kdelibs4/files/patch-kparts__statusbarextension.cpp
new file mode 100644
index 00000000000..db7825a11dc
--- /dev/null
+++ b/x11/kdelibs4/files/patch-kparts__statusbarextension.cpp
@@ -0,0 +1,21 @@
+commit 999eac446a49e6126df04aa8717f95e6aef136fc
+Author: Andras Mantia <amantia@kde.org>
+Date:   Thu Nov 10 11:40:22 2011 +0200
+
+    Don't try to access the parent() from the destructor, fixes crash on destruction.
+    BUG: 283657
+    REVIEW: 103098
+
+diff --git a/kparts/statusbarextension.cpp b/kparts/statusbarextension.cpp
+index 7689360..96eb277 100644
+--- ./kparts/statusbarextension.cpp
++++ ./kparts/statusbarextension.cpp
+@@ -96,7 +96,7 @@ StatusBarExtension::StatusBarExtension(KParts::ReadOnlyPart *parent)
+ 
+ StatusBarExtension::~StatusBarExtension()
+ {
+-  KStatusBar * sb = statusBar();
++  KStatusBar * sb = d->m_statusBar;
+   for ( int i = d->m_statusBarItems.count () - 1; i >= 0 ; --i ) {
+     if ( d->m_statusBarItems[i].widget() ) {
+       if ( sb ) {
diff --git a/x11/kdelibs4/files/patch-nepomuk__query__querybuilderdata_p.h b/x11/kdelibs4/files/patch-nepomuk__query__querybuilderdata_p.h
deleted file mode 100644
index bfe1c2b4bf1..00000000000
--- a/x11/kdelibs4/files/patch-nepomuk__query__querybuilderdata_p.h
+++ /dev/null
@@ -1,63 +0,0 @@
---- ./nepomuk/query/querybuilderdata_p.h
-+++ ./nepomuk/query/querybuilderdata_p.h
-@@ -32,6 +32,28 @@
- #include "query_p.h"
- #include "groupterm_p.h"
- 
-+namespace {
-+/// A hack to avoid passing extended chars to the bif:search_excerpts method which cannot handle
-+/// utf8 chars which use more than one char, ie. wide chars.
-+/// Thus, we simply truncate each term at the first wide char.
-+QStringList stripExtendedCharsHack(const QStringList& terms) {
-+    QStringList newTerms;
-+    foreach(const QString& term, terms) {
-+        int i = 0;
-+        while(i < term.length()) {
-+            if(term[i].unicode() > 0x7f) {
-+                break;
-+            }
-+            ++i;
-+        }
-+        if(i > 0) {
-+            newTerms.append(term.left(i));
-+        }
-+    }
-+    return newTerms;
-+}
-+}
-+
- namespace Nepomuk {
-     namespace Query {
-         class QueryBuilderData
-@@ -246,16 +268,23 @@ namespace Nepomuk {
-                     for( QHash<QString, QStringList>::const_iterator it = m_fullTextSearchTerms.constBegin();
-                          it != m_fullTextSearchTerms.constEnd(); ++it ) {
-                         const QString& varName = it.key();
--                        const QStringList& terms = it.value();
--                        // bif:search_excerpt wants a vector of all search terms
--                        excerptParts
--                                << QString::fromLatin1("bif:search_excerpt(bif:vector(bif:charset_recode('%1', '_WIDE_', 'UTF-8')), %2)")
--                            .arg( terms.join(QLatin1String("','")),
--                                  varName );
-+                        const QStringList terms = stripExtendedCharsHack(it.value());
-+                        if(terms.count()) {
-+                            // bif:search_excerpt wants a vector of all search terms
-+                            excerptParts
-+                                    << QString::fromLatin1("bif:search_excerpt(bif:vector('%1'), %2)")
-+                                       .arg( terms.join(QLatin1String("','")),
-+                                             varName );
-+                        }
-                     }
- 
--                    return QString::fromLatin1("(bif:concat(%1)) as ?_n_f_t_m_ex_")
--                        .arg(excerptParts.join(QLatin1String(",")));
-+                    if(excerptParts.count()) {
-+                        return QString::fromLatin1("(bif:concat(%1)) as ?_n_f_t_m_ex_")
-+                                .arg(excerptParts.join(QLatin1String(",")));
-+                    }
-+                    else {
-+                        return QString();
-+                    }
-                 }
-                 else {
-                     return QString();
diff --git a/x11/kdelibs4/pkg-plist b/x11/kdelibs4/pkg-plist
index b0bd253f06f..4d0b69cb3e1 100644
--- a/x11/kdelibs4/pkg-plist
+++ b/x11/kdelibs4/pkg-plist
@@ -261,6 +261,7 @@ include/KDE/KCategoryDrawer
 include/KDE/KCharMacroExpander
 include/KDE/KCharSelect
 include/KDE/KCharsets
+include/KDE/KCheckableProxyModel
 include/KDE/KCmdLineArgs
 include/KDE/KCmdLineOptions
 include/KDE/KCodecs
@@ -759,6 +760,7 @@ include/KDE/KUrlRequesterDialog
 include/KDE/KUser
 include/KDE/KUserGroup
 include/KDE/KVBox
+include/KDE/KViewStateMaintainer
 include/KDE/KWallet/Wallet
 include/KDE/KWebPage
 include/KDE/KWebPluginFactory
@@ -2147,9 +2149,6 @@ share/apps/cmake/modules/FindHUpnp.cmake
 share/apps/cmake/modules/FindIOKit.cmake
 share/apps/cmake/modules/FindKDE4Internal.cmake
 share/apps/cmake/modules/FindKDE4Workspace.cmake
-share/apps/cmake/modules/FindKDEWIN32.cmake
-share/apps/cmake/modules/FindKDEWIN_Packager.cmake
-share/apps/cmake/modules/FindKDEWin.cmake
 share/apps/cmake/modules/FindKDevPlatform.cmake
 share/apps/cmake/modules/FindKdcraw.cmake
 share/apps/cmake/modules/FindKdeMultimedia.cmake