SOURCES: gaim-dbus-dir.patch (NEW), gaim-libgadu.patch (NEW), gaim...
radek
radek at pld-linux.org
Fri Mar 23 16:38:15 CET 2007
Author: radek Date: Fri Mar 23 15:38:15 2007 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- merged from DEVEL
---- Files affected:
SOURCES:
gaim-dbus-dir.patch (1.1 -> 1.2) (NEW), gaim-libgadu.patch (1.2 -> 1.3) (NEW), gaim-GG-evo.patch (1.1 -> 1.2) , gaim-nolibs.patch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: SOURCES/gaim-dbus-dir.patch
diff -u /dev/null SOURCES/gaim-dbus-dir.patch:1.2
--- /dev/null Fri Mar 23 16:38:15 2007
+++ SOURCES/gaim-dbus-dir.patch Fri Mar 23 16:38:10 2007
@@ -0,0 +1,14 @@
+diff -aurN gaim-2.0.0beta3.orig/configure.ac gaim-2.0.0beta3/configure.ac
+--- gaim-2.0.0beta3.orig/configure.ac 2006-03-26 09:45:35.000000000 +0200
++++ gaim-2.0.0beta3/configure.ac 2006-04-07 23:09:18.526190784 +0200
+@@ -689,10 +689,6 @@
+ if test x"$enable_dbus" = "xyes" ; then
+ AC_MSG_CHECKING([location of the D-Bus services directory])
+ if ! test -z "$with_dbus_services" ; then
+- if ! test -d "$with_dbus_services" ; then
+- AC_MSG_ERROR([$with_dbus_services does not exist, if this is the correct location please make sure that it exists.])
+- fi
+-
+ DBUS_SERVICES_DIR="$with_dbus_services"
+ else
+ if test x"$prefix" = x"NONE" ; then
================================================================
Index: SOURCES/gaim-libgadu.patch
diff -u /dev/null SOURCES/gaim-libgadu.patch:1.3
--- /dev/null Fri Mar 23 16:38:15 2007
+++ SOURCES/gaim-libgadu.patch Fri Mar 23 16:38:10 2007
@@ -0,0 +1,32 @@
+diff -aurN gaim-2.0.0.orig/configure.ac gaim-2.0.0/configure.ac
+--- gaim-2.0.0.orig/configure.ac 2006-03-08 22:25:19.000000000 +0100
++++ gaim-2.0.0/configure.ac 2006-03-10 21:51:36.233940352 +0100
+@@ -631,28 +631,9 @@
+ AC_MSG_CHECKING(for libgadu GPL compatibility)
+ CPPFLAGS_save="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $GADU_CFLAGS"
+- AC_TRY_COMPILE([#include <libgadu.h>], [
+-#ifdef __GG_LIBGADU_HAVE_OPENSSL
+-#error "libgadu is not compatible with the GPL when compiled with OpenSSL support."
+-#endif
+- ], [
+ AC_MSG_RESULT(yes)
+ AC_DEFINE([HAVE_LIBGADU], [1],
+ [Define to 1 if you have libgadu.])
+- ], [
+- AC_MSG_RESULT(no)
+- echo
+- echo
+- echo "libgadu is not compatible with the GPL when compiled with OpenSSL support."
+- echo "Please recompile libgadu using:"
+- echo "./autogen.sh --disable-libgadu-openssl --disable-static --enable-shared"
+- echo "Then rerun this ./configure"
+- echo
+- echo
+- GADU_LIBS=""
+- GADU_CFLAGS=""
+- gadu_libs=no
+- ])
+ CPPFLAGS="$CPPFLAGS_save"
+ fi
+
================================================================
Index: SOURCES/gaim-GG-evo.patch
diff -u SOURCES/gaim-GG-evo.patch:1.1 SOURCES/gaim-GG-evo.patch:1.2
--- SOURCES/gaim-GG-evo.patch:1.1 Sun Jun 13 00:53:51 2004
+++ SOURCES/gaim-GG-evo.patch Fri Mar 23 16:38:10 2007
@@ -1,12 +1,12 @@
-diff -urN gaim-0.78.orig/plugins/gevolution/add_buddy_dialog.c gaim-0.78/plugins/gevolution/add_buddy_dialog.c
---- gaim-0.78.orig/plugins/gevolution/add_buddy_dialog.c 2004-06-02 14:21:12.152999696 +0200
-+++ gaim-0.78/plugins/gevolution/add_buddy_dialog.c 2004-06-02 14:35:31.623340344 +0200
-@@ -334,18 +334,19 @@
+diff -aurN gaim-2.0.0.orig/gtk/plugins/gevolution/add_buddy_dialog.c gaim-2.0.0/gtk/plugins/gevolution/add_buddy_dialog.c
+--- gaim-2.0.0.orig/gtk/plugins/gevolution/add_buddy_dialog.c 2005-07-03 08:42:16.000000000 +0200
++++ gaim-2.0.0/gtk/plugins/gevolution/add_buddy_dialog.c 2005-08-02 22:01:50.000000000 +0200
+@@ -291,16 +291,17 @@
{
EContact *contact = E_CONTACT(c->data);
const char *name;
-- GList *aims, *jabbers, *yahoos, *msns, *icqs;
-+ GList *aims, *jabbers, *yahoos, *gadugadus, *msns, *icqs;
+- GList *aims, *jabbers, *yahoos, *msns, *icqs, *novells;
++ GList *aims, *jabbers, *yahoos, *gadugadus, *msns, *icqs, *novells;
name = e_contact_get_const(contact, E_CONTACT_FULL_NAME);
@@ -15,47 +15,35 @@
- yahoos = e_contact_get(contact, E_CONTACT_IM_YAHOO);
- msns = e_contact_get(contact, E_CONTACT_IM_MSN);
- icqs = e_contact_get(contact, E_CONTACT_IM_ICQ);
-+ aims = e_contact_get(contact, E_CONTACT_IM_AIM);
-+ jabbers = e_contact_get(contact, E_CONTACT_IM_JABBER);
-+ yahoos = e_contact_get(contact, E_CONTACT_IM_YAHOO);
-+ gadugadus = e_contact_get(contact, E_CONTACT_IM_GADUGADU);
-+ msns = e_contact_get(contact, E_CONTACT_IM_MSN);
-+ icqs = e_contact_get(contact, E_CONTACT_IM_ICQ);
+- novells = e_contact_get(contact, E_CONTACT_IM_GROUPWISE);
++ aims = e_contact_get(contact, E_CONTACT_IM_AIM);
++ jabbers = e_contact_get(contact, E_CONTACT_IM_JABBER);
++ yahoos = e_contact_get(contact, E_CONTACT_IM_YAHOO);
++ gadugadus = e_contact_get(contact, E_CONTACT_IM_GADUGADU);
++ msns = e_contact_get(contact, E_CONTACT_IM_MSN);
++ icqs = e_contact_get(contact, E_CONTACT_IM_ICQ);
++ novells = e_contact_get(contact, E_CONTACT_IM_GROUPWISE);
if (aims == NULL && jabbers == NULL && yahoos == NULL &&
-- msns == NULL && icqs == NULL)
-+ msns == NULL && icqs == NULL && gadugadus == NULL)
- {
- GtkTreeIter iter;
-
-@@ -358,11 +359,12 @@
- }
- else
- {
-- add_ims(dialog, contact, name, aims, "prpl-oscar");
-- add_ims(dialog, contact, name, jabbers, "prpl-jabber");
-- add_ims(dialog, contact, name, yahoos, "prpl-yahoo");
-- add_ims(dialog, contact, name, msns, "prpl-msn");
-- add_ims(dialog, contact, name, icqs, "prpl-oscar");
-+ add_ims(dialog, contact, name, aims, "prpl-oscar");
-+ add_ims(dialog, contact, name, jabbers, "prpl-jabber");
-+ add_ims(dialog, contact, name, yahoos, "prpl-yahoo");
+ msns == NULL && icqs == NULL && novells == NULL)
+@@ -319,6 +320,7 @@
+ add_ims(dialog, contact, name, aims, "prpl-oscar");
+ add_ims(dialog, contact, name, jabbers, "prpl-jabber");
+ add_ims(dialog, contact, name, yahoos, "prpl-yahoo");
+ add_ims(dialog, contact, name, gadugadus, "prpl-gg");
-+ add_ims(dialog, contact, name, msns, "prpl-msn");
-+ add_ims(dialog, contact, name, icqs, "prpl-oscar");
- }
- }
-
-@@ -388,7 +390,7 @@
+ add_ims(dialog, contact, name, msns, "prpl-msn");
+ add_ims(dialog, contact, name, icqs, "prpl-oscar");
+ add_ims(dialog, contact, name, novells, "prpl-novell");
+@@ -363,7 +365,7 @@
{
EContact *contact = E_CONTACT(l->data);
const char *name;
-- GList *aims, *jabbers, *yahoos, *msns, *icqs;
-+ GList *aims, *jabbers, *yahoos, *gadugadus, *msns, *icqs;
+- GList *aims, *jabbers, *yahoos, *msns, *icqs, *novells;
++ GList *aims, *jabbers, *yahoos, *gadugadus, *msns, *icqs, *novells;
name = e_contact_get_const(contact, E_CONTACT_FULL_NAME);
-@@ -398,14 +400,15 @@
+@@ -373,12 +375,13 @@
continue;
}
@@ -64,62 +52,40 @@
- yahoos = e_contact_get(contact, E_CONTACT_IM_YAHOO);
- msns = e_contact_get(contact, E_CONTACT_IM_MSN);
- icqs = e_contact_get(contact, E_CONTACT_IM_ICQ);
-+ aims = e_contact_get(contact, E_CONTACT_IM_AIM);
-+ jabbers = e_contact_get(contact, E_CONTACT_IM_JABBER);
-+ yahoos = e_contact_get(contact, E_CONTACT_IM_YAHOO);
-+ gadugadus = e_contact_get(contact, E_CONTACT_IM_GADUGADU);
-+ msns = e_contact_get(contact, E_CONTACT_IM_MSN);
-+ icqs = e_contact_get(contact, E_CONTACT_IM_ICQ);
+- novells = e_contact_get(contact, E_CONTACT_IM_GROUPWISE);
++ aims = e_contact_get(contact, E_CONTACT_IM_AIM);
++ jabbers = e_contact_get(contact, E_CONTACT_IM_JABBER);
++ yahoos = e_contact_get(contact, E_CONTACT_IM_YAHOO);
++ gadugadus = e_contact_get(contact, E_CONTACT_IM_GADUGADU);
++ msns = e_contact_get(contact, E_CONTACT_IM_MSN);
++ icqs = e_contact_get(contact, E_CONTACT_IM_ICQ);
++ novells = e_contact_get(contact, E_CONTACT_IM_GROUPWISE);
if (aims == NULL && jabbers == NULL && yahoos == NULL &&
-- msns == NULL && icqs == NULL)
-+ msns == NULL && icqs == NULL && gadugadus == NULL)
- {
- GtkTreeIter iter;
-
-@@ -418,11 +421,12 @@
- }
- else
- {
-- add_ims(dialog, contact, name, aims, "prpl-oscar");
-- add_ims(dialog, contact, name, jabbers, "prpl-jabber");
-- add_ims(dialog, contact, name, yahoos, "prpl-yahoo");
-- add_ims(dialog, contact, name, msns, "prpl-msn");
-- add_ims(dialog, contact, name, icqs, "prpl-oscar");
-+ add_ims(dialog, contact, name, aims, "prpl-oscar");
-+ add_ims(dialog, contact, name, jabbers, "prpl-jabber");
-+ add_ims(dialog, contact, name, yahoos, "prpl-yahoo");
+ msns == NULL && icqs == NULL && novells == NULL)
+@@ -397,6 +400,7 @@
+ add_ims(dialog, contact, name, aims, "prpl-oscar");
+ add_ims(dialog, contact, name, jabbers, "prpl-jabber");
+ add_ims(dialog, contact, name, yahoos, "prpl-yahoo");
+ add_ims(dialog, contact, name, gadugadus, "prpl-gg");
-+ add_ims(dialog, contact, name, msns, "prpl-msn");
-+ add_ims(dialog, contact, name, icqs, "prpl-oscar");
- }
- }
- }
-diff -urN gaim-0.78.orig/plugins/gevolution/gevolution.c gaim-0.78/plugins/gevolution/gevolution.c
---- gaim-0.78.orig/plugins/gevolution/gevolution.c 2004-06-02 14:21:12.153999544 +0200
-+++ gaim-0.78/plugins/gevolution/gevolution.c 2004-06-02 14:37:47.552675944 +0200
-@@ -102,11 +102,12 @@
-
- name = e_contact_get_const(contact, E_CONTACT_FULL_NAME);
-
-- update_ims_from_contact(contact, name, "prpl-oscar", E_CONTACT_IM_AIM);
-- update_ims_from_contact(contact, name, "prpl-jabber", E_CONTACT_IM_JABBER);
-- update_ims_from_contact(contact, name, "prpl-yahoo", E_CONTACT_IM_YAHOO);
-- update_ims_from_contact(contact, name, "prpl-msn", E_CONTACT_IM_MSN);
-- update_ims_from_contact(contact, name, "prpl-oscar", E_CONTACT_IM_ICQ);
-+ update_ims_from_contact(contact, name, "prpl-oscar", E_CONTACT_IM_AIM);
-+ update_ims_from_contact(contact, name, "prpl-jabber", E_CONTACT_IM_JABBER);
-+ update_ims_from_contact(contact, name, "prpl-yahoo", E_CONTACT_IM_YAHOO);
+ add_ims(dialog, contact, name, msns, "prpl-msn");
+ add_ims(dialog, contact, name, icqs, "prpl-oscar");
+ add_ims(dialog, contact, name, novells, "prpl-novell");
+diff -aurN gaim-2.0.0.orig/gtk/plugins/gevolution/gevolution.c gaim-2.0.0/gtk/plugins/gevolution/gevolution.c
+--- gaim-2.0.0.orig/gtk/plugins/gevolution/gevolution.c 2005-07-18 09:26:08.000000000 +0200
++++ gaim-2.0.0/gtk/plugins/gevolution/gevolution.c 2005-08-02 22:02:54.000000000 +0200
+@@ -112,6 +112,7 @@
+ update_ims_from_contact(contact, name, "prpl-oscar", E_CONTACT_IM_AIM);
+ update_ims_from_contact(contact, name, "prpl-jabber", E_CONTACT_IM_JABBER);
+ update_ims_from_contact(contact, name, "prpl-yahoo", E_CONTACT_IM_YAHOO);
+ update_ims_from_contact(contact, name, "prpl-gg", E_CONTACT_IM_GADUGADU);
-+ update_ims_from_contact(contact, name, "prpl-msn", E_CONTACT_IM_MSN);
-+ update_ims_from_contact(contact, name, "prpl-oscar", E_CONTACT_IM_ICQ);
- }
-
- static void
-diff -urN gaim-0.78.orig/plugins/gevolution/gevo-util.c gaim-0.78/plugins/gevolution/gevo-util.c
---- gaim-0.78.orig/plugins/gevolution/gevo-util.c 2004-06-02 14:21:12.171996808 +0200
-+++ gaim-0.78/plugins/gevolution/gevo-util.c 2004-06-02 14:36:36.564467792 +0200
-@@ -116,6 +116,8 @@
+ update_ims_from_contact(contact, name, "prpl-msn", E_CONTACT_IM_MSN);
+ update_ims_from_contact(contact, name, "prpl-oscar", E_CONTACT_IM_ICQ);
+ update_ims_from_contact(contact, name, "prpl-novell", E_CONTACT_IM_GROUPWISE);
+diff -aurN gaim-2.0.0.orig/gtk/plugins/gevolution/gevo-util.c gaim-2.0.0/gtk/plugins/gevolution/gevo-util.c
+--- gaim-2.0.0.orig/gtk/plugins/gevolution/gevo-util.c 2005-07-03 08:42:16.000000000 +0200
++++ gaim-2.0.0/gtk/plugins/gevolution/gevo-util.c 2005-08-02 22:03:43.000000000 +0200
+@@ -110,6 +110,8 @@
protocol_field = E_CONTACT_IM_MSN;
else if (!strcmp(protocol_id, "prpl-yahoo"))
protocol_field = E_CONTACT_IM_YAHOO;
@@ -127,11 +93,11 @@
+ protocol_field = E_CONTACT_IM_GADUGADU;
else if (!strcmp(protocol_id, "prpl-jabber"))
protocol_field = E_CONTACT_IM_JABBER;
-
-diff -urN gaim-0.78.orig/plugins/gevolution/new_person_dialog.c gaim-0.78/plugins/gevolution/new_person_dialog.c
---- gaim-0.78.orig/plugins/gevolution/new_person_dialog.c 2004-06-02 14:21:12.171996808 +0200
-+++ gaim-0.78/plugins/gevolution/new_person_dialog.c 2004-06-02 14:38:35.239426456 +0200
-@@ -160,6 +160,8 @@
+ else if (!strcmp(protocol_id, "prpl-novell"))
+diff -aurN gaim-2.0.0.orig/gtk/plugins/gevolution/new_person_dialog.c gaim-2.0.0/gtk/plugins/gevolution/new_person_dialog.c
+--- gaim-2.0.0.orig/gtk/plugins/gevolution/new_person_dialog.c 2005-07-03 08:42:16.000000000 +0200
++++ gaim-2.0.0/gtk/plugins/gevolution/new_person_dialog.c 2005-08-02 22:04:18.000000000 +0200
+@@ -150,6 +150,8 @@
}
else if (!strcmp(im_service, "prpl-yahoo"))
field = E_CONTACT_IM_YAHOO;
@@ -140,10 +106,10 @@
else if (!strcmp(im_service, "prpl-jabber"))
field = E_CONTACT_IM_JABBER;
else if (!strcmp(im_service, "prpl-msn"))
-diff -urN gaim-0.78.orig/src/gtkblist.c gaim-0.78/src/gtkblist.c
---- gaim-0.78.orig/src/gtkblist.c 2004-06-02 14:21:13.721761208 +0200
-+++ gaim-0.78/src/gtkblist.c 2004-06-02 14:26:49.642693464 +0200
-@@ -1539,12 +1539,13 @@
+diff -aurN gaim-2.0.0.orig/gtk/gtkblist.c gaim-2.0.0/gtk/gtkblist.c
+--- gaim-2.0.0.orig/gtk/gtkblist.c 2005-07-21 07:49:42.000000000 +0200
++++ gaim-2.0.0/gtk/gtkblist.c 2005-08-02 22:09:51.000000000 +0200
+@@ -1702,12 +1702,13 @@
{
char *temp_vcard;
char *s, *c;
@@ -153,17 +119,17 @@
- GList *yahoos = NULL;
- GList *msns = NULL;
- GList *jabbers = NULL;
-+ char *alias = NULL;
-+ GList *aims = NULL;
-+ GList *icqs = NULL;
-+ GList *yahoos = NULL;
-+ GList *gadugadus = NULL;
-+ GList *msns = NULL;
-+ GList *jabbers = NULL;
++ char *alias = NULL;
++ GList *aims = NULL;
++ GList *icqs = NULL;
++ GList *yahoos = NULL;
++ GList *gadugadus = NULL;
++ GList *msns = NULL;
++ GList *jabbers = NULL;
s = temp_vcard = g_strdup(vcard);
-@@ -1584,7 +1585,7 @@
+@@ -1747,7 +1748,7 @@
alias = g_strdup(value);
else if (!strcmp(field, "X-AIM") || !strcmp(field, "X-ICQ") ||
!strcmp(field, "X-YAHOO") || !strcmp(field, "X-MSN") ||
@@ -172,16 +138,16 @@
{
char **values = g_strsplit(value, ":", 0);
char **im;
-@@ -1597,6 +1598,8 @@
+@@ -1760,6 +1761,8 @@
icqs = g_list_append(icqs, g_strdup(*im));
else if (!strcmp(field, "X-YAHOO"))
yahoos = g_list_append(yahoos, g_strdup(*im));
+ else if (!strcmp(field, "X-GADUGADU"))
-+ gadugadus = g_list_append(gadugadus, g_strdup(*im));
++ gadugadus = g_list_append(gadugadus, g_strdup(*im));
else if (!strcmp(field, "X-MSN"))
msns = g_list_append(msns, g_strdup(*im));
else if (!strcmp(field, "X-JABBER"))
-@@ -1610,7 +1613,7 @@
+@@ -1773,7 +1776,7 @@
g_free(temp_vcard);
if (aims == NULL && icqs == NULL && yahoos == NULL &&
@@ -190,7 +156,7 @@
{
if (alias != NULL)
g_free(alias);
-@@ -1618,11 +1621,12 @@
+@@ -1781,11 +1784,12 @@
return FALSE;
}
================================================================
Index: SOURCES/gaim-nolibs.patch
diff -u SOURCES/gaim-nolibs.patch:1.1 SOURCES/gaim-nolibs.patch:1.2
--- SOURCES/gaim-nolibs.patch:1.1 Mon Jul 7 16:23:15 2003
+++ SOURCES/gaim-nolibs.patch Fri Mar 23 16:38:10 2007
@@ -1,11 +1,14 @@
---- gaim-0.64/configure.ac.orig Mon Jul 7 15:37:56 2003
-+++ gaim-0.64/configure.ac Mon Jul 7 15:57:41 2003
-@@ -44,7 +44,7 @@
+diff -aurN gaim-2.0.0beta1.orig/configure.ac gaim-2.0.0beta1/configure.ac
+--- gaim-2.0.0beta1.orig/configure.ac 2005-12-17 22:28:54.000000000 +0100
++++ gaim-2.0.0beta1/configure.ac 2005-12-19 15:14:20.000000000 +0100
+@@ -65,8 +65,8 @@
dnl Check for inet_aton
- AC_CHECK_FUNC(inet_aton, , [AC_CHECK_LIB(resolv, inet_aton, ,
+ AC_CHECK_FUNC(inet_aton, , [AC_CHECK_LIB(resolv, inet_aton, ,
[AC_ERROR(inet_aton not found)])])
+-AC_CHECK_LIB(resolv, __res_query)
-AC_CHECK_LIB(nsl, gethostent)
++AC_CHECK_FUNC(resolv, ,[AC_CHECK_LIB(resolv, __res_query)])
+AC_CHECK_FUNC(gethostent, , [AC_CHECK_LIB(nsl, gethostent)])
- AC_CHECK_FUNC(socket, ,
+ AC_CHECK_FUNC(socket, ,
[AC_CHECK_LIB(socket, socket, , [AC_ERROR([socket not found])])])
dnl If all goes well, by this point the previous two checks will have
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/gaim-GG-evo.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/SOURCES/gaim-nolibs.patch?r1=1.1&r2=1.2&f=u
More information about the pld-cvs-commit
mailing list