Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] New packages: phosh + deps (squeekboard, phoc and feedbackd)
@ 2021-02-28 20:48 jcgruenhage
  2021-02-28 21:21 ` [PR PATCH] [Updated] " jcgruenhage
                   ` (14 more replies)
  0 siblings, 15 replies; 16+ messages in thread
From: jcgruenhage @ 2021-02-28 20:48 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1636 bytes --]

There is a new pull request by jcgruenhage against master on the void-packages repository

https://github.com/jcgruenhage/void-packages phosh-0.8.1_1
https://github.com/void-linux/void-packages/pull/29137

New packages: phosh + deps (squeekboard, phoc and feedbackd)
<!-- Mark items with [x] where applicable -->

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/29137.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-phosh-0.8.1_1-29137.patch --]
[-- Type: text/x-diff, Size: 9198 bytes --]

From b368a9126274852e35b7aec88e81e5ef4c377253 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Sun, 28 Feb 2021 21:45:00 +0100
Subject: [PATCH 1/4] New package: feedbackd-0.0.0+git20210125

---
 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 959f1692961..117643744c2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3924,3 +3924,4 @@ libsimavr.so.1 simavr-1.6_2
 libsimavrparts.so.1 simavr-1.6_2
 libsword-1.8.1.so libsword-1.8.1_6
 libtree-sitter.so.0 tree-sitter-0.18.2_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..ac0d229546e
--- /dev/null
+++ b/srcpkgs/feedbackd/template
@@ -0,0 +1,37 @@
+# Template file for 'feedbackd'
+pkgname=feedbackd
+version=0.0.0+git20210125
+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="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/feedbackd"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=48db1e6e8263025d881cd00e66c2d2a82db0d1a632cfb378803f9e3337c5dd8d
+
+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 a5f75205196541e495373035d5c4238b3a519fe5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Sun, 28 Feb 2021 21:45:00 +0100
Subject: [PATCH 2/4] New package: phoc-0.6.0

---
 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..7acef2aebc0
--- /dev/null
+++ b/srcpkgs/phoc/template
@@ -0,0 +1,16 @@
+# Template file for 'phoc'
+pkgname=phoc
+version=0.6.0
+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="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/phoc"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=0c43fa6c9e623dcb67a8579838132c098375c6024c1b45d6849097dd5381440f
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 9b06034863e578f13a5322358ff199ca9949c7aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Sun, 28 Feb 2021 21:45:00 +0100
Subject: [PATCH 3/4] New package: squeekboard-1.12.0

---
 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..5b6f9326828
--- /dev/null
+++ b/srcpkgs/squeekboard/template
@@ -0,0 +1,26 @@
+# Template file for 'squeekboard'
+pkgname=squeekboard
+version=1.12.0
+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="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/squeekboard"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=df8f3849c6dbf8677ef3dc495b54485d2ddf9830f0591acd3a867b8414fd45de
+
+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 0f89abbb915af04daba6cce3666638f08486b9f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Sun, 28 Feb 2021 21:45:00 +0100
Subject: [PATCH 4/4] New package: phosh-0.8.1

---
 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..249308655a9
--- /dev/null
+++ b/srcpkgs/phosh/template
@@ -0,0 +1,22 @@
+# Template file for 'phosh'
+pkgname=phosh
+version=0.8.1
+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 elogind-devel"
+depends="phoc squeekboard gnome-session gnome-settings-daemon elogind
+ xorg-server-xwayland cantarell-fonts font-adobe-source-code-pro"
+short_desc="Wayland shell prototype for GNOME on mobile devices"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/phosh"
+distfiles="https://repo.pureos.net/pureos/pool/main/p/${pkgname}/${pkgname}_${version}.orig.tar.gz"
+checksum=d40b945c9082bcded8b8e2dd219d2768724fef2ade5e492d0c276a20c5ee43e2
+
+post_install() {
+	vcopy ${FILESDIR}/sm.puri.OSK0.desktop usr/share/applications
+	vcopy ${FILESDIR}/phosh.desktop usr/share/wayland-sessions
+}

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PR PATCH] [Updated] New packages: phosh + deps (squeekboard, phoc and feedbackd)
  2021-02-28 20:48 [PR PATCH] New packages: phosh + deps (squeekboard, phoc and feedbackd) jcgruenhage
@ 2021-02-28 21:21 ` jcgruenhage
  2021-02-28 21:43 ` jcgruenhage
                   ` (13 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: jcgruenhage @ 2021-02-28 21:21 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1641 bytes --]

There is an updated pull request by jcgruenhage against master on the void-packages repository

https://github.com/jcgruenhage/void-packages phosh-0.8.1_1
https://github.com/void-linux/void-packages/pull/29137

New packages: phosh + deps (squeekboard, phoc and feedbackd)
<!-- Mark items with [x] where applicable -->

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/29137.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-phosh-0.8.1_1-29137.patch --]
[-- Type: text/x-diff, Size: 9198 bytes --]

From 6c5b57ac5200596de19224f6f0c1deef29a48a23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Sun, 28 Feb 2021 21:45:00 +0100
Subject: [PATCH 1/4] New package: feedbackd-0.0.0+git20210125

---
 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 959f1692961..48e89eb9d1c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3924,3 +3924,4 @@ libsimavr.so.1 simavr-1.6_2
 libsimavrparts.so.1 simavr-1.6_2
 libsword-1.8.1.so libsword-1.8.1_6
 libtree-sitter.so.0 tree-sitter-0.18.2_1
+libfeedback-0.0.so.0 libfeedback-0.0.0+git20210125_1
diff --git a/srcpkgs/feedbackd/template b/srcpkgs/feedbackd/template
new file mode 100644
index 00000000000..ac0d229546e
--- /dev/null
+++ b/srcpkgs/feedbackd/template
@@ -0,0 +1,37 @@
+# Template file for 'feedbackd'
+pkgname=feedbackd
+version=0.0.0+git20210125
+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="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/feedbackd"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=48db1e6e8263025d881cd00e66c2d2a82db0d1a632cfb378803f9e3337c5dd8d
+
+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 0d5ed5ee11ee30010f2133771a3b1a73b171220f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Sun, 28 Feb 2021 21:45:00 +0100
Subject: [PATCH 2/4] New package: phoc-0.6.0

---
 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..7acef2aebc0
--- /dev/null
+++ b/srcpkgs/phoc/template
@@ -0,0 +1,16 @@
+# Template file for 'phoc'
+pkgname=phoc
+version=0.6.0
+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="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/phoc"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=0c43fa6c9e623dcb67a8579838132c098375c6024c1b45d6849097dd5381440f
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 67ba7df7c8b23566ce7905be41a97a4cdce16174 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Sun, 28 Feb 2021 21:45:00 +0100
Subject: [PATCH 3/4] New package: squeekboard-1.12.0

---
 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..5b6f9326828
--- /dev/null
+++ b/srcpkgs/squeekboard/template
@@ -0,0 +1,26 @@
+# Template file for 'squeekboard'
+pkgname=squeekboard
+version=1.12.0
+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="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/squeekboard"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=df8f3849c6dbf8677ef3dc495b54485d2ddf9830f0591acd3a867b8414fd45de
+
+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 a39feec340c2c3e84fd590c2b9bce73f1a4c93f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Sun, 28 Feb 2021 21:45:00 +0100
Subject: [PATCH 4/4] New package: phosh-0.8.1

---
 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..249308655a9
--- /dev/null
+++ b/srcpkgs/phosh/template
@@ -0,0 +1,22 @@
+# Template file for 'phosh'
+pkgname=phosh
+version=0.8.1
+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 elogind-devel"
+depends="phoc squeekboard gnome-session gnome-settings-daemon elogind
+ xorg-server-xwayland cantarell-fonts font-adobe-source-code-pro"
+short_desc="Wayland shell prototype for GNOME on mobile devices"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/phosh"
+distfiles="https://repo.pureos.net/pureos/pool/main/p/${pkgname}/${pkgname}_${version}.orig.tar.gz"
+checksum=d40b945c9082bcded8b8e2dd219d2768724fef2ade5e492d0c276a20c5ee43e2
+
+post_install() {
+	vcopy ${FILESDIR}/sm.puri.OSK0.desktop usr/share/applications
+	vcopy ${FILESDIR}/phosh.desktop usr/share/wayland-sessions
+}

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PR PATCH] [Updated] New packages: phosh + deps (squeekboard, phoc and feedbackd)
  2021-02-28 20:48 [PR PATCH] New packages: phosh + deps (squeekboard, phoc and feedbackd) jcgruenhage
  2021-02-28 21:21 ` [PR PATCH] [Updated] " jcgruenhage
