From 3adc86b87d1cde8e1d7e0a927019456283769aa0 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 22 Jan 2025 20:32:00 +0100 Subject: [PATCH] lomiri.morph-browser: 1.1.1 -> 1.1.2 --- ...ace-wait-and-compare-with-tryCompare.patch | 196 ------------------ .../applications/morph-browser/default.nix | 19 +- 2 files changed, 3 insertions(+), 212 deletions(-) delete mode 100644 pkgs/desktops/lomiri/applications/morph-browser/1001-morph-browser-tst_AddressBar-Replace-wait-and-compare-with-tryCompare.patch diff --git a/pkgs/desktops/lomiri/applications/morph-browser/1001-morph-browser-tst_AddressBar-Replace-wait-and-compare-with-tryCompare.patch b/pkgs/desktops/lomiri/applications/morph-browser/1001-morph-browser-tst_AddressBar-Replace-wait-and-compare-with-tryCompare.patch deleted file mode 100644 index 72c27c3e0e29..000000000000 --- a/pkgs/desktops/lomiri/applications/morph-browser/1001-morph-browser-tst_AddressBar-Replace-wait-and-compare-with-tryCompare.patch +++ /dev/null @@ -1,196 +0,0 @@ -From 9c4cd4fa938244cc2e319555d372e4e32029964a Mon Sep 17 00:00:00 2001 -From: OPNA2608 -Date: Tue, 14 Jan 2025 23:06:20 +0100 -Subject: [PATCH] tests/unittests/qml/tst_AddressBar.qml: Replace wait + - compare with tryCompare - ---- - tests/unittests/qml/tst_AddressBar.qml | 75 +++++++++++--------------- - 1 file changed, 30 insertions(+), 45 deletions(-) - -diff --git a/tests/unittests/qml/tst_AddressBar.qml b/tests/unittests/qml/tst_AddressBar.qml -index 5c27acff..dc0ec4c6 100644 ---- a/tests/unittests/qml/tst_AddressBar.qml -+++ b/tests/unittests/qml/tst_AddressBar.qml -@@ -73,6 +73,15 @@ Item { - name: "AddressBar" - when: windowShown - -+ function verifyAddressBarText(text) { -+ tryCompare(addressBar, "text", text) -+ } -+ -+ function typeStringAndVerify(text) { -+ typeString(text) -+ verifyAddressBarText(text) -+ } -+ - function init() { - addressBar.actualUrl = "" - validatedSpy.clear() -@@ -101,9 +110,7 @@ Item { - } - - function test_validUrlShouldNotBeRewritten(data) { -- typeString(data.url) -- wait(500) -- compare(addressBar.text, data.url) -+ typeStringAndVerify(data.url) - keyClick(Qt.Key_Return) - validatedSpy.wait() - compare(addressBar.requestedUrl, data.url) -@@ -120,9 +127,7 @@ Item { - } - - function test_urlWithoutSchemeShouldBeRewritten(data) { -- typeString(data.text) -- wait(500) -- compare(addressBar.text, data.text) -+ typeStringAndVerify(data.text) - keyClick(Qt.Key_Return) - validatedSpy.wait() - compare(addressBar.requestedUrl, data.requestedUrl) -@@ -137,9 +142,7 @@ Item { - } - - function test_leadingAndTrailingWhitespacesShouldBeTrimmed(data) { -- typeString(data.text) -- wait(500) -- compare(addressBar.text, data.text) -+ typeStringAndVerify(data.text) - keyClick(Qt.Key_Return) - validatedSpy.wait() - compare(addressBar.requestedUrl, data.requestedUrl) -@@ -153,9 +156,7 @@ Item { - } - - function test_searchQueryShouldBeRewritten(data) { -- typeString(data.text) -- wait(500) -- compare(addressBar.text, data.text) -+ typeStringAndVerify(data.text) - keyClick(Qt.Key_Return) - validatedSpy.wait() - compare(addressBar.requestedUrl.toString().indexOf(data.start), 0) -@@ -174,9 +175,7 @@ Item { - } - - function test_htmlEntitiesShouldBeEscapedInSearchQueries(data) { -- typeString(data.text) -- wait(500) -- compare(addressBar.text, data.text) -+ typeStringAndVerify(data.text) - keyClick(Qt.Key_Return) - validatedSpy.wait() - verify(addressBar.requestedUrl.toString().indexOf("q=" + data.escaped) > 0) -@@ -191,9 +190,7 @@ Item { - } - - function test_uppercaseDomainsShouldBeRewritten(data) { -- typeString(data.text) -- wait(500) -- compare(addressBar.text, data.text) -+ typeStringAndVerify(data.text) - keyClick(Qt.Key_Return) - validatedSpy.wait() - compare(addressBar.requestedUrl, data.requestedUrl) -@@ -213,9 +210,7 @@ Item { - } - - function test_uppercaseSchemeShouldBeRewritten(data) { -- typeString(data.text) -- wait(500) -- compare(addressBar.text, data.text) -+ typeStringAndVerify(data.text) - keyClick(Qt.Key_Return) - validatedSpy.wait() - compare(addressBar.requestedUrl, data.requestedUrl) -@@ -266,9 +261,7 @@ Item { - } - - function test_urlShouldBeSimplifiedWhenUnfocused(data) { -- typeString(data.input) -- wait(500) -- compare(addressBar.text, data.input) -+ typeStringAndVerify(data.input) - keyClick(Qt.Key_Return) - validatedSpy.wait() - addressBar.actualUrl = addressBar.requestedUrl -@@ -289,9 +282,7 @@ Item { - - function test_clickingWhenUnfocusedShouldSelectAll() { - var url = "http://example.org/" -- typeString(url) -- wait(500) -- compare(addressBar.text, url) -+ typeStringAndVerify(url) - addressBar.actualUrl = url - clickItem(textInput) - verify(!addressBar.activeFocus) -@@ -301,9 +292,7 @@ Item { - - function test_clickingWhenFocusedShouldDeselectText() { - var url = "http://example.org/" -- typeString(url) -- wait(500) -- compare(addressBar.text, url) -+ typeStringAndVerify(url) - addressBar.actualUrl = url - clickItem(textInput) - verify(!addressBar.activeFocus) -@@ -316,9 +305,7 @@ Item { - - function test_clickingActionButtonWhenUnfocusedShouldNotSelectAll() { - var url = "http://example.org/" -- typeString(url) -- wait(500) -- compare(addressBar.text, url) -+ typeStringAndVerify(url) - clickItem(textInput) - verify(!addressBar.activeFocus) - clickItem(addressBar.__actionButton) -@@ -355,31 +342,29 @@ Item { - } - - function test_unfocusingWhileEditingShouldResetUrl() { -- var url = "http://example.org/" -- typeString(url) -- wait(500) -- compare(addressBar.text, url) -+ var host = "example.org" -+ var url = "http://" + host + "/" -+ typeStringAndVerify(url) - addressBar.actualUrl = url - var clearButton = findChild(addressBar, "clear_button") - verify(clearButton != null) - clickItem(clearButton) -- compare(addressBar.text, "") -+ verifyAddressBarText("") - clickItem(textInput) -- compare(addressBar.text, "example.org") -+ verifyAddressBarText(host) - clickItem(addressBar) -- compare(addressBar.text, url) -+ verifyAddressBarText(url) - } - - function test_exitingFindInPageRestoresUrl() { -- addressBar.actualUrl = "http://example.org/" -+ var host = "example.org" -+ addressBar.actualUrl = "http://" + host + "/" - addressBar.findInPageMode = true - verify(addressBar.activeFocus) - compare(addressBar.text, "") -- typeString("hello") -- wait(500) -+ typeStringAndVerify("hello") - addressBar.findInPageMode = false -- wait(500) -- compare(addressBar.text, "example.org") -+ verifyAddressBarText(host) - } - } - } --- -2.47.0 - diff --git a/pkgs/desktops/lomiri/applications/morph-browser/default.nix b/pkgs/desktops/lomiri/applications/morph-browser/default.nix index b1502dff2f84..9e273d032ce1 100644 --- a/pkgs/desktops/lomiri/applications/morph-browser/default.nix +++ b/pkgs/desktops/lomiri/applications/morph-browser/default.nix @@ -2,7 +2,6 @@ stdenv, lib, fetchFromGitLab, - fetchpatch, gitUpdater, nixosTests, cmake, @@ -30,13 +29,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "morph-browser"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/morph-browser"; - rev = finalAttrs.version; - hash = "sha256-VxSADFTlaxQUDc81TzGkx54mjAUgY2L+suQC9zYGKo0="; + tag = finalAttrs.version; + hash = "sha256-CW+8HEGxeDDfqbBtNHDKTvsZkbu0tCmD6OEDW07KG2k="; }; outputs = [ @@ -44,18 +43,6 @@ stdenv.mkDerivation (finalAttrs: { "doc" ]; - patches = [ - # Remove when version > 1.1.1 - (fetchpatch { - name = "0002-morph-browser-Call-i18n-bindtextdomain-with-buildtime-determined-locale-path.patch"; - url = "https://gitlab.com/ubports/development/core/morph-browser/-/commit/3d9777fdc7d5b302a9f17679e4ea125e94468772.patch"; - hash = "sha256-zx/pP72uNqAi8TZR4bKeONuqcJyK/vGtPglTA+5R5no="; - }) - - # Remove when https://gitlab.com/ubports/development/core/morph-browser/-/merge_requests/589 merged & in release - ./1001-morph-browser-tst_AddressBar-Replace-wait-and-compare-with-tryCompare.patch - ]; - postPatch = '' substituteInPlace src/{Morph,Ubuntu}/CMakeLists.txt \