Date: Friday, March 9, 2018 @ 10:20:38 Author: foutrelis Revision: 318303
archrelease: copy trunk to extra-x86_64 Added: pidgin/repos/extra-x86_64/PKGBUILD (from rev 318302, pidgin/trunk/PKGBUILD) pidgin/repos/extra-x86_64/purple-remote-python3.patch (from rev 318302, pidgin/trunk/purple-remote-python3.patch) Deleted: pidgin/repos/extra-x86_64/PKGBUILD -----------------------------+ PKGBUILD | 191 +++++++++++++++++++++--------------------- purple-remote-python3.patch | 34 +++++++ 2 files changed, 134 insertions(+), 91 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2018-03-09 10:20:30 UTC (rev 318302) +++ PKGBUILD 2018-03-09 10:20:38 UTC (rev 318303) @@ -1,91 +0,0 @@ -# $Id$ -# Maintainer: Evangelos Foutras <evange...@foutrelis.com> -# Contributor: Ionut Biru <ib...@archlinux.org> -# Contributor: Andrea Scarpino <and...@archlinux.org> -# Contributor: Alexander Fehr <pizzapunk gmail com> -# Contributor: Lucien Immink <l.imm...@student.fnt.hvu.nl> - -pkgname=('pidgin' 'libpurple' 'finch') -pkgver=2.13.0 -pkgrel=1 -arch=('x86_64') -url="http://pidgin.im/" -license=('GPL') -makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm' - 'libidn' 'libgadu' 'python' 'hicolor-icon-theme' 'farstream' - 'avahi' 'tk' 'ca-certificates' 'intltool' 'networkmanager') -source=(https://bitbucket.org/pidgin/main/downloads/$pkgname-$pkgver.tar.bz2{,.asc}) -sha256sums=('2747150c6f711146bddd333c496870bfd55058bab22ffb7e4eb784018ec46d8f' - 'SKIP') -validpgpkeys=('364E2EB38EA6A8D61FB963AD75FE259AA8AC8032') # Gary Kramlich (grim) <g...@reaperworld.com> - -build() { - cd $pkgbase-$pkgver - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --disable-schemas-install \ - --disable-meanwhile \ - --disable-gnutls \ - --enable-cyrus-sasl \ - --disable-doxygen \ - --enable-nm \ - --with-system-ssl-certs=/etc/ssl/certs - make -} - -package_pidgin(){ - pkgdesc="Multi-protocol instant messaging client" - depends=('libpurple' 'startup-notification' 'gtkspell' 'libxss' 'libsm' - 'gst-plugins-base' 'gst-plugins-good' 'hicolor-icon-theme') - optdepends=('aspell: for spelling correction') - - cd $pkgbase-$pkgver - - # For linking - make -C libpurple DESTDIR="$pkgdir" install-libLTLIBRARIES - - make -C pidgin DESTDIR="$pkgdir" install - make -C doc DESTDIR="$pkgdir" install - - # Remove files that are packaged in libpurle - make -C libpurple DESTDIR="$pkgdir" uninstall-libLTLIBRARIES - - rm "$pkgdir/usr/share/man/man1/finch.1" -} - -package_libpurple(){ - pkgdesc="IM library extracted from Pidgin" - depends=('farstream' 'libsasl' 'libidn' 'libgadu' 'dbus-glib' 'nss') - optdepends=('avahi: Bonjour protocol support' - 'ca-certificates: SSL CA certificates' - 'python-dbus: for purple-remote and purple-url-handler' - 'tk: Tcl/Tk scripting support') - - cd $pkgbase-$pkgver - - for _dir in libpurple share/sounds share/ca-certs m4macros po; do - make -C "$_dir" DESTDIR="$pkgdir" install - done -} - -package_finch(){ - pkgdesc="A ncurses-based messaging client" - depends=('libpurple' 'libx11' 'python') - - cd $pkgbase-$pkgver - - # For linking - make -C libpurple DESTDIR="$pkgdir" install-libLTLIBRARIES - - make -C finch DESTDIR="$pkgdir" install - make -C doc DESTDIR="$pkgdir" install - - # Remove files that are packaged in libpurle - make -C libpurple DESTDIR="$pkgdir" uninstall-libLTLIBRARIES - - rm "$pkgdir"/usr/share/man/man1/pidgin.1 -} - -# vim:set ts=2 sw=2 et: Copied: pidgin/repos/extra-x86_64/PKGBUILD (from rev 318302, pidgin/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2018-03-09 10:20:38 UTC (rev 318303) @@ -0,0 +1,100 @@ +# $Id$ +# Maintainer: Evangelos Foutras <evange...@foutrelis.com> +# Contributor: Ionut Biru <ib...@archlinux.org> +# Contributor: Andrea Scarpino <and...@archlinux.org> +# Contributor: Alexander Fehr <pizzapunk gmail com> +# Contributor: Lucien Immink <l.imm...@student.fnt.hvu.nl> + +pkgname=('pidgin' 'libpurple' 'finch') +pkgver=2.13.0 +pkgrel=1 +arch=('x86_64') +url="http://pidgin.im/" +license=('GPL') +makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm' + 'libidn' 'libgadu' 'python' 'hicolor-icon-theme' 'farstream' + 'avahi' 'tk' 'ca-certificates' 'intltool' 'networkmanager') +source=(https://bitbucket.org/pidgin/main/downloads/$pkgname-$pkgver.tar.bz2{,.asc} + purple-remote-python3.patch) +sha256sums=('2747150c6f711146bddd333c496870bfd55058bab22ffb7e4eb784018ec46d8f' + 'SKIP' + '4eb6be9310e4d5d1b906b1d579c395000ee0af6d6f5056307233512151d1f4b1') +validpgpkeys=('364E2EB38EA6A8D61FB963AD75FE259AA8AC8032') # Gary Kramlich (grim) <g...@reaperworld.com> + +prepare() { + cd $pkgbase-$pkgver + + # https://developer.pidgin.im/ticket/17065 + patch -Np1 -i ../purple-remote-python3.patch +} + +build() { + cd $pkgbase-$pkgver + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --disable-schemas-install \ + --disable-meanwhile \ + --disable-gnutls \ + --enable-cyrus-sasl \ + --disable-doxygen \ + --enable-nm \ + --with-system-ssl-certs=/etc/ssl/certs + make +} + +package_pidgin(){ + pkgdesc="Multi-protocol instant messaging client" + depends=('libpurple' 'startup-notification' 'gtkspell' 'libxss' 'libsm' + 'gst-plugins-base' 'gst-plugins-good' 'hicolor-icon-theme') + optdepends=('aspell: for spelling correction') + + cd $pkgbase-$pkgver + + # For linking + make -C libpurple DESTDIR="$pkgdir" install-libLTLIBRARIES + + make -C pidgin DESTDIR="$pkgdir" install + make -C doc DESTDIR="$pkgdir" install + + # Remove files that are packaged in libpurle + make -C libpurple DESTDIR="$pkgdir" uninstall-libLTLIBRARIES + + rm "$pkgdir/usr/share/man/man1/finch.1" +} + +package_libpurple(){ + pkgdesc="IM library extracted from Pidgin" + depends=('farstream' 'libsasl' 'libidn' 'libgadu' 'dbus-glib' 'nss') + optdepends=('avahi: Bonjour protocol support' + 'ca-certificates: SSL CA certificates' + 'python-dbus: for purple-remote and purple-url-handler' + 'tk: Tcl/Tk scripting support') + + cd $pkgbase-$pkgver + + for _dir in libpurple share/sounds share/ca-certs m4macros po; do + make -C "$_dir" DESTDIR="$pkgdir" install + done +} + +package_finch(){ + pkgdesc="A ncurses-based messaging client" + depends=('libpurple' 'libx11' 'python') + + cd $pkgbase-$pkgver + + # For linking + make -C libpurple DESTDIR="$pkgdir" install-libLTLIBRARIES + + make -C finch DESTDIR="$pkgdir" install + make -C doc DESTDIR="$pkgdir" install + + # Remove files that are packaged in libpurle + make -C libpurple DESTDIR="$pkgdir" uninstall-libLTLIBRARIES + + rm "$pkgdir"/usr/share/man/man1/pidgin.1 +} + +# vim:set ts=2 sw=2 et: Copied: pidgin/repos/extra-x86_64/purple-remote-python3.patch (from rev 318302, pidgin/trunk/purple-remote-python3.patch) =================================================================== --- purple-remote-python3.patch (rev 0) +++ purple-remote-python3.patch 2018-03-09 10:20:38 UTC (rev 318303) @@ -0,0 +1,34 @@ +# HG changeset patch +# User Evangelos Foutras <evange...@foutrelis.com> +# Date 1520583640 -7200 +# Fri Mar 09 10:20:40 2018 +0200 +# Branch release-2.x.y +# Node ID ac2e05444162f1dc0fd60e4d5c8b4cbe2969b695 +# Parent 02df346d26d00cb9a1420c11a59fccb35d92f04e +Adjust purple-remote to work with Python 3 + +Fixes the following error: + + Traceback (most recent call last): + File "./libpurple/purple-remote", line 241, in <module> + print("No existing libpurple instance detected.") + File "/usr/lib/python3.6/codecs.py", line 377, in write + self.stream.write(data) + TypeError: write() argument must be str, not bytes + +diff -r 02df346d26d0 -r ac2e05444162 libpurple/purple-remote +--- a/libpurple/purple-remote Thu Mar 08 22:51:37 2018 -0600 ++++ b/libpurple/purple-remote Fri Mar 09 10:20:40 2018 +0200 +@@ -13,8 +13,10 @@ + + import xml.dom.minidom + +-sys.stdin = codecs.getwriter('utf-8')(sys.stdin); +-sys.stdout = codecs.getwriter('utf-8')(sys.stdout); ++if hasattr(sys.stdout, 'buffer'): ++ sys.stdout = codecs.getwriter('utf-8')(sys.stdout.buffer) ++else: ++ sys.stdout = codecs.getwriter('utf-8')(sys.stdout) + + xml.dom.minidom.Element.all = xml.dom.minidom.Element.getElementsByTagName +