* Re: [PR REVIEW] New packages: phoc-0.4.2 calls-0.1.7 purism-chatty--0.1.15
2020-08-29 20:46 [PR PATCH] New packages: phoc-0.4.2 calls-0.1.7 purism-chatty--0.1.15 julio641742
@ 2020-08-29 22:12 ` fosslinux
2020-08-29 22:12 ` fosslinux
` (44 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: fosslinux @ 2020-08-29 22:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 236 bytes --]
New review comment by fosslinux on void-packages repository
https://github.com/void-linux/void-packages/pull/24538#discussion_r479694799
Comment:
Why? Do the tests fail, or is this just to reduce build time? We do want tests to work.
^ permalink raw reply [flat|nested] 47+ messages in thread* Re: [PR REVIEW] New packages: phoc-0.4.2 calls-0.1.7 purism-chatty--0.1.15
2020-08-29 20:46 [PR PATCH] New packages: phoc-0.4.2 calls-0.1.7 purism-chatty--0.1.15 julio641742
2020-08-29 22:12 ` [PR REVIEW] " fosslinux
@ 2020-08-29 22:12 ` fosslinux
2020-08-30 0:21 ` [PR PATCH] [Updated] " julio641742
` (43 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: fosslinux @ 2020-08-29 22:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 214 bytes --]
New review comment by fosslinux on void-packages repository
https://github.com/void-linux/void-packages/pull/24538#discussion_r479694857
Comment:
Split into 80 char lines, subsequent lines indented with 1 space.
^ permalink raw reply [flat|nested] 47+ messages in thread* Re: [PR PATCH] [Updated] New packages: phoc-0.4.2 calls-0.1.7 purism-chatty--0.1.15
2020-08-29 20:46 [PR PATCH] New packages: phoc-0.4.2 calls-0.1.7 purism-chatty--0.1.15 julio641742
2020-08-29 22:12 ` [PR REVIEW] " fosslinux
2020-08-29 22:12 ` fosslinux
@ 2020-08-30 0:21 ` julio641742
2020-08-30 1:36 ` julio641742
` (42 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: julio641742 @ 2020-08-30 0:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 387 bytes --]
There is an updated pull request by julio641742 against master on the void-packages repository
https://github.com/julio641742/void-packages phosh
https://github.com/void-linux/void-packages/pull/24538
New packages: phoc-0.4.2 calls-0.1.7 purism-chatty--0.1.15
Getting ready for my pinephone :)
A patch file from https://github.com/void-linux/void-packages/pull/24538.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-phosh-24538.patch --]
[-- Type: text/x-diff, Size: 11953 bytes --]
From 5eac64ee509d1bff18072b0ea74f68959c548c77 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Sat, 29 Aug 2020 11:47:35 -0700
Subject: [PATCH 1/6] New package: feedbackd-0.0.0+git20200707
---
common/shlibs | 1 +
srcpkgs/feedbackd/template | 32 ++++++++++++++++++++++++++++++++
srcpkgs/libfeedback | 1 +
srcpkgs/libfeedback-devel | 1 +
4 files changed, 35 insertions(+)
create mode 100644 srcpkgs/feedbackd/template
create mode 120000 srcpkgs/libfeedback
create mode 120000 srcpkgs/libfeedback-devel
diff --git a/common/shlibs b/common/shlibs
index a6b5737b845..6c0e544a7e1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3988,3 +3988,4 @@ libaml.so.0 aml-0.1.0_1
libneatvnc.so.0 neatvnc-0.2.0_1
libtdjson.so.1.6.0 libtd-1.6.0_1
libJudy.so.1 judy-1.0.5_1
+libfeedback-0.0.so.0 libfeedback-0.0.0+git20200707_1
diff --git a/srcpkgs/feedbackd/template b/srcpkgs/feedbackd/template
new file mode 100644
index 00000000000..cf5de83b419
--- /dev/null
+++ b/srcpkgs/feedbackd/template
@@ -0,0 +1,32 @@
+# Template file for 'feedbackd'
+pkgname=feedbackd
+version=0.0.0+git20200707
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=meson
+configure_args="-Dvapi=false -Dintrospection=disabled"
+hostmakedepends="glib-devel pkg-config"
+makedepends="gsound-devel libgudev-devel json-glib-devel"
+depends="dbus"
+short_desc="Daemon to provide haptic feedback on events"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/feedbackd"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=37cf48cbdbaee8e2d0bea406f5b6317bf0e3cdf79250f9ce0a884e7d3905a8ea
+
+libfeedback_package() {
+ short_desc+=" - shared libraries"
+ pkg_install() {
+ vmove "usr/lib/*.so.*"
+ }
+}
+libfeedback-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision} ${_devel_depends}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ }
+}
diff --git a/srcpkgs/libfeedback b/srcpkgs/libfeedback
new file mode 120000
index 00000000000..49dc965f1cd
--- /dev/null
+++ b/srcpkgs/libfeedback
@@ -0,0 +1 @@
+feedbackd
\ No newline at end of file
diff --git a/srcpkgs/libfeedback-devel b/srcpkgs/libfeedback-devel
new file mode 120000
index 00000000000..49dc965f1cd
--- /dev/null
+++ b/srcpkgs/libfeedback-devel
@@ -0,0 +1 @@
+feedbackd
\ No newline at end of file
From 4d7a8ac1cd026ed76e4b3df6af8bf6c9a429a467 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Sat, 29 Aug 2020 11:47:56 -0700
Subject: [PATCH 2/6] New package: phoc-0.4.2
---
srcpkgs/phoc/template | 15 +++++++++++++++
1 file changed, 15 insertions(+)
create mode 100644 srcpkgs/phoc/template
diff --git a/srcpkgs/phoc/template b/srcpkgs/phoc/template
new file mode 100644
index 00000000000..074acb6afc8
--- /dev/null
+++ b/srcpkgs/phoc/template
@@ -0,0 +1,15 @@
+# Template file for 'phoc'
+pkgname=phoc
+version=0.4.2
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=meson
+configure_args="-Dembed-wlroots=disabled"
+hostmakedepends="glib-devel pkg-config wayland-devel"
+makedepends="gnome-desktop-devel wlroots-devel"
+short_desc="Wlroots based Phone compositor for the Phosh shell"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/phoc"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=bdb34644c7d49c953239c1e939bc5ee2bc26f6187b9d756b70b113d2734c712c
From 3bfe62aec042faaf6592fb51a3849f77c86704f4 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Sat, 29 Aug 2020 11:48:48 -0700
Subject: [PATCH 3/6] New package: squeekboard-1.9.3
---
srcpkgs/squeekboard/template | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
create mode 100644 srcpkgs/squeekboard/template
diff --git a/srcpkgs/squeekboard/template b/srcpkgs/squeekboard/template
new file mode 100644
index 00000000000..a672443da33
--- /dev/null
+++ b/srcpkgs/squeekboard/template
@@ -0,0 +1,21 @@
+# Template file for 'squeekboard'
+pkgname=squeekboard
+version=1.9.3
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=meson
+build_helper=rust
+hostmakedepends="glib-devel gettext pkg-config cargo wayland-devel"
+makedepends="rust gtk+3-devel gnome-desktop-devel libfeedback-devel"
+short_desc="Final Librem5 keyboard"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/squeekboard"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=b99e56faace3986bf752e08c104cea60ed896d514284840655033dd9457db824
+
+pre_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ vsed -i cargo_build.sh -e "s/-a ./-a ${XBPS_CROSS_RUST_TARGET}/g"
+ fi
+}
From ced63ca0800c4273ca8b0331743e3cb6f98964ae Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Sat, 29 Aug 2020 11:48:59 -0700
Subject: [PATCH 4/6] New package: phosh-0.4.3
---
srcpkgs/phosh/files/sm.puri.OSK0.desktop | 12 +++++++++
srcpkgs/phosh/files/sm.puri.Phosh.desktop | 11 ++++++++
srcpkgs/phosh/patches/32bit-build-fix.patch | 30 +++++++++++++++++++++
srcpkgs/phosh/patches/meson.patch | 10 +++++++
srcpkgs/phosh/template | 21 +++++++++++++++
5 files changed, 84 insertions(+)
create mode 100644 srcpkgs/phosh/files/sm.puri.OSK0.desktop
create mode 100644 srcpkgs/phosh/files/sm.puri.Phosh.desktop
create mode 100644 srcpkgs/phosh/patches/32bit-build-fix.patch
create mode 100644 srcpkgs/phosh/patches/meson.patch
create mode 100644 srcpkgs/phosh/template
diff --git a/srcpkgs/phosh/files/sm.puri.OSK0.desktop b/srcpkgs/phosh/files/sm.puri.OSK0.desktop
new file mode 100644
index 00000000000..39740f15773
--- /dev/null
+++ b/srcpkgs/phosh/files/sm.puri.OSK0.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Type=Application
+Name=On-screen keyboard
+Comment=Default on-screen keyboard
+Exec=/usr/bin/squeekboard
+Categories=GNOME;Core;
+OnlyShowIn=GNOME;
+NoDisplay=true
+X-GNOME-Autostart-Phase=Panel
+X-GNOME-Provides=inputmethod
+X-GNOME-Autostart-Notify=true
+X-GNOME-AutoRestart=true
diff --git a/srcpkgs/phosh/files/sm.puri.Phosh.desktop b/srcpkgs/phosh/files/sm.puri.Phosh.desktop
new file mode 100644
index 00000000000..84452845115
--- /dev/null
+++ b/srcpkgs/phosh/files/sm.puri.Phosh.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=Phosh
+Name[en]=Phosh
+Comment=This session logs you into Phosh
+Comment[en]=This session logs in you into Phosh
+Exec=dbus-run-session /usr/bin/phosh
+TryExec=/usr/bin/phosh
+Icon=
+Type=Application
+X-DesktopNames=Phosh
+Keywords=launch;Phosh;desktop;session;
diff --git a/srcpkgs/phosh/patches/32bit-build-fix.patch b/srcpkgs/phosh/patches/32bit-build-fix.patch
new file mode 100644
index 00000000000..a98ecb0faa5
--- /dev/null
+++ b/srcpkgs/phosh/patches/32bit-build-fix.patch
@@ -0,0 +1,30 @@
+From d1da5ea7d18c6794c9a7d2f41355fe90d4115ac1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
+Date: Tue, 4 Aug 2020 08:22:39 +0200
+Subject: [PATCH] timestamp-label: Unbreak build on 32 bit platforms
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Use a G_ format specifier for GTimeSpan.
+
+Signed-off-by: Guido Günther <guido.gunther@puri.sm>
+---
+ src/notifications/timestamp-label.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/notifications/timestamp-label.c b/src/notifications/timestamp-label.c
+index 0aa04ce0..a5a4d5e7 100644
+--- src/notifications/timestamp-label.c
++++ src/notifications/timestamp-label.c
+@@ -255,7 +255,7 @@ phosh_timestamp_label_calc_timeout (PhoshTimestampLabel *self)
+ break;
+ }
+ timeout_diff = g_date_time_difference (timeout_time, time_now);
+- g_debug ("time out duration = %ld", timeout_diff);
++ g_debug ("time out duration: %" G_GINT64_FORMAT, timeout_diff);
+ return timeout_diff;
+ }
+
+--
+2.26.2
diff --git a/srcpkgs/phosh/patches/meson.patch b/srcpkgs/phosh/patches/meson.patch
new file mode 100644
index 00000000000..3d91f0c069d
--- /dev/null
+++ b/srcpkgs/phosh/patches/meson.patch
@@ -0,0 +1,10 @@
+--- meson.build 2020-08-02 09:47:19.000000000 -0700
++++ meson.build 2020-08-28 16:50:25.592370097 -0700
+@@ -152,7 +152,6 @@
+ 'Phosh @0@'.format(meson.project_version()),
+ '',
+ ' Tests: @0@'.format(get_option('tests')),
+- ' Phoc Tests: @0@'.format(run_phoc_tests),
+ 'Documentation: @0@'.format(get_option('gtk_doc')),
+ '-----------',
+ ]
diff --git a/srcpkgs/phosh/template b/srcpkgs/phosh/template
new file mode 100644
index 00000000000..8360013a956
--- /dev/null
+++ b/srcpkgs/phosh/template
@@ -0,0 +1,21 @@
+# Template file for 'phosh'
+pkgname=phosh
+version=0.4.3
+revision=1
+build_style=meson
+hostmakedepends="phoc glib-devel gettext pkg-config wayland-devel"
+makedepends="libfeedback-devel gcr-devel gnome-desktop-devel pam-devel
+ polkit-devel pulseaudio-devel libsecret-devel libhandy-devel
+ NetworkManager-devel upower-devel"
+depends="phoc squeekboard"
+short_desc="Shell PoC for the Librem5"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/phosh"
+distfiles="https://repo.pureos.net/pureos/pool/main/p/phosh/phosh_$version.tar.xz"
+checksum=c6fc68aafaf78412637b0f509aafbbca877bda3fe19511bf340b824d7cdbd4ee
+
+post_install() {
+ vcopy ${FILESDIR}/sm.puri.OSK0.desktop usr/share/applications
+ vcopy ${FILESDIR}/sm.puri.Phosh.desktop usr/share/applications
+}
From bdedbe6ecb44e0ee07cfd45bf4d90dd373c32f1a Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Sat, 29 Aug 2020 11:49:14 -0700
Subject: [PATCH 5/6] New package: calls-0.1.7
---
srcpkgs/calls/template | 17 +++++++++++++++++
srcpkgs/purism-chatty/template | 22 ++++++++++++++++++++++
2 files changed, 39 insertions(+)
create mode 100644 srcpkgs/calls/template
create mode 100644 srcpkgs/purism-chatty/template
diff --git a/srcpkgs/calls/template b/srcpkgs/calls/template
new file mode 100644
index 00000000000..260ed391d24
--- /dev/null
+++ b/srcpkgs/calls/template
@@ -0,0 +1,17 @@
+# Template file for 'calls'
+pkgname=calls
+version=0.1.7
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=meson
+hostmakedepends="glib-devel gettext vala pkg-config wayland-devel
+ evolution-data-server-devel"
+makedepends="folks-devel libhandy-devel libpeas-devel gom-devel
+ ModemManager-devel libfeedback-devel"
+depends="NetworkManager"
+short_desc="Phone call application"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/calls"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=477c55d483ca13f6ac98209c3c4d6c5858f706e72a133616dcb6827ef25829c7
diff --git a/srcpkgs/purism-chatty/template b/srcpkgs/purism-chatty/template
new file mode 100644
index 00000000000..d11bfcea882
--- /dev/null
+++ b/srcpkgs/purism-chatty/template
@@ -0,0 +1,22 @@
+# Template file for 'purism-chatty'
+pkgname=purism-chatty
+_pkgname=chatty
+version=0.1.15
+revision=1
+wrksrc=${_pkgname}-v${version}
+build_style=meson
+hostmakedepends="glib-devel pkg-config gettext"
+makedepends="libfeedback-devel libhandy-devel evolution-data-server-devel
+ libpurple libpurple-devel"
+short_desc="XMPP and SMS messaging via libpurple and Modemmanager"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/chatty"
+distfiles="${homepage}/-/archive/v${version}/${_pkgname}-v${version}.tar.gz"
+checksum=9be2b79a266a7fa1e3d3e7ba447ff89d2b9e44312d6e55f2a63d191369528d64
+
+pre_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ vsed -i src/meson.build -e "s/purple_plugdir =.*/purple_plugdir = \'\/usr\/${XBPS_CROSS_TRIPLET}\/usr\/lib\/purple-2\'/g"
+ fi
+}
^ permalink raw reply [flat|nested] 47+ messages in thread* Re: [PR PATCH] [Updated] New packages: phoc-0.4.2 calls-0.1.7 purism-chatty--0.1.15
2020-08-29 20:46 [PR PATCH] New packages: phoc-0.4.2 calls-0.1.7 purism-chatty--0.1.15 julio641742
` (2 preceding siblings ...)
2020-08-30 0:21 ` [PR PATCH] [Updated] " julio641742
@ 2020-08-30 1:36 ` julio641742
2020-08-30 3:47 ` New packages: phoc-0.4.2 calls-0.1.7 purism-chatty-0.1.15 julio641742
` (41 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: julio641742 @ 2020-08-30 1:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 387 bytes --]
There is an updated pull request by julio641742 against master on the void-packages repository
https://github.com/julio641742/void-packages phosh
https://github.com/void-linux/void-packages/pull/24538
New packages: phoc-0.4.2 calls-0.1.7 purism-chatty--0.1.15
Getting ready for my pinephone :)
A patch file from https://github.com/void-linux/void-packages/pull/24538.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-phosh-24538.patch --]
[-- Type: text/x-diff, Size: 11514 bytes --]
From 5eac64ee509d1bff18072b0ea74f68959c548c77 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Sat, 29 Aug 2020 11:47:35 -0700
Subject: [PATCH 1/6] New package: feedbackd-0.0.0+git20200707
---
common/shlibs | 1 +
srcpkgs/feedbackd/template | 32 ++++++++++++++++++++++++++++++++
srcpkgs/libfeedback | 1 +
srcpkgs/libfeedback-devel | 1 +
4 files changed, 35 insertions(+)
create mode 100644 srcpkgs/feedbackd/template
create mode 120000 srcpkgs/libfeedback
create mode 120000 srcpkgs/libfeedback-devel
diff --git a/common/shlibs b/common/shlibs
index a6b5737b845..6c0e544a7e1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3988,3 +3988,4 @@ libaml.so.0 aml-0.1.0_1
libneatvnc.so.0 neatvnc-0.2.0_1
libtdjson.so.1.6.0 libtd-1.6.0_1
libJudy.so.1 judy-1.0.5_1
+libfeedback-0.0.so.0 libfeedback-0.0.0+git20200707_1
diff --git a/srcpkgs/feedbackd/template b/srcpkgs/feedbackd/template
new file mode 100644
index 00000000000..cf5de83b419
--- /dev/null
+++ b/srcpkgs/feedbackd/template
@@ -0,0 +1,32 @@
+# Template file for 'feedbackd'
+pkgname=feedbackd
+version=0.0.0+git20200707
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=meson
+configure_args="-Dvapi=false -Dintrospection=disabled"
+hostmakedepends="glib-devel pkg-config"
+makedepends="gsound-devel libgudev-devel json-glib-devel"
+depends="dbus"
+short_desc="Daemon to provide haptic feedback on events"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/feedbackd"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=37cf48cbdbaee8e2d0bea406f5b6317bf0e3cdf79250f9ce0a884e7d3905a8ea
+
+libfeedback_package() {
+ short_desc+=" - shared libraries"
+ pkg_install() {
+ vmove "usr/lib/*.so.*"
+ }
+}
+libfeedback-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision} ${_devel_depends}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ }
+}
diff --git a/srcpkgs/libfeedback b/srcpkgs/libfeedback
new file mode 120000
index 00000000000..49dc965f1cd
--- /dev/null
+++ b/srcpkgs/libfeedback
@@ -0,0 +1 @@
+feedbackd
\ No newline at end of file
diff --git a/srcpkgs/libfeedback-devel b/srcpkgs/libfeedback-devel
new file mode 120000
index 00000000000..49dc965f1cd
--- /dev/null
+++ b/srcpkgs/libfeedback-devel
@@ -0,0 +1 @@
+feedbackd
\ No newline at end of file
From 4d7a8ac1cd026ed76e4b3df6af8bf6c9a429a467 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Sat, 29 Aug 2020 11:47:56 -0700
Subject: [PATCH 2/6] New package: phoc-0.4.2
---
srcpkgs/phoc/template | 15 +++++++++++++++
1 file changed, 15 insertions(+)
create mode 100644 srcpkgs/phoc/template
diff --git a/srcpkgs/phoc/template b/srcpkgs/phoc/template
new file mode 100644
index 00000000000..074acb6afc8
--- /dev/null
+++ b/srcpkgs/phoc/template
@@ -0,0 +1,15 @@
+# Template file for 'phoc'
+pkgname=phoc
+version=0.4.2
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=meson
+configure_args="-Dembed-wlroots=disabled"
+hostmakedepends="glib-devel pkg-config wayland-devel"
+makedepends="gnome-desktop-devel wlroots-devel"
+short_desc="Wlroots based Phone compositor for the Phosh shell"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/phoc"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=bdb34644c7d49c953239c1e939bc5ee2bc26f6187b9d756b70b113d2734c712c
From 3bfe62aec042faaf6592fb51a3849f77c86704f4 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Sat, 29 Aug 2020 11:48:48 -0700
Subject: [PATCH 3/6] New package: squeekboard-1.9.3
---
srcpkgs/squeekboard/template | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
create mode 100644 srcpkgs/squeekboard/template
diff --git a/srcpkgs/squeekboard/template b/srcpkgs/squeekboard/template
new file mode 100644
index 00000000000..a672443da33
--- /dev/null
+++ b/srcpkgs/squeekboard/template
@@ -0,0 +1,21 @@
+# Template file for 'squeekboard'
+pkgname=squeekboard
+version=1.9.3
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=meson
+build_helper=rust
+hostmakedepends="glib-devel gettext pkg-config cargo wayland-devel"
+makedepends="rust gtk+3-devel gnome-desktop-devel libfeedback-devel"
+short_desc="Final Librem5 keyboard"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/squeekboard"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=b99e56faace3986bf752e08c104cea60ed896d514284840655033dd9457db824
+
+pre_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ vsed -i cargo_build.sh -e "s/-a ./-a ${XBPS_CROSS_RUST_TARGET}/g"
+ fi
+}
From 6d7672ae0a5bd61e8b217cdc376313377443a658 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Sat, 29 Aug 2020 11:48:59 -0700
Subject: [PATCH 4/6] New package: phosh-0.4.3
---
srcpkgs/phosh/files/sm.puri.OSK0.desktop | 12 +++++++++
srcpkgs/phosh/files/sm.puri.Phosh.desktop | 11 ++++++++
srcpkgs/phosh/patches/32bit-build-fix.patch | 30 +++++++++++++++++++++
srcpkgs/phosh/template | 21 +++++++++++++++
4 files changed, 74 insertions(+)
create mode 100644 srcpkgs/phosh/files/sm.puri.OSK0.desktop
create mode 100644 srcpkgs/phosh/files/sm.puri.Phosh.desktop
create mode 100644 srcpkgs/phosh/patches/32bit-build-fix.patch
create mode 100644 srcpkgs/phosh/template
diff --git a/srcpkgs/phosh/files/sm.puri.OSK0.desktop b/srcpkgs/phosh/files/sm.puri.OSK0.desktop
new file mode 100644
index 00000000000..39740f15773
--- /dev/null
+++ b/srcpkgs/phosh/files/sm.puri.OSK0.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Type=Application
+Name=On-screen keyboard
+Comment=Default on-screen keyboard
+Exec=/usr/bin/squeekboard
+Categories=GNOME;Core;
+OnlyShowIn=GNOME;
+NoDisplay=true
+X-GNOME-Autostart-Phase=Panel
+X-GNOME-Provides=inputmethod
+X-GNOME-Autostart-Notify=true
+X-GNOME-AutoRestart=true
diff --git a/srcpkgs/phosh/files/sm.puri.Phosh.desktop b/srcpkgs/phosh/files/sm.puri.Phosh.desktop
new file mode 100644
index 00000000000..84452845115
--- /dev/null
+++ b/srcpkgs/phosh/files/sm.puri.Phosh.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=Phosh
+Name[en]=Phosh
+Comment=This session logs you into Phosh
+Comment[en]=This session logs in you into Phosh
+Exec=dbus-run-session /usr/bin/phosh
+TryExec=/usr/bin/phosh
+Icon=
+Type=Application
+X-DesktopNames=Phosh
+Keywords=launch;Phosh;desktop;session;
diff --git a/srcpkgs/phosh/patches/32bit-build-fix.patch b/srcpkgs/phosh/patches/32bit-build-fix.patch
new file mode 100644
index 00000000000..a98ecb0faa5
--- /dev/null
+++ b/srcpkgs/phosh/patches/32bit-build-fix.patch
@@ -0,0 +1,30 @@
+From d1da5ea7d18c6794c9a7d2f41355fe90d4115ac1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
+Date: Tue, 4 Aug 2020 08:22:39 +0200
+Subject: [PATCH] timestamp-label: Unbreak build on 32 bit platforms
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Use a G_ format specifier for GTimeSpan.
+
+Signed-off-by: Guido Günther <guido.gunther@puri.sm>
+---
+ src/notifications/timestamp-label.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/notifications/timestamp-label.c b/src/notifications/timestamp-label.c
+index 0aa04ce0..a5a4d5e7 100644
+--- src/notifications/timestamp-label.c
++++ src/notifications/timestamp-label.c
+@@ -255,7 +255,7 @@ phosh_timestamp_label_calc_timeout (PhoshTimestampLabel *self)
+ break;
+ }
+ timeout_diff = g_date_time_difference (timeout_time, time_now);
+- g_debug ("time out duration = %ld", timeout_diff);
++ g_debug ("time out duration: %" G_GINT64_FORMAT, timeout_diff);
+ return timeout_diff;
+ }
+
+--
+2.26.2
diff --git a/srcpkgs/phosh/template b/srcpkgs/phosh/template
new file mode 100644
index 00000000000..8360013a956
--- /dev/null
+++ b/srcpkgs/phosh/template
@@ -0,0 +1,21 @@
+# Template file for 'phosh'
+pkgname=phosh
+version=0.4.3
+revision=1
+build_style=meson
+hostmakedepends="phoc glib-devel gettext pkg-config wayland-devel"
+makedepends="libfeedback-devel gcr-devel gnome-desktop-devel pam-devel
+ polkit-devel pulseaudio-devel libsecret-devel libhandy-devel
+ NetworkManager-devel upower-devel"
+depends="phoc squeekboard"
+short_desc="Shell PoC for the Librem5"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/phosh"
+distfiles="https://repo.pureos.net/pureos/pool/main/p/phosh/phosh_$version.tar.xz"
+checksum=c6fc68aafaf78412637b0f509aafbbca877bda3fe19511bf340b824d7cdbd4ee
+
+post_install() {
+ vcopy ${FILESDIR}/sm.puri.OSK0.desktop usr/share/applications
+ vcopy ${FILESDIR}/sm.puri.Phosh.desktop usr/share/applications
+}
From 35848c915ec970f24e96391d8e473f2d734bd4e1 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 29 Aug 2020 18:35:47 -0700
Subject: [PATCH 5/6] New package: calls-0.1.7
---
srcpkgs/calls/template | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
create mode 100644 srcpkgs/calls/template
diff --git a/srcpkgs/calls/template b/srcpkgs/calls/template
new file mode 100644
index 00000000000..260ed391d24
--- /dev/null
+++ b/srcpkgs/calls/template
@@ -0,0 +1,17 @@
+# Template file for 'calls'
+pkgname=calls
+version=0.1.7
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=meson
+hostmakedepends="glib-devel gettext vala pkg-config wayland-devel
+ evolution-data-server-devel"
+makedepends="folks-devel libhandy-devel libpeas-devel gom-devel
+ ModemManager-devel libfeedback-devel"
+depends="NetworkManager"
+short_desc="Phone call application"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/calls"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=477c55d483ca13f6ac98209c3c4d6c5858f706e72a133616dcb6827ef25829c7
From 5d1848ea962983f0f1ecb09847033d44447ecc18 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 29 Aug 2020 18:36:35 -0700
Subject: [PATCH 6/6] New package: purism-chatty-0.1.15
---
srcpkgs/purism-chatty/template | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
create mode 100644 srcpkgs/purism-chatty/template
diff --git a/srcpkgs/purism-chatty/template b/srcpkgs/purism-chatty/template
new file mode 100644
index 00000000000..d11bfcea882
--- /dev/null
+++ b/srcpkgs/purism-chatty/template
@@ -0,0 +1,22 @@
+# Template file for 'purism-chatty'
+pkgname=purism-chatty
+_pkgname=chatty
+version=0.1.15
+revision=1
+wrksrc=${_pkgname}-v${version}
+build_style=meson
+hostmakedepends="glib-devel pkg-config gettext"
+makedepends="libfeedback-devel libhandy-devel evolution-data-server-devel
+ libpurple libpurple-devel"
+short_desc="XMPP and SMS messaging via libpurple and Modemmanager"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/chatty"
+distfiles="${homepage}/-/archive/v${version}/${_pkgname}-v${version}.tar.gz"
+checksum=9be2b79a266a7fa1e3d3e7ba447ff89d2b9e44312d6e55f2a63d191369528d64
+
+pre_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ vsed -i src/meson.build -e "s/purple_plugdir =.*/purple_plugdir = \'\/usr\/${XBPS_CROSS_TRIPLET}\/usr\/lib\/purple-2\'/g"
+ fi
+}
^ permalink raw reply [flat|nested] 47+ messages in thread* Re: New packages: phoc-0.4.2 calls-0.1.7 purism-chatty-0.1.15
2020-08-29 20:46 [PR PATCH] New packages: phoc-0.4.2 calls-0.1.7 purism-chatty--0.1.15 julio641742
` (3 preceding siblings ...)
2020-08-30 1:36 ` julio641742
@ 2020-08-30 3:47 ` julio641742
2020-08-30 3:56 ` [PR REVIEW] " fosslinux
` (40 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: julio641742 @ 2020-08-30 3:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 170 bytes --]
New comment by julio641742 on void-packages repository
https://github.com/void-linux/void-packages/pull/24538#issuecomment-683372410
Comment:
Ready for another review.
^ permalink raw reply [flat|nested] 47+ messages in thread* Re: [PR REVIEW] New packages: phoc-0.4.2 calls-0.1.7 purism-chatty-0.1.15
2020-08-29 20:46 [PR PATCH] New packages: phoc-0.4.2 calls-0.1.7 purism-chatty--0.1.15 julio641742
` (4 preceding siblings ...)
2020-08-30 3:47 ` New packages: phoc-0.4.2 calls-0.1.7 purism-chatty-0.1.15 julio641742
@ 2020-08-30 3:56 ` fosslinux
2020-08-30 3:56 ` fosslinux
` (39 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: fosslinux @ 2020-08-30 3:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 173 bytes --]
New review comment by fosslinux on void-packages repository
https://github.com/void-linux/void-packages/pull/24538#discussion_r479717824
Comment:
Whats `$_devel_depends`?
^ permalink raw reply [flat|nested] 47+ messages in thread* Re: [PR REVIEW] New packages: phoc-0.4.2 calls-0.1.7 purism-chatty-0.1.15
2020-08-29 20:46 [PR PATCH] New packages: phoc-0.4.2 calls-0.1.7 purism-chatty--0.1.15 julio641742
` (5 preceding siblings ...)
2020-08-30 3:56 ` [PR REVIEW] " fosslinux
@ 2020-08-30 3:56 ` fosslinux
2020-08-30 4:08 ` ericonr
` (38 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: fosslinux @ 2020-08-30 3:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 168 bytes --]
New review comment by fosslinux on void-packages repository
https://github.com/void-linux/void-packages/pull/24538#discussion_r479717847
Comment:
Newline after this.
^ permalink raw reply [flat|nested] 47+ messages in thread* Re: [PR REVIEW] New packages: phoc-0.4.2 calls-0.1.7 purism-chatty-0.1.15
2020-08-29 20:46 [PR PATCH] New packages: phoc-0.4.2 calls-0.1.7 purism-chatty--0.1.15 julio641742
` (6 preceding siblings ...)
2020-08-30 3:56 ` fosslinux
@ 2020-08-30 4:08 ` ericonr
2020-08-30 4:10 ` ericonr
` (37 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: ericonr @ 2020-08-30 4:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 235 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/24538#discussion_r479718721
Comment:
It might make sense to name this sub package `feedback-devel` instead, but I'm not sure.
^ permalink raw reply [flat|nested] 47+ messages in thread* Re: [PR REVIEW] New packages: phoc-0.4.2 calls-0.1.7 purism-chatty-0.1.15
2020-08-29 20:46 [PR PATCH] New packages: phoc-0.4.2 calls-0.1.7 purism-chatty--0.1.15 julio641742
` (7 preceding siblings ...)
2020-08-30 4:08 ` ericonr
@ 2020-08-30 4:10 ` ericonr
2020-08-30 17:10 ` PaperMountainStudio
` (36 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: ericonr @ 2020-08-30 4:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 310 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/24538#discussion_r479718721
Comment:
It might make sense to name this sub package `feedback-devel` instead, but I'm not sure. EIther is fine, but `dbus`, for example, has `dbus-devel` and `dbus-libs`.
^ permalink raw reply [flat|nested] 47+ messages in thread* Re: New packages: phoc-0.4.2 calls-0.1.7 purism-chatty-0.1.15
2020-08-29 20:46 [PR PATCH] New packages: phoc-0.4.2 calls-0.1.7 purism-chatty--0.1.15 julio641742
` (8 preceding siblings ...)
2020-08-30 4:10 ` ericonr
@ 2020-08-30 17:10 ` PaperMountainStudio
2020-08-31 0:27 ` [PR PATCH] [Updated] " julio641742
` (35 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: PaperMountainStudio @ 2020-08-30 17:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 382 bytes --]
New comment by PaperMountainStudio on void-packages repository
https://github.com/void-linux/void-packages/pull/24538#issuecomment-683445510
Comment:
I think I found some mistakes:
- phoc is missing mutter dependency
- phosh is missing at least gnome-session dependency, but then fails and asks me to log out
- /usr/bin/squeekboard-entry is not executable
thanks for the PR
^ permalink raw reply [flat|nested] 47+ messages in thread* Re: [PR PATCH] [Updated] New packages: phoc-0.4.2 calls-0.1.7 purism-chatty-0.1.15
2020-08-29 20:46 [PR PATCH] New packages: phoc-0.4.2 calls-0.1.7 purism-chatty--0.1.15 julio641742
` (9 preceding siblings ...)
2020-08-30 17:10 ` PaperMountainStudio
@ 2020-08-31 0:27 ` julio641742
2020-08-31 0:32 ` julio641742
` (34 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: julio641742 @ 2020-08-31 0:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 386 bytes --]
There is an updated pull request by julio641742 against master on the void-packages repository
https://github.com/julio641742/void-packages phosh
https://github.com/void-linux/void-packages/pull/24538
New packages: phoc-0.4.2 calls-0.1.7 purism-chatty-0.1.15
Getting ready for my pinephone :)
A patch file from https://github.com/void-linux/void-packages/pull/24538.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-phosh-24538.patch --]
[-- Type: text/x-diff, Size: 11575 bytes --]
From e1ac49872829fbae45f3b0cde1bcd1d4e6b1f559 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Sat, 29 Aug 2020 11:47:35 -0700
Subject: [PATCH 1/6] New package: feedbackd-0.0.0+git20200707
---
common/shlibs | 1 +
srcpkgs/feedbackd/template | 33 +++++++++++++++++++++++++++++++++
srcpkgs/libfeedback | 1 +
srcpkgs/libfeedback-devel | 1 +
4 files changed, 36 insertions(+)
create mode 100644 srcpkgs/feedbackd/template
create mode 120000 srcpkgs/libfeedback
create mode 120000 srcpkgs/libfeedback-devel
diff --git a/common/shlibs b/common/shlibs
index a6b5737b845..6c0e544a7e1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3988,3 +3988,4 @@ libaml.so.0 aml-0.1.0_1
libneatvnc.so.0 neatvnc-0.2.0_1
libtdjson.so.1.6.0 libtd-1.6.0_1
libJudy.so.1 judy-1.0.5_1
+libfeedback-0.0.so.0 libfeedback-0.0.0+git20200707_1
diff --git a/srcpkgs/feedbackd/template b/srcpkgs/feedbackd/template
new file mode 100644
index 00000000000..923649204f5
--- /dev/null
+++ b/srcpkgs/feedbackd/template
@@ -0,0 +1,33 @@
+# Template file for 'feedbackd'
+pkgname=feedbackd
+version=0.0.0+git20200707
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=meson
+configure_args="-Dvapi=false -Dintrospection=disabled"
+hostmakedepends="glib-devel pkg-config"
+makedepends="gsound-devel libgudev-devel json-glib-devel"
+depends="dbus"
+short_desc="Daemon to provide haptic feedback on events"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/feedbackd"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=37cf48cbdbaee8e2d0bea406f5b6317bf0e3cdf79250f9ce0a884e7d3905a8ea
+
+libfeedback_package() {
+ short_desc+=" - shared libraries"
+ pkg_install() {
+ vmove "usr/lib/*.so.*"
+ }
+}
+
+libfeedback-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ }
+}
diff --git a/srcpkgs/libfeedback b/srcpkgs/libfeedback
new file mode 120000
index 00000000000..49dc965f1cd
--- /dev/null
+++ b/srcpkgs/libfeedback
@@ -0,0 +1 @@
+feedbackd
\ No newline at end of file
diff --git a/srcpkgs/libfeedback-devel b/srcpkgs/libfeedback-devel
new file mode 120000
index 00000000000..49dc965f1cd
--- /dev/null
+++ b/srcpkgs/libfeedback-devel
@@ -0,0 +1 @@
+feedbackd
\ No newline at end of file
From 37b5e384bf97f27d16d7bcf12be06b1e049c5825 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Sat, 29 Aug 2020 11:47:56 -0700
Subject: [PATCH 2/6] New package: phoc-0.4.2
---
srcpkgs/phoc/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/phoc/template
diff --git a/srcpkgs/phoc/template b/srcpkgs/phoc/template
new file mode 100644
index 00000000000..00c9f1f3ab0
--- /dev/null
+++ b/srcpkgs/phoc/template
@@ -0,0 +1,16 @@
+# Template file for 'phoc'
+pkgname=phoc
+version=0.4.2
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=meson
+configure_args="-Dembed-wlroots=disabled"
+hostmakedepends="glib-devel pkg-config wayland-devel"
+makedepends="gnome-desktop-devel wlroots-devel"
+depends="mutter"
+short_desc="Wlroots based Phone compositor for the Phosh shell"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/phoc"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=bdb34644c7d49c953239c1e939bc5ee2bc26f6187b9d756b70b113d2734c712c
From 28a85ade972ca55db0abb22f58f29d9f3ef726ff Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Sat, 29 Aug 2020 11:48:48 -0700
Subject: [PATCH 3/6] New package: squeekboard-1.9.3
---
srcpkgs/squeekboard/template | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
create mode 100644 srcpkgs/squeekboard/template
diff --git a/srcpkgs/squeekboard/template b/srcpkgs/squeekboard/template
new file mode 100644
index 00000000000..a672443da33
--- /dev/null
+++ b/srcpkgs/squeekboard/template
@@ -0,0 +1,21 @@
+# Template file for 'squeekboard'
+pkgname=squeekboard
+version=1.9.3
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=meson
+build_helper=rust
+hostmakedepends="glib-devel gettext pkg-config cargo wayland-devel"
+makedepends="rust gtk+3-devel gnome-desktop-devel libfeedback-devel"
+short_desc="Final Librem5 keyboard"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/squeekboard"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=b99e56faace3986bf752e08c104cea60ed896d514284840655033dd9457db824
+
+pre_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ vsed -i cargo_build.sh -e "s/-a ./-a ${XBPS_CROSS_RUST_TARGET}/g"
+ fi
+}
From a86374e5d2e281af1695c63a75309803976bbbb0 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Sat, 29 Aug 2020 11:48:59 -0700
Subject: [PATCH 4/6] New package: phosh-0.4.3
---
srcpkgs/phosh/files/sm.puri.OSK0.desktop | 12 +++++++++
srcpkgs/phosh/files/sm.puri.Phosh.desktop | 11 ++++++++
srcpkgs/phosh/patches/32bit-build-fix.patch | 30 +++++++++++++++++++++
srcpkgs/phosh/template | 21 +++++++++++++++
4 files changed, 74 insertions(+)
create mode 100644 srcpkgs/phosh/files/sm.puri.OSK0.desktop
create mode 100644 srcpkgs/phosh/files/sm.puri.Phosh.desktop
create mode 100644 srcpkgs/phosh/patches/32bit-build-fix.patch
create mode 100644 srcpkgs/phosh/template
diff --git a/srcpkgs/phosh/files/sm.puri.OSK0.desktop b/srcpkgs/phosh/files/sm.puri.OSK0.desktop
new file mode 100644
index 00000000000..39740f15773
--- /dev/null
+++ b/srcpkgs/phosh/files/sm.puri.OSK0.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Type=Application
+Name=On-screen keyboard
+Comment=Default on-screen keyboard
+Exec=/usr/bin/squeekboard
+Categories=GNOME;Core;
+OnlyShowIn=GNOME;
+NoDisplay=true
+X-GNOME-Autostart-Phase=Panel
+X-GNOME-Provides=inputmethod
+X-GNOME-Autostart-Notify=true
+X-GNOME-AutoRestart=true
diff --git a/srcpkgs/phosh/files/sm.puri.Phosh.desktop b/srcpkgs/phosh/files/sm.puri.Phosh.desktop
new file mode 100644
index 00000000000..84452845115
--- /dev/null
+++ b/srcpkgs/phosh/files/sm.puri.Phosh.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=Phosh
+Name[en]=Phosh
+Comment=This session logs you into Phosh
+Comment[en]=This session logs in you into Phosh
+Exec=dbus-run-session /usr/bin/phosh
+TryExec=/usr/bin/phosh
+Icon=
+Type=Application
+X-DesktopNames=Phosh
+Keywords=launch;Phosh;desktop;session;
diff --git a/srcpkgs/phosh/patches/32bit-build-fix.patch b/srcpkgs/phosh/patches/32bit-build-fix.patch
new file mode 100644
index 00000000000..a98ecb0faa5
--- /dev/null
+++ b/srcpkgs/phosh/patches/32bit-build-fix.patch
@@ -0,0 +1,30 @@
+From d1da5ea7d18c6794c9a7d2f41355fe90d4115ac1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
+Date: Tue, 4 Aug 2020 08:22:39 +0200
+Subject: [PATCH] timestamp-label: Unbreak build on 32 bit platforms
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Use a G_ format specifier for GTimeSpan.
+
+Signed-off-by: Guido Günther <guido.gunther@puri.sm>
+---
+ src/notifications/timestamp-label.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/notifications/timestamp-label.c b/src/notifications/timestamp-label.c
+index 0aa04ce0..a5a4d5e7 100644
+--- src/notifications/timestamp-label.c
++++ src/notifications/timestamp-label.c
+@@ -255,7 +255,7 @@ phosh_timestamp_label_calc_timeout (PhoshTimestampLabel *self)
+ break;
+ }
+ timeout_diff = g_date_time_difference (timeout_time, time_now);
+- g_debug ("time out duration = %ld", timeout_diff);
++ g_debug ("time out duration: %" G_GINT64_FORMAT, timeout_diff);
+ return timeout_diff;
+ }
+
+--
+2.26.2
diff --git a/srcpkgs/phosh/template b/srcpkgs/phosh/template
new file mode 100644
index 00000000000..efca034cc11
--- /dev/null
+++ b/srcpkgs/phosh/template
@@ -0,0 +1,21 @@
+# Template file for 'phosh'
+pkgname=phosh
+version=0.4.3
+revision=1
+build_style=meson
+hostmakedepends="phoc glib-devel gettext pkg-config wayland-devel"
+makedepends="libfeedback-devel gcr-devel gnome-desktop-devel pam-devel
+ polkit-devel pulseaudio-devel libsecret-devel libhandy-devel
+ NetworkManager-devel upower-devel"
+depends="phoc squeekboard gnome-session gnome-settings-daemon gnome-control-center"
+short_desc="Shell PoC for the Librem5"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/phosh"
+distfiles="https://repo.pureos.net/pureos/pool/main/p/phosh/phosh_$version.tar.xz"
+checksum=c6fc68aafaf78412637b0f509aafbbca877bda3fe19511bf340b824d7cdbd4ee
+
+post_install() {
+ vcopy ${FILESDIR}/sm.puri.OSK0.desktop usr/share/applications
+ vcopy ${FILESDIR}/sm.puri.Phosh.desktop usr/share/applications
+}
From 7db16cc3a26ad3f6fb8f612a9b3f7e45b1fe59ea Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 29 Aug 2020 18:35:47 -0700
Subject: [PATCH 5/6] New package: calls-0.1.7
---
srcpkgs/calls/template | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
create mode 100644 srcpkgs/calls/template
diff --git a/srcpkgs/calls/template b/srcpkgs/calls/template
new file mode 100644
index 00000000000..260ed391d24
--- /dev/null
+++ b/srcpkgs/calls/template
@@ -0,0 +1,17 @@
+# Template file for 'calls'
+pkgname=calls
+version=0.1.7
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=meson
+hostmakedepends="glib-devel gettext vala pkg-config wayland-devel
+ evolution-data-server-devel"
+makedepends="folks-devel libhandy-devel libpeas-devel gom-devel
+ ModemManager-devel libfeedback-devel"
+depends="NetworkManager"
+short_desc="Phone call application"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/calls"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=477c55d483ca13f6ac98209c3c4d6c5858f706e72a133616dcb6827ef25829c7
From 1b1c543fce371bd2150663a233c9d78c7d943b05 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 29 Aug 2020 18:36:35 -0700
Subject: [PATCH 6/6] New package: purism-chatty-0.1.15
---
srcpkgs/purism-chatty/template | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
create mode 100644 srcpkgs/purism-chatty/template
diff --git a/srcpkgs/purism-chatty/template b/srcpkgs/purism-chatty/template
new file mode 100644
index 00000000000..d11bfcea882
--- /dev/null
+++ b/srcpkgs/purism-chatty/template
@@ -0,0 +1,22 @@
+# Template file for 'purism-chatty'
+pkgname=purism-chatty
+_pkgname=chatty
+version=0.1.15
+revision=1
+wrksrc=${_pkgname}-v${version}
+build_style=meson
+hostmakedepends="glib-devel pkg-config gettext"
+makedepends="libfeedback-devel libhandy-devel evolution-data-server-devel
+ libpurple libpurple-devel"
+short_desc="XMPP and SMS messaging via libpurple and Modemmanager"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/chatty"
+distfiles="${homepage}/-/archive/v${version}/${_pkgname}-v${version}.tar.gz"
+checksum=9be2b79a266a7fa1e3d3e7ba447ff89d2b9e44312d6e55f2a63d191369528d64
+
+pre_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ vsed -i src/meson.build -e "s/purple_plugdir =.*/purple_plugdir = \'\/usr\/${XBPS_CROSS_TRIPLET}\/usr\/lib\/purple-2\'/g"
+ fi
+}
^ permalink raw reply [flat|nested] 47+ messages in thread* Re: [PR PATCH] [Updated] New packages: phoc-0.4.2 calls-0.1.7 purism-chatty-0.1.15
2020-08-29 20:46 [PR PATCH] New packages: phoc-0.4.2 calls-0.1.7 purism-chatty--0.1.15 julio641742
` (10 preceding siblings ...)
2020-08-31 0:27 ` [PR PATCH] [Updated] " julio641742
@ 2020-08-31 0:32 ` julio641742
2020-08-31 0:35 ` [PR REVIEW] " julio641742
` (33 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: julio641742 @ 2020-08-31 0:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 386 bytes --]
There is an updated pull request by julio641742 against master on the void-packages repository
https://github.com/julio641742/void-packages phosh
https://github.com/void-linux/void-packages/pull/24538
New packages: phoc-0.4.2 calls-0.1.7 purism-chatty-0.1.15
Getting ready for my pinephone :)
A patch file from https://github.com/void-linux/void-packages/pull/24538.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-phosh-24538.patch --]
[-- Type: text/x-diff, Size: 11606 bytes --]
From 328e209cf54b98cbe105c6d86b2cbbbeae7779b4 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Sat, 29 Aug 2020 11:47:35 -0700
Subject: [PATCH 1/6] New package: feedbackd-0.0.0+git20200707
---
common/shlibs | 1 +
srcpkgs/feedbackd/template | 33 +++++++++++++++++++++++++++++++++
srcpkgs/libfeedback | 1 +
srcpkgs/libfeedback-devel | 1 +
4 files changed, 36 insertions(+)
create mode 100644 srcpkgs/feedbackd/template
create mode 120000 srcpkgs/libfeedback
create mode 120000 srcpkgs/libfeedback-devel
diff --git a/common/shlibs b/common/shlibs
index 33919236eda..f8beaf0fabd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3988,3 +3988,4 @@ libneatvnc.so.0 neatvnc-0.2.0_1
libtdjson.so.1.6.0 libtd-1.6.0_1
libJudy.so.1 judy-1.0.5_1
libsignal-protocol-c.so.2 libsignal-protocol-c-2.3.3_2
+libfeedback-0.0.so.0 libfeedback-0.0.0+git20200707_1
diff --git a/srcpkgs/feedbackd/template b/srcpkgs/feedbackd/template
new file mode 100644
index 00000000000..923649204f5
--- /dev/null
+++ b/srcpkgs/feedbackd/template
@@ -0,0 +1,33 @@
+# Template file for 'feedbackd'
+pkgname=feedbackd
+version=0.0.0+git20200707
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=meson
+configure_args="-Dvapi=false -Dintrospection=disabled"
+hostmakedepends="glib-devel pkg-config"
+makedepends="gsound-devel libgudev-devel json-glib-devel"
+depends="dbus"
+short_desc="Daemon to provide haptic feedback on events"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/feedbackd"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=37cf48cbdbaee8e2d0bea406f5b6317bf0e3cdf79250f9ce0a884e7d3905a8ea
+
+libfeedback_package() {
+ short_desc+=" - shared libraries"
+ pkg_install() {
+ vmove "usr/lib/*.so.*"
+ }
+}
+
+libfeedback-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ }
+}
diff --git a/srcpkgs/libfeedback b/srcpkgs/libfeedback
new file mode 120000
index 00000000000..49dc965f1cd
--- /dev/null
+++ b/srcpkgs/libfeedback
@@ -0,0 +1 @@
+feedbackd
\ No newline at end of file
diff --git a/srcpkgs/libfeedback-devel b/srcpkgs/libfeedback-devel
new file mode 120000
index 00000000000..49dc965f1cd
--- /dev/null
+++ b/srcpkgs/libfeedback-devel
@@ -0,0 +1 @@
+feedbackd
\ No newline at end of file
From 040e354d15187152290ad0e9761a5203dc6fa144 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Sat, 29 Aug 2020 11:47:56 -0700
Subject: [PATCH 2/6] New package: phoc-0.4.2
---
srcpkgs/phoc/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/phoc/template
diff --git a/srcpkgs/phoc/template b/srcpkgs/phoc/template
new file mode 100644
index 00000000000..00c9f1f3ab0
--- /dev/null
+++ b/srcpkgs/phoc/template
@@ -0,0 +1,16 @@
+# Template file for 'phoc'
+pkgname=phoc
+version=0.4.2
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=meson
+configure_args="-Dembed-wlroots=disabled"
+hostmakedepends="glib-devel pkg-config wayland-devel"
+makedepends="gnome-desktop-devel wlroots-devel"
+depends="mutter"
+short_desc="Wlroots based Phone compositor for the Phosh shell"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/phoc"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=bdb34644c7d49c953239c1e939bc5ee2bc26f6187b9d756b70b113d2734c712c
From c50273bf88cf8a47cbd16e151e46be9c88072e91 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Sat, 29 Aug 2020 11:48:48 -0700
Subject: [PATCH 3/6] New package: squeekboard-1.9.3
---
srcpkgs/squeekboard/template | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
create mode 100644 srcpkgs/squeekboard/template
diff --git a/srcpkgs/squeekboard/template b/srcpkgs/squeekboard/template
new file mode 100644
index 00000000000..a672443da33
--- /dev/null
+++ b/srcpkgs/squeekboard/template
@@ -0,0 +1,21 @@
+# Template file for 'squeekboard'
+pkgname=squeekboard
+version=1.9.3
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=meson
+build_helper=rust
+hostmakedepends="glib-devel gettext pkg-config cargo wayland-devel"
+makedepends="rust gtk+3-devel gnome-desktop-devel libfeedback-devel"
+short_desc="Final Librem5 keyboard"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/squeekboard"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=b99e56faace3986bf752e08c104cea60ed896d514284840655033dd9457db824
+
+pre_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ vsed -i cargo_build.sh -e "s/-a ./-a ${XBPS_CROSS_RUST_TARGET}/g"
+ fi
+}
From 5a95ae3db38f7e434202ad39705e1c7f9c822f72 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Sat, 29 Aug 2020 11:48:59 -0700
Subject: [PATCH 4/6] New package: phosh-0.4.3
---
srcpkgs/phosh/files/sm.puri.OSK0.desktop | 12 +++++++++
srcpkgs/phosh/files/sm.puri.Phosh.desktop | 11 ++++++++
srcpkgs/phosh/patches/32bit-build-fix.patch | 30 +++++++++++++++++++++
srcpkgs/phosh/template | 21 +++++++++++++++
4 files changed, 74 insertions(+)
create mode 100644 srcpkgs/phosh/files/sm.puri.OSK0.desktop
create mode 100644 srcpkgs/phosh/files/sm.puri.Phosh.desktop
create mode 100644 srcpkgs/phosh/patches/32bit-build-fix.patch
create mode 100644 srcpkgs/phosh/template
diff --git a/srcpkgs/phosh/files/sm.puri.OSK0.desktop b/srcpkgs/phosh/files/sm.puri.OSK0.desktop
new file mode 100644
index 00000000000..39740f15773
--- /dev/null
+++ b/srcpkgs/phosh/files/sm.puri.OSK0.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Type=Application
+Name=On-screen keyboard
+Comment=Default on-screen keyboard
+Exec=/usr/bin/squeekboard
+Categories=GNOME;Core;
+OnlyShowIn=GNOME;
+NoDisplay=true
+X-GNOME-Autostart-Phase=Panel
+X-GNOME-Provides=inputmethod
+X-GNOME-Autostart-Notify=true
+X-GNOME-AutoRestart=true
diff --git a/srcpkgs/phosh/files/sm.puri.Phosh.desktop b/srcpkgs/phosh/files/sm.puri.Phosh.desktop
new file mode 100644
index 00000000000..84452845115
--- /dev/null
+++ b/srcpkgs/phosh/files/sm.puri.Phosh.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=Phosh
+Name[en]=Phosh
+Comment=This session logs you into Phosh
+Comment[en]=This session logs in you into Phosh
+Exec=dbus-run-session /usr/bin/phosh
+TryExec=/usr/bin/phosh
+Icon=
+Type=Application
+X-DesktopNames=Phosh
+Keywords=launch;Phosh;desktop;session;
diff --git a/srcpkgs/phosh/patches/32bit-build-fix.patch b/srcpkgs/phosh/patches/32bit-build-fix.patch
new file mode 100644
index 00000000000..a98ecb0faa5
--- /dev/null
+++ b/srcpkgs/phosh/patches/32bit-build-fix.patch
@@ -0,0 +1,30 @@
+From d1da5ea7d18c6794c9a7d2f41355fe90d4115ac1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
+Date: Tue, 4 Aug 2020 08:22:39 +0200
+Subject: [PATCH] timestamp-label: Unbreak build on 32 bit platforms
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Use a G_ format specifier for GTimeSpan.
+
+Signed-off-by: Guido Günther <guido.gunther@puri.sm>
+---
+ src/notifications/timestamp-label.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/notifications/timestamp-label.c b/src/notifications/timestamp-label.c
+index 0aa04ce0..a5a4d5e7 100644
+--- src/notifications/timestamp-label.c
++++ src/notifications/timestamp-label.c
+@@ -255,7 +255,7 @@ phosh_timestamp_label_calc_timeout (PhoshTimestampLabel *self)
+ break;
+ }
+ timeout_diff = g_date_time_difference (timeout_time, time_now);
+- g_debug ("time out duration = %ld", timeout_diff);
++ g_debug ("time out duration: %" G_GINT64_FORMAT, timeout_diff);
+ return timeout_diff;
+ }
+
+--
+2.26.2
diff --git a/srcpkgs/phosh/template b/srcpkgs/phosh/template
new file mode 100644
index 00000000000..efca034cc11
--- /dev/null
+++ b/srcpkgs/phosh/template
@@ -0,0 +1,21 @@
+# Template file for 'phosh'
+pkgname=phosh
+version=0.4.3
+revision=1
+build_style=meson
+hostmakedepends="phoc glib-devel gettext pkg-config wayland-devel"
+makedepends="libfeedback-devel gcr-devel gnome-desktop-devel pam-devel
+ polkit-devel pulseaudio-devel libsecret-devel libhandy-devel
+ NetworkManager-devel upower-devel"
+depends="phoc squeekboard gnome-session gnome-settings-daemon gnome-control-center"
+short_desc="Shell PoC for the Librem5"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/phosh"
+distfiles="https://repo.pureos.net/pureos/pool/main/p/phosh/phosh_$version.tar.xz"
+checksum=c6fc68aafaf78412637b0f509aafbbca877bda3fe19511bf340b824d7cdbd4ee
+
+post_install() {
+ vcopy ${FILESDIR}/sm.puri.OSK0.desktop usr/share/applications
+ vcopy ${FILESDIR}/sm.puri.Phosh.desktop usr/share/applications
+}
From 0ae41dea57354235bec9001098c3df1932eac9b7 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 29 Aug 2020 18:35:47 -0700
Subject: [PATCH 5/6] New package: calls-0.1.7
---
srcpkgs/calls/template | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
create mode 100644 srcpkgs/calls/template
diff --git a/srcpkgs/calls/template b/srcpkgs/calls/template
new file mode 100644
index 00000000000..260ed391d24
--- /dev/null
+++ b/srcpkgs/calls/template
@@ -0,0 +1,17 @@
+# Template file for 'calls'
+pkgname=calls
+version=0.1.7
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=meson
+hostmakedepends="glib-devel gettext vala pkg-config wayland-devel
+ evolution-data-server-devel"
+makedepends="folks-devel libhandy-devel libpeas-devel gom-devel
+ ModemManager-devel libfeedback-devel"
+depends="NetworkManager"
+short_desc="Phone call application"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/calls"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=477c55d483ca13f6ac98209c3c4d6c5858f706e72a133616dcb6827ef25829c7
From 2bf2259c3b1a9e9287792cae57e824d83ea1a041 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 29 Aug 2020 18:36:35 -0700
Subject: [PATCH 6/6] New package: purism-chatty-0.1.15
---
srcpkgs/purism-chatty/template | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
create mode 100644 srcpkgs/purism-chatty/template
diff --git a/srcpkgs/purism-chatty/template b/srcpkgs/purism-chatty/template
new file mode 100644
index 00000000000..d11bfcea882
--- /dev/null
+++ b/srcpkgs/purism-chatty/template
@@ -0,0 +1,22 @@
+# Template file for 'purism-chatty'
+pkgname=purism-chatty
+_pkgname=chatty
+version=0.1.15
+revision=1
+wrksrc=${_pkgname}-v${version}
+build_style=meson
+hostmakedepends="glib-devel pkg-config gettext"
+makedepends="libfeedback-devel libhandy-devel evolution-data-server-devel
+ libpurple libpurple-devel"
+short_desc="XMPP and SMS messaging via libpurple and Modemmanager"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/chatty"
+distfiles="${homepage}/-/archive/v${version}/${_pkgname}-v${version}.tar.gz"
+checksum=9be2b79a266a7fa1e3d3e7ba447ff89d2b9e44312d6e55f2a63d191369528d64
+
+pre_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ vsed -i src/meson.build -e "s/purple_plugdir =.*/purple_plugdir = \'\/usr\/${XBPS_CROSS_TRIPLET}\/usr\/lib\/purple-2\'/g"
+ fi
+}
^ permalink raw reply [flat|nested] 47+ messages in thread* Re: [PR REVIEW] New packages: phoc-0.4.2 calls-0.1.7 purism-chatty-0.1.15
2020-08-29 20:46 [PR PATCH] New packages: phoc-0.4.2 calls-0.1.7 purism-chatty--0.1.15 julio641742
` (11 preceding siblings ...)
2020-08-31 0:32 ` julio641742
@ 2020-08-31 0:35 ` julio641742
2020-08-31 0:39 ` [PR PATCH] [Updated] " julio641742
` (32 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: julio641742 @ 2020-08-31 0:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 210 bytes --]
New review comment by julio641742 on void-packages repository
https://github.com/void-linux/void-packages/pull/24538#discussion_r479837477
Comment:
Should I rename it to `feedback-libs` and `feedback-devel`?
^ permalink raw reply [flat|nested] 47+ messages in thread* Re: [PR PATCH] [Updated] New packages: phoc-0.4.2 calls-0.1.7 purism-chatty-0.1.15
2020-08-29 20:46 [PR PATCH] New packages: phoc-0.4.2 calls-0.1.7 purism-chatty--0.1.15 julio641742
` (12 preceding siblings ...)
2020-08-31 0:35 ` [PR REVIEW] " julio641742
@ 2020-08-31 0:39 ` julio641742
2020-08-31 0:41 ` julio641742
` (31 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: julio641742 @ 2020-08-31 0:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 386 bytes --]
There is an updated pull request by julio641742 against master on the void-packages repository
https://github.com/julio641742/void-packages phosh
https://github.com/void-linux/void-packages/pull/24538
New packages: phoc-0.4.2 calls-0.1.7 purism-chatty-0.1.15
Getting ready for my pinephone :)
A patch file from https://github.com/void-linux/void-packages/pull/24538.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-phosh-24538.patch --]
[-- Type: text/x-diff, Size: 11681 bytes --]
From 328e209cf54b98cbe105c6d86b2cbbbeae7779b4 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Sat, 29 Aug 2020 11:47:35 -0700
Subject: [PATCH 1/6] New package: feedbackd-0.0.0+git20200707
---
common/shlibs | 1 +
srcpkgs/feedbackd/template | 33 +++++++++++++++++++++++++++++++++
srcpkgs/libfeedback | 1 +
srcpkgs/libfeedback-devel | 1 +
4 files changed, 36 insertions(+)
create mode 100644 srcpkgs/feedbackd/template
create mode 120000 srcpkgs/libfeedback
create mode 120000 srcpkgs/libfeedback-devel
diff --git a/common/shlibs b/common/shlibs
index 33919236eda..f8beaf0fabd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3988,3 +3988,4 @@ libneatvnc.so.0 neatvnc-0.2.0_1
libtdjson.so.1.6.0 libtd-1.6.0_1
libJudy.so.1 judy-1.0.5_1
libsignal-protocol-c.so.2 libsignal-protocol-c-2.3.3_2
+libfeedback-0.0.so.0 libfeedback-0.0.0+git20200707_1
diff --git a/srcpkgs/feedbackd/template b/srcpkgs/feedbackd/template
new file mode 100644
index 00000000000..923649204f5
--- /dev/null
+++ b/srcpkgs/feedbackd/template
@@ -0,0 +1,33 @@
+# Template file for 'feedbackd'
+pkgname=feedbackd
+version=0.0.0+git20200707
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=meson
+configure_args="-Dvapi=false -Dintrospection=disabled"
+hostmakedepends="glib-devel pkg-config"
+makedepends="gsound-devel libgudev-devel json-glib-devel"
+depends="dbus"
+short_desc="Daemon to provide haptic feedback on events"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/feedbackd"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=37cf48cbdbaee8e2d0bea406f5b6317bf0e3cdf79250f9ce0a884e7d3905a8ea
+
+libfeedback_package() {
+ short_desc+=" - shared libraries"
+ pkg_install() {
+ vmove "usr/lib/*.so.*"
+ }
+}
+
+libfeedback-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ }
+}
diff --git a/srcpkgs/libfeedback b/srcpkgs/libfeedback
new file mode 120000
index 00000000000..49dc965f1cd
--- /dev/null
+++ b/srcpkgs/libfeedback
@@ -0,0 +1 @@
+feedbackd
\ No newline at end of file
diff --git a/srcpkgs/libfeedback-devel b/srcpkgs/libfeedback-devel
new file mode 120000
index 00000000000..49dc965f1cd
--- /dev/null
+++ b/srcpkgs/libfeedback-devel
@@ -0,0 +1 @@
+feedbackd
\ No newline at end of file
From 040e354d15187152290ad0e9761a5203dc6fa144 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Sat, 29 Aug 2020 11:47:56 -0700
Subject: [PATCH 2/6] New package: phoc-0.4.2
---
srcpkgs/phoc/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/phoc/template
diff --git a/srcpkgs/phoc/template b/srcpkgs/phoc/template
new file mode 100644
index 00000000000..00c9f1f3ab0
--- /dev/null
+++ b/srcpkgs/phoc/template
@@ -0,0 +1,16 @@
+# Template file for 'phoc'
+pkgname=phoc
+version=0.4.2
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=meson
+configure_args="-Dembed-wlroots=disabled"
+hostmakedepends="glib-devel pkg-config wayland-devel"
+makedepends="gnome-desktop-devel wlroots-devel"
+depends="mutter"
+short_desc="Wlroots based Phone compositor for the Phosh shell"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/phoc"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=bdb34644c7d49c953239c1e939bc5ee2bc26f6187b9d756b70b113d2734c712c
From 476f6f35d73ebe453fe681f72ebdbd257fbb4140 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Sat, 29 Aug 2020 11:48:48 -0700
Subject: [PATCH 3/6] New package: squeekboard-1.9.3
---
srcpkgs/squeekboard/template | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
create mode 100644 srcpkgs/squeekboard/template
diff --git a/srcpkgs/squeekboard/template b/srcpkgs/squeekboard/template
new file mode 100644
index 00000000000..938248efa6b
--- /dev/null
+++ b/srcpkgs/squeekboard/template
@@ -0,0 +1,25 @@
+# Template file for 'squeekboard'
+pkgname=squeekboard
+version=1.9.3
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=meson
+build_helper=rust
+hostmakedepends="glib-devel gettext pkg-config cargo wayland-devel"
+makedepends="rust gtk+3-devel gnome-desktop-devel libfeedback-devel"
+short_desc="Final Librem5 keyboard"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/squeekboard"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=b99e56faace3986bf752e08c104cea60ed896d514284840655033dd9457db824
+
+pre_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ vsed -i cargo_build.sh -e "s/-a ./-a ${XBPS_CROSS_RUST_TARGET}/g"
+ fi
+}
+
+post_install() {
+ chmod +x ${DESTDIR}/usr/bin/squeekboard-entry
+}
From 96d5669f96328a6fe91ab58d5d4c77bb1bd2b6a9 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Sat, 29 Aug 2020 11:48:59 -0700
Subject: [PATCH 4/6] New package: phosh-0.4.3
---
srcpkgs/phosh/files/sm.puri.OSK0.desktop | 12 +++++++++
srcpkgs/phosh/files/sm.puri.Phosh.desktop | 11 ++++++++
srcpkgs/phosh/patches/32bit-build-fix.patch | 30 +++++++++++++++++++++
srcpkgs/phosh/template | 21 +++++++++++++++
4 files changed, 74 insertions(+)
create mode 100644 srcpkgs/phosh/files/sm.puri.OSK0.desktop
create mode 100644 srcpkgs/phosh/files/sm.puri.Phosh.desktop
create mode 100644 srcpkgs/phosh/patches/32bit-build-fix.patch
create mode 100644 srcpkgs/phosh/template
diff --git a/srcpkgs/phosh/files/sm.puri.OSK0.desktop b/srcpkgs/phosh/files/sm.puri.OSK0.desktop
new file mode 100644
index 00000000000..39740f15773
--- /dev/null
+++ b/srcpkgs/phosh/files/sm.puri.OSK0.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Type=Application
+Name=On-screen keyboard
+Comment=Default on-screen keyboard
+Exec=/usr/bin/squeekboard
+Categories=GNOME;Core;
+OnlyShowIn=GNOME;
+NoDisplay=true
+X-GNOME-Autostart-Phase=Panel
+X-GNOME-Provides=inputmethod
+X-GNOME-Autostart-Notify=true
+X-GNOME-AutoRestart=true
diff --git a/srcpkgs/phosh/files/sm.puri.Phosh.desktop b/srcpkgs/phosh/files/sm.puri.Phosh.desktop
new file mode 100644
index 00000000000..84452845115
--- /dev/null
+++ b/srcpkgs/phosh/files/sm.puri.Phosh.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=Phosh
+Name[en]=Phosh
+Comment=This session logs you into Phosh
+Comment[en]=This session logs in you into Phosh
+Exec=dbus-run-session /usr/bin/phosh
+TryExec=/usr/bin/phosh
+Icon=
+Type=Application
+X-DesktopNames=Phosh
+Keywords=launch;Phosh;desktop;session;
diff --git a/srcpkgs/phosh/patches/32bit-build-fix.patch b/srcpkgs/phosh/patches/32bit-build-fix.patch
new file mode 100644
index 00000000000..a98ecb0faa5
--- /dev/null
+++ b/srcpkgs/phosh/patches/32bit-build-fix.patch
@@ -0,0 +1,30 @@
+From d1da5ea7d18c6794c9a7d2f41355fe90d4115ac1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
+Date: Tue, 4 Aug 2020 08:22:39 +0200
+Subject: [PATCH] timestamp-label: Unbreak build on 32 bit platforms
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Use a G_ format specifier for GTimeSpan.
+
+Signed-off-by: Guido Günther <guido.gunther@puri.sm>
+---
+ src/notifications/timestamp-label.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/notifications/timestamp-label.c b/src/notifications/timestamp-label.c
+index 0aa04ce0..a5a4d5e7 100644
+--- src/notifications/timestamp-label.c
++++ src/notifications/timestamp-label.c
+@@ -255,7 +255,7 @@ phosh_timestamp_label_calc_timeout (PhoshTimestampLabel *self)
+ break;
+ }
+ timeout_diff = g_date_time_difference (timeout_time, time_now);
+- g_debug ("time out duration = %ld", timeout_diff);
++ g_debug ("time out duration: %" G_GINT64_FORMAT, timeout_diff);
+ return timeout_diff;
+ }
+
+--
+2.26.2
diff --git a/srcpkgs/phosh/template b/srcpkgs/phosh/template
new file mode 100644
index 00000000000..efca034cc11
--- /dev/null
+++ b/srcpkgs/phosh/template
@@ -0,0 +1,21 @@
+# Template file for 'phosh'
+pkgname=phosh
+version=0.4.3
+revision=1
+build_style=meson
+hostmakedepends="phoc glib-devel gettext pkg-config wayland-devel"
+makedepends="libfeedback-devel gcr-devel gnome-desktop-devel pam-devel
+ polkit-devel pulseaudio-devel libsecret-devel libhandy-devel
+ NetworkManager-devel upower-devel"
+depends="phoc squeekboard gnome-session gnome-settings-daemon gnome-control-center"
+short_desc="Shell PoC for the Librem5"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/phosh"
+distfiles="https://repo.pureos.net/pureos/pool/main/p/phosh/phosh_$version.tar.xz"
+checksum=c6fc68aafaf78412637b0f509aafbbca877bda3fe19511bf340b824d7cdbd4ee
+
+post_install() {
+ vcopy ${FILESDIR}/sm.puri.OSK0.desktop usr/share/applications
+ vcopy ${FILESDIR}/sm.puri.Phosh.desktop usr/share/applications
+}
From b2057074fe85f71f9ecd5dc9b221f99bdb4b8d9b Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 29 Aug 2020 18:35:47 -0700
Subject: [PATCH 5/6] New package: calls-0.1.7
---
srcpkgs/calls/template | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
create mode 100644 srcpkgs/calls/template
diff --git a/srcpkgs/calls/template b/srcpkgs/calls/template
new file mode 100644
index 00000000000..260ed391d24
--- /dev/null
+++ b/srcpkgs/calls/template
@@ -0,0 +1,17 @@
+# Template file for 'calls'
+pkgname=calls
+version=0.1.7
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=meson
+hostmakedepends="glib-devel gettext vala pkg-config wayland-devel
+ evolution-data-server-devel"
+makedepends="folks-devel libhandy-devel libpeas-devel gom-devel
+ ModemManager-devel libfeedback-devel"
+depends="NetworkManager"
+short_desc="Phone call application"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/calls"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=477c55d483ca13f6ac98209c3c4d6c5858f706e72a133616dcb6827ef25829c7
From 23eb4c41b0a77ab7999f5ee705b7fabbf7889243 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 29 Aug 2020 18:36:35 -0700
Subject: [PATCH 6/6] New package: purism-chatty-0.1.15
---
srcpkgs/purism-chatty/template | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
create mode 100644 srcpkgs/purism-chatty/template
diff --git a/srcpkgs/purism-chatty/template b/srcpkgs/purism-chatty/template
new file mode 100644
index 00000000000..d11bfcea882
--- /dev/null
+++ b/srcpkgs/purism-chatty/template
@@ -0,0 +1,22 @@
+# Template file for 'purism-chatty'
+pkgname=purism-chatty
+_pkgname=chatty
+version=0.1.15
+revision=1
+wrksrc=${_pkgname}-v${version}
+build_style=meson
+hostmakedepends="glib-devel pkg-config gettext"
+makedepends="libfeedback-devel libhandy-devel evolution-data-server-devel
+ libpurple libpurple-devel"
+short_desc="XMPP and SMS messaging via libpurple and Modemmanager"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/chatty"
+distfiles="${homepage}/-/archive/v${version}/${_pkgname}-v${version}.tar.gz"
+checksum=9be2b79a266a7fa1e3d3e7ba447ff89d2b9e44312d6e55f2a63d191369528d64
+
+pre_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ vsed -i src/meson.build -e "s/purple_plugdir =.*/purple_plugdir = \'\/usr\/${XBPS_CROSS_TRIPLET}\/usr\/lib\/purple-2\'/g"
+ fi
+}
^ permalink raw reply [flat|nested] 47+ messages in thread* Re: New packages: phoc-0.4.2 calls-0.1.7 purism-chatty-0.1.15
2020-08-29 20:46 [PR PATCH] New packages: phoc-0.4.2 calls-0.1.7 purism-chatty--0.1.15 julio641742
` (13 preceding siblings ...)
2020-08-31 0:39 ` [PR PATCH] [Updated] " julio641742
@ 2020-08-31 0:41 ` julio641742
2020-08-31 1:06 ` [PR REVIEW] " ericonr
` (30 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: julio641742 @ 2020-08-31 0:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 368 bytes --]
New comment by julio641742 on void-packages repository
https://github.com/void-linux/void-packages/pull/24538#issuecomment-683495400
Comment:
@PaperMountainStudio I did not catch these mistakes, thanks
- I added mutter to phoc
- I added the missing dependencies to phosh and it runs
- squeekboard-entry is now an executable
@fosslinux ready for another review
^ permalink raw reply [flat|nested] 47+ messages in thread* Re: [PR REVIEW] New packages: phoc-0.4.2 calls-0.1.7 purism-chatty-0.1.15
2020-08-29 20:46 [PR PATCH] New packages: phoc-0.4.2 calls-0.1.7 purism-chatty--0.1.15 julio641742
` (14 preceding siblings ...)
2020-08-31 0:41 ` julio641742
@ 2020-08-31 1:06 ` ericonr
2020-09-12 18:00 ` [PR PATCH] [Updated] " julio641742
` (29 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: ericonr @ 2020-08-31 1:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 276 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/24538#discussion_r479841986
Comment:
Honestly, given that @fosslinux suggested these specific names, I'm okay with keeping them. It was mostly an unnecessary comment.
^ permalink raw reply [flat|nested] 47+ messages in thread* Re: [PR PATCH] [Updated] New packages: phoc-0.4.2 calls-0.1.7 purism-chatty-0.1.15
2020-08-29 20:46 [PR PATCH] New packages: phoc-0.4.2 calls-0.1.7 purism-chatty--0.1.15 julio641742
` (15 preceding siblings ...)
2020-08-31 1:06 ` [PR REVIEW] " ericonr
@ 2020-09-12 18:00 ` julio641742
2020-09-12 18:19 ` julio641742
` (28 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: julio641742 @ 2020-09-12 18:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 386 bytes --]
There is an updated pull request by julio641742 against master on the void-packages repository
https://github.com/julio641742/void-packages phosh
https://github.com/void-linux/void-packages/pull/24538
New packages: phoc-0.4.2 calls-0.1.7 purism-chatty-0.1.15
Getting ready for my pinephone :)
A patch file from https://github.com/void-linux/void-packages/pull/24538.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-phosh-24538.patch --]
[-- Type: text/x-diff, Size: 13554 bytes --]
From 17528a815b0370ec2ea85f0c34e05e1cb5b16185 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Sat, 29 Aug 2020 11:47:35 -0700
Subject: [PATCH 1/7] New package: feedbackd-0.0.0+git20200707
---
common/shlibs | 1 +
srcpkgs/feedbackd/template | 37 +++++++++++++++++++++++++++++++++++++
srcpkgs/libfeedback | 1 +
srcpkgs/libfeedback-devel | 1 +
4 files changed, 40 insertions(+)
create mode 100644 srcpkgs/feedbackd/template
create mode 120000 srcpkgs/libfeedback
create mode 120000 srcpkgs/libfeedback-devel
diff --git a/common/shlibs b/common/shlibs
index ec8310df7b34..752730f829bf 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3990,3 +3990,4 @@ libneatvnc.so.0 neatvnc-0.2.0_1
libtdjson.so.1.6.0 libtd-1.6.0_1
libJudy.so.1 judy-1.0.5_1
libsignal-protocol-c.so.2 libsignal-protocol-c-2.3.3_2
+libfeedback-0.0.so.0 libfeedback-0.0.0+git20200707_1
diff --git a/srcpkgs/feedbackd/template b/srcpkgs/feedbackd/template
new file mode 100644
index 000000000000..0131775cc9da
--- /dev/null
+++ b/srcpkgs/feedbackd/template
@@ -0,0 +1,37 @@
+# Template file for 'feedbackd'
+pkgname=feedbackd
+version=0.0.0+git20200707
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=meson
+build_helper=gir
+hostmakedepends="vala glib-devel pkg-config"
+makedepends="gsound-devel libgudev-devel json-glib-devel"
+depends="dbus"
+short_desc="Daemon to provide haptic feedback on events"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/feedbackd"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=37cf48cbdbaee8e2d0bea406f5b6317bf0e3cdf79250f9ce0a884e7d3905a8ea
+
+post_install() {
+ vinstall debian/feedbackd.udev 0644 usr/lib/udev/rules.d 90-feedbackd.rules
+}
+
+libfeedback_package() {
+ short_desc+=" - shared libraries"
+ pkg_install() {
+ vmove "usr/lib/*.so.*"
+ }
+}
+
+libfeedback-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ }
+}
diff --git a/srcpkgs/libfeedback b/srcpkgs/libfeedback
new file mode 120000
index 000000000000..49dc965f1cd8
--- /dev/null
+++ b/srcpkgs/libfeedback
@@ -0,0 +1 @@
+feedbackd
\ No newline at end of file
diff --git a/srcpkgs/libfeedback-devel b/srcpkgs/libfeedback-devel
new file mode 120000
index 000000000000..49dc965f1cd8
--- /dev/null
+++ b/srcpkgs/libfeedback-devel
@@ -0,0 +1 @@
+feedbackd
\ No newline at end of file
From 79ff38df1ee8f1179da7bcecf5669db39af1f470 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Sat, 29 Aug 2020 11:47:56 -0700
Subject: [PATCH 2/7] New package: phoc-0.4.2
---
srcpkgs/phoc/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/phoc/template
diff --git a/srcpkgs/phoc/template b/srcpkgs/phoc/template
new file mode 100644
index 000000000000..00c9f1f3ab04
--- /dev/null
+++ b/srcpkgs/phoc/template
@@ -0,0 +1,16 @@
+# Template file for 'phoc'
+pkgname=phoc
+version=0.4.2
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=meson
+configure_args="-Dembed-wlroots=disabled"
+hostmakedepends="glib-devel pkg-config wayland-devel"
+makedepends="gnome-desktop-devel wlroots-devel"
+depends="mutter"
+short_desc="Wlroots based Phone compositor for the Phosh shell"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/phoc"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=bdb34644c7d49c953239c1e939bc5ee2bc26f6187b9d756b70b113d2734c712c
From 33cd96a32a6d9e01a0b8c392552fc28cff1b2761 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Sat, 29 Aug 2020 11:48:48 -0700
Subject: [PATCH 3/7] New package: squeekboard-1.9.3
---
srcpkgs/squeekboard/template | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
create mode 100644 srcpkgs/squeekboard/template
diff --git a/srcpkgs/squeekboard/template b/srcpkgs/squeekboard/template
new file mode 100644
index 000000000000..938248efa6bb
--- /dev/null
+++ b/srcpkgs/squeekboard/template
@@ -0,0 +1,25 @@
+# Template file for 'squeekboard'
+pkgname=squeekboard
+version=1.9.3
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=meson
+build_helper=rust
+hostmakedepends="glib-devel gettext pkg-config cargo wayland-devel"
+makedepends="rust gtk+3-devel gnome-desktop-devel libfeedback-devel"
+short_desc="Final Librem5 keyboard"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/squeekboard"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=b99e56faace3986bf752e08c104cea60ed896d514284840655033dd9457db824
+
+pre_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ vsed -i cargo_build.sh -e "s/-a ./-a ${XBPS_CROSS_RUST_TARGET}/g"
+ fi
+}
+
+post_install() {
+ chmod +x ${DESTDIR}/usr/bin/squeekboard-entry
+}
From 93d41049707c8e8fa528ca06bd7c4ad00b17aea7 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Sat, 29 Aug 2020 11:48:59 -0700
Subject: [PATCH 4/7] New package: phosh-0.4.3
---
srcpkgs/phosh/files/phosh.desktop | 11 ++++++++
srcpkgs/phosh/files/sm.puri.OSK0.desktop | 12 +++++++++
srcpkgs/phosh/patches/32bit-build-fix.patch | 30 +++++++++++++++++++++
srcpkgs/phosh/template | 21 +++++++++++++++
4 files changed, 74 insertions(+)
create mode 100644 srcpkgs/phosh/files/phosh.desktop
create mode 100644 srcpkgs/phosh/files/sm.puri.OSK0.desktop
create mode 100644 srcpkgs/phosh/patches/32bit-build-fix.patch
create mode 100644 srcpkgs/phosh/template
diff --git a/srcpkgs/phosh/files/phosh.desktop b/srcpkgs/phosh/files/phosh.desktop
new file mode 100644
index 000000000000..84452845115f
--- /dev/null
+++ b/srcpkgs/phosh/files/phosh.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=Phosh
+Name[en]=Phosh
+Comment=This session logs you into Phosh
+Comment[en]=This session logs in you into Phosh
+Exec=dbus-run-session /usr/bin/phosh
+TryExec=/usr/bin/phosh
+Icon=
+Type=Application
+X-DesktopNames=Phosh
+Keywords=launch;Phosh;desktop;session;
diff --git a/srcpkgs/phosh/files/sm.puri.OSK0.desktop b/srcpkgs/phosh/files/sm.puri.OSK0.desktop
new file mode 100644
index 000000000000..39740f157736
--- /dev/null
+++ b/srcpkgs/phosh/files/sm.puri.OSK0.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Type=Application
+Name=On-screen keyboard
+Comment=Default on-screen keyboard
+Exec=/usr/bin/squeekboard
+Categories=GNOME;Core;
+OnlyShowIn=GNOME;
+NoDisplay=true
+X-GNOME-Autostart-Phase=Panel
+X-GNOME-Provides=inputmethod
+X-GNOME-Autostart-Notify=true
+X-GNOME-AutoRestart=true
diff --git a/srcpkgs/phosh/patches/32bit-build-fix.patch b/srcpkgs/phosh/patches/32bit-build-fix.patch
new file mode 100644
index 000000000000..a98ecb0faa5d
--- /dev/null
+++ b/srcpkgs/phosh/patches/32bit-build-fix.patch
@@ -0,0 +1,30 @@
+From d1da5ea7d18c6794c9a7d2f41355fe90d4115ac1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
+Date: Tue, 4 Aug 2020 08:22:39 +0200
+Subject: [PATCH] timestamp-label: Unbreak build on 32 bit platforms
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Use a G_ format specifier for GTimeSpan.
+
+Signed-off-by: Guido Günther <guido.gunther@puri.sm>
+---
+ src/notifications/timestamp-label.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/notifications/timestamp-label.c b/src/notifications/timestamp-label.c
+index 0aa04ce0..a5a4d5e7 100644
+--- src/notifications/timestamp-label.c
++++ src/notifications/timestamp-label.c
+@@ -255,7 +255,7 @@ phosh_timestamp_label_calc_timeout (PhoshTimestampLabel *self)
+ break;
+ }
+ timeout_diff = g_date_time_difference (timeout_time, time_now);
+- g_debug ("time out duration = %ld", timeout_diff);
++ g_debug ("time out duration: %" G_GINT64_FORMAT, timeout_diff);
+ return timeout_diff;
+ }
+
+--
+2.26.2
diff --git a/srcpkgs/phosh/template b/srcpkgs/phosh/template
new file mode 100644
index 000000000000..2b0d22eb7167
--- /dev/null
+++ b/srcpkgs/phosh/template
@@ -0,0 +1,21 @@
+# Template file for 'phosh'
+pkgname=phosh
+version=0.4.3
+revision=1
+build_style=meson
+hostmakedepends="phoc glib-devel gettext pkg-config wayland-devel"
+makedepends="libfeedback-devel gcr-devel gnome-desktop-devel pam-devel
+ polkit-devel pulseaudio-devel libsecret-devel libhandy-devel
+ NetworkManager-devel upower-devel"
+depends="phoc squeekboard gnome-session gnome-settings-daemon gnome-control-center"
+short_desc="Shell PoC for the Librem5"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/phosh"
+distfiles="https://repo.pureos.net/pureos/pool/main/p/phosh/phosh_$version.tar.xz"
+checksum=c6fc68aafaf78412637b0f509aafbbca877bda3fe19511bf340b824d7cdbd4ee
+
+post_install() {
+ vcopy ${FILESDIR}/sm.puri.OSK0.desktop usr/share/applications
+ vcopy ${FILESDIR}/phosh.desktop usr/share/wayland-sessions
+}
From cfe75876160a2abe83b4ccc3a124754372c48cb0 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 29 Aug 2020 18:35:47 -0700
Subject: [PATCH 5/7] New package: calls-0.1.7
---
srcpkgs/calls/template | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
create mode 100644 srcpkgs/calls/template
diff --git a/srcpkgs/calls/template b/srcpkgs/calls/template
new file mode 100644
index 000000000000..260ed391d244
--- /dev/null
+++ b/srcpkgs/calls/template
@@ -0,0 +1,17 @@
+# Template file for 'calls'
+pkgname=calls
+version=0.1.7
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=meson
+hostmakedepends="glib-devel gettext vala pkg-config wayland-devel
+ evolution-data-server-devel"
+makedepends="folks-devel libhandy-devel libpeas-devel gom-devel
+ ModemManager-devel libfeedback-devel"
+depends="NetworkManager"
+short_desc="Phone call application"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/calls"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=477c55d483ca13f6ac98209c3c4d6c5858f706e72a133616dcb6827ef25829c7
From 6e80ee43b692d75e4bfeb97c89ebeae6b5247cf5 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 29 Aug 2020 18:36:35 -0700
Subject: [PATCH 6/7] New package: purism-chatty-0.1.15
---
srcpkgs/purism-chatty/template | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
create mode 100644 srcpkgs/purism-chatty/template
diff --git a/srcpkgs/purism-chatty/template b/srcpkgs/purism-chatty/template
new file mode 100644
index 000000000000..d11bfcea882e
--- /dev/null
+++ b/srcpkgs/purism-chatty/template
@@ -0,0 +1,22 @@
+# Template file for 'purism-chatty'
+pkgname=purism-chatty
+_pkgname=chatty
+version=0.1.15
+revision=1
+wrksrc=${_pkgname}-v${version}
+build_style=meson
+hostmakedepends="glib-devel pkg-config gettext"
+makedepends="libfeedback-devel libhandy-devel evolution-data-server-devel
+ libpurple libpurple-devel"
+short_desc="XMPP and SMS messaging via libpurple and Modemmanager"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/chatty"
+distfiles="${homepage}/-/archive/v${version}/${_pkgname}-v${version}.tar.gz"
+checksum=9be2b79a266a7fa1e3d3e7ba447ff89d2b9e44312d6e55f2a63d191369528d64
+
+pre_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ vsed -i src/meson.build -e "s/purple_plugdir =.*/purple_plugdir = \'\/usr\/${XBPS_CROSS_TRIPLET}\/usr\/lib\/purple-2\'/g"
+ fi
+}
From e4cd7d9d24e5561bc724f5bc0f2e59d8f76774dd Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 12 Sep 2020 10:58:50 -0700
Subject: [PATCH 7/7] New package: mobile-config-firefox-1.0.1
---
.../files/distro_links.html | 5 +++++
srcpkgs/mobile-config-firefox/template | 22 +++++++++++++++++++
2 files changed, 27 insertions(+)
create mode 100644 srcpkgs/mobile-config-firefox/files/distro_links.html
create mode 100644 srcpkgs/mobile-config-firefox/template
diff --git a/srcpkgs/mobile-config-firefox/files/distro_links.html b/srcpkgs/mobile-config-firefox/files/distro_links.html
new file mode 100644
index 000000000000..ca89d0ecd085
--- /dev/null
+++ b/srcpkgs/mobile-config-firefox/files/distro_links.html
@@ -0,0 +1,5 @@
+<p class="distro-links">
+ <a href="https://voidlinux.org/">homepage</a> -
+ <a href="https://docs.voidlinux.org/">docs</a>
+ <a href="https://github.com/void-linux">repos</a>
+</p>
diff --git a/srcpkgs/mobile-config-firefox/template b/srcpkgs/mobile-config-firefox/template
new file mode 100644
index 000000000000..77f10094701f
--- /dev/null
+++ b/srcpkgs/mobile-config-firefox/template
@@ -0,0 +1,22 @@
+# Template file for 'mobile-config-firefox'
+pkgname=mobile-config-firefox
+version=1.0.1
+revision=1
+short_desc="Firefox tweaks for mobile and privacy"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://gitlab.com/postmarketOS/mobile-config-firefox"
+distfiles="${homepage}/-/archive/${version}/${pkgname}-${version}.tar.gz"
+checksum=7dce837995956f6f224041853e005eecb3368cd3cbfec6fe3e8a3153747dd0a7
+
+post_extract() {
+ cp ${FILESDIR}/distro_links.html src/homepage
+}
+
+do_build() {
+ make DISTRO=VoidLinux
+}
+
+do_install() {
+ make DESTDIR=${DESTDIR} install
+}
^ permalink raw reply [flat|nested] 47+ messages in thread* Re: [PR PATCH] [Updated] New packages: phoc-0.4.2 calls-0.1.7 purism-chatty-0.1.15
2020-08-29 20:46 [PR PATCH] New packages: phoc-0.4.2 calls-0.1.7 purism-chatty--0.1.15 julio641742
` (16 preceding siblings ...)
2020-09-12 18:00 ` [PR PATCH] [Updated] " julio641742
@ 2020-09-12 18:19 ` julio641742
2020-09-12 18:46 ` julio641742
` (27 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: julio641742 @ 2020-09-12 18:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 386 bytes --]
There is an updated pull request by julio641742 against master on the void-packages repository
https://github.com/julio641742/void-packages phosh
https://github.com/void-linux/void-packages/pull/24538
New packages: phoc-0.4.2 calls-0.1.7 purism-chatty-0.1.15
Getting ready for my pinephone :)
A patch file from https://github.com/void-linux/void-packages/pull/24538.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-phosh-24538.patch --]
[-- Type: text/x-diff, Size: 13573 bytes --]
From 17528a815b0370ec2ea85f0c34e05e1cb5b16185 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Sat, 29 Aug 2020 11:47:35 -0700
Subject: [PATCH 1/7] New package: feedbackd-0.0.0+git20200707
---
common/shlibs | 1 +
srcpkgs/feedbackd/template | 37 +++++++++++++++++++++++++++++++++++++
srcpkgs/libfeedback | 1 +
srcpkgs/libfeedback-devel | 1 +
4 files changed, 40 insertions(+)
create mode 100644 srcpkgs/feedbackd/template
create mode 120000 srcpkgs/libfeedback
create mode 120000 srcpkgs/libfeedback-devel
diff --git a/common/shlibs b/common/shlibs
index ec8310df7b3..752730f829b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3990,3 +3990,4 @@ libneatvnc.so.0 neatvnc-0.2.0_1
libtdjson.so.1.6.0 libtd-1.6.0_1
libJudy.so.1 judy-1.0.5_1
libsignal-protocol-c.so.2 libsignal-protocol-c-2.3.3_2
+libfeedback-0.0.so.0 libfeedback-0.0.0+git20200707_1
diff --git a/srcpkgs/feedbackd/template b/srcpkgs/feedbackd/template
new file mode 100644
index 00000000000..0131775cc9d
--- /dev/null
+++ b/srcpkgs/feedbackd/template
@@ -0,0 +1,37 @@
+# Template file for 'feedbackd'
+pkgname=feedbackd
+version=0.0.0+git20200707
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=meson
+build_helper=gir
+hostmakedepends="vala glib-devel pkg-config"
+makedepends="gsound-devel libgudev-devel json-glib-devel"
+depends="dbus"
+short_desc="Daemon to provide haptic feedback on events"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/feedbackd"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=37cf48cbdbaee8e2d0bea406f5b6317bf0e3cdf79250f9ce0a884e7d3905a8ea
+
+post_install() {
+ vinstall debian/feedbackd.udev 0644 usr/lib/udev/rules.d 90-feedbackd.rules
+}
+
+libfeedback_package() {
+ short_desc+=" - shared libraries"
+ pkg_install() {
+ vmove "usr/lib/*.so.*"
+ }
+}
+
+libfeedback-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ }
+}
diff --git a/srcpkgs/libfeedback b/srcpkgs/libfeedback
new file mode 120000
index 00000000000..49dc965f1cd
--- /dev/null
+++ b/srcpkgs/libfeedback
@@ -0,0 +1 @@
+feedbackd
\ No newline at end of file
diff --git a/srcpkgs/libfeedback-devel b/srcpkgs/libfeedback-devel
new file mode 120000
index 00000000000..49dc965f1cd
--- /dev/null
+++ b/srcpkgs/libfeedback-devel
@@ -0,0 +1 @@
+feedbackd
\ No newline at end of file
From 79ff38df1ee8f1179da7bcecf5669db39af1f470 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Sat, 29 Aug 2020 11:47:56 -0700
Subject: [PATCH 2/7] New package: phoc-0.4.2
---
srcpkgs/phoc/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/phoc/template
diff --git a/srcpkgs/phoc/template b/srcpkgs/phoc/template
new file mode 100644
index 00000000000..00c9f1f3ab0
--- /dev/null
+++ b/srcpkgs/phoc/template
@@ -0,0 +1,16 @@
+# Template file for 'phoc'
+pkgname=phoc
+version=0.4.2
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=meson
+configure_args="-Dembed-wlroots=disabled"
+hostmakedepends="glib-devel pkg-config wayland-devel"
+makedepends="gnome-desktop-devel wlroots-devel"
+depends="mutter"
+short_desc="Wlroots based Phone compositor for the Phosh shell"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/phoc"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=bdb34644c7d49c953239c1e939bc5ee2bc26f6187b9d756b70b113d2734c712c
From 33cd96a32a6d9e01a0b8c392552fc28cff1b2761 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Sat, 29 Aug 2020 11:48:48 -0700
Subject: [PATCH 3/7] New package: squeekboard-1.9.3
---
srcpkgs/squeekboard/template | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
create mode 100644 srcpkgs/squeekboard/template
diff --git a/srcpkgs/squeekboard/template b/srcpkgs/squeekboard/template
new file mode 100644
index 00000000000..938248efa6b
--- /dev/null
+++ b/srcpkgs/squeekboard/template
@@ -0,0 +1,25 @@
+# Template file for 'squeekboard'
+pkgname=squeekboard
+version=1.9.3
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=meson
+build_helper=rust
+hostmakedepends="glib-devel gettext pkg-config cargo wayland-devel"
+makedepends="rust gtk+3-devel gnome-desktop-devel libfeedback-devel"
+short_desc="Final Librem5 keyboard"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/squeekboard"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=b99e56faace3986bf752e08c104cea60ed896d514284840655033dd9457db824
+
+pre_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ vsed -i cargo_build.sh -e "s/-a ./-a ${XBPS_CROSS_RUST_TARGET}/g"
+ fi
+}
+
+post_install() {
+ chmod +x ${DESTDIR}/usr/bin/squeekboard-entry
+}
From 5eb9d6d94324ceb208c4a75fa1be82dcf402c30c Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Sat, 29 Aug 2020 11:48:59 -0700
Subject: [PATCH 4/7] New package: phosh-0.4.3
---
srcpkgs/phosh/files/phosh.desktop | 11 ++++++++
srcpkgs/phosh/files/sm.puri.OSK0.desktop | 12 +++++++++
srcpkgs/phosh/patches/32bit-build-fix.patch | 30 +++++++++++++++++++++
srcpkgs/phosh/template | 22 +++++++++++++++
4 files changed, 75 insertions(+)
create mode 100644 srcpkgs/phosh/files/phosh.desktop
create mode 100644 srcpkgs/phosh/files/sm.puri.OSK0.desktop
create mode 100644 srcpkgs/phosh/patches/32bit-build-fix.patch
create mode 100644 srcpkgs/phosh/template
diff --git a/srcpkgs/phosh/files/phosh.desktop b/srcpkgs/phosh/files/phosh.desktop
new file mode 100644
index 00000000000..84452845115
--- /dev/null
+++ b/srcpkgs/phosh/files/phosh.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=Phosh
+Name[en]=Phosh
+Comment=This session logs you into Phosh
+Comment[en]=This session logs in you into Phosh
+Exec=dbus-run-session /usr/bin/phosh
+TryExec=/usr/bin/phosh
+Icon=
+Type=Application
+X-DesktopNames=Phosh
+Keywords=launch;Phosh;desktop;session;
diff --git a/srcpkgs/phosh/files/sm.puri.OSK0.desktop b/srcpkgs/phosh/files/sm.puri.OSK0.desktop
new file mode 100644
index 00000000000..39740f15773
--- /dev/null
+++ b/srcpkgs/phosh/files/sm.puri.OSK0.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Type=Application
+Name=On-screen keyboard
+Comment=Default on-screen keyboard
+Exec=/usr/bin/squeekboard
+Categories=GNOME;Core;
+OnlyShowIn=GNOME;
+NoDisplay=true
+X-GNOME-Autostart-Phase=Panel
+X-GNOME-Provides=inputmethod
+X-GNOME-Autostart-Notify=true
+X-GNOME-AutoRestart=true
diff --git a/srcpkgs/phosh/patches/32bit-build-fix.patch b/srcpkgs/phosh/patches/32bit-build-fix.patch
new file mode 100644
index 00000000000..a98ecb0faa5
--- /dev/null
+++ b/srcpkgs/phosh/patches/32bit-build-fix.patch
@@ -0,0 +1,30 @@
+From d1da5ea7d18c6794c9a7d2f41355fe90d4115ac1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
+Date: Tue, 4 Aug 2020 08:22:39 +0200
+Subject: [PATCH] timestamp-label: Unbreak build on 32 bit platforms
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Use a G_ format specifier for GTimeSpan.
+
+Signed-off-by: Guido Günther <guido.gunther@puri.sm>
+---
+ src/notifications/timestamp-label.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/notifications/timestamp-label.c b/src/notifications/timestamp-label.c
+index 0aa04ce0..a5a4d5e7 100644
+--- src/notifications/timestamp-label.c
++++ src/notifications/timestamp-label.c
+@@ -255,7 +255,7 @@ phosh_timestamp_label_calc_timeout (PhoshTimestampLabel *self)
+ break;
+ }
+ timeout_diff = g_date_time_difference (timeout_time, time_now);
+- g_debug ("time out duration = %ld", timeout_diff);
++ g_debug ("time out duration: %" G_GINT64_FORMAT, timeout_diff);
+ return timeout_diff;
+ }
+
+--
+2.26.2
diff --git a/srcpkgs/phosh/template b/srcpkgs/phosh/template
new file mode 100644
index 00000000000..61873272d51
--- /dev/null
+++ b/srcpkgs/phosh/template
@@ -0,0 +1,22 @@
+# Template file for 'phosh'
+pkgname=phosh
+version=0.4.3
+revision=1
+build_style=meson
+hostmakedepends="phoc glib-devel gettext pkg-config wayland-devel"
+makedepends="libfeedback-devel gcr-devel gnome-desktop-devel pam-devel
+ polkit-devel pulseaudio-devel libsecret-devel libhandy-devel
+ NetworkManager-devel upower-devel"
+depends="phoc squeekboard gnome-session gnome-settings-daemon gnome-control-center
+ elogind xorg-server-xwayland cantarell-fonts"
+short_desc="Shell PoC for the Librem5"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/phosh"
+distfiles="https://repo.pureos.net/pureos/pool/main/p/phosh/phosh_$version.tar.xz"
+checksum=c6fc68aafaf78412637b0f509aafbbca877bda3fe19511bf340b824d7cdbd4ee
+
+post_install() {
+ vcopy ${FILESDIR}/sm.puri.OSK0.desktop usr/share/applications
+ vcopy ${FILESDIR}/phosh.desktop usr/share/wayland-sessions
+}
From bb27e10feedbb763fcd00c0b893170fadae6d195 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 29 Aug 2020 18:35:47 -0700
Subject: [PATCH 5/7] New package: calls-0.1.7
---
srcpkgs/calls/template | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
create mode 100644 srcpkgs/calls/template
diff --git a/srcpkgs/calls/template b/srcpkgs/calls/template
new file mode 100644
index 00000000000..260ed391d24
--- /dev/null
+++ b/srcpkgs/calls/template
@@ -0,0 +1,17 @@
+# Template file for 'calls'
+pkgname=calls
+version=0.1.7
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=meson
+hostmakedepends="glib-devel gettext vala pkg-config wayland-devel
+ evolution-data-server-devel"
+makedepends="folks-devel libhandy-devel libpeas-devel gom-devel
+ ModemManager-devel libfeedback-devel"
+depends="NetworkManager"
+short_desc="Phone call application"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/calls"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=477c55d483ca13f6ac98209c3c4d6c5858f706e72a133616dcb6827ef25829c7
From 6eb668a44fe24a9cb1d23dff522473528b59706a Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 29 Aug 2020 18:36:35 -0700
Subject: [PATCH 6/7] New package: purism-chatty-0.1.15
---
srcpkgs/purism-chatty/template | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
create mode 100644 srcpkgs/purism-chatty/template
diff --git a/srcpkgs/purism-chatty/template b/srcpkgs/purism-chatty/template
new file mode 100644
index 00000000000..d11bfcea882
--- /dev/null
+++ b/srcpkgs/purism-chatty/template
@@ -0,0 +1,22 @@
+# Template file for 'purism-chatty'
+pkgname=purism-chatty
+_pkgname=chatty
+version=0.1.15
+revision=1
+wrksrc=${_pkgname}-v${version}
+build_style=meson
+hostmakedepends="glib-devel pkg-config gettext"
+makedepends="libfeedback-devel libhandy-devel evolution-data-server-devel
+ libpurple libpurple-devel"
+short_desc="XMPP and SMS messaging via libpurple and Modemmanager"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/chatty"
+distfiles="${homepage}/-/archive/v${version}/${_pkgname}-v${version}.tar.gz"
+checksum=9be2b79a266a7fa1e3d3e7ba447ff89d2b9e44312d6e55f2a63d191369528d64
+
+pre_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ vsed -i src/meson.build -e "s/purple_plugdir =.*/purple_plugdir = \'\/usr\/${XBPS_CROSS_TRIPLET}\/usr\/lib\/purple-2\'/g"
+ fi
+}
From e09d1b448225868d8be09a54d98e86c0c5aaeb2f Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 12 Sep 2020 10:58:50 -0700
Subject: [PATCH 7/7] New package: mobile-config-firefox-1.0.1
---
.../files/distro_links.html | 5 +++++
srcpkgs/mobile-config-firefox/template | 22 +++++++++++++++++++
2 files changed, 27 insertions(+)
create mode 100644 srcpkgs/mobile-config-firefox/files/distro_links.html
create mode 100644 srcpkgs/mobile-config-firefox/template
diff --git a/srcpkgs/mobile-config-firefox/files/distro_links.html b/srcpkgs/mobile-config-firefox/files/distro_links.html
new file mode 100644
index 00000000000..ca89d0ecd08
--- /dev/null
+++ b/srcpkgs/mobile-config-firefox/files/distro_links.html
@@ -0,0 +1,5 @@
+<p class="distro-links">
+ <a href="https://voidlinux.org/">homepage</a> -
+ <a href="https://docs.voidlinux.org/">docs</a>
+ <a href="https://github.com/void-linux">repos</a>
+</p>
diff --git a/srcpkgs/mobile-config-firefox/template b/srcpkgs/mobile-config-firefox/template
new file mode 100644
index 00000000000..77f10094701
--- /dev/null
+++ b/srcpkgs/mobile-config-firefox/template
@@ -0,0 +1,22 @@
+# Template file for 'mobile-config-firefox'
+pkgname=mobile-config-firefox
+version=1.0.1
+revision=1
+short_desc="Firefox tweaks for mobile and privacy"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://gitlab.com/postmarketOS/mobile-config-firefox"
+distfiles="${homepage}/-/archive/${version}/${pkgname}-${version}.tar.gz"
+checksum=7dce837995956f6f224041853e005eecb3368cd3cbfec6fe3e8a3153747dd0a7
+
+post_extract() {
+ cp ${FILESDIR}/distro_links.html src/homepage
+}
+
+do_build() {
+ make DISTRO=VoidLinux
+}
+
+do_install() {
+ make DESTDIR=${DESTDIR} install
+}
^ permalink raw reply [flat|nested] 47+ messages in thread* Re: [PR PATCH] [Updated] New packages: phoc-0.4.2 calls-0.1.7 purism-chatty-0.1.15
2020-08-29 20:46 [PR PATCH] New packages: phoc-0.4.2 calls-0.1.7 purism-chatty--0.1.15 julio641742
` (17 preceding siblings ...)
2020-09-12 18:19 ` julio641742
@ 2020-09-12 18:46 ` julio641742
2020-09-12 18:52 ` julio641742
` (26 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: julio641742 @ 2020-09-12 18:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 386 bytes --]
There is an updated pull request by julio641742 against master on the void-packages repository
https://github.com/julio641742/void-packages phosh
https://github.com/void-linux/void-packages/pull/24538
New packages: phoc-0.4.2 calls-0.1.7 purism-chatty-0.1.15
Getting ready for my pinephone :)
A patch file from https://github.com/void-linux/void-packages/pull/24538.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-phosh-24538.patch --]
[-- Type: text/x-diff, Size: 13542 bytes --]
From 17528a815b0370ec2ea85f0c34e05e1cb5b16185 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Sat, 29 Aug 2020 11:47:35 -0700
Subject: [PATCH 1/7] New package: feedbackd-0.0.0+git20200707
---
common/shlibs | 1 +
srcpkgs/feedbackd/template | 37 +++++++++++++++++++++++++++++++++++++
srcpkgs/libfeedback | 1 +
srcpkgs/libfeedback-devel | 1 +
4 files changed, 40 insertions(+)
create mode 100644 srcpkgs/feedbackd/template
create mode 120000 srcpkgs/libfeedback
create mode 120000 srcpkgs/libfeedback-devel
diff --git a/common/shlibs b/common/shlibs
index ec8310df7b3..752730f829b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3990,3 +3990,4 @@ libneatvnc.so.0 neatvnc-0.2.0_1
libtdjson.so.1.6.0 libtd-1.6.0_1
libJudy.so.1 judy-1.0.5_1
libsignal-protocol-c.so.2 libsignal-protocol-c-2.3.3_2
+libfeedback-0.0.so.0 libfeedback-0.0.0+git20200707_1
diff --git a/srcpkgs/feedbackd/template b/srcpkgs/feedbackd/template
new file mode 100644
index 00000000000..0131775cc9d
--- /dev/null
+++ b/srcpkgs/feedbackd/template
@@ -0,0 +1,37 @@
+# Template file for 'feedbackd'
+pkgname=feedbackd
+version=0.0.0+git20200707
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=meson
+build_helper=gir
+hostmakedepends="vala glib-devel pkg-config"
+makedepends="gsound-devel libgudev-devel json-glib-devel"
+depends="dbus"
+short_desc="Daemon to provide haptic feedback on events"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/feedbackd"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=37cf48cbdbaee8e2d0bea406f5b6317bf0e3cdf79250f9ce0a884e7d3905a8ea
+
+post_install() {
+ vinstall debian/feedbackd.udev 0644 usr/lib/udev/rules.d 90-feedbackd.rules
+}
+
+libfeedback_package() {
+ short_desc+=" - shared libraries"
+ pkg_install() {
+ vmove "usr/lib/*.so.*"
+ }
+}
+
+libfeedback-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ }
+}
diff --git a/srcpkgs/libfeedback b/srcpkgs/libfeedback
new file mode 120000
index 00000000000..49dc965f1cd
--- /dev/null
+++ b/srcpkgs/libfeedback
@@ -0,0 +1 @@
+feedbackd
\ No newline at end of file
diff --git a/srcpkgs/libfeedback-devel b/srcpkgs/libfeedback-devel
new file mode 120000
index 00000000000..49dc965f1cd
--- /dev/null
+++ b/srcpkgs/libfeedback-devel
@@ -0,0 +1 @@
+feedbackd
\ No newline at end of file
From 79ff38df1ee8f1179da7bcecf5669db39af1f470 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Sat, 29 Aug 2020 11:47:56 -0700
Subject: [PATCH 2/7] New package: phoc-0.4.2
---
srcpkgs/phoc/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/phoc/template
diff --git a/srcpkgs/phoc/template b/srcpkgs/phoc/template
new file mode 100644
index 00000000000..00c9f1f3ab0
--- /dev/null
+++ b/srcpkgs/phoc/template
@@ -0,0 +1,16 @@
+# Template file for 'phoc'
+pkgname=phoc
+version=0.4.2
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=meson
+configure_args="-Dembed-wlroots=disabled"
+hostmakedepends="glib-devel pkg-config wayland-devel"
+makedepends="gnome-desktop-devel wlroots-devel"
+depends="mutter"
+short_desc="Wlroots based Phone compositor for the Phosh shell"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/phoc"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=bdb34644c7d49c953239c1e939bc5ee2bc26f6187b9d756b70b113d2734c712c
From 33cd96a32a6d9e01a0b8c392552fc28cff1b2761 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Sat, 29 Aug 2020 11:48:48 -0700
Subject: [PATCH 3/7] New package: squeekboard-1.9.3
---
srcpkgs/squeekboard/template | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
create mode 100644 srcpkgs/squeekboard/template
diff --git a/srcpkgs/squeekboard/template b/srcpkgs/squeekboard/template
new file mode 100644
index 00000000000..938248efa6b
--- /dev/null
+++ b/srcpkgs/squeekboard/template
@@ -0,0 +1,25 @@
+# Template file for 'squeekboard'
+pkgname=squeekboard
+version=1.9.3
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=meson
+build_helper=rust
+hostmakedepends="glib-devel gettext pkg-config cargo wayland-devel"
+makedepends="rust gtk+3-devel gnome-desktop-devel libfeedback-devel"
+short_desc="Final Librem5 keyboard"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/squeekboard"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=b99e56faace3986bf752e08c104cea60ed896d514284840655033dd9457db824
+
+pre_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ vsed -i cargo_build.sh -e "s/-a ./-a ${XBPS_CROSS_RUST_TARGET}/g"
+ fi
+}
+
+post_install() {
+ chmod +x ${DESTDIR}/usr/bin/squeekboard-entry
+}
From 5eb9d6d94324ceb208c4a75fa1be82dcf402c30c Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Sat, 29 Aug 2020 11:48:59 -0700
Subject: [PATCH 4/7] New package: phosh-0.4.3
---
srcpkgs/phosh/files/phosh.desktop | 11 ++++++++
srcpkgs/phosh/files/sm.puri.OSK0.desktop | 12 +++++++++
srcpkgs/phosh/patches/32bit-build-fix.patch | 30 +++++++++++++++++++++
srcpkgs/phosh/template | 22 +++++++++++++++
4 files changed, 75 insertions(+)
create mode 100644 srcpkgs/phosh/files/phosh.desktop
create mode 100644 srcpkgs/phosh/files/sm.puri.OSK0.desktop
create mode 100644 srcpkgs/phosh/patches/32bit-build-fix.patch
create mode 100644 srcpkgs/phosh/template
diff --git a/srcpkgs/phosh/files/phosh.desktop b/srcpkgs/phosh/files/phosh.desktop
new file mode 100644
index 00000000000..84452845115
--- /dev/null
+++ b/srcpkgs/phosh/files/phosh.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=Phosh
+Name[en]=Phosh
+Comment=This session logs you into Phosh
+Comment[en]=This session logs in you into Phosh
+Exec=dbus-run-session /usr/bin/phosh
+TryExec=/usr/bin/phosh
+Icon=
+Type=Application
+X-DesktopNames=Phosh
+Keywords=launch;Phosh;desktop;session;
diff --git a/srcpkgs/phosh/files/sm.puri.OSK0.desktop b/srcpkgs/phosh/files/sm.puri.OSK0.desktop
new file mode 100644
index 00000000000..39740f15773
--- /dev/null
+++ b/srcpkgs/phosh/files/sm.puri.OSK0.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Type=Application
+Name=On-screen keyboard
+Comment=Default on-screen keyboard
+Exec=/usr/bin/squeekboard
+Categories=GNOME;Core;
+OnlyShowIn=GNOME;
+NoDisplay=true
+X-GNOME-Autostart-Phase=Panel
+X-GNOME-Provides=inputmethod
+X-GNOME-Autostart-Notify=true
+X-GNOME-AutoRestart=true
diff --git a/srcpkgs/phosh/patches/32bit-build-fix.patch b/srcpkgs/phosh/patches/32bit-build-fix.patch
new file mode 100644
index 00000000000..a98ecb0faa5
--- /dev/null
+++ b/srcpkgs/phosh/patches/32bit-build-fix.patch
@@ -0,0 +1,30 @@
+From d1da5ea7d18c6794c9a7d2f41355fe90d4115ac1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
+Date: Tue, 4 Aug 2020 08:22:39 +0200
+Subject: [PATCH] timestamp-label: Unbreak build on 32 bit platforms
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Use a G_ format specifier for GTimeSpan.
+
+Signed-off-by: Guido Günther <guido.gunther@puri.sm>
+---
+ src/notifications/timestamp-label.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/notifications/timestamp-label.c b/src/notifications/timestamp-label.c
+index 0aa04ce0..a5a4d5e7 100644
+--- src/notifications/timestamp-label.c
++++ src/notifications/timestamp-label.c
+@@ -255,7 +255,7 @@ phosh_timestamp_label_calc_timeout (PhoshTimestampLabel *self)
+ break;
+ }
+ timeout_diff = g_date_time_difference (timeout_time, time_now);
+- g_debug ("time out duration = %ld", timeout_diff);
++ g_debug ("time out duration: %" G_GINT64_FORMAT, timeout_diff);
+ return timeout_diff;
+ }
+
+--
+2.26.2
diff --git a/srcpkgs/phosh/template b/srcpkgs/phosh/template
new file mode 100644
index 00000000000..61873272d51
--- /dev/null
+++ b/srcpkgs/phosh/template
@@ -0,0 +1,22 @@
+# Template file for 'phosh'
+pkgname=phosh
+version=0.4.3
+revision=1
+build_style=meson
+hostmakedepends="phoc glib-devel gettext pkg-config wayland-devel"
+makedepends="libfeedback-devel gcr-devel gnome-desktop-devel pam-devel
+ polkit-devel pulseaudio-devel libsecret-devel libhandy-devel
+ NetworkManager-devel upower-devel"
+depends="phoc squeekboard gnome-session gnome-settings-daemon gnome-control-center
+ elogind xorg-server-xwayland cantarell-fonts"
+short_desc="Shell PoC for the Librem5"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/phosh"
+distfiles="https://repo.pureos.net/pureos/pool/main/p/phosh/phosh_$version.tar.xz"
+checksum=c6fc68aafaf78412637b0f509aafbbca877bda3fe19511bf340b824d7cdbd4ee
+
+post_install() {
+ vcopy ${FILESDIR}/sm.puri.OSK0.desktop usr/share/applications
+ vcopy ${FILESDIR}/phosh.desktop usr/share/wayland-sessions
+}
From bb27e10feedbb763fcd00c0b893170fadae6d195 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 29 Aug 2020 18:35:47 -0700
Subject: [PATCH 5/7] New package: calls-0.1.7
---
srcpkgs/calls/template | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
create mode 100644 srcpkgs/calls/template
diff --git a/srcpkgs/calls/template b/srcpkgs/calls/template
new file mode 100644
index 00000000000..260ed391d24
--- /dev/null
+++ b/srcpkgs/calls/template
@@ -0,0 +1,17 @@
+# Template file for 'calls'
+pkgname=calls
+version=0.1.7
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=meson
+hostmakedepends="glib-devel gettext vala pkg-config wayland-devel
+ evolution-data-server-devel"
+makedepends="folks-devel libhandy-devel libpeas-devel gom-devel
+ ModemManager-devel libfeedback-devel"
+depends="NetworkManager"
+short_desc="Phone call application"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/calls"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=477c55d483ca13f6ac98209c3c4d6c5858f706e72a133616dcb6827ef25829c7
From 6eb668a44fe24a9cb1d23dff522473528b59706a Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 29 Aug 2020 18:36:35 -0700
Subject: [PATCH 6/7] New package: purism-chatty-0.1.15
---
srcpkgs/purism-chatty/template | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
create mode 100644 srcpkgs/purism-chatty/template
diff --git a/srcpkgs/purism-chatty/template b/srcpkgs/purism-chatty/template
new file mode 100644
index 00000000000..d11bfcea882
--- /dev/null
+++ b/srcpkgs/purism-chatty/template
@@ -0,0 +1,22 @@
+# Template file for 'purism-chatty'
+pkgname=purism-chatty
+_pkgname=chatty
+version=0.1.15
+revision=1
+wrksrc=${_pkgname}-v${version}
+build_style=meson
+hostmakedepends="glib-devel pkg-config gettext"
+makedepends="libfeedback-devel libhandy-devel evolution-data-server-devel
+ libpurple libpurple-devel"
+short_desc="XMPP and SMS messaging via libpurple and Modemmanager"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/chatty"
+distfiles="${homepage}/-/archive/v${version}/${_pkgname}-v${version}.tar.gz"
+checksum=9be2b79a266a7fa1e3d3e7ba447ff89d2b9e44312d6e55f2a63d191369528d64
+
+pre_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ vsed -i src/meson.build -e "s/purple_plugdir =.*/purple_plugdir = \'\/usr\/${XBPS_CROSS_TRIPLET}\/usr\/lib\/purple-2\'/g"
+ fi
+}
From c77b0c737c9b0f61fd83a69b0cb8c62009237686 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 12 Sep 2020 10:58:50 -0700
Subject: [PATCH 7/7] New package: mobile-config-firefox-1.0.1
---
.../files/distro_links.html | 5 +++++
srcpkgs/mobile-config-firefox/template | 16 ++++++++++++++++
2 files changed, 21 insertions(+)
create mode 100644 srcpkgs/mobile-config-firefox/files/distro_links.html
create mode 100644 srcpkgs/mobile-config-firefox/template
diff --git a/srcpkgs/mobile-config-firefox/files/distro_links.html b/srcpkgs/mobile-config-firefox/files/distro_links.html
new file mode 100644
index 00000000000..ca89d0ecd08
--- /dev/null
+++ b/srcpkgs/mobile-config-firefox/files/distro_links.html
@@ -0,0 +1,5 @@
+<p class="distro-links">
+ <a href="https://voidlinux.org/">homepage</a> -
+ <a href="https://docs.voidlinux.org/">docs</a>
+ <a href="https://github.com/void-linux">repos</a>
+</p>
diff --git a/srcpkgs/mobile-config-firefox/template b/srcpkgs/mobile-config-firefox/template
new file mode 100644
index 00000000000..8a1530115e8
--- /dev/null
+++ b/srcpkgs/mobile-config-firefox/template
@@ -0,0 +1,16 @@
+# Template file for 'mobile-config-firefox'
+pkgname=mobile-config-firefox
+version=1.0.1
+revision=1
+build_style=gnu-makefile
+make_install_args="DISTRO=VoidLinux"
+short_desc="Firefox tweaks for mobile and privacy"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://gitlab.com/postmarketOS/mobile-config-firefox"
+distfiles="${homepage}/-/archive/${version}/${pkgname}-${version}.tar.gz"
+checksum=7dce837995956f6f224041853e005eecb3368cd3cbfec6fe3e8a3153747dd0a7
+
+post_extract() {
+ cp ${FILESDIR}/distro_links.html src/homepage
+}
^ permalink raw reply [flat|nested] 47+ messages in thread* Re: New packages: phoc-0.4.2 calls-0.1.7 purism-chatty-0.1.15
2020-08-29 20:46 [PR PATCH] New packages: phoc-0.4.2 calls-0.1.7 purism-chatty--0.1.15 julio641742
` (18 preceding siblings ...)
2020-09-12 18:46 ` julio641742
@ 2020-09-12 18:52 ` julio641742
2020-09-12 21:46 ` [PR PATCH] [Updated] " julio641742
` (25 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: julio641742 @ 2020-09-12 18:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 380 bytes --]
New comment by julio641742 on void-packages repository
https://github.com/void-linux/void-packages/pull/24538#issuecomment-691530672
Comment:
Here is phosh running on the pinephone with firefox
[img1](https://drive.google.com/file/d/1-Fz3ajXziTqBRU8owoPd9kWKeuJz0CRq/view?usp=sharing)
[img2](https://drive.google.com/file/d/1IK7FS-sGhqTsp-zhp7IqShigf8wSPBUU/view?usp=sharing)
^ permalink raw reply [flat|nested] 47+ messages in thread* Re: [PR PATCH] [Updated] New packages: phoc-0.4.2 calls-0.1.7 purism-chatty-0.1.15
2020-08-29 20:46 [PR PATCH] New packages: phoc-0.4.2 calls-0.1.7 purism-chatty--0.1.15 julio641742
` (19 preceding siblings ...)
2020-09-12 18:52 ` julio641742
@ 2020-09-12 21:46 ` julio641742
2020-09-12 22:08 ` julio641742
` (24 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: julio641742 @ 2020-09-12 21:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 386 bytes --]
There is an updated pull request by julio641742 against master on the void-packages repository
https://github.com/julio641742/void-packages phosh
https://github.com/void-linux/void-packages/pull/24538
New packages: phoc-0.4.2 calls-0.1.7 purism-chatty-0.1.15
Getting ready for my pinephone :)
A patch file from https://github.com/void-linux/void-packages/pull/24538.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-phosh-24538.patch --]
[-- Type: text/x-diff, Size: 17032 bytes --]
From 17528a815b0370ec2ea85f0c34e05e1cb5b16185 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Sat, 29 Aug 2020 11:47:35 -0700
Subject: [PATCH 1/8] New package: feedbackd-0.0.0+git20200707
---
common/shlibs | 1 +
srcpkgs/feedbackd/template | 37 +++++++++++++++++++++++++++++++++++++
srcpkgs/libfeedback | 1 +
srcpkgs/libfeedback-devel | 1 +
4 files changed, 40 insertions(+)
create mode 100644 srcpkgs/feedbackd/template
create mode 120000 srcpkgs/libfeedback
create mode 120000 srcpkgs/libfeedback-devel
diff --git a/common/shlibs b/common/shlibs
index ec8310df7b3..752730f829b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3990,3 +3990,4 @@ libneatvnc.so.0 neatvnc-0.2.0_1
libtdjson.so.1.6.0 libtd-1.6.0_1
libJudy.so.1 judy-1.0.5_1
libsignal-protocol-c.so.2 libsignal-protocol-c-2.3.3_2
+libfeedback-0.0.so.0 libfeedback-0.0.0+git20200707_1
diff --git a/srcpkgs/feedbackd/template b/srcpkgs/feedbackd/template
new file mode 100644
index 00000000000..0131775cc9d
--- /dev/null
+++ b/srcpkgs/feedbackd/template
@@ -0,0 +1,37 @@
+# Template file for 'feedbackd'
+pkgname=feedbackd
+version=0.0.0+git20200707
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=meson
+build_helper=gir
+hostmakedepends="vala glib-devel pkg-config"
+makedepends="gsound-devel libgudev-devel json-glib-devel"
+depends="dbus"
+short_desc="Daemon to provide haptic feedback on events"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/feedbackd"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=37cf48cbdbaee8e2d0bea406f5b6317bf0e3cdf79250f9ce0a884e7d3905a8ea
+
+post_install() {
+ vinstall debian/feedbackd.udev 0644 usr/lib/udev/rules.d 90-feedbackd.rules
+}
+
+libfeedback_package() {
+ short_desc+=" - shared libraries"
+ pkg_install() {
+ vmove "usr/lib/*.so.*"
+ }
+}
+
+libfeedback-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ }
+}
diff --git a/srcpkgs/libfeedback b/srcpkgs/libfeedback
new file mode 120000
index 00000000000..49dc965f1cd
--- /dev/null
+++ b/srcpkgs/libfeedback
@@ -0,0 +1 @@
+feedbackd
\ No newline at end of file
diff --git a/srcpkgs/libfeedback-devel b/srcpkgs/libfeedback-devel
new file mode 120000
index 00000000000..49dc965f1cd
--- /dev/null
+++ b/srcpkgs/libfeedback-devel
@@ -0,0 +1 @@
+feedbackd
\ No newline at end of file
From 79ff38df1ee8f1179da7bcecf5669db39af1f470 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Sat, 29 Aug 2020 11:47:56 -0700
Subject: [PATCH 2/8] New package: phoc-0.4.2
---
srcpkgs/phoc/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/phoc/template
diff --git a/srcpkgs/phoc/template b/srcpkgs/phoc/template
new file mode 100644
index 00000000000..00c9f1f3ab0
--- /dev/null
+++ b/srcpkgs/phoc/template
@@ -0,0 +1,16 @@
+# Template file for 'phoc'
+pkgname=phoc
+version=0.4.2
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=meson
+configure_args="-Dembed-wlroots=disabled"
+hostmakedepends="glib-devel pkg-config wayland-devel"
+makedepends="gnome-desktop-devel wlroots-devel"
+depends="mutter"
+short_desc="Wlroots based Phone compositor for the Phosh shell"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/phoc"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=bdb34644c7d49c953239c1e939bc5ee2bc26f6187b9d756b70b113d2734c712c
From 33cd96a32a6d9e01a0b8c392552fc28cff1b2761 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Sat, 29 Aug 2020 11:48:48 -0700
Subject: [PATCH 3/8] New package: squeekboard-1.9.3
---
srcpkgs/squeekboard/template | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
create mode 100644 srcpkgs/squeekboard/template
diff --git a/srcpkgs/squeekboard/template b/srcpkgs/squeekboard/template
new file mode 100644
index 00000000000..938248efa6b
--- /dev/null
+++ b/srcpkgs/squeekboard/template
@@ -0,0 +1,25 @@
+# Template file for 'squeekboard'
+pkgname=squeekboard
+version=1.9.3
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=meson
+build_helper=rust
+hostmakedepends="glib-devel gettext pkg-config cargo wayland-devel"
+makedepends="rust gtk+3-devel gnome-desktop-devel libfeedback-devel"
+short_desc="Final Librem5 keyboard"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/squeekboard"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=b99e56faace3986bf752e08c104cea60ed896d514284840655033dd9457db824
+
+pre_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ vsed -i cargo_build.sh -e "s/-a ./-a ${XBPS_CROSS_RUST_TARGET}/g"
+ fi
+}
+
+post_install() {
+ chmod +x ${DESTDIR}/usr/bin/squeekboard-entry
+}
From 5eb9d6d94324ceb208c4a75fa1be82dcf402c30c Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Sat, 29 Aug 2020 11:48:59 -0700
Subject: [PATCH 4/8] New package: phosh-0.4.3
---
srcpkgs/phosh/files/phosh.desktop | 11 ++++++++
srcpkgs/phosh/files/sm.puri.OSK0.desktop | 12 +++++++++
srcpkgs/phosh/patches/32bit-build-fix.patch | 30 +++++++++++++++++++++
srcpkgs/phosh/template | 22 +++++++++++++++
4 files changed, 75 insertions(+)
create mode 100644 srcpkgs/phosh/files/phosh.desktop
create mode 100644 srcpkgs/phosh/files/sm.puri.OSK0.desktop
create mode 100644 srcpkgs/phosh/patches/32bit-build-fix.patch
create mode 100644 srcpkgs/phosh/template
diff --git a/srcpkgs/phosh/files/phosh.desktop b/srcpkgs/phosh/files/phosh.desktop
new file mode 100644
index 00000000000..84452845115
--- /dev/null
+++ b/srcpkgs/phosh/files/phosh.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=Phosh
+Name[en]=Phosh
+Comment=This session logs you into Phosh
+Comment[en]=This session logs in you into Phosh
+Exec=dbus-run-session /usr/bin/phosh
+TryExec=/usr/bin/phosh
+Icon=
+Type=Application
+X-DesktopNames=Phosh
+Keywords=launch;Phosh;desktop;session;
diff --git a/srcpkgs/phosh/files/sm.puri.OSK0.desktop b/srcpkgs/phosh/files/sm.puri.OSK0.desktop
new file mode 100644
index 00000000000..39740f15773
--- /dev/null
+++ b/srcpkgs/phosh/files/sm.puri.OSK0.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Type=Application
+Name=On-screen keyboard
+Comment=Default on-screen keyboard
+Exec=/usr/bin/squeekboard
+Categories=GNOME;Core;
+OnlyShowIn=GNOME;
+NoDisplay=true
+X-GNOME-Autostart-Phase=Panel
+X-GNOME-Provides=inputmethod
+X-GNOME-Autostart-Notify=true
+X-GNOME-AutoRestart=true
diff --git a/srcpkgs/phosh/patches/32bit-build-fix.patch b/srcpkgs/phosh/patches/32bit-build-fix.patch
new file mode 100644
index 00000000000..a98ecb0faa5
--- /dev/null
+++ b/srcpkgs/phosh/patches/32bit-build-fix.patch
@@ -0,0 +1,30 @@
+From d1da5ea7d18c6794c9a7d2f41355fe90d4115ac1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
+Date: Tue, 4 Aug 2020 08:22:39 +0200
+Subject: [PATCH] timestamp-label: Unbreak build on 32 bit platforms
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Use a G_ format specifier for GTimeSpan.
+
+Signed-off-by: Guido Günther <guido.gunther@puri.sm>
+---
+ src/notifications/timestamp-label.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/notifications/timestamp-label.c b/src/notifications/timestamp-label.c
+index 0aa04ce0..a5a4d5e7 100644
+--- src/notifications/timestamp-label.c
++++ src/notifications/timestamp-label.c
+@@ -255,7 +255,7 @@ phosh_timestamp_label_calc_timeout (PhoshTimestampLabel *self)
+ break;
+ }
+ timeout_diff = g_date_time_difference (timeout_time, time_now);
+- g_debug ("time out duration = %ld", timeout_diff);
++ g_debug ("time out duration: %" G_GINT64_FORMAT, timeout_diff);
+ return timeout_diff;
+ }
+
+--
+2.26.2
diff --git a/srcpkgs/phosh/template b/srcpkgs/phosh/template
new file mode 100644
index 00000000000..61873272d51
--- /dev/null
+++ b/srcpkgs/phosh/template
@@ -0,0 +1,22 @@
+# Template file for 'phosh'
+pkgname=phosh
+version=0.4.3
+revision=1
+build_style=meson
+hostmakedepends="phoc glib-devel gettext pkg-config wayland-devel"
+makedepends="libfeedback-devel gcr-devel gnome-desktop-devel pam-devel
+ polkit-devel pulseaudio-devel libsecret-devel libhandy-devel
+ NetworkManager-devel upower-devel"
+depends="phoc squeekboard gnome-session gnome-settings-daemon gnome-control-center
+ elogind xorg-server-xwayland cantarell-fonts"
+short_desc="Shell PoC for the Librem5"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/phosh"
+distfiles="https://repo.pureos.net/pureos/pool/main/p/phosh/phosh_$version.tar.xz"
+checksum=c6fc68aafaf78412637b0f509aafbbca877bda3fe19511bf340b824d7cdbd4ee
+
+post_install() {
+ vcopy ${FILESDIR}/sm.puri.OSK0.desktop usr/share/applications
+ vcopy ${FILESDIR}/phosh.desktop usr/share/wayland-sessions
+}
From bb27e10feedbb763fcd00c0b893170fadae6d195 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 29 Aug 2020 18:35:47 -0700
Subject: [PATCH 5/8] New package: calls-0.1.7
---
srcpkgs/calls/template | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
create mode 100644 srcpkgs/calls/template
diff --git a/srcpkgs/calls/template b/srcpkgs/calls/template
new file mode 100644
index 00000000000..260ed391d24
--- /dev/null
+++ b/srcpkgs/calls/template
@@ -0,0 +1,17 @@
+# Template file for 'calls'
+pkgname=calls
+version=0.1.7
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=meson
+hostmakedepends="glib-devel gettext vala pkg-config wayland-devel
+ evolution-data-server-devel"
+makedepends="folks-devel libhandy-devel libpeas-devel gom-devel
+ ModemManager-devel libfeedback-devel"
+depends="NetworkManager"
+short_desc="Phone call application"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/calls"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=477c55d483ca13f6ac98209c3c4d6c5858f706e72a133616dcb6827ef25829c7
From 6eb668a44fe24a9cb1d23dff522473528b59706a Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 29 Aug 2020 18:36:35 -0700
Subject: [PATCH 6/8] New package: purism-chatty-0.1.15
---
srcpkgs/purism-chatty/template | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
create mode 100644 srcpkgs/purism-chatty/template
diff --git a/srcpkgs/purism-chatty/template b/srcpkgs/purism-chatty/template
new file mode 100644
index 00000000000..d11bfcea882
--- /dev/null
+++ b/srcpkgs/purism-chatty/template
@@ -0,0 +1,22 @@
+# Template file for 'purism-chatty'
+pkgname=purism-chatty
+_pkgname=chatty
+version=0.1.15
+revision=1
+wrksrc=${_pkgname}-v${version}
+build_style=meson
+hostmakedepends="glib-devel pkg-config gettext"
+makedepends="libfeedback-devel libhandy-devel evolution-data-server-devel
+ libpurple libpurple-devel"
+short_desc="XMPP and SMS messaging via libpurple and Modemmanager"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/chatty"
+distfiles="${homepage}/-/archive/v${version}/${_pkgname}-v${version}.tar.gz"
+checksum=9be2b79a266a7fa1e3d3e7ba447ff89d2b9e44312d6e55f2a63d191369528d64
+
+pre_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ vsed -i src/meson.build -e "s/purple_plugdir =.*/purple_plugdir = \'\/usr\/${XBPS_CROSS_TRIPLET}\/usr\/lib\/purple-2\'/g"
+ fi
+}
From c77b0c737c9b0f61fd83a69b0cb8c62009237686 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 12 Sep 2020 10:58:50 -0700
Subject: [PATCH 7/8] New package: mobile-config-firefox-1.0.1
---
.../files/distro_links.html | 5 +++++
srcpkgs/mobile-config-firefox/template | 16 ++++++++++++++++
2 files changed, 21 insertions(+)
create mode 100644 srcpkgs/mobile-config-firefox/files/distro_links.html
create mode 100644 srcpkgs/mobile-config-firefox/template
diff --git a/srcpkgs/mobile-config-firefox/files/distro_links.html b/srcpkgs/mobile-config-firefox/files/distro_links.html
new file mode 100644
index 00000000000..ca89d0ecd08
--- /dev/null
+++ b/srcpkgs/mobile-config-firefox/files/distro_links.html
@@ -0,0 +1,5 @@
+<p class="distro-links">
+ <a href="https://voidlinux.org/">homepage</a> -
+ <a href="https://docs.voidlinux.org/">docs</a>
+ <a href="https://github.com/void-linux">repos</a>
+</p>
diff --git a/srcpkgs/mobile-config-firefox/template b/srcpkgs/mobile-config-firefox/template
new file mode 100644
index 00000000000..8a1530115e8
--- /dev/null
+++ b/srcpkgs/mobile-config-firefox/template
@@ -0,0 +1,16 @@
+# Template file for 'mobile-config-firefox'
+pkgname=mobile-config-firefox
+version=1.0.1
+revision=1
+build_style=gnu-makefile
+make_install_args="DISTRO=VoidLinux"
+short_desc="Firefox tweaks for mobile and privacy"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://gitlab.com/postmarketOS/mobile-config-firefox"
+distfiles="${homepage}/-/archive/${version}/${pkgname}-${version}.tar.gz"
+checksum=7dce837995956f6f224041853e005eecb3368cd3cbfec6fe3e8a3153747dd0a7
+
+post_extract() {
+ cp ${FILESDIR}/distro_links.html src/homepage
+}
From a43c3a6f19c47f5970074f94a281fa5596298ffe Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 12 Sep 2020 14:42:26 -0700
Subject: [PATCH 8/8] New package: phosh-desktop-0.1
---
.../phosh-desktop/files/000-gschema.override | 21 +++++++++++++++++++
srcpkgs/phosh-desktop/files/01-phoc-scaling | 5 +++++
.../files/02-gnome-software-no-first-run | 2 ++
srcpkgs/phosh-desktop/template | 19 +++++++++++++++++
4 files changed, 47 insertions(+)
create mode 100644 srcpkgs/phosh-desktop/files/000-gschema.override
create mode 100644 srcpkgs/phosh-desktop/files/01-phoc-scaling
create mode 100644 srcpkgs/phosh-desktop/files/02-gnome-software-no-first-run
create mode 100644 srcpkgs/phosh-desktop/template
diff --git a/srcpkgs/phosh-desktop/files/000-gschema.override b/srcpkgs/phosh-desktop/files/000-gschema.override
new file mode 100644
index 00000000000..dfd1550e524
--- /dev/null
+++ b/srcpkgs/phosh-desktop/files/000-gschema.override
@@ -0,0 +1,21 @@
+[org.gnome.desktop.background]
+picture-uri='file:///usr/share/backgrounds/gnome/LightWaves.jpg'
+
+[org.gnome.desktop.interface]
+clock-show-weekday=false
+clock-show-date=false
+
+[org.gnome.desktop.wm.preferences]
+button-layout='appmenu:'
+
+[org.gnome.Epiphany]
+search-engines=[('Search the Web', 'https://duckduckgo.com/?q=%s&t=epiphany', ''), ('DuckDuckGo', 'https://duckduckgo.com/?q=%s&t=epiphany', '!ddg'), ('Qwant', 'https://www.qwant.com/?q=%s', '!q')]
+
+[org.gnome.Epiphany.web]
+mobile-user-agent=true
+user-agent='Mozilla/5.0 (Linux; Android 10; Pixel) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.96 Mobile Safari/537.36'
+
+
+[org.gnome.settings-daemon.plugins.power]
+sleep-inactive-ac-type='nothing'
+ambient-enabled=false
diff --git a/srcpkgs/phosh-desktop/files/01-phoc-scaling b/srcpkgs/phosh-desktop/files/01-phoc-scaling
new file mode 100644
index 00000000000..880af2439d3
--- /dev/null
+++ b/srcpkgs/phosh-desktop/files/01-phoc-scaling
@@ -0,0 +1,5 @@
+[sm/puri/phoc/application/firefox]
+scale-to-fit=false
+
+[sm/puri/phoc/application/org-gnome-maps]
+scale-to-fit=true
diff --git a/srcpkgs/phosh-desktop/files/02-gnome-software-no-first-run b/srcpkgs/phosh-desktop/files/02-gnome-software-no-first-run
new file mode 100644
index 00000000000..b46525debda
--- /dev/null
+++ b/srcpkgs/phosh-desktop/files/02-gnome-software-no-first-run
@@ -0,0 +1,2 @@
+[org/gnome/software]
+first-run=false
diff --git a/srcpkgs/phosh-desktop/template b/srcpkgs/phosh-desktop/template
new file mode 100644
index 00000000000..e75064264cd
--- /dev/null
+++ b/srcpkgs/phosh-desktop/template
@@ -0,0 +1,19 @@
+# Template file for 'phosh-desktop'
+pkgname=phosh-desktop
+version=0.1
+revision=1
+build_style=meta
+depends="phosh NetworkManager ModemManager gnome-backgrounds gnome-terminal epiphany iio-sensor-proxy
+ gnome-power-manager gnome-color-manager gnome-keyring xdg-user-dirs bluez calls purism-chatty
+ gedit gnome-maps gnome-clocks gnome-contacts gnome-calculator gnome-calendar evince gnome-music
+ gnome-photos"
+short_desc="Phosh desktop environment metapackage"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://voidlinux.org"
+
+post_install() {
+ vinstall ${FILESDIR}/000-gschema.override 644 usr/share/glib-2.0/schemas 000-void.gschema.override
+ vinstall ${FILESDIR}/01-phoc-scaling 644 etc/dconf/db/void.d
+ vinstall ${FILESDIR}/02-gnome-software-no-first-run 644 etc/dconf/db/void.d
+}
^ permalink raw reply [flat|nested] 47+ messages in thread* Re: [PR PATCH] [Updated] New packages: phoc-0.4.2 calls-0.1.7 purism-chatty-0.1.15
2020-08-29 20:46 [PR PATCH] New packages: phoc-0.4.2 calls-0.1.7 purism-chatty--0.1.15 julio641742
` (20 preceding siblings ...)
2020-09-12 21:46 ` [PR PATCH] [Updated] " julio641742
@ 2020-09-12 22:08 ` julio641742
2020-09-12 22:23 ` julio641742
` (23 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: julio641742 @ 2020-09-12 22:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 386 bytes --]
There is an updated pull request by julio641742 against master on the void-packages repository
https://github.com/julio641742/void-packages phosh
https://github.com/void-linux/void-packages/pull/24538
New packages: phoc-0.4.2 calls-0.1.7 purism-chatty-0.1.15
Getting ready for my pinephone :)
A patch file from https://github.com/void-linux/void-packages/pull/24538.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-phosh-24538.patch --]
[-- Type: text/x-diff, Size: 17557 bytes --]
From 17528a815b0370ec2ea85f0c34e05e1cb5b16185 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Sat, 29 Aug 2020 11:47:35 -0700
Subject: [PATCH 1/9] New package: feedbackd-0.0.0+git20200707
---
common/shlibs | 1 +
srcpkgs/feedbackd/template | 37 +++++++++++++++++++++++++++++++++++++
srcpkgs/libfeedback | 1 +
srcpkgs/libfeedback-devel | 1 +
4 files changed, 40 insertions(+)
create mode 100644 srcpkgs/feedbackd/template
create mode 120000 srcpkgs/libfeedback
create mode 120000 srcpkgs/libfeedback-devel
diff --git a/common/shlibs b/common/shlibs
index ec8310df7b3..752730f829b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3990,3 +3990,4 @@ libneatvnc.so.0 neatvnc-0.2.0_1
libtdjson.so.1.6.0 libtd-1.6.0_1
libJudy.so.1 judy-1.0.5_1
libsignal-protocol-c.so.2 libsignal-protocol-c-2.3.3_2
+libfeedback-0.0.so.0 libfeedback-0.0.0+git20200707_1
diff --git a/srcpkgs/feedbackd/template b/srcpkgs/feedbackd/template
new file mode 100644
index 00000000000..0131775cc9d
--- /dev/null
+++ b/srcpkgs/feedbackd/template
@@ -0,0 +1,37 @@
+# Template file for 'feedbackd'
+pkgname=feedbackd
+version=0.0.0+git20200707
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=meson
+build_helper=gir
+hostmakedepends="vala glib-devel pkg-config"
+makedepends="gsound-devel libgudev-devel json-glib-devel"
+depends="dbus"
+short_desc="Daemon to provide haptic feedback on events"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/feedbackd"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=37cf48cbdbaee8e2d0bea406f5b6317bf0e3cdf79250f9ce0a884e7d3905a8ea
+
+post_install() {
+ vinstall debian/feedbackd.udev 0644 usr/lib/udev/rules.d 90-feedbackd.rules
+}
+
+libfeedback_package() {
+ short_desc+=" - shared libraries"
+ pkg_install() {
+ vmove "usr/lib/*.so.*"
+ }
+}
+
+libfeedback-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ }
+}
diff --git a/srcpkgs/libfeedback b/srcpkgs/libfeedback
new file mode 120000
index 00000000000..49dc965f1cd
--- /dev/null
+++ b/srcpkgs/libfeedback
@@ -0,0 +1 @@
+feedbackd
\ No newline at end of file
diff --git a/srcpkgs/libfeedback-devel b/srcpkgs/libfeedback-devel
new file mode 120000
index 00000000000..49dc965f1cd
--- /dev/null
+++ b/srcpkgs/libfeedback-devel
@@ -0,0 +1 @@
+feedbackd
\ No newline at end of file
From 79ff38df1ee8f1179da7bcecf5669db39af1f470 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Sat, 29 Aug 2020 11:47:56 -0700
Subject: [PATCH 2/9] New package: phoc-0.4.2
---
srcpkgs/phoc/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/phoc/template
diff --git a/srcpkgs/phoc/template b/srcpkgs/phoc/template
new file mode 100644
index 00000000000..00c9f1f3ab0
--- /dev/null
+++ b/srcpkgs/phoc/template
@@ -0,0 +1,16 @@
+# Template file for 'phoc'
+pkgname=phoc
+version=0.4.2
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=meson
+configure_args="-Dembed-wlroots=disabled"
+hostmakedepends="glib-devel pkg-config wayland-devel"
+makedepends="gnome-desktop-devel wlroots-devel"
+depends="mutter"
+short_desc="Wlroots based Phone compositor for the Phosh shell"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/phoc"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=bdb34644c7d49c953239c1e939bc5ee2bc26f6187b9d756b70b113d2734c712c
From 33cd96a32a6d9e01a0b8c392552fc28cff1b2761 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Sat, 29 Aug 2020 11:48:48 -0700
Subject: [PATCH 3/9] New package: squeekboard-1.9.3
---
srcpkgs/squeekboard/template | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
create mode 100644 srcpkgs/squeekboard/template
diff --git a/srcpkgs/squeekboard/template b/srcpkgs/squeekboard/template
new file mode 100644
index 00000000000..938248efa6b
--- /dev/null
+++ b/srcpkgs/squeekboard/template
@@ -0,0 +1,25 @@
+# Template file for 'squeekboard'
+pkgname=squeekboard
+version=1.9.3
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=meson
+build_helper=rust
+hostmakedepends="glib-devel gettext pkg-config cargo wayland-devel"
+makedepends="rust gtk+3-devel gnome-desktop-devel libfeedback-devel"
+short_desc="Final Librem5 keyboard"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/squeekboard"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=b99e56faace3986bf752e08c104cea60ed896d514284840655033dd9457db824
+
+pre_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ vsed -i cargo_build.sh -e "s/-a ./-a ${XBPS_CROSS_RUST_TARGET}/g"
+ fi
+}
+
+post_install() {
+ chmod +x ${DESTDIR}/usr/bin/squeekboard-entry
+}
From 5eb9d6d94324ceb208c4a75fa1be82dcf402c30c Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Sat, 29 Aug 2020 11:48:59 -0700
Subject: [PATCH 4/9] New package: phosh-0.4.3
---
srcpkgs/phosh/files/phosh.desktop | 11 ++++++++
srcpkgs/phosh/files/sm.puri.OSK0.desktop | 12 +++++++++
srcpkgs/phosh/patches/32bit-build-fix.patch | 30 +++++++++++++++++++++
srcpkgs/phosh/template | 22 +++++++++++++++
4 files changed, 75 insertions(+)
create mode 100644 srcpkgs/phosh/files/phosh.desktop
create mode 100644 srcpkgs/phosh/files/sm.puri.OSK0.desktop
create mode 100644 srcpkgs/phosh/patches/32bit-build-fix.patch
create mode 100644 srcpkgs/phosh/template
diff --git a/srcpkgs/phosh/files/phosh.desktop b/srcpkgs/phosh/files/phosh.desktop
new file mode 100644
index 00000000000..84452845115
--- /dev/null
+++ b/srcpkgs/phosh/files/phosh.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=Phosh
+Name[en]=Phosh
+Comment=This session logs you into Phosh
+Comment[en]=This session logs in you into Phosh
+Exec=dbus-run-session /usr/bin/phosh
+TryExec=/usr/bin/phosh
+Icon=
+Type=Application
+X-DesktopNames=Phosh
+Keywords=launch;Phosh;desktop;session;
diff --git a/srcpkgs/phosh/files/sm.puri.OSK0.desktop b/srcpkgs/phosh/files/sm.puri.OSK0.desktop
new file mode 100644
index 00000000000..39740f15773
--- /dev/null
+++ b/srcpkgs/phosh/files/sm.puri.OSK0.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Type=Application
+Name=On-screen keyboard
+Comment=Default on-screen keyboard
+Exec=/usr/bin/squeekboard
+Categories=GNOME;Core;
+OnlyShowIn=GNOME;
+NoDisplay=true
+X-GNOME-Autostart-Phase=Panel
+X-GNOME-Provides=inputmethod
+X-GNOME-Autostart-Notify=true
+X-GNOME-AutoRestart=true
diff --git a/srcpkgs/phosh/patches/32bit-build-fix.patch b/srcpkgs/phosh/patches/32bit-build-fix.patch
new file mode 100644
index 00000000000..a98ecb0faa5
--- /dev/null
+++ b/srcpkgs/phosh/patches/32bit-build-fix.patch
@@ -0,0 +1,30 @@
+From d1da5ea7d18c6794c9a7d2f41355fe90d4115ac1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
+Date: Tue, 4 Aug 2020 08:22:39 +0200
+Subject: [PATCH] timestamp-label: Unbreak build on 32 bit platforms
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Use a G_ format specifier for GTimeSpan.
+
+Signed-off-by: Guido Günther <guido.gunther@puri.sm>
+---
+ src/notifications/timestamp-label.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/notifications/timestamp-label.c b/src/notifications/timestamp-label.c
+index 0aa04ce0..a5a4d5e7 100644
+--- src/notifications/timestamp-label.c
++++ src/notifications/timestamp-label.c
+@@ -255,7 +255,7 @@ phosh_timestamp_label_calc_timeout (PhoshTimestampLabel *self)
+ break;
+ }
+ timeout_diff = g_date_time_difference (timeout_time, time_now);
+- g_debug ("time out duration = %ld", timeout_diff);
++ g_debug ("time out duration: %" G_GINT64_FORMAT, timeout_diff);
+ return timeout_diff;
+ }
+
+--
+2.26.2
diff --git a/srcpkgs/phosh/template b/srcpkgs/phosh/template
new file mode 100644
index 00000000000..61873272d51
--- /dev/null
+++ b/srcpkgs/phosh/template
@@ -0,0 +1,22 @@
+# Template file for 'phosh'
+pkgname=phosh
+version=0.4.3
+revision=1
+build_style=meson
+hostmakedepends="phoc glib-devel gettext pkg-config wayland-devel"
+makedepends="libfeedback-devel gcr-devel gnome-desktop-devel pam-devel
+ polkit-devel pulseaudio-devel libsecret-devel libhandy-devel
+ NetworkManager-devel upower-devel"
+depends="phoc squeekboard gnome-session gnome-settings-daemon gnome-control-center
+ elogind xorg-server-xwayland cantarell-fonts"
+short_desc="Shell PoC for the Librem5"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/phosh"
+distfiles="https://repo.pureos.net/pureos/pool/main/p/phosh/phosh_$version.tar.xz"
+checksum=c6fc68aafaf78412637b0f509aafbbca877bda3fe19511bf340b824d7cdbd4ee
+
+post_install() {
+ vcopy ${FILESDIR}/sm.puri.OSK0.desktop usr/share/applications
+ vcopy ${FILESDIR}/phosh.desktop usr/share/wayland-sessions
+}
From bb27e10feedbb763fcd00c0b893170fadae6d195 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 29 Aug 2020 18:35:47 -0700
Subject: [PATCH 5/9] New package: calls-0.1.7
---
srcpkgs/calls/template | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
create mode 100644 srcpkgs/calls/template
diff --git a/srcpkgs/calls/template b/srcpkgs/calls/template
new file mode 100644
index 00000000000..260ed391d24
--- /dev/null
+++ b/srcpkgs/calls/template
@@ -0,0 +1,17 @@
+# Template file for 'calls'
+pkgname=calls
+version=0.1.7
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=meson
+hostmakedepends="glib-devel gettext vala pkg-config wayland-devel
+ evolution-data-server-devel"
+makedepends="folks-devel libhandy-devel libpeas-devel gom-devel
+ ModemManager-devel libfeedback-devel"
+depends="NetworkManager"
+short_desc="Phone call application"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/calls"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=477c55d483ca13f6ac98209c3c4d6c5858f706e72a133616dcb6827ef25829c7
From 6eb668a44fe24a9cb1d23dff522473528b59706a Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 29 Aug 2020 18:36:35 -0700
Subject: [PATCH 6/9] New package: purism-chatty-0.1.15
---
srcpkgs/purism-chatty/template | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
create mode 100644 srcpkgs/purism-chatty/template
diff --git a/srcpkgs/purism-chatty/template b/srcpkgs/purism-chatty/template
new file mode 100644
index 00000000000..d11bfcea882
--- /dev/null
+++ b/srcpkgs/purism-chatty/template
@@ -0,0 +1,22 @@
+# Template file for 'purism-chatty'
+pkgname=purism-chatty
+_pkgname=chatty
+version=0.1.15
+revision=1
+wrksrc=${_pkgname}-v${version}
+build_style=meson
+hostmakedepends="glib-devel pkg-config gettext"
+makedepends="libfeedback-devel libhandy-devel evolution-data-server-devel
+ libpurple libpurple-devel"
+short_desc="XMPP and SMS messaging via libpurple and Modemmanager"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/chatty"
+distfiles="${homepage}/-/archive/v${version}/${_pkgname}-v${version}.tar.gz"
+checksum=9be2b79a266a7fa1e3d3e7ba447ff89d2b9e44312d6e55f2a63d191369528d64
+
+pre_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ vsed -i src/meson.build -e "s/purple_plugdir =.*/purple_plugdir = \'\/usr\/${XBPS_CROSS_TRIPLET}\/usr\/lib\/purple-2\'/g"
+ fi
+}
From 42cc84c1e128d5ceac798081c40233c35d8f0d57 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 12 Sep 2020 15:05:36 -0700
Subject: [PATCH 7/9] New package: kgx-0.2.1
---
srcpkgs/kgx/template | 14 ++++++++++++++
1 file changed, 14 insertions(+)
create mode 100644 srcpkgs/kgx/template
diff --git a/srcpkgs/kgx/template b/srcpkgs/kgx/template
new file mode 100644
index 00000000000..98ec4caf70e
--- /dev/null
+++ b/srcpkgs/kgx/template
@@ -0,0 +1,14 @@
+# Template file for 'kgx'
+pkgname=kgx
+version=0.2.1
+revision=1
+build_style=meson
+hostmakedepends="glib-devel pkg-config gettext"
+makedepends="vte3-devel gtk+3-devel libhandy-devel libgtop-devel"
+depends="dbus desktop-file-utils gsettings-desktop-schemas"
+short_desc="Minimal terminal for GNOME"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://gitlab.gnome.org/ZanderBrown/kgx"
+distfiles="${homepage}/-/archive/${version}/kgx-${version}.tar.gz"
+checksum=70a814b0baf70049d5a20791d58a32e92661428d2deeeb56d91b81cc4dc5e81a
From f41e40ca26743f485aef3c0c3816c9b742ed12a8 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 12 Sep 2020 10:58:50 -0700
Subject: [PATCH 8/9] New package: mobile-config-firefox-1.0.1
---
.../files/distro_links.html | 5 +++++
srcpkgs/mobile-config-firefox/template | 16 ++++++++++++++++
2 files changed, 21 insertions(+)
create mode 100644 srcpkgs/mobile-config-firefox/files/distro_links.html
create mode 100644 srcpkgs/mobile-config-firefox/template
diff --git a/srcpkgs/mobile-config-firefox/files/distro_links.html b/srcpkgs/mobile-config-firefox/files/distro_links.html
new file mode 100644
index 00000000000..ca89d0ecd08
--- /dev/null
+++ b/srcpkgs/mobile-config-firefox/files/distro_links.html
@@ -0,0 +1,5 @@
+<p class="distro-links">
+ <a href="https://voidlinux.org/">homepage</a> -
+ <a href="https://docs.voidlinux.org/">docs</a>
+ <a href="https://github.com/void-linux">repos</a>
+</p>
diff --git a/srcpkgs/mobile-config-firefox/template b/srcpkgs/mobile-config-firefox/template
new file mode 100644
index 00000000000..8a1530115e8
--- /dev/null
+++ b/srcpkgs/mobile-config-firefox/template
@@ -0,0 +1,16 @@
+# Template file for 'mobile-config-firefox'
+pkgname=mobile-config-firefox
+version=1.0.1
+revision=1
+build_style=gnu-makefile
+make_install_args="DISTRO=VoidLinux"
+short_desc="Firefox tweaks for mobile and privacy"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://gitlab.com/postmarketOS/mobile-config-firefox"
+distfiles="${homepage}/-/archive/${version}/${pkgname}-${version}.tar.gz"
+checksum=7dce837995956f6f224041853e005eecb3368cd3cbfec6fe3e8a3153747dd0a7
+
+post_extract() {
+ cp ${FILESDIR}/distro_links.html src/homepage
+}
From c6872d808145a9984e60e5591575b704132b01ef Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 12 Sep 2020 14:42:26 -0700
Subject: [PATCH 9/9] New package: phosh-desktop-0.1
---
.../phosh-desktop/files/000-gschema.override | 21 +++++++++++++++++++
srcpkgs/phosh-desktop/files/01-phoc-scaling | 5 +++++
srcpkgs/phosh-desktop/template | 18 ++++++++++++++++
3 files changed, 44 insertions(+)
create mode 100644 srcpkgs/phosh-desktop/files/000-gschema.override
create mode 100644 srcpkgs/phosh-desktop/files/01-phoc-scaling
create mode 100644 srcpkgs/phosh-desktop/template
diff --git a/srcpkgs/phosh-desktop/files/000-gschema.override b/srcpkgs/phosh-desktop/files/000-gschema.override
new file mode 100644
index 00000000000..dfd1550e524
--- /dev/null
+++ b/srcpkgs/phosh-desktop/files/000-gschema.override
@@ -0,0 +1,21 @@
+[org.gnome.desktop.background]
+picture-uri='file:///usr/share/backgrounds/gnome/LightWaves.jpg'
+
+[org.gnome.desktop.interface]
+clock-show-weekday=false
+clock-show-date=false
+
+[org.gnome.desktop.wm.preferences]
+button-layout='appmenu:'
+
+[org.gnome.Epiphany]
+search-engines=[('Search the Web', 'https://duckduckgo.com/?q=%s&t=epiphany', ''), ('DuckDuckGo', 'https://duckduckgo.com/?q=%s&t=epiphany', '!ddg'), ('Qwant', 'https://www.qwant.com/?q=%s', '!q')]
+
+[org.gnome.Epiphany.web]
+mobile-user-agent=true
+user-agent='Mozilla/5.0 (Linux; Android 10; Pixel) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.96 Mobile Safari/537.36'
+
+
+[org.gnome.settings-daemon.plugins.power]
+sleep-inactive-ac-type='nothing'
+ambient-enabled=false
diff --git a/srcpkgs/phosh-desktop/files/01-phoc-scaling b/srcpkgs/phosh-desktop/files/01-phoc-scaling
new file mode 100644
index 00000000000..880af2439d3
--- /dev/null
+++ b/srcpkgs/phosh-desktop/files/01-phoc-scaling
@@ -0,0 +1,5 @@
+[sm/puri/phoc/application/firefox]
+scale-to-fit=false
+
+[sm/puri/phoc/application/org-gnome-maps]
+scale-to-fit=true
diff --git a/srcpkgs/phosh-desktop/template b/srcpkgs/phosh-desktop/template
new file mode 100644
index 00000000000..383268a4278
--- /dev/null
+++ b/srcpkgs/phosh-desktop/template
@@ -0,0 +1,18 @@
+# Template file for 'phosh-desktop'
+pkgname=phosh-desktop
+version=0.1
+revision=1
+build_style=meta
+depends="phosh NetworkManager ModemManager gnome-backgrounds kgx epiphany iio-sensor-proxy
+ gnome-power-manager gnome-color-manager gnome-keyring xdg-user-dirs bluez calls purism-chatty
+ gedit gnome-maps gnome-clocks gnome-contacts gnome-calculator gnome-calendar evince gnome-music
+ gnome-photos"
+short_desc="Phosh desktop environment metapackage"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://voidlinux.org"
+
+post_install() {
+ vinstall ${FILESDIR}/000-gschema.override 644 usr/share/glib-2.0/schemas 000-void.gschema.override
+ vinstall ${FILESDIR}/01-phoc-scaling 644 etc/dconf/db/void.d
+}
^ permalink raw reply [flat|nested] 47+ messages in thread* Re: [PR PATCH] [Updated] New packages: phoc-0.4.2 calls-0.1.7 purism-chatty-0.1.15
2020-08-29 20:46 [PR PATCH] New packages: phoc-0.4.2 calls-0.1.7 purism-chatty--0.1.15 julio641742
` (21 preceding siblings ...)
2020-09-12 22:08 ` julio641742
@ 2020-09-12 22:23 ` julio641742
2020-09-12 22:32 ` julio641742
` (22 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: julio641742 @ 2020-09-12 22:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 386 bytes --]
There is an updated pull request by julio641742 against master on the void-packages repository
https://github.com/julio641742/void-packages phosh
https://github.com/void-linux/void-packages/pull/24538
New packages: phoc-0.4.2 calls-0.1.7 purism-chatty-0.1.15
Getting ready for my pinephone :)
A patch file from https://github.com/void-linux/void-packages/pull/24538.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-phosh-24538.patch --]
[-- Type: text/x-diff, Size: 17528 bytes --]
From 7c4c6db664c42c69beffd038e89cbea9a46f3dbd Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Sat, 29 Aug 2020 11:47:35 -0700
Subject: [PATCH 1/9] New package: feedbackd-0.0.0+git20200707
---
common/shlibs | 1 +
srcpkgs/feedbackd/template | 37 +++++++++++++++++++++++++++++++++++++
srcpkgs/libfeedback | 1 +
srcpkgs/libfeedback-devel | 1 +
4 files changed, 40 insertions(+)
create mode 100644 srcpkgs/feedbackd/template
create mode 120000 srcpkgs/libfeedback
create mode 120000 srcpkgs/libfeedback-devel
diff --git a/common/shlibs b/common/shlibs
index ec8310df7b3..752730f829b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3990,3 +3990,4 @@ libneatvnc.so.0 neatvnc-0.2.0_1
libtdjson.so.1.6.0 libtd-1.6.0_1
libJudy.so.1 judy-1.0.5_1
libsignal-protocol-c.so.2 libsignal-protocol-c-2.3.3_2
+libfeedback-0.0.so.0 libfeedback-0.0.0+git20200707_1
diff --git a/srcpkgs/feedbackd/template b/srcpkgs/feedbackd/template
new file mode 100644
index 00000000000..0131775cc9d
--- /dev/null
+++ b/srcpkgs/feedbackd/template
@@ -0,0 +1,37 @@
+# Template file for 'feedbackd'
+pkgname=feedbackd
+version=0.0.0+git20200707
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=meson
+build_helper=gir
+hostmakedepends="vala glib-devel pkg-config"
+makedepends="gsound-devel libgudev-devel json-glib-devel"
+depends="dbus"
+short_desc="Daemon to provide haptic feedback on events"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/feedbackd"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=37cf48cbdbaee8e2d0bea406f5b6317bf0e3cdf79250f9ce0a884e7d3905a8ea
+
+post_install() {
+ vinstall debian/feedbackd.udev 0644 usr/lib/udev/rules.d 90-feedbackd.rules
+}
+
+libfeedback_package() {
+ short_desc+=" - shared libraries"
+ pkg_install() {
+ vmove "usr/lib/*.so.*"
+ }
+}
+
+libfeedback-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ }
+}
diff --git a/srcpkgs/libfeedback b/srcpkgs/libfeedback
new file mode 120000
index 00000000000..49dc965f1cd
--- /dev/null
+++ b/srcpkgs/libfeedback
@@ -0,0 +1 @@
+feedbackd
\ No newline at end of file
diff --git a/srcpkgs/libfeedback-devel b/srcpkgs/libfeedback-devel
new file mode 120000
index 00000000000..49dc965f1cd
--- /dev/null
+++ b/srcpkgs/libfeedback-devel
@@ -0,0 +1 @@
+feedbackd
\ No newline at end of file
From f12e1ef305edd0d1f1749a5d0f489de1bd105ddf Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Sat, 29 Aug 2020 11:47:56 -0700
Subject: [PATCH 2/9] New package: phoc-0.4.2
---
srcpkgs/phoc/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/phoc/template
diff --git a/srcpkgs/phoc/template b/srcpkgs/phoc/template
new file mode 100644
index 00000000000..00c9f1f3ab0
--- /dev/null
+++ b/srcpkgs/phoc/template
@@ -0,0 +1,16 @@
+# Template file for 'phoc'
+pkgname=phoc
+version=0.4.2
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=meson
+configure_args="-Dembed-wlroots=disabled"
+hostmakedepends="glib-devel pkg-config wayland-devel"
+makedepends="gnome-desktop-devel wlroots-devel"
+depends="mutter"
+short_desc="Wlroots based Phone compositor for the Phosh shell"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/phoc"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=bdb34644c7d49c953239c1e939bc5ee2bc26f6187b9d756b70b113d2734c712c
From 3a9cb180fc20307a6b95490dbbee07454bd88f99 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Sat, 29 Aug 2020 11:48:48 -0700
Subject: [PATCH 3/9] New package: squeekboard-1.9.3
---
srcpkgs/squeekboard/template | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
create mode 100644 srcpkgs/squeekboard/template
diff --git a/srcpkgs/squeekboard/template b/srcpkgs/squeekboard/template
new file mode 100644
index 00000000000..938248efa6b
--- /dev/null
+++ b/srcpkgs/squeekboard/template
@@ -0,0 +1,25 @@
+# Template file for 'squeekboard'
+pkgname=squeekboard
+version=1.9.3
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=meson
+build_helper=rust
+hostmakedepends="glib-devel gettext pkg-config cargo wayland-devel"
+makedepends="rust gtk+3-devel gnome-desktop-devel libfeedback-devel"
+short_desc="Final Librem5 keyboard"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/squeekboard"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=b99e56faace3986bf752e08c104cea60ed896d514284840655033dd9457db824
+
+pre_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ vsed -i cargo_build.sh -e "s/-a ./-a ${XBPS_CROSS_RUST_TARGET}/g"
+ fi
+}
+
+post_install() {
+ chmod +x ${DESTDIR}/usr/bin/squeekboard-entry
+}
From 8b5353d78efeb062d0ec8300ed9efd72338e1147 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Sat, 29 Aug 2020 11:48:59 -0700
Subject: [PATCH 4/9] New package: phosh-0.4.3
---
srcpkgs/phosh/files/phosh.desktop | 11 ++++++++
srcpkgs/phosh/files/sm.puri.OSK0.desktop | 12 +++++++++
srcpkgs/phosh/patches/32bit-build-fix.patch | 30 +++++++++++++++++++++
srcpkgs/phosh/template | 22 +++++++++++++++
4 files changed, 75 insertions(+)
create mode 100644 srcpkgs/phosh/files/phosh.desktop
create mode 100644 srcpkgs/phosh/files/sm.puri.OSK0.desktop
create mode 100644 srcpkgs/phosh/patches/32bit-build-fix.patch
create mode 100644 srcpkgs/phosh/template
diff --git a/srcpkgs/phosh/files/phosh.desktop b/srcpkgs/phosh/files/phosh.desktop
new file mode 100644
index 00000000000..84452845115
--- /dev/null
+++ b/srcpkgs/phosh/files/phosh.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=Phosh
+Name[en]=Phosh
+Comment=This session logs you into Phosh
+Comment[en]=This session logs in you into Phosh
+Exec=dbus-run-session /usr/bin/phosh
+TryExec=/usr/bin/phosh
+Icon=
+Type=Application
+X-DesktopNames=Phosh
+Keywords=launch;Phosh;desktop;session;
diff --git a/srcpkgs/phosh/files/sm.puri.OSK0.desktop b/srcpkgs/phosh/files/sm.puri.OSK0.desktop
new file mode 100644
index 00000000000..39740f15773
--- /dev/null
+++ b/srcpkgs/phosh/files/sm.puri.OSK0.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Type=Application
+Name=On-screen keyboard
+Comment=Default on-screen keyboard
+Exec=/usr/bin/squeekboard
+Categories=GNOME;Core;
+OnlyShowIn=GNOME;
+NoDisplay=true
+X-GNOME-Autostart-Phase=Panel
+X-GNOME-Provides=inputmethod
+X-GNOME-Autostart-Notify=true
+X-GNOME-AutoRestart=true
diff --git a/srcpkgs/phosh/patches/32bit-build-fix.patch b/srcpkgs/phosh/patches/32bit-build-fix.patch
new file mode 100644
index 00000000000..a98ecb0faa5
--- /dev/null
+++ b/srcpkgs/phosh/patches/32bit-build-fix.patch
@@ -0,0 +1,30 @@
+From d1da5ea7d18c6794c9a7d2f41355fe90d4115ac1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
+Date: Tue, 4 Aug 2020 08:22:39 +0200
+Subject: [PATCH] timestamp-label: Unbreak build on 32 bit platforms
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Use a G_ format specifier for GTimeSpan.
+
+Signed-off-by: Guido Günther <guido.gunther@puri.sm>
+---
+ src/notifications/timestamp-label.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/notifications/timestamp-label.c b/src/notifications/timestamp-label.c
+index 0aa04ce0..a5a4d5e7 100644
+--- src/notifications/timestamp-label.c
++++ src/notifications/timestamp-label.c
+@@ -255,7 +255,7 @@ phosh_timestamp_label_calc_timeout (PhoshTimestampLabel *self)
+ break;
+ }
+ timeout_diff = g_date_time_difference (timeout_time, time_now);
+- g_debug ("time out duration = %ld", timeout_diff);
++ g_debug ("time out duration: %" G_GINT64_FORMAT, timeout_diff);
+ return timeout_diff;
+ }
+
+--
+2.26.2
diff --git a/srcpkgs/phosh/template b/srcpkgs/phosh/template
new file mode 100644
index 00000000000..61873272d51
--- /dev/null
+++ b/srcpkgs/phosh/template
@@ -0,0 +1,22 @@
+# Template file for 'phosh'
+pkgname=phosh
+version=0.4.3
+revision=1
+build_style=meson
+hostmakedepends="phoc glib-devel gettext pkg-config wayland-devel"
+makedepends="libfeedback-devel gcr-devel gnome-desktop-devel pam-devel
+ polkit-devel pulseaudio-devel libsecret-devel libhandy-devel
+ NetworkManager-devel upower-devel"
+depends="phoc squeekboard gnome-session gnome-settings-daemon gnome-control-center
+ elogind xorg-server-xwayland cantarell-fonts"
+short_desc="Shell PoC for the Librem5"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/phosh"
+distfiles="https://repo.pureos.net/pureos/pool/main/p/phosh/phosh_$version.tar.xz"
+checksum=c6fc68aafaf78412637b0f509aafbbca877bda3fe19511bf340b824d7cdbd4ee
+
+post_install() {
+ vcopy ${FILESDIR}/sm.puri.OSK0.desktop usr/share/applications
+ vcopy ${FILESDIR}/phosh.desktop usr/share/wayland-sessions
+}
From c738fb04bde80ab08aecccbbe96fb679f6c0357f Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 29 Aug 2020 18:35:47 -0700
Subject: [PATCH 5/9] New package: calls-0.1.7
---
srcpkgs/calls/template | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
create mode 100644 srcpkgs/calls/template
diff --git a/srcpkgs/calls/template b/srcpkgs/calls/template
new file mode 100644
index 00000000000..260ed391d24
--- /dev/null
+++ b/srcpkgs/calls/template
@@ -0,0 +1,17 @@
+# Template file for 'calls'
+pkgname=calls
+version=0.1.7
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=meson
+hostmakedepends="glib-devel gettext vala pkg-config wayland-devel
+ evolution-data-server-devel"
+makedepends="folks-devel libhandy-devel libpeas-devel gom-devel
+ ModemManager-devel libfeedback-devel"
+depends="NetworkManager"
+short_desc="Phone call application"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/calls"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=477c55d483ca13f6ac98209c3c4d6c5858f706e72a133616dcb6827ef25829c7
From 7cb4d1ab9ea7b0ddc3b6918c10cc08d8ee680908 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 29 Aug 2020 18:36:35 -0700
Subject: [PATCH 6/9] New package: purism-chatty-0.1.15
---
srcpkgs/purism-chatty/template | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
create mode 100644 srcpkgs/purism-chatty/template
diff --git a/srcpkgs/purism-chatty/template b/srcpkgs/purism-chatty/template
new file mode 100644
index 00000000000..d11bfcea882
--- /dev/null
+++ b/srcpkgs/purism-chatty/template
@@ -0,0 +1,22 @@
+# Template file for 'purism-chatty'
+pkgname=purism-chatty
+_pkgname=chatty
+version=0.1.15
+revision=1
+wrksrc=${_pkgname}-v${version}
+build_style=meson
+hostmakedepends="glib-devel pkg-config gettext"
+makedepends="libfeedback-devel libhandy-devel evolution-data-server-devel
+ libpurple libpurple-devel"
+short_desc="XMPP and SMS messaging via libpurple and Modemmanager"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/chatty"
+distfiles="${homepage}/-/archive/v${version}/${_pkgname}-v${version}.tar.gz"
+checksum=9be2b79a266a7fa1e3d3e7ba447ff89d2b9e44312d6e55f2a63d191369528d64
+
+pre_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ vsed -i src/meson.build -e "s/purple_plugdir =.*/purple_plugdir = \'\/usr\/${XBPS_CROSS_TRIPLET}\/usr\/lib\/purple-2\'/g"
+ fi
+}
From 5580e665bc5379aefd108477e8dafa14690bf897 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 12 Sep 2020 15:05:36 -0700
Subject: [PATCH 7/9] New package: kgx-0.2.1
---
srcpkgs/kgx/template | 14 ++++++++++++++
1 file changed, 14 insertions(+)
create mode 100644 srcpkgs/kgx/template
diff --git a/srcpkgs/kgx/template b/srcpkgs/kgx/template
new file mode 100644
index 00000000000..98ec4caf70e
--- /dev/null
+++ b/srcpkgs/kgx/template
@@ -0,0 +1,14 @@
+# Template file for 'kgx'
+pkgname=kgx
+version=0.2.1
+revision=1
+build_style=meson
+hostmakedepends="glib-devel pkg-config gettext"
+makedepends="vte3-devel gtk+3-devel libhandy-devel libgtop-devel"
+depends="dbus desktop-file-utils gsettings-desktop-schemas"
+short_desc="Minimal terminal for GNOME"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://gitlab.gnome.org/ZanderBrown/kgx"
+distfiles="${homepage}/-/archive/${version}/kgx-${version}.tar.gz"
+checksum=70a814b0baf70049d5a20791d58a32e92661428d2deeeb56d91b81cc4dc5e81a
From ffc2cb9701aaffca1dd083c26ad94f151ba2c311 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 12 Sep 2020 10:58:50 -0700
Subject: [PATCH 8/9] New package: mobile-config-firefox-1.0.1
---
.../files/distro_links.html | 5 +++++
srcpkgs/mobile-config-firefox/template | 16 ++++++++++++++++
2 files changed, 21 insertions(+)
create mode 100644 srcpkgs/mobile-config-firefox/files/distro_links.html
create mode 100644 srcpkgs/mobile-config-firefox/template
diff --git a/srcpkgs/mobile-config-firefox/files/distro_links.html b/srcpkgs/mobile-config-firefox/files/distro_links.html
new file mode 100644
index 00000000000..ca89d0ecd08
--- /dev/null
+++ b/srcpkgs/mobile-config-firefox/files/distro_links.html
@@ -0,0 +1,5 @@
+<p class="distro-links">
+ <a href="https://voidlinux.org/">homepage</a> -
+ <a href="https://docs.voidlinux.org/">docs</a>
+ <a href="https://github.com/void-linux">repos</a>
+</p>
diff --git a/srcpkgs/mobile-config-firefox/template b/srcpkgs/mobile-config-firefox/template
new file mode 100644
index 00000000000..8a1530115e8
--- /dev/null
+++ b/srcpkgs/mobile-config-firefox/template
@@ -0,0 +1,16 @@
+# Template file for 'mobile-config-firefox'
+pkgname=mobile-config-firefox
+version=1.0.1
+revision=1
+build_style=gnu-makefile
+make_install_args="DISTRO=VoidLinux"
+short_desc="Firefox tweaks for mobile and privacy"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://gitlab.com/postmarketOS/mobile-config-firefox"
+distfiles="${homepage}/-/archive/${version}/${pkgname}-${version}.tar.gz"
+checksum=7dce837995956f6f224041853e005eecb3368cd3cbfec6fe3e8a3153747dd0a7
+
+post_extract() {
+ cp ${FILESDIR}/distro_links.html src/homepage
+}
From 264da0692fc7a82aa73554e1e0687ee7ffa6e4be Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 12 Sep 2020 14:42:26 -0700
Subject: [PATCH 9/9] New package: phosh-desktop-0.1
---
.../phosh-desktop/files/000-gschema.override | 21 +++++++++++++++++++
srcpkgs/phosh-desktop/files/01-phoc-scaling | 5 +++++
srcpkgs/phosh-desktop/template | 17 +++++++++++++++
3 files changed, 43 insertions(+)
create mode 100644 srcpkgs/phosh-desktop/files/000-gschema.override
create mode 100644 srcpkgs/phosh-desktop/files/01-phoc-scaling
create mode 100644 srcpkgs/phosh-desktop/template
diff --git a/srcpkgs/phosh-desktop/files/000-gschema.override b/srcpkgs/phosh-desktop/files/000-gschema.override
new file mode 100644
index 00000000000..dfd1550e524
--- /dev/null
+++ b/srcpkgs/phosh-desktop/files/000-gschema.override
@@ -0,0 +1,21 @@
+[org.gnome.desktop.background]
+picture-uri='file:///usr/share/backgrounds/gnome/LightWaves.jpg'
+
+[org.gnome.desktop.interface]
+clock-show-weekday=false
+clock-show-date=false
+
+[org.gnome.desktop.wm.preferences]
+button-layout='appmenu:'
+
+[org.gnome.Epiphany]
+search-engines=[('Search the Web', 'https://duckduckgo.com/?q=%s&t=epiphany', ''), ('DuckDuckGo', 'https://duckduckgo.com/?q=%s&t=epiphany', '!ddg'), ('Qwant', 'https://www.qwant.com/?q=%s', '!q')]
+
+[org.gnome.Epiphany.web]
+mobile-user-agent=true
+user-agent='Mozilla/5.0 (Linux; Android 10; Pixel) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.96 Mobile Safari/537.36'
+
+
+[org.gnome.settings-daemon.plugins.power]
+sleep-inactive-ac-type='nothing'
+ambient-enabled=false
diff --git a/srcpkgs/phosh-desktop/files/01-phoc-scaling b/srcpkgs/phosh-desktop/files/01-phoc-scaling
new file mode 100644
index 00000000000..880af2439d3
--- /dev/null
+++ b/srcpkgs/phosh-desktop/files/01-phoc-scaling
@@ -0,0 +1,5 @@
+[sm/puri/phoc/application/firefox]
+scale-to-fit=false
+
+[sm/puri/phoc/application/org-gnome-maps]
+scale-to-fit=true
diff --git a/srcpkgs/phosh-desktop/template b/srcpkgs/phosh-desktop/template
new file mode 100644
index 00000000000..9cf8f70dc20
--- /dev/null
+++ b/srcpkgs/phosh-desktop/template
@@ -0,0 +1,17 @@
+# Template file for 'phosh-desktop'
+pkgname=phosh-desktop
+version=0.1
+revision=1
+build_style=meta
+depends="phosh NetworkManager ModemManager gnome-backgrounds kgx epiphany iio-sensor-proxy
+ gnome-power-manager gnome-color-manager gnome-keyring xdg-user-dirs bluez calls purism-chatty
+ gedit gnome-clocks gnome-calculator gnome-calendar evince gnome-music gnome-photos"
+short_desc="Phosh desktop environment metapackage"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://voidlinux.org"
+
+post_install() {
+ vinstall ${FILESDIR}/000-gschema.override 644 usr/share/glib-2.0/schemas 000-void.gschema.override
+ vinstall ${FILESDIR}/01-phoc-scaling 644 etc/dconf/db/void.d
+}
^ permalink raw reply [flat|nested] 47+ messages in thread* Re: [PR PATCH] [Updated] New packages: phoc-0.4.2 calls-0.1.7 purism-chatty-0.1.15
2020-08-29 20:46 [PR PATCH] New packages: phoc-0.4.2 calls-0.1.7 purism-chatty--0.1.15 julio641742
` (22 preceding siblings ...)
2020-09-12 22:23 ` julio641742
@ 2020-09-12 22:32 ` julio641742
2020-09-12 23:17 ` julio641742
` (21 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: julio641742 @ 2020-09-12 22:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 386 bytes --]
There is an updated pull request by julio641742 against master on the void-packages repository
https://github.com/julio641742/void-packages phosh
https://github.com/void-linux/void-packages/pull/24538
New packages: phoc-0.4.2 calls-0.1.7 purism-chatty-0.1.15
Getting ready for my pinephone :)
A patch file from https://github.com/void-linux/void-packages/pull/24538.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-phosh-24538.patch --]
[-- Type: text/x-diff, Size: 17555 bytes --]
From 7c4c6db664c42c69beffd038e89cbea9a46f3dbd Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Sat, 29 Aug 2020 11:47:35 -0700
Subject: [PATCH 1/9] New package: feedbackd-0.0.0+git20200707
---
common/shlibs | 1 +
srcpkgs/feedbackd/template | 37 +++++++++++++++++++++++++++++++++++++
srcpkgs/libfeedback | 1 +
srcpkgs/libfeedback-devel | 1 +
4 files changed, 40 insertions(+)
create mode 100644 srcpkgs/feedbackd/template
create mode 120000 srcpkgs/libfeedback
create mode 120000 srcpkgs/libfeedback-devel
diff --git a/common/shlibs b/common/shlibs
index ec8310df7b3..752730f829b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3990,3 +3990,4 @@ libneatvnc.so.0 neatvnc-0.2.0_1
libtdjson.so.1.6.0 libtd-1.6.0_1
libJudy.so.1 judy-1.0.5_1
libsignal-protocol-c.so.2 libsignal-protocol-c-2.3.3_2
+libfeedback-0.0.so.0 libfeedback-0.0.0+git20200707_1
diff --git a/srcpkgs/feedbackd/template b/srcpkgs/feedbackd/template
new file mode 100644
index 00000000000..0131775cc9d
--- /dev/null
+++ b/srcpkgs/feedbackd/template
@@ -0,0 +1,37 @@
+# Template file for 'feedbackd'
+pkgname=feedbackd
+version=0.0.0+git20200707
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=meson
+build_helper=gir
+hostmakedepends="vala glib-devel pkg-config"
+makedepends="gsound-devel libgudev-devel json-glib-devel"
+depends="dbus"
+short_desc="Daemon to provide haptic feedback on events"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/feedbackd"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=37cf48cbdbaee8e2d0bea406f5b6317bf0e3cdf79250f9ce0a884e7d3905a8ea
+
+post_install() {
+ vinstall debian/feedbackd.udev 0644 usr/lib/udev/rules.d 90-feedbackd.rules
+}
+
+libfeedback_package() {
+ short_desc+=" - shared libraries"
+ pkg_install() {
+ vmove "usr/lib/*.so.*"
+ }
+}
+
+libfeedback-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ }
+}
diff --git a/srcpkgs/libfeedback b/srcpkgs/libfeedback
new file mode 120000
index 00000000000..49dc965f1cd
--- /dev/null
+++ b/srcpkgs/libfeedback
@@ -0,0 +1 @@
+feedbackd
\ No newline at end of file
diff --git a/srcpkgs/libfeedback-devel b/srcpkgs/libfeedback-devel
new file mode 120000
index 00000000000..49dc965f1cd
--- /dev/null
+++ b/srcpkgs/libfeedback-devel
@@ -0,0 +1 @@
+feedbackd
\ No newline at end of file
From f12e1ef305edd0d1f1749a5d0f489de1bd105ddf Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Sat, 29 Aug 2020 11:47:56 -0700
Subject: [PATCH 2/9] New package: phoc-0.4.2
---
srcpkgs/phoc/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/phoc/template
diff --git a/srcpkgs/phoc/template b/srcpkgs/phoc/template
new file mode 100644
index 00000000000..00c9f1f3ab0
--- /dev/null
+++ b/srcpkgs/phoc/template
@@ -0,0 +1,16 @@
+# Template file for 'phoc'
+pkgname=phoc
+version=0.4.2
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=meson
+configure_args="-Dembed-wlroots=disabled"
+hostmakedepends="glib-devel pkg-config wayland-devel"
+makedepends="gnome-desktop-devel wlroots-devel"
+depends="mutter"
+short_desc="Wlroots based Phone compositor for the Phosh shell"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/phoc"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=bdb34644c7d49c953239c1e939bc5ee2bc26f6187b9d756b70b113d2734c712c
From 3a9cb180fc20307a6b95490dbbee07454bd88f99 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Sat, 29 Aug 2020 11:48:48 -0700
Subject: [PATCH 3/9] New package: squeekboard-1.9.3
---
srcpkgs/squeekboard/template | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
create mode 100644 srcpkgs/squeekboard/template
diff --git a/srcpkgs/squeekboard/template b/srcpkgs/squeekboard/template
new file mode 100644
index 00000000000..938248efa6b
--- /dev/null
+++ b/srcpkgs/squeekboard/template
@@ -0,0 +1,25 @@
+# Template file for 'squeekboard'
+pkgname=squeekboard
+version=1.9.3
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=meson
+build_helper=rust
+hostmakedepends="glib-devel gettext pkg-config cargo wayland-devel"
+makedepends="rust gtk+3-devel gnome-desktop-devel libfeedback-devel"
+short_desc="Final Librem5 keyboard"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/squeekboard"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=b99e56faace3986bf752e08c104cea60ed896d514284840655033dd9457db824
+
+pre_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ vsed -i cargo_build.sh -e "s/-a ./-a ${XBPS_CROSS_RUST_TARGET}/g"
+ fi
+}
+
+post_install() {
+ chmod +x ${DESTDIR}/usr/bin/squeekboard-entry
+}
From 37bac79623df661dcbf67dfe14ae45fc6c574133 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Sat, 29 Aug 2020 11:48:59 -0700
Subject: [PATCH 4/9] New package: phosh-0.4.3
---
srcpkgs/phosh/files/phosh.desktop | 11 ++++++++
srcpkgs/phosh/files/sm.puri.OSK0.desktop | 12 +++++++++
srcpkgs/phosh/patches/32bit-build-fix.patch | 30 +++++++++++++++++++++
srcpkgs/phosh/template | 22 +++++++++++++++
4 files changed, 75 insertions(+)
create mode 100644 srcpkgs/phosh/files/phosh.desktop
create mode 100644 srcpkgs/phosh/files/sm.puri.OSK0.desktop
create mode 100644 srcpkgs/phosh/patches/32bit-build-fix.patch
create mode 100644 srcpkgs/phosh/template
diff --git a/srcpkgs/phosh/files/phosh.desktop b/srcpkgs/phosh/files/phosh.desktop
new file mode 100644
index 00000000000..84452845115
--- /dev/null
+++ b/srcpkgs/phosh/files/phosh.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=Phosh
+Name[en]=Phosh
+Comment=This session logs you into Phosh
+Comment[en]=This session logs in you into Phosh
+Exec=dbus-run-session /usr/bin/phosh
+TryExec=/usr/bin/phosh
+Icon=
+Type=Application
+X-DesktopNames=Phosh
+Keywords=launch;Phosh;desktop;session;
diff --git a/srcpkgs/phosh/files/sm.puri.OSK0.desktop b/srcpkgs/phosh/files/sm.puri.OSK0.desktop
new file mode 100644
index 00000000000..39740f15773
--- /dev/null
+++ b/srcpkgs/phosh/files/sm.puri.OSK0.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Type=Application
+Name=On-screen keyboard
+Comment=Default on-screen keyboard
+Exec=/usr/bin/squeekboard
+Categories=GNOME;Core;
+OnlyShowIn=GNOME;
+NoDisplay=true
+X-GNOME-Autostart-Phase=Panel
+X-GNOME-Provides=inputmethod
+X-GNOME-Autostart-Notify=true
+X-GNOME-AutoRestart=true
diff --git a/srcpkgs/phosh/patches/32bit-build-fix.patch b/srcpkgs/phosh/patches/32bit-build-fix.patch
new file mode 100644
index 00000000000..a98ecb0faa5
--- /dev/null
+++ b/srcpkgs/phosh/patches/32bit-build-fix.patch
@@ -0,0 +1,30 @@
+From d1da5ea7d18c6794c9a7d2f41355fe90d4115ac1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
+Date: Tue, 4 Aug 2020 08:22:39 +0200
+Subject: [PATCH] timestamp-label: Unbreak build on 32 bit platforms
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Use a G_ format specifier for GTimeSpan.
+
+Signed-off-by: Guido Günther <guido.gunther@puri.sm>
+---
+ src/notifications/timestamp-label.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/notifications/timestamp-label.c b/src/notifications/timestamp-label.c
+index 0aa04ce0..a5a4d5e7 100644
+--- src/notifications/timestamp-label.c
++++ src/notifications/timestamp-label.c
+@@ -255,7 +255,7 @@ phosh_timestamp_label_calc_timeout (PhoshTimestampLabel *self)
+ break;
+ }
+ timeout_diff = g_date_time_difference (timeout_time, time_now);
+- g_debug ("time out duration = %ld", timeout_diff);
++ g_debug ("time out duration: %" G_GINT64_FORMAT, timeout_diff);
+ return timeout_diff;
+ }
+
+--
+2.26.2
diff --git a/srcpkgs/phosh/template b/srcpkgs/phosh/template
new file mode 100644
index 00000000000..27fb1f0f0de
--- /dev/null
+++ b/srcpkgs/phosh/template
@@ -0,0 +1,22 @@
+# Template file for 'phosh'
+pkgname=phosh
+version=0.4.3
+revision=1
+build_style=meson
+hostmakedepends="phoc glib-devel gettext pkg-config wayland-devel"
+makedepends="libfeedback-devel gcr-devel gnome-desktop-devel pam-devel
+ polkit-devel pulseaudio-devel libsecret-devel libhandy-devel
+ NetworkManager-devel upower-devel"
+depends="phoc squeekboard gnome-session gnome-settings-daemon gnome-control-center
+ elogind xorg-server-xwayland cantarell-fonts font-adobe-source-code-pro"
+short_desc="Shell PoC for the Librem5"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/phosh"
+distfiles="https://repo.pureos.net/pureos/pool/main/p/phosh/phosh_$version.tar.xz"
+checksum=c6fc68aafaf78412637b0f509aafbbca877bda3fe19511bf340b824d7cdbd4ee
+
+post_install() {
+ vcopy ${FILESDIR}/sm.puri.OSK0.desktop usr/share/applications
+ vcopy ${FILESDIR}/phosh.desktop usr/share/wayland-sessions
+}
From 4329012486a50063edb66cd1419d0f5a22bbf3f7 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 29 Aug 2020 18:35:47 -0700
Subject: [PATCH 5/9] New package: calls-0.1.7
---
srcpkgs/calls/template | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
create mode 100644 srcpkgs/calls/template
diff --git a/srcpkgs/calls/template b/srcpkgs/calls/template
new file mode 100644
index 00000000000..260ed391d24
--- /dev/null
+++ b/srcpkgs/calls/template
@@ -0,0 +1,17 @@
+# Template file for 'calls'
+pkgname=calls
+version=0.1.7
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=meson
+hostmakedepends="glib-devel gettext vala pkg-config wayland-devel
+ evolution-data-server-devel"
+makedepends="folks-devel libhandy-devel libpeas-devel gom-devel
+ ModemManager-devel libfeedback-devel"
+depends="NetworkManager"
+short_desc="Phone call application"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/calls"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=477c55d483ca13f6ac98209c3c4d6c5858f706e72a133616dcb6827ef25829c7
From c6c22c5c4f8fa8d5ade507398326dc2bb55d8145 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 29 Aug 2020 18:36:35 -0700
Subject: [PATCH 6/9] New package: purism-chatty-0.1.15
---
srcpkgs/purism-chatty/template | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
create mode 100644 srcpkgs/purism-chatty/template
diff --git a/srcpkgs/purism-chatty/template b/srcpkgs/purism-chatty/template
new file mode 100644
index 00000000000..d11bfcea882
--- /dev/null
+++ b/srcpkgs/purism-chatty/template
@@ -0,0 +1,22 @@
+# Template file for 'purism-chatty'
+pkgname=purism-chatty
+_pkgname=chatty
+version=0.1.15
+revision=1
+wrksrc=${_pkgname}-v${version}
+build_style=meson
+hostmakedepends="glib-devel pkg-config gettext"
+makedepends="libfeedback-devel libhandy-devel evolution-data-server-devel
+ libpurple libpurple-devel"
+short_desc="XMPP and SMS messaging via libpurple and Modemmanager"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/chatty"
+distfiles="${homepage}/-/archive/v${version}/${_pkgname}-v${version}.tar.gz"
+checksum=9be2b79a266a7fa1e3d3e7ba447ff89d2b9e44312d6e55f2a63d191369528d64
+
+pre_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ vsed -i src/meson.build -e "s/purple_plugdir =.*/purple_plugdir = \'\/usr\/${XBPS_CROSS_TRIPLET}\/usr\/lib\/purple-2\'/g"
+ fi
+}
From 75f67639b88fd89f3b157f4149321e589c29b63e Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 12 Sep 2020 15:05:36 -0700
Subject: [PATCH 7/9] New package: kgx-0.2.1
---
srcpkgs/kgx/template | 14 ++++++++++++++
1 file changed, 14 insertions(+)
create mode 100644 srcpkgs/kgx/template
diff --git a/srcpkgs/kgx/template b/srcpkgs/kgx/template
new file mode 100644
index 00000000000..98ec4caf70e
--- /dev/null
+++ b/srcpkgs/kgx/template
@@ -0,0 +1,14 @@
+# Template file for 'kgx'
+pkgname=kgx
+version=0.2.1
+revision=1
+build_style=meson
+hostmakedepends="glib-devel pkg-config gettext"
+makedepends="vte3-devel gtk+3-devel libhandy-devel libgtop-devel"
+depends="dbus desktop-file-utils gsettings-desktop-schemas"
+short_desc="Minimal terminal for GNOME"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://gitlab.gnome.org/ZanderBrown/kgx"
+distfiles="${homepage}/-/archive/${version}/kgx-${version}.tar.gz"
+checksum=70a814b0baf70049d5a20791d58a32e92661428d2deeeb56d91b81cc4dc5e81a
From 13d2fde51528d6cce06235207efaeaecec3601df Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 12 Sep 2020 10:58:50 -0700
Subject: [PATCH 8/9] New package: mobile-config-firefox-1.0.1
---
.../files/distro_links.html | 5 +++++
srcpkgs/mobile-config-firefox/template | 16 ++++++++++++++++
2 files changed, 21 insertions(+)
create mode 100644 srcpkgs/mobile-config-firefox/files/distro_links.html
create mode 100644 srcpkgs/mobile-config-firefox/template
diff --git a/srcpkgs/mobile-config-firefox/files/distro_links.html b/srcpkgs/mobile-config-firefox/files/distro_links.html
new file mode 100644
index 00000000000..ca89d0ecd08
--- /dev/null
+++ b/srcpkgs/mobile-config-firefox/files/distro_links.html
@@ -0,0 +1,5 @@
+<p class="distro-links">
+ <a href="https://voidlinux.org/">homepage</a> -
+ <a href="https://docs.voidlinux.org/">docs</a>
+ <a href="https://github.com/void-linux">repos</a>
+</p>
diff --git a/srcpkgs/mobile-config-firefox/template b/srcpkgs/mobile-config-firefox/template
new file mode 100644
index 00000000000..8a1530115e8
--- /dev/null
+++ b/srcpkgs/mobile-config-firefox/template
@@ -0,0 +1,16 @@
+# Template file for 'mobile-config-firefox'
+pkgname=mobile-config-firefox
+version=1.0.1
+revision=1
+build_style=gnu-makefile
+make_install_args="DISTRO=VoidLinux"
+short_desc="Firefox tweaks for mobile and privacy"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://gitlab.com/postmarketOS/mobile-config-firefox"
+distfiles="${homepage}/-/archive/${version}/${pkgname}-${version}.tar.gz"
+checksum=7dce837995956f6f224041853e005eecb3368cd3cbfec6fe3e8a3153747dd0a7
+
+post_extract() {
+ cp ${FILESDIR}/distro_links.html src/homepage
+}
From 69ec8d55bcae254136fdd04f69ebe4989479475e Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 12 Sep 2020 14:42:26 -0700
Subject: [PATCH 9/9] New package: phosh-desktop-0.1
---
.../phosh-desktop/files/000-gschema.override | 21 +++++++++++++++++++
srcpkgs/phosh-desktop/files/01-phoc-scaling | 5 +++++
srcpkgs/phosh-desktop/template | 17 +++++++++++++++
3 files changed, 43 insertions(+)
create mode 100644 srcpkgs/phosh-desktop/files/000-gschema.override
create mode 100644 srcpkgs/phosh-desktop/files/01-phoc-scaling
create mode 100644 srcpkgs/phosh-desktop/template
diff --git a/srcpkgs/phosh-desktop/files/000-gschema.override b/srcpkgs/phosh-desktop/files/000-gschema.override
new file mode 100644
index 00000000000..dfd1550e524
--- /dev/null
+++ b/srcpkgs/phosh-desktop/files/000-gschema.override
@@ -0,0 +1,21 @@
+[org.gnome.desktop.background]
+picture-uri='file:///usr/share/backgrounds/gnome/LightWaves.jpg'
+
+[org.gnome.desktop.interface]
+clock-show-weekday=false
+clock-show-date=false
+
+[org.gnome.desktop.wm.preferences]
+button-layout='appmenu:'
+
+[org.gnome.Epiphany]
+search-engines=[('Search the Web', 'https://duckduckgo.com/?q=%s&t=epiphany', ''), ('DuckDuckGo', 'https://duckduckgo.com/?q=%s&t=epiphany', '!ddg'), ('Qwant', 'https://www.qwant.com/?q=%s', '!q')]
+
+[org.gnome.Epiphany.web]
+mobile-user-agent=true
+user-agent='Mozilla/5.0 (Linux; Android 10; Pixel) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.96 Mobile Safari/537.36'
+
+
+[org.gnome.settings-daemon.plugins.power]
+sleep-inactive-ac-type='nothing'
+ambient-enabled=false
diff --git a/srcpkgs/phosh-desktop/files/01-phoc-scaling b/srcpkgs/phosh-desktop/files/01-phoc-scaling
new file mode 100644
index 00000000000..880af2439d3
--- /dev/null
+++ b/srcpkgs/phosh-desktop/files/01-phoc-scaling
@@ -0,0 +1,5 @@
+[sm/puri/phoc/application/firefox]
+scale-to-fit=false
+
+[sm/puri/phoc/application/org-gnome-maps]
+scale-to-fit=true
diff --git a/srcpkgs/phosh-desktop/template b/srcpkgs/phosh-desktop/template
new file mode 100644
index 00000000000..9cf8f70dc20
--- /dev/null
+++ b/srcpkgs/phosh-desktop/template
@@ -0,0 +1,17 @@
+# Template file for 'phosh-desktop'
+pkgname=phosh-desktop
+version=0.1
+revision=1
+build_style=meta
+depends="phosh NetworkManager ModemManager gnome-backgrounds kgx epiphany iio-sensor-proxy
+ gnome-power-manager gnome-color-manager gnome-keyring xdg-user-dirs bluez calls purism-chatty
+ gedit gnome-clocks gnome-calculator gnome-calendar evince gnome-music gnome-photos"
+short_desc="Phosh desktop environment metapackage"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://voidlinux.org"
+
+post_install() {
+ vinstall ${FILESDIR}/000-gschema.override 644 usr/share/glib-2.0/schemas 000-void.gschema.override
+ vinstall ${FILESDIR}/01-phoc-scaling 644 etc/dconf/db/void.d
+}
^ permalink raw reply [flat|nested] 47+ messages in thread* Re: New packages: phoc-0.4.2 calls-0.1.7 purism-chatty-0.1.15
2020-08-29 20:46 [PR PATCH] New packages: phoc-0.4.2 calls-0.1.7 purism-chatty--0.1.15 julio641742
` (23 preceding siblings ...)
2020-09-12 22:32 ` julio641742
@ 2020-09-12 23:17 ` julio641742
2020-09-13 5:35 ` [PR PATCH] [Updated] " julio641742
` (20 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: julio641742 @ 2020-09-12 23:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 413 bytes --]
New comment by julio641742 on void-packages repository
https://github.com/void-linux/void-packages/pull/24538#issuecomment-691570490
Comment:
Here is a [preview](https://fosstodon.org/@julio641742/104854488643701135) of phosh on the pinephone with void
Thanks @jjsullivan5196 for packaging the kernel and to the void team for creating an amazing distro.
SMS and calls do not work :( but I am working on it.
^ permalink raw reply [flat|nested] 47+ messages in thread* Re: [PR PATCH] [Updated] New packages: phoc-0.4.2 calls-0.1.7 purism-chatty-0.1.15
2020-08-29 20:46 [PR PATCH] New packages: phoc-0.4.2 calls-0.1.7 purism-chatty--0.1.15 julio641742
` (24 preceding siblings ...)
2020-09-12 23:17 ` julio641742
@ 2020-09-13 5:35 ` julio641742
2020-09-13 5:53 ` julio641742
` (19 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: julio641742 @ 2020-09-13 5:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 386 bytes --]
There is an updated pull request by julio641742 against master on the void-packages repository
https://github.com/julio641742/void-packages phosh
https://github.com/void-linux/void-packages/pull/24538
New packages: phoc-0.4.2 calls-0.1.7 purism-chatty-0.1.15
Getting ready for my pinephone :)
A patch file from https://github.com/void-linux/void-packages/pull/24538.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-phosh-24538.patch --]
[-- Type: text/x-diff, Size: 51260 bytes --]
From 7c4c6db664c42c69beffd038e89cbea9a46f3dbd Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Sat, 29 Aug 2020 11:47:35 -0700
Subject: [PATCH 01/11] New package: feedbackd-0.0.0+git20200707
---
common/shlibs | 1 +
srcpkgs/feedbackd/template | 37 +++++++++++++++++++++++++++++++++++++
srcpkgs/libfeedback | 1 +
srcpkgs/libfeedback-devel | 1 +
4 files changed, 40 insertions(+)
create mode 100644 srcpkgs/feedbackd/template
create mode 120000 srcpkgs/libfeedback
create mode 120000 srcpkgs/libfeedback-devel
diff --git a/common/shlibs b/common/shlibs
index ec8310df7b3..752730f829b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3990,3 +3990,4 @@ libneatvnc.so.0 neatvnc-0.2.0_1
libtdjson.so.1.6.0 libtd-1.6.0_1
libJudy.so.1 judy-1.0.5_1
libsignal-protocol-c.so.2 libsignal-protocol-c-2.3.3_2
+libfeedback-0.0.so.0 libfeedback-0.0.0+git20200707_1
diff --git a/srcpkgs/feedbackd/template b/srcpkgs/feedbackd/template
new file mode 100644
index 00000000000..0131775cc9d
--- /dev/null
+++ b/srcpkgs/feedbackd/template
@@ -0,0 +1,37 @@
+# Template file for 'feedbackd'
+pkgname=feedbackd
+version=0.0.0+git20200707
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=meson
+build_helper=gir
+hostmakedepends="vala glib-devel pkg-config"
+makedepends="gsound-devel libgudev-devel json-glib-devel"
+depends="dbus"
+short_desc="Daemon to provide haptic feedback on events"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/feedbackd"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=37cf48cbdbaee8e2d0bea406f5b6317bf0e3cdf79250f9ce0a884e7d3905a8ea
+
+post_install() {
+ vinstall debian/feedbackd.udev 0644 usr/lib/udev/rules.d 90-feedbackd.rules
+}
+
+libfeedback_package() {
+ short_desc+=" - shared libraries"
+ pkg_install() {
+ vmove "usr/lib/*.so.*"
+ }
+}
+
+libfeedback-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ }
+}
diff --git a/srcpkgs/libfeedback b/srcpkgs/libfeedback
new file mode 120000
index 00000000000..49dc965f1cd
--- /dev/null
+++ b/srcpkgs/libfeedback
@@ -0,0 +1 @@
+feedbackd
\ No newline at end of file
diff --git a/srcpkgs/libfeedback-devel b/srcpkgs/libfeedback-devel
new file mode 120000
index 00000000000..49dc965f1cd
--- /dev/null
+++ b/srcpkgs/libfeedback-devel
@@ -0,0 +1 @@
+feedbackd
\ No newline at end of file
From f12e1ef305edd0d1f1749a5d0f489de1bd105ddf Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Sat, 29 Aug 2020 11:47:56 -0700
Subject: [PATCH 02/11] New package: phoc-0.4.2
---
srcpkgs/phoc/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/phoc/template
diff --git a/srcpkgs/phoc/template b/srcpkgs/phoc/template
new file mode 100644
index 00000000000..00c9f1f3ab0
--- /dev/null
+++ b/srcpkgs/phoc/template
@@ -0,0 +1,16 @@
+# Template file for 'phoc'
+pkgname=phoc
+version=0.4.2
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=meson
+configure_args="-Dembed-wlroots=disabled"
+hostmakedepends="glib-devel pkg-config wayland-devel"
+makedepends="gnome-desktop-devel wlroots-devel"
+depends="mutter"
+short_desc="Wlroots based Phone compositor for the Phosh shell"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/phoc"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=bdb34644c7d49c953239c1e939bc5ee2bc26f6187b9d756b70b113d2734c712c
From 3a9cb180fc20307a6b95490dbbee07454bd88f99 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Sat, 29 Aug 2020 11:48:48 -0700
Subject: [PATCH 03/11] New package: squeekboard-1.9.3
---
srcpkgs/squeekboard/template | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
create mode 100644 srcpkgs/squeekboard/template
diff --git a/srcpkgs/squeekboard/template b/srcpkgs/squeekboard/template
new file mode 100644
index 00000000000..938248efa6b
--- /dev/null
+++ b/srcpkgs/squeekboard/template
@@ -0,0 +1,25 @@
+# Template file for 'squeekboard'
+pkgname=squeekboard
+version=1.9.3
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=meson
+build_helper=rust
+hostmakedepends="glib-devel gettext pkg-config cargo wayland-devel"
+makedepends="rust gtk+3-devel gnome-desktop-devel libfeedback-devel"
+short_desc="Final Librem5 keyboard"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/squeekboard"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=b99e56faace3986bf752e08c104cea60ed896d514284840655033dd9457db824
+
+pre_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ vsed -i cargo_build.sh -e "s/-a ./-a ${XBPS_CROSS_RUST_TARGET}/g"
+ fi
+}
+
+post_install() {
+ chmod +x ${DESTDIR}/usr/bin/squeekboard-entry
+}
From 37bac79623df661dcbf67dfe14ae45fc6c574133 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Sat, 29 Aug 2020 11:48:59 -0700
Subject: [PATCH 04/11] New package: phosh-0.4.3
---
srcpkgs/phosh/files/phosh.desktop | 11 ++++++++
srcpkgs/phosh/files/sm.puri.OSK0.desktop | 12 +++++++++
srcpkgs/phosh/patches/32bit-build-fix.patch | 30 +++++++++++++++++++++
srcpkgs/phosh/template | 22 +++++++++++++++
4 files changed, 75 insertions(+)
create mode 100644 srcpkgs/phosh/files/phosh.desktop
create mode 100644 srcpkgs/phosh/files/sm.puri.OSK0.desktop
create mode 100644 srcpkgs/phosh/patches/32bit-build-fix.patch
create mode 100644 srcpkgs/phosh/template
diff --git a/srcpkgs/phosh/files/phosh.desktop b/srcpkgs/phosh/files/phosh.desktop
new file mode 100644
index 00000000000..84452845115
--- /dev/null
+++ b/srcpkgs/phosh/files/phosh.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=Phosh
+Name[en]=Phosh
+Comment=This session logs you into Phosh
+Comment[en]=This session logs in you into Phosh
+Exec=dbus-run-session /usr/bin/phosh
+TryExec=/usr/bin/phosh
+Icon=
+Type=Application
+X-DesktopNames=Phosh
+Keywords=launch;Phosh;desktop;session;
diff --git a/srcpkgs/phosh/files/sm.puri.OSK0.desktop b/srcpkgs/phosh/files/sm.puri.OSK0.desktop
new file mode 100644
index 00000000000..39740f15773
--- /dev/null
+++ b/srcpkgs/phosh/files/sm.puri.OSK0.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Type=Application
+Name=On-screen keyboard
+Comment=Default on-screen keyboard
+Exec=/usr/bin/squeekboard
+Categories=GNOME;Core;
+OnlyShowIn=GNOME;
+NoDisplay=true
+X-GNOME-Autostart-Phase=Panel
+X-GNOME-Provides=inputmethod
+X-GNOME-Autostart-Notify=true
+X-GNOME-AutoRestart=true
diff --git a/srcpkgs/phosh/patches/32bit-build-fix.patch b/srcpkgs/phosh/patches/32bit-build-fix.patch
new file mode 100644
index 00000000000..a98ecb0faa5
--- /dev/null
+++ b/srcpkgs/phosh/patches/32bit-build-fix.patch
@@ -0,0 +1,30 @@
+From d1da5ea7d18c6794c9a7d2f41355fe90d4115ac1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
+Date: Tue, 4 Aug 2020 08:22:39 +0200
+Subject: [PATCH] timestamp-label: Unbreak build on 32 bit platforms
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Use a G_ format specifier for GTimeSpan.
+
+Signed-off-by: Guido Günther <guido.gunther@puri.sm>
+---
+ src/notifications/timestamp-label.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/notifications/timestamp-label.c b/src/notifications/timestamp-label.c
+index 0aa04ce0..a5a4d5e7 100644
+--- src/notifications/timestamp-label.c
++++ src/notifications/timestamp-label.c
+@@ -255,7 +255,7 @@ phosh_timestamp_label_calc_timeout (PhoshTimestampLabel *self)
+ break;
+ }
+ timeout_diff = g_date_time_difference (timeout_time, time_now);
+- g_debug ("time out duration = %ld", timeout_diff);
++ g_debug ("time out duration: %" G_GINT64_FORMAT, timeout_diff);
+ return timeout_diff;
+ }
+
+--
+2.26.2
diff --git a/srcpkgs/phosh/template b/srcpkgs/phosh/template
new file mode 100644
index 00000000000..27fb1f0f0de
--- /dev/null
+++ b/srcpkgs/phosh/template
@@ -0,0 +1,22 @@
+# Template file for 'phosh'
+pkgname=phosh
+version=0.4.3
+revision=1
+build_style=meson
+hostmakedepends="phoc glib-devel gettext pkg-config wayland-devel"
+makedepends="libfeedback-devel gcr-devel gnome-desktop-devel pam-devel
+ polkit-devel pulseaudio-devel libsecret-devel libhandy-devel
+ NetworkManager-devel upower-devel"
+depends="phoc squeekboard gnome-session gnome-settings-daemon gnome-control-center
+ elogind xorg-server-xwayland cantarell-fonts font-adobe-source-code-pro"
+short_desc="Shell PoC for the Librem5"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/phosh"
+distfiles="https://repo.pureos.net/pureos/pool/main/p/phosh/phosh_$version.tar.xz"
+checksum=c6fc68aafaf78412637b0f509aafbbca877bda3fe19511bf340b824d7cdbd4ee
+
+post_install() {
+ vcopy ${FILESDIR}/sm.puri.OSK0.desktop usr/share/applications
+ vcopy ${FILESDIR}/phosh.desktop usr/share/wayland-sessions
+}
From 4329012486a50063edb66cd1419d0f5a22bbf3f7 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 29 Aug 2020 18:35:47 -0700
Subject: [PATCH 05/11] New package: calls-0.1.7
---
srcpkgs/calls/template | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
create mode 100644 srcpkgs/calls/template
diff --git a/srcpkgs/calls/template b/srcpkgs/calls/template
new file mode 100644
index 00000000000..260ed391d24
--- /dev/null
+++ b/srcpkgs/calls/template
@@ -0,0 +1,17 @@
+# Template file for 'calls'
+pkgname=calls
+version=0.1.7
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=meson
+hostmakedepends="glib-devel gettext vala pkg-config wayland-devel
+ evolution-data-server-devel"
+makedepends="folks-devel libhandy-devel libpeas-devel gom-devel
+ ModemManager-devel libfeedback-devel"
+depends="NetworkManager"
+short_desc="Phone call application"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/calls"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=477c55d483ca13f6ac98209c3c4d6c5858f706e72a133616dcb6827ef25829c7
From c6c22c5c4f8fa8d5ade507398326dc2bb55d8145 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 29 Aug 2020 18:36:35 -0700
Subject: [PATCH 06/11] New package: purism-chatty-0.1.15
---
srcpkgs/purism-chatty/template | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
create mode 100644 srcpkgs/purism-chatty/template
diff --git a/srcpkgs/purism-chatty/template b/srcpkgs/purism-chatty/template
new file mode 100644
index 00000000000..d11bfcea882
--- /dev/null
+++ b/srcpkgs/purism-chatty/template
@@ -0,0 +1,22 @@
+# Template file for 'purism-chatty'
+pkgname=purism-chatty
+_pkgname=chatty
+version=0.1.15
+revision=1
+wrksrc=${_pkgname}-v${version}
+build_style=meson
+hostmakedepends="glib-devel pkg-config gettext"
+makedepends="libfeedback-devel libhandy-devel evolution-data-server-devel
+ libpurple libpurple-devel"
+short_desc="XMPP and SMS messaging via libpurple and Modemmanager"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/chatty"
+distfiles="${homepage}/-/archive/v${version}/${_pkgname}-v${version}.tar.gz"
+checksum=9be2b79a266a7fa1e3d3e7ba447ff89d2b9e44312d6e55f2a63d191369528d64
+
+pre_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ vsed -i src/meson.build -e "s/purple_plugdir =.*/purple_plugdir = \'\/usr\/${XBPS_CROSS_TRIPLET}\/usr\/lib\/purple-2\'/g"
+ fi
+}
From 75f67639b88fd89f3b157f4149321e589c29b63e Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 12 Sep 2020 15:05:36 -0700
Subject: [PATCH 07/11] New package: kgx-0.2.1
---
srcpkgs/kgx/template | 14 ++++++++++++++
1 file changed, 14 insertions(+)
create mode 100644 srcpkgs/kgx/template
diff --git a/srcpkgs/kgx/template b/srcpkgs/kgx/template
new file mode 100644
index 00000000000..98ec4caf70e
--- /dev/null
+++ b/srcpkgs/kgx/template
@@ -0,0 +1,14 @@
+# Template file for 'kgx'
+pkgname=kgx
+version=0.2.1
+revision=1
+build_style=meson
+hostmakedepends="glib-devel pkg-config gettext"
+makedepends="vte3-devel gtk+3-devel libhandy-devel libgtop-devel"
+depends="dbus desktop-file-utils gsettings-desktop-schemas"
+short_desc="Minimal terminal for GNOME"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://gitlab.gnome.org/ZanderBrown/kgx"
+distfiles="${homepage}/-/archive/${version}/kgx-${version}.tar.gz"
+checksum=70a814b0baf70049d5a20791d58a32e92661428d2deeeb56d91b81cc4dc5e81a
From 13d2fde51528d6cce06235207efaeaecec3601df Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 12 Sep 2020 10:58:50 -0700
Subject: [PATCH 08/11] New package: mobile-config-firefox-1.0.1
---
.../files/distro_links.html | 5 +++++
srcpkgs/mobile-config-firefox/template | 16 ++++++++++++++++
2 files changed, 21 insertions(+)
create mode 100644 srcpkgs/mobile-config-firefox/files/distro_links.html
create mode 100644 srcpkgs/mobile-config-firefox/template
diff --git a/srcpkgs/mobile-config-firefox/files/distro_links.html b/srcpkgs/mobile-config-firefox/files/distro_links.html
new file mode 100644
index 00000000000..ca89d0ecd08
--- /dev/null
+++ b/srcpkgs/mobile-config-firefox/files/distro_links.html
@@ -0,0 +1,5 @@
+<p class="distro-links">
+ <a href="https://voidlinux.org/">homepage</a> -
+ <a href="https://docs.voidlinux.org/">docs</a>
+ <a href="https://github.com/void-linux">repos</a>
+</p>
diff --git a/srcpkgs/mobile-config-firefox/template b/srcpkgs/mobile-config-firefox/template
new file mode 100644
index 00000000000..8a1530115e8
--- /dev/null
+++ b/srcpkgs/mobile-config-firefox/template
@@ -0,0 +1,16 @@
+# Template file for 'mobile-config-firefox'
+pkgname=mobile-config-firefox
+version=1.0.1
+revision=1
+build_style=gnu-makefile
+make_install_args="DISTRO=VoidLinux"
+short_desc="Firefox tweaks for mobile and privacy"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://gitlab.com/postmarketOS/mobile-config-firefox"
+distfiles="${homepage}/-/archive/${version}/${pkgname}-${version}.tar.gz"
+checksum=7dce837995956f6f224041853e005eecb3368cd3cbfec6fe3e8a3153747dd0a7
+
+post_extract() {
+ cp ${FILESDIR}/distro_links.html src/homepage
+}
From 69ec8d55bcae254136fdd04f69ebe4989479475e Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 12 Sep 2020 14:42:26 -0700
Subject: [PATCH 09/11] New package: phosh-desktop-0.1
---
.../phosh-desktop/files/000-gschema.override | 21 +++++++++++++++++++
srcpkgs/phosh-desktop/files/01-phoc-scaling | 5 +++++
srcpkgs/phosh-desktop/template | 17 +++++++++++++++
3 files changed, 43 insertions(+)
create mode 100644 srcpkgs/phosh-desktop/files/000-gschema.override
create mode 100644 srcpkgs/phosh-desktop/files/01-phoc-scaling
create mode 100644 srcpkgs/phosh-desktop/template
diff --git a/srcpkgs/phosh-desktop/files/000-gschema.override b/srcpkgs/phosh-desktop/files/000-gschema.override
new file mode 100644
index 00000000000..dfd1550e524
--- /dev/null
+++ b/srcpkgs/phosh-desktop/files/000-gschema.override
@@ -0,0 +1,21 @@
+[org.gnome.desktop.background]
+picture-uri='file:///usr/share/backgrounds/gnome/LightWaves.jpg'
+
+[org.gnome.desktop.interface]
+clock-show-weekday=false
+clock-show-date=false
+
+[org.gnome.desktop.wm.preferences]
+button-layout='appmenu:'
+
+[org.gnome.Epiphany]
+search-engines=[('Search the Web', 'https://duckduckgo.com/?q=%s&t=epiphany', ''), ('DuckDuckGo', 'https://duckduckgo.com/?q=%s&t=epiphany', '!ddg'), ('Qwant', 'https://www.qwant.com/?q=%s', '!q')]
+
+[org.gnome.Epiphany.web]
+mobile-user-agent=true
+user-agent='Mozilla/5.0 (Linux; Android 10; Pixel) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.96 Mobile Safari/537.36'
+
+
+[org.gnome.settings-daemon.plugins.power]
+sleep-inactive-ac-type='nothing'
+ambient-enabled=false
diff --git a/srcpkgs/phosh-desktop/files/01-phoc-scaling b/srcpkgs/phosh-desktop/files/01-phoc-scaling
new file mode 100644
index 00000000000..880af2439d3
--- /dev/null
+++ b/srcpkgs/phosh-desktop/files/01-phoc-scaling
@@ -0,0 +1,5 @@
+[sm/puri/phoc/application/firefox]
+scale-to-fit=false
+
+[sm/puri/phoc/application/org-gnome-maps]
+scale-to-fit=true
diff --git a/srcpkgs/phosh-desktop/template b/srcpkgs/phosh-desktop/template
new file mode 100644
index 00000000000..9cf8f70dc20
--- /dev/null
+++ b/srcpkgs/phosh-desktop/template
@@ -0,0 +1,17 @@
+# Template file for 'phosh-desktop'
+pkgname=phosh-desktop
+version=0.1
+revision=1
+build_style=meta
+depends="phosh NetworkManager ModemManager gnome-backgrounds kgx epiphany iio-sensor-proxy
+ gnome-power-manager gnome-color-manager gnome-keyring xdg-user-dirs bluez calls purism-chatty
+ gedit gnome-clocks gnome-calculator gnome-calendar evince gnome-music gnome-photos"
+short_desc="Phosh desktop environment metapackage"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://voidlinux.org"
+
+post_install() {
+ vinstall ${FILESDIR}/000-gschema.override 644 usr/share/glib-2.0/schemas 000-void.gschema.override
+ vinstall ${FILESDIR}/01-phoc-scaling 644 etc/dconf/db/void.d
+}
From 14170f502963dd61c2cc71f4e30f7cb1fed60c69 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 12 Sep 2020 22:17:58 -0700
Subject: [PATCH 10/11] New package: atinout-0.9.1
---
...-happy-by-adding-fallthrough-comment.patch | 25 ++++++
...02-do-not-rely-on-CR-in-modem-output.patch | 84 +++++++++++++++++++
srcpkgs/atinout/patches/0003-version.patch | 11 +++
srcpkgs/atinout/template | 11 +++
4 files changed, 131 insertions(+)
create mode 100644 srcpkgs/atinout/patches/0001-make-gcc-happy-by-adding-fallthrough-comment.patch
create mode 100644 srcpkgs/atinout/patches/0002-do-not-rely-on-CR-in-modem-output.patch
create mode 100644 srcpkgs/atinout/patches/0003-version.patch
create mode 100644 srcpkgs/atinout/template
diff --git a/srcpkgs/atinout/patches/0001-make-gcc-happy-by-adding-fallthrough-comment.patch b/srcpkgs/atinout/patches/0001-make-gcc-happy-by-adding-fallthrough-comment.patch
new file mode 100644
index 00000000000..c0ebbb6561d
--- /dev/null
+++ b/srcpkgs/atinout/patches/0001-make-gcc-happy-by-adding-fallthrough-comment.patch
@@ -0,0 +1,25 @@
+From ca2e04f8b069d269172f0d55d3716a809537f696 Mon Sep 17 00:00:00 2001
+From: Beralt Meppelink <b.meppelink@riwo.eu>
+Date: Fri, 27 Oct 2017 09:12:18 +0200
+Subject: [PATCH 1/2] make gcc happy by adding fallthrough comment
+
+---
+ atinout.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/atinout.c b/atinout.c
+index d04f300..924b5bc 100644
+--- atinout.c
++++ atinout.c
+@@ -150,7 +150,7 @@ static bool is_final_result(const char * const response)
+ if (strcmp(&response[1], "K\r\n") == 0) {
+ return true;
+ }
+- /* no break */
++ // fallthrough
+ default:
+ return false;
+ }
+--
+2.23.0
+
diff --git a/srcpkgs/atinout/patches/0002-do-not-rely-on-CR-in-modem-output.patch b/srcpkgs/atinout/patches/0002-do-not-rely-on-CR-in-modem-output.patch
new file mode 100644
index 00000000000..f9671d089c3
--- /dev/null
+++ b/srcpkgs/atinout/patches/0002-do-not-rely-on-CR-in-modem-output.patch
@@ -0,0 +1,84 @@
+From 65dae46181119867cd8e93ca5b33d3b0cf3df08c Mon Sep 17 00:00:00 2001
+From: Beralt Meppelink <b.meppelink@riwo.eu>
+Date: Fri, 27 Oct 2017 10:42:50 +0200
+Subject: [PATCH 2/2] do not rely on CR in modem output
+
+---
+ atinout.c | 24 +++++++++++-------------
+ 1 file changed, 11 insertions(+), 13 deletions(-)
+
+diff --git a/atinout.c b/atinout.c
+index 924b5bc..4cd7689 100644
+--- atinout.c
++++ atinout.c
+@@ -34,7 +34,6 @@
+
+ #define MAX_LINE_LENGTH (4 * 1024)
+ static char buf[MAX_LINE_LENGTH];
+-static char buf2[MAX_LINE_LENGTH];
+
+ static struct option long_options[] = {
+ {"help", no_argument, NULL, 'h'},
+@@ -125,36 +124,36 @@ static bool is_final_result(const char * const response)
+ }
+ return false;
+ case 'B':
+- if (strcmp(&response[1], "USY\r\n") == 0) {
++ if (strcmp(&response[1], "USY\n") == 0) {
+ return true;
+- }
++ }
++
+ return false;
+
+ case 'E':
+- if (strcmp(&response[1], "RROR\r\n") == 0) {
++ if (strcmp(&response[1], "RROR\n") == 0) {
+ return true;
+ }
+ return false;
+ case 'N':
+- if (strcmp(&response[1], "O ANSWER\r\n") == 0) {
++ if (strcmp(&response[1], "O ANSWER\n") == 0) {
+ return true;
+ }
+- if (strcmp(&response[1], "O CARRIER\r\n") == 0) {
++ if (strcmp(&response[1], "O CARRIER\n") == 0) {
+ return true;
+ }
+- if (strcmp(&response[1], "O DIALTONE\r\n") == 0) {
++ if (strcmp(&response[1], "O DIALTONE\n") == 0) {
+ return true;
+ }
+ return false;
+ case 'O':
+- if (strcmp(&response[1], "K\r\n") == 0) {
++ if (strcmp(&response[1], "K\n") == 0) {
+ return true;
+ }
+ // fallthrough
+ default:
+ return false;
+ }
+-
+ }
+
+ int main(int argc, char *argv[])
+@@ -248,11 +247,10 @@ int main(int argc, char *argv[])
+ fprintf(stderr, "EOF from modem\n");
+ return EXIT_FAILURE;
+ }
+- strcpy(buf2, line);
+- strip_cr(buf2);
+- res = fputs(buf2, output);
++ strip_cr(line);
++ res = fputs(line, output);
+ if (res < 0) {
+- fprintf(stderr, "failed to write '%s' to output file (res = %d)\n", buf2, res);
++ fprintf(stderr, "failed to write '%s' to output file (res = %d)\n", line, res);
+ return EXIT_FAILURE;
+ }
+ } while (! is_final_result(line));
+--
+2.23.0
+
diff --git a/srcpkgs/atinout/patches/0003-version.patch b/srcpkgs/atinout/patches/0003-version.patch
new file mode 100644
index 00000000000..18d92de0630
--- /dev/null
+++ b/srcpkgs/atinout/patches/0003-version.patch
@@ -0,0 +1,11 @@
+--- atinout.c 2020-09-12 16:31:43.049093055 -0700
++++ atinout.c 2020-09-12 16:33:34.269081686 -0700
+@@ -170,7 +169,7 @@
+ help(argv[0]);
+ return EXIT_SUCCESS;
+ case 'V':
+- printf("atinout version " VERSION "\n");
++ printf("atinout version 0.9.1\n");
+ if (argc == 2) {
+ printf("Copyright (C) 2013 Håkon Løvdal <hlovdal@users.sourceforge.net>\n"
+ "This program comes with ABSOLUTELY NO WARRANTY.\n"
diff --git a/srcpkgs/atinout/template b/srcpkgs/atinout/template
new file mode 100644
index 00000000000..db2c2ffd223
--- /dev/null
+++ b/srcpkgs/atinout/template
@@ -0,0 +1,11 @@
+# Template file for 'atinout'
+pkgname=atinout
+version=0.9.1
+revision=1
+build_style=gnu-makefile
+short_desc="AT commands as input are sent to modem and responses given as output"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="http://atinout.sourceforge.net/index.html"
+distfiles="https://netcologne.dl.sourceforge.net/project/atinout/v${version}/atinout-${version}.tar.gz"
+checksum=4d15c8288aca414e11cd304686b172696104c5e42bf776300311c005634854a2
From 3917b6a2e1ce4e995f7c6490d6fcb8eeb6eea7ac Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 12 Sep 2020 22:18:46 -0700
Subject: [PATCH 11/11] New package: pinephone-wys-0.1.8
---
srcpkgs/pinephone-wys/files/wys.desktop | 9 +
...-daemon-to-only-switch-card-profiles.patch | 906 ++++++++++++++++++
srcpkgs/pinephone-wys/template | 19 +
3 files changed, 934 insertions(+)
create mode 100644 srcpkgs/pinephone-wys/files/wys.desktop
create mode 100644 srcpkgs/pinephone-wys/patches/0001-Simplify-daemon-to-only-switch-card-profiles.patch
create mode 100644 srcpkgs/pinephone-wys/template
diff --git a/srcpkgs/pinephone-wys/files/wys.desktop b/srcpkgs/pinephone-wys/files/wys.desktop
new file mode 100644
index 00000000000..a6a9f6894a9
--- /dev/null
+++ b/srcpkgs/pinephone-wys/files/wys.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Wys
+Comment=Daemon for managing PulseAudio for phone call audio
+Exec=/usr/bin/wys
+NoDisplay=true
+Terminal=false
+Type=Application
+StartupNotify=true
+X-GNOME-AutoRestart=true
diff --git a/srcpkgs/pinephone-wys/patches/0001-Simplify-daemon-to-only-switch-card-profiles.patch b/srcpkgs/pinephone-wys/patches/0001-Simplify-daemon-to-only-switch-card-profiles.patch
new file mode 100644
index 00000000000..91257f2cbba
--- /dev/null
+++ b/srcpkgs/pinephone-wys/patches/0001-Simplify-daemon-to-only-switch-card-profiles.patch
@@ -0,0 +1,906 @@
+From f66610d26395de15e3928cf4284573ca9cfabf26 Mon Sep 17 00:00:00 2001
+From: Arnaud Ferraris <arnaud.ferraris@collabora.com>
+Date: Fri, 6 Mar 2020 02:01:52 +0100
+Subject: [PATCH] Simplify daemon to only switch card profiles
+
+As a PoC for the PinePhone, we want to only switch card profiles:
+- when a call starts, use the "Voice Call" profile: audio is output on
+the earpiece, and the internal microphone is unmuted
+- when a call is terminated, switch back to the default "HiFi" profile,
+using the main speaker
+
+This should fully cover the most basic use-case. Headset will not work,
+and there is also no support for a "silent mode", but this is enough to
+demonstrate voice calls for the PinePhone.
+---
+diff --git meson.build meson.build
+index 5938cec..7516208 100644
+--- meson.build
++++ meson.build
+@@ -33,11 +33,6 @@ project (
+ ],
+ )
+
+-
+-libmchk_proj = subproject('libmachine-check')
+-libmchk_dep = libmchk_proj.get_variable('libmachine_check_dep')
+-
+-
+ app_name = meson.project_name()
+
+ prefix = get_option('prefix')
+@@ -63,14 +58,3 @@ config_data.set_quoted('DATADIR', full_datadir)
+ config_data.set_quoted('SYSCONFDIR', full_sysconfdir)
+
+ subdir('src')
+-
+-install_subdir (
+- 'machine-conf',
+- install_dir : join_paths(datadir, app_name)
+-)
+-
+-install_subdir (
+- 'machine-check',
+- install_dir : join_paths(datadir, 'machine-check', app_name),
+- strip_directory : true
+-)
+diff --git src/main.c src/main.c
+index 587a5f3..4631a33 100644
+--- src/main.c
++++ src/main.c
+@@ -23,10 +23,8 @@
+ */
+
+ #include "wys-modem.h"
+-#include "wys-audio.h"
+ #include "util.h"
+ #include "config.h"
+-#include "mchk-machine-check.h"
+
+ #include <libmm-glib.h>
+ #include <glib.h>
+@@ -50,8 +48,6 @@ static GMainLoop *main_loop = NULL;
+
+ struct wys_data
+ {
+- /** PulseAudio interface */
+- WysAudio *audio;
+ /** ID for the D-Bus watch */
+ guint watch_id;
+ /** ModemManager object proxy */
+@@ -59,51 +55,112 @@ struct wys_data
+ /** Map of D-Bus object paths to WysModems */
+ GHashTable *modems;
+ /** How many modems have audio, in each direction */
+- guint audio_count[2];
++ guint audio_count;
+ };
+
++static gboolean
++ugly_system (const gchar *cmd)
++{
++ gchar *out = NULL, *err = NULL;
++ gint status;
++ GError *error = NULL;
++ gboolean ok;
++
++ g_debug ("Executing command `%s'", cmd);
++
++ ok = g_spawn_command_line_sync
++ (cmd, &out, &err, &status, &error);
++
++ if (!ok)
++ {
++ g_warning ("Error spawning command `%s': %s'",
++ cmd, error->message);
++ g_error_free (error);
++ return FALSE;
++ }
++
++ ok = g_spawn_check_exit_status (status, &error);
++ if (ok)
++ {
++ g_debug ("Command `%s' executed successfully"
++ "; stdout: `%s'; stderr: `%s'",
++ cmd, out, err);
++ }
++ else
++ {
++ g_warning ("Command `%s' failed: %s"
++ "; stdout: `%s'; stderr: `%s'",
++ cmd, error->message, out, err);
++ g_error_free (error);
++ }
++
++ g_free (out);
++ g_free (err);
++
++ return ok;
++}
++
++#define UGLY_CARD "alsa_card.platform-sound"
++
++static gboolean
++ugly_set_card_profile (const gchar *card,
++ const gchar *profile)
++{
++ g_autofree gchar *cmd = NULL;
++
++ cmd = g_strdup_printf ("pactl set-card-profile '%s' '%s'", card, profile);
++
++ return ugly_system (cmd);
++}
++
++static gboolean
++ugly_set_voice_call (void)
++{
++ return ugly_set_card_profile (UGLY_CARD, "Voice Call");
++}
++
++static gboolean
++ugly_set_hifi (void)
++{
++ return ugly_set_card_profile (UGLY_CARD, "HiFi");
++}
+
+ static void
+ update_audio_count (struct wys_data *data,
+- WysDirection direction,
+ gint delta)
+ {
+- const guint old_count = data->audio_count[direction];
++ const guint old_count = data->audio_count;
+
+- g_assert (delta >= 0 || data->audio_count[direction] > 0);
++ g_assert (delta >= 0 || data->audio_count > 0);
+
+- data->audio_count[direction] += delta;
++ data->audio_count += delta;
+
+- if (data->audio_count[direction] > 0 && old_count == 0)
++ if (data->audio_count > 0 && old_count == 0)
+ {
+- g_debug ("Audio %s now present",
+- wys_direction_get_description (direction));
+- wys_audio_ensure_loopback (data->audio, direction);
++ g_message ("Audio now present");
++ ugly_set_voice_call ();
+ }
+- else if (data->audio_count[direction] == 0 && old_count > 0)
++ else if (data->audio_count == 0 && old_count > 0)
+ {
+- g_debug ("Audio %s now absent",
+- wys_direction_get_description (direction));
+- wys_audio_ensure_no_loopback (data->audio, direction);
++ g_message ("Audio now absent");
++ ugly_set_hifi ();
+ }
+ }
+
+
+ static void
+ audio_present_cb (struct wys_data *data,
+- WysDirection direction,
+ WysModem *modem)
+ {
+- update_audio_count (data, direction, +1);
++ update_audio_count (data, +1);
+ }
+
+
+ static void
+ audio_absent_cb (struct wys_data *data,
+- WysDirection direction,
+ WysModem *modem)
+ {
+- update_audio_count (data, direction, -1);
++ update_audio_count (data, -1);
+ }
+
+
+@@ -123,7 +180,7 @@ add_modem (struct wys_data *data,
+ return;
+ }
+
+- g_debug ("Adding new voice-capable modem `%s'", path);
++ g_message ("Adding new voice-capable modem `%s'", path);
+
+ g_assert (MM_IS_OBJECT (object));
+ voice = mm_object_get_modem_voice (MM_OBJECT (object));
+@@ -153,7 +210,7 @@ interface_added_cb (struct wys_data *data,
+
+ info = g_dbus_interface_get_info (interface);
+
+- g_debug ("ModemManager interface `%s' found on object `%s'",
++ g_message ("ModemManager interface `%s' found on object `%s'",
+ info->name,
+ g_dbus_object_get_object_path (object));
+
+@@ -184,7 +241,7 @@ interface_removed_cb (struct wys_data *data,
+ path = g_dbus_object_get_object_path (object);
+ info = g_dbus_interface_get_info (interface);
+
+- g_debug ("ModemManager interface `%s' removed on object `%s'",
++ g_message ("ModemManager interface `%s' removed on object `%s'",
+ info->name, path);
+
+ if (g_strcmp0 (info->name, MM_DBUS_INTERFACE_MODEM_VOICE) == 0)
+@@ -229,7 +286,7 @@ void
+ object_added_cb (struct wys_data *data,
+ GDBusObject *object)
+ {
+- g_debug ("ModemManager object `%s' added",
++ g_message ("ModemManager object `%s' added",
+ g_dbus_object_get_object_path (object));
+
+ add_mm_object (data, object);
+@@ -243,7 +300,7 @@ object_removed_cb (struct wys_data *data,
+ const gchar *path;
+
+ path = g_dbus_object_get_object_path (object);
+- g_debug ("ModemManager object `%s' removed", path);
++ g_message ("ModemManager object `%s' removed", path);
+
+ remove_modem_object (data, path, object);
+ }
+@@ -286,7 +343,7 @@ mm_appeared_cb (GDBusConnection *connection,
+ const gchar *name_owner,
+ struct wys_data *data)
+ {
+- g_debug ("ModemManager appeared on D-Bus");
++ g_message ("ModemManager appeared on D-Bus");
+
+ mm_manager_new (connection,
+ G_DBUS_OBJECT_MANAGER_CLIENT_FLAGS_NONE,
+@@ -310,18 +367,14 @@ mm_vanished_cb (GDBusConnection *connection,
+ const gchar *name,
+ struct wys_data *data)
+ {
+- g_debug ("ModemManager vanished from D-Bus");
++ g_message ("ModemManager vanished from D-Bus");
+ clear_dbus (data);
+ }
+
+
+ static void
+-set_up (struct wys_data *data,
+- const gchar *codec,
+- const gchar *modem)
++set_up (struct wys_data *data)
+ {
+- data->audio = wys_audio_new (codec, modem);
+-
+ data->modems = g_hash_table_new_full (g_str_hash, g_str_equal,
+ g_free, g_object_unref);
+
+@@ -333,7 +386,7 @@ set_up (struct wys_data *data,
+ (GBusNameVanishedCallback)mm_vanished_cb,
+ data, NULL);
+
+- g_debug ("Watching for ModemManager");
++ g_message ("Watching for ModemManager");
+ }
+
+
+@@ -343,23 +396,19 @@ tear_down (struct wys_data *data)
+ clear_dbus (data);
+ g_bus_unwatch_name (data->watch_id);
+ g_hash_table_unref (data->modems);
+- g_object_unref (G_OBJECT (data->audio));
+ }
+
+
+ static void
+-run (const gchar *codec,
+- const gchar *modem)
++run (void)
+ {
+ struct wys_data data;
+
+ memset (&data, 0, sizeof (struct wys_data));
+- set_up (&data, codec, modem);
++ set_up (&data);
+
+ main_loop = g_main_loop_new (NULL, FALSE);
+
+- printf (APPLICATION_NAME " started with codec `%s', modem `%s'\n",
+- codec, modem);
+ g_main_loop_run (main_loop);
+
+ g_main_loop_unref (main_loop);
+@@ -368,33 +417,6 @@ run (const gchar *codec,
+ tear_down (&data);
+ }
+
+-
+-static void
+-check_machine (const gchar *machine)
+-{
+- gboolean ok, passed;
+- GError *error = NULL;
+-
+- ok = mchk_check_machine (APP_DATA_NAME,
+- machine,
+- &passed,
+- &error);
+- if (!ok)
+- {
+- g_warning ("Error checking machine name against"
+- " whitelist/blacklist, continuing anyway");
+- g_error_free (error);
+- }
+- else if (!passed)
+- {
+- g_message ("Machine name `%s' did not pass"
+- " whitelist/blacklist check, exiting",
+- machine);
+- exit (EXIT_SUCCESS);
+- }
+-}
+-
+-
+ static void
+ terminate (int signal)
+ {
+@@ -452,222 +452,18 @@ setup_signals ()
+ }
+
+
+-/** This function will close @fd */
+-static gchar *
+-read_machine_conf_file (const gchar *filename,
+- int fd)
+-{
+- GInputStream *unix_stream;
+- GDataInputStream *data_stream;
+- gboolean try_again;
+- gchar *line;
+- GError *error = NULL;
+-
+- g_debug ("Reading machine configuration file `%s'", filename);
+-
+- unix_stream = g_unix_input_stream_new (fd, TRUE);
+- g_assert (unix_stream != NULL);
+-
+- data_stream = g_data_input_stream_new (unix_stream);
+- g_assert (data_stream != NULL);
+- g_object_unref (unix_stream);
+-
+- do
+- {
+- try_again = FALSE;
+-
+- line = g_data_input_stream_read_line_utf8
+- (data_stream, NULL, NULL, &error);
+-
+- if (error)
+- {
+- g_warning ("Error reading from machine"
+- " configuration file `%s': %s",
+- filename, error->message);
+- g_error_free (error);
+- }
+- else if (line)
+- {
+- g_strstrip (line);
+-
+- // Skip comments and empty lines
+- if (line[0] == '#' || line[0] == '\0')
+- {
+- g_free (line);
+- try_again = TRUE;
+- }
+- }
+- }
+- while (try_again);
+-
+- g_object_unref (data_stream);
+- return line;
+-}
+-
+-
+-static gchar *
+-dir_machine_conf (const gchar *dir,
+- const gchar *machine,
+- const gchar *key)
+-{
+- gchar *filename;
+- int fd;
+- gchar *value = NULL;
+-
+- filename = g_build_filename (dir, APP_DATA_NAME,
+- "machine-conf",
+- machine, key, NULL);
+-
+- g_debug ("Trying machine configuration file `%s'",
+- filename);
+-
+- fd = g_open (filename, O_RDONLY, 0);
+- if (fd == -1)
+- {
+- if (errno != ENOENT)
+- {
+- // The error isn't that the file doesn't exist
+- g_warning ("Error opening machine"
+- " configuration file `%s': %s",
+- filename, g_strerror (errno));
+- }
+- }
+- else
+- {
+- value = read_machine_conf_file (filename, fd);
+- }
+-
+- g_free (filename);
+- return value;
+-}
+-
+-
+-static gchar *
+-machine_conf (const gchar *machine,
+- const gchar *key)
+-{
+- gchar *value = NULL;
+- const gchar * const *dirs, * const *dir;
+-
+-
+-#define try_dir(d) \
+- value = dir_machine_conf (d, machine, key); \
+- if (value) \
+- { \
+- return value; \
+- }
+-
+-
+- try_dir (g_get_user_config_dir ());
+-
+- dirs = g_get_system_config_dirs ();
+- for (dir = dirs; *dir; ++dir)
+- {
+- try_dir (*dir);
+- }
+-
+- try_dir (SYSCONFDIR);
+- try_dir (DATADIR);
+-
+- dirs = g_get_system_data_dirs ();
+- for (dir = dirs; *dir; ++dir)
+- {
+- try_dir (*dir);
+- }
+-
+-#undef try_dir
+-
+- return NULL;
+-}
+-
+-
+-static void
+-ensure_alsa_card (const gchar *machine,
+- const gchar *var,
+- const gchar *key,
+- gchar **name)
+-{
+- const gchar *env;
+-
+- if (*name)
+- {
+- return;
+- }
+-
+- env = g_getenv (var);
+- if (env)
+- {
+- *name = g_strdup (env);
+- return;
+- }
+-
+- if (machine)
+- {
+- *name = machine_conf (machine, key);
+- if (*name)
+- {
+- return;
+- }
+- }
+-
+- g_warning ("No %s specified with a machine configuration file"
+- ", environment variable or command line option"
+- "; refusing to run", key);
+- exit (EXIT_SUCCESS);
+-}
+-
+-
+ int
+ main (int argc, char **argv)
+ {
+ GError *error = NULL;
+ GOptionContext *context;
+ gboolean ok;
+- g_autofree gchar *codec = NULL;
+- g_autofree gchar *modem = NULL;
+- g_autofree gchar *machine = NULL;
+-
+- GOptionEntry options[] =
+- {
+- { "codec", 'c', 0, G_OPTION_ARG_STRING, &codec, "Name of the codec's ALSA card", "NAME" },
+- { "modem", 'm', 0, G_OPTION_ARG_STRING, &modem, "Name of the modem's ALSA card", "NAME" },
+- { NULL }
+- };
+
+ setlocale(LC_ALL, "");
+
+- machine = mchk_read_machine (NULL);
+- if (machine)
+- {
+- check_machine (machine);
+- }
+- else
+- {
+- g_warning ("Could not read machine name, continuing without machine check");
+- }
+-
+-
+- context = g_option_context_new ("- set up PulseAudio loopback for phone call audio");
+- g_option_context_add_main_entries (context, options, NULL);
+- ok = g_option_context_parse (context, &argc, &argv, &error);
+- if (!ok)
+- {
+- g_print ("Error parsing options: %s\n", error->message);
+- }
+-
+-
+- if (machine)
+- {
+- /* Convert any directory separator characters to "_" */
+- g_strdelimit (machine, G_DIR_SEPARATOR_S, '_');
+- }
+-
+- ensure_alsa_card (machine, "WYS_CODEC", "codec", &codec);
+- ensure_alsa_card (machine, "WYS_MODEM", "modem", &modem);
+-
+ setup_signals ();
+
+- run (codec, modem);
++ run ();
+
+ return 0;
+ }
+diff --git src/meson.build src/meson.build
+index 7b99235..a8a30d7 100644
+--- src/meson.build
++++ src/meson.build
+@@ -22,13 +22,10 @@
+ gnome = import('gnome')
+
+ wys_deps = [
+- libmchk_dep,
+ dependency('gobject-2.0'),
+ dependency('gio-unix-2.0'),
+ dependency('ModemManager'),
+ dependency('mm-glib'),
+- dependency('libpulse'),
+- dependency('libpulse-mainloop-glib'),
+ ]
+
+ config_h = configure_file (
+@@ -36,20 +33,13 @@ config_h = configure_file (
+ configuration: config_data
+ )
+
+-wys_enum_headers = files(['wys-direction.h'])
+-wys_enum_sources = gnome.mkenums_simple('enum-types',
+- sources : wys_enum_headers)
+-
+ executable (
+ 'wys',
+ config_h,
+- wys_enum_sources,
+ [
+ 'main.c',
+ 'util.h', 'util.c',
+- 'wys-direction.h', 'wys-direction.c',
+ 'wys-modem.h', 'wys-modem.c',
+- 'wys-audio.h', 'wys-audio.c',
+ ],
+ dependencies : wys_deps,
+ include_directories : include_directories('..'),
+diff --git src/wys-modem.c src/wys-modem.c
+index 212f992..51a0575 100644
+--- src/wys-modem.c
++++ src/wys-modem.c
+@@ -24,18 +24,10 @@
+
+
+ #include "wys-modem.h"
+-#include "wys-direction.h"
+ #include "util.h"
+-#include "enum-types.h"
+
+ #include <glib/gi18n.h>
+
+-static const gchar * const WYS_MODEM_HAS_AUDIO[] =
+- {
+- [WYS_DIRECTION_FROM_NETWORK] = "wys-has-audio-from-network",
+- [WYS_DIRECTION_TO_NETWORK] = "wys-has-audio-to-network"
+- };
+-
+ struct _WysModem
+ {
+ GObject parent_instance;
+@@ -43,8 +35,8 @@ struct _WysModem
+ MMModemVoice *voice;
+ /** Map of D-Bus object paths to MMCall objects */
+ GHashTable *calls;
+- /** How many calls have audio, in each direction */
+- guint audio_count[2];
++ /** How many calls have audio */
++ guint audio_count;
+ };
+
+ G_DEFINE_TYPE(WysModem, wys_modem, G_TYPE_OBJECT)
+@@ -65,15 +57,11 @@ static guint signals [SIGNAL_LAST_SIGNAL];
+
+
+ static gboolean
+-call_state_has_audio (WysDirection direction,
+- MMCallState state)
++call_state_has_audio (MMCallState state)
+ {
+ switch (state)
+ {
+ case MM_CALL_STATE_RINGING_OUT:
+- return
+- (direction == WYS_DIRECTION_FROM_NETWORK)
+- ? TRUE : FALSE;
+ case MM_CALL_STATE_ACTIVE:
+ return TRUE;
+ default:
+@@ -84,39 +72,35 @@ call_state_has_audio (WysDirection direction,
+
+ static void
+ update_audio_count (WysModem *self,
+- WysDirection direction,
+ gint delta)
+ {
+- const guint old_count = self->audio_count[direction];
++ const guint old_count = self->audio_count;
+
+- g_assert (delta >= 0 || self->audio_count[direction] > 0);
++ g_assert (delta >= 0 || self->audio_count > 0);
+
+- self->audio_count[direction] += delta;
++ self->audio_count += delta;
+
+- if (self->audio_count[direction] > 0 && old_count == 0)
++ if (self->audio_count > 0 && old_count == 0)
+ {
+- g_debug ("Modem `%s' audio %s now present",
+- mm_modem_voice_get_path (self->voice),
+- wys_direction_get_description (direction));
+- g_signal_emit_by_name (self, "audio-present", direction);
++ g_message ("Modem `%s' audio now present",
++ mm_modem_voice_get_path (self->voice));
++ g_signal_emit_by_name (self, "audio-present");
+ }
+- else if (self->audio_count[direction] == 0 && old_count > 0)
++ else if (self->audio_count == 0 && old_count > 0)
+ {
+- g_debug ("Modem `%s' audio now absent",
+- mm_modem_voice_get_path (self->voice));
+- g_signal_emit_by_name (self, "audio-absent", direction);
++ g_message ("Modem `%s' audio now absent",
++ mm_modem_voice_get_path (self->voice));
++ g_signal_emit_by_name (self, "audio-absent");
+ }
+ }
+
+
+ static gboolean
+-get_call_has_audio (MMCall *mm_call,
+- WysDirection direction)
++get_call_has_audio (MMCall *mm_call)
+ {
+ gpointer data;
+
+- data = g_object_get_data (G_OBJECT (mm_call),
+- WYS_MODEM_HAS_AUDIO[direction]);
++ data = g_object_get_data (G_OBJECT (mm_call), "audio-state");
+
+ return (gboolean)(GPOINTER_TO_UINT (data));
+ }
+@@ -124,42 +108,38 @@ get_call_has_audio (MMCall *mm_call,
+
+ static void
+ set_call_has_audio (MMCall *mm_call,
+- WysDirection direction,
+ gboolean has_audio)
+ {
+ g_object_set_data (G_OBJECT (mm_call),
+- WYS_MODEM_HAS_AUDIO[direction],
++ "audio-state",
+ GUINT_TO_POINTER ((guint)has_audio));
+ }
+
+
+ static void
+-update_direction_state (WysModem *self,
+- MMCall *mm_call,
+- const gchar *path,
+- WysDirection direction,
+- MMCallState old_state,
+- MMCallState new_state)
++update_call_state (WysModem *self,
++ MMCall *mm_call,
++ const gchar *path,
++ MMCallState old_state,
++ MMCallState new_state)
+ {
+- gboolean had_audio = call_state_has_audio (direction, old_state);
+- gboolean have_audio = call_state_has_audio (direction, new_state);
++ gboolean had_audio = call_state_has_audio (old_state);
++ gboolean have_audio = call_state_has_audio (new_state);
+
+ if (!had_audio && have_audio)
+ {
+- g_debug ("Call `%s' gained audio %s", path,
+- wys_direction_get_description (direction));
+- update_audio_count (self, direction, +1);
++ g_message ("Call `%s' gained audio", path);
++ update_audio_count (self, +1);
+ }
+ else if (had_audio && !have_audio)
+ {
+- g_debug ("Call `%s' lost audio %s", path,
+- wys_direction_get_description (direction));
+- update_audio_count (self, direction, -1);
++ g_message ("Call `%s' lost audio", path);
++ update_audio_count (self, -1);
+ }
+
+ if (had_audio != have_audio)
+ {
+- set_call_has_audio (mm_call, direction, have_audio);
++ set_call_has_audio (mm_call, have_audio);
+ }
+ }
+
+@@ -174,34 +154,28 @@ call_state_changed_cb (MmGdbusCall *mm_gdbus_call,
+ MMCall *mm_call = MM_CALL (mm_gdbus_call);
+ const gchar * path = mm_call_get_path (mm_call);
+
+- g_debug ("Call `%s' state changed, new: %i, old: %i",
++ g_message ("Call `%s' state changed, new: %i, old: %i",
+ path, (int)new_state, (int)old_state);
+
+ // FIXME: deal with calls being put on hold (one call goes
+ // non-audio, another call goes audio after)
+
+- update_direction_state (self, mm_call, path,
+- WYS_DIRECTION_FROM_NETWORK,
+- old_state, new_state);
+- update_direction_state (self, mm_call, path,
+- WYS_DIRECTION_TO_NETWORK,
+- old_state, new_state);
++ update_call_state (self, mm_call, path, old_state, new_state);
+ }
+
+
+ static void
+-init_call_direction (WysModem *self,
+- MMCall *mm_call,
+- MMCallState state,
+- WysDirection direction)
++init_call_audio (WysModem *self,
++ MMCall *mm_call,
++ MMCallState state)
+ {
+- gboolean has_audio = call_state_has_audio (direction, state);
++ gboolean has_audio = call_state_has_audio (state);
+
+- set_call_has_audio (mm_call, direction, has_audio);
++ set_call_has_audio (mm_call, has_audio);
+
+ if (has_audio)
+ {
+- update_audio_count (self, direction, +1);
++ update_audio_count (self, +1);
+ }
+ }
+
+@@ -223,12 +197,9 @@ add_call (WysModem *self,
+ self);
+
+ state = mm_call_get_state (mm_call);
+- init_call_direction (self, mm_call, state,
+- WYS_DIRECTION_FROM_NETWORK);
+- init_call_direction (self, mm_call, state,
+- WYS_DIRECTION_TO_NETWORK);
++ init_call_audio (self, mm_call, state);
+
+- g_debug ("Call `%s' added, state: %i", path, (int)state);
++ g_message ("Call `%s' added, state: %i", path, (int)state);
+ }
+
+
+@@ -322,16 +293,14 @@ call_added_cb (MMModemVoice *voice,
+
+
+ static void
+-clear_call_direction (WysModem *self,
+- MMCall *mm_call,
+- WysDirection direction)
++clear_call_state (WysModem *self,
++ MMCall *mm_call)
+ {
+- gboolean has_audio =
+- get_call_has_audio (mm_call, direction);
++ gboolean has_audio = get_call_has_audio (mm_call);
+
+ if (has_audio)
+ {
+- update_audio_count (self, direction, -1);
++ update_audio_count (self, -1);
+ }
+ }
+
+@@ -343,7 +312,7 @@ call_deleted_cb (MMModemVoice *voice,
+ {
+ MMCall *mm_call;
+
+- g_debug ("Removing call `%s'", path);
++ g_message ("Removing call `%s'", path);
+
+ mm_call = g_hash_table_lookup (self->calls, path);
+ if (!mm_call)
+@@ -352,14 +321,11 @@ call_deleted_cb (MMModemVoice *voice,
+ return;
+ }
+
+- clear_call_direction (self, mm_call,
+- WYS_DIRECTION_FROM_NETWORK);
+- clear_call_direction (self, mm_call,
+- WYS_DIRECTION_TO_NETWORK);
++ clear_call_state (self, mm_call);
+
+ g_hash_table_remove (self->calls, path);
+
+- g_debug ("Call `%s' removed", path);
++ g_message ("Call `%s' removed", path);
+ }
+
+
+@@ -444,11 +410,9 @@ dispose (GObject *object)
+ if (g_hash_table_size (self->calls) > 0)
+ {
+ g_hash_table_remove_all (self->calls);
+- if (self->audio_count[WYS_DIRECTION_FROM_NETWORK] > 0 ||
+- self->audio_count[WYS_DIRECTION_TO_NETWORK] > 0)
++ if (self->audio_count > 0)
+ {
+- self->audio_count[WYS_DIRECTION_FROM_NETWORK] =
+- self->audio_count[WYS_DIRECTION_TO_NETWORK] = 0;
++ self->audio_count = 0;
+ g_signal_emit_by_name (self, "audio-absent");
+ }
+ }
+@@ -504,8 +468,7 @@ wys_modem_class_init (WysModemClass *klass)
+ G_SIGNAL_RUN_LAST,
+ 0, NULL, NULL, NULL,
+ G_TYPE_NONE,
+- 1,
+- WYS_TYPE_DIRECTION);
++ 0);
+
+ /**
+ * WysModem::audio-absent:
+@@ -520,8 +483,7 @@ wys_modem_class_init (WysModemClass *klass)
+ G_SIGNAL_RUN_LAST,
+ 0, NULL, NULL, NULL,
+ G_TYPE_NONE,
+- 1,
+- WYS_TYPE_DIRECTION);
++ 0);
+ }
+
+
diff --git a/srcpkgs/pinephone-wys/template b/srcpkgs/pinephone-wys/template
new file mode 100644
index 00000000000..ab3eaad64ac
--- /dev/null
+++ b/srcpkgs/pinephone-wys/template
@@ -0,0 +1,19 @@
+# Template file for 'pinephone-wys'
+pkgname=pinephone-wys
+_pkgname=wys
+version=0.1.8
+revision=1
+wrksrc=${_pkgname}-v${version}
+build_style=meson
+hostmakedepends="pkg-config"
+makedepends="glib-devel pulseaudio-devel ModemManager-devel"
+short_desc="Daemon to bring up and take down PulseAudio for phone call audio"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/wys"
+distfiles="${homepage}/-/archive/v${version}/${_pkgname}-v${version}.tar.gz"
+checksum=07fd6d2ae9ea5d6187e1c99d5b0e5c1d9c74ba00f4869f4aae195cd8714ba375
+
+post_install() {
+ vinstall ${FILESDIR}/wys.desktop 644 etc/xdg/autostart
+}
^ permalink raw reply [flat|nested] 47+ messages in thread* Re: New packages: phoc-0.4.2 calls-0.1.7 purism-chatty-0.1.15
2020-08-29 20:46 [PR PATCH] New packages: phoc-0.4.2 calls-0.1.7 purism-chatty--0.1.15 julio641742
` (25 preceding siblings ...)
2020-09-13 5:35 ` [PR PATCH] [Updated] " julio641742
@ 2020-09-13 5:53 ` julio641742
2020-09-13 7:42 ` julio641742
` (18 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: julio641742 @ 2020-09-13 5:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1259 bytes --]
New comment by julio641742 on void-packages repository
https://github.com/void-linux/void-packages/pull/24538#issuecomment-691618794
Comment:
Following this [guide](https://xnux.eu/devices/feature/modem-pp.html#toc-modem-power-driver) to powerup the modem, i am able to make calls with `calls` and `pinephone-wys` with some scripts pulled from `pmaports` [setup_modem.sh](https://gitlab.com/postmarketOS/pmaports/-/blob/master/device/community/device-pine64-pinephone/setup-modem.sh) [modem.rules](https://gitlab.com/postmarketOS/pmaports/-/blob/master/device/community/device-pine64-pinephone/90-modem-eg25.rules). I am using the sound profiles from [here](https://gitlab.com/postmarketOS/pmaports/-/tree/master/device/community/device-pine64-pinephone/ucm) and `alsa-ucm-conf` but the sound is bad.
SMS works but I am not that knowleageable to make the last package [purple-mm-sms](https://source.puri.sm/Librem5/purple-mm-sms) cross compilable. To run `chatty` you need to make symlinks to point to`libjabber.so` and `mm-sms.so` that are inside `/usr/lib/purple-2`
I have not tested mobile data but it seems that `gnome-control-center` is old and does not show the Mobile tab like postmarketOs. I will try to set the `APN` settings manually later.
^ permalink raw reply [flat|nested] 47+ messages in thread* Re: New packages: phoc-0.4.2 calls-0.1.7 purism-chatty-0.1.15
2020-08-29 20:46 [PR PATCH] New packages: phoc-0.4.2 calls-0.1.7 purism-chatty--0.1.15 julio641742
` (26 preceding siblings ...)
2020-09-13 5:53 ` julio641742
@ 2020-09-13 7:42 ` julio641742
2020-09-13 12:08 ` jjsullivan5196
` (17 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: julio641742 @ 2020-09-13 7:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1415 bytes --]
New comment by julio641742 on void-packages repository
https://github.com/void-linux/void-packages/pull/24538#issuecomment-691618794
Comment:
Following this [guide](https://xnux.eu/devices/feature/modem-pp.html#toc-modem-power-driver) to powerup the modem, i am able to make calls with `calls` and `pinephone-wys` with some scripts pulled from `pmaports` [setup_modem.sh](https://gitlab.com/postmarketOS/pmaports/-/blob/master/device/community/device-pine64-pinephone/setup-modem.sh) [modem.rules](https://gitlab.com/postmarketOS/pmaports/-/blob/master/device/community/device-pine64-pinephone/90-modem-eg25.rules). I am using the sound profiles from [here](https://gitlab.com/postmarketOS/pmaports/-/tree/master/device/community/device-pine64-pinephone/ucm) and `alsa-ucm-conf` but the sound is bad.
SMS works but I am not that knowleageable to make the last package [purple-mm-sms](https://source.puri.sm/Librem5/purple-mm-sms) cross compilable. To run `chatty` you need to make symlinks to point to`libjabber.so` and `mm-sms.so` that are inside `/usr/lib/purple-2`
~~I have not tested mobile data but it seems that `gnome-control-center` is old and does not show the Mobile tab like postmarketOs. I will try to set the `APN` settings manually later.~~
Edit: Mobile data works! I use Mint mobile USA which uses the T-Mobile network and use the default apn setup that is hidden in 'gnome-control-center'.
^ permalink raw reply [flat|nested] 47+ messages in thread* Re: New packages: phoc-0.4.2 calls-0.1.7 purism-chatty-0.1.15
2020-08-29 20:46 [PR PATCH] New packages: phoc-0.4.2 calls-0.1.7 purism-chatty--0.1.15 julio641742
` (27 preceding siblings ...)
2020-09-13 7:42 ` julio641742
@ 2020-09-13 12:08 ` jjsullivan5196
2020-09-13 12:08 ` jjsullivan5196
` (16 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: jjsullivan5196 @ 2020-09-13 12:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 772 bytes --]
New comment by jjsullivan5196 on void-packages repository
https://github.com/void-linux/void-packages/pull/24538#issuecomment-691663364
Comment:
@julio641742 I wanted to take a look packaging `alsa-ucm-conf` when I was doing the first PR, but it was already pretty fat so I didn't want to put anymore weight on it. I can look into making sure the audio config is correct for the kernel, I've messed around with the alsa config already. Also, the person maintaining the sunxi audio codecs is working on some improvements for audio quality in kernel 5.9, so there might be room to experiment with that.
Also I do have modem.rules in `pinephone-base`, but that version doesn't run the modem setup script. Seems like it would be a good idea to add that in a separate PR.
^ permalink raw reply [flat|nested] 47+ messages in thread* Re: New packages: phoc-0.4.2 calls-0.1.7 purism-chatty-0.1.15
2020-08-29 20:46 [PR PATCH] New packages: phoc-0.4.2 calls-0.1.7 purism-chatty--0.1.15 julio641742
` (28 preceding siblings ...)
2020-09-13 12:08 ` jjsullivan5196
@ 2020-09-13 12:08 ` jjsullivan5196
2020-09-19 8:24 ` [PR PATCH] [Updated] " julio641742
` (15 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: jjsullivan5196 @ 2020-09-13 12:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 793 bytes --]
New comment by jjsullivan5196 on void-packages repository
https://github.com/void-linux/void-packages/pull/24538#issuecomment-691663364
Comment:
@julio641742 I wanted to take a look packaging `alsa-ucm-conf` when I was doing the first PR, but it was already pretty fat so I didn't want to put anymore weight on it. I can look into making sure the audio config is correct for the kernel, I've messed around with the alsa config already. Also, the person maintaining the sunxi audio codecs is working on some improvements for audio quality in kernel 5.9, so there might be room to experiment with that.
Also I do have modem.rules in `pinephone-base`, but that version doesn't run the modem setup script. Seems like it would be a good idea to add that in a separate PR.
Good work so far!
^ permalink raw reply [flat|nested] 47+ messages in thread* Re: [PR PATCH] [Updated] New packages: phoc-0.4.2 calls-0.1.7 purism-chatty-0.1.15
2020-08-29 20:46 [PR PATCH] New packages: phoc-0.4.2 calls-0.1.7 purism-chatty--0.1.15 julio641742
` (29 preceding siblings ...)
2020-09-13 12:08 ` jjsullivan5196
@ 2020-09-19 8:24 ` julio641742
2020-09-20 2:14 ` julio641742
` (14 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: julio641742 @ 2020-09-19 8:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 386 bytes --]
There is an updated pull request by julio641742 against master on the void-packages repository
https://github.com/julio641742/void-packages phosh
https://github.com/void-linux/void-packages/pull/24538
New packages: phoc-0.4.2 calls-0.1.7 purism-chatty-0.1.15
Getting ready for my pinephone :)
A patch file from https://github.com/void-linux/void-packages/pull/24538.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-phosh-24538.patch --]
[-- Type: text/x-diff, Size: 51413 bytes --]
From 28489f6a0a20a19fa413cec400f14f9f7539c6f5 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Sat, 29 Aug 2020 11:47:35 -0700
Subject: [PATCH 01/11] New package: feedbackd-0.0.0+git20200707
---
common/shlibs | 1 +
srcpkgs/feedbackd/template | 37 +++++++++++++++++++++++++++++++++++++
srcpkgs/libfeedback | 1 +
srcpkgs/libfeedback-devel | 1 +
4 files changed, 40 insertions(+)
create mode 100644 srcpkgs/feedbackd/template
create mode 120000 srcpkgs/libfeedback
create mode 120000 srcpkgs/libfeedback-devel
diff --git a/common/shlibs b/common/shlibs
index ccfd187bfe0..5167847ffd9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3991,3 +3991,4 @@ libneatvnc.so.0 neatvnc-0.2.0_1
libtdjson.so.1.6.0 libtd-1.6.0_1
libJudy.so.1 judy-1.0.5_1
libsignal-protocol-c.so.2 libsignal-protocol-c-2.3.3_2
+libfeedback-0.0.so.0 libfeedback-0.0.0+git20200707_1
diff --git a/srcpkgs/feedbackd/template b/srcpkgs/feedbackd/template
new file mode 100644
index 00000000000..0131775cc9d
--- /dev/null
+++ b/srcpkgs/feedbackd/template
@@ -0,0 +1,37 @@
+# Template file for 'feedbackd'
+pkgname=feedbackd
+version=0.0.0+git20200707
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=meson
+build_helper=gir
+hostmakedepends="vala glib-devel pkg-config"
+makedepends="gsound-devel libgudev-devel json-glib-devel"
+depends="dbus"
+short_desc="Daemon to provide haptic feedback on events"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/feedbackd"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=37cf48cbdbaee8e2d0bea406f5b6317bf0e3cdf79250f9ce0a884e7d3905a8ea
+
+post_install() {
+ vinstall debian/feedbackd.udev 0644 usr/lib/udev/rules.d 90-feedbackd.rules
+}
+
+libfeedback_package() {
+ short_desc+=" - shared libraries"
+ pkg_install() {
+ vmove "usr/lib/*.so.*"
+ }
+}
+
+libfeedback-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ }
+}
diff --git a/srcpkgs/libfeedback b/srcpkgs/libfeedback
new file mode 120000
index 00000000000..49dc965f1cd
--- /dev/null
+++ b/srcpkgs/libfeedback
@@ -0,0 +1 @@
+feedbackd
\ No newline at end of file
diff --git a/srcpkgs/libfeedback-devel b/srcpkgs/libfeedback-devel
new file mode 120000
index 00000000000..49dc965f1cd
--- /dev/null
+++ b/srcpkgs/libfeedback-devel
@@ -0,0 +1 @@
+feedbackd
\ No newline at end of file
From 2329d04dd333e7ebfef7ec52486d343766ce4db2 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Sat, 29 Aug 2020 11:47:56 -0700
Subject: [PATCH 02/11] New package: phoc-0.4.2
---
srcpkgs/phoc/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/phoc/template
diff --git a/srcpkgs/phoc/template b/srcpkgs/phoc/template
new file mode 100644
index 00000000000..00c9f1f3ab0
--- /dev/null
+++ b/srcpkgs/phoc/template
@@ -0,0 +1,16 @@
+# Template file for 'phoc'
+pkgname=phoc
+version=0.4.2
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=meson
+configure_args="-Dembed-wlroots=disabled"
+hostmakedepends="glib-devel pkg-config wayland-devel"
+makedepends="gnome-desktop-devel wlroots-devel"
+depends="mutter"
+short_desc="Wlroots based Phone compositor for the Phosh shell"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/phoc"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=bdb34644c7d49c953239c1e939bc5ee2bc26f6187b9d756b70b113d2734c712c
From e42e9b90de544681afa3e72a7884024251497199 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Sat, 29 Aug 2020 11:48:48 -0700
Subject: [PATCH 03/11] New package: squeekboard-1.9.3
---
srcpkgs/squeekboard/template | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
create mode 100644 srcpkgs/squeekboard/template
diff --git a/srcpkgs/squeekboard/template b/srcpkgs/squeekboard/template
new file mode 100644
index 00000000000..938248efa6b
--- /dev/null
+++ b/srcpkgs/squeekboard/template
@@ -0,0 +1,25 @@
+# Template file for 'squeekboard'
+pkgname=squeekboard
+version=1.9.3
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=meson
+build_helper=rust
+hostmakedepends="glib-devel gettext pkg-config cargo wayland-devel"
+makedepends="rust gtk+3-devel gnome-desktop-devel libfeedback-devel"
+short_desc="Final Librem5 keyboard"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/squeekboard"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=b99e56faace3986bf752e08c104cea60ed896d514284840655033dd9457db824
+
+pre_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ vsed -i cargo_build.sh -e "s/-a ./-a ${XBPS_CROSS_RUST_TARGET}/g"
+ fi
+}
+
+post_install() {
+ chmod +x ${DESTDIR}/usr/bin/squeekboard-entry
+}
From fb41733e1a5503863d9b16104d8b9b9d32d43f37 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Sat, 29 Aug 2020 11:48:59 -0700
Subject: [PATCH 04/11] New package: phosh-0.4.3
---
srcpkgs/phosh/files/phosh.desktop | 11 ++++++++
srcpkgs/phosh/files/sm.puri.OSK0.desktop | 12 +++++++++
srcpkgs/phosh/patches/32bit-build-fix.patch | 30 +++++++++++++++++++++
srcpkgs/phosh/template | 22 +++++++++++++++
4 files changed, 75 insertions(+)
create mode 100644 srcpkgs/phosh/files/phosh.desktop
create mode 100644 srcpkgs/phosh/files/sm.puri.OSK0.desktop
create mode 100644 srcpkgs/phosh/patches/32bit-build-fix.patch
create mode 100644 srcpkgs/phosh/template
diff --git a/srcpkgs/phosh/files/phosh.desktop b/srcpkgs/phosh/files/phosh.desktop
new file mode 100644
index 00000000000..84452845115
--- /dev/null
+++ b/srcpkgs/phosh/files/phosh.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=Phosh
+Name[en]=Phosh
+Comment=This session logs you into Phosh
+Comment[en]=This session logs in you into Phosh
+Exec=dbus-run-session /usr/bin/phosh
+TryExec=/usr/bin/phosh
+Icon=
+Type=Application
+X-DesktopNames=Phosh
+Keywords=launch;Phosh;desktop;session;
diff --git a/srcpkgs/phosh/files/sm.puri.OSK0.desktop b/srcpkgs/phosh/files/sm.puri.OSK0.desktop
new file mode 100644
index 00000000000..39740f15773
--- /dev/null
+++ b/srcpkgs/phosh/files/sm.puri.OSK0.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Type=Application
+Name=On-screen keyboard
+Comment=Default on-screen keyboard
+Exec=/usr/bin/squeekboard
+Categories=GNOME;Core;
+OnlyShowIn=GNOME;
+NoDisplay=true
+X-GNOME-Autostart-Phase=Panel
+X-GNOME-Provides=inputmethod
+X-GNOME-Autostart-Notify=true
+X-GNOME-AutoRestart=true
diff --git a/srcpkgs/phosh/patches/32bit-build-fix.patch b/srcpkgs/phosh/patches/32bit-build-fix.patch
new file mode 100644
index 00000000000..a98ecb0faa5
--- /dev/null
+++ b/srcpkgs/phosh/patches/32bit-build-fix.patch
@@ -0,0 +1,30 @@
+From d1da5ea7d18c6794c9a7d2f41355fe90d4115ac1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
+Date: Tue, 4 Aug 2020 08:22:39 +0200
+Subject: [PATCH] timestamp-label: Unbreak build on 32 bit platforms
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Use a G_ format specifier for GTimeSpan.
+
+Signed-off-by: Guido Günther <guido.gunther@puri.sm>
+---
+ src/notifications/timestamp-label.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/notifications/timestamp-label.c b/src/notifications/timestamp-label.c
+index 0aa04ce0..a5a4d5e7 100644
+--- src/notifications/timestamp-label.c
++++ src/notifications/timestamp-label.c
+@@ -255,7 +255,7 @@ phosh_timestamp_label_calc_timeout (PhoshTimestampLabel *self)
+ break;
+ }
+ timeout_diff = g_date_time_difference (timeout_time, time_now);
+- g_debug ("time out duration = %ld", timeout_diff);
++ g_debug ("time out duration: %" G_GINT64_FORMAT, timeout_diff);
+ return timeout_diff;
+ }
+
+--
+2.26.2
diff --git a/srcpkgs/phosh/template b/srcpkgs/phosh/template
new file mode 100644
index 00000000000..46199202466
--- /dev/null
+++ b/srcpkgs/phosh/template
@@ -0,0 +1,22 @@
+# Template file for 'phosh'
+pkgname=phosh
+version=0.4.3
+revision=1
+build_style=meson
+hostmakedepends="phoc glib-devel gettext pkg-config wayland-devel"
+makedepends="libfeedback-devel gcr-devel gnome-desktop-devel pam-devel
+ polkit-devel pulseaudio-devel libsecret-devel libhandy-devel
+ NetworkManager-devel upower-devel"
+depends="phoc squeekboard gnome-session gnome-settings-daemon elogind
+ xorg-server-xwayland cantarell-fonts font-adobe-source-code-pro"
+short_desc="Shell PoC for the Librem5"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/phosh"
+distfiles="https://repo.pureos.net/pureos/pool/main/p/phosh/phosh_$version.tar.xz"
+checksum=c6fc68aafaf78412637b0f509aafbbca877bda3fe19511bf340b824d7cdbd4ee
+
+post_install() {
+ vcopy ${FILESDIR}/sm.puri.OSK0.desktop usr/share/applications
+ vcopy ${FILESDIR}/phosh.desktop usr/share/wayland-sessions
+}
From 038613a1b587b5b1821072db809eb3bc5ab81128 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 29 Aug 2020 18:35:47 -0700
Subject: [PATCH 05/11] New package: calls-0.1.8
---
srcpkgs/calls/template | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
create mode 100644 srcpkgs/calls/template
diff --git a/srcpkgs/calls/template b/srcpkgs/calls/template
new file mode 100644
index 00000000000..c17a8570f18
--- /dev/null
+++ b/srcpkgs/calls/template
@@ -0,0 +1,17 @@
+# Template file for 'calls'
+pkgname=calls
+version=0.1.8
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=meson
+hostmakedepends="glib-devel gettext vala pkg-config wayland-devel
+ evolution-data-server-devel"
+makedepends="folks-devel libhandy-devel libpeas-devel gom-devel
+ ModemManager-devel libfeedback-devel"
+depends="NetworkManager ModemManager"
+short_desc="Phone call application"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/calls"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=58fd2c438fadec812a73181fd6b1a79478814bb10bf8153f3b79a4c6271078a9
From eb60b64fa64434612d0be8e2f3e2ff79f7a74bd0 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 29 Aug 2020 18:36:35 -0700
Subject: [PATCH 06/11] New package: purism-chatty-0.1.15
---
srcpkgs/purism-chatty/template | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
create mode 100644 srcpkgs/purism-chatty/template
diff --git a/srcpkgs/purism-chatty/template b/srcpkgs/purism-chatty/template
new file mode 100644
index 00000000000..d11bfcea882
--- /dev/null
+++ b/srcpkgs/purism-chatty/template
@@ -0,0 +1,22 @@
+# Template file for 'purism-chatty'
+pkgname=purism-chatty
+_pkgname=chatty
+version=0.1.15
+revision=1
+wrksrc=${_pkgname}-v${version}
+build_style=meson
+hostmakedepends="glib-devel pkg-config gettext"
+makedepends="libfeedback-devel libhandy-devel evolution-data-server-devel
+ libpurple libpurple-devel"
+short_desc="XMPP and SMS messaging via libpurple and Modemmanager"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/chatty"
+distfiles="${homepage}/-/archive/v${version}/${_pkgname}-v${version}.tar.gz"
+checksum=9be2b79a266a7fa1e3d3e7ba447ff89d2b9e44312d6e55f2a63d191369528d64
+
+pre_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ vsed -i src/meson.build -e "s/purple_plugdir =.*/purple_plugdir = \'\/usr\/${XBPS_CROSS_TRIPLET}\/usr\/lib\/purple-2\'/g"
+ fi
+}
From 6ab82852cbd4ee3667ee0888c8ccd13b018f2a01 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 12 Sep 2020 15:05:36 -0700
Subject: [PATCH 07/11] New package: kgx-0.2.1
---
srcpkgs/kgx/template | 14 ++++++++++++++
1 file changed, 14 insertions(+)
create mode 100644 srcpkgs/kgx/template
diff --git a/srcpkgs/kgx/template b/srcpkgs/kgx/template
new file mode 100644
index 00000000000..98ec4caf70e
--- /dev/null
+++ b/srcpkgs/kgx/template
@@ -0,0 +1,14 @@
+# Template file for 'kgx'
+pkgname=kgx
+version=0.2.1
+revision=1
+build_style=meson
+hostmakedepends="glib-devel pkg-config gettext"
+makedepends="vte3-devel gtk+3-devel libhandy-devel libgtop-devel"
+depends="dbus desktop-file-utils gsettings-desktop-schemas"
+short_desc="Minimal terminal for GNOME"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://gitlab.gnome.org/ZanderBrown/kgx"
+distfiles="${homepage}/-/archive/${version}/kgx-${version}.tar.gz"
+checksum=70a814b0baf70049d5a20791d58a32e92661428d2deeeb56d91b81cc4dc5e81a
From 7655d2aa0d81189c6d4ef1989c0e980cab2c5b97 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 12 Sep 2020 10:58:50 -0700
Subject: [PATCH 08/11] New package: mobile-config-firefox-1.0.1
---
.../files/distro_links.html | 5 +++++
srcpkgs/mobile-config-firefox/template | 16 ++++++++++++++++
2 files changed, 21 insertions(+)
create mode 100644 srcpkgs/mobile-config-firefox/files/distro_links.html
create mode 100644 srcpkgs/mobile-config-firefox/template
diff --git a/srcpkgs/mobile-config-firefox/files/distro_links.html b/srcpkgs/mobile-config-firefox/files/distro_links.html
new file mode 100644
index 00000000000..ca89d0ecd08
--- /dev/null
+++ b/srcpkgs/mobile-config-firefox/files/distro_links.html
@@ -0,0 +1,5 @@
+<p class="distro-links">
+ <a href="https://voidlinux.org/">homepage</a> -
+ <a href="https://docs.voidlinux.org/">docs</a>
+ <a href="https://github.com/void-linux">repos</a>
+</p>
diff --git a/srcpkgs/mobile-config-firefox/template b/srcpkgs/mobile-config-firefox/template
new file mode 100644
index 00000000000..8a1530115e8
--- /dev/null
+++ b/srcpkgs/mobile-config-firefox/template
@@ -0,0 +1,16 @@
+# Template file for 'mobile-config-firefox'
+pkgname=mobile-config-firefox
+version=1.0.1
+revision=1
+build_style=gnu-makefile
+make_install_args="DISTRO=VoidLinux"
+short_desc="Firefox tweaks for mobile and privacy"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://gitlab.com/postmarketOS/mobile-config-firefox"
+distfiles="${homepage}/-/archive/${version}/${pkgname}-${version}.tar.gz"
+checksum=7dce837995956f6f224041853e005eecb3368cd3cbfec6fe3e8a3153747dd0a7
+
+post_extract() {
+ cp ${FILESDIR}/distro_links.html src/homepage
+}
From 3cf6ea080ab20aa8ce76cb553e7f31948f4a05d1 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 12 Sep 2020 14:42:26 -0700
Subject: [PATCH 09/11] New package: phosh-desktop-0.1
---
.../phosh-desktop/files/000-gschema.override | 20 +++++++++
srcpkgs/phosh-desktop/files/01-phoc-scaling | 5 +++
srcpkgs/phosh-desktop/template | 45 +++++++++++++++++++
3 files changed, 70 insertions(+)
create mode 100644 srcpkgs/phosh-desktop/files/000-gschema.override
create mode 100644 srcpkgs/phosh-desktop/files/01-phoc-scaling
create mode 100644 srcpkgs/phosh-desktop/template
diff --git a/srcpkgs/phosh-desktop/files/000-gschema.override b/srcpkgs/phosh-desktop/files/000-gschema.override
new file mode 100644
index 00000000000..79ec5f6cf6c
--- /dev/null
+++ b/srcpkgs/phosh-desktop/files/000-gschema.override
@@ -0,0 +1,20 @@
+[org.gnome.desktop.background]
+picture-uri='file:///usr/share/backgrounds/gnome/LightWaves.jpg'
+
+[org.gnome.desktop.interface]
+clock-show-weekday=false
+clock-show-date=false
+
+[org.gnome.desktop.wm.preferences]
+button-layout='appmenu:'
+
+[org.gnome.Epiphany]
+search-engines=[('Search the Web', 'https://duckduckgo.com/?q=%s&t=epiphany', ''), ('DuckDuckGo', 'https://duckduckgo.com/?q=%s&t=epiphany', '!ddg'), ('Qwant', 'https://www.qwant.com/?q=%s', '!q')]
+
+[org.gnome.Epiphany.web]
+user-agent='Mozilla/5.0 (Linux; Android 10; Pixel) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.96 Mobile Safari/537.36'
+
+
+[org.gnome.settings-daemon.plugins.power]
+sleep-inactive-ac-type='nothing'
+ambient-enabled=false
diff --git a/srcpkgs/phosh-desktop/files/01-phoc-scaling b/srcpkgs/phosh-desktop/files/01-phoc-scaling
new file mode 100644
index 00000000000..880af2439d3
--- /dev/null
+++ b/srcpkgs/phosh-desktop/files/01-phoc-scaling
@@ -0,0 +1,5 @@
+[sm/puri/phoc/application/firefox]
+scale-to-fit=false
+
+[sm/puri/phoc/application/org-gnome-maps]
+scale-to-fit=true
diff --git a/srcpkgs/phosh-desktop/template b/srcpkgs/phosh-desktop/template
new file mode 100644
index 00000000000..b052a7968b8
--- /dev/null
+++ b/srcpkgs/phosh-desktop/template
@@ -0,0 +1,45 @@
+# Template file for 'phosh-desktop'
+pkgname=phosh-desktop
+version=0.1
+revision=1
+build_style=meta
+depends="
+ phosh
+ kgx
+ calls
+ purism-chatty
+ iio-sensor-proxy
+ xdg-user-dirs
+ xdg-desktop-portal-gtk
+ gnome-backgrounds
+ gnome-color-manager
+ gnome-control-center
+ gnome-desktop
+ gnome-keyring
+ gnome-online-accounts
+ gnome-online-miners
+ gnome-calculator
+ gnome-calendar
+ gnome-clocks
+ gnome-contacts
+ gnome-maps
+ gnome-music
+ gnome-system-monitor
+ gedit
+ cheese
+ eog
+ evince
+ epiphany
+ evolution
+ gsettings-desktop-schemas
+ nautilus"
+
+short_desc="Phosh desktop environment metapackage"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://voidlinux.org"
+
+post_install() {
+ vinstall ${FILESDIR}/000-gschema.override 644 usr/share/glib-2.0/schemas 000-void.gschema.override
+ vinstall ${FILESDIR}/01-phoc-scaling 644 etc/dconf/db/void.d
+}
From e12a135735232fc285ec676c6f90c22b3d6a309f Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 12 Sep 2020 22:17:58 -0700
Subject: [PATCH 10/11] New package: atinout-0.9.1
---
...-happy-by-adding-fallthrough-comment.patch | 25 ++++++
...02-do-not-rely-on-CR-in-modem-output.patch | 84 +++++++++++++++++++
srcpkgs/atinout/patches/0003-version.patch | 11 +++
srcpkgs/atinout/template | 11 +++
4 files changed, 131 insertions(+)
create mode 100644 srcpkgs/atinout/patches/0001-make-gcc-happy-by-adding-fallthrough-comment.patch
create mode 100644 srcpkgs/atinout/patches/0002-do-not-rely-on-CR-in-modem-output.patch
create mode 100644 srcpkgs/atinout/patches/0003-version.patch
create mode 100644 srcpkgs/atinout/template
diff --git a/srcpkgs/atinout/patches/0001-make-gcc-happy-by-adding-fallthrough-comment.patch b/srcpkgs/atinout/patches/0001-make-gcc-happy-by-adding-fallthrough-comment.patch
new file mode 100644
index 00000000000..c0ebbb6561d
--- /dev/null
+++ b/srcpkgs/atinout/patches/0001-make-gcc-happy-by-adding-fallthrough-comment.patch
@@ -0,0 +1,25 @@
+From ca2e04f8b069d269172f0d55d3716a809537f696 Mon Sep 17 00:00:00 2001
+From: Beralt Meppelink <b.meppelink@riwo.eu>
+Date: Fri, 27 Oct 2017 09:12:18 +0200
+Subject: [PATCH 1/2] make gcc happy by adding fallthrough comment
+
+---
+ atinout.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/atinout.c b/atinout.c
+index d04f300..924b5bc 100644
+--- atinout.c
++++ atinout.c
+@@ -150,7 +150,7 @@ static bool is_final_result(const char * const response)
+ if (strcmp(&response[1], "K\r\n") == 0) {
+ return true;
+ }
+- /* no break */
++ // fallthrough
+ default:
+ return false;
+ }
+--
+2.23.0
+
diff --git a/srcpkgs/atinout/patches/0002-do-not-rely-on-CR-in-modem-output.patch b/srcpkgs/atinout/patches/0002-do-not-rely-on-CR-in-modem-output.patch
new file mode 100644
index 00000000000..f9671d089c3
--- /dev/null
+++ b/srcpkgs/atinout/patches/0002-do-not-rely-on-CR-in-modem-output.patch
@@ -0,0 +1,84 @@
+From 65dae46181119867cd8e93ca5b33d3b0cf3df08c Mon Sep 17 00:00:00 2001
+From: Beralt Meppelink <b.meppelink@riwo.eu>
+Date: Fri, 27 Oct 2017 10:42:50 +0200
+Subject: [PATCH 2/2] do not rely on CR in modem output
+
+---
+ atinout.c | 24 +++++++++++-------------
+ 1 file changed, 11 insertions(+), 13 deletions(-)
+
+diff --git a/atinout.c b/atinout.c
+index 924b5bc..4cd7689 100644
+--- atinout.c
++++ atinout.c
+@@ -34,7 +34,6 @@
+
+ #define MAX_LINE_LENGTH (4 * 1024)
+ static char buf[MAX_LINE_LENGTH];
+-static char buf2[MAX_LINE_LENGTH];
+
+ static struct option long_options[] = {
+ {"help", no_argument, NULL, 'h'},
+@@ -125,36 +124,36 @@ static bool is_final_result(const char * const response)
+ }
+ return false;
+ case 'B':
+- if (strcmp(&response[1], "USY\r\n") == 0) {
++ if (strcmp(&response[1], "USY\n") == 0) {
+ return true;
+- }
++ }
++
+ return false;
+
+ case 'E':
+- if (strcmp(&response[1], "RROR\r\n") == 0) {
++ if (strcmp(&response[1], "RROR\n") == 0) {
+ return true;
+ }
+ return false;
+ case 'N':
+- if (strcmp(&response[1], "O ANSWER\r\n") == 0) {
++ if (strcmp(&response[1], "O ANSWER\n") == 0) {
+ return true;
+ }
+- if (strcmp(&response[1], "O CARRIER\r\n") == 0) {
++ if (strcmp(&response[1], "O CARRIER\n") == 0) {
+ return true;
+ }
+- if (strcmp(&response[1], "O DIALTONE\r\n") == 0) {
++ if (strcmp(&response[1], "O DIALTONE\n") == 0) {
+ return true;
+ }
+ return false;
+ case 'O':
+- if (strcmp(&response[1], "K\r\n") == 0) {
++ if (strcmp(&response[1], "K\n") == 0) {
+ return true;
+ }
+ // fallthrough
+ default:
+ return false;
+ }
+-
+ }
+
+ int main(int argc, char *argv[])
+@@ -248,11 +247,10 @@ int main(int argc, char *argv[])
+ fprintf(stderr, "EOF from modem\n");
+ return EXIT_FAILURE;
+ }
+- strcpy(buf2, line);
+- strip_cr(buf2);
+- res = fputs(buf2, output);
++ strip_cr(line);
++ res = fputs(line, output);
+ if (res < 0) {
+- fprintf(stderr, "failed to write '%s' to output file (res = %d)\n", buf2, res);
++ fprintf(stderr, "failed to write '%s' to output file (res = %d)\n", line, res);
+ return EXIT_FAILURE;
+ }
+ } while (! is_final_result(line));
+--
+2.23.0
+
diff --git a/srcpkgs/atinout/patches/0003-version.patch b/srcpkgs/atinout/patches/0003-version.patch
new file mode 100644
index 00000000000..18d92de0630
--- /dev/null
+++ b/srcpkgs/atinout/patches/0003-version.patch
@@ -0,0 +1,11 @@
+--- atinout.c 2020-09-12 16:31:43.049093055 -0700
++++ atinout.c 2020-09-12 16:33:34.269081686 -0700
+@@ -170,7 +169,7 @@
+ help(argv[0]);
+ return EXIT_SUCCESS;
+ case 'V':
+- printf("atinout version " VERSION "\n");
++ printf("atinout version 0.9.1\n");
+ if (argc == 2) {
+ printf("Copyright (C) 2013 Håkon Løvdal <hlovdal@users.sourceforge.net>\n"
+ "This program comes with ABSOLUTELY NO WARRANTY.\n"
diff --git a/srcpkgs/atinout/template b/srcpkgs/atinout/template
new file mode 100644
index 00000000000..db2c2ffd223
--- /dev/null
+++ b/srcpkgs/atinout/template
@@ -0,0 +1,11 @@
+# Template file for 'atinout'
+pkgname=atinout
+version=0.9.1
+revision=1
+build_style=gnu-makefile
+short_desc="AT commands as input are sent to modem and responses given as output"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="http://atinout.sourceforge.net/index.html"
+distfiles="https://netcologne.dl.sourceforge.net/project/atinout/v${version}/atinout-${version}.tar.gz"
+checksum=4d15c8288aca414e11cd304686b172696104c5e42bf776300311c005634854a2
From 513331d93624d706d1dec1fbff4e2d3ae53082f2 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 12 Sep 2020 22:18:46 -0700
Subject: [PATCH 11/11] New package: pinephone-wys-0.1.8
---
srcpkgs/pinephone-wys/files/wys.desktop | 9 +
...-daemon-to-only-switch-card-profiles.patch | 906 ++++++++++++++++++
srcpkgs/pinephone-wys/template | 19 +
3 files changed, 934 insertions(+)
create mode 100644 srcpkgs/pinephone-wys/files/wys.desktop
create mode 100644 srcpkgs/pinephone-wys/patches/0001-Simplify-daemon-to-only-switch-card-profiles.patch
create mode 100644 srcpkgs/pinephone-wys/template
diff --git a/srcpkgs/pinephone-wys/files/wys.desktop b/srcpkgs/pinephone-wys/files/wys.desktop
new file mode 100644
index 00000000000..a6a9f6894a9
--- /dev/null
+++ b/srcpkgs/pinephone-wys/files/wys.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Wys
+Comment=Daemon for managing PulseAudio for phone call audio
+Exec=/usr/bin/wys
+NoDisplay=true
+Terminal=false
+Type=Application
+StartupNotify=true
+X-GNOME-AutoRestart=true
diff --git a/srcpkgs/pinephone-wys/patches/0001-Simplify-daemon-to-only-switch-card-profiles.patch b/srcpkgs/pinephone-wys/patches/0001-Simplify-daemon-to-only-switch-card-profiles.patch
new file mode 100644
index 00000000000..91257f2cbba
--- /dev/null
+++ b/srcpkgs/pinephone-wys/patches/0001-Simplify-daemon-to-only-switch-card-profiles.patch
@@ -0,0 +1,906 @@
+From f66610d26395de15e3928cf4284573ca9cfabf26 Mon Sep 17 00:00:00 2001
+From: Arnaud Ferraris <arnaud.ferraris@collabora.com>
+Date: Fri, 6 Mar 2020 02:01:52 +0100
+Subject: [PATCH] Simplify daemon to only switch card profiles
+
+As a PoC for the PinePhone, we want to only switch card profiles:
+- when a call starts, use the "Voice Call" profile: audio is output on
+the earpiece, and the internal microphone is unmuted
+- when a call is terminated, switch back to the default "HiFi" profile,
+using the main speaker
+
+This should fully cover the most basic use-case. Headset will not work,
+and there is also no support for a "silent mode", but this is enough to
+demonstrate voice calls for the PinePhone.
+---
+diff --git meson.build meson.build
+index 5938cec..7516208 100644
+--- meson.build
++++ meson.build
+@@ -33,11 +33,6 @@ project (
+ ],
+ )
+
+-
+-libmchk_proj = subproject('libmachine-check')
+-libmchk_dep = libmchk_proj.get_variable('libmachine_check_dep')
+-
+-
+ app_name = meson.project_name()
+
+ prefix = get_option('prefix')
+@@ -63,14 +58,3 @@ config_data.set_quoted('DATADIR', full_datadir)
+ config_data.set_quoted('SYSCONFDIR', full_sysconfdir)
+
+ subdir('src')
+-
+-install_subdir (
+- 'machine-conf',
+- install_dir : join_paths(datadir, app_name)
+-)
+-
+-install_subdir (
+- 'machine-check',
+- install_dir : join_paths(datadir, 'machine-check', app_name),
+- strip_directory : true
+-)
+diff --git src/main.c src/main.c
+index 587a5f3..4631a33 100644
+--- src/main.c
++++ src/main.c
+@@ -23,10 +23,8 @@
+ */
+
+ #include "wys-modem.h"
+-#include "wys-audio.h"
+ #include "util.h"
+ #include "config.h"
+-#include "mchk-machine-check.h"
+
+ #include <libmm-glib.h>
+ #include <glib.h>
+@@ -50,8 +48,6 @@ static GMainLoop *main_loop = NULL;
+
+ struct wys_data
+ {
+- /** PulseAudio interface */
+- WysAudio *audio;
+ /** ID for the D-Bus watch */
+ guint watch_id;
+ /** ModemManager object proxy */
+@@ -59,51 +55,112 @@ struct wys_data
+ /** Map of D-Bus object paths to WysModems */
+ GHashTable *modems;
+ /** How many modems have audio, in each direction */
+- guint audio_count[2];
++ guint audio_count;
+ };
+
++static gboolean
++ugly_system (const gchar *cmd)
++{
++ gchar *out = NULL, *err = NULL;
++ gint status;
++ GError *error = NULL;
++ gboolean ok;
++
++ g_debug ("Executing command `%s'", cmd);
++
++ ok = g_spawn_command_line_sync
++ (cmd, &out, &err, &status, &error);
++
++ if (!ok)
++ {
++ g_warning ("Error spawning command `%s': %s'",
++ cmd, error->message);
++ g_error_free (error);
++ return FALSE;
++ }
++
++ ok = g_spawn_check_exit_status (status, &error);
++ if (ok)
++ {
++ g_debug ("Command `%s' executed successfully"
++ "; stdout: `%s'; stderr: `%s'",
++ cmd, out, err);
++ }
++ else
++ {
++ g_warning ("Command `%s' failed: %s"
++ "; stdout: `%s'; stderr: `%s'",
++ cmd, error->message, out, err);
++ g_error_free (error);
++ }
++
++ g_free (out);
++ g_free (err);
++
++ return ok;
++}
++
++#define UGLY_CARD "alsa_card.platform-sound"
++
++static gboolean
++ugly_set_card_profile (const gchar *card,
++ const gchar *profile)
++{
++ g_autofree gchar *cmd = NULL;
++
++ cmd = g_strdup_printf ("pactl set-card-profile '%s' '%s'", card, profile);
++
++ return ugly_system (cmd);
++}
++
++static gboolean
++ugly_set_voice_call (void)
++{
++ return ugly_set_card_profile (UGLY_CARD, "Voice Call");
++}
++
++static gboolean
++ugly_set_hifi (void)
++{
++ return ugly_set_card_profile (UGLY_CARD, "HiFi");
++}
+
+ static void
+ update_audio_count (struct wys_data *data,
+- WysDirection direction,
+ gint delta)
+ {
+- const guint old_count = data->audio_count[direction];
++ const guint old_count = data->audio_count;
+
+- g_assert (delta >= 0 || data->audio_count[direction] > 0);
++ g_assert (delta >= 0 || data->audio_count > 0);
+
+- data->audio_count[direction] += delta;
++ data->audio_count += delta;
+
+- if (data->audio_count[direction] > 0 && old_count == 0)
++ if (data->audio_count > 0 && old_count == 0)
+ {
+- g_debug ("Audio %s now present",
+- wys_direction_get_description (direction));
+- wys_audio_ensure_loopback (data->audio, direction);
++ g_message ("Audio now present");
++ ugly_set_voice_call ();
+ }
+- else if (data->audio_count[direction] == 0 && old_count > 0)
++ else if (data->audio_count == 0 && old_count > 0)
+ {
+- g_debug ("Audio %s now absent",
+- wys_direction_get_description (direction));
+- wys_audio_ensure_no_loopback (data->audio, direction);
++ g_message ("Audio now absent");
++ ugly_set_hifi ();
+ }
+ }
+
+
+ static void
+ audio_present_cb (struct wys_data *data,
+- WysDirection direction,
+ WysModem *modem)
+ {
+- update_audio_count (data, direction, +1);
++ update_audio_count (data, +1);
+ }
+
+
+ static void
+ audio_absent_cb (struct wys_data *data,
+- WysDirection direction,
+ WysModem *modem)
+ {
+- update_audio_count (data, direction, -1);
++ update_audio_count (data, -1);
+ }
+
+
+@@ -123,7 +180,7 @@ add_modem (struct wys_data *data,
+ return;
+ }
+
+- g_debug ("Adding new voice-capable modem `%s'", path);
++ g_message ("Adding new voice-capable modem `%s'", path);
+
+ g_assert (MM_IS_OBJECT (object));
+ voice = mm_object_get_modem_voice (MM_OBJECT (object));
+@@ -153,7 +210,7 @@ interface_added_cb (struct wys_data *data,
+
+ info = g_dbus_interface_get_info (interface);
+
+- g_debug ("ModemManager interface `%s' found on object `%s'",
++ g_message ("ModemManager interface `%s' found on object `%s'",
+ info->name,
+ g_dbus_object_get_object_path (object));
+
+@@ -184,7 +241,7 @@ interface_removed_cb (struct wys_data *data,
+ path = g_dbus_object_get_object_path (object);
+ info = g_dbus_interface_get_info (interface);
+
+- g_debug ("ModemManager interface `%s' removed on object `%s'",
++ g_message ("ModemManager interface `%s' removed on object `%s'",
+ info->name, path);
+
+ if (g_strcmp0 (info->name, MM_DBUS_INTERFACE_MODEM_VOICE) == 0)
+@@ -229,7 +286,7 @@ void
+ object_added_cb (struct wys_data *data,
+ GDBusObject *object)
+ {
+- g_debug ("ModemManager object `%s' added",
++ g_message ("ModemManager object `%s' added",
+ g_dbus_object_get_object_path (object));
+
+ add_mm_object (data, object);
+@@ -243,7 +300,7 @@ object_removed_cb (struct wys_data *data,
+ const gchar *path;
+
+ path = g_dbus_object_get_object_path (object);
+- g_debug ("ModemManager object `%s' removed", path);
++ g_message ("ModemManager object `%s' removed", path);
+
+ remove_modem_object (data, path, object);
+ }
+@@ -286,7 +343,7 @@ mm_appeared_cb (GDBusConnection *connection,
+ const gchar *name_owner,
+ struct wys_data *data)
+ {
+- g_debug ("ModemManager appeared on D-Bus");
++ g_message ("ModemManager appeared on D-Bus");
+
+ mm_manager_new (connection,
+ G_DBUS_OBJECT_MANAGER_CLIENT_FLAGS_NONE,
+@@ -310,18 +367,14 @@ mm_vanished_cb (GDBusConnection *connection,
+ const gchar *name,
+ struct wys_data *data)
+ {
+- g_debug ("ModemManager vanished from D-Bus");
++ g_message ("ModemManager vanished from D-Bus");
+ clear_dbus (data);
+ }
+
+
+ static void
+-set_up (struct wys_data *data,
+- const gchar *codec,
+- const gchar *modem)
++set_up (struct wys_data *data)
+ {
+- data->audio = wys_audio_new (codec, modem);
+-
+ data->modems = g_hash_table_new_full (g_str_hash, g_str_equal,
+ g_free, g_object_unref);
+
+@@ -333,7 +386,7 @@ set_up (struct wys_data *data,
+ (GBusNameVanishedCallback)mm_vanished_cb,
+ data, NULL);
+
+- g_debug ("Watching for ModemManager");
++ g_message ("Watching for ModemManager");
+ }
+
+
+@@ -343,23 +396,19 @@ tear_down (struct wys_data *data)
+ clear_dbus (data);
+ g_bus_unwatch_name (data->watch_id);
+ g_hash_table_unref (data->modems);
+- g_object_unref (G_OBJECT (data->audio));
+ }
+
+
+ static void
+-run (const gchar *codec,
+- const gchar *modem)
++run (void)
+ {
+ struct wys_data data;
+
+ memset (&data, 0, sizeof (struct wys_data));
+- set_up (&data, codec, modem);
++ set_up (&data);
+
+ main_loop = g_main_loop_new (NULL, FALSE);
+
+- printf (APPLICATION_NAME " started with codec `%s', modem `%s'\n",
+- codec, modem);
+ g_main_loop_run (main_loop);
+
+ g_main_loop_unref (main_loop);
+@@ -368,33 +417,6 @@ run (const gchar *codec,
+ tear_down (&data);
+ }
+
+-
+-static void
+-check_machine (const gchar *machine)
+-{
+- gboolean ok, passed;
+- GError *error = NULL;
+-
+- ok = mchk_check_machine (APP_DATA_NAME,
+- machine,
+- &passed,
+- &error);
+- if (!ok)
+- {
+- g_warning ("Error checking machine name against"
+- " whitelist/blacklist, continuing anyway");
+- g_error_free (error);
+- }
+- else if (!passed)
+- {
+- g_message ("Machine name `%s' did not pass"
+- " whitelist/blacklist check, exiting",
+- machine);
+- exit (EXIT_SUCCESS);
+- }
+-}
+-
+-
+ static void
+ terminate (int signal)
+ {
+@@ -452,222 +452,18 @@ setup_signals ()
+ }
+
+
+-/** This function will close @fd */
+-static gchar *
+-read_machine_conf_file (const gchar *filename,
+- int fd)
+-{
+- GInputStream *unix_stream;
+- GDataInputStream *data_stream;
+- gboolean try_again;
+- gchar *line;
+- GError *error = NULL;
+-
+- g_debug ("Reading machine configuration file `%s'", filename);
+-
+- unix_stream = g_unix_input_stream_new (fd, TRUE);
+- g_assert (unix_stream != NULL);
+-
+- data_stream = g_data_input_stream_new (unix_stream);
+- g_assert (data_stream != NULL);
+- g_object_unref (unix_stream);
+-
+- do
+- {
+- try_again = FALSE;
+-
+- line = g_data_input_stream_read_line_utf8
+- (data_stream, NULL, NULL, &error);
+-
+- if (error)
+- {
+- g_warning ("Error reading from machine"
+- " configuration file `%s': %s",
+- filename, error->message);
+- g_error_free (error);
+- }
+- else if (line)
+- {
+- g_strstrip (line);
+-
+- // Skip comments and empty lines
+- if (line[0] == '#' || line[0] == '\0')
+- {
+- g_free (line);
+- try_again = TRUE;
+- }
+- }
+- }
+- while (try_again);
+-
+- g_object_unref (data_stream);
+- return line;
+-}
+-
+-
+-static gchar *
+-dir_machine_conf (const gchar *dir,
+- const gchar *machine,
+- const gchar *key)
+-{
+- gchar *filename;
+- int fd;
+- gchar *value = NULL;
+-
+- filename = g_build_filename (dir, APP_DATA_NAME,
+- "machine-conf",
+- machine, key, NULL);
+-
+- g_debug ("Trying machine configuration file `%s'",
+- filename);
+-
+- fd = g_open (filename, O_RDONLY, 0);
+- if (fd == -1)
+- {
+- if (errno != ENOENT)
+- {
+- // The error isn't that the file doesn't exist
+- g_warning ("Error opening machine"
+- " configuration file `%s': %s",
+- filename, g_strerror (errno));
+- }
+- }
+- else
+- {
+- value = read_machine_conf_file (filename, fd);
+- }
+-
+- g_free (filename);
+- return value;
+-}
+-
+-
+-static gchar *
+-machine_conf (const gchar *machine,
+- const gchar *key)
+-{
+- gchar *value = NULL;
+- const gchar * const *dirs, * const *dir;
+-
+-
+-#define try_dir(d) \
+- value = dir_machine_conf (d, machine, key); \
+- if (value) \
+- { \
+- return value; \
+- }
+-
+-
+- try_dir (g_get_user_config_dir ());
+-
+- dirs = g_get_system_config_dirs ();
+- for (dir = dirs; *dir; ++dir)
+- {
+- try_dir (*dir);
+- }
+-
+- try_dir (SYSCONFDIR);
+- try_dir (DATADIR);
+-
+- dirs = g_get_system_data_dirs ();
+- for (dir = dirs; *dir; ++dir)
+- {
+- try_dir (*dir);
+- }
+-
+-#undef try_dir
+-
+- return NULL;
+-}
+-
+-
+-static void
+-ensure_alsa_card (const gchar *machine,
+- const gchar *var,
+- const gchar *key,
+- gchar **name)
+-{
+- const gchar *env;
+-
+- if (*name)
+- {
+- return;
+- }
+-
+- env = g_getenv (var);
+- if (env)
+- {
+- *name = g_strdup (env);
+- return;
+- }
+-
+- if (machine)
+- {
+- *name = machine_conf (machine, key);
+- if (*name)
+- {
+- return;
+- }
+- }
+-
+- g_warning ("No %s specified with a machine configuration file"
+- ", environment variable or command line option"
+- "; refusing to run", key);
+- exit (EXIT_SUCCESS);
+-}
+-
+-
+ int
+ main (int argc, char **argv)
+ {
+ GError *error = NULL;
+ GOptionContext *context;
+ gboolean ok;
+- g_autofree gchar *codec = NULL;
+- g_autofree gchar *modem = NULL;
+- g_autofree gchar *machine = NULL;
+-
+- GOptionEntry options[] =
+- {
+- { "codec", 'c', 0, G_OPTION_ARG_STRING, &codec, "Name of the codec's ALSA card", "NAME" },
+- { "modem", 'm', 0, G_OPTION_ARG_STRING, &modem, "Name of the modem's ALSA card", "NAME" },
+- { NULL }
+- };
+
+ setlocale(LC_ALL, "");
+
+- machine = mchk_read_machine (NULL);
+- if (machine)
+- {
+- check_machine (machine);
+- }
+- else
+- {
+- g_warning ("Could not read machine name, continuing without machine check");
+- }
+-
+-
+- context = g_option_context_new ("- set up PulseAudio loopback for phone call audio");
+- g_option_context_add_main_entries (context, options, NULL);
+- ok = g_option_context_parse (context, &argc, &argv, &error);
+- if (!ok)
+- {
+- g_print ("Error parsing options: %s\n", error->message);
+- }
+-
+-
+- if (machine)
+- {
+- /* Convert any directory separator characters to "_" */
+- g_strdelimit (machine, G_DIR_SEPARATOR_S, '_');
+- }
+-
+- ensure_alsa_card (machine, "WYS_CODEC", "codec", &codec);
+- ensure_alsa_card (machine, "WYS_MODEM", "modem", &modem);
+-
+ setup_signals ();
+
+- run (codec, modem);
++ run ();
+
+ return 0;
+ }
+diff --git src/meson.build src/meson.build
+index 7b99235..a8a30d7 100644
+--- src/meson.build
++++ src/meson.build
+@@ -22,13 +22,10 @@
+ gnome = import('gnome')
+
+ wys_deps = [
+- libmchk_dep,
+ dependency('gobject-2.0'),
+ dependency('gio-unix-2.0'),
+ dependency('ModemManager'),
+ dependency('mm-glib'),
+- dependency('libpulse'),
+- dependency('libpulse-mainloop-glib'),
+ ]
+
+ config_h = configure_file (
+@@ -36,20 +33,13 @@ config_h = configure_file (
+ configuration: config_data
+ )
+
+-wys_enum_headers = files(['wys-direction.h'])
+-wys_enum_sources = gnome.mkenums_simple('enum-types',
+- sources : wys_enum_headers)
+-
+ executable (
+ 'wys',
+ config_h,
+- wys_enum_sources,
+ [
+ 'main.c',
+ 'util.h', 'util.c',
+- 'wys-direction.h', 'wys-direction.c',
+ 'wys-modem.h', 'wys-modem.c',
+- 'wys-audio.h', 'wys-audio.c',
+ ],
+ dependencies : wys_deps,
+ include_directories : include_directories('..'),
+diff --git src/wys-modem.c src/wys-modem.c
+index 212f992..51a0575 100644
+--- src/wys-modem.c
++++ src/wys-modem.c
+@@ -24,18 +24,10 @@
+
+
+ #include "wys-modem.h"
+-#include "wys-direction.h"
+ #include "util.h"
+-#include "enum-types.h"
+
+ #include <glib/gi18n.h>
+
+-static const gchar * const WYS_MODEM_HAS_AUDIO[] =
+- {
+- [WYS_DIRECTION_FROM_NETWORK] = "wys-has-audio-from-network",
+- [WYS_DIRECTION_TO_NETWORK] = "wys-has-audio-to-network"
+- };
+-
+ struct _WysModem
+ {
+ GObject parent_instance;
+@@ -43,8 +35,8 @@ struct _WysModem
+ MMModemVoice *voice;
+ /** Map of D-Bus object paths to MMCall objects */
+ GHashTable *calls;
+- /** How many calls have audio, in each direction */
+- guint audio_count[2];
++ /** How many calls have audio */
++ guint audio_count;
+ };
+
+ G_DEFINE_TYPE(WysModem, wys_modem, G_TYPE_OBJECT)
+@@ -65,15 +57,11 @@ static guint signals [SIGNAL_LAST_SIGNAL];
+
+
+ static gboolean
+-call_state_has_audio (WysDirection direction,
+- MMCallState state)
++call_state_has_audio (MMCallState state)
+ {
+ switch (state)
+ {
+ case MM_CALL_STATE_RINGING_OUT:
+- return
+- (direction == WYS_DIRECTION_FROM_NETWORK)
+- ? TRUE : FALSE;
+ case MM_CALL_STATE_ACTIVE:
+ return TRUE;
+ default:
+@@ -84,39 +72,35 @@ call_state_has_audio (WysDirection direction,
+
+ static void
+ update_audio_count (WysModem *self,
+- WysDirection direction,
+ gint delta)
+ {
+- const guint old_count = self->audio_count[direction];
++ const guint old_count = self->audio_count;
+
+- g_assert (delta >= 0 || self->audio_count[direction] > 0);
++ g_assert (delta >= 0 || self->audio_count > 0);
+
+- self->audio_count[direction] += delta;
++ self->audio_count += delta;
+
+- if (self->audio_count[direction] > 0 && old_count == 0)
++ if (self->audio_count > 0 && old_count == 0)
+ {
+- g_debug ("Modem `%s' audio %s now present",
+- mm_modem_voice_get_path (self->voice),
+- wys_direction_get_description (direction));
+- g_signal_emit_by_name (self, "audio-present", direction);
++ g_message ("Modem `%s' audio now present",
++ mm_modem_voice_get_path (self->voice));
++ g_signal_emit_by_name (self, "audio-present");
+ }
+- else if (self->audio_count[direction] == 0 && old_count > 0)
++ else if (self->audio_count == 0 && old_count > 0)
+ {
+- g_debug ("Modem `%s' audio now absent",
+- mm_modem_voice_get_path (self->voice));
+- g_signal_emit_by_name (self, "audio-absent", direction);
++ g_message ("Modem `%s' audio now absent",
++ mm_modem_voice_get_path (self->voice));
++ g_signal_emit_by_name (self, "audio-absent");
+ }
+ }
+
+
+ static gboolean
+-get_call_has_audio (MMCall *mm_call,
+- WysDirection direction)
++get_call_has_audio (MMCall *mm_call)
+ {
+ gpointer data;
+
+- data = g_object_get_data (G_OBJECT (mm_call),
+- WYS_MODEM_HAS_AUDIO[direction]);
++ data = g_object_get_data (G_OBJECT (mm_call), "audio-state");
+
+ return (gboolean)(GPOINTER_TO_UINT (data));
+ }
+@@ -124,42 +108,38 @@ get_call_has_audio (MMCall *mm_call,
+
+ static void
+ set_call_has_audio (MMCall *mm_call,
+- WysDirection direction,
+ gboolean has_audio)
+ {
+ g_object_set_data (G_OBJECT (mm_call),
+- WYS_MODEM_HAS_AUDIO[direction],
++ "audio-state",
+ GUINT_TO_POINTER ((guint)has_audio));
+ }
+
+
+ static void
+-update_direction_state (WysModem *self,
+- MMCall *mm_call,
+- const gchar *path,
+- WysDirection direction,
+- MMCallState old_state,
+- MMCallState new_state)
++update_call_state (WysModem *self,
++ MMCall *mm_call,
++ const gchar *path,
++ MMCallState old_state,
++ MMCallState new_state)
+ {
+- gboolean had_audio = call_state_has_audio (direction, old_state);
+- gboolean have_audio = call_state_has_audio (direction, new_state);
++ gboolean had_audio = call_state_has_audio (old_state);
++ gboolean have_audio = call_state_has_audio (new_state);
+
+ if (!had_audio && have_audio)
+ {
+- g_debug ("Call `%s' gained audio %s", path,
+- wys_direction_get_description (direction));
+- update_audio_count (self, direction, +1);
++ g_message ("Call `%s' gained audio", path);
++ update_audio_count (self, +1);
+ }
+ else if (had_audio && !have_audio)
+ {
+- g_debug ("Call `%s' lost audio %s", path,
+- wys_direction_get_description (direction));
+- update_audio_count (self, direction, -1);
++ g_message ("Call `%s' lost audio", path);
++ update_audio_count (self, -1);
+ }
+
+ if (had_audio != have_audio)
+ {
+- set_call_has_audio (mm_call, direction, have_audio);
++ set_call_has_audio (mm_call, have_audio);
+ }
+ }
+
+@@ -174,34 +154,28 @@ call_state_changed_cb (MmGdbusCall *mm_gdbus_call,
+ MMCall *mm_call = MM_CALL (mm_gdbus_call);
+ const gchar * path = mm_call_get_path (mm_call);
+
+- g_debug ("Call `%s' state changed, new: %i, old: %i",
++ g_message ("Call `%s' state changed, new: %i, old: %i",
+ path, (int)new_state, (int)old_state);
+
+ // FIXME: deal with calls being put on hold (one call goes
+ // non-audio, another call goes audio after)
+
+- update_direction_state (self, mm_call, path,
+- WYS_DIRECTION_FROM_NETWORK,
+- old_state, new_state);
+- update_direction_state (self, mm_call, path,
+- WYS_DIRECTION_TO_NETWORK,
+- old_state, new_state);
++ update_call_state (self, mm_call, path, old_state, new_state);
+ }
+
+
+ static void
+-init_call_direction (WysModem *self,
+- MMCall *mm_call,
+- MMCallState state,
+- WysDirection direction)
++init_call_audio (WysModem *self,
++ MMCall *mm_call,
++ MMCallState state)
+ {
+- gboolean has_audio = call_state_has_audio (direction, state);
++ gboolean has_audio = call_state_has_audio (state);
+
+- set_call_has_audio (mm_call, direction, has_audio);
++ set_call_has_audio (mm_call, has_audio);
+
+ if (has_audio)
+ {
+- update_audio_count (self, direction, +1);
++ update_audio_count (self, +1);
+ }
+ }
+
+@@ -223,12 +197,9 @@ add_call (WysModem *self,
+ self);
+
+ state = mm_call_get_state (mm_call);
+- init_call_direction (self, mm_call, state,
+- WYS_DIRECTION_FROM_NETWORK);
+- init_call_direction (self, mm_call, state,
+- WYS_DIRECTION_TO_NETWORK);
++ init_call_audio (self, mm_call, state);
+
+- g_debug ("Call `%s' added, state: %i", path, (int)state);
++ g_message ("Call `%s' added, state: %i", path, (int)state);
+ }
+
+
+@@ -322,16 +293,14 @@ call_added_cb (MMModemVoice *voice,
+
+
+ static void
+-clear_call_direction (WysModem *self,
+- MMCall *mm_call,
+- WysDirection direction)
++clear_call_state (WysModem *self,
++ MMCall *mm_call)
+ {
+- gboolean has_audio =
+- get_call_has_audio (mm_call, direction);
++ gboolean has_audio = get_call_has_audio (mm_call);
+
+ if (has_audio)
+ {
+- update_audio_count (self, direction, -1);
++ update_audio_count (self, -1);
+ }
+ }
+
+@@ -343,7 +312,7 @@ call_deleted_cb (MMModemVoice *voice,
+ {
+ MMCall *mm_call;
+
+- g_debug ("Removing call `%s'", path);
++ g_message ("Removing call `%s'", path);
+
+ mm_call = g_hash_table_lookup (self->calls, path);
+ if (!mm_call)
+@@ -352,14 +321,11 @@ call_deleted_cb (MMModemVoice *voice,
+ return;
+ }
+
+- clear_call_direction (self, mm_call,
+- WYS_DIRECTION_FROM_NETWORK);
+- clear_call_direction (self, mm_call,
+- WYS_DIRECTION_TO_NETWORK);
++ clear_call_state (self, mm_call);
+
+ g_hash_table_remove (self->calls, path);
+
+- g_debug ("Call `%s' removed", path);
++ g_message ("Call `%s' removed", path);
+ }
+
+
+@@ -444,11 +410,9 @@ dispose (GObject *object)
+ if (g_hash_table_size (self->calls) > 0)
+ {
+ g_hash_table_remove_all (self->calls);
+- if (self->audio_count[WYS_DIRECTION_FROM_NETWORK] > 0 ||
+- self->audio_count[WYS_DIRECTION_TO_NETWORK] > 0)
++ if (self->audio_count > 0)
+ {
+- self->audio_count[WYS_DIRECTION_FROM_NETWORK] =
+- self->audio_count[WYS_DIRECTION_TO_NETWORK] = 0;
++ self->audio_count = 0;
+ g_signal_emit_by_name (self, "audio-absent");
+ }
+ }
+@@ -504,8 +468,7 @@ wys_modem_class_init (WysModemClass *klass)
+ G_SIGNAL_RUN_LAST,
+ 0, NULL, NULL, NULL,
+ G_TYPE_NONE,
+- 1,
+- WYS_TYPE_DIRECTION);
++ 0);
+
+ /**
+ * WysModem::audio-absent:
+@@ -520,8 +483,7 @@ wys_modem_class_init (WysModemClass *klass)
+ G_SIGNAL_RUN_LAST,
+ 0, NULL, NULL, NULL,
+ G_TYPE_NONE,
+- 1,
+- WYS_TYPE_DIRECTION);
++ 0);
+ }
+
+
diff --git a/srcpkgs/pinephone-wys/template b/srcpkgs/pinephone-wys/template
new file mode 100644
index 00000000000..ab3eaad64ac
--- /dev/null
+++ b/srcpkgs/pinephone-wys/template
@@ -0,0 +1,19 @@
+# Template file for 'pinephone-wys'
+pkgname=pinephone-wys
+_pkgname=wys
+version=0.1.8
+revision=1
+wrksrc=${_pkgname}-v${version}
+build_style=meson
+hostmakedepends="pkg-config"
+makedepends="glib-devel pulseaudio-devel ModemManager-devel"
+short_desc="Daemon to bring up and take down PulseAudio for phone call audio"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/wys"
+distfiles="${homepage}/-/archive/v${version}/${_pkgname}-v${version}.tar.gz"
+checksum=07fd6d2ae9ea5d6187e1c99d5b0e5c1d9c74ba00f4869f4aae195cd8714ba375
+
+post_install() {
+ vinstall ${FILESDIR}/wys.desktop 644 etc/xdg/autostart
+}
^ permalink raw reply [flat|nested] 47+ messages in thread* Re: [PR PATCH] [Updated] New packages: phoc-0.4.2 calls-0.1.7 purism-chatty-0.1.15
2020-08-29 20:46 [PR PATCH] New packages: phoc-0.4.2 calls-0.1.7 purism-chatty--0.1.15 julio641742
` (30 preceding siblings ...)
2020-09-19 8:24 ` [PR PATCH] [Updated] " julio641742
@ 2020-09-20 2:14 ` julio641742
2020-09-20 4:57 ` julio641742
` (13 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: julio641742 @ 2020-09-20 2:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 386 bytes --]
There is an updated pull request by julio641742 against master on the void-packages repository
https://github.com/julio641742/void-packages phosh
https://github.com/void-linux/void-packages/pull/24538
New packages: phoc-0.4.2 calls-0.1.7 purism-chatty-0.1.15
Getting ready for my pinephone :)
A patch file from https://github.com/void-linux/void-packages/pull/24538.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-phosh-24538.patch --]
[-- Type: text/x-diff, Size: 52446 bytes --]
From 28489f6a0a20a19fa413cec400f14f9f7539c6f5 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Sat, 29 Aug 2020 11:47:35 -0700
Subject: [PATCH 01/12] New package: feedbackd-0.0.0+git20200707
---
common/shlibs | 1 +
srcpkgs/feedbackd/template | 37 +++++++++++++++++++++++++++++++++++++
srcpkgs/libfeedback | 1 +
srcpkgs/libfeedback-devel | 1 +
4 files changed, 40 insertions(+)
create mode 100644 srcpkgs/feedbackd/template
create mode 120000 srcpkgs/libfeedback
create mode 120000 srcpkgs/libfeedback-devel
diff --git a/common/shlibs b/common/shlibs
index ccfd187bfe0..5167847ffd9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3991,3 +3991,4 @@ libneatvnc.so.0 neatvnc-0.2.0_1
libtdjson.so.1.6.0 libtd-1.6.0_1
libJudy.so.1 judy-1.0.5_1
libsignal-protocol-c.so.2 libsignal-protocol-c-2.3.3_2
+libfeedback-0.0.so.0 libfeedback-0.0.0+git20200707_1
diff --git a/srcpkgs/feedbackd/template b/srcpkgs/feedbackd/template
new file mode 100644
index 00000000000..0131775cc9d
--- /dev/null
+++ b/srcpkgs/feedbackd/template
@@ -0,0 +1,37 @@
+# Template file for 'feedbackd'
+pkgname=feedbackd
+version=0.0.0+git20200707
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=meson
+build_helper=gir
+hostmakedepends="vala glib-devel pkg-config"
+makedepends="gsound-devel libgudev-devel json-glib-devel"
+depends="dbus"
+short_desc="Daemon to provide haptic feedback on events"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/feedbackd"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=37cf48cbdbaee8e2d0bea406f5b6317bf0e3cdf79250f9ce0a884e7d3905a8ea
+
+post_install() {
+ vinstall debian/feedbackd.udev 0644 usr/lib/udev/rules.d 90-feedbackd.rules
+}
+
+libfeedback_package() {
+ short_desc+=" - shared libraries"
+ pkg_install() {
+ vmove "usr/lib/*.so.*"
+ }
+}
+
+libfeedback-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ }
+}
diff --git a/srcpkgs/libfeedback b/srcpkgs/libfeedback
new file mode 120000
index 00000000000..49dc965f1cd
--- /dev/null
+++ b/srcpkgs/libfeedback
@@ -0,0 +1 @@
+feedbackd
\ No newline at end of file
diff --git a/srcpkgs/libfeedback-devel b/srcpkgs/libfeedback-devel
new file mode 120000
index 00000000000..49dc965f1cd
--- /dev/null
+++ b/srcpkgs/libfeedback-devel
@@ -0,0 +1 @@
+feedbackd
\ No newline at end of file
From 2329d04dd333e7ebfef7ec52486d343766ce4db2 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Sat, 29 Aug 2020 11:47:56 -0700
Subject: [PATCH 02/12] New package: phoc-0.4.2
---
srcpkgs/phoc/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/phoc/template
diff --git a/srcpkgs/phoc/template b/srcpkgs/phoc/template
new file mode 100644
index 00000000000..00c9f1f3ab0
--- /dev/null
+++ b/srcpkgs/phoc/template
@@ -0,0 +1,16 @@
+# Template file for 'phoc'
+pkgname=phoc
+version=0.4.2
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=meson
+configure_args="-Dembed-wlroots=disabled"
+hostmakedepends="glib-devel pkg-config wayland-devel"
+makedepends="gnome-desktop-devel wlroots-devel"
+depends="mutter"
+short_desc="Wlroots based Phone compositor for the Phosh shell"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/phoc"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=bdb34644c7d49c953239c1e939bc5ee2bc26f6187b9d756b70b113d2734c712c
From 8a7a7724396c527152aaabbf68e77b08cf0b9265 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Sat, 29 Aug 2020 11:48:48 -0700
Subject: [PATCH 03/12] New package: squeekboard-1.9.3
---
srcpkgs/squeekboard/template | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
create mode 100644 srcpkgs/squeekboard/template
diff --git a/srcpkgs/squeekboard/template b/srcpkgs/squeekboard/template
new file mode 100644
index 00000000000..87a671e62da
--- /dev/null
+++ b/srcpkgs/squeekboard/template
@@ -0,0 +1,26 @@
+# Template file for 'squeekboard'
+pkgname=squeekboard
+version=1.9.3
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=meson
+build_helper=rust
+hostmakedepends="glib-devel gettext pkg-config cargo wayland-devel"
+makedepends="rust gtk+3-devel gnome-desktop-devel libfeedback-devel"
+depends="feedbackd"
+short_desc="Final Librem5 keyboard"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/squeekboard"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=b99e56faace3986bf752e08c104cea60ed896d514284840655033dd9457db824
+
+pre_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ vsed -i cargo_build.sh -e "s/-a ./-a ${XBPS_CROSS_RUST_TARGET}/g"
+ fi
+}
+
+post_install() {
+ chmod +x ${DESTDIR}/usr/bin/squeekboard-entry
+}
From e5d0e381a73245b3eb76dee2d5f09ac1ca7d474c Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Sat, 29 Aug 2020 11:48:59 -0700
Subject: [PATCH 04/12] New package: phosh-0.4.3
---
srcpkgs/phosh/files/phosh.desktop | 11 ++++++++
srcpkgs/phosh/files/sm.puri.OSK0.desktop | 12 +++++++++
srcpkgs/phosh/patches/32bit-build-fix.patch | 30 +++++++++++++++++++++
srcpkgs/phosh/template | 22 +++++++++++++++
4 files changed, 75 insertions(+)
create mode 100644 srcpkgs/phosh/files/phosh.desktop
create mode 100644 srcpkgs/phosh/files/sm.puri.OSK0.desktop
create mode 100644 srcpkgs/phosh/patches/32bit-build-fix.patch
create mode 100644 srcpkgs/phosh/template
diff --git a/srcpkgs/phosh/files/phosh.desktop b/srcpkgs/phosh/files/phosh.desktop
new file mode 100644
index 00000000000..84452845115
--- /dev/null
+++ b/srcpkgs/phosh/files/phosh.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=Phosh
+Name[en]=Phosh
+Comment=This session logs you into Phosh
+Comment[en]=This session logs in you into Phosh
+Exec=dbus-run-session /usr/bin/phosh
+TryExec=/usr/bin/phosh
+Icon=
+Type=Application
+X-DesktopNames=Phosh
+Keywords=launch;Phosh;desktop;session;
diff --git a/srcpkgs/phosh/files/sm.puri.OSK0.desktop b/srcpkgs/phosh/files/sm.puri.OSK0.desktop
new file mode 100644
index 00000000000..39740f15773
--- /dev/null
+++ b/srcpkgs/phosh/files/sm.puri.OSK0.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Type=Application
+Name=On-screen keyboard
+Comment=Default on-screen keyboard
+Exec=/usr/bin/squeekboard
+Categories=GNOME;Core;
+OnlyShowIn=GNOME;
+NoDisplay=true
+X-GNOME-Autostart-Phase=Panel
+X-GNOME-Provides=inputmethod
+X-GNOME-Autostart-Notify=true
+X-GNOME-AutoRestart=true
diff --git a/srcpkgs/phosh/patches/32bit-build-fix.patch b/srcpkgs/phosh/patches/32bit-build-fix.patch
new file mode 100644
index 00000000000..a98ecb0faa5
--- /dev/null
+++ b/srcpkgs/phosh/patches/32bit-build-fix.patch
@@ -0,0 +1,30 @@
+From d1da5ea7d18c6794c9a7d2f41355fe90d4115ac1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
+Date: Tue, 4 Aug 2020 08:22:39 +0200
+Subject: [PATCH] timestamp-label: Unbreak build on 32 bit platforms
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Use a G_ format specifier for GTimeSpan.
+
+Signed-off-by: Guido Günther <guido.gunther@puri.sm>
+---
+ src/notifications/timestamp-label.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/notifications/timestamp-label.c b/src/notifications/timestamp-label.c
+index 0aa04ce0..a5a4d5e7 100644
+--- src/notifications/timestamp-label.c
++++ src/notifications/timestamp-label.c
+@@ -255,7 +255,7 @@ phosh_timestamp_label_calc_timeout (PhoshTimestampLabel *self)
+ break;
+ }
+ timeout_diff = g_date_time_difference (timeout_time, time_now);
+- g_debug ("time out duration = %ld", timeout_diff);
++ g_debug ("time out duration: %" G_GINT64_FORMAT, timeout_diff);
+ return timeout_diff;
+ }
+
+--
+2.26.2
diff --git a/srcpkgs/phosh/template b/srcpkgs/phosh/template
new file mode 100644
index 00000000000..46199202466
--- /dev/null
+++ b/srcpkgs/phosh/template
@@ -0,0 +1,22 @@
+# Template file for 'phosh'
+pkgname=phosh
+version=0.4.3
+revision=1
+build_style=meson
+hostmakedepends="phoc glib-devel gettext pkg-config wayland-devel"
+makedepends="libfeedback-devel gcr-devel gnome-desktop-devel pam-devel
+ polkit-devel pulseaudio-devel libsecret-devel libhandy-devel
+ NetworkManager-devel upower-devel"
+depends="phoc squeekboard gnome-session gnome-settings-daemon elogind
+ xorg-server-xwayland cantarell-fonts font-adobe-source-code-pro"
+short_desc="Shell PoC for the Librem5"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/phosh"
+distfiles="https://repo.pureos.net/pureos/pool/main/p/phosh/phosh_$version.tar.xz"
+checksum=c6fc68aafaf78412637b0f509aafbbca877bda3fe19511bf340b824d7cdbd4ee
+
+post_install() {
+ vcopy ${FILESDIR}/sm.puri.OSK0.desktop usr/share/applications
+ vcopy ${FILESDIR}/phosh.desktop usr/share/wayland-sessions
+}
From 057a50321c164e17a2616b14f725c61d63e944f9 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 29 Aug 2020 18:35:47 -0700
Subject: [PATCH 05/12] New package: calls-0.1.8
---
srcpkgs/calls/template | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
create mode 100644 srcpkgs/calls/template
diff --git a/srcpkgs/calls/template b/srcpkgs/calls/template
new file mode 100644
index 00000000000..c17a8570f18
--- /dev/null
+++ b/srcpkgs/calls/template
@@ -0,0 +1,17 @@
+# Template file for 'calls'
+pkgname=calls
+version=0.1.8
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=meson
+hostmakedepends="glib-devel gettext vala pkg-config wayland-devel
+ evolution-data-server-devel"
+makedepends="folks-devel libhandy-devel libpeas-devel gom-devel
+ ModemManager-devel libfeedback-devel"
+depends="NetworkManager ModemManager"
+short_desc="Phone call application"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/calls"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=58fd2c438fadec812a73181fd6b1a79478814bb10bf8153f3b79a4c6271078a9
From 538968e4ca975b83c15e8ddd8da26c091f9df066 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 29 Aug 2020 18:36:35 -0700
Subject: [PATCH 06/12] New package: purism-chatty-0.1.15
---
srcpkgs/purism-chatty/template | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
create mode 100644 srcpkgs/purism-chatty/template
diff --git a/srcpkgs/purism-chatty/template b/srcpkgs/purism-chatty/template
new file mode 100644
index 00000000000..d11bfcea882
--- /dev/null
+++ b/srcpkgs/purism-chatty/template
@@ -0,0 +1,22 @@
+# Template file for 'purism-chatty'
+pkgname=purism-chatty
+_pkgname=chatty
+version=0.1.15
+revision=1
+wrksrc=${_pkgname}-v${version}
+build_style=meson
+hostmakedepends="glib-devel pkg-config gettext"
+makedepends="libfeedback-devel libhandy-devel evolution-data-server-devel
+ libpurple libpurple-devel"
+short_desc="XMPP and SMS messaging via libpurple and Modemmanager"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/chatty"
+distfiles="${homepage}/-/archive/v${version}/${_pkgname}-v${version}.tar.gz"
+checksum=9be2b79a266a7fa1e3d3e7ba447ff89d2b9e44312d6e55f2a63d191369528d64
+
+pre_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ vsed -i src/meson.build -e "s/purple_plugdir =.*/purple_plugdir = \'\/usr\/${XBPS_CROSS_TRIPLET}\/usr\/lib\/purple-2\'/g"
+ fi
+}
From ef314b6160f15cd19e859627e0eebee0cb5e3a35 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 12 Sep 2020 15:05:36 -0700
Subject: [PATCH 07/12] New package: kgx-0.2.1
---
srcpkgs/kgx/template | 14 ++++++++++++++
1 file changed, 14 insertions(+)
create mode 100644 srcpkgs/kgx/template
diff --git a/srcpkgs/kgx/template b/srcpkgs/kgx/template
new file mode 100644
index 00000000000..98ec4caf70e
--- /dev/null
+++ b/srcpkgs/kgx/template
@@ -0,0 +1,14 @@
+# Template file for 'kgx'
+pkgname=kgx
+version=0.2.1
+revision=1
+build_style=meson
+hostmakedepends="glib-devel pkg-config gettext"
+makedepends="vte3-devel gtk+3-devel libhandy-devel libgtop-devel"
+depends="dbus desktop-file-utils gsettings-desktop-schemas"
+short_desc="Minimal terminal for GNOME"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://gitlab.gnome.org/ZanderBrown/kgx"
+distfiles="${homepage}/-/archive/${version}/kgx-${version}.tar.gz"
+checksum=70a814b0baf70049d5a20791d58a32e92661428d2deeeb56d91b81cc4dc5e81a
From 0746c009e5d2c94a00635dbcffda3dfec58ebc29 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 12 Sep 2020 10:58:50 -0700
Subject: [PATCH 08/12] New package: mobile-config-firefox-1.0.1
---
.../files/distro_links.html | 5 +++++
srcpkgs/mobile-config-firefox/template | 16 ++++++++++++++++
2 files changed, 21 insertions(+)
create mode 100644 srcpkgs/mobile-config-firefox/files/distro_links.html
create mode 100644 srcpkgs/mobile-config-firefox/template
diff --git a/srcpkgs/mobile-config-firefox/files/distro_links.html b/srcpkgs/mobile-config-firefox/files/distro_links.html
new file mode 100644
index 00000000000..ca89d0ecd08
--- /dev/null
+++ b/srcpkgs/mobile-config-firefox/files/distro_links.html
@@ -0,0 +1,5 @@
+<p class="distro-links">
+ <a href="https://voidlinux.org/">homepage</a> -
+ <a href="https://docs.voidlinux.org/">docs</a>
+ <a href="https://github.com/void-linux">repos</a>
+</p>
diff --git a/srcpkgs/mobile-config-firefox/template b/srcpkgs/mobile-config-firefox/template
new file mode 100644
index 00000000000..8a1530115e8
--- /dev/null
+++ b/srcpkgs/mobile-config-firefox/template
@@ -0,0 +1,16 @@
+# Template file for 'mobile-config-firefox'
+pkgname=mobile-config-firefox
+version=1.0.1
+revision=1
+build_style=gnu-makefile
+make_install_args="DISTRO=VoidLinux"
+short_desc="Firefox tweaks for mobile and privacy"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://gitlab.com/postmarketOS/mobile-config-firefox"
+distfiles="${homepage}/-/archive/${version}/${pkgname}-${version}.tar.gz"
+checksum=7dce837995956f6f224041853e005eecb3368cd3cbfec6fe3e8a3153747dd0a7
+
+post_extract() {
+ cp ${FILESDIR}/distro_links.html src/homepage
+}
From db90aa66f1cad5c3a3a864bbd9a95d71def52a02 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 12 Sep 2020 14:42:26 -0700
Subject: [PATCH 09/12] New package: phosh-desktop-0.1
---
.../phosh-desktop/files/000-gschema.override | 20 +++++++++
srcpkgs/phosh-desktop/files/01-phoc-scaling | 5 +++
srcpkgs/phosh-desktop/template | 45 +++++++++++++++++++
3 files changed, 70 insertions(+)
create mode 100644 srcpkgs/phosh-desktop/files/000-gschema.override
create mode 100644 srcpkgs/phosh-desktop/files/01-phoc-scaling
create mode 100644 srcpkgs/phosh-desktop/template
diff --git a/srcpkgs/phosh-desktop/files/000-gschema.override b/srcpkgs/phosh-desktop/files/000-gschema.override
new file mode 100644
index 00000000000..79ec5f6cf6c
--- /dev/null
+++ b/srcpkgs/phosh-desktop/files/000-gschema.override
@@ -0,0 +1,20 @@
+[org.gnome.desktop.background]
+picture-uri='file:///usr/share/backgrounds/gnome/LightWaves.jpg'
+
+[org.gnome.desktop.interface]
+clock-show-weekday=false
+clock-show-date=false
+
+[org.gnome.desktop.wm.preferences]
+button-layout='appmenu:'
+
+[org.gnome.Epiphany]
+search-engines=[('Search the Web', 'https://duckduckgo.com/?q=%s&t=epiphany', ''), ('DuckDuckGo', 'https://duckduckgo.com/?q=%s&t=epiphany', '!ddg'), ('Qwant', 'https://www.qwant.com/?q=%s', '!q')]
+
+[org.gnome.Epiphany.web]
+user-agent='Mozilla/5.0 (Linux; Android 10; Pixel) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.96 Mobile Safari/537.36'
+
+
+[org.gnome.settings-daemon.plugins.power]
+sleep-inactive-ac-type='nothing'
+ambient-enabled=false
diff --git a/srcpkgs/phosh-desktop/files/01-phoc-scaling b/srcpkgs/phosh-desktop/files/01-phoc-scaling
new file mode 100644
index 00000000000..880af2439d3
--- /dev/null
+++ b/srcpkgs/phosh-desktop/files/01-phoc-scaling
@@ -0,0 +1,5 @@
+[sm/puri/phoc/application/firefox]
+scale-to-fit=false
+
+[sm/puri/phoc/application/org-gnome-maps]
+scale-to-fit=true
diff --git a/srcpkgs/phosh-desktop/template b/srcpkgs/phosh-desktop/template
new file mode 100644
index 00000000000..d3b46fab869
--- /dev/null
+++ b/srcpkgs/phosh-desktop/template
@@ -0,0 +1,45 @@
+# Template file for 'phosh-desktop'
+pkgname=phosh-desktop
+version=0.1
+revision=1
+build_style=meta
+depends="
+ phosh
+ kgx
+ calls
+ megapixels
+ purism-chatty
+ iio-sensor-proxy
+ xdg-user-dirs
+ xdg-desktop-portal-gtk
+ gnome-backgrounds
+ gnome-color-manager
+ gnome-control-center
+ gnome-desktop
+ gnome-keyring
+ gnome-online-accounts
+ gnome-online-miners
+ gnome-calculator
+ gnome-calendar
+ gnome-clocks
+ gnome-contacts
+ gnome-maps
+ gnome-music
+ gnome-system-monitor
+ gedit
+ eog
+ evince
+ epiphany
+ evolution
+ gsettings-desktop-schemas
+ nautilus"
+
+short_desc="Phosh desktop environment metapackage"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://voidlinux.org"
+
+post_install() {
+ vinstall ${FILESDIR}/000-gschema.override 644 usr/share/glib-2.0/schemas 000-void.gschema.override
+ vinstall ${FILESDIR}/01-phoc-scaling 644 etc/dconf/db/void.d
+}
From 63cd8103939eaf14d751c8ca16a1aa9b0842940f Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 12 Sep 2020 22:17:58 -0700
Subject: [PATCH 10/12] New package: atinout-0.9.1
---
...-happy-by-adding-fallthrough-comment.patch | 25 ++++++
...02-do-not-rely-on-CR-in-modem-output.patch | 84 +++++++++++++++++++
srcpkgs/atinout/patches/0003-version.patch | 11 +++
srcpkgs/atinout/template | 11 +++
4 files changed, 131 insertions(+)
create mode 100644 srcpkgs/atinout/patches/0001-make-gcc-happy-by-adding-fallthrough-comment.patch
create mode 100644 srcpkgs/atinout/patches/0002-do-not-rely-on-CR-in-modem-output.patch
create mode 100644 srcpkgs/atinout/patches/0003-version.patch
create mode 100644 srcpkgs/atinout/template
diff --git a/srcpkgs/atinout/patches/0001-make-gcc-happy-by-adding-fallthrough-comment.patch b/srcpkgs/atinout/patches/0001-make-gcc-happy-by-adding-fallthrough-comment.patch
new file mode 100644
index 00000000000..c0ebbb6561d
--- /dev/null
+++ b/srcpkgs/atinout/patches/0001-make-gcc-happy-by-adding-fallthrough-comment.patch
@@ -0,0 +1,25 @@
+From ca2e04f8b069d269172f0d55d3716a809537f696 Mon Sep 17 00:00:00 2001
+From: Beralt Meppelink <b.meppelink@riwo.eu>
+Date: Fri, 27 Oct 2017 09:12:18 +0200
+Subject: [PATCH 1/2] make gcc happy by adding fallthrough comment
+
+---
+ atinout.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/atinout.c b/atinout.c
+index d04f300..924b5bc 100644
+--- atinout.c
++++ atinout.c
+@@ -150,7 +150,7 @@ static bool is_final_result(const char * const response)
+ if (strcmp(&response[1], "K\r\n") == 0) {
+ return true;
+ }
+- /* no break */
++ // fallthrough
+ default:
+ return false;
+ }
+--
+2.23.0
+
diff --git a/srcpkgs/atinout/patches/0002-do-not-rely-on-CR-in-modem-output.patch b/srcpkgs/atinout/patches/0002-do-not-rely-on-CR-in-modem-output.patch
new file mode 100644
index 00000000000..f9671d089c3
--- /dev/null
+++ b/srcpkgs/atinout/patches/0002-do-not-rely-on-CR-in-modem-output.patch
@@ -0,0 +1,84 @@
+From 65dae46181119867cd8e93ca5b33d3b0cf3df08c Mon Sep 17 00:00:00 2001
+From: Beralt Meppelink <b.meppelink@riwo.eu>
+Date: Fri, 27 Oct 2017 10:42:50 +0200
+Subject: [PATCH 2/2] do not rely on CR in modem output
+
+---
+ atinout.c | 24 +++++++++++-------------
+ 1 file changed, 11 insertions(+), 13 deletions(-)
+
+diff --git a/atinout.c b/atinout.c
+index 924b5bc..4cd7689 100644
+--- atinout.c
++++ atinout.c
+@@ -34,7 +34,6 @@
+
+ #define MAX_LINE_LENGTH (4 * 1024)
+ static char buf[MAX_LINE_LENGTH];
+-static char buf2[MAX_LINE_LENGTH];
+
+ static struct option long_options[] = {
+ {"help", no_argument, NULL, 'h'},
+@@ -125,36 +124,36 @@ static bool is_final_result(const char * const response)
+ }
+ return false;
+ case 'B':
+- if (strcmp(&response[1], "USY\r\n") == 0) {
++ if (strcmp(&response[1], "USY\n") == 0) {
+ return true;
+- }
++ }
++
+ return false;
+
+ case 'E':
+- if (strcmp(&response[1], "RROR\r\n") == 0) {
++ if (strcmp(&response[1], "RROR\n") == 0) {
+ return true;
+ }
+ return false;
+ case 'N':
+- if (strcmp(&response[1], "O ANSWER\r\n") == 0) {
++ if (strcmp(&response[1], "O ANSWER\n") == 0) {
+ return true;
+ }
+- if (strcmp(&response[1], "O CARRIER\r\n") == 0) {
++ if (strcmp(&response[1], "O CARRIER\n") == 0) {
+ return true;
+ }
+- if (strcmp(&response[1], "O DIALTONE\r\n") == 0) {
++ if (strcmp(&response[1], "O DIALTONE\n") == 0) {
+ return true;
+ }
+ return false;
+ case 'O':
+- if (strcmp(&response[1], "K\r\n") == 0) {
++ if (strcmp(&response[1], "K\n") == 0) {
+ return true;
+ }
+ // fallthrough
+ default:
+ return false;
+ }
+-
+ }
+
+ int main(int argc, char *argv[])
+@@ -248,11 +247,10 @@ int main(int argc, char *argv[])
+ fprintf(stderr, "EOF from modem\n");
+ return EXIT_FAILURE;
+ }
+- strcpy(buf2, line);
+- strip_cr(buf2);
+- res = fputs(buf2, output);
++ strip_cr(line);
++ res = fputs(line, output);
+ if (res < 0) {
+- fprintf(stderr, "failed to write '%s' to output file (res = %d)\n", buf2, res);
++ fprintf(stderr, "failed to write '%s' to output file (res = %d)\n", line, res);
+ return EXIT_FAILURE;
+ }
+ } while (! is_final_result(line));
+--
+2.23.0
+
diff --git a/srcpkgs/atinout/patches/0003-version.patch b/srcpkgs/atinout/patches/0003-version.patch
new file mode 100644
index 00000000000..18d92de0630
--- /dev/null
+++ b/srcpkgs/atinout/patches/0003-version.patch
@@ -0,0 +1,11 @@
+--- atinout.c 2020-09-12 16:31:43.049093055 -0700
++++ atinout.c 2020-09-12 16:33:34.269081686 -0700
+@@ -170,7 +169,7 @@
+ help(argv[0]);
+ return EXIT_SUCCESS;
+ case 'V':
+- printf("atinout version " VERSION "\n");
++ printf("atinout version 0.9.1\n");
+ if (argc == 2) {
+ printf("Copyright (C) 2013 Håkon Løvdal <hlovdal@users.sourceforge.net>\n"
+ "This program comes with ABSOLUTELY NO WARRANTY.\n"
diff --git a/srcpkgs/atinout/template b/srcpkgs/atinout/template
new file mode 100644
index 00000000000..db2c2ffd223
--- /dev/null
+++ b/srcpkgs/atinout/template
@@ -0,0 +1,11 @@
+# Template file for 'atinout'
+pkgname=atinout
+version=0.9.1
+revision=1
+build_style=gnu-makefile
+short_desc="AT commands as input are sent to modem and responses given as output"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="http://atinout.sourceforge.net/index.html"
+distfiles="https://netcologne.dl.sourceforge.net/project/atinout/v${version}/atinout-${version}.tar.gz"
+checksum=4d15c8288aca414e11cd304686b172696104c5e42bf776300311c005634854a2
From be4fe0a3e058b6f657af06cb2560481a6472205f Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 12 Sep 2020 22:18:46 -0700
Subject: [PATCH 11/12] New package: pinephone-wys-0.1.8
---
srcpkgs/pinephone-wys/files/wys.desktop | 9 +
...-daemon-to-only-switch-card-profiles.patch | 906 ++++++++++++++++++
srcpkgs/pinephone-wys/template | 19 +
3 files changed, 934 insertions(+)
create mode 100644 srcpkgs/pinephone-wys/files/wys.desktop
create mode 100644 srcpkgs/pinephone-wys/patches/0001-Simplify-daemon-to-only-switch-card-profiles.patch
create mode 100644 srcpkgs/pinephone-wys/template
diff --git a/srcpkgs/pinephone-wys/files/wys.desktop b/srcpkgs/pinephone-wys/files/wys.desktop
new file mode 100644
index 00000000000..a6a9f6894a9
--- /dev/null
+++ b/srcpkgs/pinephone-wys/files/wys.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Wys
+Comment=Daemon for managing PulseAudio for phone call audio
+Exec=/usr/bin/wys
+NoDisplay=true
+Terminal=false
+Type=Application
+StartupNotify=true
+X-GNOME-AutoRestart=true
diff --git a/srcpkgs/pinephone-wys/patches/0001-Simplify-daemon-to-only-switch-card-profiles.patch b/srcpkgs/pinephone-wys/patches/0001-Simplify-daemon-to-only-switch-card-profiles.patch
new file mode 100644
index 00000000000..91257f2cbba
--- /dev/null
+++ b/srcpkgs/pinephone-wys/patches/0001-Simplify-daemon-to-only-switch-card-profiles.patch
@@ -0,0 +1,906 @@
+From f66610d26395de15e3928cf4284573ca9cfabf26 Mon Sep 17 00:00:00 2001
+From: Arnaud Ferraris <arnaud.ferraris@collabora.com>
+Date: Fri, 6 Mar 2020 02:01:52 +0100
+Subject: [PATCH] Simplify daemon to only switch card profiles
+
+As a PoC for the PinePhone, we want to only switch card profiles:
+- when a call starts, use the "Voice Call" profile: audio is output on
+the earpiece, and the internal microphone is unmuted
+- when a call is terminated, switch back to the default "HiFi" profile,
+using the main speaker
+
+This should fully cover the most basic use-case. Headset will not work,
+and there is also no support for a "silent mode", but this is enough to
+demonstrate voice calls for the PinePhone.
+---
+diff --git meson.build meson.build
+index 5938cec..7516208 100644
+--- meson.build
++++ meson.build
+@@ -33,11 +33,6 @@ project (
+ ],
+ )
+
+-
+-libmchk_proj = subproject('libmachine-check')
+-libmchk_dep = libmchk_proj.get_variable('libmachine_check_dep')
+-
+-
+ app_name = meson.project_name()
+
+ prefix = get_option('prefix')
+@@ -63,14 +58,3 @@ config_data.set_quoted('DATADIR', full_datadir)
+ config_data.set_quoted('SYSCONFDIR', full_sysconfdir)
+
+ subdir('src')
+-
+-install_subdir (
+- 'machine-conf',
+- install_dir : join_paths(datadir, app_name)
+-)
+-
+-install_subdir (
+- 'machine-check',
+- install_dir : join_paths(datadir, 'machine-check', app_name),
+- strip_directory : true
+-)
+diff --git src/main.c src/main.c
+index 587a5f3..4631a33 100644
+--- src/main.c
++++ src/main.c
+@@ -23,10 +23,8 @@
+ */
+
+ #include "wys-modem.h"
+-#include "wys-audio.h"
+ #include "util.h"
+ #include "config.h"
+-#include "mchk-machine-check.h"
+
+ #include <libmm-glib.h>
+ #include <glib.h>
+@@ -50,8 +48,6 @@ static GMainLoop *main_loop = NULL;
+
+ struct wys_data
+ {
+- /** PulseAudio interface */
+- WysAudio *audio;
+ /** ID for the D-Bus watch */
+ guint watch_id;
+ /** ModemManager object proxy */
+@@ -59,51 +55,112 @@ struct wys_data
+ /** Map of D-Bus object paths to WysModems */
+ GHashTable *modems;
+ /** How many modems have audio, in each direction */
+- guint audio_count[2];
++ guint audio_count;
+ };
+
++static gboolean
++ugly_system (const gchar *cmd)
++{
++ gchar *out = NULL, *err = NULL;
++ gint status;
++ GError *error = NULL;
++ gboolean ok;
++
++ g_debug ("Executing command `%s'", cmd);
++
++ ok = g_spawn_command_line_sync
++ (cmd, &out, &err, &status, &error);
++
++ if (!ok)
++ {
++ g_warning ("Error spawning command `%s': %s'",
++ cmd, error->message);
++ g_error_free (error);
++ return FALSE;
++ }
++
++ ok = g_spawn_check_exit_status (status, &error);
++ if (ok)
++ {
++ g_debug ("Command `%s' executed successfully"
++ "; stdout: `%s'; stderr: `%s'",
++ cmd, out, err);
++ }
++ else
++ {
++ g_warning ("Command `%s' failed: %s"
++ "; stdout: `%s'; stderr: `%s'",
++ cmd, error->message, out, err);
++ g_error_free (error);
++ }
++
++ g_free (out);
++ g_free (err);
++
++ return ok;
++}
++
++#define UGLY_CARD "alsa_card.platform-sound"
++
++static gboolean
++ugly_set_card_profile (const gchar *card,
++ const gchar *profile)
++{
++ g_autofree gchar *cmd = NULL;
++
++ cmd = g_strdup_printf ("pactl set-card-profile '%s' '%s'", card, profile);
++
++ return ugly_system (cmd);
++}
++
++static gboolean
++ugly_set_voice_call (void)
++{
++ return ugly_set_card_profile (UGLY_CARD, "Voice Call");
++}
++
++static gboolean
++ugly_set_hifi (void)
++{
++ return ugly_set_card_profile (UGLY_CARD, "HiFi");
++}
+
+ static void
+ update_audio_count (struct wys_data *data,
+- WysDirection direction,
+ gint delta)
+ {
+- const guint old_count = data->audio_count[direction];
++ const guint old_count = data->audio_count;
+
+- g_assert (delta >= 0 || data->audio_count[direction] > 0);
++ g_assert (delta >= 0 || data->audio_count > 0);
+
+- data->audio_count[direction] += delta;
++ data->audio_count += delta;
+
+- if (data->audio_count[direction] > 0 && old_count == 0)
++ if (data->audio_count > 0 && old_count == 0)
+ {
+- g_debug ("Audio %s now present",
+- wys_direction_get_description (direction));
+- wys_audio_ensure_loopback (data->audio, direction);
++ g_message ("Audio now present");
++ ugly_set_voice_call ();
+ }
+- else if (data->audio_count[direction] == 0 && old_count > 0)
++ else if (data->audio_count == 0 && old_count > 0)
+ {
+- g_debug ("Audio %s now absent",
+- wys_direction_get_description (direction));
+- wys_audio_ensure_no_loopback (data->audio, direction);
++ g_message ("Audio now absent");
++ ugly_set_hifi ();
+ }
+ }
+
+
+ static void
+ audio_present_cb (struct wys_data *data,
+- WysDirection direction,
+ WysModem *modem)
+ {
+- update_audio_count (data, direction, +1);
++ update_audio_count (data, +1);
+ }
+
+
+ static void
+ audio_absent_cb (struct wys_data *data,
+- WysDirection direction,
+ WysModem *modem)
+ {
+- update_audio_count (data, direction, -1);
++ update_audio_count (data, -1);
+ }
+
+
+@@ -123,7 +180,7 @@ add_modem (struct wys_data *data,
+ return;
+ }
+
+- g_debug ("Adding new voice-capable modem `%s'", path);
++ g_message ("Adding new voice-capable modem `%s'", path);
+
+ g_assert (MM_IS_OBJECT (object));
+ voice = mm_object_get_modem_voice (MM_OBJECT (object));
+@@ -153,7 +210,7 @@ interface_added_cb (struct wys_data *data,
+
+ info = g_dbus_interface_get_info (interface);
+
+- g_debug ("ModemManager interface `%s' found on object `%s'",
++ g_message ("ModemManager interface `%s' found on object `%s'",
+ info->name,
+ g_dbus_object_get_object_path (object));
+
+@@ -184,7 +241,7 @@ interface_removed_cb (struct wys_data *data,
+ path = g_dbus_object_get_object_path (object);
+ info = g_dbus_interface_get_info (interface);
+
+- g_debug ("ModemManager interface `%s' removed on object `%s'",
++ g_message ("ModemManager interface `%s' removed on object `%s'",
+ info->name, path);
+
+ if (g_strcmp0 (info->name, MM_DBUS_INTERFACE_MODEM_VOICE) == 0)
+@@ -229,7 +286,7 @@ void
+ object_added_cb (struct wys_data *data,
+ GDBusObject *object)
+ {
+- g_debug ("ModemManager object `%s' added",
++ g_message ("ModemManager object `%s' added",
+ g_dbus_object_get_object_path (object));
+
+ add_mm_object (data, object);
+@@ -243,7 +300,7 @@ object_removed_cb (struct wys_data *data,
+ const gchar *path;
+
+ path = g_dbus_object_get_object_path (object);
+- g_debug ("ModemManager object `%s' removed", path);
++ g_message ("ModemManager object `%s' removed", path);
+
+ remove_modem_object (data, path, object);
+ }
+@@ -286,7 +343,7 @@ mm_appeared_cb (GDBusConnection *connection,
+ const gchar *name_owner,
+ struct wys_data *data)
+ {
+- g_debug ("ModemManager appeared on D-Bus");
++ g_message ("ModemManager appeared on D-Bus");
+
+ mm_manager_new (connection,
+ G_DBUS_OBJECT_MANAGER_CLIENT_FLAGS_NONE,
+@@ -310,18 +367,14 @@ mm_vanished_cb (GDBusConnection *connection,
+ const gchar *name,
+ struct wys_data *data)
+ {
+- g_debug ("ModemManager vanished from D-Bus");
++ g_message ("ModemManager vanished from D-Bus");
+ clear_dbus (data);
+ }
+
+
+ static void
+-set_up (struct wys_data *data,
+- const gchar *codec,
+- const gchar *modem)
++set_up (struct wys_data *data)
+ {
+- data->audio = wys_audio_new (codec, modem);
+-
+ data->modems = g_hash_table_new_full (g_str_hash, g_str_equal,
+ g_free, g_object_unref);
+
+@@ -333,7 +386,7 @@ set_up (struct wys_data *data,
+ (GBusNameVanishedCallback)mm_vanished_cb,
+ data, NULL);
+
+- g_debug ("Watching for ModemManager");
++ g_message ("Watching for ModemManager");
+ }
+
+
+@@ -343,23 +396,19 @@ tear_down (struct wys_data *data)
+ clear_dbus (data);
+ g_bus_unwatch_name (data->watch_id);
+ g_hash_table_unref (data->modems);
+- g_object_unref (G_OBJECT (data->audio));
+ }
+
+
+ static void
+-run (const gchar *codec,
+- const gchar *modem)
++run (void)
+ {
+ struct wys_data data;
+
+ memset (&data, 0, sizeof (struct wys_data));
+- set_up (&data, codec, modem);
++ set_up (&data);
+
+ main_loop = g_main_loop_new (NULL, FALSE);
+
+- printf (APPLICATION_NAME " started with codec `%s', modem `%s'\n",
+- codec, modem);
+ g_main_loop_run (main_loop);
+
+ g_main_loop_unref (main_loop);
+@@ -368,33 +417,6 @@ run (const gchar *codec,
+ tear_down (&data);
+ }
+
+-
+-static void
+-check_machine (const gchar *machine)
+-{
+- gboolean ok, passed;
+- GError *error = NULL;
+-
+- ok = mchk_check_machine (APP_DATA_NAME,
+- machine,
+- &passed,
+- &error);
+- if (!ok)
+- {
+- g_warning ("Error checking machine name against"
+- " whitelist/blacklist, continuing anyway");
+- g_error_free (error);
+- }
+- else if (!passed)
+- {
+- g_message ("Machine name `%s' did not pass"
+- " whitelist/blacklist check, exiting",
+- machine);
+- exit (EXIT_SUCCESS);
+- }
+-}
+-
+-
+ static void
+ terminate (int signal)
+ {
+@@ -452,222 +452,18 @@ setup_signals ()
+ }
+
+
+-/** This function will close @fd */
+-static gchar *
+-read_machine_conf_file (const gchar *filename,
+- int fd)
+-{
+- GInputStream *unix_stream;
+- GDataInputStream *data_stream;
+- gboolean try_again;
+- gchar *line;
+- GError *error = NULL;
+-
+- g_debug ("Reading machine configuration file `%s'", filename);
+-
+- unix_stream = g_unix_input_stream_new (fd, TRUE);
+- g_assert (unix_stream != NULL);
+-
+- data_stream = g_data_input_stream_new (unix_stream);
+- g_assert (data_stream != NULL);
+- g_object_unref (unix_stream);
+-
+- do
+- {
+- try_again = FALSE;
+-
+- line = g_data_input_stream_read_line_utf8
+- (data_stream, NULL, NULL, &error);
+-
+- if (error)
+- {
+- g_warning ("Error reading from machine"
+- " configuration file `%s': %s",
+- filename, error->message);
+- g_error_free (error);
+- }
+- else if (line)
+- {
+- g_strstrip (line);
+-
+- // Skip comments and empty lines
+- if (line[0] == '#' || line[0] == '\0')
+- {
+- g_free (line);
+- try_again = TRUE;
+- }
+- }
+- }
+- while (try_again);
+-
+- g_object_unref (data_stream);
+- return line;
+-}
+-
+-
+-static gchar *
+-dir_machine_conf (const gchar *dir,
+- const gchar *machine,
+- const gchar *key)
+-{
+- gchar *filename;
+- int fd;
+- gchar *value = NULL;
+-
+- filename = g_build_filename (dir, APP_DATA_NAME,
+- "machine-conf",
+- machine, key, NULL);
+-
+- g_debug ("Trying machine configuration file `%s'",
+- filename);
+-
+- fd = g_open (filename, O_RDONLY, 0);
+- if (fd == -1)
+- {
+- if (errno != ENOENT)
+- {
+- // The error isn't that the file doesn't exist
+- g_warning ("Error opening machine"
+- " configuration file `%s': %s",
+- filename, g_strerror (errno));
+- }
+- }
+- else
+- {
+- value = read_machine_conf_file (filename, fd);
+- }
+-
+- g_free (filename);
+- return value;
+-}
+-
+-
+-static gchar *
+-machine_conf (const gchar *machine,
+- const gchar *key)
+-{
+- gchar *value = NULL;
+- const gchar * const *dirs, * const *dir;
+-
+-
+-#define try_dir(d) \
+- value = dir_machine_conf (d, machine, key); \
+- if (value) \
+- { \
+- return value; \
+- }
+-
+-
+- try_dir (g_get_user_config_dir ());
+-
+- dirs = g_get_system_config_dirs ();
+- for (dir = dirs; *dir; ++dir)
+- {
+- try_dir (*dir);
+- }
+-
+- try_dir (SYSCONFDIR);
+- try_dir (DATADIR);
+-
+- dirs = g_get_system_data_dirs ();
+- for (dir = dirs; *dir; ++dir)
+- {
+- try_dir (*dir);
+- }
+-
+-#undef try_dir
+-
+- return NULL;
+-}
+-
+-
+-static void
+-ensure_alsa_card (const gchar *machine,
+- const gchar *var,
+- const gchar *key,
+- gchar **name)
+-{
+- const gchar *env;
+-
+- if (*name)
+- {
+- return;
+- }
+-
+- env = g_getenv (var);
+- if (env)
+- {
+- *name = g_strdup (env);
+- return;
+- }
+-
+- if (machine)
+- {
+- *name = machine_conf (machine, key);
+- if (*name)
+- {
+- return;
+- }
+- }
+-
+- g_warning ("No %s specified with a machine configuration file"
+- ", environment variable or command line option"
+- "; refusing to run", key);
+- exit (EXIT_SUCCESS);
+-}
+-
+-
+ int
+ main (int argc, char **argv)
+ {
+ GError *error = NULL;
+ GOptionContext *context;
+ gboolean ok;
+- g_autofree gchar *codec = NULL;
+- g_autofree gchar *modem = NULL;
+- g_autofree gchar *machine = NULL;
+-
+- GOptionEntry options[] =
+- {
+- { "codec", 'c', 0, G_OPTION_ARG_STRING, &codec, "Name of the codec's ALSA card", "NAME" },
+- { "modem", 'm', 0, G_OPTION_ARG_STRING, &modem, "Name of the modem's ALSA card", "NAME" },
+- { NULL }
+- };
+
+ setlocale(LC_ALL, "");
+
+- machine = mchk_read_machine (NULL);
+- if (machine)
+- {
+- check_machine (machine);
+- }
+- else
+- {
+- g_warning ("Could not read machine name, continuing without machine check");
+- }
+-
+-
+- context = g_option_context_new ("- set up PulseAudio loopback for phone call audio");
+- g_option_context_add_main_entries (context, options, NULL);
+- ok = g_option_context_parse (context, &argc, &argv, &error);
+- if (!ok)
+- {
+- g_print ("Error parsing options: %s\n", error->message);
+- }
+-
+-
+- if (machine)
+- {
+- /* Convert any directory separator characters to "_" */
+- g_strdelimit (machine, G_DIR_SEPARATOR_S, '_');
+- }
+-
+- ensure_alsa_card (machine, "WYS_CODEC", "codec", &codec);
+- ensure_alsa_card (machine, "WYS_MODEM", "modem", &modem);
+-
+ setup_signals ();
+
+- run (codec, modem);
++ run ();
+
+ return 0;
+ }
+diff --git src/meson.build src/meson.build
+index 7b99235..a8a30d7 100644
+--- src/meson.build
++++ src/meson.build
+@@ -22,13 +22,10 @@
+ gnome = import('gnome')
+
+ wys_deps = [
+- libmchk_dep,
+ dependency('gobject-2.0'),
+ dependency('gio-unix-2.0'),
+ dependency('ModemManager'),
+ dependency('mm-glib'),
+- dependency('libpulse'),
+- dependency('libpulse-mainloop-glib'),
+ ]
+
+ config_h = configure_file (
+@@ -36,20 +33,13 @@ config_h = configure_file (
+ configuration: config_data
+ )
+
+-wys_enum_headers = files(['wys-direction.h'])
+-wys_enum_sources = gnome.mkenums_simple('enum-types',
+- sources : wys_enum_headers)
+-
+ executable (
+ 'wys',
+ config_h,
+- wys_enum_sources,
+ [
+ 'main.c',
+ 'util.h', 'util.c',
+- 'wys-direction.h', 'wys-direction.c',
+ 'wys-modem.h', 'wys-modem.c',
+- 'wys-audio.h', 'wys-audio.c',
+ ],
+ dependencies : wys_deps,
+ include_directories : include_directories('..'),
+diff --git src/wys-modem.c src/wys-modem.c
+index 212f992..51a0575 100644
+--- src/wys-modem.c
++++ src/wys-modem.c
+@@ -24,18 +24,10 @@
+
+
+ #include "wys-modem.h"
+-#include "wys-direction.h"
+ #include "util.h"
+-#include "enum-types.h"
+
+ #include <glib/gi18n.h>
+
+-static const gchar * const WYS_MODEM_HAS_AUDIO[] =
+- {
+- [WYS_DIRECTION_FROM_NETWORK] = "wys-has-audio-from-network",
+- [WYS_DIRECTION_TO_NETWORK] = "wys-has-audio-to-network"
+- };
+-
+ struct _WysModem
+ {
+ GObject parent_instance;
+@@ -43,8 +35,8 @@ struct _WysModem
+ MMModemVoice *voice;
+ /** Map of D-Bus object paths to MMCall objects */
+ GHashTable *calls;
+- /** How many calls have audio, in each direction */
+- guint audio_count[2];
++ /** How many calls have audio */
++ guint audio_count;
+ };
+
+ G_DEFINE_TYPE(WysModem, wys_modem, G_TYPE_OBJECT)
+@@ -65,15 +57,11 @@ static guint signals [SIGNAL_LAST_SIGNAL];
+
+
+ static gboolean
+-call_state_has_audio (WysDirection direction,
+- MMCallState state)
++call_state_has_audio (MMCallState state)
+ {
+ switch (state)
+ {
+ case MM_CALL_STATE_RINGING_OUT:
+- return
+- (direction == WYS_DIRECTION_FROM_NETWORK)
+- ? TRUE : FALSE;
+ case MM_CALL_STATE_ACTIVE:
+ return TRUE;
+ default:
+@@ -84,39 +72,35 @@ call_state_has_audio (WysDirection direction,
+
+ static void
+ update_audio_count (WysModem *self,
+- WysDirection direction,
+ gint delta)
+ {
+- const guint old_count = self->audio_count[direction];
++ const guint old_count = self->audio_count;
+
+- g_assert (delta >= 0 || self->audio_count[direction] > 0);
++ g_assert (delta >= 0 || self->audio_count > 0);
+
+- self->audio_count[direction] += delta;
++ self->audio_count += delta;
+
+- if (self->audio_count[direction] > 0 && old_count == 0)
++ if (self->audio_count > 0 && old_count == 0)
+ {
+- g_debug ("Modem `%s' audio %s now present",
+- mm_modem_voice_get_path (self->voice),
+- wys_direction_get_description (direction));
+- g_signal_emit_by_name (self, "audio-present", direction);
++ g_message ("Modem `%s' audio now present",
++ mm_modem_voice_get_path (self->voice));
++ g_signal_emit_by_name (self, "audio-present");
+ }
+- else if (self->audio_count[direction] == 0 && old_count > 0)
++ else if (self->audio_count == 0 && old_count > 0)
+ {
+- g_debug ("Modem `%s' audio now absent",
+- mm_modem_voice_get_path (self->voice));
+- g_signal_emit_by_name (self, "audio-absent", direction);
++ g_message ("Modem `%s' audio now absent",
++ mm_modem_voice_get_path (self->voice));
++ g_signal_emit_by_name (self, "audio-absent");
+ }
+ }
+
+
+ static gboolean
+-get_call_has_audio (MMCall *mm_call,
+- WysDirection direction)
++get_call_has_audio (MMCall *mm_call)
+ {
+ gpointer data;
+
+- data = g_object_get_data (G_OBJECT (mm_call),
+- WYS_MODEM_HAS_AUDIO[direction]);
++ data = g_object_get_data (G_OBJECT (mm_call), "audio-state");
+
+ return (gboolean)(GPOINTER_TO_UINT (data));
+ }
+@@ -124,42 +108,38 @@ get_call_has_audio (MMCall *mm_call,
+
+ static void
+ set_call_has_audio (MMCall *mm_call,
+- WysDirection direction,
+ gboolean has_audio)
+ {
+ g_object_set_data (G_OBJECT (mm_call),
+- WYS_MODEM_HAS_AUDIO[direction],
++ "audio-state",
+ GUINT_TO_POINTER ((guint)has_audio));
+ }
+
+
+ static void
+-update_direction_state (WysModem *self,
+- MMCall *mm_call,
+- const gchar *path,
+- WysDirection direction,
+- MMCallState old_state,
+- MMCallState new_state)
++update_call_state (WysModem *self,
++ MMCall *mm_call,
++ const gchar *path,
++ MMCallState old_state,
++ MMCallState new_state)
+ {
+- gboolean had_audio = call_state_has_audio (direction, old_state);
+- gboolean have_audio = call_state_has_audio (direction, new_state);
++ gboolean had_audio = call_state_has_audio (old_state);
++ gboolean have_audio = call_state_has_audio (new_state);
+
+ if (!had_audio && have_audio)
+ {
+- g_debug ("Call `%s' gained audio %s", path,
+- wys_direction_get_description (direction));
+- update_audio_count (self, direction, +1);
++ g_message ("Call `%s' gained audio", path);
++ update_audio_count (self, +1);
+ }
+ else if (had_audio && !have_audio)
+ {
+- g_debug ("Call `%s' lost audio %s", path,
+- wys_direction_get_description (direction));
+- update_audio_count (self, direction, -1);
++ g_message ("Call `%s' lost audio", path);
++ update_audio_count (self, -1);
+ }
+
+ if (had_audio != have_audio)
+ {
+- set_call_has_audio (mm_call, direction, have_audio);
++ set_call_has_audio (mm_call, have_audio);
+ }
+ }
+
+@@ -174,34 +154,28 @@ call_state_changed_cb (MmGdbusCall *mm_gdbus_call,
+ MMCall *mm_call = MM_CALL (mm_gdbus_call);
+ const gchar * path = mm_call_get_path (mm_call);
+
+- g_debug ("Call `%s' state changed, new: %i, old: %i",
++ g_message ("Call `%s' state changed, new: %i, old: %i",
+ path, (int)new_state, (int)old_state);
+
+ // FIXME: deal with calls being put on hold (one call goes
+ // non-audio, another call goes audio after)
+
+- update_direction_state (self, mm_call, path,
+- WYS_DIRECTION_FROM_NETWORK,
+- old_state, new_state);
+- update_direction_state (self, mm_call, path,
+- WYS_DIRECTION_TO_NETWORK,
+- old_state, new_state);
++ update_call_state (self, mm_call, path, old_state, new_state);
+ }
+
+
+ static void
+-init_call_direction (WysModem *self,
+- MMCall *mm_call,
+- MMCallState state,
+- WysDirection direction)
++init_call_audio (WysModem *self,
++ MMCall *mm_call,
++ MMCallState state)
+ {
+- gboolean has_audio = call_state_has_audio (direction, state);
++ gboolean has_audio = call_state_has_audio (state);
+
+- set_call_has_audio (mm_call, direction, has_audio);
++ set_call_has_audio (mm_call, has_audio);
+
+ if (has_audio)
+ {
+- update_audio_count (self, direction, +1);
++ update_audio_count (self, +1);
+ }
+ }
+
+@@ -223,12 +197,9 @@ add_call (WysModem *self,
+ self);
+
+ state = mm_call_get_state (mm_call);
+- init_call_direction (self, mm_call, state,
+- WYS_DIRECTION_FROM_NETWORK);
+- init_call_direction (self, mm_call, state,
+- WYS_DIRECTION_TO_NETWORK);
++ init_call_audio (self, mm_call, state);
+
+- g_debug ("Call `%s' added, state: %i", path, (int)state);
++ g_message ("Call `%s' added, state: %i", path, (int)state);
+ }
+
+
+@@ -322,16 +293,14 @@ call_added_cb (MMModemVoice *voice,
+
+
+ static void
+-clear_call_direction (WysModem *self,
+- MMCall *mm_call,
+- WysDirection direction)
++clear_call_state (WysModem *self,
++ MMCall *mm_call)
+ {
+- gboolean has_audio =
+- get_call_has_audio (mm_call, direction);
++ gboolean has_audio = get_call_has_audio (mm_call);
+
+ if (has_audio)
+ {
+- update_audio_count (self, direction, -1);
++ update_audio_count (self, -1);
+ }
+ }
+
+@@ -343,7 +312,7 @@ call_deleted_cb (MMModemVoice *voice,
+ {
+ MMCall *mm_call;
+
+- g_debug ("Removing call `%s'", path);
++ g_message ("Removing call `%s'", path);
+
+ mm_call = g_hash_table_lookup (self->calls, path);
+ if (!mm_call)
+@@ -352,14 +321,11 @@ call_deleted_cb (MMModemVoice *voice,
+ return;
+ }
+
+- clear_call_direction (self, mm_call,
+- WYS_DIRECTION_FROM_NETWORK);
+- clear_call_direction (self, mm_call,
+- WYS_DIRECTION_TO_NETWORK);
++ clear_call_state (self, mm_call);
+
+ g_hash_table_remove (self->calls, path);
+
+- g_debug ("Call `%s' removed", path);
++ g_message ("Call `%s' removed", path);
+ }
+
+
+@@ -444,11 +410,9 @@ dispose (GObject *object)
+ if (g_hash_table_size (self->calls) > 0)
+ {
+ g_hash_table_remove_all (self->calls);
+- if (self->audio_count[WYS_DIRECTION_FROM_NETWORK] > 0 ||
+- self->audio_count[WYS_DIRECTION_TO_NETWORK] > 0)
++ if (self->audio_count > 0)
+ {
+- self->audio_count[WYS_DIRECTION_FROM_NETWORK] =
+- self->audio_count[WYS_DIRECTION_TO_NETWORK] = 0;
++ self->audio_count = 0;
+ g_signal_emit_by_name (self, "audio-absent");
+ }
+ }
+@@ -504,8 +468,7 @@ wys_modem_class_init (WysModemClass *klass)
+ G_SIGNAL_RUN_LAST,
+ 0, NULL, NULL, NULL,
+ G_TYPE_NONE,
+- 1,
+- WYS_TYPE_DIRECTION);
++ 0);
+
+ /**
+ * WysModem::audio-absent:
+@@ -520,8 +483,7 @@ wys_modem_class_init (WysModemClass *klass)
+ G_SIGNAL_RUN_LAST,
+ 0, NULL, NULL, NULL,
+ G_TYPE_NONE,
+- 1,
+- WYS_TYPE_DIRECTION);
++ 0);
+ }
+
+
diff --git a/srcpkgs/pinephone-wys/template b/srcpkgs/pinephone-wys/template
new file mode 100644
index 00000000000..ab3eaad64ac
--- /dev/null
+++ b/srcpkgs/pinephone-wys/template
@@ -0,0 +1,19 @@
+# Template file for 'pinephone-wys'
+pkgname=pinephone-wys
+_pkgname=wys
+version=0.1.8
+revision=1
+wrksrc=${_pkgname}-v${version}
+build_style=meson
+hostmakedepends="pkg-config"
+makedepends="glib-devel pulseaudio-devel ModemManager-devel"
+short_desc="Daemon to bring up and take down PulseAudio for phone call audio"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/wys"
+distfiles="${homepage}/-/archive/v${version}/${_pkgname}-v${version}.tar.gz"
+checksum=07fd6d2ae9ea5d6187e1c99d5b0e5c1d9c74ba00f4869f4aae195cd8714ba375
+
+post_install() {
+ vinstall ${FILESDIR}/wys.desktop 644 etc/xdg/autostart
+}
From 6658e833492d5af42a19290275267e0ec2a189e2 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 19 Sep 2020 19:12:26 -0700
Subject: [PATCH 12/12] New package: megapixels-0.7.0
---
srcpkgs/megapixels/template | 13 +++++++++++++
1 file changed, 13 insertions(+)
create mode 100644 srcpkgs/megapixels/template
diff --git a/srcpkgs/megapixels/template b/srcpkgs/megapixels/template
new file mode 100644
index 00000000000..ebce6a993b1
--- /dev/null
+++ b/srcpkgs/megapixels/template
@@ -0,0 +1,13 @@
+# Template file for 'megapixels'
+pkgname=megapixels
+version=0.7.0
+revision=1
+build_style=meson
+hostmakedepends="pkg-config glib-devel"
+makedepends="gtk+3-devel"
+short_desc="GTK+3 camera app for ARM devices"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://git.sr.ht/~martijnbraam/megapixels"
+distfiles="${homepage}/archive/${version}.tar.gz"
+checksum=9a5e555924b183e7c4d75d8afdd10a24bcfcad20f898e8d27b3eb171f31f4dd3
^ permalink raw reply [flat|nested] 47+ messages in thread* Re: [PR PATCH] [Updated] New packages: phoc-0.4.2 calls-0.1.7 purism-chatty-0.1.15
2020-08-29 20:46 [PR PATCH] New packages: phoc-0.4.2 calls-0.1.7 purism-chatty--0.1.15 julio641742
` (31 preceding siblings ...)
2020-09-20 2:14 ` julio641742
@ 2020-09-20 4:57 ` julio641742
2020-09-21 11:11 ` jjsullivan5196
` (12 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: julio641742 @ 2020-09-20 4:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 386 bytes --]
There is an updated pull request by julio641742 against master on the void-packages repository
https://github.com/julio641742/void-packages phosh
https://github.com/void-linux/void-packages/pull/24538
New packages: phoc-0.4.2 calls-0.1.7 purism-chatty-0.1.15
Getting ready for my pinephone :)
A patch file from https://github.com/void-linux/void-packages/pull/24538.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-phosh-24538.patch --]
[-- Type: text/x-diff, Size: 55525 bytes --]
From f7afb15b46ee712383b64070adf0f67ea098e40d Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Sat, 29 Aug 2020 11:47:35 -0700
Subject: [PATCH 01/13] New package: feedbackd-0.0.0+git20200707
---
common/shlibs | 1 +
srcpkgs/feedbackd/template | 37 +++++++++++++++++++++++++++++++++++++
srcpkgs/libfeedback | 1 +
srcpkgs/libfeedback-devel | 1 +
4 files changed, 40 insertions(+)
create mode 100644 srcpkgs/feedbackd/template
create mode 120000 srcpkgs/libfeedback
create mode 120000 srcpkgs/libfeedback-devel
diff --git a/common/shlibs b/common/shlibs
index ccfd187bfe0..5167847ffd9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3991,3 +3991,4 @@ libneatvnc.so.0 neatvnc-0.2.0_1
libtdjson.so.1.6.0 libtd-1.6.0_1
libJudy.so.1 judy-1.0.5_1
libsignal-protocol-c.so.2 libsignal-protocol-c-2.3.3_2
+libfeedback-0.0.so.0 libfeedback-0.0.0+git20200707_1
diff --git a/srcpkgs/feedbackd/template b/srcpkgs/feedbackd/template
new file mode 100644
index 00000000000..0131775cc9d
--- /dev/null
+++ b/srcpkgs/feedbackd/template
@@ -0,0 +1,37 @@
+# Template file for 'feedbackd'
+pkgname=feedbackd
+version=0.0.0+git20200707
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=meson
+build_helper=gir
+hostmakedepends="vala glib-devel pkg-config"
+makedepends="gsound-devel libgudev-devel json-glib-devel"
+depends="dbus"
+short_desc="Daemon to provide haptic feedback on events"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/feedbackd"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=37cf48cbdbaee8e2d0bea406f5b6317bf0e3cdf79250f9ce0a884e7d3905a8ea
+
+post_install() {
+ vinstall debian/feedbackd.udev 0644 usr/lib/udev/rules.d 90-feedbackd.rules
+}
+
+libfeedback_package() {
+ short_desc+=" - shared libraries"
+ pkg_install() {
+ vmove "usr/lib/*.so.*"
+ }
+}
+
+libfeedback-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ }
+}
diff --git a/srcpkgs/libfeedback b/srcpkgs/libfeedback
new file mode 120000
index 00000000000..49dc965f1cd
--- /dev/null
+++ b/srcpkgs/libfeedback
@@ -0,0 +1 @@
+feedbackd
\ No newline at end of file
diff --git a/srcpkgs/libfeedback-devel b/srcpkgs/libfeedback-devel
new file mode 120000
index 00000000000..49dc965f1cd
--- /dev/null
+++ b/srcpkgs/libfeedback-devel
@@ -0,0 +1 @@
+feedbackd
\ No newline at end of file
From 9c86a1d8fdf8fbc15414a10f9523aa57168999d9 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Sat, 29 Aug 2020 11:47:56 -0700
Subject: [PATCH 02/13] New package: phoc-0.4.2
---
srcpkgs/phoc/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/phoc/template
diff --git a/srcpkgs/phoc/template b/srcpkgs/phoc/template
new file mode 100644
index 00000000000..00c9f1f3ab0
--- /dev/null
+++ b/srcpkgs/phoc/template
@@ -0,0 +1,16 @@
+# Template file for 'phoc'
+pkgname=phoc
+version=0.4.2
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=meson
+configure_args="-Dembed-wlroots=disabled"
+hostmakedepends="glib-devel pkg-config wayland-devel"
+makedepends="gnome-desktop-devel wlroots-devel"
+depends="mutter"
+short_desc="Wlroots based Phone compositor for the Phosh shell"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/phoc"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=bdb34644c7d49c953239c1e939bc5ee2bc26f6187b9d756b70b113d2734c712c
From 8c4cfc6b2a5561b6fc00e28be04df63032afe1e6 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Sat, 29 Aug 2020 11:48:48 -0700
Subject: [PATCH 03/13] New package: squeekboard-1.9.3
---
srcpkgs/squeekboard/template | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
create mode 100644 srcpkgs/squeekboard/template
diff --git a/srcpkgs/squeekboard/template b/srcpkgs/squeekboard/template
new file mode 100644
index 00000000000..87a671e62da
--- /dev/null
+++ b/srcpkgs/squeekboard/template
@@ -0,0 +1,26 @@
+# Template file for 'squeekboard'
+pkgname=squeekboard
+version=1.9.3
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=meson
+build_helper=rust
+hostmakedepends="glib-devel gettext pkg-config cargo wayland-devel"
+makedepends="rust gtk+3-devel gnome-desktop-devel libfeedback-devel"
+depends="feedbackd"
+short_desc="Final Librem5 keyboard"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/squeekboard"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=b99e56faace3986bf752e08c104cea60ed896d514284840655033dd9457db824
+
+pre_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ vsed -i cargo_build.sh -e "s/-a ./-a ${XBPS_CROSS_RUST_TARGET}/g"
+ fi
+}
+
+post_install() {
+ chmod +x ${DESTDIR}/usr/bin/squeekboard-entry
+}
From 3fe5857eaea56a9b1451485cefde64fb49e85464 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Sat, 29 Aug 2020 11:48:59 -0700
Subject: [PATCH 04/13] New package: phosh-0.4.3
---
srcpkgs/phosh/files/phosh.desktop | 11 ++++++++
srcpkgs/phosh/files/sm.puri.OSK0.desktop | 12 +++++++++
srcpkgs/phosh/patches/32bit-build-fix.patch | 30 +++++++++++++++++++++
srcpkgs/phosh/template | 22 +++++++++++++++
4 files changed, 75 insertions(+)
create mode 100644 srcpkgs/phosh/files/phosh.desktop
create mode 100644 srcpkgs/phosh/files/sm.puri.OSK0.desktop
create mode 100644 srcpkgs/phosh/patches/32bit-build-fix.patch
create mode 100644 srcpkgs/phosh/template
diff --git a/srcpkgs/phosh/files/phosh.desktop b/srcpkgs/phosh/files/phosh.desktop
new file mode 100644
index 00000000000..84452845115
--- /dev/null
+++ b/srcpkgs/phosh/files/phosh.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=Phosh
+Name[en]=Phosh
+Comment=This session logs you into Phosh
+Comment[en]=This session logs in you into Phosh
+Exec=dbus-run-session /usr/bin/phosh
+TryExec=/usr/bin/phosh
+Icon=
+Type=Application
+X-DesktopNames=Phosh
+Keywords=launch;Phosh;desktop;session;
diff --git a/srcpkgs/phosh/files/sm.puri.OSK0.desktop b/srcpkgs/phosh/files/sm.puri.OSK0.desktop
new file mode 100644
index 00000000000..39740f15773
--- /dev/null
+++ b/srcpkgs/phosh/files/sm.puri.OSK0.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Type=Application
+Name=On-screen keyboard
+Comment=Default on-screen keyboard
+Exec=/usr/bin/squeekboard
+Categories=GNOME;Core;
+OnlyShowIn=GNOME;
+NoDisplay=true
+X-GNOME-Autostart-Phase=Panel
+X-GNOME-Provides=inputmethod
+X-GNOME-Autostart-Notify=true
+X-GNOME-AutoRestart=true
diff --git a/srcpkgs/phosh/patches/32bit-build-fix.patch b/srcpkgs/phosh/patches/32bit-build-fix.patch
new file mode 100644
index 00000000000..a98ecb0faa5
--- /dev/null
+++ b/srcpkgs/phosh/patches/32bit-build-fix.patch
@@ -0,0 +1,30 @@
+From d1da5ea7d18c6794c9a7d2f41355fe90d4115ac1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
+Date: Tue, 4 Aug 2020 08:22:39 +0200
+Subject: [PATCH] timestamp-label: Unbreak build on 32 bit platforms
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Use a G_ format specifier for GTimeSpan.
+
+Signed-off-by: Guido Günther <guido.gunther@puri.sm>
+---
+ src/notifications/timestamp-label.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/notifications/timestamp-label.c b/src/notifications/timestamp-label.c
+index 0aa04ce0..a5a4d5e7 100644
+--- src/notifications/timestamp-label.c
++++ src/notifications/timestamp-label.c
+@@ -255,7 +255,7 @@ phosh_timestamp_label_calc_timeout (PhoshTimestampLabel *self)
+ break;
+ }
+ timeout_diff = g_date_time_difference (timeout_time, time_now);
+- g_debug ("time out duration = %ld", timeout_diff);
++ g_debug ("time out duration: %" G_GINT64_FORMAT, timeout_diff);
+ return timeout_diff;
+ }
+
+--
+2.26.2
diff --git a/srcpkgs/phosh/template b/srcpkgs/phosh/template
new file mode 100644
index 00000000000..46199202466
--- /dev/null
+++ b/srcpkgs/phosh/template
@@ -0,0 +1,22 @@
+# Template file for 'phosh'
+pkgname=phosh
+version=0.4.3
+revision=1
+build_style=meson
+hostmakedepends="phoc glib-devel gettext pkg-config wayland-devel"
+makedepends="libfeedback-devel gcr-devel gnome-desktop-devel pam-devel
+ polkit-devel pulseaudio-devel libsecret-devel libhandy-devel
+ NetworkManager-devel upower-devel"
+depends="phoc squeekboard gnome-session gnome-settings-daemon elogind
+ xorg-server-xwayland cantarell-fonts font-adobe-source-code-pro"
+short_desc="Shell PoC for the Librem5"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/phosh"
+distfiles="https://repo.pureos.net/pureos/pool/main/p/phosh/phosh_$version.tar.xz"
+checksum=c6fc68aafaf78412637b0f509aafbbca877bda3fe19511bf340b824d7cdbd4ee
+
+post_install() {
+ vcopy ${FILESDIR}/sm.puri.OSK0.desktop usr/share/applications
+ vcopy ${FILESDIR}/phosh.desktop usr/share/wayland-sessions
+}
From 82375dbb709ac7d89b5df7398b20a0a7487b9c3a Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 29 Aug 2020 18:35:47 -0700
Subject: [PATCH 05/13] New package: calls-0.1.8
---
srcpkgs/calls/template | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
create mode 100644 srcpkgs/calls/template
diff --git a/srcpkgs/calls/template b/srcpkgs/calls/template
new file mode 100644
index 00000000000..c17a8570f18
--- /dev/null
+++ b/srcpkgs/calls/template
@@ -0,0 +1,17 @@
+# Template file for 'calls'
+pkgname=calls
+version=0.1.8
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=meson
+hostmakedepends="glib-devel gettext vala pkg-config wayland-devel
+ evolution-data-server-devel"
+makedepends="folks-devel libhandy-devel libpeas-devel gom-devel
+ ModemManager-devel libfeedback-devel"
+depends="NetworkManager ModemManager"
+short_desc="Phone call application"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/calls"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=58fd2c438fadec812a73181fd6b1a79478814bb10bf8153f3b79a4c6271078a9
From 669642bada597d040f8257658fe46a4e40b0f8c3 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 29 Aug 2020 18:36:35 -0700
Subject: [PATCH 06/13] New package: purism-chatty-0.1.15
---
srcpkgs/purism-chatty/template | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
create mode 100644 srcpkgs/purism-chatty/template
diff --git a/srcpkgs/purism-chatty/template b/srcpkgs/purism-chatty/template
new file mode 100644
index 00000000000..d11bfcea882
--- /dev/null
+++ b/srcpkgs/purism-chatty/template
@@ -0,0 +1,22 @@
+# Template file for 'purism-chatty'
+pkgname=purism-chatty
+_pkgname=chatty
+version=0.1.15
+revision=1
+wrksrc=${_pkgname}-v${version}
+build_style=meson
+hostmakedepends="glib-devel pkg-config gettext"
+makedepends="libfeedback-devel libhandy-devel evolution-data-server-devel
+ libpurple libpurple-devel"
+short_desc="XMPP and SMS messaging via libpurple and Modemmanager"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/chatty"
+distfiles="${homepage}/-/archive/v${version}/${_pkgname}-v${version}.tar.gz"
+checksum=9be2b79a266a7fa1e3d3e7ba447ff89d2b9e44312d6e55f2a63d191369528d64
+
+pre_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ vsed -i src/meson.build -e "s/purple_plugdir =.*/purple_plugdir = \'\/usr\/${XBPS_CROSS_TRIPLET}\/usr\/lib\/purple-2\'/g"
+ fi
+}
From 2875b3a5de7e50f8e0a6ed524bdd94e1801bc479 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 12 Sep 2020 15:05:36 -0700
Subject: [PATCH 07/13] New package: kgx-0.2.1
---
srcpkgs/kgx/template | 14 ++++++++++++++
1 file changed, 14 insertions(+)
create mode 100644 srcpkgs/kgx/template
diff --git a/srcpkgs/kgx/template b/srcpkgs/kgx/template
new file mode 100644
index 00000000000..98ec4caf70e
--- /dev/null
+++ b/srcpkgs/kgx/template
@@ -0,0 +1,14 @@
+# Template file for 'kgx'
+pkgname=kgx
+version=0.2.1
+revision=1
+build_style=meson
+hostmakedepends="glib-devel pkg-config gettext"
+makedepends="vte3-devel gtk+3-devel libhandy-devel libgtop-devel"
+depends="dbus desktop-file-utils gsettings-desktop-schemas"
+short_desc="Minimal terminal for GNOME"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://gitlab.gnome.org/ZanderBrown/kgx"
+distfiles="${homepage}/-/archive/${version}/kgx-${version}.tar.gz"
+checksum=70a814b0baf70049d5a20791d58a32e92661428d2deeeb56d91b81cc4dc5e81a
From da2e45ddf5ddc66e3d7bddff26a7efe6941926bf Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 12 Sep 2020 10:58:50 -0700
Subject: [PATCH 08/13] New package: mobile-config-firefox-1.0.1
---
.../files/distro_links.html | 5 +++++
srcpkgs/mobile-config-firefox/template | 16 ++++++++++++++++
2 files changed, 21 insertions(+)
create mode 100644 srcpkgs/mobile-config-firefox/files/distro_links.html
create mode 100644 srcpkgs/mobile-config-firefox/template
diff --git a/srcpkgs/mobile-config-firefox/files/distro_links.html b/srcpkgs/mobile-config-firefox/files/distro_links.html
new file mode 100644
index 00000000000..ca89d0ecd08
--- /dev/null
+++ b/srcpkgs/mobile-config-firefox/files/distro_links.html
@@ -0,0 +1,5 @@
+<p class="distro-links">
+ <a href="https://voidlinux.org/">homepage</a> -
+ <a href="https://docs.voidlinux.org/">docs</a>
+ <a href="https://github.com/void-linux">repos</a>
+</p>
diff --git a/srcpkgs/mobile-config-firefox/template b/srcpkgs/mobile-config-firefox/template
new file mode 100644
index 00000000000..8a1530115e8
--- /dev/null
+++ b/srcpkgs/mobile-config-firefox/template
@@ -0,0 +1,16 @@
+# Template file for 'mobile-config-firefox'
+pkgname=mobile-config-firefox
+version=1.0.1
+revision=1
+build_style=gnu-makefile
+make_install_args="DISTRO=VoidLinux"
+short_desc="Firefox tweaks for mobile and privacy"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://gitlab.com/postmarketOS/mobile-config-firefox"
+distfiles="${homepage}/-/archive/${version}/${pkgname}-${version}.tar.gz"
+checksum=7dce837995956f6f224041853e005eecb3368cd3cbfec6fe3e8a3153747dd0a7
+
+post_extract() {
+ cp ${FILESDIR}/distro_links.html src/homepage
+}
From 01e4214265f14395f9faa0ab210180db733122fa Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 12 Sep 2020 14:42:26 -0700
Subject: [PATCH 09/13] New package: phosh-desktop-0.1
---
.../phosh-desktop/files/000-gschema.override | 20 +++++++++
srcpkgs/phosh-desktop/files/01-phoc-scaling | 5 +++
srcpkgs/phosh-desktop/template | 45 +++++++++++++++++++
3 files changed, 70 insertions(+)
create mode 100644 srcpkgs/phosh-desktop/files/000-gschema.override
create mode 100644 srcpkgs/phosh-desktop/files/01-phoc-scaling
create mode 100644 srcpkgs/phosh-desktop/template
diff --git a/srcpkgs/phosh-desktop/files/000-gschema.override b/srcpkgs/phosh-desktop/files/000-gschema.override
new file mode 100644
index 00000000000..79ec5f6cf6c
--- /dev/null
+++ b/srcpkgs/phosh-desktop/files/000-gschema.override
@@ -0,0 +1,20 @@
+[org.gnome.desktop.background]
+picture-uri='file:///usr/share/backgrounds/gnome/LightWaves.jpg'
+
+[org.gnome.desktop.interface]
+clock-show-weekday=false
+clock-show-date=false
+
+[org.gnome.desktop.wm.preferences]
+button-layout='appmenu:'
+
+[org.gnome.Epiphany]
+search-engines=[('Search the Web', 'https://duckduckgo.com/?q=%s&t=epiphany', ''), ('DuckDuckGo', 'https://duckduckgo.com/?q=%s&t=epiphany', '!ddg'), ('Qwant', 'https://www.qwant.com/?q=%s', '!q')]
+
+[org.gnome.Epiphany.web]
+user-agent='Mozilla/5.0 (Linux; Android 10; Pixel) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.96 Mobile Safari/537.36'
+
+
+[org.gnome.settings-daemon.plugins.power]
+sleep-inactive-ac-type='nothing'
+ambient-enabled=false
diff --git a/srcpkgs/phosh-desktop/files/01-phoc-scaling b/srcpkgs/phosh-desktop/files/01-phoc-scaling
new file mode 100644
index 00000000000..880af2439d3
--- /dev/null
+++ b/srcpkgs/phosh-desktop/files/01-phoc-scaling
@@ -0,0 +1,5 @@
+[sm/puri/phoc/application/firefox]
+scale-to-fit=false
+
+[sm/puri/phoc/application/org-gnome-maps]
+scale-to-fit=true
diff --git a/srcpkgs/phosh-desktop/template b/srcpkgs/phosh-desktop/template
new file mode 100644
index 00000000000..d3b46fab869
--- /dev/null
+++ b/srcpkgs/phosh-desktop/template
@@ -0,0 +1,45 @@
+# Template file for 'phosh-desktop'
+pkgname=phosh-desktop
+version=0.1
+revision=1
+build_style=meta
+depends="
+ phosh
+ kgx
+ calls
+ megapixels
+ purism-chatty
+ iio-sensor-proxy
+ xdg-user-dirs
+ xdg-desktop-portal-gtk
+ gnome-backgrounds
+ gnome-color-manager
+ gnome-control-center
+ gnome-desktop
+ gnome-keyring
+ gnome-online-accounts
+ gnome-online-miners
+ gnome-calculator
+ gnome-calendar
+ gnome-clocks
+ gnome-contacts
+ gnome-maps
+ gnome-music
+ gnome-system-monitor
+ gedit
+ eog
+ evince
+ epiphany
+ evolution
+ gsettings-desktop-schemas
+ nautilus"
+
+short_desc="Phosh desktop environment metapackage"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://voidlinux.org"
+
+post_install() {
+ vinstall ${FILESDIR}/000-gschema.override 644 usr/share/glib-2.0/schemas 000-void.gschema.override
+ vinstall ${FILESDIR}/01-phoc-scaling 644 etc/dconf/db/void.d
+}
From 75d41c9a77f7d781d40d7ee69fb0f2505cdba40a Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 12 Sep 2020 22:17:58 -0700
Subject: [PATCH 10/13] New package: atinout-0.9.1
---
...-happy-by-adding-fallthrough-comment.patch | 25 ++++++
...02-do-not-rely-on-CR-in-modem-output.patch | 84 +++++++++++++++++++
srcpkgs/atinout/patches/0003-version.patch | 11 +++
srcpkgs/atinout/template | 11 +++
4 files changed, 131 insertions(+)
create mode 100644 srcpkgs/atinout/patches/0001-make-gcc-happy-by-adding-fallthrough-comment.patch
create mode 100644 srcpkgs/atinout/patches/0002-do-not-rely-on-CR-in-modem-output.patch
create mode 100644 srcpkgs/atinout/patches/0003-version.patch
create mode 100644 srcpkgs/atinout/template
diff --git a/srcpkgs/atinout/patches/0001-make-gcc-happy-by-adding-fallthrough-comment.patch b/srcpkgs/atinout/patches/0001-make-gcc-happy-by-adding-fallthrough-comment.patch
new file mode 100644
index 00000000000..c0ebbb6561d
--- /dev/null
+++ b/srcpkgs/atinout/patches/0001-make-gcc-happy-by-adding-fallthrough-comment.patch
@@ -0,0 +1,25 @@
+From ca2e04f8b069d269172f0d55d3716a809537f696 Mon Sep 17 00:00:00 2001
+From: Beralt Meppelink <b.meppelink@riwo.eu>
+Date: Fri, 27 Oct 2017 09:12:18 +0200
+Subject: [PATCH 1/2] make gcc happy by adding fallthrough comment
+
+---
+ atinout.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/atinout.c b/atinout.c
+index d04f300..924b5bc 100644
+--- atinout.c
++++ atinout.c
+@@ -150,7 +150,7 @@ static bool is_final_result(const char * const response)
+ if (strcmp(&response[1], "K\r\n") == 0) {
+ return true;
+ }
+- /* no break */
++ // fallthrough
+ default:
+ return false;
+ }
+--
+2.23.0
+
diff --git a/srcpkgs/atinout/patches/0002-do-not-rely-on-CR-in-modem-output.patch b/srcpkgs/atinout/patches/0002-do-not-rely-on-CR-in-modem-output.patch
new file mode 100644
index 00000000000..f9671d089c3
--- /dev/null
+++ b/srcpkgs/atinout/patches/0002-do-not-rely-on-CR-in-modem-output.patch
@@ -0,0 +1,84 @@
+From 65dae46181119867cd8e93ca5b33d3b0cf3df08c Mon Sep 17 00:00:00 2001
+From: Beralt Meppelink <b.meppelink@riwo.eu>
+Date: Fri, 27 Oct 2017 10:42:50 +0200
+Subject: [PATCH 2/2] do not rely on CR in modem output
+
+---
+ atinout.c | 24 +++++++++++-------------
+ 1 file changed, 11 insertions(+), 13 deletions(-)
+
+diff --git a/atinout.c b/atinout.c
+index 924b5bc..4cd7689 100644
+--- atinout.c
++++ atinout.c
+@@ -34,7 +34,6 @@
+
+ #define MAX_LINE_LENGTH (4 * 1024)
+ static char buf[MAX_LINE_LENGTH];
+-static char buf2[MAX_LINE_LENGTH];
+
+ static struct option long_options[] = {
+ {"help", no_argument, NULL, 'h'},
+@@ -125,36 +124,36 @@ static bool is_final_result(const char * const response)
+ }
+ return false;
+ case 'B':
+- if (strcmp(&response[1], "USY\r\n") == 0) {
++ if (strcmp(&response[1], "USY\n") == 0) {
+ return true;
+- }
++ }
++
+ return false;
+
+ case 'E':
+- if (strcmp(&response[1], "RROR\r\n") == 0) {
++ if (strcmp(&response[1], "RROR\n") == 0) {
+ return true;
+ }
+ return false;
+ case 'N':
+- if (strcmp(&response[1], "O ANSWER\r\n") == 0) {
++ if (strcmp(&response[1], "O ANSWER\n") == 0) {
+ return true;
+ }
+- if (strcmp(&response[1], "O CARRIER\r\n") == 0) {
++ if (strcmp(&response[1], "O CARRIER\n") == 0) {
+ return true;
+ }
+- if (strcmp(&response[1], "O DIALTONE\r\n") == 0) {
++ if (strcmp(&response[1], "O DIALTONE\n") == 0) {
+ return true;
+ }
+ return false;
+ case 'O':
+- if (strcmp(&response[1], "K\r\n") == 0) {
++ if (strcmp(&response[1], "K\n") == 0) {
+ return true;
+ }
+ // fallthrough
+ default:
+ return false;
+ }
+-
+ }
+
+ int main(int argc, char *argv[])
+@@ -248,11 +247,10 @@ int main(int argc, char *argv[])
+ fprintf(stderr, "EOF from modem\n");
+ return EXIT_FAILURE;
+ }
+- strcpy(buf2, line);
+- strip_cr(buf2);
+- res = fputs(buf2, output);
++ strip_cr(line);
++ res = fputs(line, output);
+ if (res < 0) {
+- fprintf(stderr, "failed to write '%s' to output file (res = %d)\n", buf2, res);
++ fprintf(stderr, "failed to write '%s' to output file (res = %d)\n", line, res);
+ return EXIT_FAILURE;
+ }
+ } while (! is_final_result(line));
+--
+2.23.0
+
diff --git a/srcpkgs/atinout/patches/0003-version.patch b/srcpkgs/atinout/patches/0003-version.patch
new file mode 100644
index 00000000000..18d92de0630
--- /dev/null
+++ b/srcpkgs/atinout/patches/0003-version.patch
@@ -0,0 +1,11 @@
+--- atinout.c 2020-09-12 16:31:43.049093055 -0700
++++ atinout.c 2020-09-12 16:33:34.269081686 -0700
+@@ -170,7 +169,7 @@
+ help(argv[0]);
+ return EXIT_SUCCESS;
+ case 'V':
+- printf("atinout version " VERSION "\n");
++ printf("atinout version 0.9.1\n");
+ if (argc == 2) {
+ printf("Copyright (C) 2013 Håkon Løvdal <hlovdal@users.sourceforge.net>\n"
+ "This program comes with ABSOLUTELY NO WARRANTY.\n"
diff --git a/srcpkgs/atinout/template b/srcpkgs/atinout/template
new file mode 100644
index 00000000000..db2c2ffd223
--- /dev/null
+++ b/srcpkgs/atinout/template
@@ -0,0 +1,11 @@
+# Template file for 'atinout'
+pkgname=atinout
+version=0.9.1
+revision=1
+build_style=gnu-makefile
+short_desc="AT commands as input are sent to modem and responses given as output"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="http://atinout.sourceforge.net/index.html"
+distfiles="https://netcologne.dl.sourceforge.net/project/atinout/v${version}/atinout-${version}.tar.gz"
+checksum=4d15c8288aca414e11cd304686b172696104c5e42bf776300311c005634854a2
From e6fb79199de3c2a27731875191858c4446f7eab4 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 12 Sep 2020 22:18:46 -0700
Subject: [PATCH 11/13] New package: pinephone-wys-0.1.8
---
srcpkgs/pinephone-wys/files/wys.desktop | 9 +
...-daemon-to-only-switch-card-profiles.patch | 906 ++++++++++++++++++
srcpkgs/pinephone-wys/template | 19 +
3 files changed, 934 insertions(+)
create mode 100644 srcpkgs/pinephone-wys/files/wys.desktop
create mode 100644 srcpkgs/pinephone-wys/patches/0001-Simplify-daemon-to-only-switch-card-profiles.patch
create mode 100644 srcpkgs/pinephone-wys/template
diff --git a/srcpkgs/pinephone-wys/files/wys.desktop b/srcpkgs/pinephone-wys/files/wys.desktop
new file mode 100644
index 00000000000..a6a9f6894a9
--- /dev/null
+++ b/srcpkgs/pinephone-wys/files/wys.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Wys
+Comment=Daemon for managing PulseAudio for phone call audio
+Exec=/usr/bin/wys
+NoDisplay=true
+Terminal=false
+Type=Application
+StartupNotify=true
+X-GNOME-AutoRestart=true
diff --git a/srcpkgs/pinephone-wys/patches/0001-Simplify-daemon-to-only-switch-card-profiles.patch b/srcpkgs/pinephone-wys/patches/0001-Simplify-daemon-to-only-switch-card-profiles.patch
new file mode 100644
index 00000000000..91257f2cbba
--- /dev/null
+++ b/srcpkgs/pinephone-wys/patches/0001-Simplify-daemon-to-only-switch-card-profiles.patch
@@ -0,0 +1,906 @@
+From f66610d26395de15e3928cf4284573ca9cfabf26 Mon Sep 17 00:00:00 2001
+From: Arnaud Ferraris <arnaud.ferraris@collabora.com>
+Date: Fri, 6 Mar 2020 02:01:52 +0100
+Subject: [PATCH] Simplify daemon to only switch card profiles
+
+As a PoC for the PinePhone, we want to only switch card profiles:
+- when a call starts, use the "Voice Call" profile: audio is output on
+the earpiece, and the internal microphone is unmuted
+- when a call is terminated, switch back to the default "HiFi" profile,
+using the main speaker
+
+This should fully cover the most basic use-case. Headset will not work,
+and there is also no support for a "silent mode", but this is enough to
+demonstrate voice calls for the PinePhone.
+---
+diff --git meson.build meson.build
+index 5938cec..7516208 100644
+--- meson.build
++++ meson.build
+@@ -33,11 +33,6 @@ project (
+ ],
+ )
+
+-
+-libmchk_proj = subproject('libmachine-check')
+-libmchk_dep = libmchk_proj.get_variable('libmachine_check_dep')
+-
+-
+ app_name = meson.project_name()
+
+ prefix = get_option('prefix')
+@@ -63,14 +58,3 @@ config_data.set_quoted('DATADIR', full_datadir)
+ config_data.set_quoted('SYSCONFDIR', full_sysconfdir)
+
+ subdir('src')
+-
+-install_subdir (
+- 'machine-conf',
+- install_dir : join_paths(datadir, app_name)
+-)
+-
+-install_subdir (
+- 'machine-check',
+- install_dir : join_paths(datadir, 'machine-check', app_name),
+- strip_directory : true
+-)
+diff --git src/main.c src/main.c
+index 587a5f3..4631a33 100644
+--- src/main.c
++++ src/main.c
+@@ -23,10 +23,8 @@
+ */
+
+ #include "wys-modem.h"
+-#include "wys-audio.h"
+ #include "util.h"
+ #include "config.h"
+-#include "mchk-machine-check.h"
+
+ #include <libmm-glib.h>
+ #include <glib.h>
+@@ -50,8 +48,6 @@ static GMainLoop *main_loop = NULL;
+
+ struct wys_data
+ {
+- /** PulseAudio interface */
+- WysAudio *audio;
+ /** ID for the D-Bus watch */
+ guint watch_id;
+ /** ModemManager object proxy */
+@@ -59,51 +55,112 @@ struct wys_data
+ /** Map of D-Bus object paths to WysModems */
+ GHashTable *modems;
+ /** How many modems have audio, in each direction */
+- guint audio_count[2];
++ guint audio_count;
+ };
+
++static gboolean
++ugly_system (const gchar *cmd)
++{
++ gchar *out = NULL, *err = NULL;
++ gint status;
++ GError *error = NULL;
++ gboolean ok;
++
++ g_debug ("Executing command `%s'", cmd);
++
++ ok = g_spawn_command_line_sync
++ (cmd, &out, &err, &status, &error);
++
++ if (!ok)
++ {
++ g_warning ("Error spawning command `%s': %s'",
++ cmd, error->message);
++ g_error_free (error);
++ return FALSE;
++ }
++
++ ok = g_spawn_check_exit_status (status, &error);
++ if (ok)
++ {
++ g_debug ("Command `%s' executed successfully"
++ "; stdout: `%s'; stderr: `%s'",
++ cmd, out, err);
++ }
++ else
++ {
++ g_warning ("Command `%s' failed: %s"
++ "; stdout: `%s'; stderr: `%s'",
++ cmd, error->message, out, err);
++ g_error_free (error);
++ }
++
++ g_free (out);
++ g_free (err);
++
++ return ok;
++}
++
++#define UGLY_CARD "alsa_card.platform-sound"
++
++static gboolean
++ugly_set_card_profile (const gchar *card,
++ const gchar *profile)
++{
++ g_autofree gchar *cmd = NULL;
++
++ cmd = g_strdup_printf ("pactl set-card-profile '%s' '%s'", card, profile);
++
++ return ugly_system (cmd);
++}
++
++static gboolean
++ugly_set_voice_call (void)
++{
++ return ugly_set_card_profile (UGLY_CARD, "Voice Call");
++}
++
++static gboolean
++ugly_set_hifi (void)
++{
++ return ugly_set_card_profile (UGLY_CARD, "HiFi");
++}
+
+ static void
+ update_audio_count (struct wys_data *data,
+- WysDirection direction,
+ gint delta)
+ {
+- const guint old_count = data->audio_count[direction];
++ const guint old_count = data->audio_count;
+
+- g_assert (delta >= 0 || data->audio_count[direction] > 0);
++ g_assert (delta >= 0 || data->audio_count > 0);
+
+- data->audio_count[direction] += delta;
++ data->audio_count += delta;
+
+- if (data->audio_count[direction] > 0 && old_count == 0)
++ if (data->audio_count > 0 && old_count == 0)
+ {
+- g_debug ("Audio %s now present",
+- wys_direction_get_description (direction));
+- wys_audio_ensure_loopback (data->audio, direction);
++ g_message ("Audio now present");
++ ugly_set_voice_call ();
+ }
+- else if (data->audio_count[direction] == 0 && old_count > 0)
++ else if (data->audio_count == 0 && old_count > 0)
+ {
+- g_debug ("Audio %s now absent",
+- wys_direction_get_description (direction));
+- wys_audio_ensure_no_loopback (data->audio, direction);
++ g_message ("Audio now absent");
++ ugly_set_hifi ();
+ }
+ }
+
+
+ static void
+ audio_present_cb (struct wys_data *data,
+- WysDirection direction,
+ WysModem *modem)
+ {
+- update_audio_count (data, direction, +1);
++ update_audio_count (data, +1);
+ }
+
+
+ static void
+ audio_absent_cb (struct wys_data *data,
+- WysDirection direction,
+ WysModem *modem)
+ {
+- update_audio_count (data, direction, -1);
++ update_audio_count (data, -1);
+ }
+
+
+@@ -123,7 +180,7 @@ add_modem (struct wys_data *data,
+ return;
+ }
+
+- g_debug ("Adding new voice-capable modem `%s'", path);
++ g_message ("Adding new voice-capable modem `%s'", path);
+
+ g_assert (MM_IS_OBJECT (object));
+ voice = mm_object_get_modem_voice (MM_OBJECT (object));
+@@ -153,7 +210,7 @@ interface_added_cb (struct wys_data *data,
+
+ info = g_dbus_interface_get_info (interface);
+
+- g_debug ("ModemManager interface `%s' found on object `%s'",
++ g_message ("ModemManager interface `%s' found on object `%s'",
+ info->name,
+ g_dbus_object_get_object_path (object));
+
+@@ -184,7 +241,7 @@ interface_removed_cb (struct wys_data *data,
+ path = g_dbus_object_get_object_path (object);
+ info = g_dbus_interface_get_info (interface);
+
+- g_debug ("ModemManager interface `%s' removed on object `%s'",
++ g_message ("ModemManager interface `%s' removed on object `%s'",
+ info->name, path);
+
+ if (g_strcmp0 (info->name, MM_DBUS_INTERFACE_MODEM_VOICE) == 0)
+@@ -229,7 +286,7 @@ void
+ object_added_cb (struct wys_data *data,
+ GDBusObject *object)
+ {
+- g_debug ("ModemManager object `%s' added",
++ g_message ("ModemManager object `%s' added",
+ g_dbus_object_get_object_path (object));
+
+ add_mm_object (data, object);
+@@ -243,7 +300,7 @@ object_removed_cb (struct wys_data *data,
+ const gchar *path;
+
+ path = g_dbus_object_get_object_path (object);
+- g_debug ("ModemManager object `%s' removed", path);
++ g_message ("ModemManager object `%s' removed", path);
+
+ remove_modem_object (data, path, object);
+ }
+@@ -286,7 +343,7 @@ mm_appeared_cb (GDBusConnection *connection,
+ const gchar *name_owner,
+ struct wys_data *data)
+ {
+- g_debug ("ModemManager appeared on D-Bus");
++ g_message ("ModemManager appeared on D-Bus");
+
+ mm_manager_new (connection,
+ G_DBUS_OBJECT_MANAGER_CLIENT_FLAGS_NONE,
+@@ -310,18 +367,14 @@ mm_vanished_cb (GDBusConnection *connection,
+ const gchar *name,
+ struct wys_data *data)
+ {
+- g_debug ("ModemManager vanished from D-Bus");
++ g_message ("ModemManager vanished from D-Bus");
+ clear_dbus (data);
+ }
+
+
+ static void
+-set_up (struct wys_data *data,
+- const gchar *codec,
+- const gchar *modem)
++set_up (struct wys_data *data)
+ {
+- data->audio = wys_audio_new (codec, modem);
+-
+ data->modems = g_hash_table_new_full (g_str_hash, g_str_equal,
+ g_free, g_object_unref);
+
+@@ -333,7 +386,7 @@ set_up (struct wys_data *data,
+ (GBusNameVanishedCallback)mm_vanished_cb,
+ data, NULL);
+
+- g_debug ("Watching for ModemManager");
++ g_message ("Watching for ModemManager");
+ }
+
+
+@@ -343,23 +396,19 @@ tear_down (struct wys_data *data)
+ clear_dbus (data);
+ g_bus_unwatch_name (data->watch_id);
+ g_hash_table_unref (data->modems);
+- g_object_unref (G_OBJECT (data->audio));
+ }
+
+
+ static void
+-run (const gchar *codec,
+- const gchar *modem)
++run (void)
+ {
+ struct wys_data data;
+
+ memset (&data, 0, sizeof (struct wys_data));
+- set_up (&data, codec, modem);
++ set_up (&data);
+
+ main_loop = g_main_loop_new (NULL, FALSE);
+
+- printf (APPLICATION_NAME " started with codec `%s', modem `%s'\n",
+- codec, modem);
+ g_main_loop_run (main_loop);
+
+ g_main_loop_unref (main_loop);
+@@ -368,33 +417,6 @@ run (const gchar *codec,
+ tear_down (&data);
+ }
+
+-
+-static void
+-check_machine (const gchar *machine)
+-{
+- gboolean ok, passed;
+- GError *error = NULL;
+-
+- ok = mchk_check_machine (APP_DATA_NAME,
+- machine,
+- &passed,
+- &error);
+- if (!ok)
+- {
+- g_warning ("Error checking machine name against"
+- " whitelist/blacklist, continuing anyway");
+- g_error_free (error);
+- }
+- else if (!passed)
+- {
+- g_message ("Machine name `%s' did not pass"
+- " whitelist/blacklist check, exiting",
+- machine);
+- exit (EXIT_SUCCESS);
+- }
+-}
+-
+-
+ static void
+ terminate (int signal)
+ {
+@@ -452,222 +452,18 @@ setup_signals ()
+ }
+
+
+-/** This function will close @fd */
+-static gchar *
+-read_machine_conf_file (const gchar *filename,
+- int fd)
+-{
+- GInputStream *unix_stream;
+- GDataInputStream *data_stream;
+- gboolean try_again;
+- gchar *line;
+- GError *error = NULL;
+-
+- g_debug ("Reading machine configuration file `%s'", filename);
+-
+- unix_stream = g_unix_input_stream_new (fd, TRUE);
+- g_assert (unix_stream != NULL);
+-
+- data_stream = g_data_input_stream_new (unix_stream);
+- g_assert (data_stream != NULL);
+- g_object_unref (unix_stream);
+-
+- do
+- {
+- try_again = FALSE;
+-
+- line = g_data_input_stream_read_line_utf8
+- (data_stream, NULL, NULL, &error);
+-
+- if (error)
+- {
+- g_warning ("Error reading from machine"
+- " configuration file `%s': %s",
+- filename, error->message);
+- g_error_free (error);
+- }
+- else if (line)
+- {
+- g_strstrip (line);
+-
+- // Skip comments and empty lines
+- if (line[0] == '#' || line[0] == '\0')
+- {
+- g_free (line);
+- try_again = TRUE;
+- }
+- }
+- }
+- while (try_again);
+-
+- g_object_unref (data_stream);
+- return line;
+-}
+-
+-
+-static gchar *
+-dir_machine_conf (const gchar *dir,
+- const gchar *machine,
+- const gchar *key)
+-{
+- gchar *filename;
+- int fd;
+- gchar *value = NULL;
+-
+- filename = g_build_filename (dir, APP_DATA_NAME,
+- "machine-conf",
+- machine, key, NULL);
+-
+- g_debug ("Trying machine configuration file `%s'",
+- filename);
+-
+- fd = g_open (filename, O_RDONLY, 0);
+- if (fd == -1)
+- {
+- if (errno != ENOENT)
+- {
+- // The error isn't that the file doesn't exist
+- g_warning ("Error opening machine"
+- " configuration file `%s': %s",
+- filename, g_strerror (errno));
+- }
+- }
+- else
+- {
+- value = read_machine_conf_file (filename, fd);
+- }
+-
+- g_free (filename);
+- return value;
+-}
+-
+-
+-static gchar *
+-machine_conf (const gchar *machine,
+- const gchar *key)
+-{
+- gchar *value = NULL;
+- const gchar * const *dirs, * const *dir;
+-
+-
+-#define try_dir(d) \
+- value = dir_machine_conf (d, machine, key); \
+- if (value) \
+- { \
+- return value; \
+- }
+-
+-
+- try_dir (g_get_user_config_dir ());
+-
+- dirs = g_get_system_config_dirs ();
+- for (dir = dirs; *dir; ++dir)
+- {
+- try_dir (*dir);
+- }
+-
+- try_dir (SYSCONFDIR);
+- try_dir (DATADIR);
+-
+- dirs = g_get_system_data_dirs ();
+- for (dir = dirs; *dir; ++dir)
+- {
+- try_dir (*dir);
+- }
+-
+-#undef try_dir
+-
+- return NULL;
+-}
+-
+-
+-static void
+-ensure_alsa_card (const gchar *machine,
+- const gchar *var,
+- const gchar *key,
+- gchar **name)
+-{
+- const gchar *env;
+-
+- if (*name)
+- {
+- return;
+- }
+-
+- env = g_getenv (var);
+- if (env)
+- {
+- *name = g_strdup (env);
+- return;
+- }
+-
+- if (machine)
+- {
+- *name = machine_conf (machine, key);
+- if (*name)
+- {
+- return;
+- }
+- }
+-
+- g_warning ("No %s specified with a machine configuration file"
+- ", environment variable or command line option"
+- "; refusing to run", key);
+- exit (EXIT_SUCCESS);
+-}
+-
+-
+ int
+ main (int argc, char **argv)
+ {
+ GError *error = NULL;
+ GOptionContext *context;
+ gboolean ok;
+- g_autofree gchar *codec = NULL;
+- g_autofree gchar *modem = NULL;
+- g_autofree gchar *machine = NULL;
+-
+- GOptionEntry options[] =
+- {
+- { "codec", 'c', 0, G_OPTION_ARG_STRING, &codec, "Name of the codec's ALSA card", "NAME" },
+- { "modem", 'm', 0, G_OPTION_ARG_STRING, &modem, "Name of the modem's ALSA card", "NAME" },
+- { NULL }
+- };
+
+ setlocale(LC_ALL, "");
+
+- machine = mchk_read_machine (NULL);
+- if (machine)
+- {
+- check_machine (machine);
+- }
+- else
+- {
+- g_warning ("Could not read machine name, continuing without machine check");
+- }
+-
+-
+- context = g_option_context_new ("- set up PulseAudio loopback for phone call audio");
+- g_option_context_add_main_entries (context, options, NULL);
+- ok = g_option_context_parse (context, &argc, &argv, &error);
+- if (!ok)
+- {
+- g_print ("Error parsing options: %s\n", error->message);
+- }
+-
+-
+- if (machine)
+- {
+- /* Convert any directory separator characters to "_" */
+- g_strdelimit (machine, G_DIR_SEPARATOR_S, '_');
+- }
+-
+- ensure_alsa_card (machine, "WYS_CODEC", "codec", &codec);
+- ensure_alsa_card (machine, "WYS_MODEM", "modem", &modem);
+-
+ setup_signals ();
+
+- run (codec, modem);
++ run ();
+
+ return 0;
+ }
+diff --git src/meson.build src/meson.build
+index 7b99235..a8a30d7 100644
+--- src/meson.build
++++ src/meson.build
+@@ -22,13 +22,10 @@
+ gnome = import('gnome')
+
+ wys_deps = [
+- libmchk_dep,
+ dependency('gobject-2.0'),
+ dependency('gio-unix-2.0'),
+ dependency('ModemManager'),
+ dependency('mm-glib'),
+- dependency('libpulse'),
+- dependency('libpulse-mainloop-glib'),
+ ]
+
+ config_h = configure_file (
+@@ -36,20 +33,13 @@ config_h = configure_file (
+ configuration: config_data
+ )
+
+-wys_enum_headers = files(['wys-direction.h'])
+-wys_enum_sources = gnome.mkenums_simple('enum-types',
+- sources : wys_enum_headers)
+-
+ executable (
+ 'wys',
+ config_h,
+- wys_enum_sources,
+ [
+ 'main.c',
+ 'util.h', 'util.c',
+- 'wys-direction.h', 'wys-direction.c',
+ 'wys-modem.h', 'wys-modem.c',
+- 'wys-audio.h', 'wys-audio.c',
+ ],
+ dependencies : wys_deps,
+ include_directories : include_directories('..'),
+diff --git src/wys-modem.c src/wys-modem.c
+index 212f992..51a0575 100644
+--- src/wys-modem.c
++++ src/wys-modem.c
+@@ -24,18 +24,10 @@
+
+
+ #include "wys-modem.h"
+-#include "wys-direction.h"
+ #include "util.h"
+-#include "enum-types.h"
+
+ #include <glib/gi18n.h>
+
+-static const gchar * const WYS_MODEM_HAS_AUDIO[] =
+- {
+- [WYS_DIRECTION_FROM_NETWORK] = "wys-has-audio-from-network",
+- [WYS_DIRECTION_TO_NETWORK] = "wys-has-audio-to-network"
+- };
+-
+ struct _WysModem
+ {
+ GObject parent_instance;
+@@ -43,8 +35,8 @@ struct _WysModem
+ MMModemVoice *voice;
+ /** Map of D-Bus object paths to MMCall objects */
+ GHashTable *calls;
+- /** How many calls have audio, in each direction */
+- guint audio_count[2];
++ /** How many calls have audio */
++ guint audio_count;
+ };
+
+ G_DEFINE_TYPE(WysModem, wys_modem, G_TYPE_OBJECT)
+@@ -65,15 +57,11 @@ static guint signals [SIGNAL_LAST_SIGNAL];
+
+
+ static gboolean
+-call_state_has_audio (WysDirection direction,
+- MMCallState state)
++call_state_has_audio (MMCallState state)
+ {
+ switch (state)
+ {
+ case MM_CALL_STATE_RINGING_OUT:
+- return
+- (direction == WYS_DIRECTION_FROM_NETWORK)
+- ? TRUE : FALSE;
+ case MM_CALL_STATE_ACTIVE:
+ return TRUE;
+ default:
+@@ -84,39 +72,35 @@ call_state_has_audio (WysDirection direction,
+
+ static void
+ update_audio_count (WysModem *self,
+- WysDirection direction,
+ gint delta)
+ {
+- const guint old_count = self->audio_count[direction];
++ const guint old_count = self->audio_count;
+
+- g_assert (delta >= 0 || self->audio_count[direction] > 0);
++ g_assert (delta >= 0 || self->audio_count > 0);
+
+- self->audio_count[direction] += delta;
++ self->audio_count += delta;
+
+- if (self->audio_count[direction] > 0 && old_count == 0)
++ if (self->audio_count > 0 && old_count == 0)
+ {
+- g_debug ("Modem `%s' audio %s now present",
+- mm_modem_voice_get_path (self->voice),
+- wys_direction_get_description (direction));
+- g_signal_emit_by_name (self, "audio-present", direction);
++ g_message ("Modem `%s' audio now present",
++ mm_modem_voice_get_path (self->voice));
++ g_signal_emit_by_name (self, "audio-present");
+ }
+- else if (self->audio_count[direction] == 0 && old_count > 0)
++ else if (self->audio_count == 0 && old_count > 0)
+ {
+- g_debug ("Modem `%s' audio now absent",
+- mm_modem_voice_get_path (self->voice));
+- g_signal_emit_by_name (self, "audio-absent", direction);
++ g_message ("Modem `%s' audio now absent",
++ mm_modem_voice_get_path (self->voice));
++ g_signal_emit_by_name (self, "audio-absent");
+ }
+ }
+
+
+ static gboolean
+-get_call_has_audio (MMCall *mm_call,
+- WysDirection direction)
++get_call_has_audio (MMCall *mm_call)
+ {
+ gpointer data;
+
+- data = g_object_get_data (G_OBJECT (mm_call),
+- WYS_MODEM_HAS_AUDIO[direction]);
++ data = g_object_get_data (G_OBJECT (mm_call), "audio-state");
+
+ return (gboolean)(GPOINTER_TO_UINT (data));
+ }
+@@ -124,42 +108,38 @@ get_call_has_audio (MMCall *mm_call,
+
+ static void
+ set_call_has_audio (MMCall *mm_call,
+- WysDirection direction,
+ gboolean has_audio)
+ {
+ g_object_set_data (G_OBJECT (mm_call),
+- WYS_MODEM_HAS_AUDIO[direction],
++ "audio-state",
+ GUINT_TO_POINTER ((guint)has_audio));
+ }
+
+
+ static void
+-update_direction_state (WysModem *self,
+- MMCall *mm_call,
+- const gchar *path,
+- WysDirection direction,
+- MMCallState old_state,
+- MMCallState new_state)
++update_call_state (WysModem *self,
++ MMCall *mm_call,
++ const gchar *path,
++ MMCallState old_state,
++ MMCallState new_state)
+ {
+- gboolean had_audio = call_state_has_audio (direction, old_state);
+- gboolean have_audio = call_state_has_audio (direction, new_state);
++ gboolean had_audio = call_state_has_audio (old_state);
++ gboolean have_audio = call_state_has_audio (new_state);
+
+ if (!had_audio && have_audio)
+ {
+- g_debug ("Call `%s' gained audio %s", path,
+- wys_direction_get_description (direction));
+- update_audio_count (self, direction, +1);
++ g_message ("Call `%s' gained audio", path);
++ update_audio_count (self, +1);
+ }
+ else if (had_audio && !have_audio)
+ {
+- g_debug ("Call `%s' lost audio %s", path,
+- wys_direction_get_description (direction));
+- update_audio_count (self, direction, -1);
++ g_message ("Call `%s' lost audio", path);
++ update_audio_count (self, -1);
+ }
+
+ if (had_audio != have_audio)
+ {
+- set_call_has_audio (mm_call, direction, have_audio);
++ set_call_has_audio (mm_call, have_audio);
+ }
+ }
+
+@@ -174,34 +154,28 @@ call_state_changed_cb (MmGdbusCall *mm_gdbus_call,
+ MMCall *mm_call = MM_CALL (mm_gdbus_call);
+ const gchar * path = mm_call_get_path (mm_call);
+
+- g_debug ("Call `%s' state changed, new: %i, old: %i",
++ g_message ("Call `%s' state changed, new: %i, old: %i",
+ path, (int)new_state, (int)old_state);
+
+ // FIXME: deal with calls being put on hold (one call goes
+ // non-audio, another call goes audio after)
+
+- update_direction_state (self, mm_call, path,
+- WYS_DIRECTION_FROM_NETWORK,
+- old_state, new_state);
+- update_direction_state (self, mm_call, path,
+- WYS_DIRECTION_TO_NETWORK,
+- old_state, new_state);
++ update_call_state (self, mm_call, path, old_state, new_state);
+ }
+
+
+ static void
+-init_call_direction (WysModem *self,
+- MMCall *mm_call,
+- MMCallState state,
+- WysDirection direction)
++init_call_audio (WysModem *self,
++ MMCall *mm_call,
++ MMCallState state)
+ {
+- gboolean has_audio = call_state_has_audio (direction, state);
++ gboolean has_audio = call_state_has_audio (state);
+
+- set_call_has_audio (mm_call, direction, has_audio);
++ set_call_has_audio (mm_call, has_audio);
+
+ if (has_audio)
+ {
+- update_audio_count (self, direction, +1);
++ update_audio_count (self, +1);
+ }
+ }
+
+@@ -223,12 +197,9 @@ add_call (WysModem *self,
+ self);
+
+ state = mm_call_get_state (mm_call);
+- init_call_direction (self, mm_call, state,
+- WYS_DIRECTION_FROM_NETWORK);
+- init_call_direction (self, mm_call, state,
+- WYS_DIRECTION_TO_NETWORK);
++ init_call_audio (self, mm_call, state);
+
+- g_debug ("Call `%s' added, state: %i", path, (int)state);
++ g_message ("Call `%s' added, state: %i", path, (int)state);
+ }
+
+
+@@ -322,16 +293,14 @@ call_added_cb (MMModemVoice *voice,
+
+
+ static void
+-clear_call_direction (WysModem *self,
+- MMCall *mm_call,
+- WysDirection direction)
++clear_call_state (WysModem *self,
++ MMCall *mm_call)
+ {
+- gboolean has_audio =
+- get_call_has_audio (mm_call, direction);
++ gboolean has_audio = get_call_has_audio (mm_call);
+
+ if (has_audio)
+ {
+- update_audio_count (self, direction, -1);
++ update_audio_count (self, -1);
+ }
+ }
+
+@@ -343,7 +312,7 @@ call_deleted_cb (MMModemVoice *voice,
+ {
+ MMCall *mm_call;
+
+- g_debug ("Removing call `%s'", path);
++ g_message ("Removing call `%s'", path);
+
+ mm_call = g_hash_table_lookup (self->calls, path);
+ if (!mm_call)
+@@ -352,14 +321,11 @@ call_deleted_cb (MMModemVoice *voice,
+ return;
+ }
+
+- clear_call_direction (self, mm_call,
+- WYS_DIRECTION_FROM_NETWORK);
+- clear_call_direction (self, mm_call,
+- WYS_DIRECTION_TO_NETWORK);
++ clear_call_state (self, mm_call);
+
+ g_hash_table_remove (self->calls, path);
+
+- g_debug ("Call `%s' removed", path);
++ g_message ("Call `%s' removed", path);
+ }
+
+
+@@ -444,11 +410,9 @@ dispose (GObject *object)
+ if (g_hash_table_size (self->calls) > 0)
+ {
+ g_hash_table_remove_all (self->calls);
+- if (self->audio_count[WYS_DIRECTION_FROM_NETWORK] > 0 ||
+- self->audio_count[WYS_DIRECTION_TO_NETWORK] > 0)
++ if (self->audio_count > 0)
+ {
+- self->audio_count[WYS_DIRECTION_FROM_NETWORK] =
+- self->audio_count[WYS_DIRECTION_TO_NETWORK] = 0;
++ self->audio_count = 0;
+ g_signal_emit_by_name (self, "audio-absent");
+ }
+ }
+@@ -504,8 +468,7 @@ wys_modem_class_init (WysModemClass *klass)
+ G_SIGNAL_RUN_LAST,
+ 0, NULL, NULL, NULL,
+ G_TYPE_NONE,
+- 1,
+- WYS_TYPE_DIRECTION);
++ 0);
+
+ /**
+ * WysModem::audio-absent:
+@@ -520,8 +483,7 @@ wys_modem_class_init (WysModemClass *klass)
+ G_SIGNAL_RUN_LAST,
+ 0, NULL, NULL, NULL,
+ G_TYPE_NONE,
+- 1,
+- WYS_TYPE_DIRECTION);
++ 0);
+ }
+
+
diff --git a/srcpkgs/pinephone-wys/template b/srcpkgs/pinephone-wys/template
new file mode 100644
index 00000000000..ab3eaad64ac
--- /dev/null
+++ b/srcpkgs/pinephone-wys/template
@@ -0,0 +1,19 @@
+# Template file for 'pinephone-wys'
+pkgname=pinephone-wys
+_pkgname=wys
+version=0.1.8
+revision=1
+wrksrc=${_pkgname}-v${version}
+build_style=meson
+hostmakedepends="pkg-config"
+makedepends="glib-devel pulseaudio-devel ModemManager-devel"
+short_desc="Daemon to bring up and take down PulseAudio for phone call audio"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/wys"
+distfiles="${homepage}/-/archive/v${version}/${_pkgname}-v${version}.tar.gz"
+checksum=07fd6d2ae9ea5d6187e1c99d5b0e5c1d9c74ba00f4869f4aae195cd8714ba375
+
+post_install() {
+ vinstall ${FILESDIR}/wys.desktop 644 etc/xdg/autostart
+}
From 30a20098cd3ae68363374d9057a8208de7bd06f4 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 19 Sep 2020 19:12:26 -0700
Subject: [PATCH 12/13] New package: megapixels-0.7.0
---
srcpkgs/megapixels/template | 13 +++++++++++++
1 file changed, 13 insertions(+)
create mode 100644 srcpkgs/megapixels/template
diff --git a/srcpkgs/megapixels/template b/srcpkgs/megapixels/template
new file mode 100644
index 00000000000..ebce6a993b1
--- /dev/null
+++ b/srcpkgs/megapixels/template
@@ -0,0 +1,13 @@
+# Template file for 'megapixels'
+pkgname=megapixels
+version=0.7.0
+revision=1
+build_style=meson
+hostmakedepends="pkg-config glib-devel"
+makedepends="gtk+3-devel"
+short_desc="GTK+3 camera app for ARM devices"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://git.sr.ht/~martijnbraam/megapixels"
+distfiles="${homepage}/archive/${version}.tar.gz"
+checksum=9a5e555924b183e7c4d75d8afdd10a24bcfcad20f898e8d27b3eb171f31f4dd3
From e3f3a36f9e88c3a6764b2764f911dd58812d7d90 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 19 Sep 2020 21:49:43 -0700
Subject: [PATCH 13/13] New package: purple-mm-sms-0.1.7
---
.../patches/0001-Support-meson.patch | 63 +++++++++++++++++++
srcpkgs/purple-mm-sms/template | 14 +++++
2 files changed, 77 insertions(+)
create mode 100644 srcpkgs/purple-mm-sms/patches/0001-Support-meson.patch
create mode 100644 srcpkgs/purple-mm-sms/template
diff --git a/srcpkgs/purple-mm-sms/patches/0001-Support-meson.patch b/srcpkgs/purple-mm-sms/patches/0001-Support-meson.patch
new file mode 100644
index 00000000000..55e4ece0869
--- /dev/null
+++ b/srcpkgs/purple-mm-sms/patches/0001-Support-meson.patch
@@ -0,0 +1,63 @@
+From 1c4896f15f63bb6719ece59b626fddf55b766a0e Mon Sep 17 00:00:00 2001
+From: Julio Galvan <julio-void@epazote.net>
+Date: Sat, 19 Sep 2020 21:32:19 -0700
+Subject: [PATCH] Support meson
+
+I am trying to package this library for voidlinux but it fails to
+crossbuild automatically. I thought that we could use this for now.
+---
+ meson.build | 42 ++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 42 insertions(+)
+ create mode 100644 meson.build
+
+diff --git a/meson.build b/meson.build
+new file mode 100644
+index 0000000..8b6c90e
+--- /dev/null
++++ meson.build
+@@ -0,0 +1,42 @@
++project('purple-mm-sms', 'c',
++ version: '0.1.7',
++)
++
++cc = meson.get_compiler('c')
++
++purple = dependency('purple')
++mm = dependency('mm-glib')
++glib= dependency('glib-2.0', version: '>=2.50.0')
++
++purple_plugdir = purple.get_pkgconfig_variable('plugindir')
++
++mm_sms_headers = [
++ 'mm-sms.h',
++ 'itu-e212-iso.h',
++]
++
++mm_sms_sources = [
++ mm_sms_headers,
++ 'mm-sms.c',
++]
++
++mm_sms_deps = [
++ purple,
++ mm,
++ glib,
++]
++
++mm_sms_shared = shared_library(
++ 'mm-sms',
++ mm_sms_sources,
++ dependencies : mm_sms_deps,
++ name_prefix : '',
++ install_dir : purple_plugdir,
++ install : true,
++)
++
++
++iconsdir = join_paths(get_option('datadir'), 'pixmaps', 'pidgin', 'protocols')
++foreach size: ['16', '22', '48']
++ install_data('icons/mm-sms-' + size + 'px.png', rename: 'mm-sms.png', install_dir: iconsdir + '/' + size)
++endforeach
+--
+2.28.0
+
diff --git a/srcpkgs/purple-mm-sms/template b/srcpkgs/purple-mm-sms/template
new file mode 100644
index 00000000000..ee57770d349
--- /dev/null
+++ b/srcpkgs/purple-mm-sms/template
@@ -0,0 +1,14 @@
+# Template file for 'purple-mm-sms'
+pkgname=purple-mm-sms
+version=0.1.7
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=meson
+hostmakedepends="pkg-config"
+makedepends="ModemManager-devel libglib-devel libpurple-devel"
+short_desc="Purple SMS plugin using ModemManager"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/purple-mm-sms"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=123d71f40051e6afc59dc8f8fb6efef0524a99b377856d99d5e64d0b867ab2be
^ permalink raw reply [flat|nested] 47+ messages in thread* Re: New packages: phoc-0.4.2 calls-0.1.7 purism-chatty-0.1.15
2020-08-29 20:46 [PR PATCH] New packages: phoc-0.4.2 calls-0.1.7 purism-chatty--0.1.15 julio641742
` (32 preceding siblings ...)
2020-09-20 4:57 ` julio641742
@ 2020-09-21 11:11 ` jjsullivan5196
2020-09-21 11:11 ` jjsullivan5196
` (11 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: jjsullivan5196 @ 2020-09-21 11:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 308 bytes --]
New comment by jjsullivan5196 on void-packages repository
https://github.com/void-linux/void-packages/pull/24538#issuecomment-696048786
Comment:
@julio641742 Do you mind if I steal `atinout` for a different PR? I want to add audio routing/modem setup to pinephone-base, and it will be a crucial component.
^ permalink raw reply [flat|nested] 47+ messages in thread* Re: New packages: phoc-0.4.2 calls-0.1.7 purism-chatty-0.1.15
2020-08-29 20:46 [PR PATCH] New packages: phoc-0.4.2 calls-0.1.7 purism-chatty--0.1.15 julio641742
` (33 preceding siblings ...)
2020-09-21 11:11 ` jjsullivan5196
@ 2020-09-21 11:11 ` jjsullivan5196
2020-09-21 11:12 ` jjsullivan5196
` (10 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: jjsullivan5196 @ 2020-09-21 11:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 310 bytes --]
New comment by jjsullivan5196 on void-packages repository
https://github.com/void-linux/void-packages/pull/24538#issuecomment-696048786
Comment:
@julio641742 Do you mind if I steal `atinout` for a different PR? I want to add audio routing/modem setup to `pinephone-base`, and it will be a crucial component.
^ permalink raw reply [flat|nested] 47+ messages in thread* Re: New packages: phoc-0.4.2 calls-0.1.7 purism-chatty-0.1.15
2020-08-29 20:46 [PR PATCH] New packages: phoc-0.4.2 calls-0.1.7 purism-chatty--0.1.15 julio641742
` (34 preceding siblings ...)
2020-09-21 11:11 ` jjsullivan5196
@ 2020-09-21 11:12 ` jjsullivan5196
2020-09-23 21:47 ` [PR PATCH] [Updated] " julio641742
` (9 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: jjsullivan5196 @ 2020-09-21 11:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 450 bytes --]
New comment by jjsullivan5196 on void-packages repository
https://github.com/void-linux/void-packages/pull/24538#issuecomment-696048786
Comment:
@julio641742 Do you mind if I steal `atinout` for a different PR? I want to add audio routing/modem setup to `pinephone-base`, and it will be a crucial component. Nothing in your PR has a direct dependency on it, and the `pinephone-base` PR will be much smaller/easier to merge than this by comparison.
^ permalink raw reply [flat|nested] 47+ messages in thread* Re: [PR PATCH] [Updated] New packages: phoc-0.4.2 calls-0.1.7 purism-chatty-0.1.15
2020-08-29 20:46 [PR PATCH] New packages: phoc-0.4.2 calls-0.1.7 purism-chatty--0.1.15 julio641742
` (35 preceding siblings ...)
2020-09-21 11:12 ` jjsullivan5196
@ 2020-09-23 21:47 ` julio641742
2020-09-23 21:49 ` julio641742
` (8 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: julio641742 @ 2020-09-23 21:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1620 bytes --]
There is an updated pull request by julio641742 against master on the void-packages repository
https://github.com/julio641742/void-packages phosh
https://github.com/void-linux/void-packages/pull/24538
New packages: phoc-0.4.2 calls-0.1.7 purism-chatty-0.1.15
Status of `phosh` on the PinePhone 1.2a
- [x] Shell
- `phosh` `squeekboard` `phoc` `feedbackd` packaged
- `phosh-desktop` (Should I rename it?, Does it need any additional dependencies?)
- [x] Calls (sound is bad)
- `calls` `pinephone-wys` packaged
- [x] SMS (works)
- `purism-chatty` `purple-mm-sms` packaged
- [x] Data (works)
- [ ] Camera (working on it)
- `megapixels` packaged
The modem needs to be manually enabled every single time with `echo 1 > /sys/class/modem-power/modem-power/device/powered` (I could create a service for that).
You need to run this [script](https://gitlab.com/postmarketOS/pmaports/-/blob/master/device/community/device-pine64-pinephone/setup-modem.sh) at least one time for it to set up the modem with the right settings.
i am able to make calls with `calls` and `pinephone-wys`. I am using the sound profiles from [here](https://gitlab.com/postmarketOS/pmaports/-/tree/master/device/community/device-pine64-pinephone/ucm) and `alsa-ucm-conf`(not yet packaged) but the sound is bad.
`purism-chatty` can't find `libjabber.so` and `mm-sms.so` that are inside `/usr/lib/purple-2`. I created symlinks from `/usr/lib/purple-2/{libjabber.so,mm-sms.so}` to `/usr/lib` Any suggestions on how to fix this?
A patch file from https://github.com/void-linux/void-packages/pull/24538.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-phosh-24538.patch --]
[-- Type: text/x-diff, Size: 54655 bytes --]
From d0f56d55265740c06bf7cf2f1f344b561c391243 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Sat, 29 Aug 2020 11:47:35 -0700
Subject: [PATCH 01/13] New package: feedbackd-0.0.0+git20200726
---
common/shlibs | 1 +
srcpkgs/feedbackd/template | 37 +++++++++++++++++++++++++++++++++++++
srcpkgs/feedbackd/update | 2 ++
srcpkgs/libfeedback | 1 +
srcpkgs/libfeedback-devel | 1 +
5 files changed, 42 insertions(+)
create mode 100644 srcpkgs/feedbackd/template
create mode 100644 srcpkgs/feedbackd/update
create mode 120000 srcpkgs/libfeedback
create mode 120000 srcpkgs/libfeedback-devel
diff --git a/common/shlibs b/common/shlibs
index e2c43cb88af..97e25eda47e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3989,3 +3989,4 @@ libneatvnc.so.0 neatvnc-0.2.0_1
libtdjson.so.1.6.0 libtd-1.6.0_1
libJudy.so.1 judy-1.0.5_1
libsignal-protocol-c.so.2 libsignal-protocol-c-2.3.3_2
+libfeedback-0.0.so.0 libfeedback-0.0.0+git20200707_1
diff --git a/srcpkgs/feedbackd/template b/srcpkgs/feedbackd/template
new file mode 100644
index 00000000000..6551c47e1e6
--- /dev/null
+++ b/srcpkgs/feedbackd/template
@@ -0,0 +1,37 @@
+# Template file for 'feedbackd'
+pkgname=feedbackd
+version=0.0.0+git20200726
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=meson
+build_helper=gir
+hostmakedepends="vala glib-devel pkg-config"
+makedepends="gsound-devel libgudev-devel json-glib-devel"
+depends="dbus"
+short_desc="Daemon to provide haptic feedback on events"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/feedbackd"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=e9632d1d1ef228bb7f6ca3d3d875806b2a5763b4def4e30e94acf0c7f3eb79ef
+
+post_install() {
+ vinstall debian/feedbackd.udev 0644 usr/lib/udev/rules.d 90-feedbackd.rules
+}
+
+libfeedback_package() {
+ short_desc+=" - shared libraries"
+ pkg_install() {
+ vmove "usr/lib/*.so.*"
+ }
+}
+
+libfeedback-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ }
+}
diff --git a/srcpkgs/feedbackd/update b/srcpkgs/feedbackd/update
new file mode 100644
index 00000000000..4e461b21e8c
--- /dev/null
+++ b/srcpkgs/feedbackd/update
@@ -0,0 +1,2 @@
+site="https://source.puri.sm/Librem5/${pkgname}/tags"
+pattern='/archive/[^/]+/\Q'"$pkgname"'\E-v?\K[\d\.]+(?=\.tar\.gz")'
diff --git a/srcpkgs/libfeedback b/srcpkgs/libfeedback
new file mode 120000
index 00000000000..49dc965f1cd
--- /dev/null
+++ b/srcpkgs/libfeedback
@@ -0,0 +1 @@
+feedbackd
\ No newline at end of file
diff --git a/srcpkgs/libfeedback-devel b/srcpkgs/libfeedback-devel
new file mode 120000
index 00000000000..49dc965f1cd
--- /dev/null
+++ b/srcpkgs/libfeedback-devel
@@ -0,0 +1 @@
+feedbackd
\ No newline at end of file
From 1455e6fbb075a93ae8f5ec534285d28f64a26c23 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Sat, 29 Aug 2020 11:47:56 -0700
Subject: [PATCH 02/13] New package: phoc-0.4.2
---
srcpkgs/phoc/template | 16 ++++++++++++++++
srcpkgs/phoc/update | 2 ++
2 files changed, 18 insertions(+)
create mode 100644 srcpkgs/phoc/template
create mode 100644 srcpkgs/phoc/update
diff --git a/srcpkgs/phoc/template b/srcpkgs/phoc/template
new file mode 100644
index 00000000000..00c9f1f3ab0
--- /dev/null
+++ b/srcpkgs/phoc/template
@@ -0,0 +1,16 @@
+# Template file for 'phoc'
+pkgname=phoc
+version=0.4.2
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=meson
+configure_args="-Dembed-wlroots=disabled"
+hostmakedepends="glib-devel pkg-config wayland-devel"
+makedepends="gnome-desktop-devel wlroots-devel"
+depends="mutter"
+short_desc="Wlroots based Phone compositor for the Phosh shell"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/phoc"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=bdb34644c7d49c953239c1e939bc5ee2bc26f6187b9d756b70b113d2734c712c
diff --git a/srcpkgs/phoc/update b/srcpkgs/phoc/update
new file mode 100644
index 00000000000..4e461b21e8c
--- /dev/null
+++ b/srcpkgs/phoc/update
@@ -0,0 +1,2 @@
+site="https://source.puri.sm/Librem5/${pkgname}/tags"
+pattern='/archive/[^/]+/\Q'"$pkgname"'\E-v?\K[\d\.]+(?=\.tar\.gz")'
From e00774f305a256111aea6dde160e8b19567f2a31 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Sat, 29 Aug 2020 11:48:48 -0700
Subject: [PATCH 03/13] New package: squeekboard-1.9.3
---
srcpkgs/squeekboard/template | 26 ++++++++++++++++++++++++++
srcpkgs/squeekboard/update | 2 ++
2 files changed, 28 insertions(+)
create mode 100644 srcpkgs/squeekboard/template
create mode 100644 srcpkgs/squeekboard/update
diff --git a/srcpkgs/squeekboard/template b/srcpkgs/squeekboard/template
new file mode 100644
index 00000000000..87a671e62da
--- /dev/null
+++ b/srcpkgs/squeekboard/template
@@ -0,0 +1,26 @@
+# Template file for 'squeekboard'
+pkgname=squeekboard
+version=1.9.3
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=meson
+build_helper=rust
+hostmakedepends="glib-devel gettext pkg-config cargo wayland-devel"
+makedepends="rust gtk+3-devel gnome-desktop-devel libfeedback-devel"
+depends="feedbackd"
+short_desc="Final Librem5 keyboard"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/squeekboard"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=b99e56faace3986bf752e08c104cea60ed896d514284840655033dd9457db824
+
+pre_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ vsed -i cargo_build.sh -e "s/-a ./-a ${XBPS_CROSS_RUST_TARGET}/g"
+ fi
+}
+
+post_install() {
+ chmod +x ${DESTDIR}/usr/bin/squeekboard-entry
+}
diff --git a/srcpkgs/squeekboard/update b/srcpkgs/squeekboard/update
new file mode 100644
index 00000000000..4e461b21e8c
--- /dev/null
+++ b/srcpkgs/squeekboard/update
@@ -0,0 +1,2 @@
+site="https://source.puri.sm/Librem5/${pkgname}/tags"
+pattern='/archive/[^/]+/\Q'"$pkgname"'\E-v?\K[\d\.]+(?=\.tar\.gz")'
From 1c34f9236dc71a4a1cd31170c4467284f76b3b9e Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Sat, 29 Aug 2020 11:48:59 -0700
Subject: [PATCH 04/13] New package: phosh-0.4.4
---
srcpkgs/phosh/files/phosh.desktop | 11 ++++++++
srcpkgs/phosh/files/sm.puri.OSK0.desktop | 12 +++++++++
srcpkgs/phosh/patches/32bit-build-fix.patch | 30 +++++++++++++++++++++
srcpkgs/phosh/template | 22 +++++++++++++++
4 files changed, 75 insertions(+)
create mode 100644 srcpkgs/phosh/files/phosh.desktop
create mode 100644 srcpkgs/phosh/files/sm.puri.OSK0.desktop
create mode 100644 srcpkgs/phosh/patches/32bit-build-fix.patch
create mode 100644 srcpkgs/phosh/template
diff --git a/srcpkgs/phosh/files/phosh.desktop b/srcpkgs/phosh/files/phosh.desktop
new file mode 100644
index 00000000000..84452845115
--- /dev/null
+++ b/srcpkgs/phosh/files/phosh.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=Phosh
+Name[en]=Phosh
+Comment=This session logs you into Phosh
+Comment[en]=This session logs in you into Phosh
+Exec=dbus-run-session /usr/bin/phosh
+TryExec=/usr/bin/phosh
+Icon=
+Type=Application
+X-DesktopNames=Phosh
+Keywords=launch;Phosh;desktop;session;
diff --git a/srcpkgs/phosh/files/sm.puri.OSK0.desktop b/srcpkgs/phosh/files/sm.puri.OSK0.desktop
new file mode 100644
index 00000000000..39740f15773
--- /dev/null
+++ b/srcpkgs/phosh/files/sm.puri.OSK0.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Type=Application
+Name=On-screen keyboard
+Comment=Default on-screen keyboard
+Exec=/usr/bin/squeekboard
+Categories=GNOME;Core;
+OnlyShowIn=GNOME;
+NoDisplay=true
+X-GNOME-Autostart-Phase=Panel
+X-GNOME-Provides=inputmethod
+X-GNOME-Autostart-Notify=true
+X-GNOME-AutoRestart=true
diff --git a/srcpkgs/phosh/patches/32bit-build-fix.patch b/srcpkgs/phosh/patches/32bit-build-fix.patch
new file mode 100644
index 00000000000..a98ecb0faa5
--- /dev/null
+++ b/srcpkgs/phosh/patches/32bit-build-fix.patch
@@ -0,0 +1,30 @@
+From d1da5ea7d18c6794c9a7d2f41355fe90d4115ac1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
+Date: Tue, 4 Aug 2020 08:22:39 +0200
+Subject: [PATCH] timestamp-label: Unbreak build on 32 bit platforms
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Use a G_ format specifier for GTimeSpan.
+
+Signed-off-by: Guido Günther <guido.gunther@puri.sm>
+---
+ src/notifications/timestamp-label.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/notifications/timestamp-label.c b/src/notifications/timestamp-label.c
+index 0aa04ce0..a5a4d5e7 100644
+--- src/notifications/timestamp-label.c
++++ src/notifications/timestamp-label.c
+@@ -255,7 +255,7 @@ phosh_timestamp_label_calc_timeout (PhoshTimestampLabel *self)
+ break;
+ }
+ timeout_diff = g_date_time_difference (timeout_time, time_now);
+- g_debug ("time out duration = %ld", timeout_diff);
++ g_debug ("time out duration: %" G_GINT64_FORMAT, timeout_diff);
+ return timeout_diff;
+ }
+
+--
+2.26.2
diff --git a/srcpkgs/phosh/template b/srcpkgs/phosh/template
new file mode 100644
index 00000000000..199f8531d28
--- /dev/null
+++ b/srcpkgs/phosh/template
@@ -0,0 +1,22 @@
+# Template file for 'phosh'
+pkgname=phosh
+version=0.4.4
+revision=1
+build_style=meson
+hostmakedepends="phoc glib-devel gettext pkg-config wayland-devel"
+makedepends="libfeedback-devel gcr-devel gnome-desktop-devel pam-devel
+ polkit-devel pulseaudio-devel libsecret-devel libhandy1-devel
+ NetworkManager-devel upower-devel"
+depends="phoc squeekboard gnome-session gnome-settings-daemon elogind
+ xorg-server-xwayland cantarell-fonts font-adobe-source-code-pro"
+short_desc="Shell PoC for the Librem5"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/phosh"
+distfiles="https://repo.pureos.net/pureos/pool/main/p/phosh/phosh_$version.tar.xz"
+checksum=1b1161e23b22496027d7c93d75b1be54918402007c4128a1efb8adb3690f437d
+
+post_install() {
+ vcopy ${FILESDIR}/sm.puri.OSK0.desktop usr/share/applications
+ vcopy ${FILESDIR}/phosh.desktop usr/share/wayland-sessions
+}
From 9964faa2b5f54b7d3d4256c64feeb672809e80d6 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 29 Aug 2020 18:35:47 -0700
Subject: [PATCH 05/13] New package: calls-0.1.8
---
srcpkgs/calls/template | 17 +++++++++++++++++
srcpkgs/calls/update | 2 ++
2 files changed, 19 insertions(+)
create mode 100644 srcpkgs/calls/template
create mode 100644 srcpkgs/calls/update
diff --git a/srcpkgs/calls/template b/srcpkgs/calls/template
new file mode 100644
index 00000000000..c17a8570f18
--- /dev/null
+++ b/srcpkgs/calls/template
@@ -0,0 +1,17 @@
+# Template file for 'calls'
+pkgname=calls
+version=0.1.8
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=meson
+hostmakedepends="glib-devel gettext vala pkg-config wayland-devel
+ evolution-data-server-devel"
+makedepends="folks-devel libhandy-devel libpeas-devel gom-devel
+ ModemManager-devel libfeedback-devel"
+depends="NetworkManager ModemManager"
+short_desc="Phone call application"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/calls"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=58fd2c438fadec812a73181fd6b1a79478814bb10bf8153f3b79a4c6271078a9
diff --git a/srcpkgs/calls/update b/srcpkgs/calls/update
new file mode 100644
index 00000000000..4e461b21e8c
--- /dev/null
+++ b/srcpkgs/calls/update
@@ -0,0 +1,2 @@
+site="https://source.puri.sm/Librem5/${pkgname}/tags"
+pattern='/archive/[^/]+/\Q'"$pkgname"'\E-v?\K[\d\.]+(?=\.tar\.gz")'
From 1d3f483363d460f24690c4438ea33efab2a006db Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 29 Aug 2020 18:36:35 -0700
Subject: [PATCH 06/13] New package: purism-chatty-0.1.16
---
srcpkgs/purism-chatty/template | 22 ++++++++++++++++++++++
srcpkgs/purism-chatty/update | 2 ++
2 files changed, 24 insertions(+)
create mode 100644 srcpkgs/purism-chatty/template
create mode 100644 srcpkgs/purism-chatty/update
diff --git a/srcpkgs/purism-chatty/template b/srcpkgs/purism-chatty/template
new file mode 100644
index 00000000000..4af8b2190f0
--- /dev/null
+++ b/srcpkgs/purism-chatty/template
@@ -0,0 +1,22 @@
+# Template file for 'purism-chatty'
+pkgname=purism-chatty
+_pkgname=chatty
+version=0.1.16
+revision=1
+wrksrc=${_pkgname}-v${version}
+build_style=meson
+hostmakedepends="glib-devel pkg-config gettext"
+makedepends="libfeedback-devel libhandy-devel evolution-data-server-devel
+ libpurple libpurple-devel"
+short_desc="XMPP and SMS messaging via libpurple and Modemmanager"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/chatty"
+distfiles="${homepage}/-/archive/v${version}/${_pkgname}-v${version}.tar.gz"
+checksum=2eb565a60892eedc91779eafd83add583007fe9567e4bc270ff9c197854bba4b
+
+pre_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ vsed -i src/meson.build -e "s/purple_plugdir =.*/purple_plugdir = \'\/usr\/${XBPS_CROSS_TRIPLET}\/usr\/lib\/purple-2\'/g"
+ fi
+}
diff --git a/srcpkgs/purism-chatty/update b/srcpkgs/purism-chatty/update
new file mode 100644
index 00000000000..76a93c0b606
--- /dev/null
+++ b/srcpkgs/purism-chatty/update
@@ -0,0 +1,2 @@
+site="https://source.puri.sm/Librem5/${_pkgname}/tags"
+pattern='/archive/[^/]+/\Q'"$_pkgname"'\E-v?\K[\d\.]+(?=\.tar\.gz")'
From 5db3166bc0f60429d22b0c66661f81a6b5874a06 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 12 Sep 2020 15:05:36 -0700
Subject: [PATCH 07/13] New package: kgx-0.2.1
---
srcpkgs/kgx/template | 14 ++++++++++++++
1 file changed, 14 insertions(+)
create mode 100644 srcpkgs/kgx/template
diff --git a/srcpkgs/kgx/template b/srcpkgs/kgx/template
new file mode 100644
index 00000000000..98ec4caf70e
--- /dev/null
+++ b/srcpkgs/kgx/template
@@ -0,0 +1,14 @@
+# Template file for 'kgx'
+pkgname=kgx
+version=0.2.1
+revision=1
+build_style=meson
+hostmakedepends="glib-devel pkg-config gettext"
+makedepends="vte3-devel gtk+3-devel libhandy-devel libgtop-devel"
+depends="dbus desktop-file-utils gsettings-desktop-schemas"
+short_desc="Minimal terminal for GNOME"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://gitlab.gnome.org/ZanderBrown/kgx"
+distfiles="${homepage}/-/archive/${version}/kgx-${version}.tar.gz"
+checksum=70a814b0baf70049d5a20791d58a32e92661428d2deeeb56d91b81cc4dc5e81a
From 0c435f7df08cee34f4a59f6a7bac2084c071fbd3 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 12 Sep 2020 10:58:50 -0700
Subject: [PATCH 08/13] New package: mobile-config-firefox-1.0.1
---
.../files/distro_links.html | 5 +++++
srcpkgs/mobile-config-firefox/template | 16 ++++++++++++++++
2 files changed, 21 insertions(+)
create mode 100644 srcpkgs/mobile-config-firefox/files/distro_links.html
create mode 100644 srcpkgs/mobile-config-firefox/template
diff --git a/srcpkgs/mobile-config-firefox/files/distro_links.html b/srcpkgs/mobile-config-firefox/files/distro_links.html
new file mode 100644
index 00000000000..ca89d0ecd08
--- /dev/null
+++ b/srcpkgs/mobile-config-firefox/files/distro_links.html
@@ -0,0 +1,5 @@
+<p class="distro-links">
+ <a href="https://voidlinux.org/">homepage</a> -
+ <a href="https://docs.voidlinux.org/">docs</a>
+ <a href="https://github.com/void-linux">repos</a>
+</p>
diff --git a/srcpkgs/mobile-config-firefox/template b/srcpkgs/mobile-config-firefox/template
new file mode 100644
index 00000000000..8a1530115e8
--- /dev/null
+++ b/srcpkgs/mobile-config-firefox/template
@@ -0,0 +1,16 @@
+# Template file for 'mobile-config-firefox'
+pkgname=mobile-config-firefox
+version=1.0.1
+revision=1
+build_style=gnu-makefile
+make_install_args="DISTRO=VoidLinux"
+short_desc="Firefox tweaks for mobile and privacy"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://gitlab.com/postmarketOS/mobile-config-firefox"
+distfiles="${homepage}/-/archive/${version}/${pkgname}-${version}.tar.gz"
+checksum=7dce837995956f6f224041853e005eecb3368cd3cbfec6fe3e8a3153747dd0a7
+
+post_extract() {
+ cp ${FILESDIR}/distro_links.html src/homepage
+}
From f5f1d79b476429af267400a92f013f9be6ff898b Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 12 Sep 2020 14:42:26 -0700
Subject: [PATCH 09/13] New package: phosh-desktop-0.1
---
.../phosh-desktop/files/000-gschema.override | 20 +++++++++
srcpkgs/phosh-desktop/files/01-phoc-scaling | 5 +++
srcpkgs/phosh-desktop/template | 45 +++++++++++++++++++
3 files changed, 70 insertions(+)
create mode 100644 srcpkgs/phosh-desktop/files/000-gschema.override
create mode 100644 srcpkgs/phosh-desktop/files/01-phoc-scaling
create mode 100644 srcpkgs/phosh-desktop/template
diff --git a/srcpkgs/phosh-desktop/files/000-gschema.override b/srcpkgs/phosh-desktop/files/000-gschema.override
new file mode 100644
index 00000000000..79ec5f6cf6c
--- /dev/null
+++ b/srcpkgs/phosh-desktop/files/000-gschema.override
@@ -0,0 +1,20 @@
+[org.gnome.desktop.background]
+picture-uri='file:///usr/share/backgrounds/gnome/LightWaves.jpg'
+
+[org.gnome.desktop.interface]
+clock-show-weekday=false
+clock-show-date=false
+
+[org.gnome.desktop.wm.preferences]
+button-layout='appmenu:'
+
+[org.gnome.Epiphany]
+search-engines=[('Search the Web', 'https://duckduckgo.com/?q=%s&t=epiphany', ''), ('DuckDuckGo', 'https://duckduckgo.com/?q=%s&t=epiphany', '!ddg'), ('Qwant', 'https://www.qwant.com/?q=%s', '!q')]
+
+[org.gnome.Epiphany.web]
+user-agent='Mozilla/5.0 (Linux; Android 10; Pixel) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.96 Mobile Safari/537.36'
+
+
+[org.gnome.settings-daemon.plugins.power]
+sleep-inactive-ac-type='nothing'
+ambient-enabled=false
diff --git a/srcpkgs/phosh-desktop/files/01-phoc-scaling b/srcpkgs/phosh-desktop/files/01-phoc-scaling
new file mode 100644
index 00000000000..880af2439d3
--- /dev/null
+++ b/srcpkgs/phosh-desktop/files/01-phoc-scaling
@@ -0,0 +1,5 @@
+[sm/puri/phoc/application/firefox]
+scale-to-fit=false
+
+[sm/puri/phoc/application/org-gnome-maps]
+scale-to-fit=true
diff --git a/srcpkgs/phosh-desktop/template b/srcpkgs/phosh-desktop/template
new file mode 100644
index 00000000000..d3b46fab869
--- /dev/null
+++ b/srcpkgs/phosh-desktop/template
@@ -0,0 +1,45 @@
+# Template file for 'phosh-desktop'
+pkgname=phosh-desktop
+version=0.1
+revision=1
+build_style=meta
+depends="
+ phosh
+ kgx
+ calls
+ megapixels
+ purism-chatty
+ iio-sensor-proxy
+ xdg-user-dirs
+ xdg-desktop-portal-gtk
+ gnome-backgrounds
+ gnome-color-manager
+ gnome-control-center
+ gnome-desktop
+ gnome-keyring
+ gnome-online-accounts
+ gnome-online-miners
+ gnome-calculator
+ gnome-calendar
+ gnome-clocks
+ gnome-contacts
+ gnome-maps
+ gnome-music
+ gnome-system-monitor
+ gedit
+ eog
+ evince
+ epiphany
+ evolution
+ gsettings-desktop-schemas
+ nautilus"
+
+short_desc="Phosh desktop environment metapackage"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://voidlinux.org"
+
+post_install() {
+ vinstall ${FILESDIR}/000-gschema.override 644 usr/share/glib-2.0/schemas 000-void.gschema.override
+ vinstall ${FILESDIR}/01-phoc-scaling 644 etc/dconf/db/void.d
+}
From 78281e74ff2868c2ebe2ec590678532f00861af9 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 12 Sep 2020 22:18:46 -0700
Subject: [PATCH 10/13] New package: pinephone-wys-0.1.8
---
srcpkgs/pinephone-wys/files/wys.desktop | 9 +
...-daemon-to-only-switch-card-profiles.patch | 906 ++++++++++++++++++
srcpkgs/pinephone-wys/template | 19 +
srcpkgs/pinephone-wys/update | 2 +
4 files changed, 936 insertions(+)
create mode 100644 srcpkgs/pinephone-wys/files/wys.desktop
create mode 100644 srcpkgs/pinephone-wys/patches/0001-Simplify-daemon-to-only-switch-card-profiles.patch
create mode 100644 srcpkgs/pinephone-wys/template
create mode 100644 srcpkgs/pinephone-wys/update
diff --git a/srcpkgs/pinephone-wys/files/wys.desktop b/srcpkgs/pinephone-wys/files/wys.desktop
new file mode 100644
index 00000000000..a6a9f6894a9
--- /dev/null
+++ b/srcpkgs/pinephone-wys/files/wys.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Wys
+Comment=Daemon for managing PulseAudio for phone call audio
+Exec=/usr/bin/wys
+NoDisplay=true
+Terminal=false
+Type=Application
+StartupNotify=true
+X-GNOME-AutoRestart=true
diff --git a/srcpkgs/pinephone-wys/patches/0001-Simplify-daemon-to-only-switch-card-profiles.patch b/srcpkgs/pinephone-wys/patches/0001-Simplify-daemon-to-only-switch-card-profiles.patch
new file mode 100644
index 00000000000..91257f2cbba
--- /dev/null
+++ b/srcpkgs/pinephone-wys/patches/0001-Simplify-daemon-to-only-switch-card-profiles.patch
@@ -0,0 +1,906 @@
+From f66610d26395de15e3928cf4284573ca9cfabf26 Mon Sep 17 00:00:00 2001
+From: Arnaud Ferraris <arnaud.ferraris@collabora.com>
+Date: Fri, 6 Mar 2020 02:01:52 +0100
+Subject: [PATCH] Simplify daemon to only switch card profiles
+
+As a PoC for the PinePhone, we want to only switch card profiles:
+- when a call starts, use the "Voice Call" profile: audio is output on
+the earpiece, and the internal microphone is unmuted
+- when a call is terminated, switch back to the default "HiFi" profile,
+using the main speaker
+
+This should fully cover the most basic use-case. Headset will not work,
+and there is also no support for a "silent mode", but this is enough to
+demonstrate voice calls for the PinePhone.
+---
+diff --git meson.build meson.build
+index 5938cec..7516208 100644
+--- meson.build
++++ meson.build
+@@ -33,11 +33,6 @@ project (
+ ],
+ )
+
+-
+-libmchk_proj = subproject('libmachine-check')
+-libmchk_dep = libmchk_proj.get_variable('libmachine_check_dep')
+-
+-
+ app_name = meson.project_name()
+
+ prefix = get_option('prefix')
+@@ -63,14 +58,3 @@ config_data.set_quoted('DATADIR', full_datadir)
+ config_data.set_quoted('SYSCONFDIR', full_sysconfdir)
+
+ subdir('src')
+-
+-install_subdir (
+- 'machine-conf',
+- install_dir : join_paths(datadir, app_name)
+-)
+-
+-install_subdir (
+- 'machine-check',
+- install_dir : join_paths(datadir, 'machine-check', app_name),
+- strip_directory : true
+-)
+diff --git src/main.c src/main.c
+index 587a5f3..4631a33 100644
+--- src/main.c
++++ src/main.c
+@@ -23,10 +23,8 @@
+ */
+
+ #include "wys-modem.h"
+-#include "wys-audio.h"
+ #include "util.h"
+ #include "config.h"
+-#include "mchk-machine-check.h"
+
+ #include <libmm-glib.h>
+ #include <glib.h>
+@@ -50,8 +48,6 @@ static GMainLoop *main_loop = NULL;
+
+ struct wys_data
+ {
+- /** PulseAudio interface */
+- WysAudio *audio;
+ /** ID for the D-Bus watch */
+ guint watch_id;
+ /** ModemManager object proxy */
+@@ -59,51 +55,112 @@ struct wys_data
+ /** Map of D-Bus object paths to WysModems */
+ GHashTable *modems;
+ /** How many modems have audio, in each direction */
+- guint audio_count[2];
++ guint audio_count;
+ };
+
++static gboolean
++ugly_system (const gchar *cmd)
++{
++ gchar *out = NULL, *err = NULL;
++ gint status;
++ GError *error = NULL;
++ gboolean ok;
++
++ g_debug ("Executing command `%s'", cmd);
++
++ ok = g_spawn_command_line_sync
++ (cmd, &out, &err, &status, &error);
++
++ if (!ok)
++ {
++ g_warning ("Error spawning command `%s': %s'",
++ cmd, error->message);
++ g_error_free (error);
++ return FALSE;
++ }
++
++ ok = g_spawn_check_exit_status (status, &error);
++ if (ok)
++ {
++ g_debug ("Command `%s' executed successfully"
++ "; stdout: `%s'; stderr: `%s'",
++ cmd, out, err);
++ }
++ else
++ {
++ g_warning ("Command `%s' failed: %s"
++ "; stdout: `%s'; stderr: `%s'",
++ cmd, error->message, out, err);
++ g_error_free (error);
++ }
++
++ g_free (out);
++ g_free (err);
++
++ return ok;
++}
++
++#define UGLY_CARD "alsa_card.platform-sound"
++
++static gboolean
++ugly_set_card_profile (const gchar *card,
++ const gchar *profile)
++{
++ g_autofree gchar *cmd = NULL;
++
++ cmd = g_strdup_printf ("pactl set-card-profile '%s' '%s'", card, profile);
++
++ return ugly_system (cmd);
++}
++
++static gboolean
++ugly_set_voice_call (void)
++{
++ return ugly_set_card_profile (UGLY_CARD, "Voice Call");
++}
++
++static gboolean
++ugly_set_hifi (void)
++{
++ return ugly_set_card_profile (UGLY_CARD, "HiFi");
++}
+
+ static void
+ update_audio_count (struct wys_data *data,
+- WysDirection direction,
+ gint delta)
+ {
+- const guint old_count = data->audio_count[direction];
++ const guint old_count = data->audio_count;
+
+- g_assert (delta >= 0 || data->audio_count[direction] > 0);
++ g_assert (delta >= 0 || data->audio_count > 0);
+
+- data->audio_count[direction] += delta;
++ data->audio_count += delta;
+
+- if (data->audio_count[direction] > 0 && old_count == 0)
++ if (data->audio_count > 0 && old_count == 0)
+ {
+- g_debug ("Audio %s now present",
+- wys_direction_get_description (direction));
+- wys_audio_ensure_loopback (data->audio, direction);
++ g_message ("Audio now present");
++ ugly_set_voice_call ();
+ }
+- else if (data->audio_count[direction] == 0 && old_count > 0)
++ else if (data->audio_count == 0 && old_count > 0)
+ {
+- g_debug ("Audio %s now absent",
+- wys_direction_get_description (direction));
+- wys_audio_ensure_no_loopback (data->audio, direction);
++ g_message ("Audio now absent");
++ ugly_set_hifi ();
+ }
+ }
+
+
+ static void
+ audio_present_cb (struct wys_data *data,
+- WysDirection direction,
+ WysModem *modem)
+ {
+- update_audio_count (data, direction, +1);
++ update_audio_count (data, +1);
+ }
+
+
+ static void
+ audio_absent_cb (struct wys_data *data,
+- WysDirection direction,
+ WysModem *modem)
+ {
+- update_audio_count (data, direction, -1);
++ update_audio_count (data, -1);
+ }
+
+
+@@ -123,7 +180,7 @@ add_modem (struct wys_data *data,
+ return;
+ }
+
+- g_debug ("Adding new voice-capable modem `%s'", path);
++ g_message ("Adding new voice-capable modem `%s'", path);
+
+ g_assert (MM_IS_OBJECT (object));
+ voice = mm_object_get_modem_voice (MM_OBJECT (object));
+@@ -153,7 +210,7 @@ interface_added_cb (struct wys_data *data,
+
+ info = g_dbus_interface_get_info (interface);
+
+- g_debug ("ModemManager interface `%s' found on object `%s'",
++ g_message ("ModemManager interface `%s' found on object `%s'",
+ info->name,
+ g_dbus_object_get_object_path (object));
+
+@@ -184,7 +241,7 @@ interface_removed_cb (struct wys_data *data,
+ path = g_dbus_object_get_object_path (object);
+ info = g_dbus_interface_get_info (interface);
+
+- g_debug ("ModemManager interface `%s' removed on object `%s'",
++ g_message ("ModemManager interface `%s' removed on object `%s'",
+ info->name, path);
+
+ if (g_strcmp0 (info->name, MM_DBUS_INTERFACE_MODEM_VOICE) == 0)
+@@ -229,7 +286,7 @@ void
+ object_added_cb (struct wys_data *data,
+ GDBusObject *object)
+ {
+- g_debug ("ModemManager object `%s' added",
++ g_message ("ModemManager object `%s' added",
+ g_dbus_object_get_object_path (object));
+
+ add_mm_object (data, object);
+@@ -243,7 +300,7 @@ object_removed_cb (struct wys_data *data,
+ const gchar *path;
+
+ path = g_dbus_object_get_object_path (object);
+- g_debug ("ModemManager object `%s' removed", path);
++ g_message ("ModemManager object `%s' removed", path);
+
+ remove_modem_object (data, path, object);
+ }
+@@ -286,7 +343,7 @@ mm_appeared_cb (GDBusConnection *connection,
+ const gchar *name_owner,
+ struct wys_data *data)
+ {
+- g_debug ("ModemManager appeared on D-Bus");
++ g_message ("ModemManager appeared on D-Bus");
+
+ mm_manager_new (connection,
+ G_DBUS_OBJECT_MANAGER_CLIENT_FLAGS_NONE,
+@@ -310,18 +367,14 @@ mm_vanished_cb (GDBusConnection *connection,
+ const gchar *name,
+ struct wys_data *data)
+ {
+- g_debug ("ModemManager vanished from D-Bus");
++ g_message ("ModemManager vanished from D-Bus");
+ clear_dbus (data);
+ }
+
+
+ static void
+-set_up (struct wys_data *data,
+- const gchar *codec,
+- const gchar *modem)
++set_up (struct wys_data *data)
+ {
+- data->audio = wys_audio_new (codec, modem);
+-
+ data->modems = g_hash_table_new_full (g_str_hash, g_str_equal,
+ g_free, g_object_unref);
+
+@@ -333,7 +386,7 @@ set_up (struct wys_data *data,
+ (GBusNameVanishedCallback)mm_vanished_cb,
+ data, NULL);
+
+- g_debug ("Watching for ModemManager");
++ g_message ("Watching for ModemManager");
+ }
+
+
+@@ -343,23 +396,19 @@ tear_down (struct wys_data *data)
+ clear_dbus (data);
+ g_bus_unwatch_name (data->watch_id);
+ g_hash_table_unref (data->modems);
+- g_object_unref (G_OBJECT (data->audio));
+ }
+
+
+ static void
+-run (const gchar *codec,
+- const gchar *modem)
++run (void)
+ {
+ struct wys_data data;
+
+ memset (&data, 0, sizeof (struct wys_data));
+- set_up (&data, codec, modem);
++ set_up (&data);
+
+ main_loop = g_main_loop_new (NULL, FALSE);
+
+- printf (APPLICATION_NAME " started with codec `%s', modem `%s'\n",
+- codec, modem);
+ g_main_loop_run (main_loop);
+
+ g_main_loop_unref (main_loop);
+@@ -368,33 +417,6 @@ run (const gchar *codec,
+ tear_down (&data);
+ }
+
+-
+-static void
+-check_machine (const gchar *machine)
+-{
+- gboolean ok, passed;
+- GError *error = NULL;
+-
+- ok = mchk_check_machine (APP_DATA_NAME,
+- machine,
+- &passed,
+- &error);
+- if (!ok)
+- {
+- g_warning ("Error checking machine name against"
+- " whitelist/blacklist, continuing anyway");
+- g_error_free (error);
+- }
+- else if (!passed)
+- {
+- g_message ("Machine name `%s' did not pass"
+- " whitelist/blacklist check, exiting",
+- machine);
+- exit (EXIT_SUCCESS);
+- }
+-}
+-
+-
+ static void
+ terminate (int signal)
+ {
+@@ -452,222 +452,18 @@ setup_signals ()
+ }
+
+
+-/** This function will close @fd */
+-static gchar *
+-read_machine_conf_file (const gchar *filename,
+- int fd)
+-{
+- GInputStream *unix_stream;
+- GDataInputStream *data_stream;
+- gboolean try_again;
+- gchar *line;
+- GError *error = NULL;
+-
+- g_debug ("Reading machine configuration file `%s'", filename);
+-
+- unix_stream = g_unix_input_stream_new (fd, TRUE);
+- g_assert (unix_stream != NULL);
+-
+- data_stream = g_data_input_stream_new (unix_stream);
+- g_assert (data_stream != NULL);
+- g_object_unref (unix_stream);
+-
+- do
+- {
+- try_again = FALSE;
+-
+- line = g_data_input_stream_read_line_utf8
+- (data_stream, NULL, NULL, &error);
+-
+- if (error)
+- {
+- g_warning ("Error reading from machine"
+- " configuration file `%s': %s",
+- filename, error->message);
+- g_error_free (error);
+- }
+- else if (line)
+- {
+- g_strstrip (line);
+-
+- // Skip comments and empty lines
+- if (line[0] == '#' || line[0] == '\0')
+- {
+- g_free (line);
+- try_again = TRUE;
+- }
+- }
+- }
+- while (try_again);
+-
+- g_object_unref (data_stream);
+- return line;
+-}
+-
+-
+-static gchar *
+-dir_machine_conf (const gchar *dir,
+- const gchar *machine,
+- const gchar *key)
+-{
+- gchar *filename;
+- int fd;
+- gchar *value = NULL;
+-
+- filename = g_build_filename (dir, APP_DATA_NAME,
+- "machine-conf",
+- machine, key, NULL);
+-
+- g_debug ("Trying machine configuration file `%s'",
+- filename);
+-
+- fd = g_open (filename, O_RDONLY, 0);
+- if (fd == -1)
+- {
+- if (errno != ENOENT)
+- {
+- // The error isn't that the file doesn't exist
+- g_warning ("Error opening machine"
+- " configuration file `%s': %s",
+- filename, g_strerror (errno));
+- }
+- }
+- else
+- {
+- value = read_machine_conf_file (filename, fd);
+- }
+-
+- g_free (filename);
+- return value;
+-}
+-
+-
+-static gchar *
+-machine_conf (const gchar *machine,
+- const gchar *key)
+-{
+- gchar *value = NULL;
+- const gchar * const *dirs, * const *dir;
+-
+-
+-#define try_dir(d) \
+- value = dir_machine_conf (d, machine, key); \
+- if (value) \
+- { \
+- return value; \
+- }
+-
+-
+- try_dir (g_get_user_config_dir ());
+-
+- dirs = g_get_system_config_dirs ();
+- for (dir = dirs; *dir; ++dir)
+- {
+- try_dir (*dir);
+- }
+-
+- try_dir (SYSCONFDIR);
+- try_dir (DATADIR);
+-
+- dirs = g_get_system_data_dirs ();
+- for (dir = dirs; *dir; ++dir)
+- {
+- try_dir (*dir);
+- }
+-
+-#undef try_dir
+-
+- return NULL;
+-}
+-
+-
+-static void
+-ensure_alsa_card (const gchar *machine,
+- const gchar *var,
+- const gchar *key,
+- gchar **name)
+-{
+- const gchar *env;
+-
+- if (*name)
+- {
+- return;
+- }
+-
+- env = g_getenv (var);
+- if (env)
+- {
+- *name = g_strdup (env);
+- return;
+- }
+-
+- if (machine)
+- {
+- *name = machine_conf (machine, key);
+- if (*name)
+- {
+- return;
+- }
+- }
+-
+- g_warning ("No %s specified with a machine configuration file"
+- ", environment variable or command line option"
+- "; refusing to run", key);
+- exit (EXIT_SUCCESS);
+-}
+-
+-
+ int
+ main (int argc, char **argv)
+ {
+ GError *error = NULL;
+ GOptionContext *context;
+ gboolean ok;
+- g_autofree gchar *codec = NULL;
+- g_autofree gchar *modem = NULL;
+- g_autofree gchar *machine = NULL;
+-
+- GOptionEntry options[] =
+- {
+- { "codec", 'c', 0, G_OPTION_ARG_STRING, &codec, "Name of the codec's ALSA card", "NAME" },
+- { "modem", 'm', 0, G_OPTION_ARG_STRING, &modem, "Name of the modem's ALSA card", "NAME" },
+- { NULL }
+- };
+
+ setlocale(LC_ALL, "");
+
+- machine = mchk_read_machine (NULL);
+- if (machine)
+- {
+- check_machine (machine);
+- }
+- else
+- {
+- g_warning ("Could not read machine name, continuing without machine check");
+- }
+-
+-
+- context = g_option_context_new ("- set up PulseAudio loopback for phone call audio");
+- g_option_context_add_main_entries (context, options, NULL);
+- ok = g_option_context_parse (context, &argc, &argv, &error);
+- if (!ok)
+- {
+- g_print ("Error parsing options: %s\n", error->message);
+- }
+-
+-
+- if (machine)
+- {
+- /* Convert any directory separator characters to "_" */
+- g_strdelimit (machine, G_DIR_SEPARATOR_S, '_');
+- }
+-
+- ensure_alsa_card (machine, "WYS_CODEC", "codec", &codec);
+- ensure_alsa_card (machine, "WYS_MODEM", "modem", &modem);
+-
+ setup_signals ();
+
+- run (codec, modem);
++ run ();
+
+ return 0;
+ }
+diff --git src/meson.build src/meson.build
+index 7b99235..a8a30d7 100644
+--- src/meson.build
++++ src/meson.build
+@@ -22,13 +22,10 @@
+ gnome = import('gnome')
+
+ wys_deps = [
+- libmchk_dep,
+ dependency('gobject-2.0'),
+ dependency('gio-unix-2.0'),
+ dependency('ModemManager'),
+ dependency('mm-glib'),
+- dependency('libpulse'),
+- dependency('libpulse-mainloop-glib'),
+ ]
+
+ config_h = configure_file (
+@@ -36,20 +33,13 @@ config_h = configure_file (
+ configuration: config_data
+ )
+
+-wys_enum_headers = files(['wys-direction.h'])
+-wys_enum_sources = gnome.mkenums_simple('enum-types',
+- sources : wys_enum_headers)
+-
+ executable (
+ 'wys',
+ config_h,
+- wys_enum_sources,
+ [
+ 'main.c',
+ 'util.h', 'util.c',
+- 'wys-direction.h', 'wys-direction.c',
+ 'wys-modem.h', 'wys-modem.c',
+- 'wys-audio.h', 'wys-audio.c',
+ ],
+ dependencies : wys_deps,
+ include_directories : include_directories('..'),
+diff --git src/wys-modem.c src/wys-modem.c
+index 212f992..51a0575 100644
+--- src/wys-modem.c
++++ src/wys-modem.c
+@@ -24,18 +24,10 @@
+
+
+ #include "wys-modem.h"
+-#include "wys-direction.h"
+ #include "util.h"
+-#include "enum-types.h"
+
+ #include <glib/gi18n.h>
+
+-static const gchar * const WYS_MODEM_HAS_AUDIO[] =
+- {
+- [WYS_DIRECTION_FROM_NETWORK] = "wys-has-audio-from-network",
+- [WYS_DIRECTION_TO_NETWORK] = "wys-has-audio-to-network"
+- };
+-
+ struct _WysModem
+ {
+ GObject parent_instance;
+@@ -43,8 +35,8 @@ struct _WysModem
+ MMModemVoice *voice;
+ /** Map of D-Bus object paths to MMCall objects */
+ GHashTable *calls;
+- /** How many calls have audio, in each direction */
+- guint audio_count[2];
++ /** How many calls have audio */
++ guint audio_count;
+ };
+
+ G_DEFINE_TYPE(WysModem, wys_modem, G_TYPE_OBJECT)
+@@ -65,15 +57,11 @@ static guint signals [SIGNAL_LAST_SIGNAL];
+
+
+ static gboolean
+-call_state_has_audio (WysDirection direction,
+- MMCallState state)
++call_state_has_audio (MMCallState state)
+ {
+ switch (state)
+ {
+ case MM_CALL_STATE_RINGING_OUT:
+- return
+- (direction == WYS_DIRECTION_FROM_NETWORK)
+- ? TRUE : FALSE;
+ case MM_CALL_STATE_ACTIVE:
+ return TRUE;
+ default:
+@@ -84,39 +72,35 @@ call_state_has_audio (WysDirection direction,
+
+ static void
+ update_audio_count (WysModem *self,
+- WysDirection direction,
+ gint delta)
+ {
+- const guint old_count = self->audio_count[direction];
++ const guint old_count = self->audio_count;
+
+- g_assert (delta >= 0 || self->audio_count[direction] > 0);
++ g_assert (delta >= 0 || self->audio_count > 0);
+
+- self->audio_count[direction] += delta;
++ self->audio_count += delta;
+
+- if (self->audio_count[direction] > 0 && old_count == 0)
++ if (self->audio_count > 0 && old_count == 0)
+ {
+- g_debug ("Modem `%s' audio %s now present",
+- mm_modem_voice_get_path (self->voice),
+- wys_direction_get_description (direction));
+- g_signal_emit_by_name (self, "audio-present", direction);
++ g_message ("Modem `%s' audio now present",
++ mm_modem_voice_get_path (self->voice));
++ g_signal_emit_by_name (self, "audio-present");
+ }
+- else if (self->audio_count[direction] == 0 && old_count > 0)
++ else if (self->audio_count == 0 && old_count > 0)
+ {
+- g_debug ("Modem `%s' audio now absent",
+- mm_modem_voice_get_path (self->voice));
+- g_signal_emit_by_name (self, "audio-absent", direction);
++ g_message ("Modem `%s' audio now absent",
++ mm_modem_voice_get_path (self->voice));
++ g_signal_emit_by_name (self, "audio-absent");
+ }
+ }
+
+
+ static gboolean
+-get_call_has_audio (MMCall *mm_call,
+- WysDirection direction)
++get_call_has_audio (MMCall *mm_call)
+ {
+ gpointer data;
+
+- data = g_object_get_data (G_OBJECT (mm_call),
+- WYS_MODEM_HAS_AUDIO[direction]);
++ data = g_object_get_data (G_OBJECT (mm_call), "audio-state");
+
+ return (gboolean)(GPOINTER_TO_UINT (data));
+ }
+@@ -124,42 +108,38 @@ get_call_has_audio (MMCall *mm_call,
+
+ static void
+ set_call_has_audio (MMCall *mm_call,
+- WysDirection direction,
+ gboolean has_audio)
+ {
+ g_object_set_data (G_OBJECT (mm_call),
+- WYS_MODEM_HAS_AUDIO[direction],
++ "audio-state",
+ GUINT_TO_POINTER ((guint)has_audio));
+ }
+
+
+ static void
+-update_direction_state (WysModem *self,
+- MMCall *mm_call,
+- const gchar *path,
+- WysDirection direction,
+- MMCallState old_state,
+- MMCallState new_state)
++update_call_state (WysModem *self,
++ MMCall *mm_call,
++ const gchar *path,
++ MMCallState old_state,
++ MMCallState new_state)
+ {
+- gboolean had_audio = call_state_has_audio (direction, old_state);
+- gboolean have_audio = call_state_has_audio (direction, new_state);
++ gboolean had_audio = call_state_has_audio (old_state);
++ gboolean have_audio = call_state_has_audio (new_state);
+
+ if (!had_audio && have_audio)
+ {
+- g_debug ("Call `%s' gained audio %s", path,
+- wys_direction_get_description (direction));
+- update_audio_count (self, direction, +1);
++ g_message ("Call `%s' gained audio", path);
++ update_audio_count (self, +1);
+ }
+ else if (had_audio && !have_audio)
+ {
+- g_debug ("Call `%s' lost audio %s", path,
+- wys_direction_get_description (direction));
+- update_audio_count (self, direction, -1);
++ g_message ("Call `%s' lost audio", path);
++ update_audio_count (self, -1);
+ }
+
+ if (had_audio != have_audio)
+ {
+- set_call_has_audio (mm_call, direction, have_audio);
++ set_call_has_audio (mm_call, have_audio);
+ }
+ }
+
+@@ -174,34 +154,28 @@ call_state_changed_cb (MmGdbusCall *mm_gdbus_call,
+ MMCall *mm_call = MM_CALL (mm_gdbus_call);
+ const gchar * path = mm_call_get_path (mm_call);
+
+- g_debug ("Call `%s' state changed, new: %i, old: %i",
++ g_message ("Call `%s' state changed, new: %i, old: %i",
+ path, (int)new_state, (int)old_state);
+
+ // FIXME: deal with calls being put on hold (one call goes
+ // non-audio, another call goes audio after)
+
+- update_direction_state (self, mm_call, path,
+- WYS_DIRECTION_FROM_NETWORK,
+- old_state, new_state);
+- update_direction_state (self, mm_call, path,
+- WYS_DIRECTION_TO_NETWORK,
+- old_state, new_state);
++ update_call_state (self, mm_call, path, old_state, new_state);
+ }
+
+
+ static void
+-init_call_direction (WysModem *self,
+- MMCall *mm_call,
+- MMCallState state,
+- WysDirection direction)
++init_call_audio (WysModem *self,
++ MMCall *mm_call,
++ MMCallState state)
+ {
+- gboolean has_audio = call_state_has_audio (direction, state);
++ gboolean has_audio = call_state_has_audio (state);
+
+- set_call_has_audio (mm_call, direction, has_audio);
++ set_call_has_audio (mm_call, has_audio);
+
+ if (has_audio)
+ {
+- update_audio_count (self, direction, +1);
++ update_audio_count (self, +1);
+ }
+ }
+
+@@ -223,12 +197,9 @@ add_call (WysModem *self,
+ self);
+
+ state = mm_call_get_state (mm_call);
+- init_call_direction (self, mm_call, state,
+- WYS_DIRECTION_FROM_NETWORK);
+- init_call_direction (self, mm_call, state,
+- WYS_DIRECTION_TO_NETWORK);
++ init_call_audio (self, mm_call, state);
+
+- g_debug ("Call `%s' added, state: %i", path, (int)state);
++ g_message ("Call `%s' added, state: %i", path, (int)state);
+ }
+
+
+@@ -322,16 +293,14 @@ call_added_cb (MMModemVoice *voice,
+
+
+ static void
+-clear_call_direction (WysModem *self,
+- MMCall *mm_call,
+- WysDirection direction)
++clear_call_state (WysModem *self,
++ MMCall *mm_call)
+ {
+- gboolean has_audio =
+- get_call_has_audio (mm_call, direction);
++ gboolean has_audio = get_call_has_audio (mm_call);
+
+ if (has_audio)
+ {
+- update_audio_count (self, direction, -1);
++ update_audio_count (self, -1);
+ }
+ }
+
+@@ -343,7 +312,7 @@ call_deleted_cb (MMModemVoice *voice,
+ {
+ MMCall *mm_call;
+
+- g_debug ("Removing call `%s'", path);
++ g_message ("Removing call `%s'", path);
+
+ mm_call = g_hash_table_lookup (self->calls, path);
+ if (!mm_call)
+@@ -352,14 +321,11 @@ call_deleted_cb (MMModemVoice *voice,
+ return;
+ }
+
+- clear_call_direction (self, mm_call,
+- WYS_DIRECTION_FROM_NETWORK);
+- clear_call_direction (self, mm_call,
+- WYS_DIRECTION_TO_NETWORK);
++ clear_call_state (self, mm_call);
+
+ g_hash_table_remove (self->calls, path);
+
+- g_debug ("Call `%s' removed", path);
++ g_message ("Call `%s' removed", path);
+ }
+
+
+@@ -444,11 +410,9 @@ dispose (GObject *object)
+ if (g_hash_table_size (self->calls) > 0)
+ {
+ g_hash_table_remove_all (self->calls);
+- if (self->audio_count[WYS_DIRECTION_FROM_NETWORK] > 0 ||
+- self->audio_count[WYS_DIRECTION_TO_NETWORK] > 0)
++ if (self->audio_count > 0)
+ {
+- self->audio_count[WYS_DIRECTION_FROM_NETWORK] =
+- self->audio_count[WYS_DIRECTION_TO_NETWORK] = 0;
++ self->audio_count = 0;
+ g_signal_emit_by_name (self, "audio-absent");
+ }
+ }
+@@ -504,8 +468,7 @@ wys_modem_class_init (WysModemClass *klass)
+ G_SIGNAL_RUN_LAST,
+ 0, NULL, NULL, NULL,
+ G_TYPE_NONE,
+- 1,
+- WYS_TYPE_DIRECTION);
++ 0);
+
+ /**
+ * WysModem::audio-absent:
+@@ -520,8 +483,7 @@ wys_modem_class_init (WysModemClass *klass)
+ G_SIGNAL_RUN_LAST,
+ 0, NULL, NULL, NULL,
+ G_TYPE_NONE,
+- 1,
+- WYS_TYPE_DIRECTION);
++ 0);
+ }
+
+
diff --git a/srcpkgs/pinephone-wys/template b/srcpkgs/pinephone-wys/template
new file mode 100644
index 00000000000..ab3eaad64ac
--- /dev/null
+++ b/srcpkgs/pinephone-wys/template
@@ -0,0 +1,19 @@
+# Template file for 'pinephone-wys'
+pkgname=pinephone-wys
+_pkgname=wys
+version=0.1.8
+revision=1
+wrksrc=${_pkgname}-v${version}
+build_style=meson
+hostmakedepends="pkg-config"
+makedepends="glib-devel pulseaudio-devel ModemManager-devel"
+short_desc="Daemon to bring up and take down PulseAudio for phone call audio"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/wys"
+distfiles="${homepage}/-/archive/v${version}/${_pkgname}-v${version}.tar.gz"
+checksum=07fd6d2ae9ea5d6187e1c99d5b0e5c1d9c74ba00f4869f4aae195cd8714ba375
+
+post_install() {
+ vinstall ${FILESDIR}/wys.desktop 644 etc/xdg/autostart
+}
diff --git a/srcpkgs/pinephone-wys/update b/srcpkgs/pinephone-wys/update
new file mode 100644
index 00000000000..76a93c0b606
--- /dev/null
+++ b/srcpkgs/pinephone-wys/update
@@ -0,0 +1,2 @@
+site="https://source.puri.sm/Librem5/${_pkgname}/tags"
+pattern='/archive/[^/]+/\Q'"$_pkgname"'\E-v?\K[\d\.]+(?=\.tar\.gz")'
From e92c0f785ef804aaee4a9ce5c68e83124c5c7f5b Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 19 Sep 2020 19:12:26 -0700
Subject: [PATCH 11/13] New package: megapixels-0.8.0
---
srcpkgs/megapixels/template | 13 +++++++++++++
srcpkgs/megapixels/update | 2 ++
2 files changed, 15 insertions(+)
create mode 100644 srcpkgs/megapixels/template
create mode 100644 srcpkgs/megapixels/update
diff --git a/srcpkgs/megapixels/template b/srcpkgs/megapixels/template
new file mode 100644
index 00000000000..3c5e485b122
--- /dev/null
+++ b/srcpkgs/megapixels/template
@@ -0,0 +1,13 @@
+# Template file for 'megapixels'
+pkgname=megapixels
+version=0.8.0
+revision=1
+build_style=meson
+hostmakedepends="pkg-config glib-devel"
+makedepends="gtk+3-devel"
+short_desc="GTK+3 camera app for ARM devices"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://git.sr.ht/~martijnbraam/megapixels"
+distfiles="${homepage}/archive/${version}.tar.gz"
+checksum=af21a62c163d912bc8b9ace77701b0f8cc76e1d423c4e644e67fd8e92b645ba7
diff --git a/srcpkgs/megapixels/update b/srcpkgs/megapixels/update
new file mode 100644
index 00000000000..c9a427b3cd2
--- /dev/null
+++ b/srcpkgs/megapixels/update
@@ -0,0 +1,2 @@
+site="https://git.sr.ht/~martijnbraam/megapixels/refs"
+pattern='/archive/(v?|\Q'"$pkgname"'\E-)?\K[\d\.]+(?=\.tar\.gz")'
From 33c92aaedebc02da1104301b8fb893c050fea601 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 19 Sep 2020 21:49:43 -0700
Subject: [PATCH 12/13] New package: purple-mm-sms-0.1.7
---
.../patches/0001-Support-meson.patch | 63 +++++++++++++++++++
srcpkgs/purple-mm-sms/template | 14 +++++
srcpkgs/purple-mm-sms/update | 2 +
3 files changed, 79 insertions(+)
create mode 100644 srcpkgs/purple-mm-sms/patches/0001-Support-meson.patch
create mode 100644 srcpkgs/purple-mm-sms/template
create mode 100644 srcpkgs/purple-mm-sms/update
diff --git a/srcpkgs/purple-mm-sms/patches/0001-Support-meson.patch b/srcpkgs/purple-mm-sms/patches/0001-Support-meson.patch
new file mode 100644
index 00000000000..55e4ece0869
--- /dev/null
+++ b/srcpkgs/purple-mm-sms/patches/0001-Support-meson.patch
@@ -0,0 +1,63 @@
+From 1c4896f15f63bb6719ece59b626fddf55b766a0e Mon Sep 17 00:00:00 2001
+From: Julio Galvan <julio-void@epazote.net>
+Date: Sat, 19 Sep 2020 21:32:19 -0700
+Subject: [PATCH] Support meson
+
+I am trying to package this library for voidlinux but it fails to
+crossbuild automatically. I thought that we could use this for now.
+---
+ meson.build | 42 ++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 42 insertions(+)
+ create mode 100644 meson.build
+
+diff --git a/meson.build b/meson.build
+new file mode 100644
+index 0000000..8b6c90e
+--- /dev/null
++++ meson.build
+@@ -0,0 +1,42 @@
++project('purple-mm-sms', 'c',
++ version: '0.1.7',
++)
++
++cc = meson.get_compiler('c')
++
++purple = dependency('purple')
++mm = dependency('mm-glib')
++glib= dependency('glib-2.0', version: '>=2.50.0')
++
++purple_plugdir = purple.get_pkgconfig_variable('plugindir')
++
++mm_sms_headers = [
++ 'mm-sms.h',
++ 'itu-e212-iso.h',
++]
++
++mm_sms_sources = [
++ mm_sms_headers,
++ 'mm-sms.c',
++]
++
++mm_sms_deps = [
++ purple,
++ mm,
++ glib,
++]
++
++mm_sms_shared = shared_library(
++ 'mm-sms',
++ mm_sms_sources,
++ dependencies : mm_sms_deps,
++ name_prefix : '',
++ install_dir : purple_plugdir,
++ install : true,
++)
++
++
++iconsdir = join_paths(get_option('datadir'), 'pixmaps', 'pidgin', 'protocols')
++foreach size: ['16', '22', '48']
++ install_data('icons/mm-sms-' + size + 'px.png', rename: 'mm-sms.png', install_dir: iconsdir + '/' + size)
++endforeach
+--
+2.28.0
+
diff --git a/srcpkgs/purple-mm-sms/template b/srcpkgs/purple-mm-sms/template
new file mode 100644
index 00000000000..ee57770d349
--- /dev/null
+++ b/srcpkgs/purple-mm-sms/template
@@ -0,0 +1,14 @@
+# Template file for 'purple-mm-sms'
+pkgname=purple-mm-sms
+version=0.1.7
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=meson
+hostmakedepends="pkg-config"
+makedepends="ModemManager-devel libglib-devel libpurple-devel"
+short_desc="Purple SMS plugin using ModemManager"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/purple-mm-sms"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=123d71f40051e6afc59dc8f8fb6efef0524a99b377856d99d5e64d0b867ab2be
diff --git a/srcpkgs/purple-mm-sms/update b/srcpkgs/purple-mm-sms/update
new file mode 100644
index 00000000000..4e461b21e8c
--- /dev/null
+++ b/srcpkgs/purple-mm-sms/update
@@ -0,0 +1,2 @@
+site="https://source.puri.sm/Librem5/${pkgname}/tags"
+pattern='/archive/[^/]+/\Q'"$pkgname"'\E-v?\K[\d\.]+(?=\.tar\.gz")'
From 24072290b79e8a64f4ef8f2286b87df1955ecf41 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Wed, 23 Sep 2020 14:38:52 -0700
Subject: [PATCH 13/13] phosh
---
srcpkgs/phosh/patches/32bit-build-fix.patch | 30 ---------------------
1 file changed, 30 deletions(-)
delete mode 100644 srcpkgs/phosh/patches/32bit-build-fix.patch
diff --git a/srcpkgs/phosh/patches/32bit-build-fix.patch b/srcpkgs/phosh/patches/32bit-build-fix.patch
deleted file mode 100644
index a98ecb0faa5..00000000000
--- a/srcpkgs/phosh/patches/32bit-build-fix.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From d1da5ea7d18c6794c9a7d2f41355fe90d4115ac1 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
-Date: Tue, 4 Aug 2020 08:22:39 +0200
-Subject: [PATCH] timestamp-label: Unbreak build on 32 bit platforms
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Use a G_ format specifier for GTimeSpan.
-
-Signed-off-by: Guido Günther <guido.gunther@puri.sm>
----
- src/notifications/timestamp-label.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/notifications/timestamp-label.c b/src/notifications/timestamp-label.c
-index 0aa04ce0..a5a4d5e7 100644
---- src/notifications/timestamp-label.c
-+++ src/notifications/timestamp-label.c
-@@ -255,7 +255,7 @@ phosh_timestamp_label_calc_timeout (PhoshTimestampLabel *self)
- break;
- }
- timeout_diff = g_date_time_difference (timeout_time, time_now);
-- g_debug ("time out duration = %ld", timeout_diff);
-+ g_debug ("time out duration: %" G_GINT64_FORMAT, timeout_diff);
- return timeout_diff;
- }
-
---
-2.26.2
^ permalink raw reply [flat|nested] 47+ messages in thread* Re: [PR PATCH] [Updated] New packages: phoc-0.4.2 calls-0.1.7 purism-chatty-0.1.15
2020-08-29 20:46 [PR PATCH] New packages: phoc-0.4.2 calls-0.1.7 purism-chatty--0.1.15 julio641742
` (36 preceding siblings ...)
2020-09-23 21:47 ` [PR PATCH] [Updated] " julio641742
@ 2020-09-23 21:49 ` julio641742
2020-09-25 9:23 ` jjsullivan5196
` (7 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: julio641742 @ 2020-09-23 21:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1620 bytes --]
There is an updated pull request by julio641742 against master on the void-packages repository
https://github.com/julio641742/void-packages phosh
https://github.com/void-linux/void-packages/pull/24538
New packages: phoc-0.4.2 calls-0.1.7 purism-chatty-0.1.15
Status of `phosh` on the PinePhone 1.2a
- [x] Shell
- `phosh` `squeekboard` `phoc` `feedbackd` packaged
- `phosh-desktop` (Should I rename it?, Does it need any additional dependencies?)
- [x] Calls (sound is bad)
- `calls` `pinephone-wys` packaged
- [x] SMS (works)
- `purism-chatty` `purple-mm-sms` packaged
- [x] Data (works)
- [ ] Camera (working on it)
- `megapixels` packaged
The modem needs to be manually enabled every single time with `echo 1 > /sys/class/modem-power/modem-power/device/powered` (I could create a service for that).
You need to run this [script](https://gitlab.com/postmarketOS/pmaports/-/blob/master/device/community/device-pine64-pinephone/setup-modem.sh) at least one time for it to set up the modem with the right settings.
i am able to make calls with `calls` and `pinephone-wys`. I am using the sound profiles from [here](https://gitlab.com/postmarketOS/pmaports/-/tree/master/device/community/device-pine64-pinephone/ucm) and `alsa-ucm-conf`(not yet packaged) but the sound is bad.
`purism-chatty` can't find `libjabber.so` and `mm-sms.so` that are inside `/usr/lib/purple-2`. I created symlinks from `/usr/lib/purple-2/{libjabber.so,mm-sms.so}` to `/usr/lib` Any suggestions on how to fix this?
A patch file from https://github.com/void-linux/void-packages/pull/24538.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-phosh-24538.patch --]
[-- Type: text/x-diff, Size: 51543 bytes --]
From d0f56d55265740c06bf7cf2f1f344b561c391243 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Sat, 29 Aug 2020 11:47:35 -0700
Subject: [PATCH 01/12] New package: feedbackd-0.0.0+git20200726
---
common/shlibs | 1 +
srcpkgs/feedbackd/template | 37 +++++++++++++++++++++++++++++++++++++
srcpkgs/feedbackd/update | 2 ++
srcpkgs/libfeedback | 1 +
srcpkgs/libfeedback-devel | 1 +
5 files changed, 42 insertions(+)
create mode 100644 srcpkgs/feedbackd/template
create mode 100644 srcpkgs/feedbackd/update
create mode 120000 srcpkgs/libfeedback
create mode 120000 srcpkgs/libfeedback-devel
diff --git a/common/shlibs b/common/shlibs
index e2c43cb88af..97e25eda47e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3989,3 +3989,4 @@ libneatvnc.so.0 neatvnc-0.2.0_1
libtdjson.so.1.6.0 libtd-1.6.0_1
libJudy.so.1 judy-1.0.5_1
libsignal-protocol-c.so.2 libsignal-protocol-c-2.3.3_2
+libfeedback-0.0.so.0 libfeedback-0.0.0+git20200707_1
diff --git a/srcpkgs/feedbackd/template b/srcpkgs/feedbackd/template
new file mode 100644
index 00000000000..6551c47e1e6
--- /dev/null
+++ b/srcpkgs/feedbackd/template
@@ -0,0 +1,37 @@
+# Template file for 'feedbackd'
+pkgname=feedbackd
+version=0.0.0+git20200726
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=meson
+build_helper=gir
+hostmakedepends="vala glib-devel pkg-config"
+makedepends="gsound-devel libgudev-devel json-glib-devel"
+depends="dbus"
+short_desc="Daemon to provide haptic feedback on events"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/feedbackd"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=e9632d1d1ef228bb7f6ca3d3d875806b2a5763b4def4e30e94acf0c7f3eb79ef
+
+post_install() {
+ vinstall debian/feedbackd.udev 0644 usr/lib/udev/rules.d 90-feedbackd.rules
+}
+
+libfeedback_package() {
+ short_desc+=" - shared libraries"
+ pkg_install() {
+ vmove "usr/lib/*.so.*"
+ }
+}
+
+libfeedback-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ }
+}
diff --git a/srcpkgs/feedbackd/update b/srcpkgs/feedbackd/update
new file mode 100644
index 00000000000..4e461b21e8c
--- /dev/null
+++ b/srcpkgs/feedbackd/update
@@ -0,0 +1,2 @@
+site="https://source.puri.sm/Librem5/${pkgname}/tags"
+pattern='/archive/[^/]+/\Q'"$pkgname"'\E-v?\K[\d\.]+(?=\.tar\.gz")'
diff --git a/srcpkgs/libfeedback b/srcpkgs/libfeedback
new file mode 120000
index 00000000000..49dc965f1cd
--- /dev/null
+++ b/srcpkgs/libfeedback
@@ -0,0 +1 @@
+feedbackd
\ No newline at end of file
diff --git a/srcpkgs/libfeedback-devel b/srcpkgs/libfeedback-devel
new file mode 120000
index 00000000000..49dc965f1cd
--- /dev/null
+++ b/srcpkgs/libfeedback-devel
@@ -0,0 +1 @@
+feedbackd
\ No newline at end of file
From 1455e6fbb075a93ae8f5ec534285d28f64a26c23 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Sat, 29 Aug 2020 11:47:56 -0700
Subject: [PATCH 02/12] New package: phoc-0.4.2
---
srcpkgs/phoc/template | 16 ++++++++++++++++
srcpkgs/phoc/update | 2 ++
2 files changed, 18 insertions(+)
create mode 100644 srcpkgs/phoc/template
create mode 100644 srcpkgs/phoc/update
diff --git a/srcpkgs/phoc/template b/srcpkgs/phoc/template
new file mode 100644
index 00000000000..00c9f1f3ab0
--- /dev/null
+++ b/srcpkgs/phoc/template
@@ -0,0 +1,16 @@
+# Template file for 'phoc'
+pkgname=phoc
+version=0.4.2
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=meson
+configure_args="-Dembed-wlroots=disabled"
+hostmakedepends="glib-devel pkg-config wayland-devel"
+makedepends="gnome-desktop-devel wlroots-devel"
+depends="mutter"
+short_desc="Wlroots based Phone compositor for the Phosh shell"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/phoc"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=bdb34644c7d49c953239c1e939bc5ee2bc26f6187b9d756b70b113d2734c712c
diff --git a/srcpkgs/phoc/update b/srcpkgs/phoc/update
new file mode 100644
index 00000000000..4e461b21e8c
--- /dev/null
+++ b/srcpkgs/phoc/update
@@ -0,0 +1,2 @@
+site="https://source.puri.sm/Librem5/${pkgname}/tags"
+pattern='/archive/[^/]+/\Q'"$pkgname"'\E-v?\K[\d\.]+(?=\.tar\.gz")'
From e00774f305a256111aea6dde160e8b19567f2a31 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Sat, 29 Aug 2020 11:48:48 -0700
Subject: [PATCH 03/12] New package: squeekboard-1.9.3
---
srcpkgs/squeekboard/template | 26 ++++++++++++++++++++++++++
srcpkgs/squeekboard/update | 2 ++
2 files changed, 28 insertions(+)
create mode 100644 srcpkgs/squeekboard/template
create mode 100644 srcpkgs/squeekboard/update
diff --git a/srcpkgs/squeekboard/template b/srcpkgs/squeekboard/template
new file mode 100644
index 00000000000..87a671e62da
--- /dev/null
+++ b/srcpkgs/squeekboard/template
@@ -0,0 +1,26 @@
+# Template file for 'squeekboard'
+pkgname=squeekboard
+version=1.9.3
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=meson
+build_helper=rust
+hostmakedepends="glib-devel gettext pkg-config cargo wayland-devel"
+makedepends="rust gtk+3-devel gnome-desktop-devel libfeedback-devel"
+depends="feedbackd"
+short_desc="Final Librem5 keyboard"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/squeekboard"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=b99e56faace3986bf752e08c104cea60ed896d514284840655033dd9457db824
+
+pre_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ vsed -i cargo_build.sh -e "s/-a ./-a ${XBPS_CROSS_RUST_TARGET}/g"
+ fi
+}
+
+post_install() {
+ chmod +x ${DESTDIR}/usr/bin/squeekboard-entry
+}
diff --git a/srcpkgs/squeekboard/update b/srcpkgs/squeekboard/update
new file mode 100644
index 00000000000..4e461b21e8c
--- /dev/null
+++ b/srcpkgs/squeekboard/update
@@ -0,0 +1,2 @@
+site="https://source.puri.sm/Librem5/${pkgname}/tags"
+pattern='/archive/[^/]+/\Q'"$pkgname"'\E-v?\K[\d\.]+(?=\.tar\.gz")'
From e056e724fd953709840e5c24bd187c50e699aad0 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Sat, 29 Aug 2020 11:48:59 -0700
Subject: [PATCH 04/12] New package: phosh-0.4.4
---
srcpkgs/phosh/files/phosh.desktop | 11 +++++++++++
srcpkgs/phosh/files/sm.puri.OSK0.desktop | 12 ++++++++++++
srcpkgs/phosh/template | 22 ++++++++++++++++++++++
3 files changed, 45 insertions(+)
create mode 100644 srcpkgs/phosh/files/phosh.desktop
create mode 100644 srcpkgs/phosh/files/sm.puri.OSK0.desktop
create mode 100644 srcpkgs/phosh/template
diff --git a/srcpkgs/phosh/files/phosh.desktop b/srcpkgs/phosh/files/phosh.desktop
new file mode 100644
index 00000000000..84452845115
--- /dev/null
+++ b/srcpkgs/phosh/files/phosh.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=Phosh
+Name[en]=Phosh
+Comment=This session logs you into Phosh
+Comment[en]=This session logs in you into Phosh
+Exec=dbus-run-session /usr/bin/phosh
+TryExec=/usr/bin/phosh
+Icon=
+Type=Application
+X-DesktopNames=Phosh
+Keywords=launch;Phosh;desktop;session;
diff --git a/srcpkgs/phosh/files/sm.puri.OSK0.desktop b/srcpkgs/phosh/files/sm.puri.OSK0.desktop
new file mode 100644
index 00000000000..39740f15773
--- /dev/null
+++ b/srcpkgs/phosh/files/sm.puri.OSK0.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Type=Application
+Name=On-screen keyboard
+Comment=Default on-screen keyboard
+Exec=/usr/bin/squeekboard
+Categories=GNOME;Core;
+OnlyShowIn=GNOME;
+NoDisplay=true
+X-GNOME-Autostart-Phase=Panel
+X-GNOME-Provides=inputmethod
+X-GNOME-Autostart-Notify=true
+X-GNOME-AutoRestart=true
diff --git a/srcpkgs/phosh/template b/srcpkgs/phosh/template
new file mode 100644
index 00000000000..199f8531d28
--- /dev/null
+++ b/srcpkgs/phosh/template
@@ -0,0 +1,22 @@
+# Template file for 'phosh'
+pkgname=phosh
+version=0.4.4
+revision=1
+build_style=meson
+hostmakedepends="phoc glib-devel gettext pkg-config wayland-devel"
+makedepends="libfeedback-devel gcr-devel gnome-desktop-devel pam-devel
+ polkit-devel pulseaudio-devel libsecret-devel libhandy1-devel
+ NetworkManager-devel upower-devel"
+depends="phoc squeekboard gnome-session gnome-settings-daemon elogind
+ xorg-server-xwayland cantarell-fonts font-adobe-source-code-pro"
+short_desc="Shell PoC for the Librem5"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/phosh"
+distfiles="https://repo.pureos.net/pureos/pool/main/p/phosh/phosh_$version.tar.xz"
+checksum=1b1161e23b22496027d7c93d75b1be54918402007c4128a1efb8adb3690f437d
+
+post_install() {
+ vcopy ${FILESDIR}/sm.puri.OSK0.desktop usr/share/applications
+ vcopy ${FILESDIR}/phosh.desktop usr/share/wayland-sessions
+}
From 2c2eeb4d70f7419f8843e1ab9bc6a6adab84e8a0 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 29 Aug 2020 18:35:47 -0700
Subject: [PATCH 05/12] New package: calls-0.1.8
---
srcpkgs/calls/template | 17 +++++++++++++++++
srcpkgs/calls/update | 2 ++
2 files changed, 19 insertions(+)
create mode 100644 srcpkgs/calls/template
create mode 100644 srcpkgs/calls/update
diff --git a/srcpkgs/calls/template b/srcpkgs/calls/template
new file mode 100644
index 00000000000..c17a8570f18
--- /dev/null
+++ b/srcpkgs/calls/template
@@ -0,0 +1,17 @@
+# Template file for 'calls'
+pkgname=calls
+version=0.1.8
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=meson
+hostmakedepends="glib-devel gettext vala pkg-config wayland-devel
+ evolution-data-server-devel"
+makedepends="folks-devel libhandy-devel libpeas-devel gom-devel
+ ModemManager-devel libfeedback-devel"
+depends="NetworkManager ModemManager"
+short_desc="Phone call application"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/calls"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=58fd2c438fadec812a73181fd6b1a79478814bb10bf8153f3b79a4c6271078a9
diff --git a/srcpkgs/calls/update b/srcpkgs/calls/update
new file mode 100644
index 00000000000..4e461b21e8c
--- /dev/null
+++ b/srcpkgs/calls/update
@@ -0,0 +1,2 @@
+site="https://source.puri.sm/Librem5/${pkgname}/tags"
+pattern='/archive/[^/]+/\Q'"$pkgname"'\E-v?\K[\d\.]+(?=\.tar\.gz")'
From 98a47b096199c5e7994eb177d32d60e94538e7d1 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 29 Aug 2020 18:36:35 -0700
Subject: [PATCH 06/12] New package: purism-chatty-0.1.16
---
srcpkgs/purism-chatty/template | 22 ++++++++++++++++++++++
srcpkgs/purism-chatty/update | 2 ++
2 files changed, 24 insertions(+)
create mode 100644 srcpkgs/purism-chatty/template
create mode 100644 srcpkgs/purism-chatty/update
diff --git a/srcpkgs/purism-chatty/template b/srcpkgs/purism-chatty/template
new file mode 100644
index 00000000000..4af8b2190f0
--- /dev/null
+++ b/srcpkgs/purism-chatty/template
@@ -0,0 +1,22 @@
+# Template file for 'purism-chatty'
+pkgname=purism-chatty
+_pkgname=chatty
+version=0.1.16
+revision=1
+wrksrc=${_pkgname}-v${version}
+build_style=meson
+hostmakedepends="glib-devel pkg-config gettext"
+makedepends="libfeedback-devel libhandy-devel evolution-data-server-devel
+ libpurple libpurple-devel"
+short_desc="XMPP and SMS messaging via libpurple and Modemmanager"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/chatty"
+distfiles="${homepage}/-/archive/v${version}/${_pkgname}-v${version}.tar.gz"
+checksum=2eb565a60892eedc91779eafd83add583007fe9567e4bc270ff9c197854bba4b
+
+pre_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ vsed -i src/meson.build -e "s/purple_plugdir =.*/purple_plugdir = \'\/usr\/${XBPS_CROSS_TRIPLET}\/usr\/lib\/purple-2\'/g"
+ fi
+}
diff --git a/srcpkgs/purism-chatty/update b/srcpkgs/purism-chatty/update
new file mode 100644
index 00000000000..76a93c0b606
--- /dev/null
+++ b/srcpkgs/purism-chatty/update
@@ -0,0 +1,2 @@
+site="https://source.puri.sm/Librem5/${_pkgname}/tags"
+pattern='/archive/[^/]+/\Q'"$_pkgname"'\E-v?\K[\d\.]+(?=\.tar\.gz")'
From f91e18e750a8846e0913fb2a0a2f2a466ab943de Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 12 Sep 2020 15:05:36 -0700
Subject: [PATCH 07/12] New package: kgx-0.2.1
---
srcpkgs/kgx/template | 14 ++++++++++++++
1 file changed, 14 insertions(+)
create mode 100644 srcpkgs/kgx/template
diff --git a/srcpkgs/kgx/template b/srcpkgs/kgx/template
new file mode 100644
index 00000000000..98ec4caf70e
--- /dev/null
+++ b/srcpkgs/kgx/template
@@ -0,0 +1,14 @@
+# Template file for 'kgx'
+pkgname=kgx
+version=0.2.1
+revision=1
+build_style=meson
+hostmakedepends="glib-devel pkg-config gettext"
+makedepends="vte3-devel gtk+3-devel libhandy-devel libgtop-devel"
+depends="dbus desktop-file-utils gsettings-desktop-schemas"
+short_desc="Minimal terminal for GNOME"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://gitlab.gnome.org/ZanderBrown/kgx"
+distfiles="${homepage}/-/archive/${version}/kgx-${version}.tar.gz"
+checksum=70a814b0baf70049d5a20791d58a32e92661428d2deeeb56d91b81cc4dc5e81a
From e261aa925a6817b484cd3d6a8f6b1b5c9b559316 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 12 Sep 2020 10:58:50 -0700
Subject: [PATCH 08/12] New package: mobile-config-firefox-1.0.1
---
.../files/distro_links.html | 5 +++++
srcpkgs/mobile-config-firefox/template | 16 ++++++++++++++++
2 files changed, 21 insertions(+)
create mode 100644 srcpkgs/mobile-config-firefox/files/distro_links.html
create mode 100644 srcpkgs/mobile-config-firefox/template
diff --git a/srcpkgs/mobile-config-firefox/files/distro_links.html b/srcpkgs/mobile-config-firefox/files/distro_links.html
new file mode 100644
index 00000000000..ca89d0ecd08
--- /dev/null
+++ b/srcpkgs/mobile-config-firefox/files/distro_links.html
@@ -0,0 +1,5 @@
+<p class="distro-links">
+ <a href="https://voidlinux.org/">homepage</a> -
+ <a href="https://docs.voidlinux.org/">docs</a>
+ <a href="https://github.com/void-linux">repos</a>
+</p>
diff --git a/srcpkgs/mobile-config-firefox/template b/srcpkgs/mobile-config-firefox/template
new file mode 100644
index 00000000000..8a1530115e8
--- /dev/null
+++ b/srcpkgs/mobile-config-firefox/template
@@ -0,0 +1,16 @@
+# Template file for 'mobile-config-firefox'
+pkgname=mobile-config-firefox
+version=1.0.1
+revision=1
+build_style=gnu-makefile
+make_install_args="DISTRO=VoidLinux"
+short_desc="Firefox tweaks for mobile and privacy"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://gitlab.com/postmarketOS/mobile-config-firefox"
+distfiles="${homepage}/-/archive/${version}/${pkgname}-${version}.tar.gz"
+checksum=7dce837995956f6f224041853e005eecb3368cd3cbfec6fe3e8a3153747dd0a7
+
+post_extract() {
+ cp ${FILESDIR}/distro_links.html src/homepage
+}
From e07c5504888351d89df6a0a1710f33c8d8c8aa39 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 12 Sep 2020 14:42:26 -0700
Subject: [PATCH 09/12] New package: phosh-desktop-0.1
---
.../phosh-desktop/files/000-gschema.override | 20 +++++++++
srcpkgs/phosh-desktop/files/01-phoc-scaling | 5 +++
srcpkgs/phosh-desktop/template | 45 +++++++++++++++++++
3 files changed, 70 insertions(+)
create mode 100644 srcpkgs/phosh-desktop/files/000-gschema.override
create mode 100644 srcpkgs/phosh-desktop/files/01-phoc-scaling
create mode 100644 srcpkgs/phosh-desktop/template
diff --git a/srcpkgs/phosh-desktop/files/000-gschema.override b/srcpkgs/phosh-desktop/files/000-gschema.override
new file mode 100644
index 00000000000..79ec5f6cf6c
--- /dev/null
+++ b/srcpkgs/phosh-desktop/files/000-gschema.override
@@ -0,0 +1,20 @@
+[org.gnome.desktop.background]
+picture-uri='file:///usr/share/backgrounds/gnome/LightWaves.jpg'
+
+[org.gnome.desktop.interface]
+clock-show-weekday=false
+clock-show-date=false
+
+[org.gnome.desktop.wm.preferences]
+button-layout='appmenu:'
+
+[org.gnome.Epiphany]
+search-engines=[('Search the Web', 'https://duckduckgo.com/?q=%s&t=epiphany', ''), ('DuckDuckGo', 'https://duckduckgo.com/?q=%s&t=epiphany', '!ddg'), ('Qwant', 'https://www.qwant.com/?q=%s', '!q')]
+
+[org.gnome.Epiphany.web]
+user-agent='Mozilla/5.0 (Linux; Android 10; Pixel) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.96 Mobile Safari/537.36'
+
+
+[org.gnome.settings-daemon.plugins.power]
+sleep-inactive-ac-type='nothing'
+ambient-enabled=false
diff --git a/srcpkgs/phosh-desktop/files/01-phoc-scaling b/srcpkgs/phosh-desktop/files/01-phoc-scaling
new file mode 100644
index 00000000000..880af2439d3
--- /dev/null
+++ b/srcpkgs/phosh-desktop/files/01-phoc-scaling
@@ -0,0 +1,5 @@
+[sm/puri/phoc/application/firefox]
+scale-to-fit=false
+
+[sm/puri/phoc/application/org-gnome-maps]
+scale-to-fit=true
diff --git a/srcpkgs/phosh-desktop/template b/srcpkgs/phosh-desktop/template
new file mode 100644
index 00000000000..d3b46fab869
--- /dev/null
+++ b/srcpkgs/phosh-desktop/template
@@ -0,0 +1,45 @@
+# Template file for 'phosh-desktop'
+pkgname=phosh-desktop
+version=0.1
+revision=1
+build_style=meta
+depends="
+ phosh
+ kgx
+ calls
+ megapixels
+ purism-chatty
+ iio-sensor-proxy
+ xdg-user-dirs
+ xdg-desktop-portal-gtk
+ gnome-backgrounds
+ gnome-color-manager
+ gnome-control-center
+ gnome-desktop
+ gnome-keyring
+ gnome-online-accounts
+ gnome-online-miners
+ gnome-calculator
+ gnome-calendar
+ gnome-clocks
+ gnome-contacts
+ gnome-maps
+ gnome-music
+ gnome-system-monitor
+ gedit
+ eog
+ evince
+ epiphany
+ evolution
+ gsettings-desktop-schemas
+ nautilus"
+
+short_desc="Phosh desktop environment metapackage"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://voidlinux.org"
+
+post_install() {
+ vinstall ${FILESDIR}/000-gschema.override 644 usr/share/glib-2.0/schemas 000-void.gschema.override
+ vinstall ${FILESDIR}/01-phoc-scaling 644 etc/dconf/db/void.d
+}
From 6d206453aa7eb95f70fdaf5545c7cd1eebf2777e Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 12 Sep 2020 22:18:46 -0700
Subject: [PATCH 10/12] New package: pinephone-wys-0.1.8
---
srcpkgs/pinephone-wys/files/wys.desktop | 9 +
...-daemon-to-only-switch-card-profiles.patch | 906 ++++++++++++++++++
srcpkgs/pinephone-wys/template | 19 +
srcpkgs/pinephone-wys/update | 2 +
4 files changed, 936 insertions(+)
create mode 100644 srcpkgs/pinephone-wys/files/wys.desktop
create mode 100644 srcpkgs/pinephone-wys/patches/0001-Simplify-daemon-to-only-switch-card-profiles.patch
create mode 100644 srcpkgs/pinephone-wys/template
create mode 100644 srcpkgs/pinephone-wys/update
diff --git a/srcpkgs/pinephone-wys/files/wys.desktop b/srcpkgs/pinephone-wys/files/wys.desktop
new file mode 100644
index 00000000000..a6a9f6894a9
--- /dev/null
+++ b/srcpkgs/pinephone-wys/files/wys.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Wys
+Comment=Daemon for managing PulseAudio for phone call audio
+Exec=/usr/bin/wys
+NoDisplay=true
+Terminal=false
+Type=Application
+StartupNotify=true
+X-GNOME-AutoRestart=true
diff --git a/srcpkgs/pinephone-wys/patches/0001-Simplify-daemon-to-only-switch-card-profiles.patch b/srcpkgs/pinephone-wys/patches/0001-Simplify-daemon-to-only-switch-card-profiles.patch
new file mode 100644
index 00000000000..91257f2cbba
--- /dev/null
+++ b/srcpkgs/pinephone-wys/patches/0001-Simplify-daemon-to-only-switch-card-profiles.patch
@@ -0,0 +1,906 @@
+From f66610d26395de15e3928cf4284573ca9cfabf26 Mon Sep 17 00:00:00 2001
+From: Arnaud Ferraris <arnaud.ferraris@collabora.com>
+Date: Fri, 6 Mar 2020 02:01:52 +0100
+Subject: [PATCH] Simplify daemon to only switch card profiles
+
+As a PoC for the PinePhone, we want to only switch card profiles:
+- when a call starts, use the "Voice Call" profile: audio is output on
+the earpiece, and the internal microphone is unmuted
+- when a call is terminated, switch back to the default "HiFi" profile,
+using the main speaker
+
+This should fully cover the most basic use-case. Headset will not work,
+and there is also no support for a "silent mode", but this is enough to
+demonstrate voice calls for the PinePhone.
+---
+diff --git meson.build meson.build
+index 5938cec..7516208 100644
+--- meson.build
++++ meson.build
+@@ -33,11 +33,6 @@ project (
+ ],
+ )
+
+-
+-libmchk_proj = subproject('libmachine-check')
+-libmchk_dep = libmchk_proj.get_variable('libmachine_check_dep')
+-
+-
+ app_name = meson.project_name()
+
+ prefix = get_option('prefix')
+@@ -63,14 +58,3 @@ config_data.set_quoted('DATADIR', full_datadir)
+ config_data.set_quoted('SYSCONFDIR', full_sysconfdir)
+
+ subdir('src')
+-
+-install_subdir (
+- 'machine-conf',
+- install_dir : join_paths(datadir, app_name)
+-)
+-
+-install_subdir (
+- 'machine-check',
+- install_dir : join_paths(datadir, 'machine-check', app_name),
+- strip_directory : true
+-)
+diff --git src/main.c src/main.c
+index 587a5f3..4631a33 100644
+--- src/main.c
++++ src/main.c
+@@ -23,10 +23,8 @@
+ */
+
+ #include "wys-modem.h"
+-#include "wys-audio.h"
+ #include "util.h"
+ #include "config.h"
+-#include "mchk-machine-check.h"
+
+ #include <libmm-glib.h>
+ #include <glib.h>
+@@ -50,8 +48,6 @@ static GMainLoop *main_loop = NULL;
+
+ struct wys_data
+ {
+- /** PulseAudio interface */
+- WysAudio *audio;
+ /** ID for the D-Bus watch */
+ guint watch_id;
+ /** ModemManager object proxy */
+@@ -59,51 +55,112 @@ struct wys_data
+ /** Map of D-Bus object paths to WysModems */
+ GHashTable *modems;
+ /** How many modems have audio, in each direction */
+- guint audio_count[2];
++ guint audio_count;
+ };
+
++static gboolean
++ugly_system (const gchar *cmd)
++{
++ gchar *out = NULL, *err = NULL;
++ gint status;
++ GError *error = NULL;
++ gboolean ok;
++
++ g_debug ("Executing command `%s'", cmd);
++
++ ok = g_spawn_command_line_sync
++ (cmd, &out, &err, &status, &error);
++
++ if (!ok)
++ {
++ g_warning ("Error spawning command `%s': %s'",
++ cmd, error->message);
++ g_error_free (error);
++ return FALSE;
++ }
++
++ ok = g_spawn_check_exit_status (status, &error);
++ if (ok)
++ {
++ g_debug ("Command `%s' executed successfully"
++ "; stdout: `%s'; stderr: `%s'",
++ cmd, out, err);
++ }
++ else
++ {
++ g_warning ("Command `%s' failed: %s"
++ "; stdout: `%s'; stderr: `%s'",
++ cmd, error->message, out, err);
++ g_error_free (error);
++ }
++
++ g_free (out);
++ g_free (err);
++
++ return ok;
++}
++
++#define UGLY_CARD "alsa_card.platform-sound"
++
++static gboolean
++ugly_set_card_profile (const gchar *card,
++ const gchar *profile)
++{
++ g_autofree gchar *cmd = NULL;
++
++ cmd = g_strdup_printf ("pactl set-card-profile '%s' '%s'", card, profile);
++
++ return ugly_system (cmd);
++}
++
++static gboolean
++ugly_set_voice_call (void)
++{
++ return ugly_set_card_profile (UGLY_CARD, "Voice Call");
++}
++
++static gboolean
++ugly_set_hifi (void)
++{
++ return ugly_set_card_profile (UGLY_CARD, "HiFi");
++}
+
+ static void
+ update_audio_count (struct wys_data *data,
+- WysDirection direction,
+ gint delta)
+ {
+- const guint old_count = data->audio_count[direction];
++ const guint old_count = data->audio_count;
+
+- g_assert (delta >= 0 || data->audio_count[direction] > 0);
++ g_assert (delta >= 0 || data->audio_count > 0);
+
+- data->audio_count[direction] += delta;
++ data->audio_count += delta;
+
+- if (data->audio_count[direction] > 0 && old_count == 0)
++ if (data->audio_count > 0 && old_count == 0)
+ {
+- g_debug ("Audio %s now present",
+- wys_direction_get_description (direction));
+- wys_audio_ensure_loopback (data->audio, direction);
++ g_message ("Audio now present");
++ ugly_set_voice_call ();
+ }
+- else if (data->audio_count[direction] == 0 && old_count > 0)
++ else if (data->audio_count == 0 && old_count > 0)
+ {
+- g_debug ("Audio %s now absent",
+- wys_direction_get_description (direction));
+- wys_audio_ensure_no_loopback (data->audio, direction);
++ g_message ("Audio now absent");
++ ugly_set_hifi ();
+ }
+ }
+
+
+ static void
+ audio_present_cb (struct wys_data *data,
+- WysDirection direction,
+ WysModem *modem)
+ {
+- update_audio_count (data, direction, +1);
++ update_audio_count (data, +1);
+ }
+
+
+ static void
+ audio_absent_cb (struct wys_data *data,
+- WysDirection direction,
+ WysModem *modem)
+ {
+- update_audio_count (data, direction, -1);
++ update_audio_count (data, -1);
+ }
+
+
+@@ -123,7 +180,7 @@ add_modem (struct wys_data *data,
+ return;
+ }
+
+- g_debug ("Adding new voice-capable modem `%s'", path);
++ g_message ("Adding new voice-capable modem `%s'", path);
+
+ g_assert (MM_IS_OBJECT (object));
+ voice = mm_object_get_modem_voice (MM_OBJECT (object));
+@@ -153,7 +210,7 @@ interface_added_cb (struct wys_data *data,
+
+ info = g_dbus_interface_get_info (interface);
+
+- g_debug ("ModemManager interface `%s' found on object `%s'",
++ g_message ("ModemManager interface `%s' found on object `%s'",
+ info->name,
+ g_dbus_object_get_object_path (object));
+
+@@ -184,7 +241,7 @@ interface_removed_cb (struct wys_data *data,
+ path = g_dbus_object_get_object_path (object);
+ info = g_dbus_interface_get_info (interface);
+
+- g_debug ("ModemManager interface `%s' removed on object `%s'",
++ g_message ("ModemManager interface `%s' removed on object `%s'",
+ info->name, path);
+
+ if (g_strcmp0 (info->name, MM_DBUS_INTERFACE_MODEM_VOICE) == 0)
+@@ -229,7 +286,7 @@ void
+ object_added_cb (struct wys_data *data,
+ GDBusObject *object)
+ {
+- g_debug ("ModemManager object `%s' added",
++ g_message ("ModemManager object `%s' added",
+ g_dbus_object_get_object_path (object));
+
+ add_mm_object (data, object);
+@@ -243,7 +300,7 @@ object_removed_cb (struct wys_data *data,
+ const gchar *path;
+
+ path = g_dbus_object_get_object_path (object);
+- g_debug ("ModemManager object `%s' removed", path);
++ g_message ("ModemManager object `%s' removed", path);
+
+ remove_modem_object (data, path, object);
+ }
+@@ -286,7 +343,7 @@ mm_appeared_cb (GDBusConnection *connection,
+ const gchar *name_owner,
+ struct wys_data *data)
+ {
+- g_debug ("ModemManager appeared on D-Bus");
++ g_message ("ModemManager appeared on D-Bus");
+
+ mm_manager_new (connection,
+ G_DBUS_OBJECT_MANAGER_CLIENT_FLAGS_NONE,
+@@ -310,18 +367,14 @@ mm_vanished_cb (GDBusConnection *connection,
+ const gchar *name,
+ struct wys_data *data)
+ {
+- g_debug ("ModemManager vanished from D-Bus");
++ g_message ("ModemManager vanished from D-Bus");
+ clear_dbus (data);
+ }
+
+
+ static void
+-set_up (struct wys_data *data,
+- const gchar *codec,
+- const gchar *modem)
++set_up (struct wys_data *data)
+ {
+- data->audio = wys_audio_new (codec, modem);
+-
+ data->modems = g_hash_table_new_full (g_str_hash, g_str_equal,
+ g_free, g_object_unref);
+
+@@ -333,7 +386,7 @@ set_up (struct wys_data *data,
+ (GBusNameVanishedCallback)mm_vanished_cb,
+ data, NULL);
+
+- g_debug ("Watching for ModemManager");
++ g_message ("Watching for ModemManager");
+ }
+
+
+@@ -343,23 +396,19 @@ tear_down (struct wys_data *data)
+ clear_dbus (data);
+ g_bus_unwatch_name (data->watch_id);
+ g_hash_table_unref (data->modems);
+- g_object_unref (G_OBJECT (data->audio));
+ }
+
+
+ static void
+-run (const gchar *codec,
+- const gchar *modem)
++run (void)
+ {
+ struct wys_data data;
+
+ memset (&data, 0, sizeof (struct wys_data));
+- set_up (&data, codec, modem);
++ set_up (&data);
+
+ main_loop = g_main_loop_new (NULL, FALSE);
+
+- printf (APPLICATION_NAME " started with codec `%s', modem `%s'\n",
+- codec, modem);
+ g_main_loop_run (main_loop);
+
+ g_main_loop_unref (main_loop);
+@@ -368,33 +417,6 @@ run (const gchar *codec,
+ tear_down (&data);
+ }
+
+-
+-static void
+-check_machine (const gchar *machine)
+-{
+- gboolean ok, passed;
+- GError *error = NULL;
+-
+- ok = mchk_check_machine (APP_DATA_NAME,
+- machine,
+- &passed,
+- &error);
+- if (!ok)
+- {
+- g_warning ("Error checking machine name against"
+- " whitelist/blacklist, continuing anyway");
+- g_error_free (error);
+- }
+- else if (!passed)
+- {
+- g_message ("Machine name `%s' did not pass"
+- " whitelist/blacklist check, exiting",
+- machine);
+- exit (EXIT_SUCCESS);
+- }
+-}
+-
+-
+ static void
+ terminate (int signal)
+ {
+@@ -452,222 +452,18 @@ setup_signals ()
+ }
+
+
+-/** This function will close @fd */
+-static gchar *
+-read_machine_conf_file (const gchar *filename,
+- int fd)
+-{
+- GInputStream *unix_stream;
+- GDataInputStream *data_stream;
+- gboolean try_again;
+- gchar *line;
+- GError *error = NULL;
+-
+- g_debug ("Reading machine configuration file `%s'", filename);
+-
+- unix_stream = g_unix_input_stream_new (fd, TRUE);
+- g_assert (unix_stream != NULL);
+-
+- data_stream = g_data_input_stream_new (unix_stream);
+- g_assert (data_stream != NULL);
+- g_object_unref (unix_stream);
+-
+- do
+- {
+- try_again = FALSE;
+-
+- line = g_data_input_stream_read_line_utf8
+- (data_stream, NULL, NULL, &error);
+-
+- if (error)
+- {
+- g_warning ("Error reading from machine"
+- " configuration file `%s': %s",
+- filename, error->message);
+- g_error_free (error);
+- }
+- else if (line)
+- {
+- g_strstrip (line);
+-
+- // Skip comments and empty lines
+- if (line[0] == '#' || line[0] == '\0')
+- {
+- g_free (line);
+- try_again = TRUE;
+- }
+- }
+- }
+- while (try_again);
+-
+- g_object_unref (data_stream);
+- return line;
+-}
+-
+-
+-static gchar *
+-dir_machine_conf (const gchar *dir,
+- const gchar *machine,
+- const gchar *key)
+-{
+- gchar *filename;
+- int fd;
+- gchar *value = NULL;
+-
+- filename = g_build_filename (dir, APP_DATA_NAME,
+- "machine-conf",
+- machine, key, NULL);
+-
+- g_debug ("Trying machine configuration file `%s'",
+- filename);
+-
+- fd = g_open (filename, O_RDONLY, 0);
+- if (fd == -1)
+- {
+- if (errno != ENOENT)
+- {
+- // The error isn't that the file doesn't exist
+- g_warning ("Error opening machine"
+- " configuration file `%s': %s",
+- filename, g_strerror (errno));
+- }
+- }
+- else
+- {
+- value = read_machine_conf_file (filename, fd);
+- }
+-
+- g_free (filename);
+- return value;
+-}
+-
+-
+-static gchar *
+-machine_conf (const gchar *machine,
+- const gchar *key)
+-{
+- gchar *value = NULL;
+- const gchar * const *dirs, * const *dir;
+-
+-
+-#define try_dir(d) \
+- value = dir_machine_conf (d, machine, key); \
+- if (value) \
+- { \
+- return value; \
+- }
+-
+-
+- try_dir (g_get_user_config_dir ());
+-
+- dirs = g_get_system_config_dirs ();
+- for (dir = dirs; *dir; ++dir)
+- {
+- try_dir (*dir);
+- }
+-
+- try_dir (SYSCONFDIR);
+- try_dir (DATADIR);
+-
+- dirs = g_get_system_data_dirs ();
+- for (dir = dirs; *dir; ++dir)
+- {
+- try_dir (*dir);
+- }
+-
+-#undef try_dir
+-
+- return NULL;
+-}
+-
+-
+-static void
+-ensure_alsa_card (const gchar *machine,
+- const gchar *var,
+- const gchar *key,
+- gchar **name)
+-{
+- const gchar *env;
+-
+- if (*name)
+- {
+- return;
+- }
+-
+- env = g_getenv (var);
+- if (env)
+- {
+- *name = g_strdup (env);
+- return;
+- }
+-
+- if (machine)
+- {
+- *name = machine_conf (machine, key);
+- if (*name)
+- {
+- return;
+- }
+- }
+-
+- g_warning ("No %s specified with a machine configuration file"
+- ", environment variable or command line option"
+- "; refusing to run", key);
+- exit (EXIT_SUCCESS);
+-}
+-
+-
+ int
+ main (int argc, char **argv)
+ {
+ GError *error = NULL;
+ GOptionContext *context;
+ gboolean ok;
+- g_autofree gchar *codec = NULL;
+- g_autofree gchar *modem = NULL;
+- g_autofree gchar *machine = NULL;
+-
+- GOptionEntry options[] =
+- {
+- { "codec", 'c', 0, G_OPTION_ARG_STRING, &codec, "Name of the codec's ALSA card", "NAME" },
+- { "modem", 'm', 0, G_OPTION_ARG_STRING, &modem, "Name of the modem's ALSA card", "NAME" },
+- { NULL }
+- };
+
+ setlocale(LC_ALL, "");
+
+- machine = mchk_read_machine (NULL);
+- if (machine)
+- {
+- check_machine (machine);
+- }
+- else
+- {
+- g_warning ("Could not read machine name, continuing without machine check");
+- }
+-
+-
+- context = g_option_context_new ("- set up PulseAudio loopback for phone call audio");
+- g_option_context_add_main_entries (context, options, NULL);
+- ok = g_option_context_parse (context, &argc, &argv, &error);
+- if (!ok)
+- {
+- g_print ("Error parsing options: %s\n", error->message);
+- }
+-
+-
+- if (machine)
+- {
+- /* Convert any directory separator characters to "_" */
+- g_strdelimit (machine, G_DIR_SEPARATOR_S, '_');
+- }
+-
+- ensure_alsa_card (machine, "WYS_CODEC", "codec", &codec);
+- ensure_alsa_card (machine, "WYS_MODEM", "modem", &modem);
+-
+ setup_signals ();
+
+- run (codec, modem);
++ run ();
+
+ return 0;
+ }
+diff --git src/meson.build src/meson.build
+index 7b99235..a8a30d7 100644
+--- src/meson.build
++++ src/meson.build
+@@ -22,13 +22,10 @@
+ gnome = import('gnome')
+
+ wys_deps = [
+- libmchk_dep,
+ dependency('gobject-2.0'),
+ dependency('gio-unix-2.0'),
+ dependency('ModemManager'),
+ dependency('mm-glib'),
+- dependency('libpulse'),
+- dependency('libpulse-mainloop-glib'),
+ ]
+
+ config_h = configure_file (
+@@ -36,20 +33,13 @@ config_h = configure_file (
+ configuration: config_data
+ )
+
+-wys_enum_headers = files(['wys-direction.h'])
+-wys_enum_sources = gnome.mkenums_simple('enum-types',
+- sources : wys_enum_headers)
+-
+ executable (
+ 'wys',
+ config_h,
+- wys_enum_sources,
+ [
+ 'main.c',
+ 'util.h', 'util.c',
+- 'wys-direction.h', 'wys-direction.c',
+ 'wys-modem.h', 'wys-modem.c',
+- 'wys-audio.h', 'wys-audio.c',
+ ],
+ dependencies : wys_deps,
+ include_directories : include_directories('..'),
+diff --git src/wys-modem.c src/wys-modem.c
+index 212f992..51a0575 100644
+--- src/wys-modem.c
++++ src/wys-modem.c
+@@ -24,18 +24,10 @@
+
+
+ #include "wys-modem.h"
+-#include "wys-direction.h"
+ #include "util.h"
+-#include "enum-types.h"
+
+ #include <glib/gi18n.h>
+
+-static const gchar * const WYS_MODEM_HAS_AUDIO[] =
+- {
+- [WYS_DIRECTION_FROM_NETWORK] = "wys-has-audio-from-network",
+- [WYS_DIRECTION_TO_NETWORK] = "wys-has-audio-to-network"
+- };
+-
+ struct _WysModem
+ {
+ GObject parent_instance;
+@@ -43,8 +35,8 @@ struct _WysModem
+ MMModemVoice *voice;
+ /** Map of D-Bus object paths to MMCall objects */
+ GHashTable *calls;
+- /** How many calls have audio, in each direction */
+- guint audio_count[2];
++ /** How many calls have audio */
++ guint audio_count;
+ };
+
+ G_DEFINE_TYPE(WysModem, wys_modem, G_TYPE_OBJECT)
+@@ -65,15 +57,11 @@ static guint signals [SIGNAL_LAST_SIGNAL];
+
+
+ static gboolean
+-call_state_has_audio (WysDirection direction,
+- MMCallState state)
++call_state_has_audio (MMCallState state)
+ {
+ switch (state)
+ {
+ case MM_CALL_STATE_RINGING_OUT:
+- return
+- (direction == WYS_DIRECTION_FROM_NETWORK)
+- ? TRUE : FALSE;
+ case MM_CALL_STATE_ACTIVE:
+ return TRUE;
+ default:
+@@ -84,39 +72,35 @@ call_state_has_audio (WysDirection direction,
+
+ static void
+ update_audio_count (WysModem *self,
+- WysDirection direction,
+ gint delta)
+ {
+- const guint old_count = self->audio_count[direction];
++ const guint old_count = self->audio_count;
+
+- g_assert (delta >= 0 || self->audio_count[direction] > 0);
++ g_assert (delta >= 0 || self->audio_count > 0);
+
+- self->audio_count[direction] += delta;
++ self->audio_count += delta;
+
+- if (self->audio_count[direction] > 0 && old_count == 0)
++ if (self->audio_count > 0 && old_count == 0)
+ {
+- g_debug ("Modem `%s' audio %s now present",
+- mm_modem_voice_get_path (self->voice),
+- wys_direction_get_description (direction));
+- g_signal_emit_by_name (self, "audio-present", direction);
++ g_message ("Modem `%s' audio now present",
++ mm_modem_voice_get_path (self->voice));
++ g_signal_emit_by_name (self, "audio-present");
+ }
+- else if (self->audio_count[direction] == 0 && old_count > 0)
++ else if (self->audio_count == 0 && old_count > 0)
+ {
+- g_debug ("Modem `%s' audio now absent",
+- mm_modem_voice_get_path (self->voice));
+- g_signal_emit_by_name (self, "audio-absent", direction);
++ g_message ("Modem `%s' audio now absent",
++ mm_modem_voice_get_path (self->voice));
++ g_signal_emit_by_name (self, "audio-absent");
+ }
+ }
+
+
+ static gboolean
+-get_call_has_audio (MMCall *mm_call,
+- WysDirection direction)
++get_call_has_audio (MMCall *mm_call)
+ {
+ gpointer data;
+
+- data = g_object_get_data (G_OBJECT (mm_call),
+- WYS_MODEM_HAS_AUDIO[direction]);
++ data = g_object_get_data (G_OBJECT (mm_call), "audio-state");
+
+ return (gboolean)(GPOINTER_TO_UINT (data));
+ }
+@@ -124,42 +108,38 @@ get_call_has_audio (MMCall *mm_call,
+
+ static void
+ set_call_has_audio (MMCall *mm_call,
+- WysDirection direction,
+ gboolean has_audio)
+ {
+ g_object_set_data (G_OBJECT (mm_call),
+- WYS_MODEM_HAS_AUDIO[direction],
++ "audio-state",
+ GUINT_TO_POINTER ((guint)has_audio));
+ }
+
+
+ static void
+-update_direction_state (WysModem *self,
+- MMCall *mm_call,
+- const gchar *path,
+- WysDirection direction,
+- MMCallState old_state,
+- MMCallState new_state)
++update_call_state (WysModem *self,
++ MMCall *mm_call,
++ const gchar *path,
++ MMCallState old_state,
++ MMCallState new_state)
+ {
+- gboolean had_audio = call_state_has_audio (direction, old_state);
+- gboolean have_audio = call_state_has_audio (direction, new_state);
++ gboolean had_audio = call_state_has_audio (old_state);
++ gboolean have_audio = call_state_has_audio (new_state);
+
+ if (!had_audio && have_audio)
+ {
+- g_debug ("Call `%s' gained audio %s", path,
+- wys_direction_get_description (direction));
+- update_audio_count (self, direction, +1);
++ g_message ("Call `%s' gained audio", path);
++ update_audio_count (self, +1);
+ }
+ else if (had_audio && !have_audio)
+ {
+- g_debug ("Call `%s' lost audio %s", path,
+- wys_direction_get_description (direction));
+- update_audio_count (self, direction, -1);
++ g_message ("Call `%s' lost audio", path);
++ update_audio_count (self, -1);
+ }
+
+ if (had_audio != have_audio)
+ {
+- set_call_has_audio (mm_call, direction, have_audio);
++ set_call_has_audio (mm_call, have_audio);
+ }
+ }
+
+@@ -174,34 +154,28 @@ call_state_changed_cb (MmGdbusCall *mm_gdbus_call,
+ MMCall *mm_call = MM_CALL (mm_gdbus_call);
+ const gchar * path = mm_call_get_path (mm_call);
+
+- g_debug ("Call `%s' state changed, new: %i, old: %i",
++ g_message ("Call `%s' state changed, new: %i, old: %i",
+ path, (int)new_state, (int)old_state);
+
+ // FIXME: deal with calls being put on hold (one call goes
+ // non-audio, another call goes audio after)
+
+- update_direction_state (self, mm_call, path,
+- WYS_DIRECTION_FROM_NETWORK,
+- old_state, new_state);
+- update_direction_state (self, mm_call, path,
+- WYS_DIRECTION_TO_NETWORK,
+- old_state, new_state);
++ update_call_state (self, mm_call, path, old_state, new_state);
+ }
+
+
+ static void
+-init_call_direction (WysModem *self,
+- MMCall *mm_call,
+- MMCallState state,
+- WysDirection direction)
++init_call_audio (WysModem *self,
++ MMCall *mm_call,
++ MMCallState state)
+ {
+- gboolean has_audio = call_state_has_audio (direction, state);
++ gboolean has_audio = call_state_has_audio (state);
+
+- set_call_has_audio (mm_call, direction, has_audio);
++ set_call_has_audio (mm_call, has_audio);
+
+ if (has_audio)
+ {
+- update_audio_count (self, direction, +1);
++ update_audio_count (self, +1);
+ }
+ }
+
+@@ -223,12 +197,9 @@ add_call (WysModem *self,
+ self);
+
+ state = mm_call_get_state (mm_call);
+- init_call_direction (self, mm_call, state,
+- WYS_DIRECTION_FROM_NETWORK);
+- init_call_direction (self, mm_call, state,
+- WYS_DIRECTION_TO_NETWORK);
++ init_call_audio (self, mm_call, state);
+
+- g_debug ("Call `%s' added, state: %i", path, (int)state);
++ g_message ("Call `%s' added, state: %i", path, (int)state);
+ }
+
+
+@@ -322,16 +293,14 @@ call_added_cb (MMModemVoice *voice,
+
+
+ static void
+-clear_call_direction (WysModem *self,
+- MMCall *mm_call,
+- WysDirection direction)
++clear_call_state (WysModem *self,
++ MMCall *mm_call)
+ {
+- gboolean has_audio =
+- get_call_has_audio (mm_call, direction);
++ gboolean has_audio = get_call_has_audio (mm_call);
+
+ if (has_audio)
+ {
+- update_audio_count (self, direction, -1);
++ update_audio_count (self, -1);
+ }
+ }
+
+@@ -343,7 +312,7 @@ call_deleted_cb (MMModemVoice *voice,
+ {
+ MMCall *mm_call;
+
+- g_debug ("Removing call `%s'", path);
++ g_message ("Removing call `%s'", path);
+
+ mm_call = g_hash_table_lookup (self->calls, path);
+ if (!mm_call)
+@@ -352,14 +321,11 @@ call_deleted_cb (MMModemVoice *voice,
+ return;
+ }
+
+- clear_call_direction (self, mm_call,
+- WYS_DIRECTION_FROM_NETWORK);
+- clear_call_direction (self, mm_call,
+- WYS_DIRECTION_TO_NETWORK);
++ clear_call_state (self, mm_call);
+
+ g_hash_table_remove (self->calls, path);
+
+- g_debug ("Call `%s' removed", path);
++ g_message ("Call `%s' removed", path);
+ }
+
+
+@@ -444,11 +410,9 @@ dispose (GObject *object)
+ if (g_hash_table_size (self->calls) > 0)
+ {
+ g_hash_table_remove_all (self->calls);
+- if (self->audio_count[WYS_DIRECTION_FROM_NETWORK] > 0 ||
+- self->audio_count[WYS_DIRECTION_TO_NETWORK] > 0)
++ if (self->audio_count > 0)
+ {
+- self->audio_count[WYS_DIRECTION_FROM_NETWORK] =
+- self->audio_count[WYS_DIRECTION_TO_NETWORK] = 0;
++ self->audio_count = 0;
+ g_signal_emit_by_name (self, "audio-absent");
+ }
+ }
+@@ -504,8 +468,7 @@ wys_modem_class_init (WysModemClass *klass)
+ G_SIGNAL_RUN_LAST,
+ 0, NULL, NULL, NULL,
+ G_TYPE_NONE,
+- 1,
+- WYS_TYPE_DIRECTION);
++ 0);
+
+ /**
+ * WysModem::audio-absent:
+@@ -520,8 +483,7 @@ wys_modem_class_init (WysModemClass *klass)
+ G_SIGNAL_RUN_LAST,
+ 0, NULL, NULL, NULL,
+ G_TYPE_NONE,
+- 1,
+- WYS_TYPE_DIRECTION);
++ 0);
+ }
+
+
diff --git a/srcpkgs/pinephone-wys/template b/srcpkgs/pinephone-wys/template
new file mode 100644
index 00000000000..ab3eaad64ac
--- /dev/null
+++ b/srcpkgs/pinephone-wys/template
@@ -0,0 +1,19 @@
+# Template file for 'pinephone-wys'
+pkgname=pinephone-wys
+_pkgname=wys
+version=0.1.8
+revision=1
+wrksrc=${_pkgname}-v${version}
+build_style=meson
+hostmakedepends="pkg-config"
+makedepends="glib-devel pulseaudio-devel ModemManager-devel"
+short_desc="Daemon to bring up and take down PulseAudio for phone call audio"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/wys"
+distfiles="${homepage}/-/archive/v${version}/${_pkgname}-v${version}.tar.gz"
+checksum=07fd6d2ae9ea5d6187e1c99d5b0e5c1d9c74ba00f4869f4aae195cd8714ba375
+
+post_install() {
+ vinstall ${FILESDIR}/wys.desktop 644 etc/xdg/autostart
+}
diff --git a/srcpkgs/pinephone-wys/update b/srcpkgs/pinephone-wys/update
new file mode 100644
index 00000000000..76a93c0b606
--- /dev/null
+++ b/srcpkgs/pinephone-wys/update
@@ -0,0 +1,2 @@
+site="https://source.puri.sm/Librem5/${_pkgname}/tags"
+pattern='/archive/[^/]+/\Q'"$_pkgname"'\E-v?\K[\d\.]+(?=\.tar\.gz")'
From 545032699f9a40d4ef93193f2fa2035b3c261a01 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 19 Sep 2020 19:12:26 -0700
Subject: [PATCH 11/12] New package: megapixels-0.8.0
---
srcpkgs/megapixels/template | 13 +++++++++++++
srcpkgs/megapixels/update | 2 ++
2 files changed, 15 insertions(+)
create mode 100644 srcpkgs/megapixels/template
create mode 100644 srcpkgs/megapixels/update
diff --git a/srcpkgs/megapixels/template b/srcpkgs/megapixels/template
new file mode 100644
index 00000000000..3c5e485b122
--- /dev/null
+++ b/srcpkgs/megapixels/template
@@ -0,0 +1,13 @@
+# Template file for 'megapixels'
+pkgname=megapixels
+version=0.8.0
+revision=1
+build_style=meson
+hostmakedepends="pkg-config glib-devel"
+makedepends="gtk+3-devel"
+short_desc="GTK+3 camera app for ARM devices"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://git.sr.ht/~martijnbraam/megapixels"
+distfiles="${homepage}/archive/${version}.tar.gz"
+checksum=af21a62c163d912bc8b9ace77701b0f8cc76e1d423c4e644e67fd8e92b645ba7
diff --git a/srcpkgs/megapixels/update b/srcpkgs/megapixels/update
new file mode 100644
index 00000000000..c9a427b3cd2
--- /dev/null
+++ b/srcpkgs/megapixels/update
@@ -0,0 +1,2 @@
+site="https://git.sr.ht/~martijnbraam/megapixels/refs"
+pattern='/archive/(v?|\Q'"$pkgname"'\E-)?\K[\d\.]+(?=\.tar\.gz")'
From 0021299df2873946bde128224984af583e1b6d37 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 19 Sep 2020 21:49:43 -0700
Subject: [PATCH 12/12] New package: purple-mm-sms-0.1.7
---
.../patches/0001-Support-meson.patch | 63 +++++++++++++++++++
srcpkgs/purple-mm-sms/template | 14 +++++
srcpkgs/purple-mm-sms/update | 2 +
3 files changed, 79 insertions(+)
create mode 100644 srcpkgs/purple-mm-sms/patches/0001-Support-meson.patch
create mode 100644 srcpkgs/purple-mm-sms/template
create mode 100644 srcpkgs/purple-mm-sms/update
diff --git a/srcpkgs/purple-mm-sms/patches/0001-Support-meson.patch b/srcpkgs/purple-mm-sms/patches/0001-Support-meson.patch
new file mode 100644
index 00000000000..55e4ece0869
--- /dev/null
+++ b/srcpkgs/purple-mm-sms/patches/0001-Support-meson.patch
@@ -0,0 +1,63 @@
+From 1c4896f15f63bb6719ece59b626fddf55b766a0e Mon Sep 17 00:00:00 2001
+From: Julio Galvan <julio-void@epazote.net>
+Date: Sat, 19 Sep 2020 21:32:19 -0700
+Subject: [PATCH] Support meson
+
+I am trying to package this library for voidlinux but it fails to
+crossbuild automatically. I thought that we could use this for now.
+---
+ meson.build | 42 ++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 42 insertions(+)
+ create mode 100644 meson.build
+
+diff --git a/meson.build b/meson.build
+new file mode 100644
+index 0000000..8b6c90e
+--- /dev/null
++++ meson.build
+@@ -0,0 +1,42 @@
++project('purple-mm-sms', 'c',
++ version: '0.1.7',
++)
++
++cc = meson.get_compiler('c')
++
++purple = dependency('purple')
++mm = dependency('mm-glib')
++glib= dependency('glib-2.0', version: '>=2.50.0')
++
++purple_plugdir = purple.get_pkgconfig_variable('plugindir')
++
++mm_sms_headers = [
++ 'mm-sms.h',
++ 'itu-e212-iso.h',
++]
++
++mm_sms_sources = [
++ mm_sms_headers,
++ 'mm-sms.c',
++]
++
++mm_sms_deps = [
++ purple,
++ mm,
++ glib,
++]
++
++mm_sms_shared = shared_library(
++ 'mm-sms',
++ mm_sms_sources,
++ dependencies : mm_sms_deps,
++ name_prefix : '',
++ install_dir : purple_plugdir,
++ install : true,
++)
++
++
++iconsdir = join_paths(get_option('datadir'), 'pixmaps', 'pidgin', 'protocols')
++foreach size: ['16', '22', '48']
++ install_data('icons/mm-sms-' + size + 'px.png', rename: 'mm-sms.png', install_dir: iconsdir + '/' + size)
++endforeach
+--
+2.28.0
+
diff --git a/srcpkgs/purple-mm-sms/template b/srcpkgs/purple-mm-sms/template
new file mode 100644
index 00000000000..ee57770d349
--- /dev/null
+++ b/srcpkgs/purple-mm-sms/template
@@ -0,0 +1,14 @@
+# Template file for 'purple-mm-sms'
+pkgname=purple-mm-sms
+version=0.1.7
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=meson
+hostmakedepends="pkg-config"
+makedepends="ModemManager-devel libglib-devel libpurple-devel"
+short_desc="Purple SMS plugin using ModemManager"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/purple-mm-sms"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=123d71f40051e6afc59dc8f8fb6efef0524a99b377856d99d5e64d0b867ab2be
diff --git a/srcpkgs/purple-mm-sms/update b/srcpkgs/purple-mm-sms/update
new file mode 100644
index 00000000000..4e461b21e8c
--- /dev/null
+++ b/srcpkgs/purple-mm-sms/update
@@ -0,0 +1,2 @@
+site="https://source.puri.sm/Librem5/${pkgname}/tags"
+pattern='/archive/[^/]+/\Q'"$pkgname"'\E-v?\K[\d\.]+(?=\.tar\.gz")'
^ permalink raw reply [flat|nested] 47+ messages in thread* Re: New packages: phoc-0.4.2 calls-0.1.7 purism-chatty-0.1.15
2020-08-29 20:46 [PR PATCH] New packages: phoc-0.4.2 calls-0.1.7 purism-chatty--0.1.15 julio641742
` (37 preceding siblings ...)
2020-09-23 21:49 ` julio641742
@ 2020-09-25 9:23 ` jjsullivan5196
2020-10-02 21:44 ` Frick-David
` (6 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: jjsullivan5196 @ 2020-09-25 9:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 262 bytes --]
New comment by jjsullivan5196 on void-packages repository
https://github.com/void-linux/void-packages/pull/24538#issuecomment-698824413
Comment:
@julio641742 thanks for letting me take `atinout`, I pushed up my PR #25084 if you want to cherrypick anything :^)
^ permalink raw reply [flat|nested] 47+ messages in thread* Re: New packages: phoc-0.4.2 calls-0.1.7 purism-chatty-0.1.15
2020-08-29 20:46 [PR PATCH] New packages: phoc-0.4.2 calls-0.1.7 purism-chatty--0.1.15 julio641742
` (38 preceding siblings ...)
2020-09-25 9:23 ` jjsullivan5196
@ 2020-10-02 21:44 ` Frick-David
2021-02-27 14:20 ` jcgruenhage
` (5 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: Frick-David @ 2020-10-02 21:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 166 bytes --]
New comment by Frick-David on void-packages repository
https://github.com/void-linux/void-packages/pull/24538#issuecomment-702971319
Comment:
Support support this!
^ permalink raw reply [flat|nested] 47+ messages in thread* Re: New packages: phoc-0.4.2 calls-0.1.7 purism-chatty-0.1.15
2020-08-29 20:46 [PR PATCH] New packages: phoc-0.4.2 calls-0.1.7 purism-chatty--0.1.15 julio641742
` (39 preceding siblings ...)
2020-10-02 21:44 ` Frick-David
@ 2021-02-27 14:20 ` jcgruenhage
2021-02-28 10:36 ` jcgruenhage
` (4 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: jcgruenhage @ 2021-02-27 14:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 292 bytes --]
New comment by jcgruenhage on void-packages repository
https://github.com/void-linux/void-packages/pull/24538#issuecomment-787079934
Comment:
Out of interest, what's missing here concretely? I'd like to give this a go and would like to avoid having to manually build updates in the future.
^ permalink raw reply [flat|nested] 47+ messages in thread* Re: New packages: phoc-0.4.2 calls-0.1.7 purism-chatty-0.1.15
2020-08-29 20:46 [PR PATCH] New packages: phoc-0.4.2 calls-0.1.7 purism-chatty--0.1.15 julio641742
` (40 preceding siblings ...)
2021-02-27 14:20 ` jcgruenhage
@ 2021-02-28 10:36 ` jcgruenhage
2021-02-28 20:05 ` jcgruenhage
` (3 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: jcgruenhage @ 2021-02-28 10:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 440 bytes --]
New comment by jcgruenhage on void-packages repository
https://github.com/void-linux/void-packages/pull/24538#issuecomment-787430963
Comment:
For the record, I'm working on updating the stuff in here to run it on my pinephone. `calls` has a new dependency on https://gitlab.com/mobian1/callaudiod and the associated libcallaudio, which aren't packaged yet, the rest seems to be just version bumps and libraries that are already packaged.
^ permalink raw reply [flat|nested] 47+ messages in thread* Re: New packages: phoc-0.4.2 calls-0.1.7 purism-chatty-0.1.15
2020-08-29 20:46 [PR PATCH] New packages: phoc-0.4.2 calls-0.1.7 purism-chatty--0.1.15 julio641742
` (41 preceding siblings ...)
2021-02-28 10:36 ` jcgruenhage
@ 2021-02-28 20:05 ` jcgruenhage
2021-02-28 21:32 ` jcgruenhage
` (2 subsequent siblings)
45 siblings, 0 replies; 47+ messages in thread
From: jcgruenhage @ 2021-02-28 20:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 900 bytes --]
New comment by jcgruenhage on void-packages repository
https://github.com/void-linux/void-packages/pull/24538#issuecomment-787513596
Comment:
https://github.com/jcgruenhage/void-packages/tree/pinephone <- has updates for:
- phosh and phoc
- megapixels
- calls (but it's broken, because my package for callaudiod doesn't split out the devel and lib packages yet)
- squeekboard
- mobile-config-firefox
I haven't been able to update pinephone-wys yet, since the patch doesn't apply anymore, haven't found an updated version of the patch yet.
Aside of that, after running phosh for the first time, my pinephone crashed, and now void isn't booting anymore. I think that's everything for now, but to move this forward, I'll split up the PR into multiple ones for each unrelated item, so one for calls, one for squeekboard, one for phoc and phosh, one for mobile-config-firefox and so on.
^ permalink raw reply [flat|nested] 47+ messages in thread* Re: New packages: phoc-0.4.2 calls-0.1.7 purism-chatty-0.1.15
2020-08-29 20:46 [PR PATCH] New packages: phoc-0.4.2 calls-0.1.7 purism-chatty--0.1.15 julio641742
` (42 preceding siblings ...)
2021-02-28 20:05 ` jcgruenhage
@ 2021-02-28 21:32 ` jcgruenhage
2022-04-19 2:12 ` github-actions
2022-05-03 2:13 ` [PR PATCH] [Closed]: " github-actions
45 siblings, 0 replies; 47+ messages in thread
From: jcgruenhage @ 2021-02-28 21:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 697 bytes --]
New comment by jcgruenhage on void-packages repository
https://github.com/void-linux/void-packages/pull/24538#issuecomment-787513596
Comment:
https://github.com/jcgruenhage/void-packages/tree/pinephone <- is my branch for all things pinephone. It has updates for some components, which have been submitted as individual PRs:
- phosh, phoc and squeekboard #29137
- megapixels #29129
- calls #29138
- mobile-config-firefox #29131
I haven't been able to update pinephone-wys yet, since the patch doesn't apply anymore, haven't found an updated version of the patch yet.
Aside of that, after running phosh for the first time, my pinephone crashed, and now void isn't booting anymore.
^ permalink raw reply [flat|nested] 47+ messages in thread* Re: New packages: phoc-0.4.2 calls-0.1.7 purism-chatty-0.1.15
2020-08-29 20:46 [PR PATCH] New packages: phoc-0.4.2 calls-0.1.7 purism-chatty--0.1.15 julio641742
` (43 preceding siblings ...)
2021-02-28 21:32 ` jcgruenhage
@ 2022-04-19 2:12 ` github-actions
2022-05-03 2:13 ` [PR PATCH] [Closed]: " github-actions
45 siblings, 0 replies; 47+ messages in thread
From: github-actions @ 2022-04-19 2:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 305 bytes --]
New comment by github-actions[bot] on void-packages repository
https://github.com/void-linux/void-packages/pull/24538#issuecomment-1101923578
Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that. If this pull request is still relevant bump it or assign it.
^ permalink raw reply [flat|nested] 47+ messages in thread* Re: [PR PATCH] [Closed]: New packages: phoc-0.4.2 calls-0.1.7 purism-chatty-0.1.15
2020-08-29 20:46 [PR PATCH] New packages: phoc-0.4.2 calls-0.1.7 purism-chatty--0.1.15 julio641742
` (44 preceding siblings ...)
2022-04-19 2:12 ` github-actions
@ 2022-05-03 2:13 ` github-actions
45 siblings, 0 replies; 47+ messages in thread
From: github-actions @ 2022-05-03 2:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1458 bytes --]
There's a closed pull request on the void-packages repository
New packages: phoc-0.4.2 calls-0.1.7 purism-chatty-0.1.15
https://github.com/void-linux/void-packages/pull/24538
Description:
Status of `phosh` on the PinePhone 1.2a
- [x] Shell
- `phosh` `squeekboard` `phoc` `feedbackd` packaged
- `phosh-desktop` (Should I rename it?, Does it need any additional dependencies?)
- [x] Calls (sound is bad)
- `calls` `pinephone-wys` packaged
- [x] SMS (works)
- `purism-chatty` `purple-mm-sms` packaged
- [x] Data (works)
- [ ] Camera (working on it)
- `megapixels` packaged
The modem needs to be manually enabled every single time with `echo 1 > /sys/class/modem-power/modem-power/device/powered` (I could create a service for that).
You need to run this [script](https://gitlab.com/postmarketOS/pmaports/-/blob/master/device/community/device-pine64-pinephone/setup-modem.sh) at least one time for it to set up the modem with the right settings.
i am able to make calls with `calls` and `pinephone-wys`. I am using the sound profiles from [here](https://gitlab.com/postmarketOS/pmaports/-/tree/master/device/community/device-pine64-pinephone/ucm) and `alsa-ucm-conf`(not yet packaged) but the sound is bad.
`purism-chatty` can't find `libjabber.so` and `mm-sms.so` that are inside `/usr/lib/purple-2`. I created symlinks from `/usr/lib/purple-2/{libjabber.so,mm-sms.so}` to `/usr/lib` Any suggestions on how to fix this?
^ permalink raw reply [flat|nested] 47+ messages in thread