diff --git a/gui-wm/phosh/files/0001-system-prompt-allow-blank-passwords.patch b/gui-wm/phosh/files/0001-system-prompt-allow-blank-passwords.patch new file mode 100644 index 0000000..4f17410 --- /dev/null +++ b/gui-wm/phosh/files/0001-system-prompt-allow-blank-passwords.patch @@ -0,0 +1,885 @@ + + + + + + + + + + + + + + + + + + + + + + + + + +gui-wm/phosh/files/0001-system-prompt-allow-blank-passwords.patch · master · bing c / gentoo-overlay · GitLab + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+Skip to content +
+
+
+

+GitLab +

+
+ + + +
+
+
+ +
+ +
+
+
+
+ +
+ + + +
+
+ +
+ + + + + + + + + + + + + + + + + + +
+
+
+
+
+ + +
+ +
+
+
+
+
+ +
+ +
+
+
Switch branch/tag
+
+
+
+
+
+
+
+
+ +
+
Find file +BlameHistoryPermalink
+
+ +
+
+
    +
  • +
    +bing c's avatar +
    +
    +
    +bump version + +· +b585073a + +
    +bing c authored +
    + +
    +
    + +
    +
    +
    +b585073a +
    + + +
    +
    +
    +
    • + +
+
+ + +
+
+
+
+
+ + +0001-system-prompt-allow-blank-passwords.patch + + + +1.69 KB + +
+ +
EditWeb IDE
+ + +
+ + + + +
+
+ + + + +
+
+ +
+ +
+ + +
+
+ + + +
+ + +
+
+ +
+
+
+
+
+ + + + + + + + diff --git a/gui-wm/phosh/files/0002-fix-locale-issue.patch b/gui-wm/phosh/files/0002-fix-locale-issue.patch new file mode 100644 index 0000000..9d2d3a0 --- /dev/null +++ b/gui-wm/phosh/files/0002-fix-locale-issue.patch @@ -0,0 +1,14 @@ +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 diff --git a/gui-wm/phosh/files/0003-fix-locale-issue-in-service-file-1.patch b/gui-wm/phosh/files/0003-fix-locale-issue-in-service-file-1.patch new file mode 100644 index 0000000..d11fa9e --- /dev/null +++ b/gui-wm/phosh/files/0003-fix-locale-issue-in-service-file-1.patch @@ -0,0 +1,22 @@ +From: Daniel Dehennin +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 diff --git a/gui-wm/phosh/phosh-0.12.1.ebuild b/gui-wm/phosh/phosh-0.12.1.ebuild index 206aec9..3ad338c 100644 --- a/gui-wm/phosh/phosh-0.12.1.ebuild +++ b/gui-wm/phosh/phosh-0.12.1.ebuild @@ -6,7 +6,7 @@ EAPI=7 inherit desktop gnome2-utils meson pam readme.gentoo-r1 vala systemd xdg MY_P="${PN}-v${PV}" -MY_COMMIT="c5ab6037f460406ac9799b1e5765de3ce0097a8b" +MY_COMMIT="f10df68ebf4c93fa186711f66e36526039d29c03" DESCRIPTION="A pure Wayland shell prototype for GNOME on mobile devices" HOMEPAGE="https://source.puri.sm/Librem5/phosh" @@ -40,25 +40,29 @@ BDEPEND=" dev-util/meson " +PATCHES=( + ${FILESDIR}/0001-system-prompt-allow-blank-passwords.patch + ${FILESDIR}/0002-fix-locale-issue.patch + ${FILESDIR}/0003-fix-locale-issue-in-service-file-1.patch +) + src_prepare() { default eapply_user - rm -r "${S}"/subprojects/gvc || die - mv "${WORKDIR}"/libgnome-volume-control-"${MY_COMMIT}" "${S}"/subprojects/gvc || die } + src_install() { default meson_src_install newpamd "${FILESDIR}"/pam_phosh 'phosh' systemd_newunit "${FILESDIR}"/phosh.service 'phosh.service' - domenu "${FILESDIR}"/sm.puri.OSK0.desktop + insinto /usr/share/applications/ + doins "${FILESDIR}"/sm.puri.OSK0.desktop - DOC_CONTENTS=" - To amend the existing password policy please see the man 5 passwdqc.conf - page and then edit the /etc/security/passwdqc.conf file to change enforce=none - to allow use digit only password as phosh only support passcode for now - " + DOC_CONTENTS="To amend the existing password policy please see the man 5 passwdqc.conf + page and then edit the /etc/security/passwdqc.conf file to change enforce=none + to allow use digit only password as phosh only support passcode for now" readme.gentoo_create_doc }