[gentoo-commits] repo/proj/guru:master commit in: gui-wm/phosh/files/, gui-wm/phosh/

[Jian Lin]

commit:     99e76470a0f67e9bf152ab189fe4a60eb6a4e93b
Author:     Marco Scardovi <marco <AT> scardovi <DOT> com>
AuthorDate: Tue Jun 22 16:20:49 2021 +0000
Commit:     Jian Lin <jlin.gentoo <AT> outlook <DOT> com>
CommitDate: Tue Jun 22 16:20:49 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=99e76470

gui-wm/phosh: fix patches

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Marco Scardovi <marco <AT> scardovi.com>

 gui-wm/phosh/Manifest                       |  1 +
 gui-wm/phosh/files/0004-calls-manager.patch | 17 ++++++++++++++---
 gui-wm/phosh/files/0005-calls-manager.patch | 20 --------------------
 gui-wm/phosh/phosh-0.11.0.ebuild            | 13 ++++++++++---
 4 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/gui-wm/phosh/Manifest b/gui-wm/phosh/Manifest
index 5160cf822..246e4f282 100644
--- a/gui-wm/phosh/Manifest
+++ b/gui-wm/phosh/Manifest
@@ -1 +1,2 @@
+DIST c5ab6037f460406ac9799b1e5765de3ce0097a8b.tar.gz 46481 BLAKE2B 7ea8424d640d71361905e2eff346f45e024f9cd430cc8cc92c53d8cf72a8ea312c00bdbd0d9c25f499e1af2122fcafbf08a600d69f053ff9fa04baeb44283ccf SHA512 368d56223907d3eaafd35fce643abddf00e963800eebe98fb5cbe6fbbd8da115d1afb93bd5d557167e787579e3ff8b8e7885cae74d8f0326b45085870ac8cc05
 DIST phosh-v0.11.0.tar.gz 447909 BLAKE2B e5e269a1c0d84000ba956b2f03e29079f53eceb03b83829f10f9aeea3e45668d7e275769f244d67e74e448deecd37abd0a0e3c4eefb945c9dce397e618911073 SHA512 77bb2898a63d3a4438d55775a55af852a90815f090bdb07889ea1743cbda7749cde2fef38ece073352303804852c9bcd1d296492a02a1334d4b5a00619b6ff0f

diff --git a/gui-wm/phosh/files/0004-calls-manager.patch b/gui-wm/phosh/files/0004-calls-manager.patch
index 419238ba4..8b7c8c88c 100644
--- a/gui-wm/phosh/files/0004-calls-manager.patch
+++ b/gui-wm/phosh/files/0004-calls-manager.patch
@@ -1,6 +1,17 @@
-diff --git a/src/calls-manager.c b/src/calls-manager.c
-new file mode 100644
-index 00000000..b8ec2721
+diff --git a/src/shell.h b/src/shell.h
+index 6465fd4..0d7c161 100644
+--- a/src/shell.h
++++ b/src/shell.h
+@@ -70,7 +70,9 @@ void                 phosh_shell_unlock          (PhoshShell *self);
+ void                 phosh_shell_set_primary_monitor (PhoshShell *self, PhoshMonitor *monitor);
+ PhoshMonitor        *phosh_shell_get_primary_monitor (PhoshShell *self);
+ PhoshMonitor        *phosh_shell_get_builtin_monitor (PhoshShell *self);
++
+ PhoshLockscreenManager *phosh_shell_get_lockscreen_manager (PhoshShell *self);
++PhoshCallsManager      *phosh_shell_get_calls_manager      (PhoshShell *self);
+ PhoshBackgroundManager *phosh_shell_get_background_manager (PhoshShell *self);
+ PhoshModeManager    *phosh_shell_get_mode_manager    (PhoshShell *self);
+ PhoshMonitorManager *phosh_shell_get_monitor_manager (PhoshShell *self);
 --- /dev/null
 +++ b/src/calls-manager.c
 @@ -0,0 +1,418 @@

