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

k3b: remove qtwebkit dependency #103164

Merged
merged 1 commit into from Nov 12, 2020
Merged

k3b: remove qtwebkit dependency #103164

merged 1 commit into from Nov 12, 2020

Conversation

bachp
Copy link
Member

@bachp bachp commented Nov 8, 2020

The dependeny is optional and k3b works without it.

Motivation for this change

Remove the dependeny from qtwebkit. It's currently marked as broken.

Contributes to #53079

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@bachp
k3b: remove qtwebkit dependency
eedcfb3 
The dependeny is optional and k3b works without it.
@bachp bachp requested a review from ttuegel as a code owner November 8, 2020 20:54
@ofborg ofborg bot requested review from svanderburg and Phreedom November 8, 2020 21:04
@SuperSandro2000
Copy link
Member

The dependeny is optional and k3b works without it.

Shouldn't this be a setting then?

@veprbl veprbl merged commit 47f576c into NixOS:master Nov 12, 2020
@veprbl
Copy link
Member

veprbl commented Nov 12, 2020

@SuperSandro2000

"Qt5WebKitWidgets is used for prettier k3bdiskinfoview"
https://github.com/KDE/k3b/blob/44dcd101eb9c58663b02812cdbe159a8aea93ab8/CMakeLists.txt#L67-L72

I suppose that's not essential.

@bachp Thanks!

@veprbl veprbl mentioned this pull request Nov 12, 2020
Closed
69 tasks
@bachp bachp deleted the k3b-no-webkit branch November 12, 2020 23:24
KyleOndy added a commit to KyleOndy/dotfiles that referenced this pull request Nov 16, 2020
@KyleOndy
niv nixpkgs: update a371c107 -> 2deeb58f
21f9c8f 
## Changelog for nixpkgs:
Commits: [NixOS/nixpkgs@a371c107...2deeb58f](NixOS/nixpkgs@a371c10...2deeb58)

