Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[qt5-base, qt5-imageformat] fix issues on osx #9705

Merged
merged 51 commits into from
Apr 10, 2020

Conversation

Neumann-A
Copy link
Contributor

@Neumann-A Neumann-A commented Jan 15, 2020

continuation of #9686 (broken commit history)
requires includes #9680 (to make CI work)

qt5-base: added iconv dependency to fontconfig
qt5-imageformat: removed freeglut dependency on osx

closes #6733
closes #9299
duplicate
closes #10173

@JackBoosY
Copy link
Contributor

JackBoosY commented Jan 16, 2020

Seems some ports can be successfully built, but some ports are broken.
Could you update baseline?

@Neumann-A
Copy link
Contributor Author

I'll fix the remaining regressions when i got the time for it. I already know how to fix those due to my local second paraview branch with qt 5.14 but have to apply those changes to Qt 5.12

@Neumann-A
Copy link
Contributor Author

Ah nice .... wt has a silent dependency on Qt5 ....

@Neumann-A
Copy link
Contributor Author

Due to the conflict between qt5-base and ms-angle, libEGL (depending on ms-angle) generation failed, which eventually caused this issue.

qt5-base no longer builds angle so there is no conflict there.
The conflict is between angle and ms-angle but since ms-angle is set to skip it should load all libraries build by angle unless angle does not build libEGL (which it should).

@Neumann-A
Copy link
Contributor Author

@JackBoosY: Should we jump directly to #10009 if possible. I just split the PRs up because I thought the fixes would land faster in master. (And i didn't now when i will finish them.)

@JackBoosY
Copy link
Contributor

@Neumann-A Okay, that's ok.

@ras0219-msft
Copy link
Contributor

/azp run

@azure-pipelines
Copy link

Pull request contains merge conflicts.

@Neumann-A
Copy link
Contributor Author

...... ah really i should not use the github merge tool anymore. It seems to completely replace the file all the time....

@JackBoosY
Copy link
Contributor

Retesting...

@heydojo
Copy link
Contributor

heydojo commented Apr 1, 2020

Hi All,
This merge fails for me in the following way:

Starting package 16/16: qt5-base:x64-windows
Building package qt5-base[core,latest]:x64-windows...
-- Figuring out qt target mkspec. Target arch x64
-- Target mkspec set to: win32-msvc
-- Host mkspec not set. Qt's own buildsystem will try to figure out the host system
-- Downloading http://download.qt.io/official_releases/qt/5.13/5.13.1/submodules/qtbase-everywhere-src-5.13.1.tar.xz...
-- Extracting source H:/vcpkg/downloads/qtbase-everywhere-src-5.13.1.tar.xz
-- Applying patch patches/winmain_pro.patch
-- Applying patch patches/windows_prf.patch
-- Applying patch patches/qt_app.patch
-- Applying patch patches/gui_configure.patch
-- Applying patch patches/icu.patch
-- Applying patch patches/Qt5BasicConfig.patch
CMake Error at scripts/cmake/vcpkg_apply_patches.cmake:51 (message):
  Applying patch failed.  Checking patch
  mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in...

  Hunk #1 succeeded at 124 (offset 71 lines).

  error: while searching for:

      )



  !!IF !isEmpty(CMAKE_WINDOWS_BUILD)

  !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)

      set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")

  !!ELSE

      set(imported_implib \"IMPORTED_IMPLIB_${Configuration}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")

  !!ENDIF



  error: patch failed: mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in:69

  error: mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in: patch does not
  apply

Call Stack (most recent call first):
  scripts/cmake/vcpkg_extract_source_archive_ex.cmake:134 (vcpkg_apply_patches)
  ports/qt5-base/cmake/qt_download_submodule.cmake:30 (vcpkg_extract_source_archive_ex)
  ports/qt5-base/portfile.cmake:35 (qt_download_submodule)
  scripts/ports.cmake:90 (include)


Error: Building package qt5-base:x64-windows failed with: BUILD_FAILED
Please ensure you're using the latest portfiles with `.\vcpkg update`, then
submit an issue at https://github.com/Microsoft/vcpkg/issues including:
  Package: qt5-base:x64-windows
  Vcpkg version: 2020.02.04-nohash-external

Additionally, attach any relevant sections from the log files above.

To test, I did the following:

  • Cloned https://github.com/Neumann-A/vcpkg
  • Moved into the vcpkg directory and switched to feature branch fix_osx_qt_2 (git checkout fix_osx_qt_2)
  • Ran CALL .\bootstrap-vcpkg.bat
  • Issued vcpkg install qt5-base[latest]:x64-windows

This resulted in the build failure above.
Hope this helps.

@Neumann-A
Copy link
Contributor Author

@heydojo:
This one is only intended to fix 5.12.5 (osx).
I know that the changes here are breaking the [latest] feature but since I am already updating latest to 5.14.2 (#10644) I am not going to spend time to fix this PR for 5.13.1 (If you really need 5.13.1 the patches need to be updated since they contain the magic to make single and multi configuration builds work correctly). Currently you could try out #10009 (5.14.1) until I have the patches fixed for 5.14.2 in #10644

@JackBoosY
Copy link
Contributor

Hi @Neumann-A, please resolve baseline conflicts.

Thanks.

@JackBoosY JackBoosY removed the info:reviewed Pull Request changes follow basic guidelines label Apr 2, 2020
@heydojo
Copy link
Contributor

heydojo commented Apr 2, 2020

@Neumann-A Thanks. Please disregard my message regarding the patches here. I did try your 5.14.1 branch and will test the 5.14.2 branch you have with the qtmain.lib fix #10644

@JackBoosY JackBoosY added the info:reviewed Pull Request changes follow basic guidelines label Apr 3, 2020
# Conflicts:
#	ports/qt5-base/portfile.cmake
@Neumann-A
Copy link
Contributor Author

@JackBoosY: Any plans to merge this? The only reason I keep this open to be merge is to have a working qt 5.12.5 version for osx in the commit history of vcpkg. Otherwise I could simply close this in favor of the other Qt PR.

@JackBoosY
Copy link
Contributor

@ras0219-msft @dan-shaw Could you please merge this PR first?

@dan-shaw
Copy link
Contributor

dan-shaw commented Apr 8, 2020

@Neumann-A @JackBoosY LGTM

@dan-shaw dan-shaw merged commit 941d546 into microsoft:master Apr 10, 2020
@Neumann-A Neumann-A deleted the fix_osx_qt_2 branch April 10, 2020 05:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
8 participants