@ 2021-02-28 21:43 ` jcgruenhage
  2021-02-28 22:36 ` jcgruenhage
                   ` (12 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: jcgruenhage @ 2021-02-28 21:43 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1641 bytes --]

There is an updated pull request by jcgruenhage against master on the void-packages repository

https://github.com/jcgruenhage/void-packages phosh-0.8.1_1
https://github.com/void-linux/void-packages/pull/29137

New packages: phosh + deps (squeekboard, phoc and feedbackd)
<!-- Mark items with [x] where applicable -->

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/29137.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-phosh-0.8.1_1-29137.patch --]
[-- Type: text/x-diff, Size: 9203 bytes --]

From 4e288aea2b19e1cd30821d96439938a5f983dcb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Sun, 28 Feb 2021 21:45:00 +0100
Subject: [PATCH 1/4] New package: feedbackd-0.0.0+git20210125

---
 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 959f1692961..48e89eb9d1c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3924,3 +3924,4 @@ libsimavr.so.1 simavr-1.6_2
 libsimavrparts.so.1 simavr-1.6_2
 libsword-1.8.1.so libsword-1.8.1_6
 libtree-sitter.so.0 tree-sitter-0.18.2_1
+libfeedback-0.0.so.0 libfeedback-0.0.0+git20210125_1
diff --git a/srcpkgs/feedbackd/template b/srcpkgs/feedbackd/template
new file mode 100644
index 00000000000..045cf61b76a
--- /dev/null
+++ b/srcpkgs/feedbackd/template
@@ -0,0 +1,37 @@
+# Template file for 'feedbackd'
+pkgname=feedbackd
+version=0.0.0+git20210125
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=meson
+build_helper=gir
+hostmakedepends="vala glib-devel pkg-config dbus"
+makedepends="gsound-devel libgudev-devel json-glib-devel"
+depends="dbus"
+short_desc="Daemon to provide haptic feedback on events"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/feedbackd"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=48db1e6e8263025d881cd00e66c2d2a82db0d1a632cfb378803f9e3337c5dd8d
+
+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 c356429e4130f5580b59c76279890048b71d90c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Sun, 28 Feb 2021 21:45:00 +0100
Subject: [PATCH 2/4] New package: phoc-0.6.0

---
 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..7acef2aebc0
--- /dev/null
+++ b/srcpkgs/phoc/template
@@ -0,0 +1,16 @@
+# Template file for 'phoc'
+pkgname=phoc
+version=0.6.0
+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="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/phoc"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=0c43fa6c9e623dcb67a8579838132c098375c6024c1b45d6849097dd5381440f
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 5cfacacc27788532971f45ddb989a890817d789b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Sun, 28 Feb 2021 21:45:00 +0100
Subject: [PATCH 3/4] New package: squeekboard-1.12.0

---
 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..5b6f9326828
--- /dev/null
+++ b/srcpkgs/squeekboard/template
@@ -0,0 +1,26 @@
+# Template file for 'squeekboard'
+pkgname=squeekboard
+version=1.12.0
+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="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/squeekboard"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=df8f3849c6dbf8677ef3dc495b54485d2ddf9830f0591acd3a867b8414fd45de
+
+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 5ce5075c98a7df9a63b9f0d48bee3cc4c3f685d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Sun, 28 Feb 2021 21:45:00 +0100
Subject: [PATCH 4/4] New package: phosh-0.8.1

---
 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..249308655a9
--- /dev/null
+++ b/srcpkgs/phosh/template
@@ -0,0 +1,22 @@
+# Template file for 'phosh'
+pkgname=phosh
+version=0.8.1
+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 elogind-devel"
+depends="phoc squeekboard gnome-session gnome-settings-daemon elogind
+ xorg-server-xwayland cantarell-fonts font-adobe-source-code-pro"
+short_desc="Wayland shell prototype for GNOME on mobile devices"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/phosh"
+distfiles="https://repo.pureos.net/pureos/pool/main/p/${pkgname}/${pkgname}_${version}.orig.tar.gz"
+checksum=d40b945c9082bcded8b8e2dd219d2768724fef2ade5e492d0c276a20c5ee43e2
+
+post_install() {
+	vcopy ${FILESDIR}/sm.puri.OSK0.desktop usr/share/applications
+	vcopy ${FILESDIR}/phosh.desktop usr/share/wayland-sessions
+}

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PR PATCH] [Updated] New packages: phosh + deps (squeekboard, phoc and feedbackd)
  2021-02-28 20:48 [PR PATCH] New packages: phosh + deps (squeekboard, phoc and feedbackd) jcgruenhage
  2021-02-28 21:21 ` [PR PATCH] [Updated] " jcgruenhage
  2021-02-28 21:43 ` jcgruenhage
@ 2021-02-28 22:36 ` jcgruenhage
  2021-03-01  1:50 ` jcgruenhage
                   ` (11 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: jcgruenhage @ 2021-02-28 22:36 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1641 bytes --]

There is an updated pull request by jcgruenhage against master on the void-packages repository

https://github.com/jcgruenhage/void-packages phosh-0.8.1_1
https://github.com/void-linux/void-packages/pull/29137

New packages: phosh + deps (squeekboard, phoc and feedbackd)
<!-- Mark items with [x] where applicable -->

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/29137.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-phosh-0.8.1_1-29137.patch --]
[-- Type: text/x-diff, Size: 9348 bytes --]

From 9c43f5e773e280d8bb9038c24df93bd1f06cfe34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Sun, 28 Feb 2021 21:45:00 +0100
Subject: [PATCH 1/4] New package: feedbackd-0.0.0+git20210125

---
 common/shlibs              |  1 +
 srcpkgs/feedbackd/template | 38 ++++++++++++++++++++++++++++++++++++++
 srcpkgs/feedbackd/update   |  2 ++
 srcpkgs/libfeedback        |  1 +
 srcpkgs/libfeedback-devel  |  1 +
 5 files changed, 43 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 959f1692961..48e89eb9d1c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3924,3 +3924,4 @@ libsimavr.so.1 simavr-1.6_2
 libsimavrparts.so.1 simavr-1.6_2
 libsword-1.8.1.so libsword-1.8.1_6
 libtree-sitter.so.0 tree-sitter-0.18.2_1
+libfeedback-0.0.so.0 libfeedback-0.0.0+git20210125_1
diff --git a/srcpkgs/feedbackd/template b/srcpkgs/feedbackd/template
new file mode 100644
index 00000000000..6e60d63417f
--- /dev/null
+++ b/srcpkgs/feedbackd/template
@@ -0,0 +1,38 @@
+# Template file for 'feedbackd'
+pkgname=feedbackd
+version=0.0.0+git20210125
+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"
+checkdepends="dbus"
+short_desc="Daemon to provide haptic feedback on events"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/feedbackd"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=48db1e6e8263025d881cd00e66c2d2a82db0d1a632cfb378803f9e3337c5dd8d
+
+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 c83fd686c78dba38b76960c45bc7f5a84d68d835 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Sun, 28 Feb 2021 21:45:00 +0100
Subject: [PATCH 2/4] New package: phoc-0.6.0

---
 srcpkgs/phoc/template | 18 ++++++++++++++++++
 srcpkgs/phoc/update   |  2 ++
 2 files changed, 20 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..c0849c2551d
--- /dev/null
+++ b/srcpkgs/phoc/template
@@ -0,0 +1,18 @@
+# Template file for 'phoc'
+pkgname=phoc
+version=0.6.0
+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="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/phoc"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=0c43fa6c9e623dcb67a8579838132c098375c6024c1b45d6849097dd5381440f
+# Checking requires running a wayland session
+make_check=no
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 92d85a42bfff8dfa0a99442d693bc546ae4aea55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Sun, 28 Feb 2021 21:45:00 +0100
Subject: [PATCH 3/4] New package: squeekboard-1.12.0

