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

pyqt5: make qtwebkit optional, disable by default #51846

Merged
merged 10 commits into from
Dec 30, 2018

Commits on Dec 27, 2018

  1. pyqt5: remove old fixes

    Since about 5 hydra evaluations ago the build log has:
    
    substituteStream(): WARNING: pattern 'install_dir=pydbusmoddir' doesn't match anything in file 'configure.py'
    substituteStream(): WARNING: pattern 'ModuleMetadata(qmake_QT=['webkitwidgets'])' doesn't match anything in file 'configure.py'
    
    Looking at the original configure.py I don't see any mention of
    pydbusmoddir and ModuleMetadata seems to be set like the patch suggests:
    
        'QtWebKitWidgets':      ModuleMetadata(
                                        qmake_QT=['webkitwidgets',
                                                'printsupport']),
    
    It appears that we don't need the fix anymore.
    
    Reverts: d3ed0ab ('PyQt: fix build')
    veprbl committed Dec 27, 2018
    Configuration menu
    Copy the full SHA
    9b07d48 View commit details
    Browse the repository at this point in the history
  2. pyqt5: make qtwebkit optional, disable by default

    qtwebkit appears to be unsupported in Qt 5.11. We are using some old port
    https://github.com/NixOS/nixpkgs/blob/475d653afdbd8fe3e00ccfd22a30014b0df7aeaa/pkgs/development/libraries/qt-5/5.11/default.nix#L39-L48
    and it is broken on darwin.
    veprbl committed Dec 27, 2018
    Configuration menu
    Copy the full SHA
    facefec View commit details
    Browse the repository at this point in the history
  3. pyqt5: refactor

    veprbl committed Dec 27, 2018
    Configuration menu
    Copy the full SHA
    3c19829 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    20d60c8 View commit details
    Browse the repository at this point in the history
  5. pythonPackages.qtconsole: build on darwin

    Fixes: d7ef9a7 ('python36Packages.qtconsole: 4.4.2 -> 4.4.3')
    veprbl committed Dec 27, 2018
    Configuration menu
    Copy the full SHA
    97ec7a9 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    07a6736 View commit details
    Browse the repository at this point in the history
  7. qutebrowser: drop QtWebKit support

    From the qutebrowser README:
    
      "support for QtWebKit will be dropped soon"
    veprbl committed Dec 27, 2018
    Configuration menu
    Copy the full SHA
    8df467e View commit details
    Browse the repository at this point in the history

Commits on Dec 30, 2018

  1. Configuration menu
    Copy the full SHA
    ae87977 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    16f11df View commit details
    Browse the repository at this point in the history
  3. git-cola: doesn't need QtWebKit

    QtWebKit is only used if QtWebEngine is not available
    veprbl committed Dec 30, 2018
    Configuration menu
    Copy the full SHA
    eecc336 View commit details
    Browse the repository at this point in the history