* [`24aedc9a`](NixOS/nixpkgs@24aedc9) perlPackages: init Catalyst::Authentication::Store::LDAP at 1.016 (and dependencies)
* [`de5875a4`](NixOS/nixpkgs@de5875a) libcef: 74.1.14 -> 75.1.14
* [`f0d31b3b`](NixOS/nixpkgs@f0d31b3) obs-studio: Enable builtin browser support
* [`cbcb8418`](NixOS/nixpkgs@cbcb841) Remove obs-linuxbrowser
* [`7aa50bb3`](NixOS/nixpkgs@7aa50bb) maintainers: add dbirks
* [`6c9aaf2a`](NixOS/nixpkgs@6c9aaf2) makemkv: fix formatting and replace pkgconfig alias
* [`83e9cc41`](NixOS/nixpkgs@83e9cc4) makemkv: add jre_headless PATH through the wrapper
* [`e7ce7e37`](NixOS/nixpkgs@e7ce7e3) ssmsh: init at 1.4.3
* [`e940b82a`](NixOS/nixpkgs@e940b82) bambootracker: 0.4.4 -> 0.4.5
* [`4735ed0d`](NixOS/nixpkgs@4735ed0) perlPackages.FutureAsyncAwait: 0.45 -> 0.46
* [`a126b440`](NixOS/nixpkgs@a126b44) terragrunt: 0.25.5 -> 0.26.2
* [`a79902f2`](NixOS/nixpkgs@a79902f) microcodeIntel: 20200616 -> 20201110
* [`5eb3f97e`](NixOS/nixpkgs@5eb3f97) joplin-desktop: 1.2.6 -> 1.3.18
* [`f72a3142`](NixOS/nixpkgs@f72a314) doc: 20.09 release notes: nixos-YY.MM branches no longer in nixos-channels repo
* [`a431ca04`](NixOS/nixpkgs@a431ca0) rss-bridge: 2020-02-26 -> 2020-11-10
* [`33645572`](NixOS/nixpkgs@3364557) sd-local: 1.0.5 -> 1.0.12
* [`e859317c`](NixOS/nixpkgs@e859317) seaweedfs: 2.07 -> 2.09
* [`1e8e9f6b`](NixOS/nixpkgs@1e8e9f6) simplenote: 1.21.1 -> 2.0.0
* [`7bf14060`](NixOS/nixpkgs@7bf1406) skaffold: 1.15.0 -> 1.16.0
* [`a1c9c430`](NixOS/nixpkgs@a1c9c43) drumstick: fix plugin lookup and enable SonivoxEAS and FluidSynth plugins
* [`fd9f28c3`](NixOS/nixpkgs@fd9f28c) vmpk: 0.5.1 -> 0.7.2
* [`1133f6e8`](NixOS/nixpkgs@1133f6e) slurp: 1.3.0 -> 1.3.1
* [`b1dc6b0a`](NixOS/nixpkgs@b1dc6b0) terraformer: 0.8.8 -> 0.8.9
* [`8d47a25b`](NixOS/nixpkgs@8d47a25) traefik: 2.3.1 -> 2.3.2
* [`0d4ac477`](NixOS/nixpkgs@0d4ac47) ugrep: 2.5.5 -> 3.0.4
* [`cd11c0c8`](NixOS/nixpkgs@cd11c0c) haskellPackages.hail: relax cabal dependencies to unbreak
* [`bea630e6`](NixOS/nixpkgs@bea630e) vale: 2.5.0 -> 2.6.1
* [`4534a5e3`](NixOS/nixpkgs@4534a5e) vips: 8.10.1 -> 8.10.2
* [`c0599d86`](NixOS/nixpkgs@c0599d8) wasabiwallet: 1.1.12 -> 1.1.12.2
* [`281a7ba7`](NixOS/nixpkgs@281a7ba) _1password-gui: 0.9.2-1 -> 0.9.3
* [`6818de30`](NixOS/nixpkgs@6818de3) pythonPackages.urwidtrees: 1.0.2 -> 1.0.3
* [`c5898475`](NixOS/nixpkgs@c589847) viu: 1.1 -> 1.2.1 (NixOS/nixpkgs#103582)
* [`bc7a68ac`](NixOS/nixpkgs@bc7a68a) rpm-ostree: 2020.5 -> 2020.7
* [`8d8c115d`](NixOS/nixpkgs@8d8c115) inxi: 3.1.08-1 -> 3.1.09-1
* [`457d3469`](NixOS/nixpkgs@457d346) signal-cli: 0.6.10 -> 0.6.11
* [`aece293e`](NixOS/nixpkgs@aece293) gns3-{gui,server}: 2.2.15 -> 2.2.16
* [`39eadbb3`](NixOS/nixpkgs@39eadbb) kubernetes: 1.19.3 -> 1.19.4
* [`6b9f2326`](NixOS/nixpkgs@6b9f232) linuxPackages.wireguard: 1.0.20200908 -> 1.0.20201112
* [`d4205544`](NixOS/nixpkgs@d420554) gpxsee: 7.35 → 7.36
* [`03b9d34d`](NixOS/nixpkgs@03b9d34) batsignal: 1.1.3 -> 1.2.0
* [`8fbb662a`](NixOS/nixpkgs@8fbb662) gremlin-console: 3.3.4 -> 3.4.8
* [`0c01e11d`](NixOS/nixpkgs@0c01e11) bazarr: 0.9.0.5 -> 0.9.0.6
* [`47f576ca`](NixOS/nixpkgs@47f576c) k3b: remove qtwebkit dependency (NixOS/nixpkgs#103164)
* [`69683ddb`](NixOS/nixpkgs@69683dd) armadillo: 10.1.1 -> 10.1.2
* [`4117c0b7`](NixOS/nixpkgs@4117c0b) tor-browser-bundle-bin: Fix extension path.  Fixes NoScript.
* [`e580eacd`](NixOS/nixpkgs@e580eac) opencascade-occt: 7.4.0p1 -> 7.5.0
* [`f32beb31`](NixOS/nixpkgs@f32beb3) ayatana-ido: 0.8.0 -> 0.8.1
* [`e72ebfe7`](NixOS/nixpkgs@e72ebfe) python3Packages.bitstring: 3.1.5 -> 3.1.7
* [`9cb3292b`](NixOS/nixpkgs@9cb3292) xmenu: 4.3.1 -> 4.4.1
* [`db215ca0`](NixOS/nixpkgs@db215ca) linux_mptcp_94: remove (outdated)
* [`015939be`](NixOS/nixpkgs@015939b) linux_mptcp_5_9: MPTCP in upstream linux
* [`950cf2bc`](NixOS/nixpkgs@950cf2b) python3Packages.setuptools-rust: 0.11.4 -> 0.11.5
* [`1b5a1c69`](NixOS/nixpkgs@1b5a1c6) nixos/tests/postfix: migrate test to use tlsTrustedAuthorities
* [`5b44f469`](NixOS/nixpkgs@5b44f46) diffoscope: 160 -> 161
* [`02a1379d`](NixOS/nixpkgs@02a1379) EmptyEpsilon: 2020.08.07 -> 2020.08.25
* [`e7053a87`](NixOS/nixpkgs@e7053a8) evcxr: 0.5.3 -> 0.6.0
* [`f94859f1`](NixOS/nixpkgs@f94859f) epson-escpr2: 1.1.23 -> 1.1.24
* [`e19567ab`](NixOS/nixpkgs@e19567a) dino: 0.1.0 -> 0.2.0
* [`93095633`](NixOS/nixpkgs@9309563) postfix: add passthru tests
* [`c80ddf3b`](NixOS/nixpkgs@c80ddf3) makemkv: 1.15.2 -> 1.15.3
* [`f70ecb65`](NixOS/nixpkgs@f70ecb6) python3Packages.fastecdsa: init at 2.1.5
* [`8f4df972`](NixOS/nixpkgs@8f4df97) colord: 1.4.4 -> 1.4.5
* [`331e2376`](NixOS/nixpkgs@331e237) libplacebo: 2.72.0 -> 2.72.2
* [`9a7e4982`](NixOS/nixpkgs@9a7e498) klayout: 0.26.6 -> 0.26.8
* [`58a906a7`](NixOS/nixpkgs@58a906a) iverilog: unstable-2020-08-24 -> unstable-2020-10-24
* [`e80eeae6`](NixOS/nixpkgs@e80eeae) yosys: 2020.10.20 -> 0.9+3675 (new version scheme)
* [`bf094b11`](NixOS/nixpkgs@bf094b1) trellis: 2020.07.27 -> 2020.11.07
* [`a22061ad`](NixOS/nixpkgs@a22061a) nextpnr: 2020.08.22 -> 2020.11.10
* [`c1661fa7`](NixOS/nixpkgs@c1661fa) magic-vlsi: 8.3.5 -> 8.3.80, co-maintain
* [`b1680e3f`](NixOS/nixpkgs@b1680e3) gnomeExtensions.material-shell: 9 -> 10 (NixOS/nixpkgs#103628)
* [`2deeb58f`](NixOS/nixpkgs@2deeb58) soundtouch: 2.1.2 -> 2.2 (NixOS/nixpkgs#103382)
@KyleOndy KyleOndy mentioned this pull request Nov 16, 2020
Closed
@joepie91
Copy link
Contributor

joepie91 commented Dec 6, 2020

When will this land in 20.09? Currently k3b will simply not build/install.

@SuperSandro2000
Copy link
Member

When will this land in 20.09? Currently k3b will simply not build/install.

When someone has done a backport and merged it.

veprbl pushed a commit that referenced this pull request Dec 7, 2020
@bachp @veprbl
k3b: remove qtwebkit dependency (#103164)
015305b 
The dependeny is optional and k3b works without it.

(cherry picked from commit 47f576c)
@veprbl veprbl added the 8.has: port to stable A PR already has a backport to the stable release. label Dec 7, 2020
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

@svanderburg svanderburg Awaiting requested review from svanderburg

@Phreedom Phreedom Awaiting requested review from Phreedom

Assignees
No one assigned
Labels
6.topic: qt/kde 8.has: port to stable A PR already has a backport to the stable release. 10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@bachp @SuperSandro2000 @veprbl @joepie91