Update to KDE SC 4.8.0

7 files changed, 104 insertions, 60 deletions

diff --git a/net/kdenetwork4/Makefile b/net/kdenetwork4/Makefile
index 140511a0d4a..dbe9fcf83fd 100644
--- a/net/kdenetwork4/Makefile
+++ b/net/kdenetwork4/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2012/03/03 00:13:45 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2012/03/19 20:12:49 markd Exp $
 
 DISTNAME=	kdenetwork-${_KDE_VERSION}
-PKGREVISION=	11
+PKGNAME=	${DISTNAME:S/-4/4-4/}
 CATEGORIES=	net
 COMMENT=	Network modules for the KDE integrated X11 desktop
 
@@ -18,6 +18,8 @@ CMAKE_ARGS+=	-DWITH_Xmms:BOOL=OFF
 #CMAKE_ARGS+=	-DWITH_LibV4L2:BOOL=OFF
 
 REPLACE_PERL+= \
+	kget/conf/kget_limitdownloads.pl \
+	kget/conf/kget_sensitive.pl \
 	kopete/kopete/kconf_update/kopete-account-0.10.pl \
 	kopete/kopete/kconf_update/kopete-gaim_to_pidgin_style.pl \
 	kopete/kopete/kconf_update/kopete-initialstatus.pl \
@@ -31,6 +33,7 @@ REPLACE_SH+= \
 
 .include "../../meta-pkgs/kde4/kde4.mk"
 
+.include "../../audio/alsa-lib/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libmsn+=  libmsn>=4.1
 .include "../../chat/libmsn/buildlink3.mk"
 .include "../../chat/libotr/buildlink3.mk"
@@ -42,15 +45,18 @@ BUILDLINK_API_DEPENDS.libmsn+=  libmsn>=4.1
 .include "../../graphics/libv4l/buildlink3.mk"
 .include "../../graphics/qimageblitz/buildlink3.mk"
 .include "../../misc/kdepimlibs4/buildlink3.mk"
+# libmms-0.6 has a broken header file. comment out till 0.6.2 in pkgsrc
+BUILDLINK_API_DEPENDS.libmms+=  libmms>=0.6.2
+#.include "../../net/libmms/buildlink3.mk"
 .include "../../net/libvncserver/buildlink3.mk"
 .include "../../net/openslp/buildlink3.mk"
 .include "../../net/ortp/buildlink3.mk"
 .include "../../security/qca2/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../x11/kdelibs4/buildlink3.mk"
-.include "../../x11/kdebase4/buildlink3.mk"
-.include "../../x11/kdebase-runtime4/buildlink3.mk"
-.include "../../x11/kdebase-workspace4/buildlink3.mk"
+.include "../../x11/kde-baseapps4/buildlink3.mk"
+.include "../../x11/kde-runtime4/buildlink3.mk"
+.include "../../x11/kde-workspace4/buildlink3.mk"
 .include "../../x11/libXScrnSaver/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/kdenetwork4/PLIST b/net/kdenetwork4/PLIST
index 28f4e8432ed..fd192efa16b 100644
--- a/net/kdenetwork4/PLIST
+++ b/net/kdenetwork4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2010/12/06 11:43:41 markd Exp $
+@comment $NetBSD: PLIST,v 1.6 2012/03/19 20:12:49 markd Exp $
 bin/kget
 bin/kopete
 bin/kopete_latexconvert.sh
@@ -79,11 +79,7 @@ include/kopete/ui/ui_kopetepasswordwidgetbase.h
 include/krdc/hostpreferences.h
 include/krdc/remoteview.h
 include/krdc/remoteviewfactory.h
-lib/kde4/fileshare_propsdlgplugin.so
-lib/kde4/kcm_fileshare.so
-lib/kde4/kcm_kcmsambaconf.so
 lib/kde4/kcm_kget_checksumsearchfactory.so
-lib/kde4/kcm_kget_contentfetchfactory.so
 lib/kde4/kcm_kget_metalinkfactory.so
 lib/kde4/kcm_kget_mirrorsearchfactory.so
 lib/kde4/kcm_kget_multisegkiofactory.so
