lmi
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [lmi] PATCH: Update wxWidgets and the other submodules


From: Greg Chicares
Subject: Re: [lmi] PATCH: Update wxWidgets and the other submodules
Date: Thu, 30 Jun 2022 15:27:00 +0000
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.8.0

On 6/29/22 22:48, Vadim Zeitlin wrote:
> 
>  This is the long, long, long promised patch updating lmi to use the latest
> wxWidgets, which is about to be released (in a week, hopefully) as 3.2.0.
> The PR https://github.com/let-me-illustrate/lmi/pull/220 containing these
> changes corresponds to xanadu/wx-3.2-and-related-updates branch using your
> nomenclature and contains several other changes

I did this:

  git remote add xanadu     https://github.com/vadz/lmi.git
  git fetch --all
  git cherry-pick ..xanadu/wx-3.2-and-related-updates

and rebuilt everything by running 'install_msw.sh'. That
seemed to succeed, so I pushed everything.

>  Other commits could be applied separately later if you prefer, but I've
> bundled even independent commits such as xmlwrapp submodule update into the
> same PR/branch, thinking that you might prefer to test all of the changes
> at once.

However, the xmlwrapp submodule still shows as "modified", even
though it seemed to build successfully:

/opt/lmi/src/lmi[0]$git status
On branch master
Your branch is up to date with 'origin/master'.

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
  (commit or discard the untracked or modified content in submodules)
        modified:   third_party/xmlwrapp (untracked content)

no changes added to commit (use "git add" and/or "git commit -a")

Here's the submodule update from my logs:

+ git submodule update --jobs=32 --recursive --init
Submodule path 'third_party/wx': checked out 
'964a7d2e4f859112e32bdfce8520b95fd1587f85'
Submodule '3rdparty/nanosvg' (https://github.com/wxWidgets/nanosvg) registered 
for path 'thi>
Submodule '3rdparty/pcre' (https://github.com/wxWidgets/pcre) registered for 
path 'third_par>
Cloning into '/opt/lmi/src/lmi/third_party/wx/3rdparty/nanosvg'...
Cloning into '/opt/lmi/src/lmi/third_party/wx/3rdparty/pcre'...
Submodule path 'third_party/wx/3rdparty/catch': checked out 
'5f5e4cecd1cafc85e109471356dec29>
Submodule path 'third_party/wx/3rdparty/nanosvg': checked out 
'ccdb1995134d340a93fb20e3a3d32>
Submodule path 'third_party/wx/3rdparty/pcre': checked out 
'5b934c2a6770c05ae3e9bc5f63e0ed5d>
Submodule path 'third_party/wx/src/expat': checked out 
'1187e4075e227d6e373b7469df65f1d8d2c7>
Submodule path 'third_party/wx/src/png': checked out 
'd675c669c8250b7da55747c81a5bd01504449e>
Submodule path 'third_party/wx/src/tiff': checked out 
'af035310bddac3e2f58ae0a330bc6ef168e18>
Submodule path 'third_party/wx/src/zlib': checked out 
'b4c511e9ee69d5a3090fc89d8b02b19b789e3>
Submodule path 'third_party/wxpdfdoc': checked out 
'409411199b5410a147581ac7c2d2c4d34d686773'
Submodule path 'third_party/xmlwrapp': checked out 
'5bc701e26301664ce670cb32eb0b1fd98454b24a'


reply via email to

[Prev in Thread] Current Thread [Next in Thread]