Re: [PR PATCH] [Updated] New packages: phoc-0.4.2 calls-0.1.7 purism-chatty-0.1.15

[julio641742 <julio641742@users.noreply.github.com>]

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

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

https://github.com/julio641742/void-packages phosh
https://github.com/void-linux/void-packages/pull/24538

New packages: phoc-0.4.2 calls-0.1.7 purism-chatty-0.1.15
Getting ready for my pinephone :)

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

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

From 17528a815b0370ec2ea85f0c34e05e1cb5b16185 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Sat, 29 Aug 2020 11:47:35 -0700
Subject: [PATCH 1/7] New package: feedbackd-0.0.0+git20200707

---
 common/shlibs              |  1 +
 srcpkgs/feedbackd/template | 37 +++++++++++++++++++++++++++++++++++++
 srcpkgs/libfeedback        |  1 +
 srcpkgs/libfeedback-devel  |  1 +
 4 files changed, 40 insertions(+)
 create mode 100644 srcpkgs/feedbackd/template
 create mode 120000 srcpkgs/libfeedback
 create mode 120000 srcpkgs/libfeedback-devel

diff --git a/common/shlibs b/common/shlibs
index ec8310df7b3..752730f829b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3990,3 +3990,4 @@ libneatvnc.so.0 neatvnc-0.2.0_1
 libtdjson.so.1.6.0 libtd-1.6.0_1
 libJudy.so.1 judy-1.0.5_1
 libsignal-protocol-c.so.2 libsignal-protocol-c-2.3.3_2
+libfeedback-0.0.so.0 libfeedback-0.0.0+git20200707_1
diff --git a/srcpkgs/feedbackd/template b/srcpkgs/feedbackd/template
new file mode 100644
index 00000000000..0131775cc9d
--- /dev/null
+++ b/srcpkgs/feedbackd/template
@@ -0,0 +1,37 @@
+# Template file for 'feedbackd'
+pkgname=feedbackd
+version=0.0.0+git20200707
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=meson
+build_helper=gir
+hostmakedepends="vala glib-devel pkg-config"
+makedepends="gsound-devel libgudev-devel json-glib-devel"
+depends="dbus"
+short_desc="Daemon to provide haptic feedback on events"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/feedbackd"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=37cf48cbdbaee8e2d0bea406f5b6317bf0e3cdf79250f9ce0a884e7d3905a8ea
+
+post_install() {
+	vinstall debian/feedbackd.udev 0644 usr/lib/udev/rules.d 90-feedbackd.rules
+}
+
+libfeedback_package() {
+	short_desc+=" - shared libraries"
+	pkg_install() {
+		vmove "usr/lib/*.so.*"
+	}
+}
+
+libfeedback-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}
diff --git a/srcpkgs/libfeedback b/srcpkgs/libfeedback
new file mode 120000
index 00000000000..49dc965f1cd
--- /dev/null
+++ b/srcpkgs/libfeedback
@@ -0,0 +1 @@
+feedbackd
\ No newline at end of file
diff --git a/srcpkgs/libfeedback-devel b/srcpkgs/libfeedback-devel
new file mode 120000
index 00000000000..49dc965f1cd
--- /dev/null
+++ b/srcpkgs/libfeedback-devel
@@ -0,0 +1 @@
+feedbackd
\ No newline at end of file

From 79ff38df1ee8f1179da7bcecf5669db39af1f470 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Sat, 29 Aug 2020 11:47:56 -0700
Subject: [PATCH 2/7] New package: phoc-0.4.2

---
 srcpkgs/phoc/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/phoc/template

