Author: grzegol Date: Fri Oct 27 14:04:30 2006 GMT
Module: SOURCES Tag: DEVEL
---- Log message:
- updated for 2.0beta4
---- Files affected:
SOURCES:
gaim-dbus-dir.patch (1.1.2.2 -> 1.1.2.3) , gaim-GG-evo.patch (1.1.2.1 ->
1.1.2.2) , gaim-libgadu.patch (1.1 -> 1.1.2.1) , gaim-nolibs.patch (1.1.2.1 ->
1.1.2.2)
---- Diffs:
================================================================
Index: SOURCES/gaim-dbus-dir.patch
diff -u SOURCES/gaim-dbus-dir.patch:1.1.2.2 SOURCES/gaim-dbus-dir.patch:1.1.2.3
--- SOURCES/gaim-dbus-dir.patch:1.1.2.2 Fri Apr 7 23:46:33 2006
+++ SOURCES/gaim-dbus-dir.patch Fri Oct 27 16:04:25 2006
@@ -2,13 +2,13 @@
--- 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 @@
-
- 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
+ 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
+ DBUS_SERVICES_DIR="$with_dbus_services"
+ else
+ if test x"$prefix" = x"NONE" ; then
================================================================
Index: SOURCES/gaim-GG-evo.patch
diff -u SOURCES/gaim-GG-evo.patch:1.1.2.1 SOURCES/gaim-GG-evo.patch:1.1.2.2
--- SOURCES/gaim-GG-evo.patch:1.1.2.1 Tue Aug 2 23:32:44 2005
+++ SOURCES/gaim-GG-evo.patch Fri Oct 27 16:04:25 2006
@@ -1,6 +1,6 @@
-diff -aurN gaim-2.0.0.orig/plugins/gevolution/add_buddy_dialog.c
gaim-2.0.0/plugins/gevolution/add_buddy_dialog.c
---- gaim-2.0.0.orig/plugins/gevolution/add_buddy_dialog.c 2005-07-03
08:42:16.000000000 +0200
-+++ gaim-2.0.0/plugins/gevolution/add_buddy_dialog.c 2005-08-02
22:01:50.000000000 +0200
+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);
@@ -71,9 +71,9 @@
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/plugins/gevolution/gevolution.c
gaim-2.0.0/plugins/gevolution/gevolution.c
---- gaim-2.0.0.orig/plugins/gevolution/gevolution.c 2005-07-18
09:26:08.000000000 +0200
-+++ gaim-2.0.0/plugins/gevolution/gevolution.c 2005-08-02 22:02:54.000000000
+0200
+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);
@@ -82,9 +82,9 @@
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/plugins/gevolution/gevo-util.c
gaim-2.0.0/plugins/gevolution/gevo-util.c
---- gaim-2.0.0.orig/plugins/gevolution/gevo-util.c 2005-07-03
08:42:16.000000000 +0200
-+++ gaim-2.0.0/plugins/gevolution/gevo-util.c 2005-08-02 22:03:43.000000000
+0200
+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"))
@@ -94,9 +94,9 @@
else if (!strcmp(protocol_id, "prpl-jabber"))
protocol_field = E_CONTACT_IM_JABBER;
else if (!strcmp(protocol_id, "prpl-novell"))
-diff -aurN gaim-2.0.0.orig/plugins/gevolution/new_person_dialog.c
gaim-2.0.0/plugins/gevolution/new_person_dialog.c
---- gaim-2.0.0.orig/plugins/gevolution/new_person_dialog.c 2005-07-03
08:42:16.000000000 +0200
-+++ gaim-2.0.0/plugins/gevolution/new_person_dialog.c 2005-08-02
22:04:18.000000000 +0200
+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"))
@@ -106,9 +106,9 @@
else if (!strcmp(im_service, "prpl-jabber"))
field = E_CONTACT_IM_JABBER;
else if (!strcmp(im_service, "prpl-msn"))
-diff -aurN gaim-2.0.0.orig/src/gtkblist.c gaim-2.0.0/src/gtkblist.c
---- gaim-2.0.0.orig/src/gtkblist.c 2005-07-21 07:49:42.000000000 +0200
-+++ gaim-2.0.0/src/gtkblist.c 2005-08-02 22:09:51.000000000 +0200
+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;
================================================================
Index: SOURCES/gaim-libgadu.patch
diff -u SOURCES/gaim-libgadu.patch:1.1 SOURCES/gaim-libgadu.patch:1.1.2.1
--- SOURCES/gaim-libgadu.patch:1.1 Fri Apr 7 23:45:58 2006
+++ SOURCES/gaim-libgadu.patch Fri Oct 27 16:04:25 2006
@@ -1,7 +1,16 @@
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
-@@ -319,28 +319,9 @@
+@@ -605,7 +605,7 @@
+ gadu_manual_check="no"
+ fi
+ if test "x$gadu_manual_check" = "xno"; then
+- PKG_CHECK_MODULES(LIBGADU, libgadu, [
++ PKG_CHECK_MODULES(GADU, libgadu, [
+ gadu_includes="yes"
+ gadu_libs="yes"
+ ], [
+@@ -631,28 +631,9 @@
AC_MSG_CHECKING(for libgadu GPL compatibility)
CPPFLAGS_save="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $GADU_CFLAGS"
@@ -12,7 +21,7 @@
- ], [
AC_MSG_RESULT(yes)
AC_DEFINE([HAVE_LIBGADU], [1],
- [Define to 1 if you have libgadu.])
+ [Define to 1 if you have libgadu.])
- ], [
- AC_MSG_RESULT(no)
- echo
================================================================
Index: SOURCES/gaim-nolibs.patch
diff -u SOURCES/gaim-nolibs.patch:1.1.2.1 SOURCES/gaim-nolibs.patch:1.1.2.2
--- SOURCES/gaim-nolibs.patch:1.1.2.1 Mon Dec 19 15:24:08 2005
+++ SOURCES/gaim-nolibs.patch Fri Oct 27 16:04:25 2006
@@ -3,12 +3,12 @@
+++ 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-dbus-dir.patch?r1=1.1.2.2&r2=1.1.2.3&f=u
http://cvs.pld-linux.org/SOURCES/gaim-GG-evo.patch?r1=1.1.2.1&r2=1.1.2.2&f=u
http://cvs.pld-linux.org/SOURCES/gaim-libgadu.patch?r1=1.1&r2=1.1.2.1&f=u
http://cvs.pld-linux.org/SOURCES/gaim-nolibs.patch?r1=1.1.2.1&r2=1.1.2.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