---
 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..5b6f9326828
--- /dev/null
+++ b/srcpkgs/squeekboard/template
@@ -0,0 +1,26 @@
+# Template file for 'squeekboard'
+pkgname=squeekboard
+version=1.12.0
+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="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/squeekboard"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=df8f3849c6dbf8677ef3dc495b54485d2ddf9830f0591acd3a867b8414fd45de
+
+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 5e4ffb2755a0137318c427e70a56a39463044459 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Sun, 28 Feb 2021 21:45:00 +0100
Subject: [PATCH 4/4] New package: phosh-0.8.1

---
 srcpkgs/phosh/files/phosh.desktop        | 11 +++++++++++
 srcpkgs/phosh/files/sm.puri.OSK0.desktop | 12 ++++++++++++
 srcpkgs/phosh/template                   | 24 ++++++++++++++++++++++++
 3 files changed, 47 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..3fd4c4705be
--- /dev/null
+++ b/srcpkgs/phosh/template
@@ -0,0 +1,24 @@
+# Template file for 'phosh'
+pkgname=phosh
+version=0.8.1
+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 elogind-devel"
+depends="phoc squeekboard gnome-session gnome-settings-daemon elogind
+ xorg-server-xwayland cantarell-fonts font-adobe-source-code-pro"
+short_desc="Wayland shell prototype for GNOME on mobile devices"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/phosh"
+distfiles="https://repo.pureos.net/pureos/pool/main/p/${pkgname}/${pkgname}_${version}.orig.tar.gz"
+checksum=d40b945c9082bcded8b8e2dd219d2768724fef2ade5e492d0c276a20c5ee43e2
+# Checking requires running a wayland session
+make_check=no
+
+post_install() {
+	vcopy ${FILESDIR}/sm.puri.OSK0.desktop usr/share/applications
+	vcopy ${FILESDIR}/phosh.desktop usr/share/wayland-sessions
+}

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PR PATCH] [Updated] New packages: phosh + deps (squeekboard, phoc and feedbackd)
  2021-02-28 20:48 [PR PATCH] New packages: phosh + deps (squeekboard, phoc and feedbackd) jcgruenhage
                   ` (2 preceding siblings ...)
  2021-02-28 22:36 ` jcgruenhage
@ 2021-03-01  1:50 ` jcgruenhage
  2022-05-05  2:09 ` github-actions
                   ` (10 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: jcgruenhage @ 2021-03-01  1:50 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1641 bytes --]

There is an updated pull request by jcgruenhage against master on the void-packages repository

https://github.com/jcgruenhage/void-packages phosh-0.8.1_1
https://github.com/void-linux/void-packages/pull/29137

New packages: phosh + deps (squeekboard, phoc and feedbackd)
<!-- Mark items with [x] where applicable -->

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/29137.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-phosh-0.8.1_1-29137.patch --]
[-- Type: text/x-diff, Size: 10326 bytes --]

From b1fb142ec01302641f8a4ee226037aeb5aade9aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Sun, 28 Feb 2021 21:45:00 +0100
Subject: [PATCH 1/4] New package: feedbackd-0.0.0+git20210125

---
 common/shlibs              |  1 +
 srcpkgs/feedbackd/template | 38 ++++++++++++++++++++++++++++++++++++++
 srcpkgs/feedbackd/update   |  2 ++
 srcpkgs/libfeedback        |  1 +
 srcpkgs/libfeedback-devel  |  1 +
 5 files changed, 43 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 858957c29f7..555e3941c9a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3924,3 +3924,4 @@ libsimavr.so.1 simavr-1.6_2
 libsimavrparts.so.1 simavr-1.6_2
 libsword-1.8.1.so libsword-1.8.1_6
 libtree-sitter.so.0 tree-sitter-0.18.2_1
+libfeedback-0.0.so.0 libfeedback-0.0.0+git20210125_1
diff --git a/srcpkgs/feedbackd/template b/srcpkgs/feedbackd/template
new file mode 100644
index 00000000000..6e60d63417f
--- /dev/null
+++ b/srcpkgs/feedbackd/template
@@ -0,0 +1,38 @@
+# Template file for 'feedbackd'
+pkgname=feedbackd
+version=0.0.0+git20210125
+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"
+checkdepends="dbus"
+short_desc="Daemon to provide haptic feedback on events"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/feedbackd"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=48db1e6e8263025d881cd00e66c2d2a82db0d1a632cfb378803f9e3337c5dd8d
+
+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 74ce5e5dcd352c22ef5327895fb9e12aad37e31a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Sun, 28 Feb 2021 21:45:00 +0100
Subject: [PATCH 2/4] New package: phoc-0.6.0

---
 srcpkgs/phoc/template | 18 ++++++++++++++++++
 srcpkgs/phoc/update   |  2 ++
 2 files changed, 20 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..c0849c2551d
--- /dev/null
+++ b/srcpkgs/phoc/template
@@ -0,0 +1,18 @@
+# Template file for 'phoc'
+pkgname=phoc
+version=0.6.0
+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="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/phoc"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=0c43fa6c9e623dcb67a8579838132c098375c6024c1b45d6849097dd5381440f
+# Checking requires running a wayland session
+make_check=no
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 6b1031c7b41f52409f0f5d15bd67a7ddcdf4f469 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Sun, 28 Feb 2021 21:45:00 +0100
Subject: [PATCH 3/4] New package: squeekboard-1.12.0

---
 srcpkgs/squeekboard/patches/crossbuild.patch | 28 ++++++++++++++++++++
 srcpkgs/squeekboard/template                 | 20 ++++++++++++++
 srcpkgs/squeekboard/update                   |  2 ++
 3 files changed, 50 insertions(+)
 create mode 100644 srcpkgs/squeekboard/patches/crossbuild.patch
 create mode 100644 srcpkgs/squeekboard/template
 create mode 100644 srcpkgs/squeekboard/update

diff --git a/srcpkgs/squeekboard/patches/crossbuild.patch b/srcpkgs/squeekboard/patches/crossbuild.patch
new file mode 100644
index 00000000000..3e59bdc7c54
--- /dev/null
+++ b/srcpkgs/squeekboard/patches/crossbuild.patch
@@ -0,0 +1,28 @@
+diff --git cargo_build.py cargo_build.py
+index d78ceb9..301bf00 100644
+--- cargo_build.py
++++ cargo_build.py
+@@ -9,14 +9,21 @@ from pathlib import Path
+ import shlex
+ import subprocess
+ import sys
++import os
+ 
+ source_dir = Path(__file__).absolute().parent
+ 
+ args = sys.argv[1:]
+-binary_dir = "debug"
++if 'CROSS_BUILD' in os.environ:
++    binary_dir = os.environ['RUST_TARGET'] + "/debug"
++else:
++    binary_dir = "debug"
+ 
+ if '--release' in args:
+-    binary_dir = "release"
++    if 'CROSS_BUILD' in os.environ:
++        binary_dir = os.environ['RUST_TARGET'] + "/release"
++    else:
++        binary_dir = "release"
+ 
+ # The file produced by Cargo will have a special name
+ try:
diff --git a/srcpkgs/squeekboard/template b/srcpkgs/squeekboard/template
new file mode 100644
index 00000000000..8c6f1bd35ce
--- /dev/null
+++ b/srcpkgs/squeekboard/template
@@ -0,0 +1,20 @@
+# Template file for 'squeekboard'
+pkgname=squeekboard
+version=1.12.0
+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="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/squeekboard"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=df8f3849c6dbf8677ef3dc495b54485d2ddf9830f0591acd3a867b8414fd45de
+
+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 f5ae380cd97da5da0917643476ab200c57237f9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Sun, 28 Feb 2021 21:45:00 +0100
Subject: [PATCH 4/4] New package: phosh-0.8.1

---
 srcpkgs/phosh/files/phosh.desktop        | 11 +++++++++++
 srcpkgs/phosh/files/sm.puri.OSK0.desktop | 12 ++++++++++++
 srcpkgs/phosh/template                   | 24 ++++++++++++++++++++++++
 3 files changed, 47 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..3fd4c4705be
--- /dev/null
+++ b/srcpkgs/phosh/template
@@ -0,0 +1,24 @@
+# Template file for 'phosh'
+pkgname=phosh
+version=0.8.1
+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 elogind-devel"
+depends="phoc squeekboard gnome-session gnome-settings-daemon elogind
+ xorg-server-xwayland cantarell-fonts font-adobe-source-code-pro"
+short_desc="Wayland shell prototype for GNOME on mobile devices"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/phosh"
+distfiles="https://repo.pureos.net/pureos/pool/main/p/${pkgname}/${pkgname}_${version}.orig.tar.gz"
+checksum=d40b945c9082bcded8b8e2dd219d2768724fef2ade5e492d0c276a20c5ee43e2
+# Checking requires running a wayland session
+make_check=no
+
+post_install() {
+	vcopy ${FILESDIR}/sm.puri.OSK0.desktop usr/share/applications
+	vcopy ${FILESDIR}/phosh.desktop usr/share/wayland-sessions
+}

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: New packages: phosh + deps (squeekboard, phoc and feedbackd)
  2021-02-28 20:48 [PR PATCH] New packages: phosh + deps (squeekboard, phoc and feedbackd) jcgruenhage
                   ` (3 preceding siblings ...)
  2021-03-01  1:50 ` jcgruenhage
@ 2022-05-05  2:09 ` github-actions
  2022-05-10 16:37 ` [PR PATCH] [Updated] " jcgruenhage
                   ` (9 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: github-actions @ 2022-05-05  2:09 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/29137#issuecomment-1118098358

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] 16+ messages in thread

