Added second subproject
This commit is contained in:
Gerben Jan Dijkman
parent
f3a36edad4
commit
4963026719
@ -1,2 +1,3 @@
|
||||
DIST libcall-ui-465f6add090b623fb80c6c5cbb9ab2880ff531a4.tar.gz 50329 BLAKE2B 218635af4f1a6076198746a038a522f56648f2e058a7cf874033da3b533683acde5edc482d824b56402a939c16e1003f61747c158b5beb9a82c2836400afc9d3 SHA512 d11de7b15777f175d0a2323cd7b6a07f76b1ccd1e01a4948084b2e950f356f80357604dd95853c60fa49c812d2e981d0899ade1ce7d933f0f9e32fc8c44807eb
|
||||
DIST libgnome-volume-control-c5ab6037f460406ac9799b1e5765de3ce0097a8b.tar.gz 46481 BLAKE2B 7ea8424d640d71361905e2eff346f45e024f9cd430cc8cc92c53d8cf72a8ea312c00bdbd0d9c25f499e1af2122fcafbf08a600d69f053ff9fa04baeb44283ccf SHA512 368d56223907d3eaafd35fce643abddf00e963800eebe98fb5cbe6fbbd8da115d1afb93bd5d557167e787579e3ff8b8e7885cae74d8f0326b45085870ac8cc05
|
||||
DIST phosh-v0.13.0.tar.gz 491512 BLAKE2B 5d459c15195ae966a363120d88d6dbbe08d811a479c09447f092ebb7e3e78b781c8e1e173db2005df2d157d5a9b44b5d8ac8edf6d8fd53f857223d6f6d1966d7 SHA512 6e398ab55007d05be5b3e2e2523d4d2d7df483efbfe1df5fadeae3eae032adf0aba828914e4645e9938c60db4518d96be55f3fe195c9880a181519548f93feb9
|
||||
|
||||
@ -1,49 +0,0 @@
|
||||
From e88f5dee0cbb7fa0851b43a5ded5d94256c756d2 Mon Sep 17 00:00:00 2001
|
||||
From: Arnaud Ferraris <arnaud.ferraris@gmail.com>
|
||||
Date: Sat, 21 Mar 2020 03:00:34 +0100
|
||||
Subject: [PATCH] system-prompt: allow blank passwords
|
||||
|
||||
---
|
||||
src/system-prompt.c | 5 -----
|
||||
1 file changed, 5 deletions(-)
|
||||
|
||||
diff --git a/src/system-prompt.c b/src/system-prompt.c
|
||||
index 30aa3f1..bd06ee0 100644
|
||||
--- a/src/system-prompt.c
|
||||
+++ b/src/system-prompt.c
|
||||
@@ -256,8 +256,6 @@ phosh_system_prompt_password_async (GcrPrompt *prompt,
|
||||
priv->task = g_task_new (self, NULL, callback, user_data);
|
||||
g_task_set_source_tag (priv->task, phosh_system_prompt_password_async);
|
||||
|
||||
- if (!gtk_entry_get_text_length (GTK_ENTRY (priv->entry_password)))
|
||||
- gtk_widget_set_sensitive (priv->btn_continue, FALSE);
|
||||
gtk_widget_set_sensitive (priv->grid, TRUE);
|
||||
|
||||
obj = G_OBJECT (self);
|
||||
@@ -315,7 +313,6 @@ phosh_system_prompt_confirm_async (GcrPrompt *prompt,
|
||||
priv->task = g_task_new (self, NULL, callback, user_data);
|
||||
g_task_set_source_tag (priv->task, phosh_system_prompt_confirm_async);
|
||||
|
||||
- gtk_widget_set_sensitive (priv->btn_continue, TRUE);
|
||||
gtk_widget_set_sensitive (priv->grid, TRUE);
|
||||
|
||||
obj = G_OBJECT (self);
|
||||
@@ -392,7 +389,6 @@ prompt_complete (PhoshSystemPrompt *self)
|
||||
g_task_return_pointer (res, (gpointer)password, NULL);
|
||||
g_object_unref (res);
|
||||
|
||||
- gtk_widget_set_sensitive (priv->btn_continue, FALSE);
|
||||
gtk_widget_set_sensitive (priv->grid, FALSE);
|
||||
|
||||
return TRUE;
|
||||
@@ -451,7 +447,6 @@ on_password_changed (PhoshSystemPrompt *self,
|
||||
if (!gtk_entry_get_text_length (GTK_ENTRY (editable)))
|
||||
return;
|
||||
|
||||
- gtk_widget_set_sensitive (priv->btn_continue, TRUE);
|
||||
password = gtk_entry_get_text (GTK_ENTRY (editable));
|
||||
|
||||
/*
|
||||
--
|
||||
2.24.1
|
||||
|
||||
@ -1,14 +0,0 @@
|
||||
diff -Npur a/data/phosh.in b/data/phosh.in
|
||||
--- a/data/phosh.in 2021-03-20 13:53:32.367786000 +0100
|
||||
+++ b/data/phosh.in 2021-03-20 13:55:19.327789721 +0100
|
||||
@@ -56,6 +56,10 @@ elif [ -f /etc/phosh/rootston.ini ]; th
|
||||
PHOC_INI=/etc/phosh/rootston.ini
|
||||
fi
|
||||
|
||||
+# Set proper locale according to /etc/locale.conf
|
||||
+source /etc/locale.conf
|
||||
+export LANG=$LANG
|
||||
+
|
||||
# Run gnome-session through a login shell so it picks
|
||||
# variables from /etc/profile.d (XDG_*)
|
||||
[ -n "$WLR_BACKENDS" ] || WLR_BACKENDS=drm,libinput
|
||||
@ -1,22 +0,0 @@
|
||||
From: Daniel Dehennin <daniel.dehennin@baby-gnu.org>
|
||||
Date: Wed, 17 Mar 2021 17:38:58 +0100
|
||||
Subject: Fix locale issue in Service file
|
||||
|
||||
* data/phosh.service (Environment): do not override user language
|
||||
setting.
|
||||
---
|
||||
data/phosh.service | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/data/phosh.service b/data/phosh.service
|
||||
index fa18137..a585696 100644
|
||||
--- a/data/phosh.service
|
||||
+++ b/data/phosh.service
|
||||
@@ -25,7 +25,6 @@ Before=graphical.target
|
||||
ConditionPathExists=/dev/tty0
|
||||
|
||||
[Service]
|
||||
-Environment=LANG=C.UTF-8
|
||||
Environment=XDG_CURRENT_DESKTOP=GNOME:Phosh
|
||||
Environment=XDG_SESSION_DESKTOP=phosh
|
||||
Environment=XDG_SESSION_TYPE=wayland
|
||||
@ -6,13 +6,15 @@ EAPI=7
|
||||
inherit desktop gnome2-utils meson pam readme.gentoo-r1 vala systemd xdg
|
||||
|
||||
MY_P="${PN}-v${PV}"
|
||||
MY_COMMIT="c5ab6037f460406ac9799b1e5765de3ce0097a8b"
|
||||
LVC_COMMIT="c5ab6037f460406ac9799b1e5765de3ce0097a8b"
|
||||
LCU_COMMIT="465f6add090b623fb80c6c5cbb9ab2880ff531a4"
|
||||
|
||||
DESCRIPTION="A pure Wayland shell prototype for GNOME on mobile devices"
|
||||
HOMEPAGE="https://gitlab.gnome.org/World/Phosh/phosh/"
|
||||
SRC_URI="
|
||||
https://gitlab.gnome.org/World/Phosh/phosh/-/archive/v${PV}/${MY_P}.tar.gz
|
||||
https://gitlab.gnome.org/GNOME/libgnome-volume-control/-/archive/${MY_COMMIT}.tar.gz -> libgnome-volume-control-${MY_COMMIT}.tar.gz
|
||||
https://gitlab.gnome.org/GNOME/libgnome-volume-control/-/archive/${LVC_COMMIT}/libgnome-volume-control-${LVC_COMMIT}.tar.gz
|
||||
https://gitlab.gnome.org/World/Phosh/libcall-ui/-/archive/${LCU_COMMIT}/libcall-ui-${LCU_COMMIT}.tar.gz
|
||||
"
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
@ -43,8 +45,10 @@ BDEPEND="
|
||||
src_prepare() {
|
||||
default
|
||||
eapply_user
|
||||
# rm -r "${S}"/subprojects/gvc || die
|
||||
# mv "${WORKDIR}"/libgnome-volume-control-"${MY_COMMIT}" "${S}"/subprojects/gvc || die
|
||||
rm -r "${S}"/subprojects/gvc || die
|
||||
mv "${WORKDIR}"/libgnome-volume-control-"${LVC_COMMIT}" "${S}"/subprojects/gvc || die
|
||||
rm -r "${S}"/subprojects/libcall-ui || die
|
||||
mv "${WORKDIR}"/libcall-ui-"${LCU_COMMIT}" "${S}"/subprojects/libcall-ui || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user