diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2013-09-24 12:48:54 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2013-10-04 12:40:31 +0000 |
commit | 999bb800360fe5dfe85345989073951ce15b2595 (patch) | |
tree | 2024d2c41a9a1e7d4903bda52782c4c388f94632 | |
parent | e274a00ec7822f0d3bba2ab6a6f8f9d0b891b6c2 (diff) | |
download | alpine_aports-999bb800360fe5dfe85345989073951ce15b2595.tar.bz2 alpine_aports-999bb800360fe5dfe85345989073951ce15b2595.tar.xz alpine_aports-999bb800360fe5dfe85345989073951ce15b2595.zip |
main/pidgin: fix sasl underlinking in libirc and enable avahi
(cherry picked from commit 7dd6bfbca5cd07bc6656ba25d546367c76bf7908)
Conflicts:
main/pidgin/APKBUILD
-rw-r--r-- | main/pidgin/APKBUILD | 18 | ||||
-rw-r--r-- | main/pidgin/irc-underlinking.patch | 13 |
2 files changed, 26 insertions, 5 deletions
diff --git a/main/pidgin/APKBUILD b/main/pidgin/APKBUILD index 5739a4a31a..5d07df8511 100644 --- a/main/pidgin/APKBUILD +++ b/main/pidgin/APKBUILD | |||
@@ -1,7 +1,7 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=pidgin | 2 | pkgname=pidgin |
3 | pkgver=2.10.7 | 3 | pkgver=2.10.7 |
4 | pkgrel=0 | 4 | pkgrel=1 |
5 | pkgdesc="graphical multi-protocol instant messaging client for X" | 5 | pkgdesc="graphical multi-protocol instant messaging client for X" |
6 | url="http://pidgin.im/" | 6 | url="http://pidgin.im/" |
7 | arch="all" | 7 | arch="all" |
@@ -9,11 +9,12 @@ license="GPL" | |||
9 | depends= | 9 | depends= |
10 | makedepends="gtk+-dev intltool libsm-dev startup-notification-dev gtkspell-dev | 10 | makedepends="gtk+-dev intltool libsm-dev startup-notification-dev gtkspell-dev |
11 | libxml2-dev gstreamer-dev libidn-dev dbus-glib-dev gnutls-dev | 11 | libxml2-dev gstreamer-dev libidn-dev dbus-glib-dev gnutls-dev |
12 | cyrus-sasl-dev ncurses-dev nss-dev farstream0.1-dev | 12 | cyrus-sasl-dev ncurses-dev nss-dev farstream0.1-dev avahi-dev |
13 | autoconf automake libtool" | 13 | autoconf automake libtool" |
14 | subpackages="$pkgname-dev $pkgname-doc finch libpurple $pkgname-lang" | 14 | subpackages="$pkgname-dev $pkgname-doc finch libpurple $pkgname-lang" |
15 | source="http://downloads.sourceforge.net/pidgin/pidgin-$pkgver.tar.bz2 | 15 | source="http://downloads.sourceforge.net/pidgin/pidgin-$pkgver.tar.bz2 |
16 | pidgin-underlinking.patch | 16 | pidgin-underlinking.patch |
17 | irc-underlinking.patch | ||
17 | " | 18 | " |
18 | 19 | ||
19 | _builddir="$srcdir"/$pkgname-$pkgver | 20 | _builddir="$srcdir"/$pkgname-$pkgver |
@@ -28,11 +29,11 @@ prepare() { | |||
28 | aclocal -I m4macros && autoconf && automake --add-missing || return 1 | 29 | aclocal -I m4macros && autoconf && automake --add-missing || return 1 |
29 | } | 30 | } |
30 | 31 | ||
31 | build() { | 32 | build() { |
32 | cd "$_builddir" | 33 | cd "$_builddir" |
33 | ./configure --prefix=/usr \ | 34 | ./configure --prefix=/usr \ |
34 | --sysconfdir=/etc \ | 35 | --sysconfdir=/etc \ |
35 | --disable-avahi \ | 36 | --enable-avahi \ |
36 | --disable-doxygen \ | 37 | --disable-doxygen \ |
37 | --disable-gnutls \ | 38 | --disable-gnutls \ |
38 | --disable-meanwhile \ | 39 | --disable-meanwhile \ |
@@ -71,4 +72,11 @@ libpurple() { | |||
71 | "$subpkgdir"/usr/share/ | 72 | "$subpkgdir"/usr/share/ |
72 | } | 73 | } |
73 | md5sums="ea88976b9952e80b702b030489f94393 pidgin-2.10.7.tar.bz2 | 74 | md5sums="ea88976b9952e80b702b030489f94393 pidgin-2.10.7.tar.bz2 |
74 | 9e7f42f8bc4284009dff50e8128bf4f9 pidgin-underlinking.patch" | 75 | 9e7f42f8bc4284009dff50e8128bf4f9 pidgin-underlinking.patch |
76 | cdbce1effbc9beb7f4cf583f083785df irc-underlinking.patch" | ||
77 | sha256sums="eba32994eca20d1cf24a4261b059b2de71a1ec2dd0926e904074b0db49f7f192 pidgin-2.10.7.tar.bz2 | ||
78 | 3f086cb668806f3b69af4c7decd6618a16dbfdcd120df984713adafc5bc0aa09 pidgin-underlinking.patch | ||
79 | a75625c8d1eb1d758f15cedaa87e51ed3e3d7ee5f5770ad1882059c590bebc6b irc-underlinking.patch" | ||
80 | sha512sums="0f0d421f91be3b1577527f3609bff164d7c57a94338e18dca5d8b7d911634a98b9c0e8860f3e62026eba09a6afb3112a8cd6770a90c89afdb9fb40f83dd6f3e4 pidgin-2.10.7.tar.bz2 | ||
81 | 307f284a7d1ad5277b8d198d8ee56806f063a8b72356726f89f31fad67aad3e3cd43c597556e7dce1804d2e8d92b350a968fcc851a11d851f70c7a375ab29559 pidgin-underlinking.patch | ||
82 | 75eb7af0e31ac3bbb3ad5c0641b7bdbe9c32b540f2e8902d8480213abed54c4cf438d5a2e59659aa40cc17ceda387928c4a05b320da874ff3e99a3edecf936d3 irc-underlinking.patch" | ||
diff --git a/main/pidgin/irc-underlinking.patch b/main/pidgin/irc-underlinking.patch new file mode 100644 index 0000000000..e30f983ddc --- /dev/null +++ b/main/pidgin/irc-underlinking.patch | |||
@@ -0,0 +1,13 @@ | |||
1 | --- ./libpurple/protocols/irc/Makefile.am.orig 2013-09-24 12:35:56.771633963 +0000 | ||
2 | +++ ./libpurple/protocols/irc/Makefile.am 2013-09-24 12:36:22.581943787 +0000 | ||
3 | @@ -27,7 +27,8 @@ | ||
4 | st = | ||
5 | pkg_LTLIBRARIES = libirc.la | ||
6 | libirc_la_SOURCES = $(IRCSOURCES) | ||
7 | -libirc_la_LIBADD = $(GLIB_LIBS) | ||
8 | +libirc_la_LIBADD = $(GLIB_LIBS) \ | ||
9 | + $(SASL_LIBS) | ||
10 | |||
11 | endif | ||
12 | |||
13 | |||