forked from pool/pidgin
Accepting request 73986 from GNOME:Apps
Fix evo build, add new NM patch + tweaks (warning, diff might appear as empty, talk to me if this happens) (forwarded request 73949 from vuntz) OBS-URL: https://build.opensuse.org/request/show/73986 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pidgin?expand=0&rev=71
This commit is contained in:
Sascha Peilicke
Git OBS Bridge
parent
071956359b
commit
d9f60258cc
7
_service
7
_service
@ -1,7 +0,0 @@
|
|||||||
<services>
|
|
||||||
<service name="download_url">
|
|
||||||
<param name="host">sourceforge.net</param>
|
|
||||||
<param name="path">/projects/pidgin/files/Pidgin/2.7.11/pidgin-2.7.11.tar.bz2/download</param>
|
|
||||||
<param name="protocol">http</param>
|
|
||||||
</service>
|
|
||||||
</services>
|
|
||||||
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:a24e2c3118bd47983955d398c9cf5543c12e95527cdf7de9d273a6e92f9d160b
|
|
||||||
size 9978175
|
|
||||||
3
pidgin-2.8.0.tar.bz2
Normal file
3
pidgin-2.8.0.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:71ced93efecd48a1114eaf6370adebf591ace31158457baf023d15892d663c78
|
||||||
|
size 9921362
|
||||||
20
pidgin-gevolution-fix-build.patch
Normal file
20
pidgin-gevolution-fix-build.patch
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
#
|
||||||
|
#
|
||||||
|
# patch "pidgin/plugins/gevolution/gevolution.c"
|
||||||
|
# from [e82d07077f62e85a1e318e1f77fb093b2502e1a2]
|
||||||
|
# to [f19cde741adeff1f88065dbd4c7580a49eed80ce]
|
||||||
|
#
|
||||||
|
============================================================
|
||||||
|
--- pidgin/plugins/gevolution/gevolution.c e82d07077f62e85a1e318e1f77fb093b2502e1a2
|
||||||
|
+++ pidgin/plugins/gevolution/gevolution.c f19cde741adeff1f88065dbd4c7580a49eed80ce
|
||||||
|
@@ -447,8 +447,8 @@ get_config_frame(PurplePlugin *plugin)
|
||||||
|
treeview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(model));
|
||||||
|
gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(treeview), TRUE);
|
||||||
|
gtk_box_pack_start(GTK_BOX(vbox),
|
||||||
|
- pidgin_make_scrollable(treeview, GTK_POLICY_AUTO, GTK_POLICY_ALWAYS, GTK_SHADOW_IN, 300, 300),
|
||||||
|
- TRUE, TRUE, 0);
|
||||||
|
+ pidgin_make_scrollable(treeview, GTK_POLICY_AUTOMATIC,
|
||||||
|
+ GTK_POLICY_ALWAYS, GTK_SHADOW_IN, 300, 300), TRUE, TRUE, 0);
|
||||||
|
gtk_widget_show(treeview);
|
||||||
|
|
||||||
|
/* Setup the column */
|
||||||
49
pidgin-nm09-more.patch
Normal file
49
pidgin-nm09-more.patch
Normal file
@ -0,0 +1,49 @@
|
|||||||
|
diff -up pidgin-2.7.11/libpurple/network.c.nm09more pidgin-2.7.11/libpurple/network.c
|
||||||
|
--- pidgin-2.7.11/libpurple/network.c.nm09more 2011-04-26 12:01:27.700085246 -0500
|
||||||
|
+++ pidgin-2.7.11/libpurple/network.c 2011-05-24 13:13:28.185165657 -0500
|
||||||
|
@@ -833,8 +833,20 @@ purple_network_is_available(void)
|
||||||
|
purple_debug_warning("network", "NetworkManager not active. Assuming connection exists.\n");
|
||||||
|
}
|
||||||
|
|
||||||
|
- if (nm_state == NM_STATE_UNKNOWN || nm_state == NM_STATE_CONNECTED)
|
||||||
|
- return TRUE;
|
||||||
|
+ switch (nm_state)
|
||||||
|
+ {
|
||||||
|
+ case NM_STATE_UNKNOWN:
|
||||||
|
+#if NM_CHECK_VERSION(0,8,992)
|
||||||
|
+ case NM_STATE_CONNECTED_LOCAL:
|
||||||
|
+ case NM_STATE_CONNECTED_SITE:
|
||||||
|
+ case NM_STATE_CONNECTED_GLOBAL:
|
||||||
|
+#else
|
||||||
|
+ case NM_STATE_CONNECTED:
|
||||||
|
+#endif
|
||||||
|
+ return TRUE;
|
||||||
|
+ default:
|
||||||
|
+ break;
|
||||||
|
+ }
|
||||||
|
|
||||||
|
return FALSE;
|
||||||
|
|
||||||
|
@@ -1170,9 +1182,14 @@ purple_network_init(void)
|
||||||
|
NM_DBUS_SERVICE,
|
||||||
|
NM_DBUS_PATH,
|
||||||
|
NM_DBUS_INTERFACE);
|
||||||
|
+ /* NM 0.6 signal */
|
||||||
|
dbus_g_proxy_add_signal(nm_proxy, "StateChange", G_TYPE_UINT, G_TYPE_INVALID);
|
||||||
|
dbus_g_proxy_connect_signal(nm_proxy, "StateChange",
|
||||||
|
G_CALLBACK(nm_state_change_cb), NULL, NULL);
|
||||||
|
+ /* NM 0.7 and later signal */
|
||||||
|
+ dbus_g_proxy_add_signal(nm_proxy, "StateChanged", G_TYPE_UINT, G_TYPE_INVALID);
|
||||||
|
+ dbus_g_proxy_connect_signal(nm_proxy, "StateChanged",
|
||||||
|
+ G_CALLBACK(nm_state_change_cb), NULL, NULL);
|
||||||
|
|
||||||
|
dbus_proxy = dbus_g_proxy_new_for_name(nm_conn,
|
||||||
|
DBUS_SERVICE_DBUS,
|
||||||
|
@@ -1207,6 +1224,7 @@ purple_network_uninit(void)
|
||||||
|
#ifdef HAVE_NETWORKMANAGER
|
||||||
|
if (nm_proxy) {
|
||||||
|
dbus_g_proxy_disconnect_signal(nm_proxy, "StateChange", G_CALLBACK(nm_state_change_cb), NULL);
|
||||||
|
+ dbus_g_proxy_disconnect_signal(nm_proxy, "StateChanged", G_CALLBACK(nm_state_change_cb), NULL);
|
||||||
|
g_object_unref(G_OBJECT(nm_proxy));
|
||||||
|
}
|
||||||
|
if (dbus_proxy) {
|
||||||
@ -1,38 +0,0 @@
|
|||||||
diff -up pidgin-2.7.10/libpurple/network.c.foo pidgin-2.7.10/libpurple/network.c
|
|
||||||
--- pidgin-2.7.10/libpurple/network.c.foo 2011-03-10 02:21:43.920933267 -0600
|
|
||||||
+++ pidgin-2.7.10/libpurple/network.c 2011-03-10 02:23:11.466838793 -0600
|
|
||||||
@@ -71,6 +71,10 @@
|
|
||||||
#include <dbus/dbus-glib.h>
|
|
||||||
#include <NetworkManager.h>
|
|
||||||
|
|
||||||
+#if !defined(NM_CHECK_VERSION)
|
|
||||||
+#define NM_CHECK_VERSION(x,y,z) 0
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
static DBusGConnection *nm_conn = NULL;
|
|
||||||
static DBusGProxy *nm_proxy = NULL;
|
|
||||||
static DBusGProxy *dbus_proxy = NULL;
|
|
||||||
@@ -863,7 +867,13 @@ nm_update_state(NMState state)
|
|
||||||
|
|
||||||
switch(state)
|
|
||||||
{
|
|
||||||
+#if NM_CHECK_VERSION(0,8,992)
|
|
||||||
+ case NM_STATE_CONNECTED_LOCAL:
|
|
||||||
+ case NM_STATE_CONNECTED_SITE:
|
|
||||||
+ case NM_STATE_CONNECTED_GLOBAL:
|
|
||||||
+#else
|
|
||||||
case NM_STATE_CONNECTED:
|
|
||||||
+#endif
|
|
||||||
/* Call res_init in case DNS servers have changed */
|
|
||||||
res_init();
|
|
||||||
/* update STUN IP in case we it changed (theoretically we could
|
|
||||||
@@ -880,6 +890,9 @@ nm_update_state(NMState state)
|
|
||||||
case NM_STATE_ASLEEP:
|
|
||||||
case NM_STATE_CONNECTING:
|
|
||||||
case NM_STATE_DISCONNECTED:
|
|
||||||
+#if NM_CHECK_VERSION(0,8,992)
|
|
||||||
+ case NM_STATE_DISCONNECTING:
|
|
||||||
+#endif
|
|
||||||
if (prev != NM_STATE_CONNECTED && prev != NM_STATE_UNKNOWN)
|
|
||||||
break;
|
|
||||||
if (ui_ops != NULL && ui_ops->network_disconnected != NULL)
|
|
||||||
110
pidgin.changes
110
pidgin.changes
@ -1,3 +1,113 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Jun 17 03:56:41 CEST 2011 - vuntz@opensuse.org
|
||||||
|
|
||||||
|
- Add pidgin-nm09-more.patch: correctly handle state changes in
|
||||||
|
NetworkManager 0.9.
|
||||||
|
- Add pidgin-gevolution-fix-build.patch: this fixes the build of
|
||||||
|
the evolution integration. So drop all the %build_evo machinery.
|
||||||
|
- Stop using source service to download the tarball, as Factory
|
||||||
|
will move away from this.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Jun 7 16:55:34 CEST 2011 - dimstar@opensuse.org
|
||||||
|
|
||||||
|
- Update to version 2.8.0:
|
||||||
|
+ General:
|
||||||
|
- Implement simple silence suppression for voice calls,
|
||||||
|
preventing wasted bandwidth for silent periods during a call.
|
||||||
|
- Added the DigiCert High Assurance CA-3 intermediate CA,
|
||||||
|
needed for validation of the Facebook XMPP interface's
|
||||||
|
certificate.
|
||||||
|
- Removed the QQ protocol plugin. It hasn't worked in a long
|
||||||
|
time and isn't being maintained.
|
||||||
|
+ Pidgin:
|
||||||
|
- Duplicate code cleanup.
|
||||||
|
- Voice/Video call window adapts correctly to adding or
|
||||||
|
removing streams on the fly.
|
||||||
|
- Don't cancel an ongoing call when rejecting the addition of a
|
||||||
|
stream to the existing call.
|
||||||
|
- Pidgin plugins can now override tab completion and detect
|
||||||
|
clicks on usernames in the chat userlist.
|
||||||
|
- Fix the tooltip being destroyed when it is full of
|
||||||
|
information and cover the mouse
|
||||||
|
+ libpurple:
|
||||||
|
- media:
|
||||||
|
. Allow obtaining active local and remote candidates.
|
||||||
|
. Allow getting/setting video capabilities.
|
||||||
|
. Allow adding/removing streams on the fly.
|
||||||
|
. Allow libpurple and plugins to set SDES properties for RTP
|
||||||
|
conferences.
|
||||||
|
. Add support for using TCP relaying with TURN
|
||||||
|
- Simple Silence Suppression is optional per-account.
|
||||||
|
- Fix purple-url-handler being unable to find an account.
|
||||||
|
- Support new connection states in NetworkManager 0.9.
|
||||||
|
- When removing a buddy, delete the pounces associated with it.
|
||||||
|
- proxy: Add new "Tor/Privacy" proxy type that can be used to
|
||||||
|
restrict operations that could leak potentially sensitive
|
||||||
|
data (e.g. DNS queries).
|
||||||
|
+ AIM:
|
||||||
|
- Fix setting icons with dimensions greater than 64x64 pixels
|
||||||
|
by scaling them down to at most 64x64.
|
||||||
|
+ Gadu-Gadu:
|
||||||
|
- Allow showing your status only to buddies.
|
||||||
|
- Suppress blank messages that happen when receiving inline
|
||||||
|
images.
|
||||||
|
- Fix sending inline images to remote users, don't crash when
|
||||||
|
trying to send large (> 256kB) images.
|
||||||
|
- Support typing notifications.
|
||||||
|
- Optional SSL connection support for GNUTLS users
|
||||||
|
- Don't count received messages or statuses when determining
|
||||||
|
whether to send a keepalive packet.
|
||||||
|
- Support XML events, resulting in immediate update of other
|
||||||
|
users' buddy icons.
|
||||||
|
- Accept poorly formatted URLs from other third-party clients
|
||||||
|
in the same manner as the official client.
|
||||||
|
+ ICQ:
|
||||||
|
- Fix setting icons with dimensions greater than 64x64 pixels
|
||||||
|
by scaling them down to at most 64x64.
|
||||||
|
- Fix unsetting your mood when "None" is selected.
|
||||||
|
- Ignore Daylight Saving Time when performing calculations
|
||||||
|
related to birthdays.
|
||||||
|
- It is now possible to specify multiple encodings on the
|
||||||
|
Advanced tab of an ICQ account's settings by using a
|
||||||
|
comma-delimited list.
|
||||||
|
+ IRC:
|
||||||
|
- Add "authserv" service command.
|
||||||
|
+ MSN:
|
||||||
|
- Fix a hard-to-exploit crash in the MSN protocol when using
|
||||||
|
the HTTP connection method.
|
||||||
|
+ MXit:
|
||||||
|
- Support for an Invite Message when adding a buddy.
|
||||||
|
- Fixed bug in splitting-up of messages that contain a lot of
|
||||||
|
links.
|
||||||
|
- Fixed crash caused by timer not being disabled on disconnect.
|
||||||
|
- Clearing of the conversation window now works.
|
||||||
|
- When receiving an invite you can display the sender's profile
|
||||||
|
information, avatar image, invite message.
|
||||||
|
- The Change PIN option was moved into separate action.
|
||||||
|
- New profile attributes added and shown.
|
||||||
|
- Added the ability to view and invite your Suggested Friends,
|
||||||
|
and to search for contacts.
|
||||||
|
- Also display the Status Message of offline contacts in their
|
||||||
|
profile information.
|
||||||
|
+ XMPP:
|
||||||
|
- Remember the previously entered user directory when searching
|
||||||
|
- Correctly handle a buddy's unsetting his/her vCard-based
|
||||||
|
avatar.
|
||||||
|
- Squash one more situation that resulted in duplicate entries
|
||||||
|
in the roster
|
||||||
|
+ Plugins:
|
||||||
|
- The Voice/Video Settings plugin now includes the ability to
|
||||||
|
test microphone settings.
|
||||||
|
- Fix a crash when handling some saved settings in the
|
||||||
|
Voice/Video Settings plugin.
|
||||||
|
- Drop pidgin-nm09.patch: fixed upstream.
|
||||||
|
- Disable building of evolution plugin for Factory, with a
|
||||||
|
build_evo define. The plugin is currently not compatible with
|
||||||
|
evolution 3.1.x.
|
||||||
|
- Add explicit gconf2-devel BuildRequires: it was implicitly
|
||||||
|
brought before, but it is really needed.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Apr 22 10:24:15 UTC 2011 - fcrozat@novell.com
|
Fri Apr 22 10:24:15 UTC 2011 - fcrozat@novell.com
|
||||||
|
|
||||||
|
|||||||
10
pidgin.spec
10
pidgin.spec
@ -25,7 +25,7 @@
|
|||||||
|
|
||||||
Name: pidgin
|
Name: pidgin
|
||||||
Summary: GTK+-Based Multiprotocol Instant Messaging Client
|
Summary: GTK+-Based Multiprotocol Instant Messaging Client
|
||||||
Version: 2.7.11
|
Version: 2.8.0
|
||||||
Release: 1
|
Release: 1
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
Group: Productivity/Networking/Instant Messenger
|
Group: Productivity/Networking/Instant Messenger
|
||||||
@ -41,8 +41,10 @@ Patch5: pidgin-nonblock-common2.patch
|
|||||||
Patch14: pidgin-mono-buildfix.patch
|
Patch14: pidgin-mono-buildfix.patch
|
||||||
# PATCH-FIX-OPENSUSE pidgin-fix-perl-build.patch vuntz@opensuse.org -- Revert http://developer.pidgin.im/viewmtn/revision/info/f32151852a00fb5abd3fdccdd8df2419031666de as it breaks the build
|
# PATCH-FIX-OPENSUSE pidgin-fix-perl-build.patch vuntz@opensuse.org -- Revert http://developer.pidgin.im/viewmtn/revision/info/f32151852a00fb5abd3fdccdd8df2419031666de as it breaks the build
|
||||||
Patch15: pidgin-fix-perl-build.patch
|
Patch15: pidgin-fix-perl-build.patch
|
||||||
# PATCH-FIX-UPSTREAM pidgin-nm09.patch fcrozat@novell.com -- Fix compatibility with NM 0.9 (upstream ticket 13505)
|
# PATCH-FIX-UPSTREAM pidgin-nm09-more.patch vuntz@opensuse.org -- Fix to use new NM signal name http://developer.pidgin.im/ticket/13859
|
||||||
Patch16: pidgin-nm09.patch
|
Patch16: pidgin-nm09-more.patch
|
||||||
|
# PATCH-FIX-UPSTREAM pidgin-gevolution-fix-build.patch vuntz@opensuse.org -- Fix build, taken from upstream
|
||||||
|
Patch17: pidgin-gevolution-fix-build.patch
|
||||||
# Can use external libzephyr
|
# Can use external libzephyr
|
||||||
BuildRequires: cyrus-sasl-devel
|
BuildRequires: cyrus-sasl-devel
|
||||||
BuildRequires: dbus-1-devel
|
BuildRequires: dbus-1-devel
|
||||||
@ -51,6 +53,7 @@ BuildRequires: evolution-data-server-devel
|
|||||||
%if %suse_version > 1110
|
%if %suse_version > 1110
|
||||||
BuildRequires: farsight2-devel
|
BuildRequires: farsight2-devel
|
||||||
%endif
|
%endif
|
||||||
|
BuildRequires: gconf2-devel
|
||||||
%if %suse_version < 1020
|
%if %suse_version < 1020
|
||||||
BuildRequires: gnome-icon-theme
|
BuildRequires: gnome-icon-theme
|
||||||
%endif
|
%endif
|
||||||
@ -331,6 +334,7 @@ translation-update-upstream
|
|||||||
%patch14 -p1
|
%patch14 -p1
|
||||||
%patch15 -p1
|
%patch15 -p1
|
||||||
%patch16 -p1
|
%patch16 -p1
|
||||||
|
%patch17 -p0
|
||||||
# Change Myanmar/Myanmar to Myanmar:
|
# Change Myanmar/Myanmar to Myanmar:
|
||||||
rename my_MM my po/my_MM.*
|
rename my_MM my po/my_MM.*
|
||||||
%{__sed} -i "/ALL_LINGUAS/s/ my_MM / my /" configure.ac
|
%{__sed} -i "/ALL_LINGUAS/s/ my_MM / my /" configure.ac
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user