diff --git a/x11-packages/cinnamon/0011-disable-virtualkeyboard.patch b/x11-packages/cinnamon/0011-disable-virtualkeyboard.patch index a312f979817..a3ee57e9a73 100644 --- a/x11-packages/cinnamon/0011-disable-virtualkeyboard.patch +++ b/x11-packages/cinnamon/0011-disable-virtualkeyboard.patch @@ -1,8 +1,45 @@ +diff --git a/js/ui/ibusCandidatePopup.js b/js/ui/ibusCandidatePopup.js +index c4048e3..7f0dedb 100644 +--- a/js/ui/ibusCandidatePopup.js ++++ b/js/ui/ibusCandidatePopup.js +@@ -260,12 +260,12 @@ class IbusCandidatePopup extends BoxPointer.BoxPointer { + for (let i = 0; (indexLabel = lookupTable.get_label(i)); ++i) + indexes.push(indexLabel.get_text()); + +- Main.virtualKeyboardManager.resetSuggestions(); ++ if (Main.virtualKeyboardManager) Main.virtualKeyboardManager.resetSuggestions(); + + let candidates = []; + for (let i = startIndex; i < endIndex; ++i) { + candidates.push(lookupTable.get_candidate(i).get_text()); +- Main.virtualKeyboardManager.addSuggestion(lookupTable.get_candidate(i).get_text(), () => { ++ if (Main.virtualKeyboardManager) Main.virtualKeyboardManager.addSuggestion(lookupTable.get_candidate(i).get_text(), () => { + let index = i; + this._panelService.candidate_clicked(index, 1, 0); + }); +@@ -288,7 +288,7 @@ class IbusCandidatePopup extends BoxPointer.BoxPointer { + }); + panelService.connect('focus-out', () => { + this.close(BoxPointer.PopupAnimation.NONE); +- Main.virtualKeyboardManager.resetSuggestions(); ++ if (Main.virtualKeyboardManager) Main.virtualKeyboardManager.resetSuggestions(); + }); + } + +@@ -301,7 +301,7 @@ class IbusCandidatePopup extends BoxPointer.BoxPointer { + } + + _updateVisibility() { +- let isVisible = !Main.virtualKeyboardManager.visible && ++ let isVisible = !(Main.virtualKeyboardManager && Main.virtualKeyboardManager.visible) && + (this._preeditText.visible || + this._auxText.visible || + this._candidateArea.visible); diff --git a/js/ui/main.js b/js/ui/main.js -index 1b1069e..d640b53 100644 +index e5f8daa..1b9077e 100644 --- a/js/ui/main.js +++ b/js/ui/main.js -@@ -97,7 +97,7 @@ var AppletManager = imports.ui.appletManager; +@@ -100,7 +100,7 @@ var AppletManager = imports.ui.appletManager; const SearchProviderManager = imports.ui.searchProviderManager; const DeskletManager = imports.ui.deskletManager; const ExtensionSystem = imports.ui.extensionSystem; @@ -42,7 +79,7 @@ index 1b1069e..d640b53 100644 Promise.all([ AppletManager.init(), diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js -index a12bcbb..1262d6d 100644 +index 495a01f..3b48b76 100644 --- a/js/ui/popupMenu.js +++ b/js/ui/popupMenu.js @@ -3667,7 +3667,7 @@ var PopupMenuManager = class PopupMenuManager { diff --git a/x11-packages/cinnamon/build.sh b/x11-packages/cinnamon/build.sh index 3df32b01320..997053ba451 100644 --- a/x11-packages/cinnamon/build.sh +++ b/x11-packages/cinnamon/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Cinnamon shell" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="6.6.7" -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SRCURL="https://github.com/linuxmint/cinnamon/archive/refs/tags/${TERMUX_PKG_VERSION}.tar.gz" TERMUX_PKG_SHA256=220f9ba77860d63708e682aa3fdc48cd8597b41b698467f116e477b45d514249 TERMUX_PKG_AUTO_UPDATE=true