diff --git a/srcpkgs/phoc/template b/srcpkgs/phoc/template
new file mode 100644
index 00000000000..00c9f1f3ab0
--- /dev/null
+++ b/srcpkgs/phoc/template
@@ -0,0 +1,16 @@
+# Template file for 'phoc'
+pkgname=phoc
+version=0.4.2
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=meson
+configure_args="-Dembed-wlroots=disabled"
+hostmakedepends="glib-devel pkg-config wayland-devel"
+makedepends="gnome-desktop-devel wlroots-devel"
+depends="mutter"
+short_desc="Wlroots based Phone compositor for the Phosh shell"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/phoc"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=bdb34644c7d49c953239c1e939bc5ee2bc26f6187b9d756b70b113d2734c712c

From 33cd96a32a6d9e01a0b8c392552fc28cff1b2761 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Sat, 29 Aug 2020 11:48:48 -0700
Subject: [PATCH 3/7] New package: squeekboard-1.9.3

---
 srcpkgs/squeekboard/template | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 srcpkgs/squeekboard/template

diff --git a/srcpkgs/squeekboard/template b/srcpkgs/squeekboard/template
new file mode 100644
index 00000000000..938248efa6b
--- /dev/null
+++ b/srcpkgs/squeekboard/template
@@ -0,0 +1,25 @@
+# Template file for 'squeekboard'
+pkgname=squeekboard
+version=1.9.3
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=meson
+build_helper=rust
+hostmakedepends="glib-devel gettext pkg-config cargo wayland-devel"
+makedepends="rust gtk+3-devel gnome-desktop-devel libfeedback-devel"
+short_desc="Final Librem5 keyboard"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/squeekboard"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=b99e56faace3986bf752e08c104cea60ed896d514284840655033dd9457db824
+
+pre_configure() {
+	if [ "$CROSS_BUILD" ]; then
+		vsed -i cargo_build.sh -e "s/-a ./-a ${XBPS_CROSS_RUST_TARGET}/g"
+	fi
+}
+
+post_install() {
+	chmod +x ${DESTDIR}/usr/bin/squeekboard-entry
+}

From 5eb9d6d94324ceb208c4a75fa1be82dcf402c30c Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Sat, 29 Aug 2020 11:48:59 -0700
Subject: [PATCH 4/7] New package: phosh-0.4.3

---
 srcpkgs/phosh/files/phosh.desktop           | 11 ++++++++
 srcpkgs/phosh/files/sm.puri.OSK0.desktop    | 12 +++++++++
 srcpkgs/phosh/patches/32bit-build-fix.patch | 30 +++++++++++++++++++++
 srcpkgs/phosh/template                      | 22 +++++++++++++++
 4 files changed, 75 insertions(+)
 create mode 100644 srcpkgs/phosh/files/phosh.desktop
 create mode 100644 srcpkgs/phosh/files/sm.puri.OSK0.desktop
 create mode 100644 srcpkgs/phosh/patches/32bit-build-fix.patch
 create mode 100644 srcpkgs/phosh/template

