Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/cdemu-client/PKGBUILD
	community/dcron/PKGBUILD
	community/freevo/PKGBUILD
	community/gmerlin-avdecoder/PKGBUILD
	community/hacburn/PKGBUILD
	community/htmldoc/PKGBUILD
	community/ibus-table/PKGBUILD
	community/iksemel/PKGBUILD
	community/isomaster/PKGBUILD
	community/libmatio/PKGBUILD
	community/libtlen/PKGBUILD
	community/luarocks/PKGBUILD
	community/lxde-common/PKGBUILD
	community/multipath-tools/PKGBUILD
	community/nvclock/PKGBUILD
	community/pam-krb5/PKGBUILD
	community/pidgin-musictracker/PKGBUILD
	community/pkgfile/PKGBUILD
	community/pkgtools/PKGBUILD
	community/print-manager/PKGBUILD
	community/python-pyro/PKGBUILD
	community/python-pyxmpp/PKGBUILD
	community/python2-simplejson/PKGBUILD
	community/rsnapshot/PKGBUILD
	community/setconf/PKGBUILD
	community/tagpy/PKGBUILD
	community/terminator/PKGBUILD
	community/udunits/PKGBUILD
	community/vlock/PKGBUILD
	community/winefish/PKGBUILD
	core/nss-myhostname/PKGBUILD
	extra/avfs/PKGBUILD
	extra/bmp-musepack/PKGBUILD
	extra/bmp-wma/PKGBUILD
	extra/bochs/PKGBUILD
	extra/botan/PKGBUILD
	extra/cdargs/PKGBUILD
	extra/cx_freeze/PKGBUILD
	extra/dcfldd/PKGBUILD
	extra/devilspie/PKGBUILD
	extra/emelfm2/PKGBUILD
	extra/evilwm/PKGBUILD
	extra/fssos-nsvs/PKGBUILD
	extra/gimp-dbp/PKGBUILD
	extra/gimp-gap/PKGBUILD
	extra/gimp-ufraw/PKGBUILD
	extra/gmpc/PKGBUILD
	extra/gtkpod/PKGBUILD
	extra/hercules/PKGBUILD
	extra/herqq/PKGBUILD
	extra/hydrogen/PKGBUILD
	extra/kdegames/PKGBUILD
	extra/kradio/PKGBUILD
	extra/kshutdown/PKGBUILD
	extra/libmusicbrainz4/PKGBUILD
	extra/mahjong/PKGBUILD
	extra/mcrypt/PKGBUILD
	extra/monica/PKGBUILD
	extra/mpck/PKGBUILD
	extra/mrtg/PKGBUILD
	extra/nicotine/PKGBUILD
	extra/normalize/PKGBUILD
	extra/oprofile/PKGBUILD
	extra/perl-event/PKGBUILD
	extra/perl-unicode-string/PKGBUILD
	extra/pidgin-encryption/PKGBUILD
	extra/proftpd/PKGBUILD
	extra/pymad/PKGBUILD
	extra/qiv/PKGBUILD
	extra/quodlibet/PKGBUILD
	extra/ratpoison/PKGBUILD
	extra/rox/PKGBUILD
	extra/scrot/PKGBUILD
	extra/stardict/PKGBUILD
	extra/terminal/PKGBUILD
	extra/usbview/PKGBUILD
	extra/xdelta/PKGBUILD
	extra/xdelta3/PKGBUILD
	extra/xorg-xlsfonts/PKGBUILD
	extra/zile/PKGBUILD
	mozilla-testing/iceweasel-libre/mozconfig
	mozilla-testing/iceweasel-libre/vendor.js
	social/tokyocabinet/PKGBUILD
	~fauno/notmuch/PKGBUILD
	~mtjm/thinkfan/PKGBUILD
	~mtjm/zbar/PKGBUILD

2 files changed, 0 insertions, 97 deletions