* Re: [PR PATCH] [Updated] New packages: phosh + deps (squeekboard, phoc and feedbackd)
  2021-02-28 20:48 [PR PATCH] New packages: phosh + deps (squeekboard, phoc and feedbackd) jcgruenhage
                   ` (4 preceding siblings ...)
  2022-05-05  2:09 ` github-actions
@ 2022-05-10 16:37 ` jcgruenhage
  2022-05-10 16:40 ` jcgruenhage
                   ` (8 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: jcgruenhage @ 2022-05-10 16:37 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1704 bytes --]

There is an updated pull request by jcgruenhage against master on the void-packages repository

https://github.com/jcgruenhage/void-packages phosh-0.8.1_1
https://github.com/void-linux/void-packages/pull/29137

New packages: phosh + deps (squeekboard, phoc and feedbackd)
<!-- Mark items with [x] where applicable -->

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

#### TODOs
- [ ] Create a service for phosh
- [ ] Testing

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/29137.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-phosh-0.8.1_1-29137.patch --]
[-- Type: text/x-diff, Size: 9312 bytes --]

From c7a180d0f576585a0dc1491a1ea354dc4e60ff57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Sun, 28 Feb 2021 21:45:00 +0100
Subject: [PATCH 1/4] New package: feedbackd-0.0.0+git20220208

---
 common/shlibs              |  2 ++
 srcpkgs/feedbackd/template | 38 ++++++++++++++++++++++++++++++++++++++
 srcpkgs/feedbackd/update   |  2 ++
 srcpkgs/libfeedback        |  1 +
 srcpkgs/libfeedback-devel  |  1 +
 5 files changed, 44 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 d75ecdda38dc..d661b48a3314 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4168,3 +4168,5 @@ libMatrix.so root-6.24.06_1
 libThread.so root-6.24.06_1
 libTMVA.so root-6.24.06_1
 libMathCore.so root-6.24.06_1
+libtree-sitter.so.0 tree-sitter-0.18.2_1
+libfeedback-0.0.so.0 libfeedback-0.0.0+git20210125_1
diff --git a/srcpkgs/feedbackd/template b/srcpkgs/feedbackd/template
new file mode 100644
index 000000000000..316c4897ca95
--- /dev/null
+++ b/srcpkgs/feedbackd/template
@@ -0,0 +1,38 @@
+# Template file for 'feedbackd'
+pkgname=feedbackd
+version=0.0.0+git20220208
+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"
+checkdepends="dbus"
+short_desc="Daemon to provide haptic feedback on events"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/feedbackd"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=b4504aad1d061a41d1ca8cf4d09b43fecbd6b2286b6593d0b8a15169ab21398a
+
+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 000000000000..4e461b21e8c2
--- /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 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 ed2309b59717ebe80ae1a7e95dca78b5eeb3332e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Sun, 28 Feb 2021 21:45:00 +0100
Subject: [PATCH 2/4] New package: phoc-0.13.1

---
 srcpkgs/phoc/template | 18 ++++++++++++++++++
 srcpkgs/phoc/update   |  2 ++
 2 files changed, 20 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 000000000000..be8f32f9b603
--- /dev/null
+++ b/srcpkgs/phoc/template
@@ -0,0 +1,18 @@
+# Template file for 'phoc'
+pkgname=phoc
+version=0.13.1
+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 wlroots0.14-devel"
+depends="mutter"
+short_desc="Wlroots based Phone compositor for the Phosh shell"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="GPL-3.0-or-later"
+homepage="https://gitlab.gnome.org/World/Phosh/phoc"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=66c29a13960e28bb740a126e3bdb3775aeedfd25fea40b1b5d476284801a0ccf
+# Checking requires running a wayland session
+make_check=no
diff --git a/srcpkgs/phoc/update b/srcpkgs/phoc/update
new file mode 100644
index 000000000000..4e461b21e8c2
--- /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 0abb2221ce674e872f66cb33f85f5a812c2eaad7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Sun, 28 Feb 2021 21:45:00 +0100
Subject: [PATCH 3/4] New package: squeekboard-1.17.1

---
 srcpkgs/squeekboard/template | 20 ++++++++++++++++++++
 srcpkgs/squeekboard/update   |  2 ++
 2 files changed, 22 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 000000000000..b4d7b83ce57f
--- /dev/null
+++ b/srcpkgs/squeekboard/template
@@ -0,0 +1,20 @@
+# Template file for 'squeekboard'
+pkgname=squeekboard
+version=1.17.1
+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="Wayland on-screen keyboard for phones"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="GPL-3.0-or-later"
+homepage="https://gitlab.gnome.org/World/Phosh/squeekboard/"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=1b5329e7fb7b8d79a34fccd5059eff54f1aeb6d8d5d444773ea42412c3e3b2b2
+
+post_install() {
+	chmod +x ${DESTDIR}/usr/bin/squeekboard-entry
+}
diff --git a/srcpkgs/squeekboard/update b/srcpkgs/squeekboard/update
new file mode 100644
index 000000000000..4e461b21e8c2
--- /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 55b03dc4e53ae8051a37efd4fd45f062e451b276 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Sun, 28 Feb 2021 21:45:00 +0100
Subject: [PATCH 4/4] New package: phosh-0.17.0

---
 srcpkgs/phosh/files/phosh.desktop        | 11 +++++++++++
 srcpkgs/phosh/files/sm.puri.OSK0.desktop | 12 ++++++++++++
 srcpkgs/phosh/template                   | 25 ++++++++++++++++++++++++
 3 files changed, 48 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 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/template b/srcpkgs/phosh/template
new file mode 100644
index 000000000000..110087d40d8f
--- /dev/null
+++ b/srcpkgs/phosh/template
@@ -0,0 +1,25 @@
+# Template file for 'phosh'
+pkgname=phosh
+version=0.17.0
+revision=1
+wrksrc="${pkgname}-v${version}"
+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 elogind-devel libgudev-devel"
+depends="phoc squeekboard gnome-session gnome-settings-daemon elogind
+ xorg-server-xwayland cantarell-fonts font-adobe-source-code-pro"
+short_desc="Wayland shell for GNOME on mobile devices"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="GPL-3.0-or-later"
+homepage="https://gitlab.gnome.org/World/Phosh/phosh"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=dd6c5be5cda532cf33c602e55a087959d10510367e511c86576e91b0f24c7d6d
+# Checking requires running a wayland session
+make_check=no
+
+post_install() {
+	vcopy ${FILESDIR}/sm.puri.OSK0.desktop usr/share/applications
+	vcopy ${FILESDIR}/phosh.desktop usr/share/wayland-sessions
+}

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: New packages: phosh + deps (squeekboard, phoc and feedbackd)
  2021-02-28 20:48 [PR PATCH] New packages: phosh + deps (squeekboard, phoc and feedbackd) jcgruenhage
                   ` (5 preceding siblings ...)
  2022-05-10 16:37 ` [PR PATCH] [Updated] " jcgruenhage
@ 2022-05-10 16:40 ` jcgruenhage
  2022-05-10 19:59 ` [PR PATCH] [Updated] " jcgruenhage
                   ` (7 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: jcgruenhage @ 2022-05-10 16:40 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/29137#issuecomment-1122630831

Comment:
Updated, although I'm having a few problems with phosh: It doesn't want to build without two git submodules that aren't included with the tarball.

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PR PATCH] [Updated] New packages: phosh + deps (squeekboard, phoc and feedbackd)
  2021-02-28 20:48 [PR PATCH] New packages: phosh + deps (squeekboard, phoc and feedbackd) jcgruenhage
                   ` (6 preceding siblings ...)
  2022-05-10 16:40 ` jcgruenhage