@@ -112,7 +108,6 @@ lib/kde4/kcm_krdc_vncplugin.so
 lib/kde4/kded_dnssdwatcher.so
 lib/kde4/kget_browser_integration.so
 lib/kde4/kget_checksumsearchfactory.so
-lib/kde4/kget_contentfetchfactory.so
 lib/kde4/kget_kiofactory.so
 lib/kde4/kget_metalinkfactory.so
 lib/kde4/kget_mirrorsearchfactory.so
@@ -158,21 +153,23 @@ lib/kde4/libchattexteditpart.so
 lib/kde4/plasma_engine_kget.so
 lib/kde4/plasma_kget_barapplet.so
 lib/kde4/plasma_kget_piechart.so
+lib/kde4/plugins/accessible/chatwindowaccessiblewidgetfactory.so
+lib/kde4/sambausershareplugin.so
 lib/libkgetcore.so
 lib/libkgetcore.so.4
-lib/libkgetcore.so.4.5.0
+lib/libkgetcore.so.4.8.0
 lib/libkopete.so
 lib/libkopete.so.4
-lib/libkopete.so.4.5.0
+lib/libkopete.so.4.8.0
 lib/libkopete_oscar.so
 lib/libkopete_oscar.so.4
-lib/libkopete_oscar.so.4.5.0
+lib/libkopete_oscar.so.4.8.0
 lib/libkopete_otr_shared.so
 lib/libkopete_otr_shared.so.1
 lib/libkopete_otr_shared.so.1.0.0
 lib/libkopete_videodevice.so
 lib/libkopete_videodevice.so.4
-lib/libkopete_videodevice.so.4.5.0
+lib/libkopete_videodevice.so.4.8.0
 lib/libkopeteaddaccountwizard.so
 lib/libkopeteaddaccountwizard.so.1
 lib/libkopeteaddaccountwizard.so.1.0.0
@@ -193,9 +190,8 @@ lib/libkopetestatusmenu.so.1
 lib/libkopetestatusmenu.so.1.0.0
 lib/libkrdccore.so
 lib/libkrdccore.so.4
-lib/libkrdccore.so.4.5.0
-lib/libkrfbprivate.so
-lib/libkrfbprivate.so.4.5.0
+lib/libkrdccore.so.4.8.0
+lib/libkrfbprivate.so.4.8.0
 lib/libkyahoo.so
 lib/libkyahoo.so.1
 lib/libkyahoo.so.1.0.0
@@ -235,10 +231,49 @@ share/doc/kde/HTML/en/kget/metalink0.png
 share/doc/kde/HTML/en/kget/metalink1.png
 share/doc/kde/HTML/en/kget/metalink2.png
 share/doc/kde/HTML/en/kget/metalink3.png
