From 5eac64ee509d1bff18072b0ea74f68959c548c77 Mon Sep 17 00:00:00 2001 From: Julio Galvan Date: Sat, 29 Aug 2020 11:47:35 -0700 Subject: [PATCH 1/6] New package: feedbackd-0.0.0+git20200707 --- common/shlibs | 1 + srcpkgs/feedbackd/template | 32 ++++++++++++++++++++++++++++++++ srcpkgs/libfeedback | 1 + srcpkgs/libfeedback-devel | 1 + 4 files changed, 35 insertions(+) create mode 100644 srcpkgs/feedbackd/template create mode 120000 srcpkgs/libfeedback create mode 120000 srcpkgs/libfeedback-devel diff --git a/common/shlibs b/common/shlibs index a6b5737b845..6c0e544a7e1 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3988,3 +3988,4 @@ libaml.so.0 aml-0.1.0_1 libneatvnc.so.0 neatvnc-0.2.0_1 libtdjson.so.1.6.0 libtd-1.6.0_1 libJudy.so.1 judy-1.0.5_1 +libfeedback-0.0.so.0 libfeedback-0.0.0+git20200707_1 diff --git a/srcpkgs/feedbackd/template b/srcpkgs/feedbackd/template new file mode 100644 index 00000000000..cf5de83b419 --- /dev/null +++ b/srcpkgs/feedbackd/template @@ -0,0 +1,32 @@ +# Template file for 'feedbackd' +pkgname=feedbackd +version=0.0.0+git20200707 +revision=1 +wrksrc=${pkgname}-v${version} +build_style=meson +configure_args="-Dvapi=false -Dintrospection=disabled" +hostmakedepends="glib-devel pkg-config" +makedepends="gsound-devel libgudev-devel json-glib-devel" +depends="dbus" +short_desc="Daemon to provide haptic feedback on events" +maintainer="Julio Galvan " +license="GPL-3.0-or-later" +homepage="https://source.puri.sm/Librem5/feedbackd" +distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz" +checksum=37cf48cbdbaee8e2d0bea406f5b6317bf0e3cdf79250f9ce0a884e7d3905a8ea + +libfeedback_package() { + short_desc+=" - shared libraries" + pkg_install() { + vmove "usr/lib/*.so.*" + } +} +libfeedback-devel_package() { + depends="${sourcepkg}>=${version}_${revision} ${_devel_depends}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" + } +} diff --git a/srcpkgs/libfeedback b/srcpkgs/libfeedback new file mode 120000 index 00000000000..49dc965f1cd --- /dev/null +++ b/srcpkgs/libfeedback @@ -0,0 +1 @@ +feedbackd \ No newline at end of file diff --git a/srcpkgs/libfeedback-devel b/srcpkgs/libfeedback-devel new file mode 120000 index 00000000000..49dc965f1cd --- /dev/null +++ b/srcpkgs/libfeedback-devel @@ -0,0 +1 @@ +feedbackd \ No newline at end of file From 4d7a8ac1cd026ed76e4b3df6af8bf6c9a429a467 Mon Sep 17 00:00:00 2001 From: Julio Galvan Date: Sat, 29 Aug 2020 11:47:56 -0700 Subject: [PATCH 2/6] New package: phoc-0.4.2 --- srcpkgs/phoc/template | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 srcpkgs/phoc/template diff --git a/srcpkgs/phoc/template b/srcpkgs/phoc/template new file mode 100644 index 00000000000..074acb6afc8 --- /dev/null +++ b/srcpkgs/phoc/template @@ -0,0 +1,15 @@ +# Template file for 'phoc' +pkgname=phoc +version=0.4.2 +revision=1 +wrksrc=${pkgname}-v${version} +build_style=meson +configure_args="-Dembed-wlroots=disabled" +hostmakedepends="glib-devel pkg-config wayland-devel" +makedepends="gnome-desktop-devel wlroots-devel" +short_desc="Wlroots based Phone compositor for the Phosh shell" +maintainer="Julio Galvan " +license="GPL-3.0-or-later" +homepage="https://source.puri.sm/Librem5/phoc" +distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz" +checksum=bdb34644c7d49c953239c1e939bc5ee2bc26f6187b9d756b70b113d2734c712c From 3bfe62aec042faaf6592fb51a3849f77c86704f4 Mon Sep 17 00:00:00 2001 From: Julio Galvan Date: Sat, 29 Aug 2020 11:48:48 -0700 Subject: [PATCH 3/6] New package: squeekboard-1.9.3 --- srcpkgs/squeekboard/template | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 srcpkgs/squeekboard/template diff --git a/srcpkgs/squeekboard/template b/srcpkgs/squeekboard/template new file mode 100644 index 00000000000..a672443da33 --- /dev/null +++ b/srcpkgs/squeekboard/template @@ -0,0 +1,21 @@ +# Template file for 'squeekboard' +pkgname=squeekboard +version=1.9.3 +revision=1 +wrksrc=${pkgname}-v${version} +build_style=meson +build_helper=rust +hostmakedepends="glib-devel gettext pkg-config cargo wayland-devel" +makedepends="rust gtk+3-devel gnome-desktop-devel libfeedback-devel" +short_desc="Final Librem5 keyboard" +maintainer="Julio Galvan " +license="GPL-3.0-or-later" +homepage="https://source.puri.sm/Librem5/squeekboard" +distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz" +checksum=b99e56faace3986bf752e08c104cea60ed896d514284840655033dd9457db824 + +pre_configure() { + if [ "$CROSS_BUILD" ]; then + vsed -i cargo_build.sh -e "s/-a ./-a ${XBPS_CROSS_RUST_TARGET}/g" + fi +} From ced63ca0800c4273ca8b0331743e3cb6f98964ae Mon Sep 17 00:00:00 2001 From: Julio Galvan Date: Sat, 29 Aug 2020 11:48:59 -0700 Subject: [PATCH 4/6] New package: phosh-0.4.3 --- srcpkgs/phosh/files/sm.puri.OSK0.desktop | 12 +++++++++ srcpkgs/phosh/files/sm.puri.Phosh.desktop | 11 ++++++++ srcpkgs/phosh/patches/32bit-build-fix.patch | 30 +++++++++++++++++++++ srcpkgs/phosh/patches/meson.patch | 10 +++++++ srcpkgs/phosh/template | 21 +++++++++++++++ 5 files changed, 84 insertions(+) create mode 100644 srcpkgs/phosh/files/sm.puri.OSK0.desktop create mode 100644 srcpkgs/phosh/files/sm.puri.Phosh.desktop create mode 100644 srcpkgs/phosh/patches/32bit-build-fix.patch create mode 100644 srcpkgs/phosh/patches/meson.patch create mode 100644 srcpkgs/phosh/template diff --git a/srcpkgs/phosh/files/sm.puri.OSK0.desktop b/srcpkgs/phosh/files/sm.puri.OSK0.desktop new file mode 100644 index 00000000000..39740f15773 --- /dev/null +++ b/srcpkgs/phosh/files/sm.puri.OSK0.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Type=Application +Name=On-screen keyboard +Comment=Default on-screen keyboard +Exec=/usr/bin/squeekboard +Categories=GNOME;Core; +OnlyShowIn=GNOME; +NoDisplay=true +X-GNOME-Autostart-Phase=Panel +X-GNOME-Provides=inputmethod +X-GNOME-Autostart-Notify=true +X-GNOME-AutoRestart=true diff --git a/srcpkgs/phosh/files/sm.puri.Phosh.desktop b/srcpkgs/phosh/files/sm.puri.Phosh.desktop new file mode 100644 index 00000000000..84452845115 --- /dev/null +++ b/srcpkgs/phosh/files/sm.puri.Phosh.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Name=Phosh +Name[en]=Phosh +Comment=This session logs you into Phosh +Comment[en]=This session logs in you into Phosh +Exec=dbus-run-session /usr/bin/phosh +TryExec=/usr/bin/phosh +Icon= +Type=Application +X-DesktopNames=Phosh +Keywords=launch;Phosh;desktop;session; diff --git a/srcpkgs/phosh/patches/32bit-build-fix.patch b/srcpkgs/phosh/patches/32bit-build-fix.patch new file mode 100644 index 00000000000..a98ecb0faa5 --- /dev/null +++ b/srcpkgs/phosh/patches/32bit-build-fix.patch @@ -0,0 +1,30 @@ +From d1da5ea7d18c6794c9a7d2f41355fe90d4115ac1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Guido=20G=C3=BCnther?= +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 +--- + src/notifications/timestamp-label.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/notifications/timestamp-label.c b/src/notifications/timestamp-label.c +index 0aa04ce0..a5a4d5e7 100644 +--- src/notifications/timestamp-label.c ++++ src/notifications/timestamp-label.c +@@ -255,7 +255,7 @@ phosh_timestamp_label_calc_timeout (PhoshTimestampLabel *self) + break; + } + timeout_diff = g_date_time_difference (timeout_time, time_now); +- g_debug ("time out duration = %ld", timeout_diff); ++ g_debug ("time out duration: %" G_GINT64_FORMAT, timeout_diff); + return timeout_diff; + } + +-- +2.26.2 diff --git a/srcpkgs/phosh/patches/meson.patch b/srcpkgs/phosh/patches/meson.patch new file mode 100644 index 00000000000..3d91f0c069d --- /dev/null +++ b/srcpkgs/phosh/patches/meson.patch @@ -0,0 +1,10 @@ +--- meson.build 2020-08-02 09:47:19.000000000 -0700 ++++ meson.build 2020-08-28 16:50:25.592370097 -0700 +@@ -152,7 +152,6 @@ + 'Phosh @0@'.format(meson.project_version()), + '', + ' Tests: @0@'.format(get_option('tests')), +- ' Phoc Tests: @0@'.format(run_phoc_tests), + 'Documentation: @0@'.format(get_option('gtk_doc')), + '-----------', + ] diff --git a/srcpkgs/phosh/template b/srcpkgs/phosh/template new file mode 100644 index 00000000000..8360013a956 --- /dev/null +++ b/srcpkgs/phosh/template @@ -0,0 +1,21 @@ +# Template file for 'phosh' +pkgname=phosh +version=0.4.3 +revision=1 +build_style=meson +hostmakedepends="phoc glib-devel gettext pkg-config wayland-devel" +makedepends="libfeedback-devel gcr-devel gnome-desktop-devel pam-devel + polkit-devel pulseaudio-devel libsecret-devel libhandy-devel + NetworkManager-devel upower-devel" +depends="phoc squeekboard" +short_desc="Shell PoC for the Librem5" +maintainer="Julio Galvan " +license="GPL-3.0-or-later" +homepage="https://source.puri.sm/Librem5/phosh" +distfiles="https://repo.pureos.net/pureos/pool/main/p/phosh/phosh_$version.tar.xz" +checksum=c6fc68aafaf78412637b0f509aafbbca877bda3fe19511bf340b824d7cdbd4ee + +post_install() { + vcopy ${FILESDIR}/sm.puri.OSK0.desktop usr/share/applications + vcopy ${FILESDIR}/sm.puri.Phosh.desktop usr/share/applications +} From bdedbe6ecb44e0ee07cfd45bf4d90dd373c32f1a Mon Sep 17 00:00:00 2001 From: Julio Galvan Date: Sat, 29 Aug 2020 11:49:14 -0700 Subject: [PATCH 5/6] New package: calls-0.1.7 --- srcpkgs/calls/template | 17 +++++++++++++++++ srcpkgs/purism-chatty/template | 22 ++++++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 srcpkgs/calls/template create mode 100644 srcpkgs/purism-chatty/template diff --git a/srcpkgs/calls/template b/srcpkgs/calls/template new file mode 100644 index 00000000000..260ed391d24 --- /dev/null +++ b/srcpkgs/calls/template @@ -0,0 +1,17 @@ +# Template file for 'calls' +pkgname=calls +version=0.1.7 +revision=1 +wrksrc=${pkgname}-v${version} +build_style=meson +hostmakedepends="glib-devel gettext vala pkg-config wayland-devel + evolution-data-server-devel" +makedepends="folks-devel libhandy-devel libpeas-devel gom-devel + ModemManager-devel libfeedback-devel" +depends="NetworkManager" +short_desc="Phone call application" +maintainer="Julio Galvan " +license="GPL-3.0-or-later" +homepage="https://source.puri.sm/Librem5/calls" +distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz" +checksum=477c55d483ca13f6ac98209c3c4d6c5858f706e72a133616dcb6827ef25829c7 diff --git a/srcpkgs/purism-chatty/template b/srcpkgs/purism-chatty/template new file mode 100644 index 00000000000..d11bfcea882 --- /dev/null +++ b/srcpkgs/purism-chatty/template @@ -0,0 +1,22 @@ +# Template file for 'purism-chatty' +pkgname=purism-chatty +_pkgname=chatty +version=0.1.15 +revision=1 +wrksrc=${_pkgname}-v${version} +build_style=meson +hostmakedepends="glib-devel pkg-config gettext" +makedepends="libfeedback-devel libhandy-devel evolution-data-server-devel + libpurple libpurple-devel" +short_desc="XMPP and SMS messaging via libpurple and Modemmanager" +maintainer="Julio Galvan " +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 +}