@ 2022-05-10 19:59 ` jcgruenhage
  2022-05-10 20:08 ` jcgruenhage
                   ` (6 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: jcgruenhage @ 2022-05-10 19:59 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1704 bytes --]

There is an updated pull request by jcgruenhage against master on the void-packages repository

https://github.com/jcgruenhage/void-packages phosh-0.8.1_1
https://github.com/void-linux/void-packages/pull/29137

New packages: phosh + deps (squeekboard, phoc and feedbackd)
<!-- Mark items with [x] where applicable -->

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

#### TODOs
- [ ] Create a service for phosh
- [ ] Testing

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/29137.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-phosh-0.8.1_1-29137.patch --]
[-- Type: text/x-diff, Size: 13781 bytes --]

From d90b818378fb9c8134f80578c87e982f46b3fe36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Sun, 28 Feb 2021 21:45:00 +0100
Subject: [PATCH 1/5] New package: feedbackd-0.0.0+git20220208

---
 common/shlibs              |  2 ++
 srcpkgs/feedbackd/template | 38 ++++++++++++++++++++++++++++++++++++++
 srcpkgs/feedbackd/update   |  2 ++
 srcpkgs/libfeedback        |  1 +
 srcpkgs/libfeedback-devel  |  1 +
 5 files changed, 44 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 d75ecdda38dc..483098393cae 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4168,3 +4168,5 @@ libMatrix.so root-6.24.06_1
 libThread.so root-6.24.06_1
 libTMVA.so root-6.24.06_1
 libMathCore.so root-6.24.06_1
+libfeedback-0.0.so.0 libfeedback-0.0.0+git20210125_1
+
diff --git a/srcpkgs/feedbackd/template b/srcpkgs/feedbackd/template
new file mode 100644
index 000000000000..316c4897ca95
--- /dev/null
+++ b/srcpkgs/feedbackd/template
@@ -0,0 +1,38 @@
+# Template file for 'feedbackd'
+pkgname=feedbackd
+version=0.0.0+git20220208
+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"
+checkdepends="dbus"
+short_desc="Daemon to provide haptic feedback on events"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/feedbackd"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=b4504aad1d061a41d1ca8cf4d09b43fecbd6b2286b6593d0b8a15169ab21398a
+
+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 000000000000..4e461b21e8c2
--- /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 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 1d5ff1af3dbc0de3976d39dae119fbe40a88fc52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Sun, 28 Feb 2021 21:45:00 +0100
Subject: [PATCH 2/5] New package: phoc-0.13.1

---
 srcpkgs/phoc/template | 18 ++++++++++++++++++
 srcpkgs/phoc/update   |  2 ++
 2 files changed, 20 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 000000000000..be8f32f9b603
--- /dev/null
+++ b/srcpkgs/phoc/template
@@ -0,0 +1,18 @@
+# Template file for 'phoc'
+pkgname=phoc
+version=0.13.1
+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 wlroots0.14-devel"
+depends="mutter"
+short_desc="Wlroots based Phone compositor for the Phosh shell"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="GPL-3.0-or-later"
+homepage="https://gitlab.gnome.org/World/Phosh/phoc"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=66c29a13960e28bb740a126e3bdb3775aeedfd25fea40b1b5d476284801a0ccf
+# Checking requires running a wayland session
+make_check=no
diff --git a/srcpkgs/phoc/update b/srcpkgs/phoc/update
new file mode 100644
index 000000000000..4e461b21e8c2
--- /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 e14b00461d2f3cedf0530c1f245c9849a12c11ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Sun, 28 Feb 2021 21:45:00 +0100
Subject: [PATCH 3/5] New package: squeekboard-1.17.1

---
 .../patches/0001-fix-cross-compiling.patch    | 35 +++++++++++++++++++
 srcpkgs/squeekboard/template                  | 20 +++++++++++
 srcpkgs/squeekboard/update                    |  2 ++
 3 files changed, 57 insertions(+)
 create mode 100644 srcpkgs/squeekboard/patches/0001-fix-cross-compiling.patch
 create mode 100644 srcpkgs/squeekboard/template
 create mode 100644 srcpkgs/squeekboard/update

diff --git a/srcpkgs/squeekboard/patches/0001-fix-cross-compiling.patch b/srcpkgs/squeekboard/patches/0001-fix-cross-compiling.patch
new file mode 100644
index 000000000000..5f15863d3749
--- /dev/null
+++ b/srcpkgs/squeekboard/patches/0001-fix-cross-compiling.patch
@@ -0,0 +1,35 @@
+From bbf416fe5225166ba4f555f2920b86e2c7e4d724 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
+ <jan.christian@gruenhage.xyz>
+Date: Tue, 10 May 2022 18:05:54 +0200
+Subject: [PATCH] fix cross compiling
+
+---
+ cargo_build.py | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/cargo_build.py b/cargo_build.py
+index 0c7c5c6..6a71c3d 100644
+--- a/cargo_build.py
++++ b/cargo_build.py
+@@ -9,6 +9,7 @@ from pathlib import Path
+ import shlex
+ import subprocess
+ import sys
++import os
+ 
+ source_dir = Path(__file__).absolute().parent
+ 
+@@ -18,6 +19,9 @@ binary_dir = "debug"
+ if '--release' in args:
+     binary_dir = "release"
+ 
++if 'CROSS_BUILD' in os.environ:
++    binary_dir = os.environ['RUST_TARGET'] + "/" + binary_dir
++
+ # The file produced by Cargo will have a special name
+ try:
+     i = args.index('--rename')
+-- 
+2.35.3
+
diff --git a/srcpkgs/squeekboard/template b/srcpkgs/squeekboard/template
new file mode 100644
index 000000000000..b4d7b83ce57f
--- /dev/null
+++ b/srcpkgs/squeekboard/template
@@ -0,0 +1,20 @@
+# Template file for 'squeekboard'
+pkgname=squeekboard
+version=1.17.1
+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="Wayland on-screen keyboard for phones"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="GPL-3.0-or-later"
+homepage="https://gitlab.gnome.org/World/Phosh/squeekboard/"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=1b5329e7fb7b8d79a34fccd5059eff54f1aeb6d8d5d444773ea42412c3e3b2b2
+
+post_install() {
+	chmod +x ${DESTDIR}/usr/bin/squeekboard-entry
+}
diff --git a/srcpkgs/squeekboard/update b/srcpkgs/squeekboard/update
new file mode 100644
index 000000000000..4e461b21e8c2
--- /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 c259ca491cde2030d155bf7a3a7c8b41342b8c19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Tue, 10 May 2022 21:40:23 +0200
Subject: [PATCH 4/5] New package: callaudiod-0.1.4

---
 common/shlibs               |  2 +-
 srcpkgs/callaudiod/template | 30 ++++++++++++++++++++++++++++++
 srcpkgs/libcallaudio        |  1 +
 srcpkgs/libcallaudio-devel  |  1 +
 4 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/callaudiod/template
 create mode 120000 srcpkgs/libcallaudio
 create mode 120000 srcpkgs/libcallaudio-devel

diff --git a/common/shlibs b/common/shlibs
index 483098393cae..27a98d35ae3d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4169,4 +4169,4 @@ libThread.so root-6.24.06_1
 libTMVA.so root-6.24.06_1
 libMathCore.so root-6.24.06_1
 libfeedback-0.0.so.0 libfeedback-0.0.0+git20210125_1
-
+libcallaudio-0.1.so.0 libcallaudio-0.1.4_1
diff --git a/srcpkgs/callaudiod/template b/srcpkgs/callaudiod/template
new file mode 100644
index 000000000000..70a554f55ef9
--- /dev/null
+++ b/srcpkgs/callaudiod/template
@@ -0,0 +1,30 @@
+# Template file for 'callaudiod'
+pkgname=callaudiod
+version=0.1.4
+revision=1
+build_style=meson
+hostmakedepends="pkg-config glib-devel"
+makedepends="alsa-lib-devel pulseaudio-devel glib-devel"
+short_desc="Call audio routing daemon"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="LGPL-3.0-or-later"
+homepage="https://gitlab.com/mobian1/callaudiod"
+distfiles="https://gitlab.com/mobian1/callaudiod/-/archive/${version}/callaudiod-${version}.tar.gz"
+checksum=a1d561d801c003a796ba3648d0d95d36ecff8d261a724a22e0d78e6576a14bb0
+
+libcallaudio_package() {
+	short_desc+=" - shared-libraries"
+	pkg_install() {
+		vmove "usr/lib/*.so.*"
+	}
+}
+
+libcallaudio-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/libcallaudio b/srcpkgs/libcallaudio
new file mode 120000
index 000000000000..8e060309aba7
--- /dev/null
+++ b/srcpkgs/libcallaudio
@@ -0,0 +1 @@
+./callaudiod
\ No newline at end of file
diff --git a/srcpkgs/libcallaudio-devel b/srcpkgs/libcallaudio-devel
new file mode 120000
index 000000000000..8e060309aba7
--- /dev/null
+++ b/srcpkgs/libcallaudio-devel
@@ -0,0 +1 @@
+./callaudiod
\ No newline at end of file

From cfc059563d405abcdb6eb44c563705bb639de0c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Sun, 28 Feb 2021 21:45:00 +0100
Subject: [PATCH 5/5] New package: phosh-0.17.0

---
 srcpkgs/phosh/files/phosh.desktop        | 11 +++++++
 srcpkgs/phosh/files/sm.puri.OSK0.desktop | 12 ++++++++
 srcpkgs/phosh/template                   | 39 ++++++++++++++++++++++++
 3 files changed, 62 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 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/template b/srcpkgs/phosh/template
new file mode 100644
index 000000000000..b925f7e96291
--- /dev/null
+++ b/srcpkgs/phosh/template
@@ -0,0 +1,39 @@
+# Template file for 'phosh'
+pkgname=phosh
+version=0.17.0
+_gvc_commit="ae1a34aafce7026b8c0f65a43c9192d756fe1057"
+_libcall_ui_commit="acfbb136bbf74514e0b9801ce6c1e8acf36350b6"
+revision=1
+wrksrc="${pkgname}-v${version}"
+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 elogind-devel libgudev-devel
+ libcallaudio-devel"
+depends="phoc squeekboard gnome-session gnome-settings-daemon elogind
+ xorg-server-xwayland cantarell-fonts font-adobe-source-code-pro"
+short_desc="Wayland shell for GNOME on mobile devices"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="GPL-3.0-or-later"
+homepage="https://gitlab.gnome.org/World/Phosh/phosh"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz
+ https://gitlab.gnome.org/GNOME/libgnome-volume-control/-/archive/${_gvc_commit}/gvc-${_gvc_commit}.tar.gz
+ https://gitlab.gnome.org/World/Phosh/libcall-ui/-/archive/${_libcall_ui_commit}/libcall-ui-${_libcall_ui_commit}.tar.gz"
+checksum="dd6c5be5cda532cf33c602e55a087959d10510367e511c86576e91b0f24c7d6d
+ afc9a7c7fd6de8252430878a753b4dbfd09033a54055e4020ced3d26609143ee
+ 2dacd4c16b1e9afe30cacdbbbbb1d5f1c1079cb391083191ab647f142365d66e"
+# Checking requires running a wayland session
+make_check=no
+
+post_extract() {
+	rm -rf subprojects/gvc
+	rm -rf subprojects/libcall-ui
+	mv ../libgnome-volume-control-${_gvc_commit} subprojects/gvc
+	mv ../libcall-ui-${_libcall_ui_commit} subprojects/libcall-ui
+}
+
+post_install() {
+	vcopy ${FILESDIR}/sm.puri.OSK0.desktop usr/share/applications
+	vcopy ${FILESDIR}/phosh.desktop usr/share/wayland-sessions
+}

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PR PATCH] [Updated] New packages: phosh + deps (squeekboard, phoc and feedbackd)
  2021-02-28 20:48 [PR PATCH] New packages: phosh + deps (squeekboard, phoc and feedbackd) jcgruenhage
                   ` (7 preceding siblings ...)
  2022-05-10 19:59 ` [PR PATCH] [Updated] " jcgruenhage
@ 2022-05-10 20:08 ` jcgruenhage
  2022-05-11 11:54 ` New packages: phosh + deps (squeekboard, phoc, callaudiod " jcgruenhage
                   ` (5 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: jcgruenhage @ 2022-05-10 20:08 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1704 bytes --]

