From 983465f13a42075925f78c69950b79d4e41397b5 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 13 Nov 2020 09:36:54 +0200 Subject: [PATCH 1/9] qt515.qtwebkit: unbreak :tada: A copy of #96309 essentially - fix the build of it with bison-3.7. --- pkgs/development/libraries/qt-5/5.15/default.nix | 16 +++++++++++----- .../libraries/qt-5/modules/qtwebkit.nix | 1 - 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index b4e3d681c749..b4486bf025d7 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -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 ]; }; diff --git a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix index b31e57f38065..3d9e72bb54fa 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix @@ -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 ]; }; } From 7e3d216725f154ad76102c13b1830f9f18ad6d42 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 13 Nov 2020 09:04:34 +0200 Subject: [PATCH 2/9] nextcloud-client: use qt5.15 It segfaults with qt5.14. --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a7cff959dcfe..ba8b1d52e680 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5909,7 +5909,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 { }; From a942b8d4965afa4a79a4148242ae782ddddc7c82 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 13 Nov 2020 11:01:16 +0200 Subject: [PATCH 3/9] kmymoney: Use qt5.15 (with unbroken qt515.qtwebkit) --- pkgs/top-level/all-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ba8b1d52e680..f526cf245848 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21986,8 +21986,7 @@ 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 { }; From 4688540ba99e004299a75843b940280ef6c7b3bd Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 20 Nov 2020 13:39:21 +0200 Subject: [PATCH 4/9] konversation: 1.7.5 -> 1.7.7 --- .../networking/irc/konversation/default.nix | 18 ++++-------------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/networking/irc/konversation/default.nix b/pkgs/applications/networking/irc/konversation/default.nix index 2890deccb800..3c80ef09aaf7 100644 --- a/pkgs/applications/networking/irc/konversation/default.nix +++ b/pkgs/applications/networking/irc/konversation/default.nix @@ -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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f526cf245848..49c1cb99282b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21992,7 +21992,7 @@ in 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 { }; From 496222a7d9d84365ba56576637a5eb461283a3ca Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 13 Nov 2020 09:04:14 +0200 Subject: [PATCH 5/9] digitalbitbox: mention that it segfaults with qt5.15 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 49c1cb99282b..ac145363c65e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -234,6 +234,7 @@ in archiver = callPackage ../applications/misc/archiver { }; + # It segfaults if it uses qt5.15 digitalbitbox = libsForQt514.callPackage ../applications/misc/digitalbitbox { }; grsync = callPackage ../applications/misc/grsync { }; From 1b04eac101f24015fc787bf4341a885e0216f74e Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 13 Nov 2020 09:03:57 +0200 Subject: [PATCH 6/9] clementine: comment it should support qt5.15 on next update --- pkgs/applications/audio/clementine/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index 0c1690f1462a..d9d1a11ce1db 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -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 { From 5ab7eaa96d5f46c94e8e309b5de8ce119bc8b423 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 21 Nov 2020 11:17:32 +0200 Subject: [PATCH 7/9] vlc: Use qt515 (add QPainterPath patch from OpenSUSE) --- pkgs/applications/video/vlc/default.nix | 7 +++- .../fix-missing-includes-with-qt-5.15.patch | 37 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 pkgs/applications/video/vlc/fix-missing-includes-with-qt-5.15.patch diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 58df85332ea0..1c52a89e98d4 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -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; }; } diff --git a/pkgs/applications/video/vlc/fix-missing-includes-with-qt-5.15.patch b/pkgs/applications/video/vlc/fix-missing-includes-with-qt-5.15.patch new file mode 100644 index 000000000000..d980fd2f6da8 --- /dev/null +++ b/pkgs/applications/video/vlc/fix-missing-includes-with-qt-5.15.patch @@ -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 ++#include + + 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 ++#include + #include + #include + #include +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 + #include + #include ++#include + #include + #include + #include + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ac145363c65e..7c2a71aa09e6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24291,7 +24291,7 @@ in vkeybd = callPackage ../applications/audio/vkeybd {}; - vlc = libsForQt514.callPackage ../applications/video/vlc {}; + vlc = libsForQt5.callPackage ../applications/video/vlc {}; vlc_qt5 = vlc; From 4180a96e52161af3364709a1e2bf8b91fe92dc26 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 21 Nov 2020 11:29:19 +0200 Subject: [PATCH 8/9] qtikz: Use qt5.15 (Add QPainterPath patch) --- pkgs/applications/graphics/ktikz/default.nix | 6 ++++++ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/ktikz/default.nix b/pkgs/applications/graphics/ktikz/default.nix index f817a3321606..d0d9f100878f 100644 --- a/pkgs/applications/graphics/ktikz/default.nix +++ b/pkgs/applications/graphics/ktikz/default.nix @@ -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 ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7c2a71aa09e6..6459f07ff5bc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6727,7 +6727,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 { }; From 77f5eacf9d523a0d261905e2b29bbf66c4e9ef62 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 22 Nov 2020 23:42:45 +0200 Subject: [PATCH 9/9] qsyncthingtray: use qt515 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6459f07ff5bc..f0a95dc7dda9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23292,7 +23292,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 {