diff --git a/srcpkgs/phosh/files/phosh.desktop b/srcpkgs/phosh/files/phosh.desktop
new file mode 100644
index 00000000000..84452845115
--- /dev/null
+++ b/srcpkgs/phosh/files/phosh.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=Phosh
+Name[en]=Phosh
+Comment=This session logs you into Phosh
+Comment[en]=This session logs in you into Phosh
+Exec=dbus-run-session /usr/bin/phosh
+TryExec=/usr/bin/phosh
+Icon=
+Type=Application
+X-DesktopNames=Phosh
+Keywords=launch;Phosh;desktop;session;
diff --git a/srcpkgs/phosh/files/sm.puri.OSK0.desktop b/srcpkgs/phosh/files/sm.puri.OSK0.desktop
new file mode 100644
index 00000000000..39740f15773
--- /dev/null
+++ b/srcpkgs/phosh/files/sm.puri.OSK0.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Type=Application
+Name=On-screen keyboard
+Comment=Default on-screen keyboard
+Exec=/usr/bin/squeekboard
+Categories=GNOME;Core;
+OnlyShowIn=GNOME;
+NoDisplay=true
+X-GNOME-Autostart-Phase=Panel
+X-GNOME-Provides=inputmethod
+X-GNOME-Autostart-Notify=true
+X-GNOME-AutoRestart=true
diff --git a/srcpkgs/phosh/patches/32bit-build-fix.patch b/srcpkgs/phosh/patches/32bit-build-fix.patch
new file mode 100644
index 00000000000..a98ecb0faa5
--- /dev/null
+++ b/srcpkgs/phosh/patches/32bit-build-fix.patch
@@ -0,0 +1,30 @@
+From d1da5ea7d18c6794c9a7d2f41355fe90d4115ac1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
+Date: Tue, 4 Aug 2020 08:22:39 +0200
+Subject: [PATCH] timestamp-label: Unbreak build on 32 bit platforms
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Use a G_ format specifier for GTimeSpan.
+
+Signed-off-by: Guido Günther <guido.gunther@puri.sm>
+---
+ src/notifications/timestamp-label.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/notifications/timestamp-label.c b/src/notifications/timestamp-label.c
+index 0aa04ce0..a5a4d5e7 100644
+--- src/notifications/timestamp-label.c
++++ src/notifications/timestamp-label.c
+@@ -255,7 +255,7 @@ phosh_timestamp_label_calc_timeout (PhoshTimestampLabel *self)
+     break;
+   }
+   timeout_diff = g_date_time_difference (timeout_time, time_now);
+-  g_debug ("time out duration = %ld", timeout_diff);
++  g_debug ("time out duration: %" G_GINT64_FORMAT, timeout_diff);
+   return timeout_diff;
+ }
+ 
+-- 
+2.26.2
diff --git a/srcpkgs/phosh/template b/srcpkgs/phosh/template
new file mode 100644
index 00000000000..61873272d51
--- /dev/null
+++ b/srcpkgs/phosh/template
@@ -0,0 +1,22 @@
+# Template file for 'phosh'
+pkgname=phosh
+version=0.4.3
+revision=1
+build_style=meson
+hostmakedepends="phoc glib-devel gettext pkg-config wayland-devel"
+makedepends="libfeedback-devel gcr-devel gnome-desktop-devel pam-devel
+ polkit-devel pulseaudio-devel libsecret-devel libhandy-devel
+ NetworkManager-devel upower-devel"
+depends="phoc squeekboard gnome-session gnome-settings-daemon gnome-control-center
+ elogind xorg-server-xwayland cantarell-fonts"
+short_desc="Shell PoC for the Librem5"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/phosh"
+distfiles="https://repo.pureos.net/pureos/pool/main/p/phosh/phosh_$version.tar.xz"
+checksum=c6fc68aafaf78412637b0f509aafbbca877bda3fe19511bf340b824d7cdbd4ee
+
+post_install() {
+	vcopy ${FILESDIR}/sm.puri.OSK0.desktop usr/share/applications
+	vcopy ${FILESDIR}/phosh.desktop usr/share/wayland-sessions
+}

From bb27e10feedbb763fcd00c0b893170fadae6d195 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 29 Aug 2020 18:35:47 -0700
Subject: [PATCH 5/7] New package: calls-0.1.7

---
 srcpkgs/calls/template | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/calls/template

diff --git a/srcpkgs/calls/template b/srcpkgs/calls/template
new file mode 100644
index 00000000000..260ed391d24
--- /dev/null
+++ b/srcpkgs/calls/template
@@ -0,0 +1,17 @@
+# Template file for 'calls'
+pkgname=calls
+version=0.1.7
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=meson
+hostmakedepends="glib-devel gettext vala pkg-config wayland-devel
+ evolution-data-server-devel"
+makedepends="folks-devel libhandy-devel libpeas-devel gom-devel
+ ModemManager-devel libfeedback-devel"
+depends="NetworkManager"
+short_desc="Phone call application"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/calls"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=477c55d483ca13f6ac98209c3c4d6c5858f706e72a133616dcb6827ef25829c7

