Unverified Commit 3af6e7dc authored by Nick Cao's avatar Nick Cao Committed by GitHub
Browse files

Merge pull request #224469 from NickCao/qt65 

qt6: 6.4.3 -> 6.5.0
parents afd261b8 19f2603c

pkgs/applications/editors/texworks/0001-fix-build-with-qt-6.5.patch

0 → 100644
+26 −0
Original line number Diff line number Diff line 
From b26a91fd0f70e8f0a8f3360a5f371a1eace70002 Mon Sep 17 00:00:00 2001

From: Nick Cao <nickcao@nichi.co>

Date: Sun, 16 Apr 2023 22:10:55 +0800

Subject: [PATCH] fix build with qt 6.5



The fix is borrowed from https://github.com/hluk/CopyQ/pull/2324

---

 src/scripting/Script.cpp | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)



diff --git a/src/scripting/Script.cpp b/src/scripting/Script.cpp

index 3437f125..906eefde 100644

--- a/src/scripting/Script.cpp

+++ b/src/scripting/Script.cpp

@@ -352,7 +352,7 @@ Script::MethodResult Script::doCallMethod(QObject * obj, const QString& name,

 		}

 		else if (typeName == QString::fromLatin1("QVariant")) {

 			// QMetaType can't construct QVariant objects

-			retValArg = Q_RETURN_ARG(QVariant, result);

+			retValArg = QGenericReturnArgument("QVariant", static_cast<void*>(result.data()));

 		}

 		else {

 			// Note: These two lines are a hack!

-- 

2.39.2

pkgs/applications/editors/texworks/default.nix

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ stdenv.mkDerivation rec { 
    sha256 = "sha256-X0VuXNghHoNsNNDfZJXXJ++nfUa5ofjW8rv3CHOUzxQ=";

  };



  patches = [ ./0001-fix-build-with-qt-6.5.patch ];



  nativeBuildInputs = [

    cmake

    pkg-config

pkgs/applications/misc/copyq/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -17,13 +17,13 @@ 


stdenv.mkDerivation rec {

  pname = "CopyQ";

  version = "7.0.0";

  version = "unstable-2023-04-14";



  src = fetchFromGitHub {

    owner = "hluk";

    repo = "CopyQ";

    rev = "v${version}";

    hash = "sha256-Wk1kTbL6LYgs1edazU39LlNZMAAm6wDbEPjuXvb5EkE=";

    rev = "c4e481315be5a1fa35503c9717b396319b43aa9b";

    hash = "sha256-XLuawTKzDi+ixEUcsllyW5tCVTPlzIozu1UzYOjTqDU=";

  };



  nativeBuildInputs = [

pkgs/applications/misc/mediaelch/default.nix

+10 −0
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchFromGitHub

, fetchpatch



, cmake

, qttools
@@ -33,6 +34,15 @@ stdenv.mkDerivation rec { 
    fetchSubmodules = true;

  };



  patches = [

    # https://github.com/Komet/MediaElch/issues/1557

    # build: Fix build issue with Qt 6.5 on macOS (also other platforms)

    (fetchpatch {

      url = "https://github.com/Komet/MediaElch/commit/872b21decf95d70073400bedbe1ad183a8267791.patch";

      hash = "sha256-D1Ui5xg5cpvNX4IHfXQ7wN9I7Y3SuPFOWxWidcAlLEA=";

    })

  ];



  nativeBuildInputs = [

    cmake

    qttools

pkgs/applications/networking/instant-messengers/jami/0001-fix-annotations-in-bin-dbus-cx.ring.Ring.CallManager.patch

0 → 100644
+52 −0
Original line number Diff line number Diff line 
From f60e38b394c55e709cba2c0839c1fbba2fd8a1d2 Mon Sep 17 00:00:00 2001

From: Nick Cao <nickcao@nichi.co>

Date: Sun, 16 Apr 2023 21:56:06 +0800

Subject: [PATCH] fix annotations in bin/dbus/cx.ring.Ring.CallManager.xml



---

 bin/dbus/cx.ring.Ring.CallManager.xml | 8 ++++----

 1 file changed, 4 insertions(+), 4 deletions(-)



diff --git a/bin/dbus/cx.ring.Ring.CallManager.xml b/bin/dbus/cx.ring.Ring.CallManager.xml

index 8c5732f30..4228fcad2 100644

--- a/bin/dbus/cx.ring.Ring.CallManager.xml

+++ b/bin/dbus/cx.ring.Ring.CallManager.xml

@@ -87,7 +87,7 @@

             <tp:docstring>

               Once enabled using the startSmartInfo method, this signal is emitted every refreshTimeMS

             </tp:docstring>

-             <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="MapStringString"/>

+             <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="MapStringString"/>

              <arg type="a{ss}" name="info" direction="out" />

        </signal>

 

@@ -761,7 +761,7 @@

                 The caller phone number.

               </tp:docstring>

             </arg>

-            <annotation name="org.qtproject.QtDBus.QtTypeName.In3" value="VectorMapStringString"/>

+            <annotation name="org.qtproject.QtDBus.QtTypeName.Out3" value="VectorMapStringString"/>

             <arg type="aa{ss}" name="mediaList">

               <tp:docstring>

                 The list of media offered in the incoming call.

@@ -791,7 +791,7 @@

                 Call ID of the incoming call.

               </tp:docstring>

             </arg>

-            <annotation name="org.qtproject.QtDBus.QtTypeName.In2" value="VectorMapStringString"/>

+            <annotation name="org.qtproject.QtDBus.QtTypeName.Out2" value="VectorMapStringString"/>

             <arg type="aa{ss}" name="mediaList">

               <tp:docstring>

                 The list of media offered in the incoming call.

@@ -807,7 +807,7 @@

             <arg type="s" name="accountId" />

             <arg type="s" name="callId" />

             <arg type="s" name="from" />

-            <annotation name="org.qtproject.QtDBus.QtTypeName.In3" value="MapStringString"/>

+            <annotation name="org.qtproject.QtDBus.QtTypeName.Out3" value="MapStringString"/>

             <arg type="a{ss}" name="messages" />

         </signal>

 

-- 

2.39.2