There is an updated pull request by jcgruenhage against master on the void-packages repository

https://github.com/jcgruenhage/void-packages phosh-0.8.1_1
https://github.com/void-linux/void-packages/pull/29137

New packages: phosh + deps (squeekboard, phoc and feedbackd)
<!-- Mark items with [x] where applicable -->

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

#### TODOs
- [ ] Create a service for phosh
- [ ] Testing

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/29137.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-phosh-0.8.1_1-29137.patch --]
[-- Type: text/x-diff, Size: 13781 bytes --]

From d90b818378fb9c8134f80578c87e982f46b3fe36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Sun, 28 Feb 2021 21:45:00 +0100
Subject: [PATCH 1/5] New package: feedbackd-0.0.0+git20220208

---
 common/shlibs              |  2 ++
 srcpkgs/feedbackd/template | 38 ++++++++++++++++++++++++++++++++++++++
 srcpkgs/feedbackd/update   |  2 ++
 srcpkgs/libfeedback        |  1 +
 srcpkgs/libfeedback-devel  |  1 +
 5 files changed, 44 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 d75ecdda38dc..483098393cae 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4168,3 +4168,5 @@ libMatrix.so root-6.24.06_1
 libThread.so root-6.24.06_1
 libTMVA.so root-6.24.06_1
 libMathCore.so root-6.24.06_1
+libfeedback-0.0.so.0 libfeedback-0.0.0+git20210125_1
+
diff --git a/srcpkgs/feedbackd/template b/srcpkgs/feedbackd/template
new file mode 100644
index 000000000000..316c4897ca95
--- /dev/null
+++ b/srcpkgs/feedbackd/template
@@ -0,0 +1,38 @@
+# Template file for 'feedbackd'
+pkgname=feedbackd
+version=0.0.0+git20220208
+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"
+checkdepends="dbus"
+short_desc="Daemon to provide haptic feedback on events"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/feedbackd"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=b4504aad1d061a41d1ca8cf4d09b43fecbd6b2286b6593d0b8a15169ab21398a
+
+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 000000000000..4e461b21e8c2
--- /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 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 1d5ff1af3dbc0de3976d39dae119fbe40a88fc52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Sun, 28 Feb 2021 21:45:00 +0100
Subject: [PATCH 2/5] New package: phoc-0.13.1

---
 srcpkgs/phoc/template | 18 ++++++++++++++++++
 srcpkgs/phoc/update   |  2 ++
 2 files changed, 20 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 000000000000..be8f32f9b603
--- /dev/null
+++ b/srcpkgs/phoc/template
@@ -0,0 +1,18 @@
+# Template file for 'phoc'
+pkgname=phoc
+version=0.13.1
+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 wlroots0.14-devel"
+depends="mutter"
+short_desc="Wlroots based Phone compositor for the Phosh shell"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="GPL-3.0-or-later"
+homepage="https://gitlab.gnome.org/World/Phosh/phoc"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=66c29a13960e28bb740a126e3bdb3775aeedfd25fea40b1b5d476284801a0ccf
+# Checking requires running a wayland session
+make_check=no
diff --git a/srcpkgs/phoc/update b/srcpkgs/phoc/update
new file mode 100644
index 000000000000..4e461b21e8c2
--- /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 e14b00461d2f3cedf0530c1f245c9849a12c11ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Sun, 28 Feb 2021 21:45:00 +0100
Subject: [PATCH 3/5] New package: squeekboard-1.17.1