+share/doc/kde/HTML/en/kopete/Kopete_icq_account_preferences.png
+share/doc/kde/HTML/en/kopete/Kopete_icq_account_setup.png
+share/doc/kde/HTML/en/kopete/Kopete_icq_activate_new_account1.png
+share/doc/kde/HTML/en/kopete/Kopete_icq_add_contact.png
+share/doc/kde/HTML/en/kopete/Kopete_icq_added.png
+share/doc/kde/HTML/en/kopete/Kopete_icq_chat_window.png
+share/doc/kde/HTML/en/kopete/Kopete_icq_create_new_account.png
+share/doc/kde/HTML/en/kopete/Kopete_icq_first_start.png
+share/doc/kde/HTML/en/kopete/Kopete_icq_go_to_profile.png
+share/doc/kde/HTML/en/kopete/Kopete_icq_information.png
+share/doc/kde/HTML/en/kopete/Kopete_icq_log_in.png
+share/doc/kde/HTML/en/kopete/Kopete_icq_logged_in.png
+share/doc/kde/HTML/en/kopete/Kopete_icq_new_account.png
+share/doc/kde/HTML/en/kopete/Kopete_icq_search_contact.png
+share/doc/kde/HTML/en/kopete/Kopete_icq_uin.png
+share/doc/kde/HTML/en/kopete/Kopete_snap021_groupchat.png
+share/doc/kde/HTML/en/kopete/Kopeteicon.png
+share/doc/kde/HTML/en/kopete/Kopetetutoial_snap003_selectserver.png
+share/doc/kde/HTML/en/kopete/Kopetetutorial_jabbernetwork.png
+share/doc/kde/HTML/en/kopete/Kopetetutorial_snap001_emptykopete.png
+share/doc/kde/HTML/en/kopete/Kopetetutorial_snap002_configacc.png
+share/doc/kde/HTML/en/kopete/Kopetetutorial_snap004_createacc.png
+share/doc/kde/HTML/en/kopete/Kopetetutorial_snap005_enterjid.png
+share/doc/kde/HTML/en/kopete/Kopetetutorial_snap006_connection.png
+share/doc/kde/HTML/en/kopete/Kopetetutorial_snap007_conf-ready.png
+share/doc/kde/HTML/en/kopete/Kopetetutorial_snap008_goonline.png
+share/doc/kde/HTML/en/kopete/Kopetetutorial_snap009_addfriend.png
+share/doc/kde/HTML/en/kopete/Kopetetutorial_snap010_exlamationmarkfriend.png
+share/doc/kde/HTML/en/kopete/Kopetetutorial_snap011_addedbyfriend.png
+share/doc/kde/HTML/en/kopete/Kopetetutorial_snap012_fullauthorized.png
+share/doc/kde/HTML/en/kopete/Kopetetutorial_snap013_firstchat.png
+share/doc/kde/HTML/en/kopete/Kopetetutorial_snap014_setidentity.png
+share/doc/kde/HTML/en/kopete/Kopetetutorial_snap015_otrgenerate.png
+share/doc/kde/HTML/en/kopete/Kopetetutorial_snap016_otrfirstuse.png
+share/doc/kde/HTML/en/kopete/Kopetetutorial_snap017_seqretquestion.png
+share/doc/kde/HTML/en/kopete/Kopetetutorial_snap018_otrsuccess.png
+share/doc/kde/HTML/en/kopete/Kopetetutorial_snap019_otrauth.png
 share/doc/kde/HTML/en/kopete/chatstyle.docbook
 share/doc/kde/HTML/en/kopete/common
+share/doc/kde/HTML/en/kopete/icq.docbook
 share/doc/kde/HTML/en/kopete/index.cache.bz2
 share/doc/kde/HTML/en/kopete/index.docbook
+share/doc/kde/HTML/en/kopete/jabber.docbook
 share/doc/kde/HTML/en/kopete/menus.docbook
 share/doc/kde/HTML/en/kopete/otr-auth-1.png
 share/doc/kde/HTML/en/kopete/pipes.docbook
@@ -297,7 +332,6 @@ share/icons/hicolor/128x128/apps/kget.png
 share/icons/hicolor/128x128/apps/kopete-offline.png
 share/icons/hicolor/128x128/apps/kopete.png
 share/icons/hicolor/128x128/apps/kppp.png
-share/icons/hicolor/16x16/apps/kcmsambaconf.png
 share/icons/hicolor/16x16/apps/kget.png
 share/icons/hicolor/16x16/apps/kopete-offline.png
 share/icons/hicolor/16x16/apps/kopete.png
@@ -376,7 +410,11 @@ share/icons/oxygen/scalable/actions/webcamsend.svgz
 share/icons/oxygen/scalable/status/object-locked-finished.svgz
 share/icons/oxygen/scalable/status/object-locked-unverified.svgz
 share/icons/oxygen/scalable/status/object-locked-verified.svgz
+share/kde/apps/dolphinpart/kpartplugins/kget_plug_in.desktop
 share/kde/apps/dolphinpart/kpartplugins/kget_plug_in.rc
+share/kde/apps/kconf_update/kget.upd
+share/kde/apps/kconf_update/kget_limitdownloads.pl
+share/kde/apps/kconf_update/kget_sensitive.pl
 share/kde/apps/kconf_update/kopete-account-0.10.pl
 share/kde/apps/kconf_update/kopete-account-kconf_update.sh
 share/kde/apps/kconf_update/kopete-account-kconf_update.upd
