From d4dbb3a15b97f89304d1b3d5dc9b10421714f895 Mon Sep 17 00:00:00 2001
From: Phil <philm[at]chakra-project[dot]org>
Date: Mon, 4 Apr 2011 08:08:19 +0000
Subject: [PATCH] kdebase: make konqueror working

---
 kdebase/PKGBUILD | 93 ++++++++++++++++++++++++++----------------------
 1 file changed, 51 insertions(+), 42 deletions(-)

diff --git a/kdebase/PKGBUILD b/kdebase/PKGBUILD
index 91701ab13..8b4723cee 100644
--- a/kdebase/PKGBUILD
+++ b/kdebase/PKGBUILD
@@ -27,7 +27,7 @@ pkgname=('kdebase'
 
 arch=('i686' 'x86_64')
 pkgver=${_kdever}
-pkgrel=3
+pkgrel=4
 
 pkgdesc="split package"
 url="http://www.kde.org"
@@ -112,41 +112,34 @@ package_kdebase()
 
 	# prepare konqueror
 	msg "splitting konqueror ..."
-	mkdir -p ${srcdir}/${_origname}-${pkgver}/konqueror-split/usr/{include,lib/kde4,share/config,share/config.kcfg,share/autostart,share/applications/kde4,share/apps/kwebkitpart/kpartplugins,share/apps/konqsidebartng,share/apps/konqueror,share/apps/khtml,share/icons/hicolor/32x32/apps,share/icons/hicolor/scalable/apps,share/icons/hicolor/128x128/apps,share/icons/hicolor/22x22/apps,share/icons/hicolor/64x64/apps,share/icons/hicolor/48x48/apps,share/icons/hicolor/16x16/apps,share/dbus-1/interfaces,bin}
-	mv -v ${pkgdir}/usr/include/konqsidebarplugin.h ${srcdir}/${_origname}-${pkgver}/konqueror-split/usr/include
-	mv -v ${pkgdir}/usr/lib/libkonqsidebarplugin.so* ${srcdir}/${_origname}-${pkgver}/konqueror-split/usr/lib
-	mv -v ${pkgdir}/usr/lib/libkdeinit4_konqueror.so ${srcdir}/${_origname}-${pkgver}/konqueror-split/usr/lib
-	mv -v ${pkgdir}/usr/lib/libkonquerorprivate.so* ${srcdir}/${_origname}-${pkgver}/konqueror-split/usr/lib
-	mv -v ${pkgdir}/usr/lib/kde4/konq_aboutpage.so ${srcdir}/${_origname}-${pkgver}/konqueror-split/usr/lib/kde4
-	mv -v ${pkgdir}/usr/lib/kde4/konqsidebar_web.so ${srcdir}/${_origname}-${pkgver}/konqueror-split/usr/lib/kde4
-	mv -v ${pkgdir}/usr/lib/kde4/konq_sidebartree_bookmarks.so ${srcdir}/${_origname}-${pkgver}/konqueror-split/usr/lib/kde4
-	mv -v ${pkgdir}/usr/lib/kde4/konq_sidebartree_dirtree.so ${srcdir}/${_origname}-${pkgver}/konqueror-split/usr/lib/kde4
-	mv -v ${pkgdir}/usr/lib/kde4/konq_sidebar.so ${srcdir}/${_origname}-${pkgver}/konqueror-split/usr/lib/kde4
-	mv -v ${pkgdir}/usr/lib/kde4/khtmlkttsdplugin.so ${srcdir}/${_origname}-${pkgver}/konqueror-split/usr/lib/kde4
-	mv -v ${pkgdir}/usr/lib/kde4/konqsidebar_history.so ${srcdir}/${_origname}-${pkgver}/konqueror-split/usr/lib/kde4
-	mv -v ${pkgdir}/usr/lib/kde4/kded_konqy_preloader.so ${srcdir}/${_origname}-${pkgver}/konqueror-split/usr/lib/kde4
-	mv -v ${pkgdir}/usr/lib/kde4/konq_shellcmdplugin.so ${srcdir}/${_origname}-${pkgver}/konqueror-split/usr/lib/kde4
-	mv -v ${pkgdir}/usr/lib/kde4/konqsidebar_places.so ${srcdir}/${_origname}-${pkgver}/konqueror-split/usr/lib/kde4
-	mv -v ${pkgdir}/usr/lib/kde4/konqsidebar_tree.so ${srcdir}/${_origname}-${pkgver}/konqueror-split/usr/lib/kde4
-	mv -v ${pkgdir}/usr/share/config/konqsidebartngrc ${srcdir}/${_origname}-${pkgver}/konqueror-split/usr/share/config
-	mv -v ${pkgdir}/usr/share/config.kcfg/konqueror.kcfg ${srcdir}/${_origname}-${pkgver}/konqueror-split/usr/share/config.kcfg
-	mv -v ${pkgdir}/usr/share/autostart/konqy_preload.desktop ${srcdir}/${_origname}-${pkgver}/konqueror-split/usr/share/autostart
-	mv -v ${pkgdir}/usr/share/applications/kde4/konquerorsu.desktop ${srcdir}/${_origname}-${pkgver}/konqueror-split/usr/share/applications/kde4
-	mv -v ${pkgdir}/usr/share/applications/kde4/konqbrowser.desktop ${srcdir}/${_origname}-${pkgver}/konqueror-split/usr/share/applications/kde4
-	mv -v ${pkgdir}/usr/share/apps/kwebkitpart/kpartplugins/khtmlkttsd.desktop ${srcdir}/${_origname}-${pkgver}/konqueror-split/usr/share/apps/kwebkitpart/kpartplugins
-	mv -v ${pkgdir}/usr/share/apps/kwebkitpart/kpartplugins/khtmlkttsd.rc ${srcdir}/${_origname}-${pkgver}/konqueror-split/usr/share/apps/kwebkitpart/kpartplugins
-	mv -v ${pkgdir}/usr/share/apps/konqsidebartng  ${srcdir}/${_origname}-${pkgver}/konqueror-split/usr/share/apps/konqsidebartng
-	mv -v ${pkgdir}/usr/share/apps/konqueror ${srcdir}/${_origname}-${pkgver}/konqueror-split/usr/share/apps/konqueror
-	mv -v ${pkgdir}/usr/share/apps/khtml ${srcdir}/${_origname}-${pkgver}/konqueror-split/usr/share/apps/khtml
-	mv -v ${pkgdir}/usr/share/icons/hicolor/32x32/apps/konqueror.png ${srcdir}/${_origname}-${pkgver}/konqueror-split/usr/share/icons/hicolor/32x32/apps
-	mv -v ${pkgdir}/usr/share/icons/hicolor/scalable/apps/konqueror.svgz ${srcdir}/${_origname}-${pkgver}/konqueror-split/usr/share/icons/hicolor/scalable/apps
-	mv -v ${pkgdir}/usr/share/icons/hicolor/128x128/apps/konqueror.png ${srcdir}/${_origname}-${pkgver}/konqueror-split/usr/share/icons/hicolor/128x128/apps
-	mv -v ${pkgdir}/usr/share/icons/hicolor/22x22/apps/konqueror.png ${srcdir}/${_origname}-${pkgver}/konqueror-split/usr/share/icons/hicolor/22x22/apps
-	mv -v ${pkgdir}/usr/share/icons/hicolor/64x64/apps/konqueror.png ${srcdir}/${_origname}-${pkgver}/konqueror-split/usr/share/icons/hicolor/64x64/apps
-	mv -v ${pkgdir}/usr/share/icons/hicolor/48x48/apps/konqueror.png ${srcdir}/${_origname}-${pkgver}/konqueror-split/usr/share/icons/hicolor/48x48/apps
-	mv -v ${pkgdir}/usr/share/icons/hicolor/16x16/apps/konqueror.png ${srcdir}/${_origname}-${pkgver}/konqueror-split/usr/share/icons/hicolor/16x16/apps
-	mv -v ${pkgdir}/usr/share/dbus-1/interfaces/org.kde.konqueror* ${srcdir}/${_origname}-${pkgver}/konqueror-split/usr/share/dbus-1/interfaces
-	mv -v ${pkgdir}/usr/bin/konqueror ${srcdir}/${_origname}-${pkgver}/konqueror-split/usr/bin
+	rm -vR ${pkgdir}/usr/include/konqsidebarplugin.h 
+	rm -vR ${pkgdir}/usr/lib/libkonqsidebarplugin.so*
+	rm -vR ${pkgdir}/usr/lib/libkdeinit4_konqueror.so
+	rm -vR ${pkgdir}/usr/lib/libkonquerorprivate.so*
+	rm -vR ${pkgdir}/usr/lib/kde4/konq_aboutpage.so
+	rm -vR ${pkgdir}/usr/lib/kde4/konqsidebar_web.so
+	rm -vR ${pkgdir}/usr/lib/kde4/konq_sidebartree_bookmarks.so
+	rm -vR ${pkgdir}/usr/lib/kde4/konq_sidebartree_dirtree.so
+	rm -vR ${pkgdir}/usr/lib/kde4/konq_sidebar.so
+	rm -vR ${pkgdir}/usr/lib/kde4/khtmlkttsdplugin.so
+	rm -vR ${pkgdir}/usr/lib/kde4/konqsidebar_history.so
+	rm -vR ${pkgdir}/usr/lib/kde4/kded_konqy_preloader.so
+	rm -vR ${pkgdir}/usr/lib/kde4/konq_shellcmdplugin.so
+	rm -vR ${pkgdir}/usr/lib/kde4/konqsidebar_places.so
+	rm -vR ${pkgdir}/usr/lib/kde4/konqsidebar_tree.so
+	rm -vR ${pkgdir}/usr/share/config/konqsidebartngrc
+	rm -vR ${pkgdir}/usr/share/config.kcfg/konqueror.kcfg
+	rm -vR ${pkgdir}/usr/share/autostart/konqy_preload.desktop
+	rm -vR ${pkgdir}/usr/share/applications/kde4/konquerorsu.desktop
+	rm -vR ${pkgdir}/usr/share/applications/kde4/konqbrowser.desktop
+	rm -vR ${pkgdir}/usr/share/apps/kwebkitpart
+	rm -vR ${pkgdir}/usr/share/apps/konqsidebartng
+	rm -vR ${pkgdir}/usr/share/apps/konqueror
+	rm -vR ${pkgdir}/usr/share/apps/khtml
+	rm -vR ${pkgdir}/usr/share/icons/
+	rm -vR ${pkgdir}/usr/share/dbus-1/interfaces/org.kde.Konq*
+	rm -vR ${pkgdir}/usr/share/dbus-1/interfaces/org.kde.konq*
+	rm -vR ${pkgdir}/usr/bin/konqueror
 		
 	# install cdemu frontend
 	cd ${srcdir}/kde_cdemu-0.3
@@ -210,13 +203,29 @@ package_kdebase-konqueror()
 	conflicts=("kdemod-${_origname}-konqueror")
 	install=${_origname}-konqueror.install
 
-#	splitdirs="konqueror"
-#		for i in ${splitdirs} ; do
-#			cd ${srcdir}/${_origname}-${pkgver}/${i}
-#			make DESTDIR=${pkgdir} install || return 1
-#		done
+	splitdirs="konqueror"
+		for i in ${splitdirs} ; do
+			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			make DESTDIR=${pkgdir} install || return 1
+		done
 
-	cp -vR ${srcdir}/${_origname}-${pkgver}/konqueror-split/* ${pkgdir}
+	msg "remove conflicting files ..."
+	rm -vR ${pkgdir}/usr/bin/kfmclient
+	rm -vR ${pkgdir}/usr/lib/kde4/kcm_history.so
+	rm -vR ${pkgdir}/usr/lib/kde4/kcm_kio.so
+	rm -vR ${pkgdir}/usr/lib/kde4/kcm_konq.so
+	rm -vR ${pkgdir}/usr/lib/kde4/kcm_konqhtml.so
+	rm -vR ${pkgdir}/usr/lib/kde4/kcm_kurifilt.so
+	rm -vR ${pkgdir}/usr/lib/kde4/kcm_performance.so
+	rm -vR ${pkgdir}/usr/lib/libkdeinit4_kfmclient.so
+	rm -vR ${pkgdir}/usr/share/applications/kde4/Home.desktop
+	rm -vR ${pkgdir}/usr/share/applications/kde4/kfmclient*
+	rm -vR ${pkgdir}/usr/share/apps/dolphinpart/kpartplugins/kshellcmdplugin*
+	rm -vR ${pkgdir}/usr/share/apps/kcmcss/template.css
+	rm -vR ${pkgdir}/usr/share/apps/kconf_update/kfmclient*
+	rm -vR ${pkgdir}/usr/share/apps/kcontrol/pics/onlyone.png
+	rm -vR ${pkgdir}/usr/share/apps/kcontrol/pics/overlapping.png
+	rm -vR ${pkgdir}/usr/share/kde4/service*
 }
 
 package_kdebase-konsole()