[arch-commits] Commit in (kmess)
Date: Monday, November 21, 2016 @ 20:00:12 Author: jlichtblau Revision: 196473 kmess removed from [community] - kdebase-lib is gone in 16.12 and we would like to avoid shipping another kde4 compat library Deleted: kmess/
[arch-commits] Commit in kmess/trunk (PKGBUILD)
Date: Monday, May 20, 2013 @ 23:10:04
Author: foutrelis
Revision: 91295
upgpkg: kmess 2.0.6.2-2
Fix invalid PNG images to work with libpng 1.6.
Modified:
kmess/trunk/PKGBUILD
--+
PKGBUILD | 11 +--
1 file changed, 9 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-05-20 20:42:41 UTC (rev 91294)
+++ PKGBUILD2013-05-20 21:10:04 UTC (rev 91295)
@@ -5,18 +5,25 @@
pkgname=kmess
pkgver=2.0.6.2
-pkgrel=1
+pkgrel=2
pkgdesc="A MSN Messenger client for Linux"
arch=('i686' 'x86_64')
url='http://kmess.sourceforge.net/'
license=('GPL')
depends=('kdebase-lib')
-makedepends=('automoc4' 'cmake')
+makedepends=('automoc4' 'cmake' 'optipng')
optdepends=('cabextract: provides winks support')
install=${pkgname}.install
source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-$pkgver.tar.bz2";)
md5sums=('a2e57911713308bef81b9347135cc5dd')
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ # Fix invalid PNG images to work with libpng 1.6
+ find -name '*.png' -exec optipng -quiet -force -fix {} +
+}
+
build() {
cd "${srcdir}"
mkdir build
[arch-commits] Commit in kmess/trunk (PKGBUILD)
Date: Wednesday, October 1, 2014 @ 08:30:05
Author: jlichtblau
Revision: 119921
kde4 translation rebuild: kmess 2.0.6.2-7
Modified:
kmess/trunk/PKGBUILD
--+
PKGBUILD | 13 -
1 file changed, 8 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-10-01 06:14:10 UTC (rev 119920)
+++ PKGBUILD2014-10-01 06:30:05 UTC (rev 119921)
@@ -5,7 +5,7 @@
pkgname=kmess
pkgver=2.0.6.2
-pkgrel=6
+pkgrel=7
pkgdesc="A MSN Messenger client for Linux"
arch=('i686' 'x86_64')
url='http://kmess.sourceforge.net/'
@@ -13,8 +13,8 @@
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";
+install=$pkgname.install
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-$pkgver.tar.bz2
giflib-5.0.patch
fix-crash-in-contactlistmodel.patch)
md5sums=('a2e57911713308bef81b9347135cc5dd'
@@ -24,26 +24,29 @@
prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
- # Fix invalid PNG images to work with libpng 1.6
+# Fix invalid PNG images to work with libpng 1.6
find -name '*.png' -exec optipng -quiet -force -fix {} +
patch -Np0 -i ../giflib-5.0.patch
- # Fix crash in ContactListModel (FS#32402)
+# 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
}
[arch-commits] Commit in kmess/trunk (PKGBUILD)
Date: Tuesday, April 14, 2015 @ 08:36:17
Author: arojas
Revision: 131338
KDE4 doc move
Modified:
kmess/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-04-14 06:29:37 UTC (rev 131337)
+++ PKGBUILD2015-04-14 06:36:17 UTC (rev 131338)
@@ -5,7 +5,7 @@
pkgname=kmess
pkgver=2.0.6.2
-pkgrel=7
+pkgrel=8
pkgdesc="A MSN Messenger client for Linux"
arch=('i686' 'x86_64')
url='http://kmess.sourceforge.net/'
[arch-commits] Commit in kmess/trunk (PKGBUILD)
Date: Wednesday, December 25, 2013 @ 14:47:03
Author: jlichtblau
Revision: 102998
upgpkg: kmess 2.0.6.2-5 libgcrypt 1.6.0 .so rebuild
Modified:
kmess/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-12-25 13:19:07 UTC (rev 102997)
+++ PKGBUILD2013-12-25 13:47:03 UTC (rev 102998)
@@ -1,11 +1,11 @@
# $Id$
-# Maintainer:
+# Maintainer: Jaroslav Lichtblau
# Contributor: Mateusz Herych
# Contributor: Stefano Zamprogno
pkgname=kmess
pkgver=2.0.6.2
-pkgrel=4
+pkgrel=5
pkgdesc="A MSN Messenger client for Linux"
arch=('i686' 'x86_64')
url='http://kmess.sourceforge.net/'
[arch-commits] Commit in kmess/trunk (PKGBUILD)
Date: Tuesday, December 8, 2015 @ 19:22:53
Author: foutrelis
Revision: 150354
C++11 ABI rebuild
Modified:
kmess/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-12-08 18:20:04 UTC (rev 150353)
+++ PKGBUILD2015-12-08 18:22:53 UTC (rev 150354)
@@ -5,7 +5,7 @@
pkgname=kmess
pkgver=2.0.6.2
-pkgrel=8
+pkgrel=9
pkgdesc="A MSN Messenger client for Linux"
arch=('i686' 'x86_64')
url='http://kmess.sourceforge.net/'
[arch-commits] Commit in kmess/repos (8 files)
Date: Monday, May 20, 2013 @ 23:10:18
Author: foutrelis
Revision: 91296
archrelease: copy trunk to community-i686, community-x86_64
Added:
kmess/repos/community-i686/PKGBUILD
(from rev 91295, kmess/trunk/PKGBUILD)
kmess/repos/community-i686/kmess.install
(from rev 91295, kmess/trunk/kmess.install)
kmess/repos/community-x86_64/PKGBUILD
(from rev 91295, kmess/trunk/PKGBUILD)
kmess/repos/community-x86_64/kmess.install
(from rev 91295, kmess/trunk/kmess.install)
Deleted:
kmess/repos/community-i686/PKGBUILD
kmess/repos/community-i686/kmess.install
kmess/repos/community-x86_64/PKGBUILD
kmess/repos/community-x86_64/kmess.install
+
/PKGBUILD | 80 +++
/kmess.install | 22 ++
community-i686/PKGBUILD| 33
community-i686/kmess.install | 11 -
community-x86_64/PKGBUILD | 33
community-x86_64/kmess.install | 11 -
6 files changed, 102 insertions(+), 88 deletions(-)
Deleted: community-i686/PKGBUILD
===
--- community-i686/PKGBUILD 2013-05-20 21:10:04 UTC (rev 91295)
+++ community-i686/PKGBUILD 2013-05-20 21:10:18 UTC (rev 91296)
@@ -1,33 +0,0 @@
-# $Id$
-# Maintainer:
-# Contributor: Mateusz Herych
-# Contributor: Stefano Zamprogno
-
-pkgname=kmess
-pkgver=2.0.6.2
-pkgrel=1
-pkgdesc="A MSN Messenger client for Linux"
-arch=('i686' 'x86_64')
-url='http://kmess.sourceforge.net/'
-license=('GPL')
-depends=('kdebase-lib')
-makedepends=('automoc4' 'cmake')
-optdepends=('cabextract: provides winks support')
-install=${pkgname}.install
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-$pkgver.tar.bz2";)
-md5sums=('a2e57911713308bef81b9347135cc5dd')
-
-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 91295,
kmess/trunk/PKGBUILD)
===
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2013-05-20 21:10:18 UTC (rev 91296)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer:
+# Contributor: Mateusz Herych
+# Contributor: Stefano Zamprogno
+
+pkgname=kmess
+pkgver=2.0.6.2
+pkgrel=2
+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";)
+md5sums=('a2e57911713308bef81b9347135cc5dd')
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ # Fix invalid PNG images to work with libpng 1.6
+ find -name '*.png' -exec optipng -quiet -force -fix {} +
+}
+
+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
+}
Deleted: community-i686/kmess.install
===
--- community-i686/kmess.install2013-05-20 21:10:04 UTC (rev 91295)
+++ community-i686/kmess.install2013-05-20 21:10:18 UTC (rev 91296)
@@ -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 91295,
kmess/trunk/kmess.install)
===
--- community-i686/kmess.install(rev 0)
+++ community-i686/kmess.install2013-05-20 21:10:18 UTC (rev 91296)
@@ -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-05-20 21:10:04 UTC (rev 91295)
+++ community-x86_64/PKGBUILD 2013-05-20 21:10:18 UTC (rev 91296)
@@ -1,33 +0,0 @@
-# $Id$
-# Maintainer:
-# Contributor: Mateusz Herych
-# Contributor: Stefano Zamprogno
-
-pkgname=kmess
-pkgver=2.0.6.2
-pkgrel=1
-pkgdesc="A MSN Messenger client for Linux"
-arch=('i686' 'x86_64')
-url='http://kmess.sourceforge.net/'
-license=('GPL')
-depends=('kdebase-lib')
-makedepends=('automoc4' 'cmake')
-optdepends=('cabextract: provides winks support')
-install=${pkgname}.install
-source=("http://downloads.sourceforge.net
[arch-commits] Commit in kmess/repos (8 files)
Date: Tuesday, July 30, 2013 @ 23:00:37
Author: bpiotrowski
Revision: 94807
archrelease: copy trunk to community-staging-i686, community-staging-x86_64
Added:
kmess/repos/community-staging-i686/
kmess/repos/community-staging-i686/PKGBUILD
(from rev 94806, kmess/trunk/PKGBUILD)
kmess/repos/community-staging-i686/giflib-5.0.patch
(from rev 94806, kmess/trunk/giflib-5.0.patch)
kmess/repos/community-staging-i686/kmess.install
(from rev 94806, kmess/trunk/kmess.install)
kmess/repos/community-staging-x86_64/
kmess/repos/community-staging-x86_64/PKGBUILD
(from rev 94806, kmess/trunk/PKGBUILD)
kmess/repos/community-staging-x86_64/giflib-5.0.patch
(from rev 94806, kmess/trunk/giflib-5.0.patch)
kmess/repos/community-staging-x86_64/kmess.install
(from rev 94806, kmess/trunk/kmess.install)
---+
community-staging-i686/PKGBUILD | 44 ++
community-staging-i686/giflib-5.0.patch | 85
community-staging-i686/kmess.install | 11 +++
community-staging-x86_64/PKGBUILD | 44 ++
community-staging-x86_64/giflib-5.0.patch | 85
community-staging-x86_64/kmess.install| 11 +++
6 files changed, 280 insertions(+)
Copied: kmess/repos/community-staging-i686/PKGBUILD (from rev 94806,
kmess/trunk/PKGBUILD)
===
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2013-07-30 21:00:37 UTC (rev 94807)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer:
+# Contributor: Mateusz Herych
+# Contributor: Stefano Zamprogno
+
+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-staging-i686/giflib-5.0.patch (from rev 94806,
kmess/trunk/giflib-5.0.patch)
===
--- community-staging-i686/giflib-5.0.patch (rev 0)
+++ community-staging-i686/giflib-5.0.patch 2013-07-30 21:00:37 UTC (rev
94807)
@@ -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.0 +
b/contrib/isf-qt/src/isfqt.cpp 2013-07-30 20:51:06.705394145 +
+@@ -484,12 +484,13 @@ QByteArray Stream::writerGif( const Draw
+ int width = isfImage.width();
+ int numColors = 0;
+ boolgifError = 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
[arch-commits] Commit in kmess/repos (5 files)
Date: Wednesday, October 1, 2014 @ 08:30:16
Author: jlichtblau
Revision: 119922
archrelease: copy trunk to community-staging-x86_64
Added:
kmess/repos/community-staging-x86_64/
kmess/repos/community-staging-x86_64/PKGBUILD
(from rev 119921, kmess/trunk/PKGBUILD)
kmess/repos/community-staging-x86_64/fix-crash-in-contactlistmodel.patch
(from rev 119921, kmess/trunk/fix-crash-in-contactlistmodel.patch)
kmess/repos/community-staging-x86_64/giflib-5.0.patch
(from rev 119921, kmess/trunk/giflib-5.0.patch)
kmess/repos/community-staging-x86_64/kmess.install
(from rev 119921, kmess/trunk/kmess.install)
-+
PKGBUILD| 52 ++
fix-crash-in-contactlistmodel.patch | 29 ++
giflib-5.0.patch| 95 ++
kmess.install | 11 +++
4 files changed, 187 insertions(+)
Copied: kmess/repos/community-staging-x86_64/PKGBUILD (from rev 119921,
kmess/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2014-10-01 06:30:16 UTC (rev 119922)
@@ -0,0 +1,52 @@
+# $Id$
+# Maintainer: Jaroslav Lichtblau
+# Contributor: Mateusz Herych
+# Contributor: Stefano Zamprogno
+
+pkgname=kmess
+pkgver=2.0.6.2
+pkgrel=7
+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'
+ '29f7a0c0e27d6b5cafbc3ad498e3e30f'
+ '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 -Np0 -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-staging-x86_64/fix-crash-in-contactlistmodel.patch (from
rev 119921, kmess/trunk/fix-crash-in-contactlistmodel.patch)
===
--- community-staging-x86_64/fix-crash-in-contactlistmodel.patch
(rev 0)
+++ community-staging-x86_64/fix-crash-in-contactlistmodel.patch
2014-10-01 06:30:16 UTC (rev 119922)
@@ -0,0 +1,29 @@
+commit e10ebb8bd33cf807e2edfa56c465b40f3237102e
+Author: Ruben Vandamme
+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
Copied: kmess/repos/community-staging-x86_64/giflib-5.0.patch (from rev 119921,
kmess/trunk/giflib-5.0.patch)
===
--- community-staging-x86_64/giflib-5.0.patch (rev 0)
+++ community-staging-x86_64/giflib-5.0.patch 2014-10-01 06:30:16 UTC (rev
119922)
@@ -0,0 +1,95 @@
+--- contrib/isf-qt/src/isfqt.cpp.orig 2014-06-11 13:10:43.137321400 +
contrib/isf-qt/src/isfqt.cpp 2014-06-11 13:12:23.123474616 +
+@@ -249,7 +249,7 @@
+ qWarning() << "Couldn't initialize GIF library!";
+ }
+
+- DGifCloseFile( gifImage );
++ DGifCloseFile( gifImage, NULL );
+ gifData.close();
+ */
+
+@@ -484,12 +484,13 @@
+ int width = isfImage.width();
+ int numColors = 0;
+ boolgifError = true;
++ int gifErrCode;
+
+ // Convert the image
[arch-commits] Commit in kmess/repos (5 files)
Date: Wednesday, October 1, 2014 @ 08:41:09
Author: jlichtblau
Revision: 119925
archrelease: copy trunk to community-staging-i686
Added:
kmess/repos/community-staging-i686/
kmess/repos/community-staging-i686/PKGBUILD
(from rev 119924, kmess/trunk/PKGBUILD)
kmess/repos/community-staging-i686/fix-crash-in-contactlistmodel.patch
(from rev 119924, kmess/trunk/fix-crash-in-contactlistmodel.patch)
kmess/repos/community-staging-i686/giflib-5.0.patch
(from rev 119924, kmess/trunk/giflib-5.0.patch)
kmess/repos/community-staging-i686/kmess.install
(from rev 119924, kmess/trunk/kmess.install)
-+
PKGBUILD| 52 ++
fix-crash-in-contactlistmodel.patch | 29 ++
giflib-5.0.patch| 95 ++
kmess.install | 11 +++
4 files changed, 187 insertions(+)
Copied: kmess/repos/community-staging-i686/PKGBUILD (from rev 119924,
kmess/trunk/PKGBUILD)
===
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2014-10-01 06:41:09 UTC (rev 119925)
@@ -0,0 +1,52 @@
+# $Id$
+# Maintainer: Jaroslav Lichtblau
+# Contributor: Mateusz Herych
+# Contributor: Stefano Zamprogno
+
+pkgname=kmess
+pkgver=2.0.6.2
+pkgrel=7
+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'
+ '29f7a0c0e27d6b5cafbc3ad498e3e30f'
+ '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 -Np0 -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-staging-i686/fix-crash-in-contactlistmodel.patch
(from rev 119924, kmess/trunk/fix-crash-in-contactlistmodel.patch)
===
--- community-staging-i686/fix-crash-in-contactlistmodel.patch
(rev 0)
+++ community-staging-i686/fix-crash-in-contactlistmodel.patch 2014-10-01
06:41:09 UTC (rev 119925)
@@ -0,0 +1,29 @@
+commit e10ebb8bd33cf807e2edfa56c465b40f3237102e
+Author: Ruben Vandamme
+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
Copied: kmess/repos/community-staging-i686/giflib-5.0.patch (from rev 119924,
kmess/trunk/giflib-5.0.patch)
===
--- community-staging-i686/giflib-5.0.patch (rev 0)
+++ community-staging-i686/giflib-5.0.patch 2014-10-01 06:41:09 UTC (rev
119925)
@@ -0,0 +1,95 @@
+--- contrib/isf-qt/src/isfqt.cpp.orig 2014-06-11 13:10:43.137321400 +
contrib/isf-qt/src/isfqt.cpp 2014-06-11 13:12:23.123474616 +
+@@ -249,7 +249,7 @@
+ qWarning() << "Couldn't initialize GIF library!";
+ }
+
+- DGifCloseFile( gifImage );
++ DGifCloseFile( gifImage, NULL );
+ gifData.close();
+ */
+
+@@ -484,12 +484,13 @@
+ int width = isfImage.width();
+ int numColors = 0;
+ boolgifError = true;
++ int gifErrCode;
+
+ // Convert the image to GIF using libgif
+
+ // Open
[arch-commits] Commit in kmess/repos (10 files)
Date: Tuesday, April 14, 2015 @ 08:37:16
Author: arojas
Revision: 131339
archrelease: copy trunk to community-staging-i686, community-staging-x86_64
Added:
kmess/repos/community-staging-i686/
kmess/repos/community-staging-i686/PKGBUILD
(from rev 131338, kmess/trunk/PKGBUILD)
kmess/repos/community-staging-i686/fix-crash-in-contactlistmodel.patch
(from rev 131338, kmess/trunk/fix-crash-in-contactlistmodel.patch)
kmess/repos/community-staging-i686/giflib-5.0.patch
(from rev 131338, kmess/trunk/giflib-5.0.patch)
kmess/repos/community-staging-i686/kmess.install
(from rev 131338, kmess/trunk/kmess.install)
kmess/repos/community-staging-x86_64/
kmess/repos/community-staging-x86_64/PKGBUILD
(from rev 131338, kmess/trunk/PKGBUILD)
kmess/repos/community-staging-x86_64/fix-crash-in-contactlistmodel.patch
(from rev 131338, kmess/trunk/fix-crash-in-contactlistmodel.patch)
kmess/repos/community-staging-x86_64/giflib-5.0.patch
(from rev 131338, kmess/trunk/giflib-5.0.patch)
kmess/repos/community-staging-x86_64/kmess.install
(from rev 131338, kmess/trunk/kmess.install)
--+
community-staging-i686/PKGBUILD | 52 +
community-staging-i686/fix-crash-in-contactlistmodel.patch | 29 +++
community-staging-i686/giflib-5.0.patch | 95 ++
community-staging-i686/kmess.install | 11 +
community-staging-x86_64/PKGBUILD| 52 +
community-staging-x86_64/fix-crash-in-contactlistmodel.patch | 29 +++
community-staging-x86_64/giflib-5.0.patch| 95 ++
community-staging-x86_64/kmess.install | 11 +
8 files changed, 374 insertions(+)
Copied: kmess/repos/community-staging-i686/PKGBUILD (from rev 131338,
kmess/trunk/PKGBUILD)
===
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2015-04-14 06:37:16 UTC (rev 131339)
@@ -0,0 +1,52 @@
+# $Id$
+# Maintainer: Jaroslav Lichtblau
+# Contributor: Mateusz Herych
+# Contributor: Stefano Zamprogno
+
+pkgname=kmess
+pkgver=2.0.6.2
+pkgrel=8
+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'
+ '29f7a0c0e27d6b5cafbc3ad498e3e30f'
+ '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 -Np0 -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-staging-i686/fix-crash-in-contactlistmodel.patch
(from rev 131338, kmess/trunk/fix-crash-in-contactlistmodel.patch)
===
--- community-staging-i686/fix-crash-in-contactlistmodel.patch
(rev 0)
+++ community-staging-i686/fix-crash-in-contactlistmodel.patch 2015-04-14
06:37:16 UTC (rev 131339)
@@ -0,0 +1,29 @@
+commit e10ebb8bd33cf807e2edfa56c465b40f3237102e
+Author: Ruben Vandamme
+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
Copied: kmess/repos/community-staging-i686/giflib-
[arch-commits] Commit in kmess/repos (14 files)
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
-# Contributor: Stefano Zamprogno
-
-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
+# Contributor: Stefano Zamprogno
+
+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-
[arch-commits] Commit in kmess/repos (5 files)
Date: Wednesday, December 25, 2013 @ 14:47:18
Author: jlichtblau
Revision: 102999
archrelease: copy trunk to community-staging-i686
Added:
kmess/repos/community-staging-i686/
kmess/repos/community-staging-i686/PKGBUILD
(from rev 102998, kmess/trunk/PKGBUILD)
kmess/repos/community-staging-i686/fix-crash-in-contactlistmodel.patch
(from rev 102998, kmess/trunk/fix-crash-in-contactlistmodel.patch)
kmess/repos/community-staging-i686/giflib-5.0.patch
(from rev 102998, kmess/trunk/giflib-5.0.patch)
kmess/repos/community-staging-i686/kmess.install
(from rev 102998, kmess/trunk/kmess.install)
-+
PKGBUILD| 49 +++
fix-crash-in-contactlistmodel.patch | 29 +++
giflib-5.0.patch| 85 ++
kmess.install | 11
4 files changed, 174 insertions(+)
Copied: kmess/repos/community-staging-i686/PKGBUILD (from rev 102998,
kmess/trunk/PKGBUILD)
===
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2013-12-25 13:47:18 UTC (rev 102999)
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer: Jaroslav Lichtblau
+# Contributor: Mateusz Herych
+# Contributor: Stefano Zamprogno
+
+pkgname=kmess
+pkgver=2.0.6.2
+pkgrel=5
+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-staging-i686/fix-crash-in-contactlistmodel.patch
(from rev 102998, kmess/trunk/fix-crash-in-contactlistmodel.patch)
===
--- community-staging-i686/fix-crash-in-contactlistmodel.patch
(rev 0)
+++ community-staging-i686/fix-crash-in-contactlistmodel.patch 2013-12-25
13:47:18 UTC (rev 102999)
@@ -0,0 +1,29 @@
+commit e10ebb8bd33cf807e2edfa56c465b40f3237102e
+Author: Ruben Vandamme
+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
Copied: kmess/repos/community-staging-i686/giflib-5.0.patch (from rev 102998,
kmess/trunk/giflib-5.0.patch)
===
--- community-staging-i686/giflib-5.0.patch (rev 0)
+++ community-staging-i686/giflib-5.0.patch 2013-12-25 13:47:18 UTC (rev
102999)
@@ -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.0 +
b/contrib/isf-qt/src/isfqt.cpp 2013-07-30 20:51:06.705394145 +
+@@ -484,12 +484,13 @@ QByteArray Stream::writerGif( const Draw
+ int width = isfImage.width();
+ int numColors = 0;
+ boolgifError = true;
++ int gifErrCode;
+
+ // Convert the image to GIF using libgif
+
+ // Open the gif file
+ gifData.open( QIODevice::WriteOnly );
+-
[arch-commits] Commit in kmess/repos (5 files)
Date: Wednesday, December 25, 2013 @ 14:58:51
Author: jlichtblau
Revision: 103000
archrelease: copy trunk to community-staging-x86_64
Added:
kmess/repos/community-staging-x86_64/
kmess/repos/community-staging-x86_64/PKGBUILD
(from rev 102999, kmess/trunk/PKGBUILD)
kmess/repos/community-staging-x86_64/fix-crash-in-contactlistmodel.patch
(from rev 102999, kmess/trunk/fix-crash-in-contactlistmodel.patch)
kmess/repos/community-staging-x86_64/giflib-5.0.patch
(from rev 102999, kmess/trunk/giflib-5.0.patch)
kmess/repos/community-staging-x86_64/kmess.install
(from rev 102999, kmess/trunk/kmess.install)
-+
PKGBUILD| 49 +++
fix-crash-in-contactlistmodel.patch | 29 +++
giflib-5.0.patch| 85 ++
kmess.install | 11
4 files changed, 174 insertions(+)
Copied: kmess/repos/community-staging-x86_64/PKGBUILD (from rev 102999,
kmess/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2013-12-25 13:58:51 UTC (rev 103000)
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer: Jaroslav Lichtblau
+# Contributor: Mateusz Herych
+# Contributor: Stefano Zamprogno
+
+pkgname=kmess
+pkgver=2.0.6.2
+pkgrel=5
+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-staging-x86_64/fix-crash-in-contactlistmodel.patch (from
rev 102999, kmess/trunk/fix-crash-in-contactlistmodel.patch)
===
--- community-staging-x86_64/fix-crash-in-contactlistmodel.patch
(rev 0)
+++ community-staging-x86_64/fix-crash-in-contactlistmodel.patch
2013-12-25 13:58:51 UTC (rev 103000)
@@ -0,0 +1,29 @@
+commit e10ebb8bd33cf807e2edfa56c465b40f3237102e
+Author: Ruben Vandamme
+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
Copied: kmess/repos/community-staging-x86_64/giflib-5.0.patch (from rev 102999,
kmess/trunk/giflib-5.0.patch)
===
--- community-staging-x86_64/giflib-5.0.patch (rev 0)
+++ community-staging-x86_64/giflib-5.0.patch 2013-12-25 13:58:51 UTC (rev
103000)
@@ -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.0 +
b/contrib/isf-qt/src/isfqt.cpp 2013-07-30 20:51:06.705394145 +
+@@ -484,12 +484,13 @@ QByteArray Stream::writerGif( const Draw
+ int width = isfImage.width();
+ int numColors = 0;
+ boolgifError = true;
++ int gifErrCode;
+
+ // Convert the image to GIF using libgif
+
+ // Open the gif file
+ gifData
[arch-commits] Commit in kmess/repos (10 files)
Date: Wednesday, June 11, 2014 @ 15:27:48
Author: jgc
Revision: 113014
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
kmess/repos/staging-i686/
kmess/repos/staging-i686/PKGBUILD
(from rev 113013, kmess/trunk/PKGBUILD)
kmess/repos/staging-i686/fix-crash-in-contactlistmodel.patch
(from rev 113013, kmess/trunk/fix-crash-in-contactlistmodel.patch)
kmess/repos/staging-i686/giflib-5.0.patch
(from rev 113013, kmess/trunk/giflib-5.0.patch)
kmess/repos/staging-i686/kmess.install
(from rev 113013, kmess/trunk/kmess.install)
kmess/repos/staging-x86_64/
kmess/repos/staging-x86_64/PKGBUILD
(from rev 113013, kmess/trunk/PKGBUILD)
kmess/repos/staging-x86_64/fix-crash-in-contactlistmodel.patch
(from rev 113013, kmess/trunk/fix-crash-in-contactlistmodel.patch)
kmess/repos/staging-x86_64/giflib-5.0.patch
(from rev 113013, kmess/trunk/giflib-5.0.patch)
kmess/repos/staging-x86_64/kmess.install
(from rev 113013, kmess/trunk/kmess.install)
+
staging-i686/PKGBUILD | 49 +
staging-i686/fix-crash-in-contactlistmodel.patch | 29 +
staging-i686/giflib-5.0.patch | 95 +++
staging-i686/kmess.install | 11 ++
staging-x86_64/PKGBUILD| 49 +
staging-x86_64/fix-crash-in-contactlistmodel.patch | 29 +
staging-x86_64/giflib-5.0.patch| 95 +++
staging-x86_64/kmess.install | 11 ++
8 files changed, 368 insertions(+)
Copied: kmess/repos/staging-i686/PKGBUILD (from rev 113013,
kmess/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2014-06-11 13:27:48 UTC (rev 113014)
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer: Jaroslav Lichtblau
+# Contributor: Mateusz Herych
+# Contributor: Stefano Zamprogno
+
+pkgname=kmess
+pkgver=2.0.6.2
+pkgrel=6
+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'
+ '29f7a0c0e27d6b5cafbc3ad498e3e30f'
+ '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 -Np0 -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/staging-i686/fix-crash-in-contactlistmodel.patch (from rev
113013, kmess/trunk/fix-crash-in-contactlistmodel.patch)
===
--- staging-i686/fix-crash-in-contactlistmodel.patch
(rev 0)
+++ staging-i686/fix-crash-in-contactlistmodel.patch2014-06-11 13:27:48 UTC
(rev 113014)
@@ -0,0 +1,29 @@
+commit e10ebb8bd33cf807e2edfa56c465b40f3237102e
+Author: Ruben Vandamme
+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
Copied: kmess/repos/staging-i686/giflib-5.0.patch (from rev 113013,
kmess/trunk/giflib-5.0.patch)
===
--- staging-i686/giflib-5.0.patch (rev 0)
+++ staging-i686/giflib-5.0.patch
[arch-commits] Commit in kmess/repos (4 files)
Date: Wednesday, June 11, 2014 @ 15:33:10 Author: jgc Revision: 113015 Fix repo name Added: kmess/repos/community-staging-i686/ kmess/repos/community-staging-x86_64/ Deleted: kmess/repos/staging-i686/ kmess/repos/staging-x86_64/
[arch-commits] Commit in kmess/repos (10 files)
Date: Tuesday, December 8, 2015 @ 19:23:04
Author: foutrelis
Revision: 150355
archrelease: copy trunk to community-staging-i686, community-staging-x86_64
Added:
kmess/repos/community-staging-i686/
kmess/repos/community-staging-i686/PKGBUILD
(from rev 150354, kmess/trunk/PKGBUILD)
kmess/repos/community-staging-i686/fix-crash-in-contactlistmodel.patch
(from rev 150354, kmess/trunk/fix-crash-in-contactlistmodel.patch)
kmess/repos/community-staging-i686/giflib-5.0.patch
(from rev 150354, kmess/trunk/giflib-5.0.patch)
kmess/repos/community-staging-i686/kmess.install
(from rev 150354, kmess/trunk/kmess.install)
kmess/repos/community-staging-x86_64/
kmess/repos/community-staging-x86_64/PKGBUILD
(from rev 150354, kmess/trunk/PKGBUILD)
kmess/repos/community-staging-x86_64/fix-crash-in-contactlistmodel.patch
(from rev 150354, kmess/trunk/fix-crash-in-contactlistmodel.patch)
kmess/repos/community-staging-x86_64/giflib-5.0.patch
(from rev 150354, kmess/trunk/giflib-5.0.patch)
kmess/repos/community-staging-x86_64/kmess.install
(from rev 150354, kmess/trunk/kmess.install)
--+
community-staging-i686/PKGBUILD | 52 +
community-staging-i686/fix-crash-in-contactlistmodel.patch | 29 +++
community-staging-i686/giflib-5.0.patch | 95 ++
community-staging-i686/kmess.install | 11 +
community-staging-x86_64/PKGBUILD| 52 +
community-staging-x86_64/fix-crash-in-contactlistmodel.patch | 29 +++
community-staging-x86_64/giflib-5.0.patch| 95 ++
community-staging-x86_64/kmess.install | 11 +
8 files changed, 374 insertions(+)
Copied: kmess/repos/community-staging-i686/PKGBUILD (from rev 150354,
kmess/trunk/PKGBUILD)
===
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2015-12-08 18:23:04 UTC (rev 150355)
@@ -0,0 +1,52 @@
+# $Id$
+# Maintainer: Jaroslav Lichtblau
+# Contributor: Mateusz Herych
+# Contributor: Stefano Zamprogno
+
+pkgname=kmess
+pkgver=2.0.6.2
+pkgrel=9
+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'
+ '29f7a0c0e27d6b5cafbc3ad498e3e30f'
+ '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 -Np0 -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-staging-i686/fix-crash-in-contactlistmodel.patch
(from rev 150354, kmess/trunk/fix-crash-in-contactlistmodel.patch)
===
--- community-staging-i686/fix-crash-in-contactlistmodel.patch
(rev 0)
+++ community-staging-i686/fix-crash-in-contactlistmodel.patch 2015-12-08
18:23:04 UTC (rev 150355)
@@ -0,0 +1,29 @@
+commit e10ebb8bd33cf807e2edfa56c465b40f3237102e
+Author: Ruben Vandamme
+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
Copied: kmess/repos/community-staging-i686/gi
[arch-commits] Commit in kmess/trunk (PKGBUILD kmess.install)
Date: Sunday, May 1, 2016 @ 12:02:33
Author: jlichtblau
Revision: 173229
upgpkg: kmess 2.0.6.2-10 pacman hooks part 1 rebuild
Modified:
kmess/trunk/PKGBUILD
Deleted:
kmess/trunk/kmess.install
---+
PKGBUILD | 21 ++---
kmess.install | 11 ---
2 files changed, 10 insertions(+), 22 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2016-05-01 09:59:21 UTC (rev 173228)
+++ PKGBUILD2016-05-01 10:02:33 UTC (rev 173229)
@@ -1,28 +1,27 @@
# $Id$
-# Maintainer: Jaroslav Lichtblau
+# Maintainer: Jaroslav Lichtblau
# Contributor: Mateusz Herych
# Contributor: Stefano Zamprogno
pkgname=kmess
pkgver=2.0.6.2
-pkgrel=9
+pkgrel=10
pkgdesc="A MSN Messenger client for Linux"
arch=('i686' 'x86_64')
-url='http://kmess.sourceforge.net/'
+url='https://sourceforge.net/projects/kmess/'
license=('GPL')
depends=('kdebase-lib')
-makedepends=('automoc4' 'cmake' 'optipng')
+makedepends=('automoc4' 'cmake' 'optipng' 'patch')
optdepends=('cabextract: provides winks support')
-install=$pkgname.install
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-$pkgver.tar.bz2
+source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
giflib-5.0.patch
fix-crash-in-contactlistmodel.patch)
-md5sums=('a2e57911713308bef81b9347135cc5dd'
- '29f7a0c0e27d6b5cafbc3ad498e3e30f'
- 'fdfe837f4bd64a5123edc63019bd5cf2')
+sha256sums=('d6af80d2144d3b859b46bc3aa18eaecb1329f1782bf165bda5617a92ec8a6a8e'
+'3026df002dd0a829588c8d3b2c9b4674a411c784e2e34e56c3b1829c868ea83c'
+'f496008e3a43eeb22a3f9126d410fb61e97ca7c5d9e5a2ba2f4a87c2f74d1dce')
prepare() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd "${srcdir}"/$pkgname-$pkgver
# Fix invalid PNG images to work with libpng 1.6
find -name '*.png' -exec optipng -quiet -force -fix {} +
@@ -38,7 +37,7 @@
mkdir build
cd build
- cmake ../${pkgname}-${pkgver} \
+ cmake ../$pkgname-$pkgver \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_BUILD_TYPE=Release
Deleted: kmess.install
===
--- kmess.install 2016-05-01 09:59:21 UTC (rev 173228)
+++ kmess.install 2016-05-01 10:02:33 UTC (rev 173229)
@@ -1,11 +0,0 @@
-post_install() {
-xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-post_install
-}
-
-post_remove() {
-post_install
-}
[arch-commits] Commit in kmess/repos (14 files)
Date: Sunday, May 1, 2016 @ 12:03:32
Author: jlichtblau
Revision: 173230
archrelease: copy trunk to community-i686, community-x86_64
Added:
kmess/repos/community-i686/PKGBUILD
(from rev 173229, kmess/trunk/PKGBUILD)
kmess/repos/community-i686/fix-crash-in-contactlistmodel.patch
(from rev 173229, kmess/trunk/fix-crash-in-contactlistmodel.patch)
kmess/repos/community-i686/giflib-5.0.patch
(from rev 173229, kmess/trunk/giflib-5.0.patch)
kmess/repos/community-x86_64/PKGBUILD
(from rev 173229, kmess/trunk/PKGBUILD)
kmess/repos/community-x86_64/fix-crash-in-contactlistmodel.patch
(from rev 173229, kmess/trunk/fix-crash-in-contactlistmodel.patch)
kmess/repos/community-x86_64/giflib-5.0.patch
(from rev 173229, kmess/trunk/giflib-5.0.patch)
Deleted:
kmess/repos/community-i686/PKGBUILD
kmess/repos/community-i686/fix-crash-in-contactlistmodel.patch
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/fix-crash-in-contactlistmodel.patch
kmess/repos/community-x86_64/giflib-5.0.patch
kmess/repos/community-x86_64/kmess.install
--+
/PKGBUILD| 102 +
/fix-crash-in-contactlistmodel.patch | 58 +
/giflib-5.0.patch| 190 +
community-i686/PKGBUILD | 52
community-i686/fix-crash-in-contactlistmodel.patch | 29 --
community-i686/giflib-5.0.patch | 95
community-i686/kmess.install | 11
community-x86_64/PKGBUILD| 52
community-x86_64/fix-crash-in-contactlistmodel.patch | 29 --
community-x86_64/giflib-5.0.patch| 95
community-x86_64/kmess.install | 11
11 files changed, 350 insertions(+), 374 deletions(-)
Deleted: community-i686/PKGBUILD
===
--- community-i686/PKGBUILD 2016-05-01 10:02:33 UTC (rev 173229)
+++ community-i686/PKGBUILD 2016-05-01 10:03:32 UTC (rev 173230)
@@ -1,52 +0,0 @@
-# $Id$
-# Maintainer: Jaroslav Lichtblau
-# Contributor: Mateusz Herych
-# Contributor: Stefano Zamprogno
-
-pkgname=kmess
-pkgver=2.0.6.2
-pkgrel=9
-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'
- '29f7a0c0e27d6b5cafbc3ad498e3e30f'
- '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 -Np0 -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/PKGBUILD (from rev 173229,
kmess/trunk/PKGBUILD)
===
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2016-05-01 10:03:32 UTC (rev 173230)
@@ -0,0 +1,51 @@
+# $Id$
+# Maintainer: Jaroslav Lichtblau
+# Contributor: Mateusz Herych
+# Contributor: Stefano Zamprogno
+
+pkgname=kmess
+pkgver=2.0.6.2
+pkgrel=10
+pkgdesc="A MSN Messenger client for Linux"
+arch=('i686' 'x86_64')
+url='https://sourceforge.net/projects/kmess/'
+license=('GPL')
+depends=('kdebase-lib')
+makedepends=('automoc4' 'cmake' 'optipng' 'patch')
+optdepends=('cabextract: provides winks support')
+source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
+giflib-5.0.patch
+fix-crash-in-contactlistmodel.patch)
+sha256sums=('d6af80d2144d3b859b46bc3aa18eaecb1329f1782bf165bda5617a92ec8a6a8e'
+'3026df002dd0a829588c8d3b2c9b4674a411c784e2e34e56c3b1829c868ea83c'
+'f496008e3a43eeb22a3f9126d410fb61e97ca7c5d9e5a2ba2f4a87c2f74d1dce')
+
+prepare() {
+ cd "${srcdir}"/$pkgname-$pkgver
+
+# Fix invalid PNG images to work with libpng 1.6
+ find -name '*.png' -exec optipng -quiet -force -fix {} +
+
+ patch -Np0 -i ../giflib-5.0.patch
+
+# Fix crash in ContactListModel (FS#32402)
+ patch -Np1 -i ../fix-crash-in-contactlistmodel.patch
+}
+
+build() {
+
[arch-commits] Commit in kmess/trunk (PKGBUILD giflib-5.0.patch)
Date: Tuesday, July 30, 2013 @ 23:00:21
Author: bpiotrowski
Revision: 94806
upgpkg: kmess 2.0.6.2-3
- giflib 5.0 rebuild
Added:
kmess/trunk/giflib-5.0.patch
Modified:
kmess/trunk/PKGBUILD
--+
PKGBUILD | 10 --
giflib-5.0.patch | 85 +
2 files changed, 92 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-07-30 20:37:58 UTC (rev 94805)
+++ PKGBUILD2013-07-30 21:00:21 UTC (rev 94806)
@@ -5,7 +5,7 @@
pkgname=kmess
pkgver=2.0.6.2
-pkgrel=2
+pkgrel=3
pkgdesc="A MSN Messenger client for Linux"
arch=('i686' 'x86_64')
url='http://kmess.sourceforge.net/'
@@ -14,14 +14,18 @@
makedepends=('automoc4' 'cmake' 'optipng')
optdepends=('cabextract: provides winks support')
install=${pkgname}.install
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-$pkgver.tar.bz2";)
-md5sums=('a2e57911713308bef81b9347135cc5dd')
+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() {
Added: giflib-5.0.patch
===
--- giflib-5.0.patch(rev 0)
+++ giflib-5.0.patch2013-07-30 21:00:21 UTC (rev 94806)
@@ -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.0 +
b/contrib/isf-qt/src/isfqt.cpp 2013-07-30 20:51:06.705394145 +
+@@ -484,12 +484,13 @@ QByteArray Stream::writerGif( const Draw
+ int width = isfImage.width();
+ int numColors = 0;
+ boolgifError = 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
+ {
[arch-commits] Commit in kmess/trunk (PKGBUILD giflib-5.0.patch)
Date: Wednesday, June 11, 2014 @ 15:27:40
Author: jgc
Revision: 113013
upgpkg: kmess 2.0.6.2-6
giflib rebuild
Modified:
kmess/trunk/PKGBUILD
kmess/trunk/giflib-5.0.patch
--+
PKGBUILD |6 +++---
giflib-5.0.patch | 30 --
2 files changed, 23 insertions(+), 13 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-06-11 13:18:17 UTC (rev 113012)
+++ PKGBUILD2014-06-11 13:27:40 UTC (rev 113013)
@@ -5,7 +5,7 @@
pkgname=kmess
pkgver=2.0.6.2
-pkgrel=5
+pkgrel=6
pkgdesc="A MSN Messenger client for Linux"
arch=('i686' 'x86_64')
url='http://kmess.sourceforge.net/'
@@ -18,7 +18,7 @@
giflib-5.0.patch
fix-crash-in-contactlistmodel.patch)
md5sums=('a2e57911713308bef81b9347135cc5dd'
- '97734b073bf4a45ed3612d7626541cee'
+ '29f7a0c0e27d6b5cafbc3ad498e3e30f'
'fdfe837f4bd64a5123edc63019bd5cf2')
prepare() {
@@ -27,7 +27,7 @@
# 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
+ patch -Np0 -i ../giflib-5.0.patch
# Fix crash in ContactListModel (FS#32402)
patch -Np1 -i ../fix-crash-in-contactlistmodel.patch
Modified: giflib-5.0.patch
===
--- giflib-5.0.patch2014-06-11 13:18:17 UTC (rev 113012)
+++ giflib-5.0.patch2014-06-11 13:27:40 UTC (rev 113013)
@@ -1,7 +1,15 @@
-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.0 +
-+++ b/contrib/isf-qt/src/isfqt.cpp 2013-07-30 20:51:06.705394145 +
-@@ -484,12 +484,13 @@ QByteArray Stream::writerGif( const Draw
+--- contrib/isf-qt/src/isfqt.cpp.orig 2014-06-11 13:10:43.137321400 +
contrib/isf-qt/src/isfqt.cpp 2014-06-11 13:12:23.123474616 +
+@@ -249,7 +249,7 @@
+ qWarning() << "Couldn't initialize GIF library!";
+ }
+
+- DGifCloseFile( gifImage );
++ DGifCloseFile( gifImage, NULL );
+ gifData.close();
+ */
+
+@@ -484,12 +484,13 @@
int width = isfImage.width();
int numColors = 0;
boolgifError = true;
@@ -16,7 +24,7 @@
if( gifImage == 0 )
{
qWarning() << "Couldn't initialize gif library!";
-@@ -503,7 +504,7 @@ QByteArray Stream::writerGif( const Draw
+@@ -503,7 +504,7 @@
numColors = 256;
}
@@ -25,7 +33,7 @@
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
+@@ -576,7 +577,7 @@
else
{
// Write the extension
@@ -34,7 +42,7 @@
{
qWarning() << "EGifPutExtensionFirst failed!";
goto writeError;
-@@ -590,9 +591,9 @@ QByteArray Stream::writerGif( const Draw
+@@ -590,9 +591,9 @@
// Write all the full data blocks
while( length >= MAX_GIF_BYTE )
{
@@ -46,7 +54,7 @@
goto writeError;
}
-@@ -603,17 +604,17 @@ QByteArray Stream::writerGif( const Draw
+@@ -603,17 +604,17 @@
// Write the last block
if( length > 0 )
{
@@ -68,11 +76,13 @@
goto writeError;
}
}
-@@ -624,12 +625,12 @@ QByteArray Stream::writerGif( const Draw
+@@ -623,13 +624,13 @@
+
writeError:
// Clean up the GIF converter etc
- EGifCloseFile( gifImage );
+- EGifCloseFile( gifImage );
- FreeMapObject( cmap );
++ EGifCloseFile( gifImage, NULL );
+ GifFreeMapObject( cmap );
gifData.close();
[arch-commits] Commit in kmess/trunk (PKGBUILD fix-crash-in-contactlistmodel.patch)
Date: Wednesday, September 11, 2013 @ 04:12:51
Author: bgyorgy
Revision: 97031
upgpkg: kmess 2.0.6.2-4
Fix crash in ContactListModel (FS#32402)
Added:
kmess/trunk/fix-crash-in-contactlistmodel.patch
Modified:
kmess/trunk/PKGBUILD
-+
PKGBUILD| 11 ---
fix-crash-in-contactlistmodel.patch | 29 +
2 files changed, 37 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-09-11 01:28:37 UTC (rev 97030)
+++ PKGBUILD2013-09-11 02:12:51 UTC (rev 97031)
@@ -5,7 +5,7 @@
pkgname=kmess
pkgver=2.0.6.2
-pkgrel=3
+pkgrel=4
pkgdesc="A MSN Messenger client for Linux"
arch=('i686' 'x86_64')
url='http://kmess.sourceforge.net/'
@@ -15,9 +15,11 @@
optdepends=('cabextract: provides winks support')
install=${pkgname}.install
source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-$pkgver.tar.bz2";
-giflib-5.0.patch)
+giflib-5.0.patch
+fix-crash-in-contactlistmodel.patch)
md5sums=('a2e57911713308bef81b9347135cc5dd'
- '97734b073bf4a45ed3612d7626541cee')
+ '97734b073bf4a45ed3612d7626541cee'
+ 'fdfe837f4bd64a5123edc63019bd5cf2')
prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
@@ -26,6 +28,9 @@
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() {
Added: fix-crash-in-contactlistmodel.patch
===
--- fix-crash-in-contactlistmodel.patch (rev 0)
+++ fix-crash-in-contactlistmodel.patch 2013-09-11 02:12:51 UTC (rev 97031)
@@ -0,0 +1,29 @@
+commit e10ebb8bd33cf807e2edfa56c465b40f3237102e
+Author: Ruben Vandamme
+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
