JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #104474 from doronbehar/pkg/qt515/qtwebkit

Browse Source 
qt515.qtwebkit: unbreak
This commit is contained in:
Thomas Tuegel 2020-12-11 05:43:59 -06:00 committed by GitHub
commit e772531ce8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 72 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/applications/audio/clementine/default.nix
View File

@ -10,6 +10,7 @@ let
withCD = config.clementine.cd or true;
withCloud = config.clementine.cloud or true;
# On the update after all 1.4rc, qt5.15 will be supported.
version = "1.4.0rc1";
src = fetchFromGitHub {

6
pkgs/applications/graphics/ktikz/default.nix
View File

@ -31,10 +31,16 @@ stdenv.mkDerivation rec {
};
patches = [
# Fix version in qtikz.pro
(fetchpatch {
url = "https://github.com/fhackenberger/ktikz/commit/972685a406517bb85eb561f2c8e26f029eacd7db.patch";
sha256 = "13z40rcd4m4n088v7z2ns17lnpn0z3rzp31lsamic3qdcwjwa5k8";
})
# Fix missing qt5.15 QPainterPath include
(fetchpatch {
url = "https://github.com/fhackenberger/ktikz/commit/ebe4dfb72ac8a137b475ef688b9f7ac3e5c7f242.patch";
sha256 = "GIgPh+iUBPftHKIpZR3a0FxmLhMLuPUapF/t+bCuqMs=";
})
];
nativeBuildInputs = [ pkgconfig qttools qmake wrapQtAppsHook ];

18
pkgs/applications/networking/irc/konversation/default.nix
View File

@ -28,25 +28,15 @@
, phonon
}:
let
mkDerivation rec {
pname = "konversation";
version = "1.7.5";
in mkDerivation rec {
name = "${pname}-${version}";
version = "1.7.7";
src = fetchurl {
url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
sha256 = "0h098yhlp36ls6pdvs2r93ig8dv4fys62m0h6wxccprb0qrpbgv0";
url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz";
sha256 = "R+wWHBOFmBqLmdKMQZ6Iskgj3AG2j7FiOJSBiXTCGKc=";
};
patches = [
# Delete this patch for konversation > 1.7.5
(fetchpatch {
url = "https://cgit.kde.org/konversation.git/patch/?id=4d0036617becc26a76fd021138c98aceec4c7b53";
sha256 = "17hdj6zyln3n93b71by26mrwbgyh4k052ck5iw1drysx5dyd5l6y";
})
];
buildInputs = [
kbookmarks
karchive

7
pkgs/applications/video/vlc/default.nix
View File

@ -32,6 +32,12 @@ stdenv.mkDerivation rec {
sha256 = "1f46h0hv7fk35zg4iczlp7ib7h2jmh8m4r5klw3g2558ib9134qq";
};
patches = [
# Couldn't find an upstream version of this patch
# https://build.opensuse.org/package/view_file/openSUSE:Factory/vlc/fix-missing-includes-with-qt-5.15.patch?expand=1
./fix-missing-includes-with-qt-5.15.patch
];
# VLC uses a *ton* of libraries for various pieces of functionality, many of
# which are not included here for no other reason that nobody has mentioned
# needing them
@ -99,6 +105,5 @@ stdenv.mkDerivation rec {
homepage = "http://www.videolan.org/vlc/";
license = licenses.lgpl21Plus;
platforms = platforms.linux;
broken = if qtbase != null then versionAtLeast qtbase.version "5.15" else false;
};
}

37
pkgs/applications/video/vlc/fix-missing-includes-with-qt-5.15.patch Normal file
View File

@ -0,0 +1,37 @@
Index: vlc-3.0.8/modules/gui/qt/util/timetooltip.hpp
===================================================================
--- vlc-3.0.8.orig/modules/gui/qt/util/timetooltip.hpp
+++ vlc-3.0.8/modules/gui/qt/util/timetooltip.hpp
@@ -25,6 +25,7 @@
#include "qt.hpp"
#include <QWidget>
+#include <QPainterPath>
class TimeTooltip : public QWidget
{
Index: vlc-3.0.8/modules/gui/qt/components/playlist/views.cpp
===================================================================
--- vlc-3.0.8.orig/modules/gui/qt/components/playlist/views.cpp
+++ vlc-3.0.8/modules/gui/qt/components/playlist/views.cpp
@@ -27,6 +27,7 @@
#include "input_manager.hpp" /* THEMIM */
#include <QPainter>
+#include <QPainterPath>
#include <QRect>
#include <QStyleOptionViewItem>
#include <QFontMetrics>
Index: vlc-3.0.8/modules/gui/qt/dialogs/plugins.cpp
===================================================================
--- vlc-3.0.8.orig/modules/gui/qt/dialogs/plugins.cpp
+++ vlc-3.0.8/modules/gui/qt/dialogs/plugins.cpp
@@ -53,6 +53,7 @@
#include <QListView>
#include <QListWidget>
#include <QPainter>
+#include <QPainterPath>
#include <QStyleOptionViewItem>
#include <QKeyEvent>
#include <QPushButton>

16
pkgs/development/libraries/qt-5/5.15/default.nix
View File

@ -88,11 +88,17 @@ let
})
]
++ optional stdenv.isDarwin ./qtwebengine-darwin-no-platform-check.patch;
qtwebkit = [ ./qtwebkit.patch ]
++ optionals stdenv.isDarwin [
./qtwebkit-darwin-no-readline.patch
./qtwebkit-darwin-no-qos-classes.patch
];
qtwebkit = [
(fetchpatch {
name = "qtwebkit-bison-3.7-build.patch";
url = "https://github.com/qtwebkit/qtwebkit/commit/d92b11fea65364fefa700249bd3340e0cd4c5b31.patch";
sha256 = "0h8ymfnwgkjkwaankr3iifiscsvngqpwb91yygndx344qdiw9y0n";
})
./qtwebkit.patch
] ++ optionals stdenv.isDarwin [
./qtwebkit-darwin-no-readline.patch
./qtwebkit-darwin-no-qos-classes.patch
];
qttools = [ ./qttools.patch ];
};