---
 .../patches/0001-fix-cross-compiling.patch    | 35 +++++++++++++++++++
 srcpkgs/squeekboard/template                  | 20 +++++++++++
 srcpkgs/squeekboard/update                    |  2 ++
 3 files changed, 57 insertions(+)
 create mode 100644 srcpkgs/squeekboard/patches/0001-fix-cross-compiling.patch
 create mode 100644 srcpkgs/squeekboard/template
 create mode 100644 srcpkgs/squeekboard/update

diff --git a/srcpkgs/squeekboard/patches/0001-fix-cross-compiling.patch b/srcpkgs/squeekboard/patches/0001-fix-cross-compiling.patch
new file mode 100644
index 000000000000..5f15863d3749
--- /dev/null
+++ b/srcpkgs/squeekboard/patches/0001-fix-cross-compiling.patch
@@ -0,0 +1,35 @@
+From bbf416fe5225166ba4f555f2920b86e2c7e4d724 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
+ <jan.christian@gruenhage.xyz>
+Date: Tue, 10 May 2022 18:05:54 +0200
+Subject: [PATCH] fix cross compiling
+
+---
+ cargo_build.py | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/cargo_build.py b/cargo_build.py
+index 0c7c5c6..6a71c3d 100644
+--- a/cargo_build.py
++++ b/cargo_build.py
+@@ -9,6 +9,7 @@ from pathlib import Path
+ import shlex
+ import subprocess
+ import sys
++import os
+ 
+ source_dir = Path(__file__).absolute().parent
+ 
+@@ -18,6 +19,9 @@ binary_dir = "debug"
+ if '--release' in args:
+     binary_dir = "release"
+ 
++if 'CROSS_BUILD' in os.environ:
++    binary_dir = os.environ['RUST_TARGET'] + "/" + binary_dir
++
+ # The file produced by Cargo will have a special name
+ try:
+     i = args.index('--rename')
+-- 
+2.35.3
+
diff --git a/srcpkgs/squeekboard/template b/srcpkgs/squeekboard/template
new file mode 100644
index 000000000000..b4d7b83ce57f
--- /dev/null
+++ b/srcpkgs/squeekboard/template
@@ -0,0 +1,20 @@
+# Template file for 'squeekboard'
+pkgname=squeekboard
+version=1.17.1
+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="Wayland on-screen keyboard for phones"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="GPL-3.0-or-later"
+homepage="https://gitlab.gnome.org/World/Phosh/squeekboard/"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=1b5329e7fb7b8d79a34fccd5059eff54f1aeb6d8d5d444773ea42412c3e3b2b2
+
+post_install() {
+	chmod +x ${DESTDIR}/usr/bin/squeekboard-entry
+}
diff --git a/srcpkgs/squeekboard/update b/srcpkgs/squeekboard/update
new file mode 100644
index 000000000000..4e461b21e8c2
--- /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 c259ca491cde2030d155bf7a3a7c8b41342b8c19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Tue, 10 May 2022 21:40:23 +0200
Subject: [PATCH 4/5] New package: callaudiod-0.1.4

---
 common/shlibs               |  2 +-
 srcpkgs/callaudiod/template | 30 ++++++++++++++++++++++++++++++
 srcpkgs/libcallaudio        |  1 +
 srcpkgs/libcallaudio-devel  |  1 +
 4 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/callaudiod/template
 create mode 120000 srcpkgs/libcallaudio
 create mode 120000 srcpkgs/libcallaudio-devel

diff --git a/common/shlibs b/common/shlibs
index 483098393cae..27a98d35ae3d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4169,4 +4169,4 @@ libThread.so root-6.24.06_1
 libTMVA.so root-6.24.06_1
 libMathCore.so root-6.24.06_1
 libfeedback-0.0.so.0 libfeedback-0.0.0+git20210125_1
-
+libcallaudio-0.1.so.0 libcallaudio-0.1.4_1
diff --git a/srcpkgs/callaudiod/template b/srcpkgs/callaudiod/template
new file mode 100644
index 000000000000..70a554f55ef9
--- /dev/null
+++ b/srcpkgs/callaudiod/template
@@ -0,0 +1,30 @@
+# Template file for 'callaudiod'
+pkgname=callaudiod
+version=0.1.4
+revision=1
+build_style=meson
+hostmakedepends="pkg-config glib-devel"
+makedepends="alsa-lib-devel pulseaudio-devel glib-devel"
+short_desc="Call audio routing daemon"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="LGPL-3.0-or-later"
+homepage="https://gitlab.com/mobian1/callaudiod"
+distfiles="https://gitlab.com/mobian1/callaudiod/-/archive/${version}/callaudiod-${version}.tar.gz"
+checksum=a1d561d801c003a796ba3648d0d95d36ecff8d261a724a22e0d78e6576a14bb0
+
+libcallaudio_package() {
+	short_desc+=" - shared-libraries"
+	pkg_install() {
+		vmove "usr/lib/*.so.*"
+	}
+}
+
+libcallaudio-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/libcallaudio b/srcpkgs/libcallaudio
new file mode 120000
index 000000000000..8e060309aba7
--- /dev/null
+++ b/srcpkgs/libcallaudio
@@ -0,0 +1 @@
+./callaudiod
\ No newline at end of file
diff --git a/srcpkgs/libcallaudio-devel b/srcpkgs/libcallaudio-devel
new file mode 120000
index 000000000000..8e060309aba7
--- /dev/null
+++ b/srcpkgs/libcallaudio-devel
@@ -0,0 +1 @@
+./callaudiod
\ No newline at end of file

From cc2781f228cb7aa63e74c50ac4948b4af7f8747a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Sun, 28 Feb 2021 21:45:00 +0100
Subject: [PATCH 5/5] New package: phosh-0.17.0

---
 srcpkgs/phosh/files/phosh.desktop        | 11 +++++++
 srcpkgs/phosh/files/sm.puri.OSK0.desktop | 12 ++++++++
 srcpkgs/phosh/template                   | 39 ++++++++++++++++++++++++
 3 files changed, 62 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 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/template b/srcpkgs/phosh/template
new file mode 100644
index 000000000000..dd0adb8494ab
--- /dev/null
+++ b/srcpkgs/phosh/template
@@ -0,0 +1,39 @@
+# Template file for 'phosh'
+pkgname=phosh
+version=0.17.0
+revision=1
+_gvc_commit="ae1a34aafce7026b8c0f65a43c9192d756fe1057"
+_libcall_ui_commit="acfbb136bbf74514e0b9801ce6c1e8acf36350b6"
+wrksrc="${pkgname}-v${version}"
+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 elogind-devel libgudev-devel
+ libcallaudio-devel"
+depends="phoc squeekboard gnome-session gnome-settings-daemon elogind
+ xorg-server-xwayland cantarell-fonts font-adobe-source-code-pro"
+short_desc="Wayland shell for GNOME on mobile devices"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="GPL-3.0-or-later"
+homepage="https://gitlab.gnome.org/World/Phosh/phosh"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz
+ https://gitlab.gnome.org/GNOME/libgnome-volume-control/-/archive/${_gvc_commit}/gvc-${_gvc_commit}.tar.gz
+ https://gitlab.gnome.org/World/Phosh/libcall-ui/-/archive/${_libcall_ui_commit}/libcall-ui-${_libcall_ui_commit}.tar.gz"
+checksum="dd6c5be5cda532cf33c602e55a087959d10510367e511c86576e91b0f24c7d6d
+ afc9a7c7fd6de8252430878a753b4dbfd09033a54055e4020ced3d26609143ee
+ 2dacd4c16b1e9afe30cacdbbbbb1d5f1c1079cb391083191ab647f142365d66e"
+# Checking requires running a wayland session
+make_check=no
+
+post_extract() {
+	rm -rf subprojects/gvc
+	rm -rf subprojects/libcall-ui
+	mv ../libgnome-volume-control-${_gvc_commit} subprojects/gvc
+	mv ../libcall-ui-${_libcall_ui_commit} subprojects/libcall-ui
+}
+
+post_install() {
+	vcopy ${FILESDIR}/sm.puri.OSK0.desktop usr/share/applications
+	vcopy ${FILESDIR}/phosh.desktop usr/share/wayland-sessions
+}

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: New packages: phosh + deps (squeekboard, phoc, callaudiod and feedbackd)
  2021-02-28 20:48 [PR PATCH] New packages: phosh + deps (squeekboard, phoc and feedbackd) jcgruenhage
                   ` (8 preceding siblings ...)
  2022-05-10 20:08 ` jcgruenhage
