forge/pmaports
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

temp/phosh: upgrade to 0.4.5 (MR 1623)

Browse source 
re-fork from Alpine to get upstream packaging changes as well
This commit is contained in:
Luca Weiss 2020-10-07 09:21:29 +02:00 committed by Oliver Smith
parent 757edbd304
commit 65983235e7
No known key found for this signature in database
GPG key ID: 5AE7F5513E0885CB
2 changed files with 9 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
temp/phosh/0002-timestamp-label-Unbreak-build-on-32-bit-platforms.patch
View file

@ -1,34 +0,0 @@
Patch from upstream:
https://source.puri.sm/Librem5/phosh/-/commit/d1da5ea7d18c6794c9a7d2f41355fe90d4115ac1
From 3036049454349fee74867b42c159a8eb49b5b00f 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 0aa04ce..a5a4d5e 100644
--- a/src/notifications/timestamp-label.c
+++ b/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.20.1

26
temp/phosh/APKBUILD
View file

@ -1,8 +1,8 @@
# Forked from Alpine to apply Hide-Logout-action patch # Forked from Alpine to apply Hide-Logout-action patch
pkgname=phosh pkgname=phosh
pkgver=9999 pkgver=9999
_pkgver=0.4.3 _pkgver=0.4.5
pkgrel=0 pkgrel=1
pkgdesc="Shell PoC for the Librem5" pkgdesc="Shell PoC for the Librem5"
# Blocked on mips and s390x by gnome-session, gnome-settings-daemon, squeekboard and libhandy # Blocked on mips and s390x by gnome-session, gnome-settings-daemon, squeekboard and libhandy
# Blocked on ppc64le by gnome-session # Blocked on ppc64le by gnome-session
@ -11,7 +11,7 @@ url="https://source.puri.sm/Librem5/phosh"
license="GPL-3.0-only" license="GPL-3.0-only"
depends="wayland-protocols phoc gnome-session bash dbus-x11 gnome-settings-daemon depends="wayland-protocols phoc gnome-session bash dbus-x11 gnome-settings-daemon
squeekboard libpulse dbus:org.freedesktop.Secrets elogind gnome-control-center" squeekboard libpulse dbus:org.freedesktop.Secrets elogind gnome-control-center"
makedepends="gtk+3.0-dev meson ninja gnome-desktop-dev libhandy-dev gcr-dev upower-dev makedepends="gtk+3.0-dev meson ninja gnome-desktop-dev libhandy1-dev gcr-dev upower-dev
linux-pam-dev git cmake pulseaudio-dev networkmanager-dev polkit-elogind-dev linux-pam-dev git cmake pulseaudio-dev networkmanager-dev polkit-elogind-dev
libsecret-dev feedbackd-dev" libsecret-dev feedbackd-dev"
subpackages="$pkgname-lang" subpackages="$pkgname-lang"
@ -19,28 +19,21 @@ source="$pkgname-$_pkgver.tar.xz::https://repo.pureos.net/pureos/pool/main/p/pho
phosh.desktop phosh.desktop
sm.puri.OSK0.desktop sm.puri.OSK0.desktop
0001-PMOS-Hide-Logout-action.patch 0001-PMOS-Hide-Logout-action.patch
0002-timestamp-label-Unbreak-build-on-32-bit-platforms.patch
" "
options="!check" # Needs a running Wayland compositor options="!check" # Needs a running Wayland compositor
builddir="$srcdir/$pkgname-$_pkgver" builddir="$srcdir/$pkgname-$_pkgver"
build() { build() {
meson \ abuild-meson . output
--prefix=/usr \ meson compile ${JOBS:+-j ${JOBS}} -C output
--sysconfdir=/etc \
--mandir=/usr/share/man \
--localstatedir=/var \
--buildtype=plain \
. output
ninja -C output
} }
check() { check() {
ninja -C output test meson test --no-rebuild -v -C output
} }
package() { package() {
DESTDIR="$pkgdir/" ninja -C output install DESTDIR="$pkgdir/" meson install --no-rebuild -C output
install -D -m644 "$srcdir"/phosh.desktop \ install -D -m644 "$srcdir"/phosh.desktop \
"$pkgdir"/usr/share/wayland-sessions/phosh.desktop "$pkgdir"/usr/share/wayland-sessions/phosh.desktop
@ -49,8 +42,7 @@ package() {
"$pkgdir"/usr/share/applications/sm.puri.OSK0.desktop "$pkgdir"/usr/share/applications/sm.puri.OSK0.desktop
} }
sha512sums="43eec9987daec6f220e853021a8e32cfdb00f73e097479847e846ab318d506419f8d4d0712ff8f12d2e7b1b863a9edbf4465ad430df092b593f0b06d24bc27b1 phosh-0.4.3.tar.xz sha512sums="ca106d66d8a9067d0062f6a56142d7a5476e963a9f4a4ca173ce54b32ec5cdefe93b5274d1aeadafb09e4feed180a1247718a233c0e9ff629bc6f3321e14c13c phosh-0.4.5.tar.xz
6644870edbbbc6b88d6e19f7771d81dba1a11066c2b34e4c22736db73a2dfd0d4909b4967503059c35385c5139a834a5c06a3c56b148ba1275d7f089c0c5f33c phosh.desktop 6644870edbbbc6b88d6e19f7771d81dba1a11066c2b34e4c22736db73a2dfd0d4909b4967503059c35385c5139a834a5c06a3c56b148ba1275d7f089c0c5f33c phosh.desktop
f97019598323276cf97ae62f04b6245983198e04b228ddc605835ee46845d9b88c6890fb86e97e4bb6f1ad73361437d9ed18c91e81fe1284a88cdcb92d3fdc69 sm.puri.OSK0.desktop f97019598323276cf97ae62f04b6245983198e04b228ddc605835ee46845d9b88c6890fb86e97e4bb6f1ad73361437d9ed18c91e81fe1284a88cdcb92d3fdc69 sm.puri.OSK0.desktop
f289c8a9db01741058881ca6b20c386fcd87f00d3f638f1d32d181bed70d36e9696d84f4c210b581138fff6fceeafa5dcbcb4e1097f04eb29d8cee2930ca4446 0001-PMOS-Hide-Logout-action.patch f289c8a9db01741058881ca6b20c386fcd87f00d3f638f1d32d181bed70d36e9696d84f4c210b581138fff6fceeafa5dcbcb4e1097f04eb29d8cee2930ca4446 0001-PMOS-Hide-Logout-action.patch"
3e7eae0a9b9977a38f7a894cc0e4e319d3b7a8a6fdc02cc3ce1d14461c998e44da9bced494c8c820584709da6e25a48347f530ef0237239fd88e52a862aae92f 0002-timestamp-label-Unbreak-build-on-32-bit-platforms.patch"