diff --git a/extra/ktorrent/groupmiewmodel.diff b/extra/ktorrent/groupmiewmodel.diff
deleted file mode 100644
index f16bdc57b..000000000
--- a/extra/ktorrent/groupmiewmodel.diff
+++ /dev/null
@@ -1,87 +0,0 @@
-commit 1009ba89b5d603ae7f1a95ef65a818c760c367cf
-Author: Joris Guisson <joris.guisson@gmail.com>
-Date:   Mon Oct 22 20:07:21 2012 +0200
-
-    Backport to 4.3: Fix crash in GroupViewModel when dragging torrents over groups
-    
-    BUG: 308733
-
-diff --git a/ktorrent/groups/groupviewmodel.cpp b/ktorrent/groups/groupviewmodel.cpp
-index f2e99d2..b4dca7e 100644
---- ktorrent/groups/groupviewmodel.cpp
-+++ ktorrent/groups/groupviewmodel.cpp
-@@ -55,6 +55,9 @@ namespace kt
- 	QVariant GroupViewModel::data(const QModelIndex& index, int role) const
- 	{
- 		Item* item = (Item*)index.internalPointer();
-+        if(!item)
-+            return QVariant();
-+        
- 		switch(role)
- 		{
- 			case Qt::DisplayRole:
-@@ -72,6 +75,9 @@ namespace kt
- 			return false;
- 		
- 		Item* item = (Item*)index.internalPointer();
-+        if(!item)
-+            return false;
-+        
- 		Group* group = item->group;
- 		QString new_name = value.toString();
- 		if(new_name.isEmpty() || gman->find(new_name))
-@@ -96,13 +102,16 @@ namespace kt
- 			return 1;
- 		
- 		Item* item = (Item*)parent.internalPointer();
--		return item->children.size();
-+        if(!item)
-+            return 0;
-+        else
-+            return item->children.size();
- 	}
- 
- 	QModelIndex GroupViewModel::parent(const QModelIndex& child) const
- 	{
- 		Item* item = (Item*)child.internalPointer();
--		if(!item->parent)
-+		if(!item || !item->parent)
- 			return QModelIndex();
- 		else
- 			return createIndex(item->parent->row, 0, (void*)item->parent);
-@@ -114,7 +123,7 @@ namespace kt
- 			return createIndex(row, column, (void*)&root);
- 		
- 		Item* item = (Item*)parent.internalPointer();
--		if(row < 0 || row >= item->children.count())
-+		if(!item || row < 0 || row >= item->children.count())
- 			return QModelIndex();
- 		
- 		return createIndex(row, column, (void*)&item->children.at(row));
-@@ -157,7 +166,7 @@ namespace kt
- 	Qt::ItemFlags GroupViewModel::flags(const QModelIndex& index) const
- 	{
- 		Item* item = (Item*)index.internalPointer();
--		if(item->group && !item->group->isStandardGroup())
-+		if(item && item->group && !item->group->isStandardGroup())
- 			return Qt::ItemIsEnabled | Qt::ItemIsEditable | Qt::ItemIsDropEnabled;
- 		else
- 			return Qt::ItemIsEnabled;
-@@ -218,8 +227,11 @@ namespace kt
- 	
- 	bool GroupViewModel::removeRows(int row, int count, const QModelIndex& parent)
- 	{
-+        Item* item = (Item*)parent.internalPointer();
-+        if(!item)
-+            return false;
-+        
- 		beginRemoveRows(parent, row, row + count);
--		Item* item = (Item*)parent.internalPointer();
- 		for(int i = 0; i < count; i++)
- 			item->children.removeAt(row);
- 		int row_index = 0;
-@@ -436,3 +448,4 @@ namespace kt
- 
- 
- }
-+
diff --git a/extra/ktorrent/httpserver.patch b/extra/ktorrent/httpserver.patch
deleted file mode 100644
index 71c616db0..000000000
--- a/extra/ktorrent/httpserver.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- plugins/webinterface/httpserver.cpp.old
-+++ plugins/webinterface/httpserver.cpp
-@@ -29,6 +29,7 @@
- #include <ktemporaryfile.h>
- #include <k3streamsocket.h>
- #include <k3resolver.h>
-+#include <time.h>
- 
- #include <qfileinfo.h>
- #include <qstringlist.h>