@@ -397,10 +435,6 @@ share/kde/apps/kconf_update/kopete-update_icq_server.pl
 share/kde/apps/kconf_update/kopete-update_icq_server.upd
 share/kde/apps/kconf_update/kopete-update_yahoo_server.pl
 share/kde/apps/kconf_update/kopete-update_yahoo_server.upd
-share/kde/apps/kget/content_fetch_scripts/youtubedl/kget_youtubedl.py
-share/kde/apps/kget/content_fetch_scripts/youtubedl/kget_youtubedl_option.py
-share/kde/apps/kget/content_fetch_scripts/youtubedl/ui_youtube_option.py
-share/kde/apps/kget/content_fetch_scripts/youtubedl/youtube_option.ui
 share/kde/apps/kget/kget.notifyrc
 share/kde/apps/kget/kgetui.rc
 share/kde/apps/kget/pics/kget_splash.png
@@ -418,6 +452,7 @@ share/kde/apps/kget/www/preferences-system.png
 share/kde/apps/kget/www/title-border-bottom-downloads.png
 share/kde/apps/kget/www/title-border-bottom-settings.png
 share/kde/apps/kget/www/view-refresh.png
+share/kde/apps/khtml/kpartplugins/kget_plug_in.desktop
 share/kde/apps/khtml/kpartplugins/kget_plug_in.rc
 share/kde/apps/kopete/CompactContactListLayouts.xml
 share/kde/apps/kopete/DefaultContactListLayouts.xml
@@ -1355,11 +1390,12 @@ share/kde/apps/krdc/krdcui.rc
 share/kde/apps/krdc/pics/pointcursor.png
 share/kde/apps/krdc/pics/pointcursormask.png
 share/kde/apps/krfb/krfb.notifyrc
+share/kde/apps/kwebkitpart/kpartplugins/kget_plug_in.desktop
+share/kde/apps/kwebkitpart/kpartplugins/kget_plug_in.rc
 share/kde/apps/remoteview/zeroconf.desktop
 share/kde/config.kcfg/historyconfig.kcfg
 share/kde/config.kcfg/kget.kcfg
 share/kde/config.kcfg/kget_checksumsearchfactory.kcfg
-share/kde/config.kcfg/kget_contentfetchfactory.kcfg
 share/kde/config.kcfg/kget_mirrorsearchfactory.kcfg
 share/kde/config.kcfg/kget_multisegkiofactory.kcfg
 share/kde/config.kcfg/kopete_otr.kcfg
@@ -1369,6 +1405,7 @@ share/kde/config.kcfg/kopetestatussettings.kcfg
 share/kde/config.kcfg/krdc.kcfg
 share/kde/config.kcfg/latexconfig.kcfg
 share/kde/config.kcfg/nowlisteningconfig.kcfg
+share/kde/config.kcfg/translatorconfig.kcfg
 share/kde/config.kcfg/urlpicpreview.kcfg
 share/kde/config.kcfg/webpresenceconfig.kcfg
 share/kde/config/kopeterc
@@ -1378,9 +1415,6 @@ share/kde4/services/aim.protocol
 share/kde4/services/callto.protocol
 share/kde4/services/chatwindow.desktop
 share/kde4/services/emailwindow.desktop
-share/kde4/services/fileshare.desktop
-share/kde4/services/fileshare_propsdlgplugin.desktop
-share/kde4/services/kcmsambaconf.desktop
 share/kde4/services/kconfiguredialog/kopete_addbookmarks_config.desktop
 share/kde4/services/kconfiguredialog/kopete_autoreplace_config.desktop
 share/kde4/services/kconfiguredialog/kopete_highlight_config.desktop
@@ -1397,8 +1431,6 @@ share/kde4/services/kconfiguredialog/kopete_webpresence_config.desktop
 share/kde4/services/kded/dnssdwatcher.desktop
 share/kde4/services/kget_checksumsearchfactory.desktop
 share/kde4/services/kget_checksumsearchfactory_config.desktop
