On Sat, Jun 25, 2016 at 6:29 PM, Kornel Benko <kor...@lyx.org> wrote:
> Am Samstag, 25. Juni 2016 um 18:23:03, schrieb Liviu Andronic
> <landr...@lyx.org>
>> On Sat, Jun 25, 2016 at 6:00 PM, Richard Heck <rgh...@lyx.org> wrote:
>> > I've fixed both these issues with the attached.
>> >
>> I have trouble applying this patch. I've tried everything from patch
>> -p1 < filename.patch to git apply filename.patch on a clean tree and
>> it fails.
>
> I had no problems with this in master branch. The only difference was
> patching file src/frontends/qt4/GuiView.cpp
> Hunk #9 succeeded at 4236 (offset 5 lines).
> Hunk #10 succeeded at 4374 (offset 5 lines).
>
I also get this, but the patch doesn't seem to apply cleanly:
sh>patch -p1 < "0001-Initial-work-for-inset-toolbar-combo2.patch" (7483)
(Stripping trailing CRs from patch; use --binary to disable.)
patching file lib/ui/stdtoolbars.inc
(Stripping trailing CRs from patch; use --binary to disable.)
patching file src/frontends/qt4/GuiToolbar.cpp
(Stripping trailing CRs from patch; use --binary to disable.)
patching file src/frontends/qt4/GuiView.cpp
Hunk #9 succeeded at 4236 (offset 5 lines).
Hunk #10 succeeded at 4374 (offset 5 lines).
(Stripping trailing CRs from patch; use --binary to disable.)
patching file src/frontends/qt4/GuiView.h
The next patch would create the file src/frontends/qt4/InsetCombo.cpp,
which already exists! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored
The next patch would create the file src/frontends/qt4/InsetCombo.h,
which already exists! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored
(Stripping trailing CRs from patch; use --binary to disable.)
patching file src/frontends/qt4/Makefile.am
(Stripping trailing CRs from patch; use --binary to disable.)
patching file src/frontends/qt4/Toolbars.cpp
(Stripping trailing CRs from patch; use --binary to disable.)
patching file src/frontends/qt4/Toolbars.h
sh>patch -p1 < ... 1-Initial-work-for-inset-toolbar-combo2.patch"
(7483) returned '1'
Liviu
>> >git apply "0001-Initial-work-for-inset-toolbar-combo2.patch" (7324)
>> 0001-Initial-work-for-inset-toolbar-combo2.patch:28: trailing whitespace.
>> Separator0001-Initial-work-for-inset-toolbar-combo2.patch:29: trailing
>> whitespace.
>> Insets0001-Initial-work-for-inset-toolbar-combo2.patch:41: trailing
>> whitespace.
>> #include "InsetCombo.h"0001-Initial-work-for-inset-toolbar-combo2.patch:49:
>> trailing whitespace.
>> case ToolbarItem::INSETS:
>> {0001-Initial-work-for-inset-toolbar-combo2.patch:50: trailing
>> whitespace.
>> InsetCombo * insets = owner_.getInsetCombo();fatal: git apply: bad
>> git-diff - expected /dev/null on line 187
>> >git apply "0001-Initial-work-for-inset-toolbar-combo2.patch" (7324)
>> >returned '128'
>>
>>
>> Any pointers?
>>
>> Thanks,
>> Liviu
>>
>>
>> > Richard
>
> Kornel
