From d312d05e0e3f9539f24993895cee26e8a084b20b Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 10 Feb 2020 02:01:56 +0100 Subject: pkgs/psi: Update to latest upstream master Updating to latest master fixes one of the most annoying theming issue where the chat message input box text will turn black on dark background for my custom Qt theme. There are also quite a lot of fixes in master (which is still unreleased), which we want to have as well. Signed-off-by: aszlig --- pkgs/aszlig/psi/config.patch | 82 +++++++++++++++++----------------- pkgs/aszlig/psi/darkstyle.patch | 2 +- pkgs/aszlig/psi/default.nix | 10 ++--- pkgs/aszlig/psi/disable-xep-0232.patch | 6 +-- 4 files changed, 50 insertions(+), 50 deletions(-) (limited to 'pkgs/aszlig') diff --git a/pkgs/aszlig/psi/config.patch b/pkgs/aszlig/psi/config.patch index a9462102..a37276fd 100644 --- a/pkgs/aszlig/psi/config.patch +++ b/pkgs/aszlig/psi/config.patch @@ -1,5 +1,5 @@ diff --git a/options/default.xml b/options/default.xml -index 90f019b3..ef33997b 100644 +index 63fd2667..de3332ed 100644 --- a/options/default.xml +++ b/options/default.xml @@ -19,7 +19,7 @@ @@ -11,7 +11,7 @@ index 90f019b3..ef33997b 100644 false -@@ -86,7 +86,7 @@ +@@ -89,7 +89,7 @@ true @@ -20,7 +20,7 @@ index 90f019b3..ef33997b 100644 true -@@ -128,7 +128,7 @@ +@@ -135,7 +135,7 @@ QWidget#bottomFrame>QWidget>QTextEdit[correction="true"] { auto @@ -29,7 +29,7 @@ index 90f019b3..ef33997b 100644 -@@ -146,8 +146,8 @@ +@@ -153,8 +153,8 @@ QWidget#bottomFrame>QWidget>QTextEdit[correction="true"] { false 100 @@ -40,7 +40,7 @@ index 90f019b3..ef33997b 100644 -@@ -208,7 +208,7 @@ QLineEdit#le_status_text { +@@ -215,7 +215,7 @@ QLineEdit#le_status_text { false false true @@ -49,7 +49,7 @@ index 90f019b3..ef33997b 100644 status false true -@@ -223,7 +223,7 @@ QLineEdit#le_status_text { +@@ -230,7 +230,7 @@ QLineEdit#le_status_text { true true true @@ -58,7 +58,7 @@ index 90f019b3..ef33997b 100644 true true -@@ -248,7 +248,7 @@ QLineEdit#le_status_text { +@@ -255,7 +255,7 @@ QLineEdit#le_status_text { false false true @@ -67,7 +67,7 @@ index 90f019b3..ef33997b 100644 true 64 -@@ -285,7 +285,7 @@ QLineEdit#le_status_text { +@@ -292,7 +292,7 @@ QLineEdit#le_status_text { true
@@ -76,7 +76,7 @@ index 90f019b3..ef33997b 100644
true -@@ -335,7 +335,7 @@ QLineEdit#le_status_text { +@@ -343,7 +343,7 @@ QLineEdit#le_status_text { true false @@ -85,7 +85,7 @@ index 90f019b3..ef33997b 100644 false true -@@ -353,8 +353,8 @@ QLineEdit#le_status_text { +@@ -361,8 +361,8 @@ QLineEdit#le_status_text { @@ -96,7 +96,7 @@ index 90f019b3..ef33997b 100644 #969696 -@@ -364,16 +364,16 @@ QLineEdit#le_status_text { +@@ -372,16 +372,16 @@ QLineEdit#le_status_text { #004bb4 #7e0000 #646464 @@ -116,7 +116,7 @@ index 90f019b3..ef33997b 100644 -@@ -384,21 +384,21 @@ QLineEdit#le_status_text { +@@ -392,21 +392,21 @@ QLineEdit#le_status_text { Red #910000 @@ -143,7 +143,7 @@ index 90f019b3..ef33997b 100644 red grey -@@ -411,10 +411,10 @@ QLineEdit#le_status_text { +@@ -419,10 +419,10 @@ QLineEdit#le_status_text { false @@ -158,7 +158,7 @@ index 90f019b3..ef33997b 100644 -@@ -462,20 +462,20 @@ QLineEdit#le_status_text { +@@ -470,20 +470,20 @@ QLineEdit#le_status_text { false @@ -191,8 +191,8 @@ index 90f019b3..ef33997b 100644 + - false -@@ -494,7 +494,7 @@ QLineEdit#le_status_text { + true +@@ -502,7 +502,7 @@ QLineEdit#le_status_text { close detach @@ -201,7 +201,7 @@ index 90f019b3..ef33997b 100644 true -@@ -627,7 +627,7 @@ QLineEdit#le_status_text { +@@ -715,7 +715,7 @@ QLineEdit#le_status_text { true @@ -210,7 +210,7 @@ index 90f019b3..ef33997b 100644 false true true -@@ -650,7 +650,20 @@ QLineEdit#le_status_text { +@@ -738,7 +738,20 @@ QLineEdit#le_status_text { true false @@ -232,7 +232,7 @@ index 90f019b3..ef33997b 100644 submenu false true -@@ -690,5 +703,9 @@ QLineEdit#le_status_text { +@@ -778,5 +791,9 @@ QLineEdit#le_status_text { @@ -244,30 +244,30 @@ index 90f019b3..ef33997b 100644 + diff --git a/src/psi_profiles.cpp b/src/psi_profiles.cpp -index 77fbd169..4b4bca11 100644 +index 894c8ac9..a6798e76 100644 --- a/src/psi_profiles.cpp +++ b/src/psi_profiles.cpp -@@ -79,8 +79,8 @@ void UserAccount::reset() - req_mutual_auth = false; - legacy_ssl_probe = false; - security_level = QCA::SL_None; -- ssl = SSL_Auto; -- jid = ""; -+ ssl = SSL_Yes; -+ jid = "@jid@"; - pass = ""; - scramSaltedHashPassword = ""; - opt_pass = false; -@@ -90,7 +90,7 @@ void UserAccount::reset() - opt_automatic_resource = true; - priority_dep_on_status = true; - ignore_global_actions = false; -- resource = ApplicationInfo::name(); -+ resource = "@resource@"; - priority = 55; - ibbOnly = false; - opt_keepAlive = true; -@@ -133,7 +133,7 @@ void UserAccount::reset() +@@ -75,8 +75,8 @@ void UserAccount::reset() + req_mutual_auth = false; + legacy_ssl_probe = false; + security_level = QCA::SL_None; +- ssl = SSL_Auto; +- jid = ""; ++ ssl = SSL_Yes; ++ jid = "@jid@"; + pass = ""; + scramSaltedHashPassword = ""; + opt_pass = false; +@@ -86,7 +86,7 @@ void UserAccount::reset() + opt_automatic_resource = true; + priority_dep_on_status = true; + ignore_global_actions = false; +- resource = ApplicationInfo::name(); ++ resource = "@resource@"; + priority = 55; + ibbOnly = false; + opt_keepAlive = true; +@@ -129,7 +129,7 @@ void UserAccount::reset() << "stun.voipbuster.com" << "stun.voxgratia.org"; diff --git a/pkgs/aszlig/psi/darkstyle.patch b/pkgs/aszlig/psi/darkstyle.patch index 45c5067f..4e3a1296 100644 --- a/pkgs/aszlig/psi/darkstyle.patch +++ b/pkgs/aszlig/psi/darkstyle.patch @@ -5,7 +5,7 @@ index 7118ea75..c6f58e35 100644 @@ -237,6 +237,7 @@ endif() set(RESOURCES ${PROJECT_SOURCE_DIR}/psi.qrc - ${PROJECT_SOURCE_DIR}/iconsets.qrc + ${ICONSETSQRC_OUTPUT_FILE} + ${QDARKSTYLE_PATH}/qdarkstyle/style.qrc ) qt5_add_resources(QRC_SOURCES ${RESOURCES}) diff --git a/pkgs/aszlig/psi/default.nix b/pkgs/aszlig/psi/default.nix index d0e24c05..3d7e4c38 100644 --- a/pkgs/aszlig/psi/default.nix +++ b/pkgs/aszlig/psi/default.nix @@ -18,21 +18,21 @@ let in stdenv.mkDerivation rec { name = "psi-${version}"; - version = "2.0git20190922aszlig"; + version = "2.0git20200208aszlig"; src = fetchFromGitHub { owner = "psi-im"; repo = "psi"; - rev = "af26ce1c04207d384a05ea530d571068310957c6"; - sha256 = "0pxd4ha391mfmsa7n7ag5kqw0nv825wsnkyfxi8wsa942bnbircg"; + rev = "f1ca4cc0d45d0c1981fd2abd5da40182bbd8c5fb"; + sha256 = "170g3dlpd8hp9g4j4y28l8y2xhgsmfay4m7dknvd9vanxd7s42ks"; fetchSubmodules = true; }; plugins = fetchFromGitHub { owner = "psi-im"; repo = "plugins"; - rev = "5574afcc8ab4c5647831d38be111976fb1fa10d3"; - sha256 = "1h011j94iy40ksiqlprjamfyv7irql502hhhb0mpabk4mndxmjgn"; + rev = "5dc21909fc46c4780e1f4d23c56bf4be94802912"; + sha256 = "0bxlsmwisc22m8y0py1ms69fyqspyx1a1zcjh6m51c4vmzskfr7a"; }; patches = [ diff --git a/pkgs/aszlig/psi/disable-xep-0232.patch b/pkgs/aszlig/psi/disable-xep-0232.patch index 4788d262..80c8a385 100644 --- a/pkgs/aszlig/psi/disable-xep-0232.patch +++ b/pkgs/aszlig/psi/disable-xep-0232.patch @@ -1,13 +1,13 @@ diff --git a/iris/src/xmpp/xmpp-im/client.cpp b/iris/src/xmpp/xmpp-im/client.cpp -index d8573bf..31af799 100644 +index 66960b0..c8edd75 100644 --- a/iris/src/xmpp/xmpp-im/client.cpp +++ b/iris/src/xmpp/xmpp-im/client.cpp -@@ -1257,45 +1257,6 @@ DiscoItem Client::makeDiscoResult(const QString &node) const +@@ -1131,45 +1131,6 @@ DiscoItem Client::makeDiscoResult(const QString &node) const item.setFeatures(features); - // xep-0232 Software Information -- XData si; +- XData si; - XData::FieldList si_fields; - - XData::Field si_type_field; -- cgit 1.4.1