1
pkgs/development/libraries/qt-5/modules/qtwebkit.nix
View File

@ -72,7 +72,6 @@ qtModule {
preFixup = ''rm -rf "$(pwd)" && mkdir "$(pwd)" '';
meta = {
broken = lib.versionAtLeast qtbase.version "5.15";
maintainers = with stdenv.lib.maintainers; [ abbradar periklis ];
};
}

14
pkgs/top-level/all-packages.nix
View File

@ -242,6 +242,7 @@ in
archiver = callPackage ../applications/misc/archiver { };
# It segfaults if it uses qt5.15
digitalbitbox = libsForQt514.callPackage ../applications/misc/digitalbitbox { };
gretl = callPackage ../applications/science/math/gretl { };
@ -5999,7 +6000,7 @@ in
inherit (callPackage ../servers/nextcloud {})
nextcloud17 nextcloud18 nextcloud19 nextcloud20;
nextcloud-client = libsForQt514.callPackage ../applications/networking/nextcloud-client { };
nextcloud-client = libsForQt5.callPackage ../applications/networking/nextcloud-client { };
nextcloud-news-updater = callPackage ../servers/nextcloud/news-updater.nix { };
@ -6822,7 +6823,7 @@ in
qr-filetransfer = callPackage ../tools/networking/qr-filetransfer { };
qtikz = libsForQt514.callPackage ../applications/graphics/ktikz { };
qtikz = libsForQt5.callPackage ../applications/graphics/ktikz { };
quickjs = callPackage ../development/interpreters/quickjs { };
@ -22288,14 +22289,13 @@ in
kmplayer = libsForQt5.callPackage ../applications/video/kmplayer { };
# Pinned to qt5.14 due to kdewebkit (depends on qtwebkit) which is currently broken with qt5.15
kmymoney = libsForQt514.callPackage ../applications/office/kmymoney { };
kmymoney = libsForQt5.callPackage ../applications/office/kmymoney { };
kodestudio = callPackage ../applications/editors/kodestudio { };
kondo = callPackage ../applications/misc/kondo { };
konversation = libsForQt514.callPackage ../applications/networking/irc/konversation { };
konversation = libsForQt5.callPackage ../applications/networking/irc/konversation { };
kotatogram-desktop = libsForQt514.callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop { };
@ -23604,7 +23604,7 @@ in
qsstv = qt5.callPackage ../applications/radio/qsstv { };
qsyncthingtray = libsForQt514.callPackage ../applications/misc/qsyncthingtray { };
qsyncthingtray = libsForQt5.callPackage ../applications/misc/qsyncthingtray { };
qstopmotion = libsForQt5.callPackage ../applications/video/qstopmotion {
guvcview = guvcview.override {
@ -24606,7 +24606,7 @@ in
vkeybd = callPackage ../applications/audio/vkeybd {};
vlc = libsForQt514.callPackage ../applications/video/vlc {};
vlc = libsForQt5.callPackage ../applications/video/vlc {};
vlc_qt5 = vlc;