-share/kde4/services/kget_contentfetchfactory.desktop
-share/kde4/services/kget_contentfetchfactory_config.desktop
 share/kde4/services/kget_kiofactory.desktop
 share/kde4/services/kget_metalinkfactory.desktop
 share/kde4/services/kget_metalinkfactory_config.desktop
@@ -1453,6 +1485,7 @@ share/kde4/services/krfb_framebuffer_x11.desktop
 share/kde4/services/plasma-engine-kget.desktop
 share/kde4/services/plasma-runner-kget.desktop
 share/kde4/services/rdp.protocol
+share/kde4/services/sambausershareplugin.desktop
 share/kde4/services/skype.protocol
 share/kde4/services/tel.protocol
 share/kde4/services/vnc.protocol
@@ -1464,6 +1497,7 @@ share/kde4/servicetypes/kopeteprotocol.desktop
 share/kde4/servicetypes/kopeteui.desktop
 share/kde4/servicetypes/krdc_plugin.desktop
 share/kde4/servicetypes/krfb-framebuffer.desktop
+share/sounds/KDE-Im-Phone-Ring.wav
 share/sounds/Kopete_Event.ogg
 share/sounds/Kopete_Received.ogg
 share/sounds/Kopete_Sent.ogg
diff --git a/net/kdenetwork4/distinfo b/net/kdenetwork4/distinfo
index f13bdfe12c3..7e6723e6818 100644
--- a/net/kdenetwork4/distinfo
+++ b/net/kdenetwork4/distinfo
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.17 2011/05/07 22:25:08 markd Exp $
+$NetBSD: distinfo,v 1.18 2012/03/19 20:12:49 markd Exp $
 
-SHA1 (kdenetwork-4.5.5.tar.bz2) = 2c7dd0bc1809ac477f46ddb966f232ca3f60bc0a
-RMD160 (kdenetwork-4.5.5.tar.bz2) = 769829e255830bf360d9796c0ea9dcb12faeac0b
-Size (kdenetwork-4.5.5.tar.bz2) = 8148708 bytes
+SHA1 (kdenetwork-4.8.0.tar.bz2) = 51ea55dbcbece59535af61f7450e8ac2aa1db28b
+RMD160 (kdenetwork-4.8.0.tar.bz2) = 48eb3b1666daa8ff696d1c4a91d1c34f30bcb9bb
+Size (kdenetwork-4.8.0.tar.bz2) = 9981102 bytes
 SHA1 (patch-aa) = 0359cd86501c57197242c398d63c1fc77c60a4d0
 SHA1 (patch-ab) = 0743b3b6c994623c507b8bcd52ee01dad31cf56f
 SHA1 (patch-ae) = 765d48550d2d8b7a59a1593a669b0909fef3bd96
-SHA1 (patch-af) = 5afe11d2691c0f3e9510d2cd1df5b4f736abafbe
-SHA1 (patch-kget_ui_metalinkcreator_metalinker.cpp) = 1c3aaf24097c25120ff95b329e0995bc91843214
+SHA1 (patch-af) = ebd1bc3ae40b5cd551a1283e28fb0f4a80764cfb
+SHA1 (patch-kget_CMakeLists.txt) = 91029f47cf50dbdd31b3ba63bf8e4e35c303f6cb
+SHA1 (patch-kopete_protocols_wlm_CMakeLists.txt) = bf4929a7e872adb13b2017957801385ca9623f37
diff --git a/net/kdenetwork4/patches/patch-af b/net/kdenetwork4/patches/patch-af
index 71bf1b4b81b..fa857a51aae 100644
--- a/net/kdenetwork4/patches/patch-af
+++ b/net/kdenetwork4/patches/patch-af
@@ -1,11 +1,11 @@
-$NetBSD: patch-af,v 1.2 2011/01/10 11:30:23 markd Exp $
+$NetBSD: patch-af,v 1.3 2012/03/19 20:12:49 markd Exp $
 
