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

Jump to bottom

[19.03] qt511.qtwebkit: fix on darwin #57531

Merged
merged 4 commits into from Mar 13, 2019
Merged

[19.03] qt511.qtwebkit: fix on darwin #57531

merged 4 commits into from Mar 13, 2019

Conversation

veprbl
Copy link
Member

@veprbl veprbl commented Mar 12, 2019

Motivation for this change

Backport of #55983

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@veprbl
qt5.qtwebkit: link against libicucore.dylib from darwin.ICU instead o…
a98b258 
…f /usr/lib

The impure library was introduced in

   775531c ('qt58: extend darwin compatibility')

cmake-based build can use a non-apple ICU if -DMACOS_USE_SYSTEM_ICU=OFF
is set.

(cherry picked from commit f212dd2)
@veprbl
qt5.qtwebkit: refactor version comparison
fb24cb2 
This introduces usingAnnulenWebkitFork variable. Using version
check for qtbase.version is misleading because annulen's fork is not
tied to a specific qt5 release.

(cherry picked from commit 67186de)
@veprbl
qt511.qtwebkit: fix on darwin
91f2dc0 
readline is used on macOS and iOS for some javascript console (JSC). It
seems to be easier to disable it than to fix it.

(cherry picked from commit 4bbd00e)
@veprbl
qt5.qtwebkit: don't set qmake variables for cmake build
6f38046 
(cherry picked from commit 518f997)
@veprbl veprbl requested a review from ttuegel as a code owner March 12, 2019 17:58
@GrahamcOfBorg GrahamcOfBorg added 6.topic: darwin Running or building packages on Darwin 6.topic: qt/kde labels Mar 12, 2019
@veprbl veprbl merged commit aa34ca0 into NixOS:release-19.03 Mar 13, 2019
@veprbl veprbl deleted the pr/qt5_qtwebkit_darwin_fix_19.03 branch December 1, 2020 17:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ttuegel ttuegel Awaiting requested review from ttuegel ttuegel is a code owner

@abbradar abbradar Awaiting requested review from abbradar

Assignees
No one assigned
Labels
6.topic: darwin Running or building packages on Darwin 6.topic: qt/kde 10.rebuild-darwin: 11-100 10.rebuild-linux: 101-500
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@veprbl @GrahamcOfBorg