* [PATCH v2 0/5] fixes for w32 and NetPBM
@ 2013-10-30 12:42 Claudio Bley
2013-11-01 9:12 ` Eli Zaretskii
0 siblings, 1 reply; 4+ messages in thread
From: Claudio Bley @ 2013-10-30 12:42 UTC (permalink / raw)
To: Emacs-devel
This is version 2 of
http://lists.gnu.org/archive/html/emacs-devel/2013-10/msg00772.html
Changes since v1:
- reworded commit message of patch #1 stating that different major
versions of jpeglib are indeed binary incompatible
- simplified logic of patch #2, using the name libpngXY.dll and
libpngXY-XY.dll for versions >= 1.4.0 as per Eli's request
Claudio Bley (5):
w32: define new jpeglib-version var in order to load the correct DLL
at runtime
w32: add support for recent PNG library version >= 1.5
w32: add support for default library names for libtiff
Fix parsing of NetPBM file comments
Fix file magic for pbm files with comments
lisp/image.el | 5 +++-
lisp/term/w32-win.el | 17 ++++++++++----
src/image.c | 65 +++++++++++++++++++++++++++++++++++-----------------
3 files changed, 61 insertions(+), 26 deletions(-)
--
1.8.4.msysgit.0
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2 0/5] fixes for w32 and NetPBM
2013-10-30 12:42 [PATCH v2 0/5] fixes for w32 and NetPBM Claudio Bley
@ 2013-11-01 9:12 ` Eli Zaretskii
2013-11-01 10:36 ` Claudio Bley
0 siblings, 1 reply; 4+ messages in thread
From: Eli Zaretskii @ 2013-11-01 9:12 UTC (permalink / raw)
To: Claudio Bley; +Cc: emacs-devel
> Date: Wed, 30 Oct 2013 13:42:50 +0100
> From: Claudio Bley <claudio.bley@googlemail.com>
>
> This is version 2 of
> http://lists.gnu.org/archive/html/emacs-devel/2013-10/msg00772.html
>
> Changes since v1:
>
> - reworded commit message of patch #1 stating that different major
> versions of jpeglib are indeed binary incompatible
>
> - simplified logic of patch #2, using the name libpngXY.dll and
> libpngXY-XY.dll for versions >= 1.4.0 as per Eli's request
Thanks, installed on your behalf.
In the future, please also provide ChangeLog entries for your
changes. (I wrote them this time.)
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2 0/5] fixes for w32 and NetPBM
2013-11-01 9:12 ` Eli Zaretskii
@ 2013-11-01 10:36 ` Claudio Bley
2013-11-01 11:24 ` Eli Zaretskii
0 siblings, 1 reply; 4+ messages in thread
From: Claudio Bley @ 2013-11-01 10:36 UTC (permalink / raw)
To: Eli Zaretskii; +Cc: emacs-devel
At Fri, 01 Nov 2013 11:12:24 +0200,
Eli Zaretskii wrote:
>
> > Date: Wed, 30 Oct 2013 13:42:50 +0100
> > From: Claudio Bley <claudio.bley@googlemail.com>
> >
> > This is version 2 of
> > http://lists.gnu.org/archive/html/emacs-devel/2013-10/msg00772.html
> >
> > Changes since v1:
> >
> > - reworded commit message of patch #1 stating that different major
> > versions of jpeglib are indeed binary incompatible
> >
> > - simplified logic of patch #2, using the name libpngXY.dll and
> > libpngXY-XY.dll for versions >= 1.4.0 as per Eli's request
>
> Thanks, installed on your behalf.
Thank you!
> In the future, please also provide ChangeLog entries for your
> changes. (I wrote them this time.)
OK, will do. But, I'm curious, how do you cope with the merge
conflicts popping up for each patch? Do you resolve them manually each
time?
--
Claudio
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2 0/5] fixes for w32 and NetPBM
2013-11-01 10:36 ` Claudio Bley
@ 2013-11-01 11:24 ` Eli Zaretskii
0 siblings, 0 replies; 4+ messages in thread
From: Eli Zaretskii @ 2013-11-01 11:24 UTC (permalink / raw)
To: Claudio Bley; +Cc: emacs-devel
> Date: Fri, 01 Nov 2013 11:36:31 +0100
> From: Claudio Bley <claudio.bley@googlemail.com>
> Cc: emacs-devel@gnu.org
>
> > In the future, please also provide ChangeLog entries for your
> > changes. (I wrote them this time.)
>
> OK, will do. But, I'm curious, how do you cope with the merge
> conflicts popping up for each patch? Do you resolve them manually each
> time?
There are no ChangeLog merge conflicts, not with bzr. Bzr resolves
ChangeLog issues automatically.
Anyway, you don't need to send the log entries as diffs, you can just
send them as part of the text portion of your patch. Copy/yank is
simple enough.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-11-01 11:24 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-10-30 12:42 [PATCH v2 0/5] fixes for w32 and NetPBM Claudio Bley
2013-11-01 9:12 ` Eli Zaretskii
2013-11-01 10:36 ` Claudio Bley
2013-11-01 11:24 ` Eli Zaretskii
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).