---- kopete/libkopete/avdevice/videodevice.h.orig	2009-03-18 10:00:00.000000000 +0000
+--- kopete/libkopete/avdevice/videodevice.h.orig	2011-04-01 10:59:27.000000000 +0000
 +++ kopete/libkopete/avdevice/videodevice.h
-@@ -61,6 +61,13 @@
+@@ -75,6 +75,13 @@
  #endif // HAVE_V4L2
  
- #endif // __linux__
+ #endif // __linux__ __FreeBSD__ ENABLE_AV
 +#if (defined(__NetBSD__) || defined(__DragonFly__)) && defined(ENABLE_AV)
 +
 +#ifdef HAVE_LIBV4L2
diff --git a/net/kdenetwork4/patches/patch-kget_CMakeLists.txt b/net/kdenetwork4/patches/patch-kget_CMakeLists.txt
new file mode 100644
index 00000000000..e1e9bdbcb64
--- /dev/null
+++ b/net/kdenetwork4/patches/patch-kget_CMakeLists.txt
@@ -0,0 +1,12 @@
+$NetBSD: patch-kget_CMakeLists.txt,v 1.1 2012/03/19 20:12:49 markd Exp $
+
+--- kget/CMakeLists.txt.orig	2011-09-26 11:25:46.000000000 +0000
++++ kget/CMakeLists.txt
+@@ -1,5 +1,7 @@
+ project(kget)
+ 
++add_definitions(${KDE4_ENABLE_EXCEPTIONS})
++
+ set(kget_adaptor_SRCS
+     dbus/dbuskgetwrapper.cpp
+ )
diff --git a/net/kdenetwork4/patches/patch-kget_ui_metalinkcreator_metalinker.cpp b/net/kdenetwork4/patches/patch-kget_ui_metalinkcreator_metalinker.cpp
deleted file mode 100644
index 621a5d277d8..00000000000
--- a/net/kdenetwork4/patches/patch-kget_ui_metalinkcreator_metalinker.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-kget_ui_metalinkcreator_metalinker.cpp,v 1.1 2011/05/07 22:25:09 markd Exp $
-
-http://secunia.com/advisories/44124/
-
---- kget/ui/metalinkcreator/metalinker.cpp	2011/04/09 09:24:33	1227468
-+++ kget/ui/metalinkcreator/metalinker.cpp	2011/04/09 09:25:23	1227469
-@@ -583,7 +583,13 @@
-         return false;
-     }
- 
--    if (name.contains(QRegExp("$(\\.\\.?)?/")) || name.contains("/../") || name.endsWith("/..")) {
-+    if (name.endsWith('/')) {
-+        kError(5001) << "Name attribute of Metalink::File does not contain a file name:" << name;
-+        return false;
-+    }
-+
-+    const QStringList components = name.split('/');
-+    if (name.startsWith('/') || components.contains("..") || components.contains(".")) {
-         kError(5001) << "Name attribute of Metalink::File contains directory traversal directives:" << name;
-         return false;
-     }
diff --git a/net/kdenetwork4/patches/patch-kopete_protocols_wlm_CMakeLists.txt b/net/kdenetwork4/patches/patch-kopete_protocols_wlm_CMakeLists.txt
new file mode 100644
index 00000000000..0611f400867
--- /dev/null
+++ b/net/kdenetwork4/patches/patch-kopete_protocols_wlm_CMakeLists.txt
@@ -0,0 +1,12 @@
+$NetBSD: patch-kopete_protocols_wlm_CMakeLists.txt,v 1.1 2012/03/19 20:12:49 markd Exp $
+
+--- kopete/protocols/wlm/CMakeLists.txt.orig	2011-07-27 18:25:39.000000000 +0000
++++ kopete/protocols/wlm/CMakeLists.txt
+@@ -1,5 +1,7 @@
+ project(wlm)
+ 
++add_definitions(${KDE4_ENABLE_EXCEPTIONS})
++
+ # the wlm protocol uses KMime from kdepimlibs, which in turn requires Boost to work
+ find_package(Boost REQUIRED)
+ include_directories(