From 6eb668a44fe24a9cb1d23dff522473528b59706a Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 29 Aug 2020 18:36:35 -0700
Subject: [PATCH 6/7] New package: purism-chatty-0.1.15

---
 srcpkgs/purism-chatty/template | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 srcpkgs/purism-chatty/template

diff --git a/srcpkgs/purism-chatty/template b/srcpkgs/purism-chatty/template
new file mode 100644
index 00000000000..d11bfcea882
--- /dev/null
+++ b/srcpkgs/purism-chatty/template
@@ -0,0 +1,22 @@
+# Template file for 'purism-chatty'
+pkgname=purism-chatty
+_pkgname=chatty
+version=0.1.15
+revision=1
+wrksrc=${_pkgname}-v${version}
+build_style=meson
+hostmakedepends="glib-devel pkg-config gettext"
+makedepends="libfeedback-devel libhandy-devel evolution-data-server-devel
+ libpurple libpurple-devel"
+short_desc="XMPP and SMS messaging via libpurple and Modemmanager"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://source.puri.sm/Librem5/chatty"
+distfiles="${homepage}/-/archive/v${version}/${_pkgname}-v${version}.tar.gz"
+checksum=9be2b79a266a7fa1e3d3e7ba447ff89d2b9e44312d6e55f2a63d191369528d64
+
+pre_configure() {
+	if [ "$CROSS_BUILD" ]; then
+		vsed -i src/meson.build -e "s/purple_plugdir =.*/purple_plugdir = \'\/usr\/${XBPS_CROSS_TRIPLET}\/usr\/lib\/purple-2\'/g"
+	fi
+}

From e09d1b448225868d8be09a54d98e86c0c5aaeb2f Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio-void@epazote.net>
Date: Sat, 12 Sep 2020 10:58:50 -0700
Subject: [PATCH 7/7] New package: mobile-config-firefox-1.0.1

---
 .../files/distro_links.html                   |  5 +++++
 srcpkgs/mobile-config-firefox/template        | 22 +++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 srcpkgs/mobile-config-firefox/files/distro_links.html
 create mode 100644 srcpkgs/mobile-config-firefox/template

diff --git a/srcpkgs/mobile-config-firefox/files/distro_links.html b/srcpkgs/mobile-config-firefox/files/distro_links.html
new file mode 100644
index 00000000000..ca89d0ecd08
--- /dev/null
+++ b/srcpkgs/mobile-config-firefox/files/distro_links.html
@@ -0,0 +1,5 @@
+<p class="distro-links">
+	<a href="https://voidlinux.org/">homepage</a> -
+	<a href="https://docs.voidlinux.org/">docs</a>
+	<a href="https://github.com/void-linux">repos</a>
+</p>
diff --git a/srcpkgs/mobile-config-firefox/template b/srcpkgs/mobile-config-firefox/template
new file mode 100644
index 00000000000..77f10094701
--- /dev/null
+++ b/srcpkgs/mobile-config-firefox/template
@@ -0,0 +1,22 @@
+# Template file for 'mobile-config-firefox'
+pkgname=mobile-config-firefox
+version=1.0.1
+revision=1
+short_desc="Firefox tweaks for mobile and privacy"
+maintainer="Julio Galvan <julio-void@epazote.net>"
+license="GPL-3.0-or-later"
+homepage="https://gitlab.com/postmarketOS/mobile-config-firefox"
+distfiles="${homepage}/-/archive/${version}/${pkgname}-${version}.tar.gz"
+checksum=7dce837995956f6f224041853e005eecb3368cd3cbfec6fe3e8a3153747dd0a7
+
+post_extract() {
+	cp ${FILESDIR}/distro_links.html src/homepage
+}
+
+do_build() {
+	make DISTRO=VoidLinux
+}
+
+do_install() {
+	make DESTDIR=${DESTDIR} install
+}