pidgin package update
Signed-off-by: guibuilder_pel7x64builder0 <guibuilder@powerel.org>master
parent
b65113e1e7
commit
6ac09b6ff8
|
@ -0,0 +1,33 @@
|
|||
----------------------------------------------------------------------
|
||||
Revision: 9d51cb9fbcc04d21597eed0381f4d06c53facc44
|
||||
Parent: 17326b88b85d2f13939a71ca80d4a617f0527f9a
|
||||
Author: Cristi Posoiu
|
||||
Date: 06/03/11 02:55:31
|
||||
Branch: im.pidgin.pidgin
|
||||
|
||||
Changelog:
|
||||
|
||||
Fix up some cases of file transfers never finishing. This will help certain
|
||||
instances of Yahoo file transfers not working, but not all. Fixes #12472.
|
||||
|
||||
Changes against parent 17326b88b85d2f13939a71ca80d4a617f0527f9a
|
||||
|
||||
patched libpurple/ft.c
|
||||
|
||||
============================================================
|
||||
--- libpurple/ft.c 2b8633b159e16099b858dd21ed122e9c3811a9d5
|
||||
+++ libpurple/ft.c ffba61c0a50c9d5f866f8b1f0dec16cf13bbd65c
|
||||
@@ -1100,9 +1100,11 @@ purple_xfer_write(PurpleXfer *xfer, cons
|
||||
r = write(xfer->fd, buffer, s);
|
||||
if (r < 0 && errno == EAGAIN)
|
||||
r = 0;
|
||||
- if ((purple_xfer_get_bytes_sent(xfer)+r) >= purple_xfer_get_size(xfer))
|
||||
- purple_xfer_set_completed(xfer, TRUE);
|
||||
}
|
||||
+ if (r >= 0 && (purple_xfer_get_bytes_sent(xfer)+r) >= purple_xfer_get_size(xfer) &&
|
||||
+ !purple_xfer_is_completed(xfer))
|
||||
+ purple_xfer_set_completed(xfer, TRUE);
|
||||
+
|
||||
|
||||
return r;
|
||||
}
|
|
@ -0,0 +1,16 @@
|
|||
diff --git a/configure.ac b/configure.ac
|
||||
index 51471b1..6b59976 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -1227,11 +1227,6 @@ AC_ARG_ENABLE(fortify, [AC_HELP_STRING([--disable-fortify], [compile without FOR
|
||||
|
||||
DEBUG_CFLAGS="$DEBUG_CFLAGS -DPURPLE_DISABLE_DEPRECATED -DPIDGIN_DISABLE_DEPRECATED -DFINCH_DISABLE_DEPRECATED -DGNT_DISABLE_DEPRECATED"
|
||||
if test "x$GCC" = "xyes"; then
|
||||
- dnl We enable -Wall later.
|
||||
- dnl If it's set after the warning CFLAGS in the compiler invocation, it counteracts the -Wno... flags.
|
||||
- dnl This leads to warnings we don't want.
|
||||
- CFLAGS=`echo $CFLAGS |$sedpath 's/-Wall//'`
|
||||
-
|
||||
dnl ENABLE WARNINGS SUPPORTED BY THE VERSION OF GCC IN USE
|
||||
dnl
|
||||
dnl Future Possibilities
|
|
@ -0,0 +1,17 @@
|
|||
Actually make things work in python3.
|
||||
|
||||
Author: Jan Synacek <jsynacek@redhat.com>
|
||||
|
||||
Index: pidgin-2.13.0/libpurple/purple-remote
|
||||
===================================================================
|
||||
--- pidgin-2.13.0.orig/libpurple/purple-remote
|
||||
+++ pidgin-2.13.0/libpurple/purple-remote
|
||||
@@ -14,7 +14,7 @@ import sys
|
||||
import xml.dom.minidom
|
||||
|
||||
sys.stdin = codecs.getwriter('utf-8')(sys.stdin);
|
||||
-sys.stdout = codecs.getwriter('utf-8')(sys.stdout);
|
||||
+sys.stdout = codecs.getwriter('utf-8')(sys.stdout.detach());
|
||||
|
||||
xml.dom.minidom.Element.all = xml.dom.minidom.Element.getElementsByTagName
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
--- a/libpurple/Makefile.am 2014-02-02 22:29:17.000000000 +0100
|
||||
+++ b/libpurple/Makefile.am 2014-09-15 08:47:31.352256368 +0200
|
||||
@@ -284,8 +284,7 @@
|
||||
|
||||
noinst_HEADERS= \
|
||||
internal.h \
|
||||
- media/backend-fs2.h \
|
||||
- valgrind.h
|
||||
+ media/backend-fs2.h
|
||||
|
||||
libpurpleincludedir=$(includedir)/libpurple
|
||||
libpurpleinclude_HEADERS = \
|
|
@ -0,0 +1,33 @@
|
|||
diff -urN pidgin-2.5.2.orig/pidgin/gtksound.c pidgin-2.5.2/pidgin/gtksound.c
|
||||
--- pidgin-2.5.2.orig/pidgin/gtksound.c 2008-07-13 22:05:38.000000000 -0400
|
||||
+++ pidgin-2.5.2/pidgin/gtksound.c 2008-11-22 13:36:54.000000000 -0500
|
||||
@@ -298,6 +298,9 @@
|
||||
purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/sound/mute", FALSE);
|
||||
purple_prefs_add_path(PIDGIN_PREFS_ROOT "/sound/command", "");
|
||||
purple_prefs_add_string(PIDGIN_PREFS_ROOT "/sound/method", "automatic");
|
||||
+#ifndef USE_GSTREAMER
|
||||
+ purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/sound/rhel4migrated", FALSE);
|
||||
+#endif
|
||||
purple_prefs_add_int(PIDGIN_PREFS_ROOT "/sound/volume", 50);
|
||||
|
||||
#ifdef USE_GSTREAMER
|
||||
@@ -433,6 +436,19 @@
|
||||
return;
|
||||
}
|
||||
|
||||
+#ifndef USE_GSTREAMER
|
||||
+ /* RHEL4 migration code */
|
||||
+ if (!purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/sound/rhel4migrated")) {
|
||||
+ purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/sound/rhel4migrated", TRUE);
|
||||
+ if(!strcmp(method, "automatic") ||
|
||||
+ !strcmp(method, "esd") ||
|
||||
+ !strcmp(method, "arts")) {
|
||||
+ purple_prefs_set_string(PIDGIN_PREFS_ROOT "/sound/method", "custom");
|
||||
+ purple_prefs_set_path(PIDGIN_PREFS_ROOT "/sound/command", "aplay %s");
|
||||
+ }
|
||||
+ }
|
||||
+#endif
|
||||
+
|
||||
#ifndef _WIN32
|
||||
if (!strcmp(method, "custom")) {
|
||||
const char *sound_cmd;
|
|
@ -0,0 +1,55 @@
|
|||
<?xml version='1.0' encoding='UTF-8' ?>
|
||||
|
||||
<pref version='1' name='/'>
|
||||
<pref name='purple'>
|
||||
<pref name='logging'>
|
||||
<pref name='log_ims' type='bool' value='1'/>
|
||||
<pref name='format' type='string' value='html'/>
|
||||
</pref>
|
||||
</pref>
|
||||
<pref name='plugins'>
|
||||
<pref name='gtk'>
|
||||
<pref name='extplacement'>
|
||||
<pref name='placement_number' type='int' value='4'/>
|
||||
<pref name='placement_number_separate' type='bool' value='0'/>
|
||||
</pref>
|
||||
<pref name='X11'>
|
||||
<pref name='notify'>
|
||||
<pref name='type_im' type='bool' value='1'/>
|
||||
<pref name='type_chat' type='bool' value='1'/>
|
||||
<pref name='type_chat_nick' type='bool' value='1'/>
|
||||
<pref name='type_focused' type='bool' value='0'/>
|
||||
<pref name='method_string' type='bool' value='0'/>
|
||||
<pref name='title_string' type='string' value='(*)'/>
|
||||
<pref name='method_urgent' type='bool' value='1'/>
|
||||
<pref name='method_count' type='bool' value='1'/>
|
||||
<pref name='method_count_xprop' type='bool' value='0'/>
|
||||
<pref name='method_raise' type='bool' value='0'/>
|
||||
<pref name='notify_focus' type='bool' value='1'/>
|
||||
<pref name='notify_click' type='bool' value='1'/>
|
||||
<pref name='notify_type' type='bool' value='1'/>
|
||||
<pref name='notify_send' type='bool' value='1'/>
|
||||
<pref name='notify_switch' type='bool' value='1'/>
|
||||
</pref>
|
||||
</pref>
|
||||
</pref>
|
||||
</pref>
|
||||
<pref name='pidgin'>
|
||||
<pref name='browsers'>
|
||||
<pref name='place' type='int' value='0'/>
|
||||
<pref name='command' type='path' value=''/>
|
||||
<pref name='browser' type='string' value='xdg-open'/>
|
||||
</pref>
|
||||
<pref name='plugins'>
|
||||
<pref name='loaded' type='pathlist'>
|
||||
<item value='/usr/lib/pidgin/extplacement.so'/>
|
||||
<item value='/usr/lib/pidgin/history.so'/>
|
||||
<item value='/usr/lib/pidgin/notify.so'/>
|
||||
<item value='/usr/lib/pidgin/nautilus.so'/>
|
||||
</pref>
|
||||
</pref>
|
||||
<pref name='blist'>
|
||||
<pref name='show_buddy_icons' type='bool' value='0'/>
|
||||
</pref>
|
||||
</pref>
|
||||
</pref>
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue