Skip to content

Commit

Permalink
pkg: phosh: phosh: revert unknown hardware patch
Browse files Browse the repository at this point in the history
Signed-off-by: Danct12 <[email protected]>
  • Loading branch information
Danct12 committed Nov 20, 2021
1 parent bcf8280 commit 2305420
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 1 deletion.
7 changes: 6 additions & 1 deletion PKGBUILDS/phosh/phosh/PKGBUILD
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Maintainer: Danct12 <[email protected]>
pkgname=phosh
pkgver=0.14.0
pkgrel=1
pkgrel=2
pkgdesc="The Librem5 Shell"
arch=('x86_64' 'armv7h' 'aarch64')
url="https://gitlab.gnome.org/World/Phosh/phosh"
Expand All @@ -14,6 +14,7 @@ _commit_libcall_ui="465f6add090b623fb80c6c5cbb9ab2880ff531a4"
source=("https://gitlab.gnome.org/World/Phosh/phosh/-/archive/v$pkgver/phosh-v$pkgver.tar.gz"
"https://gitlab.gnome.org/GNOME/libgnome-volume-control/-/archive/$_commit_gvc/libgnome-volume-control-$_commit_gvc.tar.gz"
"https://gitlab.gnome.org/guidog/libcall-ui/-/archive/$_commit_libcall_ui/libcall-ui-$_commit_libcall_ui.tar.gz"
'Revert-docked-manager-Treat-unknown-hardware-as-undo.patch'
'pam_phosh'
'sm.puri.OSK0.desktop'
'phosh.service')
Expand All @@ -26,6 +27,9 @@ prepare() {

rm -r subprojects/libcall-ui
mv "$srcdir/libcall-ui-$_commit_libcall_ui" subprojects/libcall-ui

# Revert this patch, it seems to break un/docked mode
patch -p1 < ../Revert-docked-manager-Treat-unknown-hardware-as-undo.patch
}

build() {
Expand All @@ -47,6 +51,7 @@ package() {
md5sums=('73c5f5e1310cbfcf12537796c3f3dfaa'
'c08f04485db11997525c139346faecc8'
'bd1569dc4925fc873ec32ca477559725'
'66a6c8ce27f8df7d4e5e2e8256887717'
'6d5a0d561f8362bf91f85c236a88395d'
'30c7febb5cbbac40984fb50d66a88639'
'8fad8bdef9442f81cfd1cfd468f9c6fb')
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
Subject: [PATCH] Revert "docked-manager: Treat unknown hardware as undocked"

This reverts commit 3b688d164fd1b0d78f8801aeebcaf614c168ce9a.
---
src/docked-manager.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/docked-manager.c b/src/docked-manager.c
index accf89c..79363e1 100644
--- a/src/docked-manager.c
+++ b/src/docked-manager.c
@@ -119,11 +119,10 @@ mode_changed_cb (PhoshDockedManager *self, GParamSpec *pspec, PhoshModeManager *

/*
* Desktops, laptops and phones with enough external hardware should get floating
- * windows, etc. Unknown hardware is assumed to be a phone.
+ * windows, etc
*/
if (phosh_mode_manager_get_mimicry (manager) != PHOSH_MODE_DEVICE_TYPE_PHONE &&
- phosh_mode_manager_get_mimicry (manager) != PHOSH_MODE_DEVICE_TYPE_TABLET &&
- phosh_mode_manager_get_mimicry (manager) != PHOSH_MODE_DEVICE_TYPE_UNKNOWN)
+ phosh_mode_manager_get_mimicry (manager) != PHOSH_MODE_DEVICE_TYPE_TABLET)
can_dock = TRUE;

if (can_dock == self->can_dock)
--
2.33.1

0 comments on commit 2305420

Please sign in to comment.