From 442151f5c43ddad22137af7687118ced2bb9a877 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 28 Jan 2014 23:17:18 +0100 Subject: [PATCH] pidgin: update to 2.10.8. --- ...idgin-2.10.7-link-libirc-to-libsasl2.patch | 11 ------ srcpkgs/pidgin/template | 39 ++++++++----------- 2 files changed, 17 insertions(+), 33 deletions(-) delete mode 100644 srcpkgs/pidgin/patches/pidgin-2.10.7-link-libirc-to-libsasl2.patch diff --git a/srcpkgs/pidgin/patches/pidgin-2.10.7-link-libirc-to-libsasl2.patch b/srcpkgs/pidgin/patches/pidgin-2.10.7-link-libirc-to-libsasl2.patch deleted file mode 100644 index b177654b29a..00000000000 --- a/srcpkgs/pidgin/patches/pidgin-2.10.7-link-libirc-to-libsasl2.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- libpurple/protocols/irc/Makefile.am 2013-02-14 02:44:47.000000000 +0200 -+++ libpurple/protocols/irc/Makefile.am 2013-02-14 02:49:58.000000000 +0200 -@@ -27,7 +27,7 @@ else - st = - pkg_LTLIBRARIES = libirc.la - libirc_la_SOURCES = $(IRCSOURCES) --libirc_la_LIBADD = $(GLIB_LIBS) -+libirc_la_LIBADD = $(GLIB_LIBS) $(SASL_LIBS) - - endif - diff --git a/srcpkgs/pidgin/template b/srcpkgs/pidgin/template index 3c27919bb4d..775ac85ded9 100644 --- a/srcpkgs/pidgin/template +++ b/srcpkgs/pidgin/template @@ -1,22 +1,18 @@ # Template file for 'pidgin' pkgname=pidgin -version=2.10.7 -revision=2 +version=2.10.8 +revision=1 build_style=gnu-configure configure_args="--disable-schemas-install --disable-meanwhile --enable-cyrus-sasl --disable-doxygen --enable-nm --disable-vv - --with-system-ssl-certs=/etc/ssl/certs --disable-tk - --disable-gnutls --disable-tcl - --with-gconf-schema-file-dir=/usr/share/gconf/schemas" + --with-system-ssl-certs=/etc/ssl/certs --disable-tk --disable-tcl + --disable-gnutls" short_desc="Multi-protocol instant messaging client" maintainer="Juan RP " license="GPL-2" homepage="http://pidgin.im/" distfiles="${SOURCEFORGE_SITE}/pidgin/pidgin-${version}.tar.bz2" -checksum=eba32994eca20d1cf24a4261b059b2de71a1ec2dd0926e904074b0db49f7f192 -long_desc=" - Pidgin is an easy to use and free chat client used by millions. Connect to - AIM, MSN, Yahoo, and more chat networks all at once." +checksum=b633367e3588ff3e615d68e812302dfdbe32e73693cbe42a0d827b7aed7a8227 hostmakedepends="pkg-config intltool automake libtool gettext-devel" makedepends="libglib-devel gtk+-devel libXext-devel @@ -33,29 +29,27 @@ pre_configure() { } post_install() { - mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc} - gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/purple.schemas \ - --domain purple ${wrksrc}/*.schemas + rm -rf ${DESTDIR}/etc/gconf } libpurple_package() { short_desc="IM library extracted from Pidgin" pkg_install() { vmove "usr/bin/purple-*" - vmove "usr/lib/libpurple*.so*" + vmove "usr/lib/libpurple*.so.*" vmove usr/lib/purple-2 vmove usr/share/purple vmove usr/share/sounds/purple - vmove usr/share/gconf } } libpurple-devel_package() { - depends="libglib-devel libpurple>=${version}" - short_desc="IM library extracted from Pidgin -- development files" + depends="libglib-devel libpurple>=${version}_${revision}" + short_desc="IM library extracted from Pidgin - development files" pkg_install() { vmove usr/include/libpurple vmove usr/lib/pkgconfig/purple.pc + vmove usr/lib/libpurple.so vmove usr/share/aclocal/purple.m4 vmove usr/share/man/man3/Purple.3p } @@ -71,11 +65,12 @@ libgnt_package() { } libgnt-devel_package() { - depends="libglib-devel libgnt>=${version}" - short_desc="IM library extracted from Pidgin (GNT) -- development files" + depends="libglib-devel libgnt>=${version}_${revision}" + short_desc="IM library extracted from Pidgin (GNT) - development files" pkg_install() { vmove usr/include/gnt vmove usr/lib/pkgconfig/gnt.pc + vmove usr/lib/libgnt.so } } @@ -88,8 +83,8 @@ finch_package() { } finch-devel_package() { - depends="libgnt-devel>=${version} libpurple-devel>=${version}" - short_desc="A ncurses-based messaging client -- development files" + depends="libgnt-devel>=${version} libpurple-devel>=${version}_${revision}" + short_desc="A ncurses-based messaging client - development files" pkg_install() { vmove usr/include/finch vmove usr/lib/pkgconfig/finch.pc @@ -97,8 +92,8 @@ finch-devel_package() { } pidgin-devel_package() { - depends="gtk+-devel libpurple-devel>=${version}" - short_desc="${short_desc} -- development files" + depends="gtk+-devel libpurple-devel>=${version}_${revision}" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig