Date: Wednesday, September 11, 2013 @ 04:13:11 Author: bgyorgy Revision: 97032
archrelease: copy trunk to community-i686, community-x86_64 Added: kmess/repos/community-i686/PKGBUILD (from rev 97031, kmess/trunk/PKGBUILD) kmess/repos/community-i686/fix-crash-in-contactlistmodel.patch (from rev 97031, kmess/trunk/fix-crash-in-contactlistmodel.patch) kmess/repos/community-i686/giflib-5.0.patch (from rev 97031, kmess/trunk/giflib-5.0.patch) kmess/repos/community-i686/kmess.install (from rev 97031, kmess/trunk/kmess.install) kmess/repos/community-x86_64/PKGBUILD (from rev 97031, kmess/trunk/PKGBUILD) kmess/repos/community-x86_64/fix-crash-in-contactlistmodel.patch (from rev 97031, kmess/trunk/fix-crash-in-contactlistmodel.patch) kmess/repos/community-x86_64/giflib-5.0.patch (from rev 97031, kmess/trunk/giflib-5.0.patch) kmess/repos/community-x86_64/kmess.install (from rev 97031, kmess/trunk/kmess.install) Deleted: kmess/repos/community-i686/PKGBUILD kmess/repos/community-i686/giflib-5.0.patch kmess/repos/community-i686/kmess.install kmess/repos/community-x86_64/PKGBUILD kmess/repos/community-x86_64/giflib-5.0.patch kmess/repos/community-x86_64/kmess.install ------------------------------------------------------+ /PKGBUILD | 98 +++++++++ /giflib-5.0.patch | 170 +++++++++++++++++ /kmess.install | 22 ++ community-i686/PKGBUILD | 44 ---- community-i686/fix-crash-in-contactlistmodel.patch | 29 ++ community-i686/giflib-5.0.patch | 85 -------- community-i686/kmess.install | 11 - community-x86_64/PKGBUILD | 44 ---- community-x86_64/fix-crash-in-contactlistmodel.patch | 29 ++ community-x86_64/giflib-5.0.patch | 85 -------- community-x86_64/kmess.install | 11 - 11 files changed, 348 insertions(+), 280 deletions(-) Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2013-09-11 02:12:51 UTC (rev 97031) +++ community-i686/PKGBUILD 2013-09-11 02:13:11 UTC (rev 97032) @@ -1,44 +0,0 @@ -# $Id$ -# Maintainer: -# Contributor: Mateusz Herych <heni...@gmail.com> -# Contributor: Stefano Zamprogno <stefano.zampro...@gmail.com> - -pkgname=kmess -pkgver=2.0.6.2 -pkgrel=3 -pkgdesc="A MSN Messenger client for Linux" -arch=('i686' 'x86_64') -url='http://kmess.sourceforge.net/' -license=('GPL') -depends=('kdebase-lib') -makedepends=('automoc4' 'cmake' 'optipng') -optdepends=('cabextract: provides winks support') -install=${pkgname}.install -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-$pkgver.tar.bz2" - giflib-5.0.patch) -md5sums=('a2e57911713308bef81b9347135cc5dd' - '97734b073bf4a45ed3612d7626541cee') - -prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # Fix invalid PNG images to work with libpng 1.6 - find -name '*.png' -exec optipng -quiet -force -fix {} + - - patch -Np1 -i ../giflib-5.0.patch -} - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} Copied: kmess/repos/community-i686/PKGBUILD (from rev 97031, kmess/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2013-09-11 02:13:11 UTC (rev 97032) @@ -0,0 +1,49 @@ +# $Id$ +# Maintainer: +# Contributor: Mateusz Herych <heni...@gmail.com> +# Contributor: Stefano Zamprogno <stefano.zampro...@gmail.com> + +pkgname=kmess +pkgver=2.0.6.2 +pkgrel=4 +pkgdesc="A MSN Messenger client for Linux" +arch=('i686' 'x86_64') +url='http://kmess.sourceforge.net/' +license=('GPL') +depends=('kdebase-lib') +makedepends=('automoc4' 'cmake' 'optipng') +optdepends=('cabextract: provides winks support') +install=${pkgname}.install +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-$pkgver.tar.bz2" + giflib-5.0.patch + fix-crash-in-contactlistmodel.patch) +md5sums=('a2e57911713308bef81b9347135cc5dd' + '97734b073bf4a45ed3612d7626541cee' + 'fdfe837f4bd64a5123edc63019bd5cf2') + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # Fix invalid PNG images to work with libpng 1.6 + find -name '*.png' -exec optipng -quiet -force -fix {} + + + patch -Np1 -i ../giflib-5.0.patch + + # Fix crash in ContactListModel (FS#32402) + patch -Np1 -i ../fix-crash-in-contactlistmodel.patch +} + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} Copied: kmess/repos/community-i686/fix-crash-in-contactlistmodel.patch (from rev 97031, kmess/trunk/fix-crash-in-contactlistmodel.patch) =================================================================== --- community-i686/fix-crash-in-contactlistmodel.patch (rev 0) +++ community-i686/fix-crash-in-contactlistmodel.patch 2013-09-11 02:13:11 UTC (rev 97032) @@ -0,0 +1,29 @@ +commit e10ebb8bd33cf807e2edfa56c465b40f3237102e +Author: Ruben Vandamme <ru...@kmess.org> +Date: Sun Jul 8 10:56:37 2012 +0200 + + Fix crash in ContactListModel. + + * Individually delete every child instead of using qDeleteAll. + * Crash only happens in combination with Qt 4.8. + * See https://bugs.kde.org/show_bug.cgi?id=285951 for similar issue in Amarok. + * See https://bugreports.qt-project.org/browse/QTBUG-22037 for Qt report. + * Many thanks to Bob ("badjar" on kmess.org/board) for providing the fix. + +diff --git a/src/model/contactlistmodelitem.cpp b/src/model/contactlistmodelitem.cpp +index 462d555..ac5a6ca 100644 +--- a/src/model/contactlistmodelitem.cpp ++++ b/src/model/contactlistmodelitem.cpp +@@ -79,7 +79,11 @@ ContactListModelItem::ContactListModelItem( Group *group, ContactListModelItem * + */ + ContactListModelItem::~ContactListModelItem() + { +- qDeleteAll( childItems_ ); ++ while( !childItems_.isEmpty() ) ++ { ++ delete childItems_.takeFirst(); ++ } ++ + childItems_.clear(); + + // Delete this item from the parent's children Deleted: community-i686/giflib-5.0.patch =================================================================== --- community-i686/giflib-5.0.patch 2013-09-11 02:12:51 UTC (rev 97031) +++ community-i686/giflib-5.0.patch 2013-09-11 02:13:11 UTC (rev 97032) @@ -1,85 +0,0 @@ -diff -rupN a/contrib/isf-qt/src/isfqt.cpp b/contrib/isf-qt/src/isfqt.cpp ---- a/contrib/isf-qt/src/isfqt.cpp 2012-02-18 16:28:01.000000000 +0000 -+++ b/contrib/isf-qt/src/isfqt.cpp 2013-07-30 20:51:06.705394145 +0000 -@@ -484,12 +484,13 @@ QByteArray Stream::writerGif( const Draw - int width = isfImage.width(); - int numColors = 0; - bool gifError = true; -+ int gifErrCode; - - // Convert the image to GIF using libgif - - // Open the gif file - gifData.open( QIODevice::WriteOnly ); -- gifImage = EGifOpen( (void*)&gifData, GifWriteToByteArray ); -+ gifImage = EGifOpen( (void*)&gifData, GifWriteToByteArray, &gifErrCode ); - if( gifImage == 0 ) - { - qWarning() << "Couldn't initialize gif library!"; -@@ -503,7 +504,7 @@ QByteArray Stream::writerGif( const Draw - numColors = 256; - } - -- cmap = MakeMapObject( numColors, NULL ); -+ cmap = GifMakeMapObject( numColors, NULL ); - if( cmap == 0 && isfImage.numColors() > 1 ) - { - qWarning() << "Couldn't create map object for gif conversion (colors:" << isfImage.numColors() << ")!"; -@@ -576,7 +577,7 @@ QByteArray Stream::writerGif( const Draw - else - { - // Write the extension -- if( EGifPutExtensionFirst( gifImage, COMMENT_EXT_FUNC_CODE, MAX_GIF_BYTE, isfData.left( MAX_GIF_BYTE ).data() ) == GIF_ERROR ) -+ if( EGifPutExtensionLeader( gifImage, COMMENT_EXT_FUNC_CODE) == GIF_ERROR ) - { - qWarning() << "EGifPutExtensionFirst failed!"; - goto writeError; -@@ -590,9 +591,9 @@ QByteArray Stream::writerGif( const Draw - // Write all the full data blocks - while( length >= MAX_GIF_BYTE ) - { -- if( EGifPutExtensionNext( gifImage, 0, MAX_GIF_BYTE, isfData.mid( pos, MAX_GIF_BYTE ).data() ) == GIF_ERROR ) -+ if( EGifPutExtensionBlock( gifImage, MAX_GIF_BYTE, isfData.mid( pos, MAX_GIF_BYTE ).data() ) == GIF_ERROR ) - { -- qWarning() << "EGifPutExtensionNext failed!"; -+ qWarning() << "EGifPutExtensionBlock failed!"; - goto writeError; - } - -@@ -603,17 +604,17 @@ QByteArray Stream::writerGif( const Draw - // Write the last block - if( length > 0 ) - { -- if( EGifPutExtensionLast( gifImage, 0, length, isfData.mid( pos, MAX_GIF_BYTE ).data() ) == GIF_ERROR ) -+ if( EGifPutExtensionTrailer( gifImage ) == GIF_ERROR ) - { -- qWarning() << "EGifPutExtensionLast (n) failed!"; -+ qWarning() << "EGifPutExtensionTrailer (n) failed!"; - goto writeError; - } - } - else - { -- if( EGifPutExtensionLast( gifImage, 0, 0, 0 ) == GIF_ERROR ) -+ if( EGifPutExtensionTrailer( gifImage ) == GIF_ERROR ) - { -- qWarning() << "EGifPutExtensionLast (0) failed!"; -+ qWarning() << "EGifPutExtensionTrailer (0) failed!"; - goto writeError; - } - } -@@ -624,12 +625,12 @@ QByteArray Stream::writerGif( const Draw - writeError: - // Clean up the GIF converter etc - EGifCloseFile( gifImage ); -- FreeMapObject( cmap ); -+ GifFreeMapObject( cmap ); - gifData.close(); - - if( gifError ) - { -- qWarning() << "GIF error code:" << GifLastError(); -+ qWarning() << "GIF error code:" << GifErrorString(gifErrCode); - } - else - { Copied: kmess/repos/community-i686/giflib-5.0.patch (from rev 97031, kmess/trunk/giflib-5.0.patch) =================================================================== --- community-i686/giflib-5.0.patch (rev 0) +++ community-i686/giflib-5.0.patch 2013-09-11 02:13:11 UTC (rev 97032) @@ -0,0 +1,85 @@ +diff -rupN a/contrib/isf-qt/src/isfqt.cpp b/contrib/isf-qt/src/isfqt.cpp +--- a/contrib/isf-qt/src/isfqt.cpp 2012-02-18 16:28:01.000000000 +0000 ++++ b/contrib/isf-qt/src/isfqt.cpp 2013-07-30 20:51:06.705394145 +0000 +@@ -484,12 +484,13 @@ QByteArray Stream::writerGif( const Draw + int width = isfImage.width(); + int numColors = 0; + bool gifError = true; ++ int gifErrCode; + + // Convert the image to GIF using libgif + + // Open the gif file + gifData.open( QIODevice::WriteOnly ); +- gifImage = EGifOpen( (void*)&gifData, GifWriteToByteArray ); ++ gifImage = EGifOpen( (void*)&gifData, GifWriteToByteArray, &gifErrCode ); + if( gifImage == 0 ) + { + qWarning() << "Couldn't initialize gif library!"; +@@ -503,7 +504,7 @@ QByteArray Stream::writerGif( const Draw + numColors = 256; + } + +- cmap = MakeMapObject( numColors, NULL ); ++ cmap = GifMakeMapObject( numColors, NULL ); + if( cmap == 0 && isfImage.numColors() > 1 ) + { + qWarning() << "Couldn't create map object for gif conversion (colors:" << isfImage.numColors() << ")!"; +@@ -576,7 +577,7 @@ QByteArray Stream::writerGif( const Draw + else + { + // Write the extension +- if( EGifPutExtensionFirst( gifImage, COMMENT_EXT_FUNC_CODE, MAX_GIF_BYTE, isfData.left( MAX_GIF_BYTE ).data() ) == GIF_ERROR ) ++ if( EGifPutExtensionLeader( gifImage, COMMENT_EXT_FUNC_CODE) == GIF_ERROR ) + { + qWarning() << "EGifPutExtensionFirst failed!"; + goto writeError; +@@ -590,9 +591,9 @@ QByteArray Stream::writerGif( const Draw + // Write all the full data blocks + while( length >= MAX_GIF_BYTE ) + { +- if( EGifPutExtensionNext( gifImage, 0, MAX_GIF_BYTE, isfData.mid( pos, MAX_GIF_BYTE ).data() ) == GIF_ERROR ) ++ if( EGifPutExtensionBlock( gifImage, MAX_GIF_BYTE, isfData.mid( pos, MAX_GIF_BYTE ).data() ) == GIF_ERROR ) + { +- qWarning() << "EGifPutExtensionNext failed!"; ++ qWarning() << "EGifPutExtensionBlock failed!"; + goto writeError; + } + +@@ -603,17 +604,17 @@ QByteArray Stream::writerGif( const Draw + // Write the last block + if( length > 0 ) + { +- if( EGifPutExtensionLast( gifImage, 0, length, isfData.mid( pos, MAX_GIF_BYTE ).data() ) == GIF_ERROR ) ++ if( EGifPutExtensionTrailer( gifImage ) == GIF_ERROR ) + { +- qWarning() << "EGifPutExtensionLast (n) failed!"; ++ qWarning() << "EGifPutExtensionTrailer (n) failed!"; + goto writeError; + } + } + else + { +- if( EGifPutExtensionLast( gifImage, 0, 0, 0 ) == GIF_ERROR ) ++ if( EGifPutExtensionTrailer( gifImage ) == GIF_ERROR ) + { +- qWarning() << "EGifPutExtensionLast (0) failed!"; ++ qWarning() << "EGifPutExtensionTrailer (0) failed!"; + goto writeError; + } + } +@@ -624,12 +625,12 @@ QByteArray Stream::writerGif( const Draw + writeError: + // Clean up the GIF converter etc + EGifCloseFile( gifImage ); +- FreeMapObject( cmap ); ++ GifFreeMapObject( cmap ); + gifData.close(); + + if( gifError ) + { +- qWarning() << "GIF error code:" << GifLastError(); ++ qWarning() << "GIF error code:" << GifErrorString(gifErrCode); + } + else + { Deleted: community-i686/kmess.install =================================================================== --- community-i686/kmess.install 2013-09-11 02:12:51 UTC (rev 97031) +++ community-i686/kmess.install 2013-09-11 02:13:11 UTC (rev 97032) @@ -1,11 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} Copied: kmess/repos/community-i686/kmess.install (from rev 97031, kmess/trunk/kmess.install) =================================================================== --- community-i686/kmess.install (rev 0) +++ community-i686/kmess.install 2013-09-11 02:13:11 UTC (rev 97032) @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} Deleted: community-x86_64/PKGBUILD =================================================================== --- community-x86_64/PKGBUILD 2013-09-11 02:12:51 UTC (rev 97031) +++ community-x86_64/PKGBUILD 2013-09-11 02:13:11 UTC (rev 97032) @@ -1,44 +0,0 @@ -# $Id$ -# Maintainer: -# Contributor: Mateusz Herych <heni...@gmail.com> -# Contributor: Stefano Zamprogno <stefano.zampro...@gmail.com> - -pkgname=kmess -pkgver=2.0.6.2 -pkgrel=3 -pkgdesc="A MSN Messenger client for Linux" -arch=('i686' 'x86_64') -url='http://kmess.sourceforge.net/' -license=('GPL') -depends=('kdebase-lib') -makedepends=('automoc4' 'cmake' 'optipng') -optdepends=('cabextract: provides winks support') -install=${pkgname}.install -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-$pkgver.tar.bz2" - giflib-5.0.patch) -md5sums=('a2e57911713308bef81b9347135cc5dd' - '97734b073bf4a45ed3612d7626541cee') - -prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # Fix invalid PNG images to work with libpng 1.6 - find -name '*.png' -exec optipng -quiet -force -fix {} + - - patch -Np1 -i ../giflib-5.0.patch -} - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} Copied: kmess/repos/community-x86_64/PKGBUILD (from rev 97031, kmess/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2013-09-11 02:13:11 UTC (rev 97032) @@ -0,0 +1,49 @@ +# $Id$ +# Maintainer: +# Contributor: Mateusz Herych <heni...@gmail.com> +# Contributor: Stefano Zamprogno <stefano.zampro...@gmail.com> + +pkgname=kmess +pkgver=2.0.6.2 +pkgrel=4 +pkgdesc="A MSN Messenger client for Linux" +arch=('i686' 'x86_64') +url='http://kmess.sourceforge.net/' +license=('GPL') +depends=('kdebase-lib') +makedepends=('automoc4' 'cmake' 'optipng') +optdepends=('cabextract: provides winks support') +install=${pkgname}.install +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-$pkgver.tar.bz2" + giflib-5.0.patch + fix-crash-in-contactlistmodel.patch) +md5sums=('a2e57911713308bef81b9347135cc5dd' + '97734b073bf4a45ed3612d7626541cee' + 'fdfe837f4bd64a5123edc63019bd5cf2') + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # Fix invalid PNG images to work with libpng 1.6 + find -name '*.png' -exec optipng -quiet -force -fix {} + + + patch -Np1 -i ../giflib-5.0.patch + + # Fix crash in ContactListModel (FS#32402) + patch -Np1 -i ../fix-crash-in-contactlistmodel.patch +} + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} Copied: kmess/repos/community-x86_64/fix-crash-in-contactlistmodel.patch (from rev 97031, kmess/trunk/fix-crash-in-contactlistmodel.patch) =================================================================== --- community-x86_64/fix-crash-in-contactlistmodel.patch (rev 0) +++ community-x86_64/fix-crash-in-contactlistmodel.patch 2013-09-11 02:13:11 UTC (rev 97032) @@ -0,0 +1,29 @@ +commit e10ebb8bd33cf807e2edfa56c465b40f3237102e +Author: Ruben Vandamme <ru...@kmess.org> +Date: Sun Jul 8 10:56:37 2012 +0200 + + Fix crash in ContactListModel. + + * Individually delete every child instead of using qDeleteAll. + * Crash only happens in combination with Qt 4.8. + * See https://bugs.kde.org/show_bug.cgi?id=285951 for similar issue in Amarok. + * See https://bugreports.qt-project.org/browse/QTBUG-22037 for Qt report. + * Many thanks to Bob ("badjar" on kmess.org/board) for providing the fix. + +diff --git a/src/model/contactlistmodelitem.cpp b/src/model/contactlistmodelitem.cpp +index 462d555..ac5a6ca 100644 +--- a/src/model/contactlistmodelitem.cpp ++++ b/src/model/contactlistmodelitem.cpp +@@ -79,7 +79,11 @@ ContactListModelItem::ContactListModelItem( Group *group, ContactListModelItem * + */ + ContactListModelItem::~ContactListModelItem() + { +- qDeleteAll( childItems_ ); ++ while( !childItems_.isEmpty() ) ++ { ++ delete childItems_.takeFirst(); ++ } ++ + childItems_.clear(); + + // Delete this item from the parent's children Deleted: community-x86_64/giflib-5.0.patch =================================================================== --- community-x86_64/giflib-5.0.patch 2013-09-11 02:12:51 UTC (rev 97031) +++ community-x86_64/giflib-5.0.patch 2013-09-11 02:13:11 UTC (rev 97032) @@ -1,85 +0,0 @@ -diff -rupN a/contrib/isf-qt/src/isfqt.cpp b/contrib/isf-qt/src/isfqt.cpp ---- a/contrib/isf-qt/src/isfqt.cpp 2012-02-18 16:28:01.000000000 +0000 -+++ b/contrib/isf-qt/src/isfqt.cpp 2013-07-30 20:51:06.705394145 +0000 -@@ -484,12 +484,13 @@ QByteArray Stream::writerGif( const Draw - int width = isfImage.width(); - int numColors = 0; - bool gifError = true; -+ int gifErrCode; - - // Convert the image to GIF using libgif - - // Open the gif file - gifData.open( QIODevice::WriteOnly ); -- gifImage = EGifOpen( (void*)&gifData, GifWriteToByteArray ); -+ gifImage = EGifOpen( (void*)&gifData, GifWriteToByteArray, &gifErrCode ); - if( gifImage == 0 ) - { - qWarning() << "Couldn't initialize gif library!"; -@@ -503,7 +504,7 @@ QByteArray Stream::writerGif( const Draw - numColors = 256; - } - -- cmap = MakeMapObject( numColors, NULL ); -+ cmap = GifMakeMapObject( numColors, NULL ); - if( cmap == 0 && isfImage.numColors() > 1 ) - { - qWarning() << "Couldn't create map object for gif conversion (colors:" << isfImage.numColors() << ")!"; -@@ -576,7 +577,7 @@ QByteArray Stream::writerGif( const Draw - else - { - // Write the extension -- if( EGifPutExtensionFirst( gifImage, COMMENT_EXT_FUNC_CODE, MAX_GIF_BYTE, isfData.left( MAX_GIF_BYTE ).data() ) == GIF_ERROR ) -+ if( EGifPutExtensionLeader( gifImage, COMMENT_EXT_FUNC_CODE) == GIF_ERROR ) - { - qWarning() << "EGifPutExtensionFirst failed!"; - goto writeError; -@@ -590,9 +591,9 @@ QByteArray Stream::writerGif( const Draw - // Write all the full data blocks - while( length >= MAX_GIF_BYTE ) - { -- if( EGifPutExtensionNext( gifImage, 0, MAX_GIF_BYTE, isfData.mid( pos, MAX_GIF_BYTE ).data() ) == GIF_ERROR ) -+ if( EGifPutExtensionBlock( gifImage, MAX_GIF_BYTE, isfData.mid( pos, MAX_GIF_BYTE ).data() ) == GIF_ERROR ) - { -- qWarning() << "EGifPutExtensionNext failed!"; -+ qWarning() << "EGifPutExtensionBlock failed!"; - goto writeError; - } - -@@ -603,17 +604,17 @@ QByteArray Stream::writerGif( const Draw - // Write the last block - if( length > 0 ) - { -- if( EGifPutExtensionLast( gifImage, 0, length, isfData.mid( pos, MAX_GIF_BYTE ).data() ) == GIF_ERROR ) -+ if( EGifPutExtensionTrailer( gifImage ) == GIF_ERROR ) - { -- qWarning() << "EGifPutExtensionLast (n) failed!"; -+ qWarning() << "EGifPutExtensionTrailer (n) failed!"; - goto writeError; - } - } - else - { -- if( EGifPutExtensionLast( gifImage, 0, 0, 0 ) == GIF_ERROR ) -+ if( EGifPutExtensionTrailer( gifImage ) == GIF_ERROR ) - { -- qWarning() << "EGifPutExtensionLast (0) failed!"; -+ qWarning() << "EGifPutExtensionTrailer (0) failed!"; - goto writeError; - } - } -@@ -624,12 +625,12 @@ QByteArray Stream::writerGif( const Draw - writeError: - // Clean up the GIF converter etc - EGifCloseFile( gifImage ); -- FreeMapObject( cmap ); -+ GifFreeMapObject( cmap ); - gifData.close(); - - if( gifError ) - { -- qWarning() << "GIF error code:" << GifLastError(); -+ qWarning() << "GIF error code:" << GifErrorString(gifErrCode); - } - else - { Copied: kmess/repos/community-x86_64/giflib-5.0.patch (from rev 97031, kmess/trunk/giflib-5.0.patch) =================================================================== --- community-x86_64/giflib-5.0.patch (rev 0) +++ community-x86_64/giflib-5.0.patch 2013-09-11 02:13:11 UTC (rev 97032) @@ -0,0 +1,85 @@ +diff -rupN a/contrib/isf-qt/src/isfqt.cpp b/contrib/isf-qt/src/isfqt.cpp +--- a/contrib/isf-qt/src/isfqt.cpp 2012-02-18 16:28:01.000000000 +0000 ++++ b/contrib/isf-qt/src/isfqt.cpp 2013-07-30 20:51:06.705394145 +0000 +@@ -484,12 +484,13 @@ QByteArray Stream::writerGif( const Draw + int width = isfImage.width(); + int numColors = 0; + bool gifError = true; ++ int gifErrCode; + + // Convert the image to GIF using libgif + + // Open the gif file + gifData.open( QIODevice::WriteOnly ); +- gifImage = EGifOpen( (void*)&gifData, GifWriteToByteArray ); ++ gifImage = EGifOpen( (void*)&gifData, GifWriteToByteArray, &gifErrCode ); + if( gifImage == 0 ) + { + qWarning() << "Couldn't initialize gif library!"; +@@ -503,7 +504,7 @@ QByteArray Stream::writerGif( const Draw + numColors = 256; + } + +- cmap = MakeMapObject( numColors, NULL ); ++ cmap = GifMakeMapObject( numColors, NULL ); + if( cmap == 0 && isfImage.numColors() > 1 ) + { + qWarning() << "Couldn't create map object for gif conversion (colors:" << isfImage.numColors() << ")!"; +@@ -576,7 +577,7 @@ QByteArray Stream::writerGif( const Draw + else + { + // Write the extension +- if( EGifPutExtensionFirst( gifImage, COMMENT_EXT_FUNC_CODE, MAX_GIF_BYTE, isfData.left( MAX_GIF_BYTE ).data() ) == GIF_ERROR ) ++ if( EGifPutExtensionLeader( gifImage, COMMENT_EXT_FUNC_CODE) == GIF_ERROR ) + { + qWarning() << "EGifPutExtensionFirst failed!"; + goto writeError; +@@ -590,9 +591,9 @@ QByteArray Stream::writerGif( const Draw + // Write all the full data blocks + while( length >= MAX_GIF_BYTE ) + { +- if( EGifPutExtensionNext( gifImage, 0, MAX_GIF_BYTE, isfData.mid( pos, MAX_GIF_BYTE ).data() ) == GIF_ERROR ) ++ if( EGifPutExtensionBlock( gifImage, MAX_GIF_BYTE, isfData.mid( pos, MAX_GIF_BYTE ).data() ) == GIF_ERROR ) + { +- qWarning() << "EGifPutExtensionNext failed!"; ++ qWarning() << "EGifPutExtensionBlock failed!"; + goto writeError; + } + +@@ -603,17 +604,17 @@ QByteArray Stream::writerGif( const Draw + // Write the last block + if( length > 0 ) + { +- if( EGifPutExtensionLast( gifImage, 0, length, isfData.mid( pos, MAX_GIF_BYTE ).data() ) == GIF_ERROR ) ++ if( EGifPutExtensionTrailer( gifImage ) == GIF_ERROR ) + { +- qWarning() << "EGifPutExtensionLast (n) failed!"; ++ qWarning() << "EGifPutExtensionTrailer (n) failed!"; + goto writeError; + } + } + else + { +- if( EGifPutExtensionLast( gifImage, 0, 0, 0 ) == GIF_ERROR ) ++ if( EGifPutExtensionTrailer( gifImage ) == GIF_ERROR ) + { +- qWarning() << "EGifPutExtensionLast (0) failed!"; ++ qWarning() << "EGifPutExtensionTrailer (0) failed!"; + goto writeError; + } + } +@@ -624,12 +625,12 @@ QByteArray Stream::writerGif( const Draw + writeError: + // Clean up the GIF converter etc + EGifCloseFile( gifImage ); +- FreeMapObject( cmap ); ++ GifFreeMapObject( cmap ); + gifData.close(); + + if( gifError ) + { +- qWarning() << "GIF error code:" << GifLastError(); ++ qWarning() << "GIF error code:" << GifErrorString(gifErrCode); + } + else + { Deleted: community-x86_64/kmess.install =================================================================== --- community-x86_64/kmess.install 2013-09-11 02:12:51 UTC (rev 97031) +++ community-x86_64/kmess.install 2013-09-11 02:13:11 UTC (rev 97032) @@ -1,11 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} Copied: kmess/repos/community-x86_64/kmess.install (from rev 97031, kmess/trunk/kmess.install) =================================================================== --- community-x86_64/kmess.install (rev 0) +++ community-x86_64/kmess.install 2013-09-11 02:13:11 UTC (rev 97032) @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +}