rpm/pidgin
SHA256
1
0
Fork 0
forked from pool/pidgin
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pidgin?expand=0&rev=7

Browse Source
This commit is contained in:
OBS User unknown 2007-08-03 00:10:42 +00:00 committed by Git OBS Bridge
parent 8ca45c5642
commit ca67707a17
7 changed files with 95 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
includes.patch
View File

@ -1,12 +1,11 @@
Index: pidgin-2.0.1/pidgin/plugins/gevolution/gevolution.c Index: pidgin-2.0.1/pidgin/plugins/gevolution/gevolution.c
=================================================================== ================================================================================
--- pidgin-2.0.1.orig/pidgin/plugins/gevolution/gevolution.c --- pidgin-2.1.0/pidgin/plugins/gevolution/gevolution.c
+++ pidgin-2.0.1/pidgin/plugins/gevolution/gevolution.c +++ pidgin-2.1.0/pidgin/plugins/gevolution/gevolution.c
@@ -38,7 +38,8 @@ @@ -38,6 +38,8 @@
#include <libedata-book/Evolution-DataServer-Addressbook.h> #include <libedata-book/Evolution-DataServer-Addressbook.h>
-#include <libebook/e-book-listener.h>
+/* #include <libebook/e-book-listener.h> */ +/* #include <libebook/e-book-listener.h> */
+#include <libedataserver/e-component-listener.h> +#include <libedataserver/e-component-listener.h>
#include <libedata-book/e-data-book-factory.h> #include <libedata-book/e-data-book-factory.h>

3
pidgin-2.0.1.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:80f9908a604600950de8894e8107ba8f449543034e0220382d0c9f7361d151fc
size 7682458

3
pidgin-2.1.0.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:79be69cccca6cb25d6c1ba0360864da8a0c043f5ded55babcd99dc5b8e15a5f8
size 7772942

41
pidgin-64bit-buildhack.patch Normal file
View File

@ -0,0 +1,41 @@
This patch corrects type casts of universal data item in the generated code. It
is an ugly hack. Generator has to be fixed instead.
================================================================================
--- libpurple/dbus-bindings.c
+++ libpurple/dbus-bindings.c
@@ -3576,7 +3576,7 @@
CHECK_ERROR(error_DBUS);
PURPLE_DBUS_ID_TO_POINTER(conv, conv_ID, PurpleConversation, error_DBUS);
key = (key && key[0]) ? key : NULL;
- purple_conversation_set_data(conv, key, data);
+ purple_conversation_set_data(conv, key, GINT_TO_POINTER(data));
reply_DBUS = dbus_message_new_method_return (message_DBUS);
dbus_message_append_args(reply_DBUS, DBUS_TYPE_INVALID);
return reply_DBUS;
@@ -3593,7 +3593,7 @@
CHECK_ERROR(error_DBUS);
PURPLE_DBUS_ID_TO_POINTER(conv, conv_ID, PurpleConversation, error_DBUS);
key = (key && key[0]) ? key : NULL;
- RESULT = purple_conversation_get_data(conv, key);
+ RESULT = GINT_TO_POINTER(purple_conversation_get_data(conv, key));
reply_DBUS = dbus_message_new_method_return (message_DBUS);
dbus_message_append_args(reply_DBUS, DBUS_TYPE_INT32, &RESULT, DBUS_TYPE_INVALID);
return reply_DBUS;
@@ -4741,7 +4741,7 @@
dbus_int32_t RESULT;
dbus_message_get_args(message_DBUS, error_DBUS, DBUS_TYPE_UINT32, &unused, DBUS_TYPE_INVALID);
CHECK_ERROR(error_DBUS);
- RESULT = purple_core_quit_cb(unused);
+ RESULT = purple_core_quit_cb(GINT_TO_POINTER(unused));
reply_DBUS = dbus_message_new_method_return (message_DBUS);
dbus_message_append_args(reply_DBUS, DBUS_TYPE_INT32, &RESULT, DBUS_TYPE_INVALID);
return reply_DBUS;
@@ -6479,7 +6479,7 @@
dbus_message_get_args(message_DBUS, error_DBUS, DBUS_TYPE_STRING, &name, DBUS_TYPE_UINT32, &value, DBUS_TYPE_INVALID);
CHECK_ERROR(error_DBUS);
name = (name && name[0]) ? name : NULL;
- purple_prefs_set_generic(name, value);
+ purple_prefs_set_generic(name, GINT_TO_POINTER(value));
reply_DBUS = dbus_message_new_method_return (message_DBUS);
dbus_message_append_args(reply_DBUS, DBUS_TYPE_INVALID);
return reply_DBUS;

35
pidgin-gnome-keyring.patch
View File

@ -1,8 +1,8 @@
--- 2.0b4-my/configure.ac 2006-11-13 18:29:02.830447000 +0800 --- pidgin-2.1.0/configure.ac
+++ 2.0b4-my2/configure.ac 2006-11-13 17:05:20.491984000 +0800 +++ pidgin-2.1.0/configure.ac
@@ -1783,5 +1783,19 @@ @@ -1479,6 +1479,20 @@
LDFLAGS="$orig_LDFLAGS" [AC_HELP_STRING([--with-nss-libs=PREFIX], [specify location of Mozilla nss3 libs.])],
fi [with_nss_libs="$withval"])
+dnl ####################################################################### +dnl #######################################################################
+dnl # Check for gnome-keyring +dnl # Check for gnome-keyring
@ -19,26 +19,27 @@
+fi +fi
+ +
AC_MSG_CHECKING(for me pot o' gold) if test -n "$with_nspr_includes" || test -n "$with_nspr_libs" || \
--- 2.0b4-my/libpurple/Makefile.am 2006-10-19 01:38:16.000000000 +0800 test -n "$with_nss_includes" || test -n "$with_nss_libs" ||
+++ 2.0b4-my2/libpurple/Makefile.am 2006-11-13 18:28:51.383417000 +0800 --- pidgin-2.1.0/libpurple/Makefile.am
@@ -221,6 +221,7 @@ +++ pidgin-2.1.0/libpurple/Makefile.am
@@ -230,6 +230,7 @@
$(GLIB_LIBS) \
$(LIBXML_LIBS) \ $(LIBXML_LIBS) \
$(LIBNM_LIBS) \ $(LIBNM_LIBS) \
$(STATIC_LINK_LIBS) \
+ $(PURPLE_KEYRING_LIBS) \ + $(PURPLE_KEYRING_LIBS) \
$(INTLLIBS) \ $(INTLLIBS) \
-lm -lm
@@ -233,5 +234,6 @@ @@ -242,5 +243,6 @@
$(GLIB_CFLAGS) \ $(GLIB_CFLAGS) \
$(DEBUG_CFLAGS) \ $(DEBUG_CFLAGS) \
$(DBUS_CFLAGS) \ $(DBUS_CFLAGS) \
+ $(PURPLE_KEYRING_CFLAGS) \ + $(PURPLE_KEYRING_CFLAGS) \
$(LIBXML_CFLAGS) \ $(LIBXML_CFLAGS) \
$(LIBNM_CFLAGS) $(LIBNM_CFLAGS)
--- 2.0b4-my/libpurple/account.c 2006-10-19 01:38:16.000000000 +0800 --- pidgin-2.1.0/libpurple/account.c
+++ 2.0b4-my2/libpurple/account.c 2006-11-13 18:26:19.409755000 +0800 +++ pidgin-2.1.0/libpurple/account.c
@@ -40,6 +40,13 @@ @@ -40,6 +40,13 @@
#include "util.h" #include "util.h"
#include "xmlnode.h" #include "xmlnode.h"
@ -53,7 +54,7 @@
/* TODO: Should use PurpleValue instead of this? What about "ui"? */ /* TODO: Should use PurpleValue instead of this? What about "ui"? */
typedef struct typedef struct
{ {
@@ -321,8 +328,13 @@ @@ -324,8 +331,13 @@
if (purple_account_get_remember_password(account) && if (purple_account_get_remember_password(account) &&
((tmp = purple_account_get_password(account)) != NULL)) ((tmp = purple_account_get_password(account)) != NULL))
{ {
@ -67,7 +68,7 @@
} }
if ((tmp = purple_account_get_alias(account)) != NULL) if ((tmp = purple_account_get_alias(account)) != NULL)
@@ -703,17 +715,30 @@ @@ -700,17 +712,30 @@
} }
ret = purple_account_new(name, _purple_oscar_convert(name, protocol_id)); /* XXX: */ ret = purple_account_new(name, _purple_oscar_convert(name, protocol_id)); /* XXX: */
@ -104,9 +105,9 @@
/* Read the alias */ /* Read the alias */
child = xmlnode_get_child(node, "alias"); child = xmlnode_get_child(node, "alias");
@@ -2352,3 +2377,60 @@ @@ -2448,3 +2473,60 @@
gaim_signals_unregister_by_instance(gaim_accounts_get_handle()); purple_signals_unregister_by_instance(purple_accounts_get_handle());
} }
+ +
+#ifdef PURPLE_ENABLE_KEYRING +#ifdef PURPLE_ENABLE_KEYRING

10
pidgin.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Thu Aug 2 19:40:14 CEST 2007 - sbrabec@suse.cz
- Updated to version 2.1.0:
* start with new UI concepts
* largely re-designed conversation window
* fixed some ICQ internationalization issues
* enable using SILC Toolkit 1.1
* lots of bug fixed
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jul 30 23:11:07 CEST 2007 - maw@suse.de Mon Jul 30 23:11:07 CEST 2007 - maw@suse.de

25
pidgin.spec
View File

@ -1,5 +1,5 @@
# #
# spec file for package pidgin (Version 2.0.1) # spec file for package pidgin (Version 2.1.0)
# #
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine # This file and all modifications and additions to the pristine
@ -12,8 +12,8 @@
Name: pidgin Name: pidgin
Summary: GTK+-Based Multiprotocol Instant Messaging Client Summary: GTK+-Based Multiprotocol Instant Messaging Client
Version: 2.0.1 Version: 2.1.0
Release: 26 Release: 1
License: GPL v2 or later License: GPL v2 or later
Group: Productivity/Networking/Instant Messenger Group: Productivity/Networking/Instant Messenger
URL: http://www.pidgin.im/ URL: http://www.pidgin.im/
@ -28,6 +28,7 @@ Patch5: pidgin-nonblock-common2.patch
Patch7: pidgin-check.patch Patch7: pidgin-check.patch
Patch8: pidgin-stringcompare.patch Patch8: pidgin-stringcompare.patch
Patch9: includes.patch Patch9: includes.patch
Patch10: pidgin-64bit-buildhack.patch
# Can use external libzephyr # Can use external libzephyr
BuildRequires: cyrus-sasl-devel dbus-1-devel doxygen evolution-data-server-devel gnome-keyring-devel graphviz gtkspell-devel intltool libao-devel libbonobo-devel libgadu-devel libstdc++-devel libxml2-devel meanwhile-devel mono-devel mozilla-nspr-devel mozilla-nss-devel ncurses-devel perl-XML-Parser python sqlite-devel startup-notification-devel tk-devel update-desktop-files BuildRequires: cyrus-sasl-devel dbus-1-devel doxygen evolution-data-server-devel gnome-keyring-devel graphviz gtkspell-devel intltool libao-devel libbonobo-devel libgadu-devel libstdc++-devel libxml2-devel meanwhile-devel mono-devel mozilla-nspr-devel mozilla-nss-devel ncurses-devel perl-XML-Parser python sqlite-devel startup-notification-devel tk-devel update-desktop-files
# Product specific lines # Product specific lines
@ -791,8 +792,12 @@ ACLOCAL="aclocal -I m4macros" autoreconf -f -i
--with-nss-includes=/usr/include/nss3\ --with-nss-includes=/usr/include/nss3\
--with-tclconfig=/usr/%_lib\ --with-tclconfig=/usr/%_lib\
--with-tkconfig=/usr/%_lib --with-tkconfig=/usr/%_lib
cd libpurple
make dbus-bindings.c
cd ..
patch -p0 <%{P:10}
make make
# Mono bindings 2.0.1 are not parallel build ready: # Mono bindings 2.1.0 are not parallel build ready:
#make %{?jobs:-j%jobs} #make %{?jobs:-j%jobs}
%install %install
@ -842,6 +847,8 @@ find $RPM_BUILD_ROOT%{_libdir}/finch -xtype f -print | \
%find_gconf_schemas %find_gconf_schemas
cat %{name}.schemas_list %{name}-%{version}-pidginplugins >%{name}.lst cat %{name}.schemas_list %{name}-%{version}-pidginplugins >%{name}.lst
cat %{name}.lang %{name}-%{version}-purpleplugins >libpurple.lst cat %{name}.lang %{name}-%{version}-purpleplugins >libpurple.lst
# pointless libtool .la file with only trivial dependencies
rm $RPM_BUILD_ROOT%{_libdir}/libpurple.la $RPM_BUILD_ROOT%{_libdir}/libpurple-client.la
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
@ -915,9 +922,7 @@ rm -rf $RPM_BUILD_ROOT
%{_includedir}/libpurple %{_includedir}/libpurple
%{_datadir}/aclocal/purple.m4 %{_datadir}/aclocal/purple.m4
%{_libdir}/libpurple.so %{_libdir}/libpurple.so
%{_libdir}/libpurple.*a
%{_libdir}/libpurple-client.so %{_libdir}/libpurple-client.so
%{_libdir}/libpurple-client.*a
%{_libdir}/pkgconfig/purple.pc %{_libdir}/pkgconfig/purple.pc
%doc %{_mandir}/man3/Purple.* %doc %{_mandir}/man3/Purple.*
@ -925,6 +930,7 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-, root, root) %defattr(-, root, root)
%{_bindir}/finch %{_bindir}/finch
%{_libdir}/libgnt.so.* %{_libdir}/libgnt.so.*
%{_libdir}/gnt
%dir %{_libdir}/finch %dir %{_libdir}/finch
%doc %{_mandir}/man1/finch.* %doc %{_mandir}/man1/finch.*
@ -942,6 +948,13 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/gaim-text %{_bindir}/gaim-text
%changelog %changelog
* Thu Aug 02 2007 - sbrabec@suse.cz
- Updated to version 2.1.0:
* start with new UI concepts
* largely re-designed conversation window
* fixed some ICQ internationalization issues
* enable using SILC Toolkit 1.1
* lots of bug fixed
* Mon Jul 30 2007 - maw@suse.de * Mon Jul 30 2007 - maw@suse.de
- Change some obsoletes and provides stuff. - Change some obsoletes and provides stuff.
* Tue Jul 24 2007 - maw@suse.de * Tue Jul 24 2007 - maw@suse.de