20 files changed, 95 insertions, 352 deletions

diff --git a/deskutils/krss/Makefile b/deskutils/krss/Makefile
index a14b799d052c..790eb54612d7 100644
--- a/deskutils/krss/Makefile
+++ b/deskutils/krss/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	krss
-PORTVERSION=	2.6
-PORTREVISION=	12
+PORTVERSION=	3.0
 CATEGORIES=	deskutils kde
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
@@ -18,12 +17,13 @@ COMMENT=	KDE Rich Site Summary viewer
 USE_KDEBASE_VER=3
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	LIBQT="-lqt-mt ${PTHREAD_LIBS}" KDB2HTML=${TRUE}
-MAKE_ENV=	LIBQT="-lqt-mt ${PTHREAD_LIBS}" KDB2HTML=${TRUE}
+MAKE_JOBS_SAFE=	yes
 
 QTCPPFLAGS+=	${PTHREAD_CFLAGS}
 QTCFGLIBS+=	${PTHREAD_LIBS}
 
+INSTALLS_ICONS=	yes
+
 post-patch:
 	${REINPLACE_CMD} -e 's|$$(LIB_KFILE)|-lkio|' ${WRKSRC}/krss/Makefile.in
 	${REINPLACE_CMD} -e 's|-pedantic||;s|-Wmissing-prototypes||' \
