Github messages for voidlinux
 help / color / mirror / Atom feed
From: jcgruenhage <jcgruenhage@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] New packages: phosh + deps (squeekboard, phoc and feedbackd)
Date: Tue, 10 May 2022 21:59:06 +0200	[thread overview]
Message-ID: <20220510195906.n17pwmuE2zgiqoeWg3EYnqahRNxOg4ryy_968aqAfSo@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29137@inbox.vuxu.org>

[-- 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
+}

  parent reply	other threads:[~2022-05-10 19:59 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-28 20:48 [PR PATCH] " 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 ` jcgruenhage [this message]
2022-05-10 20:08 ` [PR PATCH] [Updated] " 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
2023-03-29  1:59 ` github-actions
2023-04-04 13:34 ` jcgruenhage
2023-07-04  2:07 ` github-actions
2023-07-04 10:30 ` Newbytee
2023-07-08 12:52 ` jcgruenhage
2023-07-08 12:55 ` Newbytee
2023-07-08 13:05 ` jcgruenhage
2023-10-07  1:44 ` github-actions
2023-10-22  1:46 ` [PR PATCH] [Closed]: " github-actions

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220510195906.n17pwmuE2zgiqoeWg3EYnqahRNxOg4ryy_968aqAfSo@z \
    --to=jcgruenhage@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).