Date: Monday, January 6, 2014 @ 12:32:57 Author: bisson Revision: 203242
archrelease: copy trunk to testing-i686, testing-x86_64 Added: libotr/repos/testing-i686/PKGBUILD (from rev 203241, libotr/trunk/PKGBUILD) libotr/repos/testing-i686/kopete.patch (from rev 203241, libotr/trunk/kopete.patch) libotr/repos/testing-x86_64/PKGBUILD (from rev 203241, libotr/trunk/PKGBUILD) libotr/repos/testing-x86_64/kopete.patch (from rev 203241, libotr/trunk/kopete.patch) Deleted: libotr/repos/testing-i686/PKGBUILD libotr/repos/testing-x86_64/PKGBUILD -----------------------------+ /PKGBUILD | 66 ++++++++++++++++++++++++++++++++++++++++++ testing-i686/PKGBUILD | 26 ---------------- testing-i686/kopete.patch | 12 +++++++ testing-x86_64/PKGBUILD | 26 ---------------- testing-x86_64/kopete.patch | 12 +++++++ 5 files changed, 90 insertions(+), 52 deletions(-) Deleted: testing-i686/PKGBUILD =================================================================== --- testing-i686/PKGBUILD 2014-01-06 11:32:28 UTC (rev 203241) +++ testing-i686/PKGBUILD 2014-01-06 11:32:57 UTC (rev 203242) @@ -1,26 +0,0 @@ -# $Id$ -# Maintainer: Gaetan Bisson <bis...@archlinux.org> -# Contributor: Pierre Schmitz <pie...@archlinux.de> -# Contributor: Bug <bug2...@gmail.com> - -pkgname=libotr -pkgver=4.0.0 -pkgrel=2 -pkgdesc='Off-the-Record Messaging Library and Toolkit' -url='http://www.cypherpunks.ca/otr/' -license=('GPL' 'LGPL') -arch=('i686' 'x86_64') -depends=('libgcrypt') -source=("http://www.cypherpunks.ca/otr/${pkgname}-${pkgver}.tar.gz") -sha1sums=('8865e9011b8674290837afcf7caf90c492ae09cc') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --mandir=/usr/share/man - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} Copied: libotr/repos/testing-i686/PKGBUILD (from rev 203241, libotr/trunk/PKGBUILD) =================================================================== --- testing-i686/PKGBUILD (rev 0) +++ testing-i686/PKGBUILD 2014-01-06 11:32:57 UTC (rev 203242) @@ -0,0 +1,33 @@ +# $Id$ +# Maintainer: Gaetan Bisson <bis...@archlinux.org> +# Contributor: Pierre Schmitz <pie...@archlinux.de> +# Contributor: Bug <bug2...@gmail.com> + +pkgname=libotr +pkgver=4.0.0 +pkgrel=3 +pkgdesc='Off-the-Record Messaging Library and Toolkit' +url='http://www.cypherpunks.ca/otr/' +license=('GPL' 'LGPL') +arch=('i686' 'x86_64') +depends=('libgcrypt') +source=("http://www.cypherpunks.ca/otr/${pkgname}-${pkgver}.tar.gz" + 'kopete.patch') +sha1sums=('8865e9011b8674290837afcf7caf90c492ae09cc' + '55988c4f11b6852491a758ea7a5b7071e8959c55') + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i ../kopete.patch # FS#38326 +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --mandir=/usr/share/man + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} Copied: libotr/repos/testing-i686/kopete.patch (from rev 203241, libotr/trunk/kopete.patch) =================================================================== --- testing-i686/kopete.patch (rev 0) +++ testing-i686/kopete.patch 2014-01-06 11:32:57 UTC (rev 203242) @@ -0,0 +1,12 @@ +diff -Naur old/src/message.c new/src/message.c +--- old/src/message.c 2012-08-31 02:15:35.000000000 -1000 ++++ new/src/message.c 2014-01-06 01:22:43.316831758 -1000 +@@ -441,7 +441,7 @@ + /* Fragment and send according to policy */ + if (!err && messagep && *messagep) { + if (context) { +- err = fragment_and_send(ops, NULL, context, *messagep, ++ err = fragment_and_send(ops, opdata, context, *messagep, + fragPolicy, messagep); + } + } Deleted: testing-x86_64/PKGBUILD =================================================================== --- testing-x86_64/PKGBUILD 2014-01-06 11:32:28 UTC (rev 203241) +++ testing-x86_64/PKGBUILD 2014-01-06 11:32:57 UTC (rev 203242) @@ -1,26 +0,0 @@ -# $Id$ -# Maintainer: Gaetan Bisson <bis...@archlinux.org> -# Contributor: Pierre Schmitz <pie...@archlinux.de> -# Contributor: Bug <bug2...@gmail.com> - -pkgname=libotr -pkgver=4.0.0 -pkgrel=2 -pkgdesc='Off-the-Record Messaging Library and Toolkit' -url='http://www.cypherpunks.ca/otr/' -license=('GPL' 'LGPL') -arch=('i686' 'x86_64') -depends=('libgcrypt') -source=("http://www.cypherpunks.ca/otr/${pkgname}-${pkgver}.tar.gz") -sha1sums=('8865e9011b8674290837afcf7caf90c492ae09cc') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --mandir=/usr/share/man - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} Copied: libotr/repos/testing-x86_64/PKGBUILD (from rev 203241, libotr/trunk/PKGBUILD) =================================================================== --- testing-x86_64/PKGBUILD (rev 0) +++ testing-x86_64/PKGBUILD 2014-01-06 11:32:57 UTC (rev 203242) @@ -0,0 +1,33 @@ +# $Id$ +# Maintainer: Gaetan Bisson <bis...@archlinux.org> +# Contributor: Pierre Schmitz <pie...@archlinux.de> +# Contributor: Bug <bug2...@gmail.com> + +pkgname=libotr +pkgver=4.0.0 +pkgrel=3 +pkgdesc='Off-the-Record Messaging Library and Toolkit' +url='http://www.cypherpunks.ca/otr/' +license=('GPL' 'LGPL') +arch=('i686' 'x86_64') +depends=('libgcrypt') +source=("http://www.cypherpunks.ca/otr/${pkgname}-${pkgver}.tar.gz" + 'kopete.patch') +sha1sums=('8865e9011b8674290837afcf7caf90c492ae09cc' + '55988c4f11b6852491a758ea7a5b7071e8959c55') + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i ../kopete.patch # FS#38326 +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --mandir=/usr/share/man + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} Copied: libotr/repos/testing-x86_64/kopete.patch (from rev 203241, libotr/trunk/kopete.patch) =================================================================== --- testing-x86_64/kopete.patch (rev 0) +++ testing-x86_64/kopete.patch 2014-01-06 11:32:57 UTC (rev 203242) @@ -0,0 +1,12 @@ +diff -Naur old/src/message.c new/src/message.c +--- old/src/message.c 2012-08-31 02:15:35.000000000 -1000 ++++ new/src/message.c 2014-01-06 01:22:43.316831758 -1000 +@@ -441,7 +441,7 @@ + /* Fragment and send according to policy */ + if (!err && messagep && *messagep) { + if (context) { +- err = fragment_and_send(ops, NULL, context, *messagep, ++ err = fragment_and_send(ops, opdata, context, *messagep, + fragPolicy, messagep); + } + }