1 |
pva 10/10/29 09:59:46 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: pidgin-2.7.4-r1.ebuild |
5 |
Log: |
6 |
Backport upstream patches to fix ICQ regressions (e.g. bug #342779 thank Phil Stracchino for report) and crashes. |
7 |
|
8 |
(Portage version: 2.1.9.22/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.198 net-im/pidgin/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/pidgin/ChangeLog?rev=1.198&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/pidgin/ChangeLog?rev=1.198&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/pidgin/ChangeLog?r1=1.197&r2=1.198 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v |
20 |
retrieving revision 1.197 |
21 |
retrieving revision 1.198 |
22 |
diff -u -r1.197 -r1.198 |
23 |
--- ChangeLog 26 Oct 2010 13:44:55 -0000 1.197 |
24 |
+++ ChangeLog 29 Oct 2010 09:59:46 -0000 1.198 |
25 |
@@ -1,6 +1,16 @@ |
26 |
# ChangeLog for net-im/pidgin |
27 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.197 2010/10/26 13:44:55 jer Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.198 2010/10/29 09:59:46 pva Exp $ |
30 |
+ |
31 |
+*pidgin-2.7.4-r1 (29 Oct 2010) |
32 |
+ |
33 |
+ 29 Oct 2010; Peter Volkov <pva@g.o> +pidgin-2.7.4-r1.ebuild, |
34 |
+ +files/pidgin-2.7.4-bonjour-crash.patch, |
35 |
+ +files/pidgin-2.7.4-icq-authorization-empty-nick.patch, |
36 |
+ +files/pidgin-2.7.4-icq-html-regression.patch, |
37 |
+ +files/pidgin-2.7.4-missing-break-bug-12810.patch: |
38 |
+ Backport upstream patches to fix ICQ regressions (e.g. bug #342779 thank |
39 |
+ Phil Stracchino for report) and crashes. |
40 |
|
41 |
26 Oct 2010; Jeroen Roovers <jer@g.o> pidgin-2.7.4.ebuild: |
42 |
Stable for PPC (bug #342059). |
43 |
|
44 |
|
45 |
|
46 |
1.1 net-im/pidgin/pidgin-2.7.4-r1.ebuild |
47 |
|
48 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/pidgin/pidgin-2.7.4-r1.ebuild?rev=1.1&view=markup |
49 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/pidgin/pidgin-2.7.4-r1.ebuild?rev=1.1&content-type=text/plain |
50 |
|
51 |
Index: pidgin-2.7.4-r1.ebuild |
52 |
=================================================================== |
53 |
# Copyright 1999-2010 Gentoo Foundation |
54 |
# Distributed under the terms of the GNU General Public License v2 |
55 |
# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.7.4-r1.ebuild,v 1.1 2010/10/29 09:59:46 pva Exp $ |
56 |
|
57 |
EAPI=2 |
58 |
|
59 |
GENTOO_DEPEND_ON_PERL=no |
60 |
inherit flag-o-matic eutils toolchain-funcs multilib perl-app gnome2 python autotools |
61 |
|
62 |
DESCRIPTION="GTK Instant Messenger client" |
63 |
HOMEPAGE="http://pidgin.im/" |
64 |
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" |
65 |
|
66 |
LICENSE="GPL-2" |
67 |
SLOT="0" |
68 |
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
69 |
IUSE="dbus debug doc eds gadu gnutls +gstreamer +gtk idn meanwhile" |
70 |
IUSE+=" networkmanager nls perl silc tcl tk spell qq sasl +startup-notification" |
71 |
IUSE+=" ncurses groupwise prediction python +xscreensaver zephyr zeroconf" # mono" |
72 |
|
73 |
# dbus requires python to generate C code for dbus bindings (thus DEPEND only). |
74 |
# finch uses libgnt that links with libpython - {R,}DEPEND. But still there is |
75 |
# no way to build dbus and avoid libgnt linkage with python. If you want this |
76 |
# send patch upstream. |
77 |
RDEPEND=" |
78 |
>=dev-libs/glib-2.12 |
79 |
>=dev-libs/libxml2-2.6.18 |
80 |
ncurses? ( sys-libs/ncurses[unicode] |
81 |
dbus? ( <dev-lang/python-3 ) |
82 |
python? ( <dev-lang/python-3 ) ) |
83 |
gtk? ( |
84 |
>=x11-libs/gtk+-2.10:2 |
85 |
x11-libs/libSM |
86 |
xscreensaver? ( x11-libs/libXScrnSaver ) |
87 |
startup-notification? ( >=x11-libs/startup-notification-0.5 ) |
88 |
spell? ( >=app-text/gtkspell-2.0.2 ) |
89 |
eds? ( gnome-extra/evolution-data-server ) |
90 |
prediction? ( >=dev-db/sqlite-3.3:3 ) ) |
91 |
gstreamer? ( =media-libs/gstreamer-0.10* |
92 |
=media-libs/gst-plugins-good-0.10* |
93 |
>=net-libs/farsight2-0.0.14 |
94 |
media-plugins/gst-plugins-meta |
95 |
media-plugins/gst-plugins-gconf ) |
96 |
zeroconf? ( net-dns/avahi ) |
97 |
dbus? ( >=dev-libs/dbus-glib-0.71 |
98 |
>=sys-apps/dbus-0.90 ) |
99 |
perl? ( >=dev-lang/perl-5.8.2-r1[-build] ) |
100 |
gadu? ( >=net-libs/libgadu-1.9.0[-ssl] ) |
101 |
gnutls? ( net-libs/gnutls ) |
102 |
!gnutls? ( >=dev-libs/nss-3.11 ) |
103 |
meanwhile? ( net-libs/meanwhile ) |
104 |
silc? ( >=net-im/silc-toolkit-1.0.1 ) |
105 |
tcl? ( dev-lang/tcl ) |
106 |
tk? ( dev-lang/tk ) |
107 |
sasl? ( dev-libs/cyrus-sasl:2 ) |
108 |
networkmanager? ( net-misc/networkmanager ) |
109 |
idn? ( net-dns/libidn )" |
110 |
# Mono support crashes pidgin |
111 |
#mono? ( dev-lang/mono )" |
112 |
|
113 |
# We want nls in case gtk is enabled, bug # |
114 |
NLS_DEPEND=">=dev-util/intltool-0.41.1 sys-devel/gettext" |
115 |
|
116 |
DEPEND="$RDEPEND |
117 |
dev-lang/perl |
118 |
dev-perl/XML-Parser |
119 |
dev-util/pkgconfig |
120 |
gtk? ( x11-proto/scrnsaverproto |
121 |
${NLS_DEPEND} ) |
122 |
dbus? ( <dev-lang/python-3 ) |
123 |
doc? ( app-doc/doxygen ) |
124 |
!gtk? ( nls? ( ${NLS_DEPEND} ) )" |
125 |
|
126 |
DOCS="AUTHORS HACKING NEWS README ChangeLog" |
127 |
|
128 |
# Enable Default protocols |
129 |
DYNAMIC_PRPLS="irc,jabber,oscar,yahoo,simple,msn,myspace" |
130 |
|
131 |
# List of plugins |
132 |
# app-accessibility/pidgin-festival |
133 |
# net-im/librvp |
134 |
# x11-plugins/guifications |
135 |
# x11-plugins/msn-pecan |
136 |
# x11-plugins/pidgin-encryption |
137 |
# x11-plugins/pidgin-extprefs |
138 |
# x11-plugins/pidgin-hotkeys |
139 |
# x11-plugins/pidgin-latex |
140 |
# x11-plugins/pidgintex |
141 |
# x11-plugins/pidgin-libnotify |
142 |
# x11-plugins/pidgin-otr |
143 |
# x11-plugins/pidgin-rhythmbox |
144 |
# x11-plugins/purple-plugin_pack |
145 |
# x11-themes/pidgin-smileys |
146 |
# x11-plugins/pidgin-knotify |
147 |
# Plugins in Sunrise: |
148 |
# x11-plugins/pidgimpd |
149 |
# x11-plugins/pidgin-birthday |
150 |
# x11-plugins/pidgin-botsentry |
151 |
# x11-plugins/pidgin-convreverse |
152 |
# x11-plugins/pidgin-extended-blist-sort |
153 |
# x11-plugins/pidgin-lastfm |
154 |
# x11-plugins/pidgin-mbpurple |
155 |
|
156 |
pkg_setup() { |
157 |
if ! use gtk && ! use ncurses ; then |
158 |
elog "You did not pick the ncurses or gtk use flags, only libpurple" |
159 |
elog "will be built." |
160 |
fi |
161 |
if use gtk && ! use nls; then |
162 |
ewarn "gtk build => nls is enalbed!" |
163 |
fi |
164 |
if use dbus && ! use python; then |
165 |
elog "dbus is enabled, no way to disable linkage with python => python is enabled" |
166 |
fi |
167 |
if use dbus || { use ncurses && use python; }; then |
168 |
python_set_active_version 2 |
169 |
python_pkg_setup |
170 |
fi |
171 |
} |
172 |
|
173 |
src_prepare() { |
174 |
gnome2_src_prepare |
175 |
epatch "${FILESDIR}"/${PN}-2.7.3-ldflags.patch |
176 |
epatch "${FILESDIR}"/${P}-icq-html-regression.patch |
177 |
epatch "${FILESDIR}"/${P}-bonjour-crash.patch |
178 |
epatch "${FILESDIR}"/${P}-missing-break-bug-12810.patch |
179 |
epatch "${FILESDIR}"/${P}-icq-authorization-empty-nick.patch |
180 |
eautoreconf |
181 |
} |
182 |
|
183 |
src_configure() { |
184 |
# Stabilize things, for your own good |
185 |
strip-flags |
186 |
replace-flags -O? -O2 |
187 |
|
188 |
local myconf |
189 |
|
190 |
if use gadu; then |
191 |
DYNAMIC_PRPLS="${DYNAMIC_PRPLS},gg" |
192 |
myconf="${myconf} --with-gadu-includes=." |
193 |
myconf="${myconf} --with-gadu-libs=." |
194 |
fi |
195 |
|
196 |
use silc && DYNAMIC_PRPLS+=",silc" |
197 |
use qq && DYNAMIC_PRPLS+=",qq" |
198 |
use meanwhile && DYNAMIC_PRPLS+=",sametime" |
199 |
use zeroconf && DYNAMIC_PRPLS+=",bonjour" |
200 |
use groupwise && DYNAMIC_PRPLS+=",novell" |
201 |
use zephyr && DYNAMIC_PRPLS+=",zephyr" |
202 |
|
203 |
if use gnutls; then |
204 |
einfo "Disabling NSS, using GnuTLS" |
205 |
myconf+=" --enable-nss=no --enable-gnutls=yes" |
206 |
myconf+=" --with-gnutls-includes=/usr/include/gnutls" |
207 |
myconf+=" --with-gnutls-libs=/usr/$(get_libdir)" |
208 |
else |
209 |
einfo "Disabling GnuTLS, using NSS" |
210 |
myconf+=" --enable-gnutls=no --enable-nss=yes" |
211 |
fi |
212 |
|
213 |
if use dbus || { use ncurses && use python; }; then |
214 |
myconf+=" --with-python=$(PYTHON)" |
215 |
else |
216 |
myconf+=" --without-python" |
217 |
fi |
218 |
|
219 |
econf \ |
220 |
--disable-silent-rules \ |
221 |
$(use_enable ncurses consoleui) \ |
222 |
$(use_enable gtk gtkui) \ |
223 |
$(use_enable gtk sm) \ |
224 |
$(use gtk || use_enable nls) \ |
225 |
$(use gtk && echo "--enable-nls") \ |
226 |
$(use gtk && use_enable startup-notification) \ |
227 |
$(use gtk && use_enable xscreensaver screensaver) \ |
228 |
$(use gtk && use_enable prediction cap) \ |
229 |
$(use gtk && use_enable eds gevolution) \ |
230 |
$(use gtk && use_enable spell gtkspell) \ |
231 |
$(use_enable perl) \ |
232 |
$(use_enable tk) \ |
233 |
$(use_enable tcl) \ |
234 |
$(use_enable debug) \ |
235 |
$(use_enable dbus) \ |
236 |
$(use_enable meanwhile) \ |
237 |
$(use_enable gstreamer) \ |
238 |
$(use_enable gstreamer farsight) \ |
239 |
$(use_enable gstreamer vv) \ |
240 |
$(use_enable sasl cyrus-sasl ) \ |
241 |
$(use_enable doc doxygen) \ |
242 |
$(use_enable networkmanager nm) \ |
243 |
$(use_enable zeroconf avahi) \ |
244 |
$(use_enable idn) \ |
245 |
--with-system-ssl-certs="/etc/ssl/certs/" \ |
246 |
--with-dynamic-prpls="${DYNAMIC_PRPLS}" \ |
247 |
--disable-mono \ |
248 |
--x-includes=/usr/include/X11 \ |
249 |
${myconf} |
250 |
#$(use_enable mono) \ |
251 |
} |
252 |
|
253 |
src_install() { |
254 |
gnome2_src_install |
255 |
if use gtk; then |
256 |
# Fix tray pathes for kde-3.5, e16 (x11-wm/enlightenment) and other |
257 |
# implementations that are not complient with new hicolor theme yet, #323355 |
258 |
local pixmapdir |
259 |
for d in 16 22 32 48; do |
260 |
pixmapdir=${D}/usr/share/pixmaps/pidgin/tray/hicolor/${d}x${d}/actions |
261 |
mkdir "${pixmapdir}" || die |
262 |
pushd "${pixmapdir}" >/dev/null || die |
263 |
for f in ../status/*; do |
264 |
ln -s ${f} || die |
265 |
done |
266 |
popd >/dev/null |
267 |
done |
268 |
fi |
269 |
use perl && fixlocalpod |
270 |
|
271 |
find "${D}" -type f -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed" |
272 |
} |