[arch-commits] Commit in ktorrent/repos (14 files)

Ronald van Haren ronald at archlinux.org
Sun Nov 18 10:30:05 UTC 2012


    Date: Sunday, November 18, 2012 @ 05:30:03
  Author: ronald
Revision: 171523

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  ktorrent/repos/extra-i686/PKGBUILD
    (from rev 171522, ktorrent/trunk/PKGBUILD)
  ktorrent/repos/extra-i686/groupmiewmodel.diff
    (from rev 171522, ktorrent/trunk/groupmiewmodel.diff)
  ktorrent/repos/extra-i686/httpserver.patch
    (from rev 171522, ktorrent/trunk/httpserver.patch)
  ktorrent/repos/extra-i686/ktorrent.install
    (from rev 171522, ktorrent/trunk/ktorrent.install)
  ktorrent/repos/extra-x86_64/PKGBUILD
    (from rev 171522, ktorrent/trunk/PKGBUILD)
  ktorrent/repos/extra-x86_64/groupmiewmodel.diff
    (from rev 171522, ktorrent/trunk/groupmiewmodel.diff)
  ktorrent/repos/extra-x86_64/httpserver.patch
    (from rev 171522, ktorrent/trunk/httpserver.patch)
  ktorrent/repos/extra-x86_64/ktorrent.install
    (from rev 171522, ktorrent/trunk/ktorrent.install)
Deleted:
  ktorrent/repos/extra-i686/PKGBUILD
  ktorrent/repos/extra-i686/httpserver.patch
  ktorrent/repos/extra-i686/ktorrent.install
  ktorrent/repos/extra-x86_64/PKGBUILD
  ktorrent/repos/extra-x86_64/httpserver.patch
  ktorrent/repos/extra-x86_64/ktorrent.install

----------------------------------+
 extra-i686/PKGBUILD              |   83 ++++++++++++++++++-----------------
 extra-i686/groupmiewmodel.diff   |   87 +++++++++++++++++++++++++++++++++++++
 extra-i686/httpserver.patch      |   20 ++++----
 extra-i686/ktorrent.install      |   26 +++++------
 extra-x86_64/PKGBUILD            |   83 ++++++++++++++++++-----------------
 extra-x86_64/groupmiewmodel.diff |   87 +++++++++++++++++++++++++++++++++++++
 extra-x86_64/httpserver.patch    |   20 ++++----
 extra-x86_64/ktorrent.install    |   26 +++++------
 8 files changed, 308 insertions(+), 124 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2012-11-18 10:29:07 UTC (rev 171522)
+++ extra-i686/PKGBUILD	2012-11-18 10:30:03 UTC (rev 171523)
@@ -1,39 +0,0 @@
-# $Id$
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Travis Willard <travisw at wmpub.ca>
-# Contributor: Georg Grabler <ggrabler at gmail.com>
-
-pkgname=ktorrent
-pkgver=4.3.0
-pkgrel=1
-pkgdesc="A powerful BitTorrent client for KDE"
-arch=('i686' 'x86_64')
-url='http://ktorrent.org/'
-license=('GPL2')
-depends=('libktorrent' 'kdebase-workspace' 'taglib')
-makedepends=('automoc4' 'cmake' 'boost')
-source=("http://ktorrent.org/downloads/${pkgver}/${pkgname}-${pkgver}.tar.bz2"
-        'httpserver.patch')
-install=${pkgname}.install
-sha1sums=('60400c6286f58934dde7ab471f56188b68d69f7b'
-          'cef22b24af540e1bfcf13da60e4846ade106c303')
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	# build time patch
-	patch -p0 -i "${srcdir}/httpserver.patch"
-
-	cd "${srcdir}"
-	mkdir build
-	cd build
-	cmake ../${pkgname}-${pkgver} \
-	  -DCMAKE_BUILD_TYPE=Release \
-	  -DCMAKE_INSTALL_PREFIX=/usr
-	make
-}
-
-package() {
-	cd "${srcdir}/build"
-	make DESTDIR="${pkgdir}" install
-}

