diff options
author | Alexey Shvetsov <alexxy@gentoo.org> | 2009-02-12 22:23:58 +0000 |
---|---|---|
committer | Alexey Shvetsov <alexxy@gentoo.org> | 2009-02-12 22:23:58 +0000 |
commit | 89d1f384cebf9d86777cc118dde63f38450d05b4 (patch) | |
tree | 0960d01ffcb93f42453b87a0702c43e2a3cb37b3 /kde-base/kdegraphics-kfile-plugins | |
parent | Drop stalled kde 3.5.[45678] ebuilds (diff) | |
download | historical-89d1f384cebf9d86777cc118dde63f38450d05b4.tar.gz historical-89d1f384cebf9d86777cc118dde63f38450d05b4.tar.bz2 historical-89d1f384cebf9d86777cc118dde63f38450d05b4.zip |
Drop stalled kde 3.5.[45678] ebuilds
Package-Manager: portage-2.2_rc23/cvs/Linux x86_64
Diffstat (limited to 'kde-base/kdegraphics-kfile-plugins')
5 files changed, 19 insertions, 196 deletions
diff --git a/kde-base/kdegraphics-kfile-plugins/ChangeLog b/kde-base/kdegraphics-kfile-plugins/ChangeLog index eb44a7cc6af8..890f7eb504e5 100644 --- a/kde-base/kdegraphics-kfile-plugins/ChangeLog +++ b/kde-base/kdegraphics-kfile-plugins/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for kde-base/kdegraphics-kfile-plugins -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics-kfile-plugins/ChangeLog,v 1.101 2008/09/13 23:58:04 carlo Exp $ +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics-kfile-plugins/ChangeLog,v 1.102 2009/02/12 22:23:57 alexxy Exp $ + + 12 Feb 2009; Alexey Shvetsov <alexxy@gentoo.org> + -files/post-3.5.5-kdegraphics.diff, + -kdegraphics-kfile-plugins-3.5.5-r1.ebuild, + -kdegraphics-kfile-plugins-3.5.8.ebuild: + Drop stalled kde 3.5.[45678] ebuilds *kdegraphics-kfile-plugins-3.5.10 (13 Sep 2008) diff --git a/kde-base/kdegraphics-kfile-plugins/Manifest b/kde-base/kdegraphics-kfile-plugins/Manifest index f3a438c2ce13..fadec41e0988 100644 --- a/kde-base/kdegraphics-kfile-plugins/Manifest +++ b/kde-base/kdegraphics-kfile-plugins/Manifest @@ -1,11 +1,16 @@ -AUX post-3.5.5-kdegraphics.diff 5324 RMD160 e67762766b9a77d855e189012c5eff526a9716fc SHA1 f48513bd60956c67aa877f52dd1daa25b41d43bb SHA256 45fabc5f38aef16c17456346a3423e996b5c025fef00f6b3e96eb21f3cfb105d +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + DIST kdegraphics-3.5.10.tar.bz2 7440912 RMD160 94278e4419ab99885fc9efae9b6ba5ba787f831e SHA1 9634e3ab364d017152fb6d636efad8811aeec6c3 SHA256 bdc73fa98008aa64b72636282bf0d83c7bb3e6d4ba1d0831277dda469b57408b -DIST kdegraphics-3.5.5.tar.bz2 7334117 RMD160 c6febdf8ebd67110be3f27ada4c00e148403217f SHA1 e063f9351e2781cc6a5d23834611fc7dc7dc4fbd SHA256 b6706d37568686e1ca4b4bb2cf1f79c027b94a512f6fe1156b7c7b7f79336f16 -DIST kdegraphics-3.5.8.tar.bz2 7444011 RMD160 8e77f76a6edcf6a1c20b4d76fcc5c79fe196599b SHA1 2f7b0aeefffd1d10128f1f1edd7e4c11e0329f35 SHA256 4d041d892f17ef90e0029ef14925980cf6a637d7a9971fba5835a5620ff3e155 DIST kdegraphics-3.5.9.tar.bz2 7441533 RMD160 047a02352858300b6be8db686e95fc55d257ac2d SHA1 62062f2e0274c4fb35e4988ede10072b0267ada7 SHA256 81514a8234158522440b0ecd269dbeb2e3622f72956fcdf38e726866d8100cb2 EBUILD kdegraphics-kfile-plugins-3.5.10.ebuild 820 RMD160 c61d6d1f6e58eab0ebca24b546f925875e9db489 SHA1 b2040978cc957ecc42c7aa5586a8404476dc5f76 SHA256 f8b53f74da71f424b13198a8cbc3058a31d55c155dc80d0807b6f46f93c4d03e -EBUILD kdegraphics-kfile-plugins-3.5.5-r1.ebuild 896 RMD160 c929d13f0141f76ea5120fcf8a9fd764fae0691c SHA1 a94e54b0be002b178262d890859be9277a71ec5c SHA256 5fbc4d8fc62702373432320f46749d21f60daf085d93ffba7e7cb77029df0649 -EBUILD kdegraphics-kfile-plugins-3.5.8.ebuild 843 RMD160 d00053562f9e73df9498f635d9e1b744ba407e67 SHA1 a009b5cc2f5cb6733d8995a75831c77f8398fef1 SHA256 d389f955befdedc0329637c94ab3356169b6259b09d41f17b3a98334888f55e8 EBUILD kdegraphics-kfile-plugins-3.5.9.ebuild 812 RMD160 37369d59be5555ecbc2a8345e7db3a6b06f994e8 SHA1 8dbb7636dee10ca9998fd031dddcf170aa8ef0d1 SHA256 8faef9e991c3cd94985c11f3fa0fb21b4c4960200321e9c15380d18ca33a481b -MISC ChangeLog 14862 RMD160 6c5db0e483d3ca19b88e3eaa67f0a6044e5ac668 SHA1 c63464601563a4ee9fb920de922a755bb39688b6 SHA256 8ed1217ce34783285d4fc93767425116d9bc1daddee81760d7288ab12750b005 +MISC ChangeLog 15081 RMD160 8a41fd18d79e4ede92706b2c3aa65aaa48184e24 SHA1 d9bf95fb62d2f99aa4879c2bf7206698ae2054e4 SHA256 9c198604b953fa4a89d22ffbcdc948caabf8b84c160d5527758ded40671cb5ef MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.9 (GNU/Linux) + +iEYEARECAAYFAkmUoYMACgkQ5BmOA85PVLjaTACghmVOYUCY3fwo3P1dS2bbbkxw +DGsAmwcXxMdh0wzOoVVO/EGhkmUVUGPe +=dHgK +-----END PGP SIGNATURE----- diff --git a/kde-base/kdegraphics-kfile-plugins/files/post-3.5.5-kdegraphics.diff b/kde-base/kdegraphics-kfile-plugins/files/post-3.5.5-kdegraphics.diff deleted file mode 100644 index 881b81757ab4..000000000000 --- a/kde-base/kdegraphics-kfile-plugins/files/post-3.5.5-kdegraphics.diff +++ /dev/null @@ -1,134 +0,0 @@ ---- kfile-plugins/jpeg/exif.h -+++ kfile-plugins/jpeg/exif.h -@@ -72,7 +72,8 @@ - int Get32s(void * Long); - unsigned Get32u(void * Long); - double ConvertAnyFormat(void * ValuePtr, int Format); -- void ProcessExifDir(unsigned char * DirStart, unsigned char * OffsetBase, unsigned ExifLength); -+ void ProcessExifDir(unsigned char * DirStart, unsigned char * OffsetBase, unsigned ExifLength, -+ unsigned NestingLevel); - void process_COM (const uchar * Data, int length); - void process_SOFn (const uchar * Data, int marker); - int Get16m(const void * Short); ---- kfile-plugins/jpeg/exif.cpp -+++ kfile-plugins/jpeg/exif.cpp -@@ -446,7 +446,7 @@ - //-------------------------------------------------------------------------- - // Process one of the nested EXIF directories. - //-------------------------------------------------------------------------- --void ExifData::ProcessExifDir(unsigned char * DirStart, unsigned char * OffsetBase, unsigned ExifLength) -+void ExifData::ProcessExifDir(unsigned char * DirStart, unsigned char * OffsetBase, unsigned ExifLength, unsigned NestingLevel) - { - int de; - int a; -@@ -454,6 +454,9 @@ - unsigned ThumbnailOffset = 0; - unsigned ThumbnailSize = 0; - -+ if ( NestingLevel > 4) -+ throw FatalError("Maximum directory nesting exceeded (corrupt exif header)"); -+ - NumDirEntries = Get16u(DirStart); - #define DIR_ENTRY_ADDR(Start, Entry) (Start+2+12*(Entry)) - -@@ -476,7 +479,7 @@ - for (de=0;de<NumDirEntries;de++){ - int Tag, Format, Components; - unsigned char * ValuePtr; -- int ByteCount; -+ unsigned ByteCount; - char * DirEntry; - DirEntry = (char *)DIR_ENTRY_ADDR(DirStart, de); - -@@ -489,6 +492,11 @@ - throw FatalError("Illegal format code in EXIF dir"); - } - -+ if ((unsigned)Components > 0x10000) { -+ throw FatalError("Illegal number of components for tag"); -+ continue; -+ } -+ - ByteCount = Components * BytesPerFormat[Format]; - - if (ByteCount > 4){ -@@ -517,11 +525,11 @@ - switch(Tag){ - - case TAG_MAKE: -- ExifData::CameraMake = QString((char*)ValuePtr); -+ ExifData::CameraMake = QString::fromLatin1((const char*)ValuePtr, 31); - break; - - case TAG_MODEL: -- ExifData::CameraModel = QString((char*)ValuePtr); -+ ExifData::CameraModel = QString::fromLatin1((const char*)ValuePtr, 39); - break; - - case TAG_ORIENTATION: -@@ -529,7 +537,7 @@ - break; - - case TAG_DATETIME_ORIGINAL: -- DateTime = QString((char*)ValuePtr); -+ DateTime = QString::fromLatin1((const char*)ValuePtr, 19); - break; - - case TAG_USERCOMMENT: -@@ -550,14 +558,12 @@ - int c; - c = (ValuePtr)[a]; - if (c != '\0' && c != ' '){ -- //strncpy(ImageInfo.Comments, (const char*)(a+ValuePtr), 199); -- UserComment.sprintf("%s", (const char*)(a+ValuePtr)); -+ UserComment = QString::fromLatin1((const char*)(a+ValuePtr), 199); - break; - } - } - }else{ -- //strncpy(ImageInfo.Comments, (const char*)ValuePtr, 199); -- UserComment.sprintf("%s", (const char*)ValuePtr); -+ UserComment = QString::fromLatin1((const char*)ValuePtr, 199); - } - break; - -@@ -676,10 +682,10 @@ - if (Tag == TAG_EXIF_OFFSET || Tag == TAG_INTEROP_OFFSET){ - unsigned char * SubdirStart; - SubdirStart = OffsetBase + Get32u(ValuePtr); -- if (SubdirStart < OffsetBase || SubdirStart > OffsetBase+ExifLength){ -+ if (SubdirStart <= OffsetBase || SubdirStart >= OffsetBase+ExifLength){ - throw FatalError("Illegal subdirectory link"); - } -- ProcessExifDir(SubdirStart, OffsetBase, ExifLength); -+ ProcessExifDir(SubdirStart, OffsetBase, ExifLength, NestingLevel+1); - continue; - } - } -@@ -709,7 +715,7 @@ - } - }else{ - if (SubdirStart <= OffsetBase+ExifLength){ -- ProcessExifDir(SubdirStart, OffsetBase, ExifLength); -+ ProcessExifDir(SubdirStart, OffsetBase, ExifLength, NestingLevel+1); - } - } - } -@@ -719,7 +725,7 @@ - } - - if (ThumbnailSize && ThumbnailOffset){ -- if (ThumbnailSize + ThumbnailOffset <= ExifLength){ -+ if (ThumbnailSize + ThumbnailOffset < ExifLength){ - // The thumbnail pointer appears to be valid. Store it. - Thumbnail.loadFromData(OffsetBase + ThumbnailOffset, ThumbnailSize, "JPEG"); - } -@@ -810,7 +816,7 @@ - LastExifRefd = CharBuf; - - // First directory starts 16 bytes in. Offsets start at 8 bytes in. -- ProcessExifDir(CharBuf+16, CharBuf+8, length-6); -+ ProcessExifDir(CharBuf+16, CharBuf+8, length-6, 0); - - // This is how far the interesting (non thumbnail) part of the exif went. - ExifSettingsLength = LastExifRefd - CharBuf; diff --git a/kde-base/kdegraphics-kfile-plugins/kdegraphics-kfile-plugins-3.5.5-r1.ebuild b/kde-base/kdegraphics-kfile-plugins/kdegraphics-kfile-plugins-3.5.5-r1.ebuild deleted file mode 100644 index 686a066b5615..000000000000 --- a/kde-base/kdegraphics-kfile-plugins/kdegraphics-kfile-plugins-3.5.5-r1.ebuild +++ /dev/null @@ -1,28 +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/kdegraphics-kfile-plugins/kdegraphics-kfile-plugins-3.5.5-r1.ebuild,v 1.9 2008/02/19 04:20:29 ingmar Exp $ - -KMNAME=kdegraphics -KMMODULE=kfile-plugins -MAXKDEVER=3.5.8 -KM_DEPRANGE="$PV $MAXKDEVER" -inherit kde-meta eutils - -DESCRIPTION="kfile plugins from kdegraphics" -KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd" -IUSE="openexr" -DEPEND="media-libs/tiff - openexr? ( media-libs/openexr )" - -# compilation of the tiff plugin depends on the check in acinclude.m4.in, -# which doesn't have a switch. - -# ps installed with kghostview, pdf installed with kpdf -KMEXTRACTONLY="kfile-plugins/ps kfile-plugins/pdf" - -PATCHES="${FILESDIR}/post-3.5.5-kdegraphics.diff" - -src_compile() { - myconf="$myconf $(use_with openexr)" - kde-meta_src_compile -} diff --git a/kde-base/kdegraphics-kfile-plugins/kdegraphics-kfile-plugins-3.5.8.ebuild b/kde-base/kdegraphics-kfile-plugins/kdegraphics-kfile-plugins-3.5.8.ebuild deleted file mode 100644 index 46b725706ac4..000000000000 --- a/kde-base/kdegraphics-kfile-plugins/kdegraphics-kfile-plugins-3.5.8.ebuild +++ /dev/null @@ -1,26 +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/kdegraphics-kfile-plugins/kdegraphics-kfile-plugins-3.5.8.ebuild,v 1.8 2008/03/04 05:05:41 jer Exp $ - -KMNAME=kdegraphics -KMMODULE=kfile-plugins -MAXKDEVER=$PV -KM_DEPRANGE="$PV $MAXKDEVER" -inherit kde-meta eutils - -DESCRIPTION="kfile plugins from kdegraphics" -KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd" -IUSE="openexr" -DEPEND="media-libs/tiff - openexr? ( media-libs/openexr )" - -# compilation of the tiff plugin depends on the check in acinclude.m4.in, -# which doesn't have a switch. - -# ps installed with kghostview, pdf installed with kpdf -KMEXTRACTONLY="kfile-plugins/ps kfile-plugins/pdf" - -src_compile() { - local myconf="$myconf $(use_with openexr)" - kde-meta_src_compile -} |