@ 2022-05-11 11:54 ` jcgruenhage
  2022-08-10  2:08 ` github-actions
                   ` (4 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: jcgruenhage @ 2022-05-11 11:54 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 2392 bytes --]

New comment by jcgruenhage on void-packages repository

https://github.com/void-linux/void-packages/pull/29137#issuecomment-1123651161

Comment:
So, posh now builds correctly with the subprojcets fetched, but at least on my Pinephone it seems not to work yet. I'm not sure what's going on, since the error originates from wlroots, but wlroots works fine on that phone with sway. See the logs:

```
phoc-output-Message: 09:19:27.339: Output 'DSI-1' added ('<Unknown>'/'<Unknown>'/''), 68mm x 136mm
phoc-server-Message: 09:19:27.647: Enabling shell mode
The XKEYBOARD keymap compiler (xkbcomp) reports:
> Warning:          Unsupported maximum keycode 708, clipping.
>                   X11 cannot support keycodes above 255.
Errors from xkbcomp are not fatal to the X server
dbus[833]: Unable to set up transient service directory: XDG_RUNTIME_DIR "/tmp" is owned by uid 0, not our uid 1000
gnome-session-binary[822]: WARNING: Failed to upload environment to systemd: GDBus.Error:org.freedesktop.DBus.Error.NameHasNoOwner: Name "org.freedesktop.systemd1" does not exist
gnome-session-binary[822]: WARNING: Could not get session id for session. Check that logind is properly installed and pam_systemd is getting used at login.
gnome-session-binary[822]: WARNING: Could not parse desktop file libcanberra-login-sound.desktop or it references a not found TryExec binary

(phosh:843): phosh-osk-manager-WARNING **: 09:19:30.299: Unable to toggle OSK: GDBus.Error:org.freedesktop.DBus.Error.ServiceUnknown: The name sm.puri.OSK0 was not provided by any .service files
XDG_RUNTIME_DIR (/tmp) is not owned by us (uid 1000), but by uid 0! (This could e.g. happen if you try to connect to a non-root PulseAudio as a root user, over the native protocol. Don't do that.)

(phosh:843): Gvc-WARNING **: 09:19:30.621: Failed to connect context: Connection refused

(phosh:843): GLib-GIO-ERROR **: 09:19:30.629: Settings schema 'org.gnome.shell.keybindings' is not installed
gnome-session-binary[822]: WARNING: Application 'sm.puri.Phosh.desktop' killed by signal 5
(EE) failed to read Wayland events: Broken pipe

(phoc:811): phoc-wlroots-CRITICAL **: 09:19:30.673: [backend/drm/drm.c:1594] drmHandleEvent failed
```

I've tried running it on my laptop, where it doesn't crash, but I don't see anything besides a black screen and a mouse cursor, so.. This isn't quite complete yet.

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: New packages: phosh + deps (squeekboard, phoc, callaudiod and feedbackd)
  2021-02-28 20:48 [PR PATCH] New packages: phosh + deps (squeekboard, phoc and feedbackd) jcgruenhage
                   ` (9 preceding siblings ...)
  2022-05-11 11:54 ` New packages: phosh + deps (squeekboard, phoc, callaudiod " jcgruenhage
@ 2022-08-10  2:08 ` github-actions
  2022-08-17  7:39 ` jcgruenhage
                   ` (3 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: github-actions @ 2022-08-10  2:08 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/29137#issuecomment-1210068279

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] 16+ messages in thread

* Re: New packages: phosh + deps (squeekboard, phoc, callaudiod and feedbackd)
  2021-02-28 20:48 [PR PATCH] New packages: phosh + deps (squeekboard, phoc and feedbackd) jcgruenhage
                   ` (10 preceding siblings ...)
  2022-08-10  2:08 ` github-actions
@ 2022-08-17  7:39 ` jcgruenhage
  2022-09-23 17:05 ` Newbytee
                   ` (2 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: jcgruenhage @ 2022-08-17  7:39 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 202 bytes --]

New comment by jcgruenhage on void-packages repository

https://github.com/void-linux/void-packages/pull/29137#issuecomment-1217597160

Comment:
Well, sort-of stale, but I still plan to continue on it.

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: New packages: phosh + deps (squeekboard, phoc, callaudiod and feedbackd)
  2021-02-28 20:48 [PR PATCH] New packages: phosh + deps (squeekboard, phoc and feedbackd) jcgruenhage
                   ` (11 preceding siblings ...)
  2022-08-17  7:39 ` jcgruenhage
@ 2022-09-23 17:05 ` Newbytee
  2022-12-23  1:56 ` github-actions
  2022-12-27  8:26 ` jcgruenhage
  14 siblings, 0 replies; 16+ messages in thread
From: Newbytee @ 2022-09-23 17:05 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 362 bytes --]

New comment by Newbytee on void-packages repository

https://github.com/void-linux/void-packages/pull/29137#issuecomment-1256451790

Comment:
You can't use upstream wlroots with Phoc. It does not work. I suggest you copy what we do in Alpine and statically link Purism's fork of wlroots into Phoc: https://git.alpinelinux.org/aports/tree/community/phoc/APKBUILD

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: New packages: phosh + deps (squeekboard, phoc, callaudiod and feedbackd)
  2021-02-28 20:48 [PR PATCH] New packages: phosh + deps (squeekboard, phoc and feedbackd) jcgruenhage
                   ` (12 preceding siblings ...)
  2022-09-23 17:05 ` Newbytee
@ 2022-12-23  1:56 ` github-actions
  2022-12-27  8:26 ` jcgruenhage
  14 siblings, 0 replies; 16+ messages in thread
From: github-actions @ 2022-12-23  1:56 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/29137#issuecomment-1363535197

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] 16+ messages in thread

* Re: New packages: phosh + deps (squeekboard, phoc, callaudiod and feedbackd)
  2021-02-28 20:48 [PR PATCH] New packages: phosh + deps (squeekboard, phoc and feedbackd) jcgruenhage
                   ` (13 preceding siblings ...)
  2022-12-23  1:56 ` github-actions
@ 2022-12-27  8:26 ` jcgruenhage
  14 siblings, 0 replies; 16+ messages in thread
From: jcgruenhage @ 2022-12-27  8:26 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 235 bytes --]

New comment by jcgruenhage on void-packages repository

https://github.com/void-linux/void-packages/pull/29137#issuecomment-1365707991

Comment:
I plan on continuing on this once the new 6.1 based megi kernel is out, so no, not stale.

^ permalink raw reply	[flat|nested] 16+ messages in thread

end of thread, other threads:[~2022-12-27  8:26 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-28 20:48 [PR PATCH] New packages: phosh + deps (squeekboard, phoc and feedbackd) jcgruenhage
2021-02-28 21:21 ` [PR PATCH] [Updated] " jcgruenhage
2021-02-28 21:43 ` jcgruenhage
2021-02-28 22:36 ` jcgruenhage
2021-03-01  1:50 ` jcgruenhage
2022-05-05  2:09 ` github-actions
2022-05-10 16:37 ` [PR PATCH] [Updated] " jcgruenhage
2022-05-10 16:40 ` jcgruenhage
2022-05-10 19:59 ` [PR PATCH] [Updated] " jcgruenhage
2022-05-10 20:08 ` jcgruenhage
2022-05-11 11:54 ` New packages: phosh + deps (squeekboard, phoc, callaudiod " jcgruenhage
2022-08-10  2:08 ` github-actions
2022-08-17  7:39 ` jcgruenhage
2022-09-23 17:05 ` Newbytee
2022-12-23  1:56 ` github-actions
2022-12-27  8:26 ` jcgruenhage

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).