Copied: ktorrent/repos/extra-i686/PKGBUILD (from rev 171522, ktorrent/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2012-11-18 10:30:03 UTC (rev 171523)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Travis Willard <travisw at wmpub.ca>
+# Contributor: Georg Grabler <ggrabler at gmail.com>
+
+pkgname=ktorrent
+pkgver=4.3.0
+pkgrel=2
+pkgdesc="A powerful BitTorrent client for KDE"
+arch=('i686' 'x86_64')
+url='http://ktorrent.org/'
+license=('GPL2')
+depends=('libktorrent' 'kdebase-workspace' 'taglib')
+makedepends=('automoc4' 'cmake' 'boost')
+source=("http://ktorrent.org/downloads/${pkgver}/${pkgname}-${pkgver}.tar.bz2"
+        'httpserver.patch' 'groupmiewmodel.diff')
+install=${pkgname}.install
+sha1sums=('60400c6286f58934dde7ab471f56188b68d69f7b'
+          'cef22b24af540e1bfcf13da60e4846ade106c303'
+	  '5b91b40e38afb15452bcb0644cd7ba57bc9db6eb' )
+
+options=(strip)
+
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+
+	# build time patch
+	patch -p0 -i "${srcdir}/httpserver.patch"
+	patch -p0 -i "${srcdir}/groupmiewmodel.diff"
+
+	cd "${srcdir}"
+	mkdir build
+	cd build
+	cmake ../${pkgname}-${pkgver} \
+	  -DCMAKE_BUILD_TYPE=Release \
+	  -DCMAKE_INSTALL_PREFIX=/usr
+	make
+}
+
+package() {
+	cd "${srcdir}/build"
+	make DESTDIR="${pkgdir}" install
+}

Copied: ktorrent/repos/extra-i686/groupmiewmodel.diff (from rev 171522, ktorrent/trunk/groupmiewmodel.diff)
===================================================================
--- extra-i686/groupmiewmodel.diff	                        (rev 0)
+++ extra-i686/groupmiewmodel.diff	2012-11-18 10:30:03 UTC (rev 171523)
@@ -0,0 +1,87 @@
+commit 1009ba89b5d603ae7f1a95ef65a818c760c367cf
+Author: Joris Guisson <joris.guisson at 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
+ 
+ 
+ }
++

Deleted: extra-i686/httpserver.patch
===================================================================
--- extra-i686/httpserver.patch	2012-11-18 10:29:07 UTC (rev 171522)
+++ extra-i686/httpserver.patch	2012-11-18 10:30:03 UTC (rev 171523)
@@ -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> 

Copied: ktorrent/repos/extra-i686/httpserver.patch (from rev 171522, ktorrent/trunk/httpserver.patch)
===================================================================
--- extra-i686/httpserver.patch	                        (rev 0)
+++ extra-i686/httpserver.patch	2012-11-18 10:30:03 UTC (rev 171523)
@@ -0,0 +1,10 @@
+--- 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> 

Deleted: extra-i686/ktorrent.install
===================================================================
--- extra-i686/ktorrent.install	2012-11-18 10:29:07 UTC (rev 171522)
+++ extra-i686/ktorrent.install	2012-11-18 10:30:03 UTC (rev 171523)
@@ -1,13 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-mime-database usr/share/mime &> /dev/null
-	update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}

Copied: ktorrent/repos/extra-i686/ktorrent.install (from rev 171522, ktorrent/trunk/ktorrent.install)
===================================================================
--- extra-i686/ktorrent.install	                        (rev 0)
+++ extra-i686/ktorrent.install	2012-11-18 10:30:03 UTC (rev 171523)
@@ -0,0 +1,13 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-mime-database usr/share/mime &> /dev/null
+	update-desktop-database -q
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2012-11-18 10:29:07 UTC (rev 171522)
+++ extra-x86_64/PKGBUILD	2012-11-18 10:30:03 UTC (rev 171523)
@@ -1,39 +0,0 @@
-# $Id$
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Travis Willard <travisw at wmpub.ca>
-# Contributor: Georg Grabler <ggrabler at gmail.com>
-
-pkgname=ktorrent
-pkgver=4.3.0
-pkgrel=1
-pkgdesc="A powerful BitTorrent client for KDE"
-arch=('i686' 'x86_64')
-url='http://ktorrent.org/'
-license=('GPL2')
-depends=('libktorrent' 'kdebase-workspace' 'taglib')
-makedepends=('automoc4' 'cmake' 'boost')
-source=("http://ktorrent.org/downloads/${pkgver}/${pkgname}-${pkgver}.tar.bz2"
-        'httpserver.patch')
-install=${pkgname}.install
-sha1sums=('60400c6286f58934dde7ab471f56188b68d69f7b'
-          'cef22b24af540e1bfcf13da60e4846ade106c303')
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	# build time patch
-	patch -p0 -i "${srcdir}/httpserver.patch"
-
-	cd "${srcdir}"
-	mkdir build
-	cd build
-	cmake ../${pkgname}-${pkgver} \
-	  -DCMAKE_BUILD_TYPE=Release \
-	  -DCMAKE_INSTALL_PREFIX=/usr
-	make
-}
-
-package() {
-	cd "${srcdir}/build"
-	make DESTDIR="${pkgdir}" install
-}

