Bug 569271 - upstream or drop ancient pidgin patches
Summary: upstream or drop ancient pidgin patches
Status: RESOLVED FIXED
Alias: None
Product: openSUSE 11.4
Classification: openSUSE
Component: GNOME (show other bugs)
Version: Factory
Hardware: Other Other
: P5 - None : Normal (vote)
Target Milestone: ---
Assignee: E-mail List
QA Contact: E-mail List
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2010-01-08 17:36 UTC by Stanislav Brabec
Modified: 2012-07-21 17:35 UTC (History)
5 users (show)

See Also:
Found By: ---
Services Priority:
Business Priority:
Blocker: ---
Marketing QA Status: ---
IT Deployment: ---


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Stanislav Brabec 2010-01-08 17:36:37 UTC
Here is an exhausting list of pidgin stuff that was not upstreamed. That stuff should be upstreamed or dropped.

pidgin-gnome-keyring.patch: Were introduced to gaim by:
Mon Nov 28 09:42:06 CET 2005 - hpj@suse.de
...- Added patch to use the GNOME keyring for passwords.
Related: bug 566286, bug 553272 and bug 522361.

pidgin-nonblock-*: Were introduced to gaim by:
Thu Oct  6 16:09:24 CEST 2005 - gekker@suse.de
- Make aim and gwim asynchronous, patches from HPJ

pidgin-dbus-invalid-gpointer.patch was apparently a fix. My fault.
Mon Mar  3 13:30:23 CET 2008 - sbrabec@suse.cz
- Update to version 2.4.0:...

pidgin-browser-default.patch: My patch, customization, must stay downstream.

pidgin-directconn-argfix.patch: Look like a fix.
Tue Nov 13 21:29:06 CET 2007 - maw@suse.de
- Add pidgin-directconn-argfix.patch.

pidgin-bnc550170-qq-2008only.patch: My new fix.
- If QQ migration will not happen in pidgin-2.6.5, I'll report it upstream.

includes.patch: Was apparently a fix:
Tue Jul 24 00:17:19 CEST 2007 - maw@suse.de
- Add includes.patch, fixing the build when new versions of
  evolution-data-server are installed.

pidgin-NLD-smiley-theme pidgin-Tango-smiley-theme: Ancient and newer skin. May be interesting for upstream. Jakub, what do you think about them?
Comment 1 Jakub Steiner 2010-01-08 21:20:51 UTC
The default upstream emote theme is following the tango guidelines and is a decent default, I think we can drop our custom themes.
Comment 2 Vincent Untz 2010-06-03 17:24:45 UTC
Stanislav: any progress on this?
Comment 3 Dominique Leuenberger 2010-08-16 10:53:46 UTC
Moving to 11.4

Current list of patches in the pidgin package (what is left after updating to 2.7.3 in my branch):

> includes.patch
> pidgin-bnc550170-qq-2008only.patch
> pidgin-browser-default.patch
> pidgin-dbus-invalid-gpointer.patch
> pidgin-gnome-keyring.patch
> pidgin-nonblock-aim.patch
> pidgin-nonblock-common2.patch
> pidgin-nonblock-common.patch
> pidgin-nonblock-gwim.patch
Comment 4 Stanislav Brabec 2010-08-16 13:00:12 UTC
Regarding my patches:

pidgin-browser-default.patch: Submitting as http://developer.pidgin.im/ticket/12505

pidgin-bnc550170-qq-2008only.patch: It is a hack that forced all users to migrate to QQ2008 whenever they enter into preferences. I never tried to upstream it, as I don't use QQ and I don't know any details. Feel free to drop the patch. I think that all people already miograted.

pidgin-dbus-invalid-gpointer.patch includes.patch look like apparent compilation warning fixes. We should check whether they are still needed. If not, we can drop it, otherwise upstream them.

All other patches: Maybe HPJ can answer or try to describe its usefullness to the upstream: http://developer.pidgin.im/newticket
Comment 5 Dominique Leuenberger 2010-08-16 14:08:36 UTC
pidgin-bnc550170-qq-2008only.patch => dropped in my branch
pidgin-dbus-invalid-gpointer.patch => seems still valid. I will upstream it
includes.patch => not sure (yet) if really needed. Will check
Comment 6 Dominique Leuenberger 2010-08-16 14:18:09 UTC
includes.patch can be dropped for sure => the code change is within an #if 0 [...]
#endif statement.
Comment 7 Dominique Leuenberger 2010-08-16 15:58:11 UTC
pidgin-dbus-invalid-gpointer.patch submitted as http://developer.pidgin.im/ticket/12507
Comment 8 Dominique Leuenberger 2010-08-16 16:10:49 UTC
Which leaves those rest to be checked:

> pidgin-gnome-keyring.patch
=> is disabled on any non SLE platform.. I could not care less :) I'm not even sure it applies. 

> pidgin-nonblock-aim.patch
==> is currently disabled in the build ; has been marked as NEEDS REBASE since January 2009. As per .changes text, it was probably earlier disabled.

> pidgin-nonblock-common2.patch
> pidgin-nonblock-common.patch
> pidgin-nonblock-gwim.patch
Comment 9 Stanislav Brabec 2010-08-16 16:27:15 UTC
Well, disabling pidgin-gnome-keyring.patch in openSUSE was a consensus in bug 566286.

openSUSE: pidgin does not depend on gnome-keyring unlocking (i. e. no extra keyring unlock dialog in non-GNOME sessions).

SLED: Use gnome-keyring to keep passwords more safe.

It is surely not an optimal solution.
Comment 10 Hans Petter Jansson 2010-11-28 01:15:09 UTC
I agree with Stanislav is comment #9: Leave gnome-keyring on in SLED, if that is the consensus.

The nonblock patches that no longer apply can be dropped.
Comment 11 Bjørn Lie 2011-02-21 18:18:18 UTC
(changed during the 2011-02-20 Open-Bugs-Day about bugs for obsolete versions of openSUSE)+1

So is this bug ready for closing? 
I see that new patches have been added, so in a sense I guess this bug can remain open for eternity ;-)
Comment 12 Dominique Leuenberger 2012-07-21 17:35:18 UTC
Lots of patches are gone and the remaining ones are probably safe to stay, so I think it's about time to close this bug (which should not mean we should stop upstreaming patches)