diff --git a/deskutils/krss/distinfo b/deskutils/krss/distinfo
index bb5b965b301a..0ea9aeeb8e2e 100644
--- a/deskutils/krss/distinfo
+++ b/deskutils/krss/distinfo
@@ -1,2 +1,2 @@
-SHA256 (krss-2.6.tar.gz) = e340f770051f7ca71223eaa7664bafa5536f6d8a76d3cf4c67305be2f2f72c28
-SIZE (krss-2.6.tar.gz) = 632777
+SHA256 (krss-3.0.tar.gz) = 2a288c507bbb5daf482573970f16a5bfad5457f04b1efa1584658f2ac395fccb
+SIZE (krss-3.0.tar.gz) = 748813
diff --git a/deskutils/krss/files/patch-admin-ltconfig b/deskutils/krss/files/patch-admin-ltconfig
new file mode 100644
index 000000000000..153e0bd9976b
--- /dev/null
+++ b/deskutils/krss/files/patch-admin-ltconfig
@@ -0,0 +1,9 @@
+--- admin/ltconfig	2003-02-20 14:26:48.000000000 -0500
++++ admin/ltconfig	2011-05-02 13:56:16.000000000 -0400
+@@ -635,5 +635,5 @@
+   # FIXME:  We should use a variable here
+   # Configure for a C compiler
+-  . $srcdir/ltcf-c.sh
++  . admin/ltcf-c.sh
+ fi
+ 
diff --git a/deskutils/krss/files/patch-configure b/deskutils/krss/files/patch-configure
deleted file mode 100644
index 68ee67adee02..000000000000
--- a/deskutils/krss/files/patch-configure
+++ /dev/null
@@ -1,54 +0,0 @@
---- configure.orig	Wed Feb 20 16:31:19 2002
-+++ configure	Mon Feb 27 08:06:44 2006
-@@ -3037,13 +3037,2 @@
- 
--# Actually configure libtool.  ac_aux_dir is where install-sh is found.
--AR="$AR" LTCC="$CC" CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
--MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
--LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
--AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
--objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
--deplibs_check_method="$deplibs_check_method" file_magic_cmd="$file_magic_cmd" \
--${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
--$libtool_flags --no-verify --build="$build" $ac_aux_dir/ltmain.sh $host \
--|| { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
--
- # Reload cache, that may have been modified by ltconfig
-@@ -3059,3 +3048,3 @@
- # This can be used to rebuild libtool when needed
--LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh $ac_aux_dir/ltcf-c.sh"
-+LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
- 
-@@ -3067,32 +3056,2 @@
- exec 5>>./config.log
--
--
--
--LIBTOOL_DEPS=$LIBTOOL_DEPS" $ac_aux_dir/ltcf-cxx.sh"
--lt_save_CC="$CC"
--lt_save_CFLAGS="$CFLAGS"
--AR="$AR" LTCC="$CC" CC="$CXX" CXX="$CXX" CFLAGS="$CXXFLAGS" CPPFLAGS="$CPPFLAGS" \
--MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
--LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
--AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
--objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
--deplibs_check_method="$deplibs_check_method" \
--file_magic_cmd="$file_magic_cmd" \
--${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig -o libtool $libtool_flags \
----build="$build" --add-tag=CXX $ac_aux_dir/ltcf-cxx.sh $host \
--|| { echo "configure: error: libtool tag configuration failed" 1>&2; exit 1; }
--CC="$lt_save_CC"
--CFLAGS="$lt_save_CFLAGS"
--
--# Redirect the config.log output again, so that the ltconfig log is not
--# clobbered by the next message.
--exec 5>>./config.log
--
--
--
--
--
--
--
--
- 
diff --git a/deskutils/krss/files/patch-krss-amphetadeskinport.cpp b/deskutils/krss/files/patch-krss-amphetadeskinport.cpp
deleted file mode 100644
index 1a26e87c74df..000000000000
--- a/deskutils/krss/files/patch-krss-amphetadeskinport.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- krss/amphetadeskinport.cpp.orig	Wed Feb 20 15:46:11 2002
-+++ krss/amphetadeskinport.cpp	Wed May 21 10:21:02 2003
-@@ -38,6 +38,8 @@
- 
- #include "sitehandler.h"
- 
-+using namespace std;
-+
- 
- AmphetaDeskInport::AmphetaDeskInport(KApplication *app, SiteHandler *sitehandler, QWidget *parent, const char *name )
- : KDialogBase(parent,name,true,i18n("Import Sites from AmphetaDesk"),Details|User1|Close,Close,true,i18n("Import")), QXmlDefaultHandler()
diff --git a/deskutils/krss/files/patch-krss-configuredialog.cpp b/deskutils/krss/files/patch-krss-configuredialog.cpp
deleted file mode 100644
index deffc5391671..000000000000
--- a/deskutils/krss/files/patch-krss-configuredialog.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
---- krss/configuredialog.cpp~	Thu Dec 13 16:28:44 2001
-+++ krss/configuredialog.cpp	Tue Sep 10 23:06:11 2002
-@@ -29,6 +29,7 @@
- #include <qlabel.h>
- #include <qtoolbutton.h>
- #include <qradiobutton.h>
-+#include <qpushbutton.h>
- 
- #include <ktip.h>
- #include <klineeditdlg.h>
-@@ -102,9 +103,9 @@
- 	/** Calculate the size of the caches **/
- 	KURL url;
- 	url.setPath(QDir::homeDirPath() + QString("/.krss/feeds/unparsed/"));
--	ccv_bend->mFeedSize->setText(i18n("Size: ") + QString::number(KDirSize::dirSize(url)/1024, KGlobal::locale()->fracDigits()) + QString("KB"));
-+	ccv_bend->mFeedSize->setText(i18n("Size: ") + QString::number((long)KDirSize::dirSize(url)/1024, KGlobal::locale()->fracDigits()) + QString("KB"));
- 	url.setPath(QDir::homeDirPath() + QString("/.krss/cache/"));
--	ccv_bend->mImageSize->setText(i18n("Size: ") + QString::number(KDirSize::dirSize(url)/1024, KGlobal::locale()->fracDigits()) + QString("KB"));
-+	ccv_bend->mImageSize->setText(i18n("Size: ") + QString::number((long)KDirSize::dirSize(url)/1024, KGlobal::locale()->fracDigits()) + QString("KB"));
- 	
- 	QFrame *page5 = addPage(i18n("MyChannelBar"), i18n("MyChannelBar"), QPixmap(KGlobal::iconLoader()->iconPath("view_icon", KIcon::Desktop)));
- 	QHBoxLayout *lay5 = new QHBoxLayout(page5);
-@@ -254,9 +255,9 @@
- 	
- 	KURL url;
- 	url.setPath(QDir::homeDirPath() + QString("/.krss/feeds/unparsed/"));
--	ccv_bend->mFeedSize->setText(i18n("Size: ") + QString::number(KDirSize::dirSize(url)/1024) + QString("KB"));
-+	ccv_bend->mFeedSize->setText(i18n("Size: ") + QString::number((long)KDirSize::dirSize(url)/1024) + QString("KB"));
- 	url.setPath(QDir::homeDirPath() + QString("/.krss/cache/"));
--	ccv_bend->mImageSize->setText(i18n("Size: ") + QString::number(KDirSize::dirSize(url)/1024) + QString("KB"));
-+	ccv_bend->mImageSize->setText(i18n("Size: ") + QString::number((long)KDirSize::dirSize(url)/1024) + QString("KB"));
- }
- 
- void ConfigureDialog::clearFeedCache(void)
-@@ -283,9 +284,9 @@
- 	
- 	KURL url;
- 	url.setPath(QDir::homeDirPath() + QString("/.krss/feeds/unparsed/"));
--	ccv_bend->mFeedSize->setText(i18n("Size: ") + QString::number(KDirSize::dirSize(url)/1024) + QString("KB"));
-+	ccv_bend->mFeedSize->setText(i18n("Size: ") + QString::number((long)KDirSize::dirSize(url)/1024) + QString("KB"));
- 	url.setPath(QDir::homeDirPath() + QString("/.krss/cache/"));
--	ccv_bend->mImageSize->setText(i18n("Size: ") + QString::number(KDirSize::dirSize(url)/1024) + QString("KB"));
-+	ccv_bend->mImageSize->setText(i18n("Size: ") + QString::number((long)KDirSize::dirSize(url)/1024) + QString("KB"));
- }
- 
- void ConfigureDialog::clearImageCache(void)
diff --git a/deskutils/krss/files/patch-krss-editfeeddialog.cpp b/deskutils/krss/files/patch-krss-editfeeddialog.cpp
deleted file mode 100644
index 040b314ed5e3..000000000000
--- a/deskutils/krss/files/patch-krss-editfeeddialog.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- krss/editfeeddialog.cpp~	Tue Feb 19 21:17:22 2002
-+++ krss/editfeeddialog.cpp	Tue Sep 10 23:08:15 2002
-@@ -22,6 +22,7 @@
- #include <qcheckbox.h>
- #include <qspinbox.h>
- #include <qgroupbox.h>
-+#include <qpushbutton.h>
- 
- #include <kglobal.h>
- #include <kiconloader.h>
diff --git a/deskutils/krss/files/patch-krss-filterdialog.cpp b/deskutils/krss/files/patch-krss-filterdialog.cpp
deleted file mode 100644
index 52be83d10232..000000000000
--- a/deskutils/krss/files/patch-krss-filterdialog.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
---- krss/filterdialog.cpp.orig	Wed Oct 17 04:05:58 2001
-+++ krss/filterdialog.cpp	Wed May 21 10:24:47 2003
-@@ -18,6 +18,7 @@
- #include "filterdialog.h"
- 
- #include <qradiobutton.h>
-+#include <qpushbutton.h>
- 
- #include <klocale.h>
- #include <klistview.h>
-@@ -27,6 +28,8 @@
- #include "filterviewbackend.h"
- 
- #include "filterruledialog.h"
-+
-+using namespace std;
- 
- 
- FilterDialog::FilterDialog(QWidget *parent, const char *name )
diff --git a/deskutils/krss/files/patch-krss-filterhandler.cpp b/deskutils/krss/files/patch-krss-filterhandler.cpp
deleted file mode 100644
index c39cab960e6d..000000000000
--- a/deskutils/krss/files/patch-krss-filterhandler.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- krss/filterhandler.cpp.orig	Thu Oct 18 00:06:25 2001
-+++ krss/filterhandler.cpp	Wed May 21 10:23:16 2003
-@@ -29,6 +29,8 @@
- 
- #include <iostream>
- 
-+using namespace std;
-+
- FilterHandler::FilterHandler(FilterRule::Action defaultAction)
- {
- 	mFilters.setAutoDelete(true);
diff --git a/deskutils/krss/files/patch-krss-krss.cpp b/deskutils/krss/files/patch-krss-krss.cpp
deleted file mode 100644
index 3eec48fff956..000000000000
--- a/deskutils/krss/files/patch-krss-krss.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
---- krss/krss.cpp.orig	Thu Feb 21 02:00:22 2002
-+++ krss/krss.cpp	Wed May 21 10:41:25 2003
-@@ -24,6 +24,7 @@
- #include <qscrollbar.h>
- #include <qsplitter.h>
- #include <qlayout.h>
-+#include <qregexp.h>
- 
- // include files for KDE
- #include <kiconloader.h>
-@@ -46,7 +47,7 @@
- #include <kwinmodule.h>
- #include <khtml_part.h>
- #include <khtmlview.h>
--
-+#include <kstatusbar.h>
- 
- // application specific includes
- #include "krss.h"
-@@ -62,6 +63,8 @@
- 
- #define ID_STATUS_MSG 1
- 
-+using namespace std;
-+
- KrssApp::KrssApp(QWidget* , const char* name)
- : KMainWindow(0, name)
- {
-@@ -518,7 +521,7 @@
- {
- 	config->setGroup(QString("General"));
- 	QString mExec = config->readEntry(QString("Open URLs With"), QString("konqueror %url"));
--	mExec.replace(QString("%url"), url.url());
-+	mExec.replace(QRegExp("%url"), url.url());
- 		
- 	slotStatusMsg(i18n("Starting ") + mExec + QString("..."));
- 	
-@@ -967,12 +970,12 @@
- 		config->setGroup(QString("General"));
- 		QStringList uh_list = config->readListEntry(QString("URL Handlers"));
- 		QString default_handler = config->readEntry(QString("Open URLs With"), QString("konqueror %url"));
--		default_handler.replace(QString("%url"), url);
-+		default_handler.replace(QRegExp("%url"), url);
- 		menu.insertItem(default_handler);
- 		menu.insertSeparator();
- 		for(QStringList::Iterator i = uh_list.begin(); i != uh_list.end(); i++) {
- 			QString handler((*i).latin1());
--			handler.replace(QString("%url"), url);
-+			handler.replace(QRegExp("%url"), url);
- 			menu.insertItem(handler);
- 		}
- 		int ret = menu.exec(p);
diff --git a/deskutils/krss/files/patch-krss-mychannelbar.cpp b/deskutils/krss/files/patch-krss-mychannelbar.cpp
deleted file mode 100644
index 2690880ab8e7..000000000000
--- a/deskutils/krss/files/patch-krss-mychannelbar.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- krss/mychannelbar.cpp~	Wed Feb 20 08:36:15 2002
-+++ krss/mychannelbar.cpp	Tue Sep 10 22:56:56 2002
-@@ -23,6 +23,7 @@
- #include <qxml.h>
- #include <qtooltip.h>
- #include <qfileinfo.h>
-+#include <qpainter.h>
- 
- #include <kurldrag.h>
- #include <kurl.h>
diff --git a/deskutils/krss/files/patch-krss-rdftree.cpp b/deskutils/krss/files/patch-krss-rdftree.cpp
deleted file mode 100644
index 6823f6900fb8..000000000000
--- a/deskutils/krss/files/patch-krss-rdftree.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- krss/rdftree.cpp~	Mon Dec 17 11:42:06 2001
-+++ krss/rdftree.cpp	Tue Sep 10 23:07:34 2002
-@@ -20,6 +20,8 @@
- #include <qfile.h>
- #include <qtextstream.h>
- #include <qimage.h>
-+#include <qwmatrix.h>
-+
- #include <kiconloader.h>
- 
- #include "colourconverter.h"
diff --git a/deskutils/krss/files/patch-krss-rssparser.cpp b/deskutils/krss/files/patch-krss-rssparser.cpp
deleted file mode 100644
index 6cb921b7176a..000000000000
--- a/deskutils/krss/files/patch-krss-rssparser.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- krss/rssparser.cpp.orig	Wed Feb 20 14:39:36 2002
-+++ krss/rssparser.cpp	Wed May 21 10:35:29 2003
-@@ -35,6 +35,8 @@
- #include "mychannelbaritem.h"
- #include "filterhandler.h"
- 
-+using namespace std;
-+
- RSSParser::RSSParser()
- : QXmlDefaultHandler()
- {
diff --git a/deskutils/krss/files/patch-krss-schemeeditor.cpp b/deskutils/krss/files/patch-krss-schemeeditor.cpp
deleted file mode 100644
index 29344a3e8199..000000000000
--- a/deskutils/krss/files/patch-krss-schemeeditor.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- krss/schemeeditor.cpp.orig	Mon Nov 26 10:08:12 2001
-+++ krss/schemeeditor.cpp	Wed May 21 10:27:55 2003
-@@ -43,6 +43,8 @@
- #include "schemeparser.h"
- #include "colourconverter.h"
- 
-+using namespace std;
-+
- SchemeEditor::SchemeEditor(QWidget *parent, const char *name )
- : QWidget(parent,name)
- {
diff --git a/deskutils/krss/files/patch-krss-schemeparser.cpp b/deskutils/krss/files/patch-krss-schemeparser.cpp
deleted file mode 100644
index 32fe5e3d82fe..000000000000
--- a/deskutils/krss/files/patch-krss-schemeparser.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
---- krss/schemeparser.cpp.orig	Mon Nov 26 10:12:50 2001
-+++ krss/schemeparser.cpp	Wed May 21 10:32:25 2003
-@@ -18,6 +18,8 @@
- #include "schemeparser.h"
- #include <iostream>
- 
-+using namespace std;
-+
- SchemeParser::SchemeParser()
- {
- 	schemetag = QString("scheme");
-@@ -341,9 +343,6 @@
- 					font.setUnderline(true);
- 				else
- 					font.setUnderline(false);
--			}
--			else if(atts.qName(i).compare("charset") == 0) {
--				font.setCharSet((QFont::CharSet) atts.value(i).toInt());
- 			}
- 		}
- 		if(mReadingChannel) {
diff --git a/deskutils/krss/files/patch-krss-schemetree.cpp b/deskutils/krss/files/patch-krss-schemetree.cpp
deleted file mode 100644
index f31c987602dd..000000000000
--- a/deskutils/krss/files/patch-krss-schemetree.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
---- krss/schemetree.cpp.orig	Mon Nov 26 10:16:21 2001
-+++ krss/schemetree.cpp	Wed May 21 10:33:35 2003
-@@ -24,6 +24,8 @@
- 
- #include "colourconverter.h"
- 
-+using namespace std;
-+
- SchemeTree::SchemeTree()
- {	
- 	clear();
-@@ -178,7 +180,6 @@
- 				ctfelm.setAttribute("underline", "true");
- 			else
- 				ctfelm.setAttribute("underline", "false");
--			ctfelm.setAttribute("charset", QString::number(channelTitleFont().charSet()));
- 		ctelm.appendChild(ctfelm);
- 		QDomElement ctaelm = doc.createElement("align");
- 			QDomText ctatxt = doc.createTextNode(QString::number(channelTitleAlign()));
-@@ -220,7 +221,6 @@
- 				cdfelm.setAttribute("underline", "true");
- 			else
- 				cdfelm.setAttribute("underline", "false");
--			cdfelm.setAttribute("charset", QString::number(channelDescriptionFont().charSet()));
- 		cdelm.appendChild(cdfelm);
- 			QDomElement cdaelm = doc.createElement("align");
- 				QDomText cdatxt = doc.createTextNode(QString::number(channelDescriptionAlign()));
-@@ -251,7 +251,6 @@
- 				ntfelm.setAttribute("underline", "true");
- 			else
- 				ntfelm.setAttribute("underline", "false");
--			ntfelm.setAttribute("charset", QString::number(newsTitleFont().charSet()));
- 		ntelm.appendChild(ntfelm);
- 		QDomElement ntaelm = doc.createElement("align");
- 			QDomText ntatxt = doc.createTextNode(QString::number(newsTitleAlign()));
-@@ -283,7 +282,6 @@
- 				ndfelm.setAttribute("underline", "true");
- 			else
- 				ndfelm.setAttribute("underline", "false");
--			ndfelm.setAttribute("charset", QString::number(newsDescriptionFont().charSet()));
- 		ndelm.appendChild(ndfelm);
- 			QDomElement ndaelm = doc.createElement("align");
- 				QDomText ndatxt = doc.createTextNode(QString::number(newsDescriptionAlign()));
diff --git a/deskutils/krss/files/patch-krss-sitehandler.cpp b/deskutils/krss/files/patch-krss-sitehandler.cpp
deleted file mode 100644
index 886fafe47c19..000000000000
--- a/deskutils/krss/files/patch-krss-sitehandler.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- krss/sitehandler.cpp.orig	Wed Feb 20 13:38:38 2002
-+++ krss/sitehandler.cpp	Wed May 21 10:38:31 2003
-@@ -35,6 +35,8 @@
- #include "mychannelbar.h"
- #include "editfeedlistviewitem.h"
- 
-+using namespace std;
-+
- SiteHandler::SiteHandler()
- {
- 	mReadingSites = mReadingSite = mReadingName = mReadingUsed = false;
diff --git a/deskutils/krss/files/patch-krss-syncdialog.cpp b/deskutils/krss/files/patch-krss-syncdialog.cpp
deleted file mode 100644
index 9dbd3ce508e1..000000000000
--- a/deskutils/krss/files/patch-krss-syncdialog.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- krss/syncdialog.cpp.orig	Tue Sep 11 01:23:37 2001
-+++ krss/syncdialog.cpp	Wed May 21 10:30:45 2003
-@@ -27,6 +27,8 @@
- 
- #include <klocale.h>
- 
-+using namespace std;
-+
- SyncDialog::SyncDialog(KConfig *config, QWidget *parent, const char *name )
- : KDialogBase(parent,name,true,i18n("Sharing Feeds"),User1|Close,Close,true,i18n("Skip"))
- {
diff --git a/deskutils/krss/files/patch-spacer b/deskutils/krss/files/patch-spacer
new file mode 100644
index 000000000000..15e224197d89
--- /dev/null
+++ b/deskutils/krss/files/patch-spacer
@@ -0,0 +1,80 @@
+--- krss/schemeconfigureviewbackend.ui	2003-06-07 23:04:11.000000000 -0400
++++ krss/schemeconfigureviewbackend.ui	2011-05-02 14:50:38.000000000 -0400
+@@ -134,4 +134,5 @@
+                     </widget>
+                     <spacer row="3"  column="1" >
++                        <class>QSpacerItem</class>
+                         <property>
+                             <name>name</name>
+--- krss/quickviewconfigurationviewbackend.ui	2003-06-07 23:04:10.000000000 -0400
++++ krss/quickviewconfigurationviewbackend.ui	2011-05-02 14:52:52.000000000 -0400
+@@ -41,4 +41,5 @@
+         </widget>
+         <spacer row="2"  column="0" >
++            <class>QSpacerItem</class>
+             <property>
+                 <name>name</name>
+@@ -179,4 +180,5 @@
+                                         </widget>
+                                         <spacer>
++                                            <class>QSpacerItem</class>
+                                             <property>
+                                                 <name>name</name>
+--- krss/filterviewbackend.ui	2003-06-07 23:04:03.000000000 -0400
++++ krss/filterviewbackend.ui	2011-05-02 14:54:31.000000000 -0400
+@@ -241,4 +241,5 @@
+                 </widget>
+                 <spacer row="3"  column="1" >
++                    <class>QSpacerItem</class>
+                     <property>
+                         <name>name</name>
+--- krss/cacheconfigureviewbackend.ui	2003-06-07 23:04:01.000000000 -0400
++++ krss/cacheconfigureviewbackend.ui	2011-05-02 14:57:48.000000000 -0400
+@@ -60,4 +60,5 @@
+                 </widget>
+                 <spacer>
++                    <class>QSpacerItem</class>
+                     <property>
+                         <name>name</name>
+@@ -124,4 +125,5 @@
+                 </widget>
+                 <spacer>
++                    <class>QSpacerItem</class>
+                     <property>
+                         <name>name</name>
+@@ -158,4 +160,5 @@
+         </widget>
+         <spacer row="2"  column="0" >
++            <class>QSpacerItem</class>
+             <property>
+                 <name>name</name>
+--- krss/datetimeconfigureviewbackend.ui	2003-06-07 23:04:02.000000000 -0400
++++ krss/datetimeconfigureviewbackend.ui	2011-05-02 14:58:40.000000000 -0400
+@@ -123,4 +123,5 @@
+         </widget>
+         <spacer row="4"  column="0" >
++            <class>QSpacerItem</class>
+             <property>
+                 <name>name</name>
+--- krss/editfeedviewbackend.ui	2003-06-07 23:04:02.000000000 -0400
++++ krss/editfeedviewbackend.ui	2011-05-02 14:59:26.000000000 -0400
+@@ -119,4 +119,5 @@
+         </widget>
+         <spacer row="0"  column="2" >
++            <class>QSpacerItem</class>
+             <property>
+                 <name>name</name>
+--- krss/autoupdateviewbackend.ui	2003-06-07 23:04:01.000000000 -0400
++++ krss/autoupdateviewbackend.ui	2011-05-02 15:01:04.000000000 -0400
+@@ -163,4 +163,5 @@
+                 </widget>
+                 <spacer row="1"  column="0" >
++                    <class>QSpacerItem</class>
+                     <property>
+                         <name>name</name>
+@@ -184,4 +185,5 @@
+                 </spacer>
+                 <spacer row="2"  column="0" >
++                    <class>QSpacerItem</class>
+                     <property>
+                         <name>name</name>
diff --git a/deskutils/krss/pkg-plist b/deskutils/krss/pkg-plist
index a8e25bd13565..19df82b79480 100644
--- a/deskutils/krss/pkg-plist
+++ b/deskutils/krss/pkg-plist
@@ -1,20 +1,6 @@
 bin/krss
 share/applnk/Applications/krss.desktop
 share/apps/krss/krssui.rc
-share/apps/krss/services-channels-complete.xml
-share/apps/krss/tempimage.png
-share/apps/krss/tips
 @dirrm share/apps/krss
-share/doc/HTML/en/krss/common
-share/doc/HTML/en/krss/index.docbook
-@dirrm share/doc/HTML/en/krss
-share/icons/hicolor/16x16/actions/autoupdaterssfeeds.png
-share/icons/hicolor/16x16/actions/editrssfeeds.png
-share/icons/hicolor/16x16/actions/getrssfeeds.png
-share/icons/hicolor/16x16/apps/krss.png
-share/icons/hicolor/32x32/actions/autoupdaterssfeeds.png
-share/icons/hicolor/32x32/actions/editrssfeeds.png
-share/icons/hicolor/32x32/actions/getrssfeeds.png
-share/icons/hicolor/32x32/apps/krss.png
 share/icons/locolor/16x16/apps/krss.png
 share/icons/locolor/32x32/apps/krss.png