Copied: ktorrent/repos/extra-x86_64/PKGBUILD (from rev 171522, ktorrent/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2012-11-18 10:30:03 UTC (rev 171523)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Travis Willard <travisw at wmpub.ca>
+# Contributor: Georg Grabler <ggrabler at gmail.com>
+
+pkgname=ktorrent
+pkgver=4.3.0
+pkgrel=2
+pkgdesc="A powerful BitTorrent client for KDE"
+arch=('i686' 'x86_64')
+url='http://ktorrent.org/'
+license=('GPL2')
+depends=('libktorrent' 'kdebase-workspace' 'taglib')
+makedepends=('automoc4' 'cmake' 'boost')
+source=("http://ktorrent.org/downloads/${pkgver}/${pkgname}-${pkgver}.tar.bz2"
+        'httpserver.patch' 'groupmiewmodel.diff')
+install=${pkgname}.install
+sha1sums=('60400c6286f58934dde7ab471f56188b68d69f7b'
+          'cef22b24af540e1bfcf13da60e4846ade106c303'
+	  '5b91b40e38afb15452bcb0644cd7ba57bc9db6eb' )
+
+options=(strip)
+
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+
+	# build time patch
+	patch -p0 -i "${srcdir}/httpserver.patch"
+	patch -p0 -i "${srcdir}/groupmiewmodel.diff"
+
+	cd "${srcdir}"
+	mkdir build
+	cd build
+	cmake ../${pkgname}-${pkgver} \
+	  -DCMAKE_BUILD_TYPE=Release \
+	  -DCMAKE_INSTALL_PREFIX=/usr
+	make
+}
+
+package() {
+	cd "${srcdir}/build"
+	make DESTDIR="${pkgdir}" install
+}

Copied: ktorrent/repos/extra-x86_64/groupmiewmodel.diff (from rev 171522, ktorrent/trunk/groupmiewmodel.diff)
===================================================================
--- extra-x86_64/groupmiewmodel.diff	                        (rev 0)
+++ extra-x86_64/groupmiewmodel.diff	2012-11-18 10:30:03 UTC (rev 171523)
@@ -0,0 +1,87 @@
+commit 1009ba89b5d603ae7f1a95ef65a818c760c367cf
+Author: Joris Guisson <joris.guisson at 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
+ 
+ 
+ }
++

Deleted: extra-x86_64/httpserver.patch
===================================================================
--- extra-x86_64/httpserver.patch	2012-11-18 10:29:07 UTC (rev 171522)
+++ extra-x86_64/httpserver.patch	2012-11-18 10:30:03 UTC (rev 171523)
@@ -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> 

Copied: ktorrent/repos/extra-x86_64/httpserver.patch (from rev 171522, ktorrent/trunk/httpserver.patch)
===================================================================
--- extra-x86_64/httpserver.patch	                        (rev 0)
+++ extra-x86_64/httpserver.patch	2012-11-18 10:30:03 UTC (rev 171523)
@@ -0,0 +1,10 @@
+--- 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> 

Deleted: extra-x86_64/ktorrent.install
===================================================================
--- extra-x86_64/ktorrent.install	2012-11-18 10:29:07 UTC (rev 171522)
+++ extra-x86_64/ktorrent.install	2012-11-18 10:30:03 UTC (rev 171523)
@@ -1,13 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-mime-database usr/share/mime &> /dev/null
-	update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}

Copied: ktorrent/repos/extra-x86_64/ktorrent.install (from rev 171522, ktorrent/trunk/ktorrent.install)
===================================================================
--- extra-x86_64/ktorrent.install	                        (rev 0)
+++ extra-x86_64/ktorrent.install	2012-11-18 10:30:03 UTC (rev 171523)
@@ -0,0 +1,13 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-mime-database usr/share/mime &> /dev/null
+	update-desktop-database -q
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}




More information about the arch-commits mailing list