From 534bee70fd2d9fb7d8f74e83d40ddd911ffb4ab5 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sat, 2 Jan 2016 11:45:54 -0300 Subject: pidgin-2.10.12-1.nonprism1: updating version * switch to python 3 --- nonprism/pidgin/PKGBUILD | 49 ++++++++++++++++++++---------------------------- 1 file changed, 20 insertions(+), 29 deletions(-) (limited to 'nonprism/pidgin/PKGBUILD') diff --git a/nonprism/pidgin/PKGBUILD b/nonprism/pidgin/PKGBUILD index 74f42a8f4..e159db089 100644 --- a/nonprism/pidgin/PKGBUILD +++ b/nonprism/pidgin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 249233 2015-10-13 21:30:13Z foutrelis $ +# $Id: PKGBUILD 257443 2016-01-02 04:32:23Z foutrelis $ # Maintainer (Arch): Evangelos Foutras # Contributor (Arch): Ionut Biru # Contributor (Arch): Andrea Scarpino @@ -8,30 +8,26 @@ # Contributor: Márcio Silva pkgname=('pidgin' 'libpurple' 'finch') -pkgver=2.10.11 -pkgrel=6.nonprism1 -_rev=cbc4db14444c91f4f4b03aa1b228c2d51dacea6b +pkgver=2.10.12 +pkgrel=1.nonprism1 arch=('i686' 'x86_64') url="http://pidgin.im/" license=('GPL') makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm' - 'libidn' 'python2' 'hicolor-icon-theme' 'farstream' - 'avahi' 'tk' 'ca-certificates' 'intltool' 'networkmanager' - 'mercurial') -source=(pidgin::hg+https://bitbucket.org/pidgin/main#revision=$_rev + 'libidn' 'python' 'hicolor-icon-theme' 'farstream' + 'avahi' 'tk' 'ca-certificates' 'intltool' 'networkmanager') +source=(https://downloads.sourceforge.net/project/$pkgname/Pidgin/$pkgver/$pkgname-$pkgver.tar.bz2{,.asc} + pidgin-2.10.12-py3-fixes.patch nonprism.patch) -sha256sums=('SKIP' +sha256sums=('2c7523f0fefe89749c03b2b738ab9f7bd186da435be4762f1487eee31e77ffdd' + 'SKIP' + 'e38bd61e0dcfcc2e5761078ea709b92c5bf8d025d5eb1288aa8a550715babb7e' 'f720dc9aca3191b65cd89828ab7266e06d93203b7f0de9ac6b506227b00b0bc0') +validpgpkeys=('364E2EB38EA6A8D61FB963AD75FE259AA8AC8032') prepare() { - cd $pkgbase - - # Revert change that breaks rejoining multi-user chats - # https://developer.pidgin.im/ticket/16724 - { - hg diff -c 136a5e95a1ad - hg diff -c 187b51ce9922 - } | patch -Rp1 + cd $pkgbase-$pkgver + patch -Np1 -i ../pidgin-2.10.12-py3-fixes.patch msg "Remove Google Talk and Facebook protocols" patch -Np1 -i "$srcdir/nonprism.patch" @@ -41,16 +37,12 @@ prepare() { sed -i 's|On Linux|On GNU/Linux|' libpurple/connection.h autoreconf -vi - - # Use Python 2 - sed -i 's/env python$/&2/' */plugins/*.py \ - libpurple/purple-{remote,notifications-example,url-handler} } build() { - cd $pkgbase + cd $pkgbase-$pkgver - ./autogen.sh \ + ./configure \ --prefix=/usr \ --sysconfdir=/etc \ --disable-schemas-install \ @@ -59,7 +51,6 @@ build() { --enable-cyrus-sasl \ --disable-doxygen \ --enable-nm \ - --with-python=/usr/bin/python2 \ --with-system-ssl-certs=/etc/ssl/certs \ --with-dynamic-prpls=bonjour,irc,jabber,silc,simple,zephyr make @@ -74,7 +65,7 @@ package_pidgin(){ replaces=(${pkgname}-nonprism) install=pidgin.install - cd $pkgbase + cd $pkgbase-$pkgver # For linking make -C libpurple DESTDIR="$pkgdir" install-libLTLIBRARIES @@ -105,12 +96,12 @@ package_libpurple(){ depends=('farstream' 'libsasl' 'libidn' 'dbus-glib' 'nss') optdepends=('avahi: Bonjour protocol support' 'ca-certificates: SSL CA certificates' - 'python2-dbus: for purple-remote and purple-url-handler' + 'python-dbus: for purple-remote and purple-url-handler' 'tk: Tcl/Tk scripting support') conflicts=(${pkgname}-nonprism) replaces=(${pkgname}-nonprism) - cd $pkgbase + cd $pkgbase-$pkgver for _dir in libpurple share/sounds share/ca-certs m4macros po; do make -C "$_dir" DESTDIR="$pkgdir" install @@ -119,11 +110,11 @@ package_libpurple(){ package_finch(){ pkgdesc="A ncurses-based messaging client, without support for unsafe and dangerous for privacy protocols" - depends=('libpurple' 'libx11' 'python2') + depends=('libpurple' 'libx11' 'python') conflicts=(${pkgname}-nonprism) replaces=(${pkgname}-nonprism) - cd $pkgbase + cd $pkgbase-$pkgver # For linking make -C libpurple DESTDIR="$pkgdir" install-libLTLIBRARIES -- cgit v1.2.3