diff --git a/gui-wm/phosh/files/0005-calls-manager.patch b/gui-wm/phosh/files/0005-calls-manager.patch
index 9eb3ed50c..ff9c3bb11 100644
--- a/gui-wm/phosh/files/0005-calls-manager.patch
+++ b/gui-wm/phosh/files/0005-calls-manager.patch
@@ -532,25 +532,5 @@ index c5894fde..2120e1f8 100644
  PhoshWifiManager *
  phosh_shell_get_wifi_manager (PhoshShell *self)
  {
-diff --git a/src/shell.h b/src/shell.h
-index 6465fd40..e0353f02 100644
---- a/src/shell.h
-+++ b/src/shell.h
-@@ -10,6 +10,7 @@
-
- #include "background-manager.h"
- #include "bt-manager.h"
-+#include "calls-manager.h"
- #include "docked-manager.h"
- #include "feedback-manager.h"
- #include "gtk-mount-manager.h"
-@@ -77,6 +78,7 @@ PhoshBackgroundManager *phosh_shell_get_background_manager (PhoshShell *self);
- PhoshFeedbackManager   *phosh_shell_get_feedback_manager   (PhoshShell *self);
- PhoshGtkMountManager   *phosh_shell_get_gtk_mount_manager  (PhoshShell *self);
- PhoshLockscreenManager *phosh_shell_get_lockscreen_manager (PhoshShell *self);
-+PhoshCallsManager      *phosh_shell_get_calls_manager      (PhoshShell *self);
- PhoshModeManager       *phosh_shell_get_mode_manager       (PhoshShell *self);
- PhoshMonitorManager    *phosh_shell_get_monitor_manager    (PhoshShell *self);
- PhoshToplevelManager   *phosh_shell_get_toplevel_manager   (PhoshShell *self);
 --
 GitLab

diff --git a/gui-wm/phosh/phosh-0.11.0.ebuild b/gui-wm/phosh/phosh-0.11.0.ebuild
index 566efba2a..7007a1c28 100644
--- a/gui-wm/phosh/phosh-0.11.0.ebuild
+++ b/gui-wm/phosh/phosh-0.11.0.ebuild
@@ -9,7 +9,10 @@ MY_P="${PN}-v${PV}"
 
 DESCRIPTION="A pure Wayland shell prototype for GNOME on mobile devices"
 HOMEPAGE="https://source.puri.sm/Librem5/phosh"
-SRC_URI="https://source.puri.sm/Librem5/phosh/-/archive/v0.11.0/${MY_P}.tar.gz"
+SRC_URI="
+	https://source.puri.sm/Librem5/phosh/-/archive/v0.11.0/${MY_P}.tar.gz
+	https://gitlab.gnome.org/GNOME/libgnome-volume-control/-/archive/c5ab6037f460406ac9799b1e5765de3ce0097a8b.tar.gz
+"
 
 KEYWORDS="~amd64 ~arm64"
 LICENSE="GPL-3"
@@ -35,8 +38,6 @@ BDEPEND="
 	dev-util/meson
 "
 
-S="${WORKDIR}/${MY_P}"
-
 PATCHES=(
 	"${FILESDIR}"/0001-system-prompt-allow-blank-passwords.patch
 	"${FILESDIR}"/0002-fix-locale-issue.patch
@@ -46,9 +47,15 @@ PATCHES=(
 	"${FILESDIR}"/0006-calls-manager.patch
 )
 
+S="${WORKDIR}/${MY_P}"
+
+MY_COMMIT="c5ab6037f460406ac9799b1e5765de3ce0097a8b"
+
 src_prepare() {
 	default
 	eapply_user
+	rm -r "${S}"/subprojects/gvc || die
+	mv "${WORKDIR}"/libgnome-volume-control-"${MY_COMMIT}" "${S}"/subprojects/gvc || die
 }
 
 src_install() {