kicad-developers team mailing list archive

[Wayne Stambaugh <stambaughw@xxxxxxxxx>]

Hi Cedric,

I took a look at your patch and it looks like you forgot to tell git to
ignore eol characters so your patch includes a duplicate copy of the
entire file so I cannot easily see your changes.  I also saw some
trailing whitespace which needs to be cleaned up.  There has been some
interest in your patch recently so if you get the correct patch, I will
try to get it merged.

Cheers,

Wayne

On 12/18/2018 11:17 AM, cedric.dewijs@xxxxxxxxxx wrote:
> Hi Wayne,
> 
> I had some trouble generating the .patch file. Finally the following steps worked. Is the generated file formatted correctly?
> Cheers,
> Cedric
> 
> <<Edit file>>
> $ git commit *
> [master 5384b934c] Added notes to downgrade GLM v0.9.9.3 to 0.9.9.1
>  1 file changed, 507 insertions(+), 490 deletions(-)
> 
> $ git log
> <<Get commit number>>
> 
> $ git format-patch -1  5384b934c09c7a23759321d4116eb8c6b259a614
> 0001-Added-notes-to-downgrade-GLM-v0.9.9.3-to-0.9.9.1.patch
> 
>> ----Origineel Bericht----
>> Van : stambaughw@xxxxxxxxx
>> Datum : 18/12/2018 14:50
>> Aan : kicad-developers@xxxxxxxxxxxxxxxxxxx
>> Onderwerp : Re: [Kicad-developers] [PATCH] Added notes to downgrade GLM v0.9.9.3 to 0.9.9.2
>>
>> Cedric,
>>
>> Please do the following:
>>
>> $ cd /to/your/kicad/source/path
>> $ git format-patch
>>
>> you should see a patch file named:
>>
>> 0001-first-line-of-commit-message.patch.
>>
>> Post this patch to the mailing list.
>>
>> Cheers,
>>
>> Wayne
>>
>> On 12/18/2018 8:16 AM, cedric.dewijs@xxxxxxxxxx wrote:
>>> Hi All, 
>>> This is my first patch, created by copying and pasting from github:
>>> https://github.com/cdwijs/kicad-source-mirror/commit/019dec6edacd63237680b0662e720b8dab6f1664
>>> Is this method acceptable?
>>>
>>> Cheers,
>>> Cedric
>>>
>>> Documentation/development/compiling.md
>>> <https://github.com/cdwijs/kicad-source-mirror/commit/019dec6edacd63237680b0662e720b8dab6f1664#diff-922fef278a3be6506a5926a921032140>
>>>
>>>
>>> @@ -275,13 +275,18 @@ and run `msys2_shell.cmd`.
>>>
>>>
>>> ##Building using MSYS2 ## {#msys2_build}
>>>
>>>
>>> The following commands assume you are building for 64-bit Windows, and
>>> that you already have
>>>
>>> the KiCad source code in a folder called `kicad-source` in your home
>>> directory. See below
>>>
>>> The following commands assume you are building for 64-bit Windows. See
>>> below
>>>
>>> for changes if you need to build for 32-bit instead. Run `mingw64.exe`
>>> from the MSYS2
>>>
>>> install path. At the command prompt run the the following commands:
>>>
>>>
>>>
>>>
>>>
>>>
>>>
>>>
>>> pacman -S base-devel \
>>>
>>> git \
>>>
>>> git \
>>>
>>> mingw-w64-x86_64-cmake \
>>>
>>> mingw-w64-x86_64-doxygen \
>>>
>>> mingw-w64-x86_64-gcc \
>>>
>>> @@ -298,7 +303,8 @@ install path. At the command prompt run the the
>>> following commands:
>>>
>>> mingw-w64-x86_64-glm \
>>>
>>> mingw-w64-x86_64-oce \
>>>
>>> mingw-w64-x86_64-ngspice
>>>
>>> cd kicad-source
>>>
>>> git clone https://git.launchpad.net/kicad
>>>
>>> cd kicad
>>>
>>> mkdir -p build/release
>>>
>>> mkdir build/debug # Optional for debug build.
>>>
>>> cd build/release
>>>
>>> @@ -320,7 +326,18 @@ For debug builds, run the cmake command with
>>> `-DCMAKE_BUILD_TYPE=Debug` from the
>>>
>>> There are some known issues that are specific to MSYS2. This section
>>> provides a list of the
>>>
>>> currently known issues when building KiCad using MSYS2.
>>>
>>>
>>> ###GLM version 0.9.9.3 is incompatible with KiCad. ### {#ki_glm_0993}
>>>
>>>
>>> GLM version 0.9.9.3 is incompatible with KiCad. You must downgrade to
>>> version 0.9.9.2 or older. Open the file /etc/pacman.d/mirrorlist.ming64
>>> to get the location of your mirror, download the older version, and use
>>> the following command to install it:
>>>
>>> pacman -U ~/mingw-w64-x86_64-glm-0.9.9.2-1-any.pkg.tar.xz
>>>
>>>
>>> You should also
>>>
>>> configure pacman to prevent upgrading the 64-bit GLM package by adding:
>>>
>>>
>>> IgnorePkg = mingw-w64-x86_64-glm
>>>
>>>
>>> to your /etc/pacman.conf file.
>>>
>>>
>>> ###64-bit Package of Boost 1.59 ### {#ki_msys2_64bit_boost}
>>>
>>>
>>> The context library of the x86_64 package of Boost version 1.59 is
>>> broken and will cause KiCad
>>>
>>> _______________________________________________
>>> Mailing list: https://launchpad.net/~kicad-developers
>>> Post to     : kicad-developers@xxxxxxxxxxxxxxxxxxx
>>> Unsubscribe : https://launchpad.net/~kicad-developers
>>> More help   : https://help.launchpad.net/ListHelp
>>>
>>
>> _______________________________________________
>> Mailing list: https://launchpad.net/~kicad-developers
>> Post to     : kicad-developers@xxxxxxxxxxxxxxxxxxx
>> Unsubscribe : https://launchpad.net/~kicad-developers
>> More help   : https://help.launchpad.net/ListHelp
>>