[Pidgin] #13525: [PATCH]Update internal libgadu to 1.10.1
Pidgin
trac at pidgin.im
Tue Mar 22 16:55:41 EDT 2011
#13525: [PATCH]Update internal libgadu to 1.10.1
--------------------+-------------------------------------------------------
Reporter: matekm | Owner: bartosz
Type: patch | Status: new
Milestone: | Component: Gadu-Gadu
Version: 2.7.11 | Resolution:
Keywords: |
--------------------+-------------------------------------------------------
Comment(by matekm):
I tested it on the newest code from repo - even now I updated main pidgin
repo and applied this patch - everything worked great, zero information
about conflicts.
{{{
H:\PidginDevel\pidgin-src>patch -p0 < ggupdate.diff
patching file libpurple/protocols/gg/Makefile.mingw
patching file libpurple/protocols/gg/lib/COPYING
patching file libpurple/protocols/gg/lib/common.c
patching file libpurple/protocols/gg/lib/dcc.c
patching file libpurple/protocols/gg/lib/events.c
patching file libpurple/protocols/gg/lib/http.c
patching file libpurple/protocols/gg/lib/libgadu.c
patching file libpurple/protocols/gg/lib/libgadu.h
patching file libpurple/protocols/gg/lib/obsolete.c
patching file libpurple/protocols/gg/lib/pubdir50.c
patching file libpurple/protocols/gg/lib/dcc7.c
patching file libpurple/protocols/gg/lib/libgadu-internal.h
patching file libpurple/protocols/gg/lib/protocol.h
patching file libpurple/protocols/gg/lib/resolver.c
patching file libpurple/protocols/gg/lib/resolver.h
patching file libpurple/protocols/gg/lib/debug.c
patching file libpurple/protocols/gg/lib/encoding.c
patching file libpurple/protocols/gg/lib/encoding.h
patching file libpurple/protocols/gg/lib/handlers.c
patching file libpurple/protocols/gg/lib/libgadu-debug.h
patching file libpurple/protocols/gg/lib/message.c
patching file libpurple/protocols/gg/lib/message.h
patching file libpurple/protocols/gg/lib/session.h
}}}
How the conflict looked like? Did You updated repo before applying this
patch?
--
Ticket URL: <http://developer.pidgin.im/ticket/13525#comment:2>
Pidgin <http://pidgin.im>
Pidgin
More information about the Tracker
mailing list