Djam/pidgin
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/pidgin.git synced 2025-02-23 21:42:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

update to 2.10.6

Browse source
This commit is contained in:
Sergey Zhemoitel 2012-07-13 17:27:37 +04:00
parent 1f2ad7a2bb
commit 942cb30be3
5 changed files with 248 additions and 1076 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.abf.yml
View file

@ -1,2 +1,3 @@
sources:
"pidgin-2.10.6.tar.bz2": a0532e7ba2acd205d6a5a4e3624156a980fe3d43
"pidgin-2.9.0.tar.bz2": 632c681030304443a911c9eeca6d582df0a24fbb

24
pidgin-2.10.0-gg-search-by-uin.patch Normal file
View file

@ -0,0 +1,24 @@
--- pidgin-2.10.0/libpurple/protocols/gg/gg.c.gg-search 2011-08-18 10:51:03.000000000 +0200
+++ pidgin-2.10.0/libpurple/protocols/gg/gg.c 2011-08-22 15:57:02.000000000 +0200
@@ -533,6 +533,9 @@ static void ggp_callback_find_buddies(Pu
purple_request_fields_get_string(fields, "firstname"));
form->nickname = g_strdup(
purple_request_fields_get_string(fields, "nickname"));
+ form->uin = charset_convert(
+ purple_request_fields_get_string(fields, "uin"),
+ "UTF-8", "CP1250");
form->city = g_strdup(
purple_request_fields_get_string(fields, "city"));
form->birthyear = g_strdup(
@@ -586,6 +589,11 @@ static void ggp_find_buddies(PurplePlugi
purple_request_field_string_set_masked(field, FALSE);
purple_request_field_group_add_field(group, field);
+ field = purple_request_field_string_new("uin",
+ _("UIN"), NULL, FALSE);
+ purple_request_field_string_set_masked(field, FALSE);
+ purple_request_field_group_add_field(group, field);
+
field = purple_request_field_string_new("city",
_("City"), NULL, FALSE);
purple_request_field_string_set_masked(field, FALSE);

32
pidgin-2.10.1-fix-perl-module-build.patch Normal file
View file

@ -0,0 +1,32 @@
--- pidgin-2.10.1/libpurple/Makefile.am~ 2011-12-06 09:44:33.000000000 +0100
+++ pidgin-2.10.1/libpurple/Makefile.am 2011-12-13 17:14:37.492942189 +0100
@@ -32,7 +32,7 @@ endif
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = purple.pc
-SUBDIRS = $(GCONF_DIR) plugins protocols ciphers . tests example
+SUBDIRS = $(GCONF_DIR) protocols ciphers . plugins tests example
purple_coresources = \
account.c \
--- pidgin-2.10.1/libpurple/plugins/perl/Makefile.am~ 2011-12-06 09:44:33.000000000 +0100
+++ pidgin-2.10.1/libpurple/plugins/perl/Makefile.am 2011-12-13 17:15:09.437943687 +0100
@@ -5,7 +5,7 @@ perl_dirs = common
plugin_LTLIBRARIES = perl.la
perl_la_LDFLAGS = -module -avoid-version
-perl_la_LIBADD = $(GLIB_LIBS) $(PERL_LIBS)
+perl_la_LIBADD = $(GLIB_LIBS) $(PERL_LIBS) $(top_builddir)/libpurple/libpurple.la
perl_la_SOURCES = \
perl.c \
perl-common.c \
@@ -15,7 +15,8 @@ perl_la_SOURCES = \
perl_la_DEPENDENCIES = \
.libs/libperl_orig.a \
- .libs/DynaLoader.a
+ .libs/DynaLoader.a \
+ $(top_builddir)/libpurple/libpurple.la
.libs/libperl_orig.a:
@mkdir -p .libs

22
pidgin-2.10.2-explicitly-add-soname-to-liboscar-and-libjabber.patch Normal file
View file

@ -0,0 +1,22 @@
--- pidgin-2.10.2/libpurple/protocols/jabber/Makefile.am.soname~ 2012-03-16 20:23:40.918123912 +0100
+++ pidgin-2.10.2/libpurple/protocols/jabber/Makefile.am 2012-03-16 20:24:42.355199920 +0100
@@ -93,7 +93,7 @@ JABBERSOURCES = \
AM_CFLAGS = $(st)
-libjabber_la_LDFLAGS = -module -avoid-version
+libjabber_la_LDFLAGS = -module -avoid-version -Wl,-soname=libjabber.so
libxmpp_la_LDFLAGS = -module -avoid-version
if USE_CYRUS_SASL
--- pidgin-2.10.2/libpurple/protocols/oscar/Makefile.am.soname~ 2012-03-16 20:15:58.733552100 +0100
+++ pidgin-2.10.2/libpurple/protocols/oscar/Makefile.am 2012-03-16 20:15:58.753552126 +0100
@@ -52,7 +52,7 @@ AM_CFLAGS = $(st)
libaim_la_LDFLAGS = -module -avoid-version
libicq_la_LDFLAGS = -module -avoid-version
-liboscar_la_LDFLAGS = -module -avoid-version
+liboscar_la_LDFLAGS = -module -avoid-version -Wl,-soname=liboscar.so
if STATIC_OSCAR
st = -DPURPLE_STATIC_PRPL

1241
pidgin.spec
View file

File diff suppressed because it is too large Load diff