From 5f92fa6dba7a4fb612ee682098101bdc0ff66711 Mon Sep 17 00:00:00 2001 From: Ingmar Vanhassel Date: Sun, 17 Feb 2008 03:20:54 +0000 Subject: Spring cleaning. (Portage version: 2.1.4.4) --- kde-base/kamera/ChangeLog | 8 ++- .../kamera/files/kamera-3.5.6-download-fix.diff | 68 ---------------------- kde-base/kamera/kamera-3.5.5.ebuild | 15 ----- kde-base/kamera/kamera-3.5.6-r1.ebuild | 17 ------ kde-base/kamera/kamera-3.5.6.ebuild | 15 ----- kde-base/kamera/kamera-3.5.7.ebuild | 15 ----- kde-base/kamera/kamera-4.0.0.ebuild | 15 ----- 7 files changed, 7 insertions(+), 146 deletions(-) delete mode 100644 kde-base/kamera/files/kamera-3.5.6-download-fix.diff delete mode 100644 kde-base/kamera/kamera-3.5.5.ebuild delete mode 100644 kde-base/kamera/kamera-3.5.6-r1.ebuild delete mode 100644 kde-base/kamera/kamera-3.5.6.ebuild delete mode 100644 kde-base/kamera/kamera-3.5.7.ebuild delete mode 100644 kde-base/kamera/kamera-4.0.0.ebuild (limited to 'kde-base/kamera') diff --git a/kde-base/kamera/ChangeLog b/kde-base/kamera/ChangeLog index ef4d120cbf67..20b7752a8fd2 100644 --- a/kde-base/kamera/ChangeLog +++ b/kde-base/kamera/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for kde-base/kamera # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kamera/ChangeLog,v 1.77 2008/02/07 00:10:57 philantrop Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kamera/ChangeLog,v 1.78 2008/02/17 03:20:54 ingmar Exp $ + + 17 Feb 2008; Ingmar Vanhassel + -files/kamera-3.5.6-download-fix.diff, -kamera-3.5.5.ebuild, + -kamera-3.5.6.ebuild, -kamera-3.5.6-r1.ebuild, -kamera-3.5.7.ebuild, + -kamera-4.0.0.ebuild: + Spring cleaning *kamera-4.0.1 (06 Feb 2008) diff --git a/kde-base/kamera/files/kamera-3.5.6-download-fix.diff b/kde-base/kamera/files/kamera-3.5.6-download-fix.diff deleted file mode 100644 index c26dff3a86bf..000000000000 --- a/kde-base/kamera/files/kamera-3.5.6-download-fix.diff +++ /dev/null @@ -1,68 +0,0 @@ ---- kamera/kioslave/kamera.cpp 2006/06/22 06:45:40 553793 -+++ kamera/kioslave/kamera.cpp 2007/05/03 20:59:50 660816 -@@ -270,19 +270,39 @@ - long unsigned int fileSize; - // This merely returns us a pointer to gphoto's internal data - // buffer -- there's no expensive memcpy -- gp_file_get_data_and_size(m_file, &fileData, &fileSize); -+ gpr = gp_file_get_data_and_size(m_file, &fileData, &fileSize); -+ if (gpr != GP_OK) { -+ kdDebug(7123) << "get():: get_data_and_size failed." << endl; -+ gp_file_free(m_file); -+ m_file = NULL; -+ error(KIO::ERR_UNKNOWN, gp_result_as_string(gpr)); -+ closeCamera(); -+ return; -+ } - // make sure we're not sending zero-sized chunks (=EOF) - // also make sure we send only if the progress did not send the data - // already. - if ((fileSize > 0) && (fileSize - m_fileSize)>0) { -- // XXX using assign() here causes segfault, prolly because -- // gp_file_free is called before chunkData goes out of scope -+ unsigned long written = 0; - QByteArray chunkDataBuffer; -- chunkDataBuffer.setRawData(fileData + m_fileSize, fileSize - m_fileSize); -- data(chunkDataBuffer); -- processedSize(fileSize); -- chunkDataBuffer.resetRawData(fileData + m_fileSize, fileSize - m_fileSize); -+ -+ // We need to split it up here. Someone considered it funny -+ // to discard any data() larger than 16MB. -+ // -+ // So nearly any Movie will just fail.... -+ while (written < fileSize-m_fileSize) { -+ unsigned long towrite = 1024*1024; // 1MB -+ -+ if (towrite > fileSize-m_fileSize-written) -+ towrite = fileSize-m_fileSize-written; -+ chunkDataBuffer.setRawData(fileData + m_fileSize + written, towrite); -+ processedSize(m_fileSize + written + towrite); -+ data(chunkDataBuffer); -+ chunkDataBuffer.resetRawData(fileData + m_fileSize + written, towrite); -+ written += towrite; -+ } - m_fileSize = fileSize; -+ setFileSize(fileSize); - } - - finished(); -@@ -907,8 +927,8 @@ - // camera and pass it to KIO, to allow progressive display - // of the downloaded photo. - -- const char *fileData; -- long unsigned int fileSize; -+ const char *fileData = NULL; -+ long unsigned int fileSize = 0; - - // This merely returns us a pointer to gphoto's internal data - // buffer -- there's no expensive memcpy -@@ -921,6 +941,7 @@ - // gp_file_free is called before chunkData goes out of scope - QByteArray chunkDataBuffer; - chunkDataBuffer.setRawData(fileData + object->getFileSize(), fileSize - object->getFileSize()); -+ // Note: this will fail with sizes > 16MB ... - object->data(chunkDataBuffer); - object->processedSize(fileSize); - chunkDataBuffer.resetRawData(fileData + object->getFileSize(), fileSize - object->getFileSize()); diff --git a/kde-base/kamera/kamera-3.5.5.ebuild b/kde-base/kamera/kamera-3.5.5.ebuild deleted file mode 100644 index 531264c6d352..000000000000 --- a/kde-base/kamera/kamera-3.5.5.ebuild +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kamera/kamera-3.5.5.ebuild,v 1.9 2007/07/11 01:08:48 mr_bones_ Exp $ - -KMNAME=kdegraphics -MAXKDEVER=$PV -KM_DEPRANGE="$PV $MAXKDEVER" -inherit kde-meta eutils - -DESCRIPTION="KDE digital camera manager" -KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86" -IUSE="" -DEPEND="media-libs/libgphoto2" - -RDEPEND="${DEPEND}" diff --git a/kde-base/kamera/kamera-3.5.6-r1.ebuild b/kde-base/kamera/kamera-3.5.6-r1.ebuild deleted file mode 100644 index c7c434f0c913..000000000000 --- a/kde-base/kamera/kamera-3.5.6-r1.ebuild +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kamera/kamera-3.5.6-r1.ebuild,v 1.2 2007/05/30 20:35:29 mr_bones_ Exp $ - -KMNAME=kdegraphics -MAXKDEVER=$PV -KM_DEPRANGE="$PV $MAXKDEVER" -inherit kde-meta eutils - -DESCRIPTION="KDE digital camera manager" -KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="" -DEPEND="media-libs/libgphoto2" - -RDEPEND="${DEPEND}" - -PATCHES="${FILESDIR}/kamera-3.5.6-download-fix.diff" diff --git a/kde-base/kamera/kamera-3.5.6.ebuild b/kde-base/kamera/kamera-3.5.6.ebuild deleted file mode 100644 index b8dc8ab4262d..000000000000 --- a/kde-base/kamera/kamera-3.5.6.ebuild +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kamera/kamera-3.5.6.ebuild,v 1.2 2007/07/11 01:08:48 mr_bones_ Exp $ - -KMNAME=kdegraphics -MAXKDEVER=$PV -KM_DEPRANGE="$PV $MAXKDEVER" -inherit kde-meta eutils - -DESCRIPTION="KDE digital camera manager" -KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="" -DEPEND="media-libs/libgphoto2" - -RDEPEND="${DEPEND}" diff --git a/kde-base/kamera/kamera-3.5.7.ebuild b/kde-base/kamera/kamera-3.5.7.ebuild deleted file mode 100644 index 9670af4706e1..000000000000 --- a/kde-base/kamera/kamera-3.5.7.ebuild +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kamera/kamera-3.5.7.ebuild,v 1.7 2007/08/11 15:59:33 armin76 Exp $ - -KMNAME=kdegraphics -MAXKDEVER=$PV -KM_DEPRANGE="$PV $MAXKDEVER" -inherit kde-meta eutils - -DESCRIPTION="KDE digital camera manager" -KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86" -IUSE="" -DEPEND="media-libs/libgphoto2" - -RDEPEND="${DEPEND}" diff --git a/kde-base/kamera/kamera-4.0.0.ebuild b/kde-base/kamera/kamera-4.0.0.ebuild deleted file mode 100644 index fe79334d470f..000000000000 --- a/kde-base/kamera/kamera-4.0.0.ebuild +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kamera/kamera-4.0.0.ebuild,v 1.1 2008/01/17 23:31:49 philantrop Exp $ - -EAPI="1" - -KMNAME=kdegraphics -inherit kde4-meta - -DESCRIPTION="KDE digital camera manager" -KEYWORDS="~amd64 ~x86" -IUSE="debug htmlhandbook" - -DEPEND="media-libs/libgphoto2" -RDEPEND="${DEPEND}" -- cgit v1.2.3-65-gdbad