r9646 - /packages/unstable/pidgin/trunk/debian/patches/
ari at users.alioth.debian.org
ari at users.alioth.debian.org
Tue Apr 10 01:04:58 UTC 2007
Author: ari
Date: Tue Apr 10 01:04:57 2007
New Revision: 9646
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=9646
Log:
Update patches for pidgin snapshot
Added:
packages/unstable/pidgin/trunk/debian/patches/20_purple-remote_friendly.patch
- copied, changed from r9597, packages/experimental/gaim/debian/patches/20_gaim-remote_friendly.patch
Removed:
packages/unstable/pidgin/trunk/debian/patches/13_yahoo_webauth_disable.patch
packages/unstable/pidgin/trunk/debian/patches/18_sametime-strip-html.patch
packages/unstable/pidgin/trunk/debian/patches/19_redirect_crash.patch
packages/unstable/pidgin/trunk/debian/patches/20_gaim-remote_friendly.patch
Modified:
packages/unstable/pidgin/trunk/debian/patches/01_gtkspell-locale3.patch
packages/unstable/pidgin/trunk/debian/patches/02_gnthistory-in-gtk.patch
packages/unstable/pidgin/trunk/debian/patches/03_gconf-gstreamer.patch
packages/unstable/pidgin/trunk/debian/patches/11_reread-resolvconf.patch
packages/unstable/pidgin/trunk/debian/patches/14_xulrunner_nss.patch
packages/unstable/pidgin/trunk/debian/patches/16_yahoo_icon_crash.patch
packages/unstable/pidgin/trunk/debian/patches/17_statusbox_crash.patch
Modified: packages/unstable/pidgin/trunk/debian/patches/01_gtkspell-locale3.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/pidgin/trunk/debian/patches/01_gtkspell-locale3.patch?rev=9646&op=diff
==============================================================================
--- packages/unstable/pidgin/trunk/debian/patches/01_gtkspell-locale3.patch (original)
+++ packages/unstable/pidgin/trunk/debian/patches/01_gtkspell-locale3.patch Tue Apr 10 01:04:57 2007
@@ -1,6 +1,6 @@
diff -u -r1.58 gtkutils.c
---- gtk/gtkutils.c 4 Jan 2004 06:59:09 -0000 1.58
-+++ gtk/gtkutils.c 5 Jan 2004 01:38:19 -0000
+--- pidgin-2.0.0+beta6/pidgin/gtkutils.c 4 Jan 2004 06:59:09 -0000 1.58
++++ pidgin-2.0.0+beta6/pidgin/gtkutils.c 5 Jan 2004 01:38:19 -0000
@@ -1104,6 +1104,17 @@
g_return_if_fail(textview != NULL);
g_return_if_fail(GTK_IS_TEXT_VIEW(textview));
@@ -19,8 +19,8 @@
if (gtkspell_new_attach(textview, locale, &error) == NULL && error)
{
gaim_debug_warning("gtkspell", "Failed to setup GtkSpell: %s\n",
---- gtk/gtkutils.h 29 Dec 2003 09:03:43 -0000 1.24
-+++ gtk/gtkutils.h 5 Jan 2004 01:38:19 -0000
+--- pidgin-2.0.0+beta6/pidgin/gtkutils.h 29 Dec 2003 09:03:43 -0000 1.24
++++ pidgin-2.0.0+beta6/pidgin/gtkutils.h 5 Jan 2004 01:38:19 -0000
@@ -283,7 +283,8 @@
void gaim_gtk_find_images(const char *message, GSList **list);
Modified: packages/unstable/pidgin/trunk/debian/patches/02_gnthistory-in-gtk.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/pidgin/trunk/debian/patches/02_gnthistory-in-gtk.patch?rev=9646&op=diff
==============================================================================
--- packages/unstable/pidgin/trunk/debian/patches/02_gnthistory-in-gtk.patch (original)
+++ packages/unstable/pidgin/trunk/debian/patches/02_gnthistory-in-gtk.patch Tue Apr 10 01:04:57 2007
@@ -1,5 +1,5 @@
---- console/plugins/gnthistory.orig 2006-10-18 20:54:41.000000000 -0400
-+++ console/plugins/gnthistory.c 2006-10-18 20:54:45.000000000 -0400
+--- pidgin-2.0.0+beta6/finch/plugins/gnthistory.orig 2006-10-18 20:54:41.000000000 -0400
++++ pidgin-2.0.0+beta6/finch/gnthistory.c 2006-10-18 20:54:45.000000000 -0400
@@ -173,7 +173,7 @@
GAIM_MAJOR_VERSION,
GAIM_MINOR_VERSION,
Modified: packages/unstable/pidgin/trunk/debian/patches/03_gconf-gstreamer.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/pidgin/trunk/debian/patches/03_gconf-gstreamer.patch?rev=9646&op=diff
==============================================================================
--- packages/unstable/pidgin/trunk/debian/patches/03_gconf-gstreamer.patch (original)
+++ packages/unstable/pidgin/trunk/debian/patches/03_gconf-gstreamer.patch Tue Apr 10 01:04:57 2007
@@ -1,11 +1,11 @@
-diff -Nur gaim-2.0.0+beta5/gtk/gtksound.c gaim-2.0.0+beta5.new/gtk/gtksound.c
---- gaim-2.0.0+beta5/gtk/gtksound.c 2006-11-10 02:23:00.000000000 -0500
-+++ gaim-2.0.0+beta5.new/gtk/gtksound.c 2006-11-11 15:44:05.000000000 -0500
+diff -Nur pidgin-2.0.0+beta5/pidgin/gtksound.c pidgin-2.0.0+beta5.new/pidgin/gtksound.c
+--- pidgin-2.0.0+beta5/pidgin/gtksound.c 2006-11-10 02:23:00.000000000 -0500
++++ pidgin-2.0.0+beta5.new/pidgin/gtksound.c 2006-11-11 15:44:05.000000000 -0500
@@ -448,9 +448,7 @@
return;
- volume = (float)(CLAMP(gaim_prefs_get_int("/gaim/gtk/sound/volume"),0,100)) / 50;
+ volume = (float)(CLAMP(purple_prefs_get_int("/purple/gtk/sound/volume"),0,100)) / 50;
if (!strcmp(method, "automatic")) {
-- if (gaim_running_gnome()) {
+- if (purple_running_gnome()) {
- sink = gst_element_factory_make("gconfaudiosink", "sink");
- }
+ sink = gst_element_factory_make("gconfaudiosink", "sink");
Modified: packages/unstable/pidgin/trunk/debian/patches/11_reread-resolvconf.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/pidgin/trunk/debian/patches/11_reread-resolvconf.patch?rev=9646&op=diff
==============================================================================
--- packages/unstable/pidgin/trunk/debian/patches/11_reread-resolvconf.patch (original)
+++ packages/unstable/pidgin/trunk/debian/patches/11_reread-resolvconf.patch Tue Apr 10 01:04:57 2007
@@ -1,6 +1,5 @@
-diff -ur gaim-2.0.0+beta5.orig/libgaim/connection.c gaim-2.0.0+beta5/libgaim/connection.c
---- gaim-2.0.0+beta5.orig/libgaim/connection.c 2006-11-28 00:12:14.000000000 -0500
-+++ gaim-2.0.0+beta5/libgaim/connection.c 2006-11-28 00:24:00.000000000 -0500
+--- pidgin-2.0.0+beta5.orig/libpurple/connection.c 2006-11-28 00:12:14.000000000 -0500
++++ pidgin-2.0.0+beta5/libpurple/connection.c 2006-11-28 00:24:00.000000000 -0500
@@ -37,6 +37,10 @@
#include "signals.h"
#include "util.h"
@@ -11,20 +10,19 @@
+
static GList *connections = NULL;
static GList *connections_connecting = NULL;
- static GaimConnectionUiOps *connection_ui_ops = NULL;
+ static PurpleConnectionUiOps *connection_ui_ops = NULL;
@@ -139,6 +139,9 @@
- gaim_signal_emit(gaim_connections_get_handle(), "signing-on", gc);
+ purple_signal_emit(purple_connections_get_handle(), "signing-on", gc);
+ /* Re-read resolv.conf and friends in case DNS servers have changed */
+ res_init();
+
if (regist)
{
- gaim_debug_info("connection", "Registering. gc = %p\n", gc);
-diff -ur gaim-2.0.0+beta5.orig/libgaim/network.c gaim-2.0.0+beta5/libgaim/network.c
---- gaim-2.0.0+beta5.orig/libgaim/network.c 2006-11-28 00:12:14.000000000 -0500
-+++ gaim-2.0.0+beta5/libgaim/network.c 2006-11-28 00:24:15.000000000 -0500
+ purple_debug_info("connection", "Registering. gc = %p\n", gc);
+--- pidgin-2.0.0+beta5.orig/libpurple/network.c 2006-11-28 00:12:14.000000000 -0500
++++ pidgin-2.0.0+beta5/libpurple/network.c 2006-11-28 00:24:15.000000000 -0500
@@ -558,8 +558,6 @@
switch(current)
{
Modified: packages/unstable/pidgin/trunk/debian/patches/14_xulrunner_nss.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/pidgin/trunk/debian/patches/14_xulrunner_nss.patch?rev=9646&op=diff
==============================================================================
--- packages/unstable/pidgin/trunk/debian/patches/14_xulrunner_nss.patch (original)
+++ packages/unstable/pidgin/trunk/debian/patches/14_xulrunner_nss.patch Tue Apr 10 01:04:57 2007
@@ -1,5 +1,5 @@
---- gaim-2.0.0+beta5/configure.orig 2006-12-11 13:11:56.000000000 -0500
-+++ gaim-2.0.0+beta5/configure 2006-12-11 12:17:51.000000000 -0500
+--- pidgin-2.0.0+beta5/configure.orig 2006-12-11 13:11:56.000000000 -0500
++++ pidgin-2.0.0+beta5/configure 2006-12-11 12:17:51.000000000 -0500
@@ -32122,7 +32122,7 @@
enable_nss="no"
Modified: packages/unstable/pidgin/trunk/debian/patches/16_yahoo_icon_crash.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/pidgin/trunk/debian/patches/16_yahoo_icon_crash.patch?rev=9646&op=diff
==============================================================================
--- packages/unstable/pidgin/trunk/debian/patches/16_yahoo_icon_crash.patch (original)
+++ packages/unstable/pidgin/trunk/debian/patches/16_yahoo_icon_crash.patch Tue Apr 10 01:04:57 2007
@@ -1,5 +1,5 @@
---- gaim.orig/libgaim/protocols/yahoo/yahoo_picture.c 2006-12-12 20:59:01.000000000 -0500
-+++ gaim.orig/libgaim/protocols/yahoo/yahoo_picture.c 2006-12-12 21:00:28.000000000 -0500
+--- pidgin.orig/libpurple/protocols/yahoo/yahoo_picture.c 2006-12-12 20:59:01.000000000 -0500
++++ pidgin/libpurple/protocols/yahoo/yahoo_picture.c 2006-12-12 21:00:28.000000000 -0500
@@ -130,9 +130,6 @@
if (url_data != NULL) {
yd = gc->proto_data;
@@ -10,8 +10,8 @@
}
} else if (who && send_icon_info) {
yahoo_send_picture_info(gc, who);
---- gaim.orig/libgaim/protocols/yahoo/yahoo_profile.c 2006-12-12 20:59:01.000000000 -0500
-+++ gaim.orig/libgaim/protocols/yahoo/yahoo_profile.c 2006-12-12 21:02:13.000000000 -0500
+--- pidgin.orig/libpurple/protocols/yahoo/yahoo_profile.c 2006-12-12 20:59:01.000000000 -0500
++++ pidgin/libpurple/protocols/yahoo/yahoo_profile.c 2006-12-12 21:02:13.000000000 -0500
@@ -928,11 +928,6 @@
FALSE, yahoo_got_photo, info2_data);
if (url_data != NULL)
Modified: packages/unstable/pidgin/trunk/debian/patches/17_statusbox_crash.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/pidgin/trunk/debian/patches/17_statusbox_crash.patch?rev=9646&op=diff
==============================================================================
--- packages/unstable/pidgin/trunk/debian/patches/17_statusbox_crash.patch (original)
+++ packages/unstable/pidgin/trunk/debian/patches/17_statusbox_crash.patch Tue Apr 10 01:04:57 2007
@@ -1,11 +1,11 @@
---- gaim.orig/gtk/gtkstatusbox.c 2007-01-27 16:49:35.000000000 -0500
-+++ gaim/gtk/gtkstatusbox.c 2007-01-27 16:49:44.000000000 -0500
+--- pidgin.orig/pidgin/gtkstatusbox.c 2007-01-27 16:49:35.000000000 -0500
++++ pidgin/pidgin/gtkstatusbox.c 2007-01-27 16:49:44.000000000 -0500
@@ -2119,7 +2119,7 @@
- GaimSavedStatusSub *sub = gaim_savedstatus_get_substatus(ss, acct);
+ PurpleSavedStatusSub *sub = purple_savedstatus_get_substatus(ss, acct);
if (sub) {
- const GaimStatusType *sub_type = gaim_savedstatus_substatus_get_type(sub);
-- if (!strcmp(gaim_status_type_get_id(sub_type),
-+ if (sub_type && !strcmp(gaim_status_type_get_id(sub_type),
- gaim_status_type_get_id(acct_status_type)))
+ const PurpleStatusType *sub_type = purple_savedstatus_substatus_get_type(sub);
+- if (!strcmp(purple_status_type_get_id(sub_type),
++ if (sub_type && !strcmp(purple_status_type_get_id(sub_type),
+ purple_status_type_get_id(acct_status_type)))
found = TRUE;
}
Copied: packages/unstable/pidgin/trunk/debian/patches/20_purple-remote_friendly.patch (from r9597, packages/experimental/gaim/debian/patches/20_gaim-remote_friendly.patch)
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/pidgin/trunk/debian/patches/20_purple-remote_friendly.patch?rev=9646&op=diff
==============================================================================
--- packages/experimental/gaim/debian/patches/20_gaim-remote_friendly.patch (original)
+++ packages/unstable/pidgin/trunk/debian/patches/20_purple-remote_friendly.patch Tue Apr 10 01:04:57 2007
@@ -1,6 +1,6 @@
-diff -Nur gaim-2.0.0+beta6/libgaim/gaim-remote gaim-2.0.0+beta6.new/libgaim/gaim-remote
---- gaim-2.0.0+beta6/libgaim/gaim-remote 2007-01-18 23:28:24.000000000 -0500
-+++ gaim-2.0.0+beta6.new/libgaim/gaim-remote 2007-03-19 22:47:49.000000000 -0400
+diff -Nur pidgin-2.0.0+beta6/libpurple/purple-remote pidgin-2.0.0+beta6.new/libpurple/purple-remote
+--- pidgin-2.0.0+beta6/libpurple/purple-remote 2007-01-18 23:28:24.000000000 -0500
++++ pidgin-2.0.0+beta6.new/libpurple/purple-remote 2007-03-19 22:47:49.000000000 -0400
@@ -1,6 +1,10 @@
#!/usr/bin/python
@@ -19,20 +19,20 @@
-if len(sys.argv) == 1:
+if len(sys.argv) == 1 or sys.argv[1] == "--help" or sys.argv == "-h":
- print """This program uses DBus to communicate with gaim.
+ print """This program uses DBus to communicate with pidgin.
Usage:
@@ -203,6 +207,7 @@
- GaimAccountsFindConnected?name=&protocol=prpl-jabber
- GaimAccountFindConnected(,prpl-jabber)
+ pidginAccountsFindConnected?name=&protocol=prpl-jabber
+ pidginAccountFindConnected(,prpl-jabber)
""" % sys.argv[0]
+ sys.exit(1)
for arg in sys.argv[1:]:
output = execute(arg)
-diff -Nur gaim-2.0.0+beta6/libgaim/gaim-url-handler gaim-2.0.0+beta6.new/libgaim/gaim-url-handler
---- gaim-2.0.0+beta6/libgaim/gaim-url-handler 2007-01-18 23:28:24.000000000 -0500
-+++ gaim-2.0.0+beta6.new/libgaim/gaim-url-handler 2007-03-19 22:48:34.000000000 -0400
+diff -Nur pidgin-2.0.0+beta6/libpurple/purple-url-handler pidgin-2.0.0+beta6.new/libpurple/purple-url-handler
+--- pidgin-2.0.0+beta6/libpurple/purple-url-handler 2007-01-18 23:28:24.000000000 -0500
++++ pidgin-2.0.0+beta6.new/libpurple/purple-url-handler 2007-03-19 22:48:34.000000000 -0400
@@ -1,6 +1,10 @@
#!/usr/bin/python
More information about the pkg-gnome-commits
mailing list