Piecuu/pmaports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

device-pine64-pinenote: fix waybar icons by being unicode compliant

Browse source 
Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/7515>
This commit is contained in:
Antoine Martin 2025-12-08 17:53:44 -05:00 • committed by The Friendly Merge Bot
parent d7229de9d4
commit b5256b5f3d
No known key found for this signature in database
4 changed files with 383 additions and 264 deletions
Download patch file Download diff file Expand all files Collapse all files

10
device/testing/device-pine64-pinenote/APKBUILD
View file

@ -1,8 +1,8 @@
# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
pkgname=device-pine64-pinenote
pkgdesc="Pine64 PineNote"
pkgver=7
pkgrel=1
pkgver=8
pkgrel=0
_commit="28d2c05ab4e80a7972611cd3188f3e8be4197f6a"
url="https://postmarketos.org"
license="GPL-3.0-only"
@ -24,7 +24,7 @@ source="
pinenote-dist-$_commit.tar.gz::https://git.sr.ht/~hrdl/pinenote-dist/archive/$_commit.tar.gz
waveform-extract-use-lib.patch
sway-wayland-sessions-use-dbus.patch
sway-waybar-config-fix-endless-interval.patch
sway-waybar-config-fix-endless-interval-and-invisible-icons.patch
sway-sane-scale.patch
sway-nwg-menu-fix-css-path.patch
@ -251,8 +251,8 @@ sha512sums="
4b6548a05dcdbe1ddda97dba58d625407fb553f90817e8e678b97e28603f64aab9a31fa18bda654c06638f3be21d7a6936786197f93f715e7d03a07e380873c5 pinenote-dist-28d2c05ab4e80a7972611cd3188f3e8be4197f6a.tar.gz
780ece54589b4483461cc07917d9ca6f13222435872386d65c34ff6798758f28d81e913777d41b745e7bb0f53950b8f610ce361f2fe146937afd4080ae2aa904 waveform-extract-use-lib.patch
16f5c226d1366ebd0efc5bdc92a33ae184773a17ce593bdb71c60f1a091de13b2d39bedee43c46c01229e36d60f3688626a1b1ae08eab2c235ac6f5f0fc3d6a8 sway-wayland-sessions-use-dbus.patch
b0eb78d9b74b984c4bc5c5e15518a3f659d2e10a46b60085d5bc8bd3927d4724f71ecd623bcdb5743069fbed86291c6a33ac3cfefac21818bf44bdff620e8b14 sway-waybar-config-fix-endless-interval.patch
74e5a76662b5e4c58ca9f281d4a3964f7e925cc06fc47f9c5f6bf1c3f039d2310495fe1a99b501cb35339309a74c7a4e94f270f511385f7bd2fc3c1a647a1447 sway-sane-scale.patch
82babd0aa02084c7a05f7b2e3a6d74db373588cd612d4d75f5ec79db895d8bdda4fcde784a1b8340df33a8c5f26204151d55a9d9b9dd2cc317cef623f51b626e sway-waybar-config-fix-endless-interval-and-invisible-icons.patch
4a02a3fb225b16290fbc469da5acba8438e959c0471743950ae125ede6b75b61e1772d900bd1f7c5fca55222cf430cae6c953d6065553ea3594babf33b569405 sway-sane-scale.patch
7effcd37bbf2cab66ccb57ab976de63c93bd03795ccd82f317fbfb16216da287ada4410d9b168057e651fa4d769588d1f0efa713caa28c5b71ba6b73909ae33c sway-nwg-menu-fix-css-path.patch
763461efa1c687f778112bc5804ebe66a5185032de0cdf6ae93ebcc70a3117011d6300db4970012c8fae8858b572a0b3ca7fb4344d366c46f32baa32cc9868fc deviceinfo
e0d3ac808e7a4f05df327a824e30dc54864908e31f4a643f6e85f054ab812eeb28fef647eb52ae85bfad7d40c9cd81c43c1cdc575de5dbc04304d74862d9772c modules-initfs

8
device/testing/device-pine64-pinenote/sway-sane-scale.patch
View file

@ -20,7 +20,7 @@ index 280fd83015..c87676069b 100755
rotnormal() {
- swaymsg -- output "-" transform 0 scale 1
+ swaymsg -- output "-" transform 0 scale 1.5
+ swaymsg -- output "-" transform 0
focused_name="$(focusedname)"
swaymsg -- input type:touch map_to_output "$focused_name"
swaymsg -- input type:tablet_tool map_to_output "$focused_name"
@ -29,7 +29,7 @@ index 280fd83015..c87676069b 100755
rotleft() {
- swaymsg -- output "-" transform 90 scale 1
+ swaymsg -- output "-" transform 90 scale 1.2
+ swaymsg -- output "-" transform 90
focused_name="$(focusedname)"
swaymsg -- input type:touch map_to_output "$focused_name"
swaymsg -- input type:tablet_tool map_to_output "$focused_name"
@ -38,7 +38,7 @@ index 280fd83015..c87676069b 100755
rotright() {
- swaymsg -- output "-" transform 270 scale 1
+ swaymsg -- output "-" transform 270 scale 1.2
+ swaymsg -- output "-" transform 270
focused_name="$(focusedname)"
swaymsg -- input type:touch map_to_output "$focused_name"
swaymsg -- input type:tablet_tool map_to_output "$focused_name"
@ -47,7 +47,7 @@ index 280fd83015..c87676069b 100755
rotinvert() {
- swaymsg -- output "-" transform 180 scale 1
+ swaymsg -- output "-" transform 180 scale 1.5
+ swaymsg -- output "-" transform 180
focused_name="$(focusedname)"
swaymsg -- input type:touch map_to_output "$focused_name"
swaymsg -- input type:tablet_tool map_to_output "$focused_name"

374
device/testing/device-pine64-pinenote/sway-waybar-config-fix-endless-interval-and-invisible-icons.patch Normal file
View file

@ -0,0 +1,374 @@
diff --git a/etc/sway_hrdl/waybar/config b/etc/sway_hrdl/waybar/config
index f31a30e..76e041f 100644
--- a/etc/sway_hrdl/waybar/config
+++ b/etc/sway_hrdl/waybar/config
@@ -72,15 +72,15 @@
"critical": 15
},
// Connected to AC
- "format": " {icon} {capacity}%", // Icon: bolt
+ "format": "\uF0E7 {icon} {capacity}%", // Icon: bolt
// Not connected to AC
"format-discharging": "{capacity}% {icon}",
"format-icons": [
- "", // Icon: battery-full
- "", // Icon: battery-three-quarters
- "", // Icon: battery-half
- "", // Icon: battery-quarter
- "" // Icon: battery-empty
+ "\uF244", // Icon: battery-full
+ "\uF243", // Icon: battery-three-quarters
+ "\uF242", // Icon: battery-half
+ "\uF241", // Icon: battery-quarter
+ "\uF240" // Icon: battery-empty
],
"min-length": 5,
"tooltip": true
@@ -94,13 +94,13 @@
"clock#date": {
"interval": 10,
- "format": " {:%e %b %Y}", // Icon: calendar-alt
+ "format": "\uF073 {:%e %b %Y}", // Icon: calendar-alt
"tooltip-format": "{:%e %B %Y}"
},
"cpu": {
"interval": 5,
- "format": " {usage}%", // Icon: microchip
+ "format": "\uF2DB {usage}%", // Icon: microchip
"states": {
"warning": 70,
"critical": 90
@@ -109,7 +109,7 @@
"memory": {
"interval": 5,
- "format": " {}%", // Icon: memory
+ "format": "\uF538 {}%", // Icon: memory
"states": {
"warning": 70,
"critical": 90
@@ -131,259 +131,221 @@
"interval": 5,
"format": "{icon} {temperatureC}°C",
"format-icons": [
- "", // Icon: temperature-empty
- "", // Icon: temperature-quarter
- "", // Icon: temperature-half
- "", // Icon: temperature-three-quarters
- "" // Icon: temperature-full
+ "\uF2CB", // Icon: temperature-empty
+ "\uF2CA", // Icon: temperature-quarter
+ "\uF2C9", // Icon: temperature-half
+ "\uF2C8", // Icon: temperature-three-quarters
+ "\uF2C8" // Icon: temperature-full
],
"tooltip": true,
- "hwmon-path": "/sys/class/hwmon/hwmon3/temp1_input",
+ "hwmon-path": "/sys/class/hwmon/hwmon3/temp1_input"
},
"custom/kill": {
- "format": "",
- "interval": "once",
+ "format": "\uF00D",
"on-click": "swaymsg kill",
"min-length": 5,
- "tooltip": false,
+ "tooltip": false
},
"custom/winleft": {
- "format": "",
- "interval": "once",
+ "format": "\uF104",
"on-click": "swaymsg move left",
"min-length": 5,
- "tooltip": false,
+ "tooltip": false
},
"custom/winright": {
- "format": "",
- "interval": "once",
+ "format": "\uF105",
"on-click": "swaymsg move right",
"min-length": 5,
- "tooltip": false,
+ "tooltip": false
},
"custom/winup": {
- "format": "",
- "interval": "once",
+ "format": "\uF106",
"on-click": "swaymsg move up",
"min-length": 5,
- "tooltip": false,
+ "tooltip": false
},
"custom/windown": {
- "format": "",
- "interval": "once",
+ "format": "\uF107",
"on-click": "swaymsg move down",
"min-length": 5,
- "tooltip": false,
+ "tooltip": false
},
"custom/splitv": {
"format": "/|",
- "interval": "once",
"on-click": "swaymsg splitv",
"min-length": 5,
- "tooltip": false,
+ "tooltip": false
},
"custom/splith": {
"format": "/-",
- "interval": "once",
"on-click": "swaymsg splith",
"min-length": 5,
- "tooltip": false,
+ "tooltip": false
},
"custom/mvws_prev": {
- "format": "",
- "interval": "once",
+ "format": "\uF100",
"on-click": "sway_workspace move prev",
"min-length": 5,
- "tooltip": false,
+ "tooltip": false
},
"custom/gows_prev": {
- "format": "<",
- "interval": "once",
+ "format": "\u2190",
"on-click": "sway_workspace goto prev",
"min-length": 5,
- "tooltip": false,
+ "tooltip": false
},
"custom/gows_next": {
- "format": ">",
- "interval": "once",
+ "format": "\u2192",
"on-click": "sway_workspace goto next",
"min-length": 5,
- "tooltip": false,
+ "tooltip": false
},
"custom/mvws_next": {
- "format": "",
- "interval": "once",
+ "format": "\uF101",
"on-click": "sway_workspace move next",
"min-length": 5,
- "tooltip": false,
+ "tooltip": false
},
"custom/okb": {
- "format": "",
- "interval": "once",
+ "format": "\uF11C",
"on-click": "toggle_onscreen_keyboard.py",
"min-length": 5,
- "tooltip": false,
+ "tooltip": false
},
"custom/smenu": {
- "format": "",
- "interval": "once",
+ "format": "\uF277",
"on-click": "toggle_menu.sh",
"min-length": 5,
- "tooltip": false,
+ "tooltip": false
},
"custom/ws1": {
"format": "1",
- "interval": "once",
"on-click": "swaymsg workspace number 1",
"min-length": 5,
- "tooltip": false,
+ "tooltip": false
},
"custom/ws2": {
"format": "2",
- "interval": "once",
"on-click": "swaymsg workspace number 2",
"min-length": 5,
- "tooltip": false,
+ "tooltip": false
},
"custom/ws3": {
"format": "3",
- "interval": "once",
"on-click": "swaymsg workspace number 3",
"min-length": 5,
- "tooltip": false,
+ "tooltip": false
},
"custom/ws4": {
"format": "4",
- "interval": "once",
"on-click": "swaymsg workspace number 4",
"min-length": 5,
- "tooltip": false,
+ "tooltip": false
},
"custom/ws5": {
"format": "5",
- "interval": "once",
"on-click": "swaymsg workspace number 5",
"min-length": 5,
- "tooltip": false,
+ "tooltip": false
},
"custom/blc_down": {
- "format": "",
- "interval": "once",
+ "format": "\uF063\uF186",
"on-click": "brightnessctl --device=backlight_cool set 10%-",
"min-length": 5,
- "tooltip": false,
+ "tooltip": false
},
"custom/blc_up": {
- "format": "",
- "interval": "once",
+ "format": "\uF186\uF062",
"on-click": "brightnessctl --device=backlight_cool set 10%+",
"min-length": 5,
- "tooltip": false,
+ "tooltip": false
},
"custom/blw_down": {
- "format": "",
- "interval": "once",
+ "format": "\uF063\uF185",
"on-click": "brightnessctl --device=backlight_warm set 10%-",
"min-length": 5,
- "tooltip": false,
+ "tooltip": false
},
"custom/blw_up": {
- "format": "",
- "interval": "once",
+ "format": "\uF185\uF062",
"on-click": "brightnessctl --device=backlight_warm set 10%+",
"min-length": 5,
- "tooltip": false,
+ "tooltip": false
},
"idle_inhibitor": {
"format": "{icon}",
"format-icons": {
- "activated": "",
- "deactivated": ""
+ "activated": "\uF06E",
+ "deactivated": "\uF070"
},
- "min-length": 5,
+ "min-length": 5
},
"custom/ebc_dump_buffers": {
- "format": "🐃",
- "interval": "once",
+ "format": "\u2707",
"on-click": "rockchip_ebc_dump_buffers.py",
"min-length": 5,
- "tooltip": false,
+ "tooltip": false
},
"custom/ebc_cycle_driver_mode": {
- "format": "🚲",
- "interval": "once",
+ "format": "\u2727",
+ "format-alt": "\u2726",
"on-click": "python -c 'import rockchip_ebc_custom_ioctl as reci; reci.cycle_driver_mode()'",
"min-length": 5,
- "tooltip": false,
+ "tooltip": false
},
"custom/ebc_refresh": {
- "format": "",
- "interval": "once",
+ "format": "\uf2f1",
"on-click": "dbus-send --type=method_call --dest=org.pinenote.ebc_custom / org.pinenote.ebc_custom.GlobalRefresh",
"min-length": 5,
- "tooltip": false,
+ "tooltip": false
},
"custom/rotate_0": {
- "format": "R0",
- "interval": "once",
+ "format": "\u25AC",
"on-click": "sway_rotate.sh rotnormal",
"min-length": 5,
- "tooltip": false,
+ "tooltip": false
},
"custom/rotate_90": {
- "format": "R90",
- "interval": "once",
+ "format": "\u25AE",
"on-click": "sway_rotate.sh rotright",
"min-length": 5,
- "tooltip": false,
+ "tooltip": false
},
"custom/rotate_180": {
"format": "R180",
- "interval": "once",
"on-click": "sway_rotate.sh rotinvert",
"min-length": 5,
- "tooltip": false,
+ "tooltip": false
},
"custom/rotate_270": {
"format": "R270",
- "interval": "once",
"on-click": "sway_rotate.sh rotleft",
"min-length": 5,
- "tooltip": false,
+ "tooltip": false
},
"custom/key_pageup": {
- "format": "",
- "interval": "once",
+ "format": "\uF102",
// "on-click": "wtype -P page_up",
"on-click": "swaymsg resize grow width 10px; swaymsg resize grow height 10px",
"min-length": 5,
- "tooltip": false,
+ "tooltip": false
},
"custom/key_pagedown": {
- "format": "",
- "interval": "once",
+ "format": "\uF103",
// "on-click": "wtype -P page_down",
"on-click": "swaymsg resize shrink width 10px; swaymsg resize shrink height 10px",
"min-length": 5,
- "tooltip": false,
- },
-
- "custom/battery_watts": {
- "exec": "battery_watts.sh",
- "format": " {}W",
- "interval": 10,
- "min-length": 5,
- "tooltip": false,
+ "tooltip": false
},
"tray": {

255
device/testing/device-pine64-pinenote/sway-waybar-config-fix-endless-interval.patch
View file

@ -1,255 +0,0 @@
diff --git a/etc/sway_hrdl/waybar/config.orig b/etc/sway_hrdl/waybar/config
index f31a30eb25..55c8e0214c 100644
--- a/etc/sway_hrdl/waybar/config.orig
+++ b/etc/sway_hrdl/waybar/config
@@ -46,7 +46,7 @@
"idle_inhibitor",
"battery",
"tray",
- // "clock#time",
+ "clock#time",
"custom/kill",
],
@@ -143,7 +143,6 @@
"custom/kill": {
"format": "",
- "interval": "once",
"on-click": "swaymsg kill",
"min-length": 5,
"tooltip": false,
@@ -151,77 +150,66 @@
"custom/winleft": {
"format": "",
- "interval": "once",
"on-click": "swaymsg move left",
"min-length": 5,
"tooltip": false,
},
"custom/winright": {
"format": "",
- "interval": "once",
"on-click": "swaymsg move right",
"min-length": 5,
"tooltip": false,
},
"custom/winup": {
"format": "",
- "interval": "once",
"on-click": "swaymsg move up",
"min-length": 5,
"tooltip": false,
},
"custom/windown": {
"format": "",
- "interval": "once",
"on-click": "swaymsg move down",
"min-length": 5,
"tooltip": false,
},
"custom/splitv": {
"format": "/|",
- "interval": "once",
"on-click": "swaymsg splitv",
"min-length": 5,
"tooltip": false,
},
"custom/splith": {
"format": "/-",
- "interval": "once",
"on-click": "swaymsg splith",
"min-length": 5,
"tooltip": false,
},
"custom/mvws_prev": {
"format": "",
- "interval": "once",
"on-click": "sway_workspace move prev",
"min-length": 5,
"tooltip": false,
},
"custom/gows_prev": {
"format": "<",
- "interval": "once",
"on-click": "sway_workspace goto prev",
"min-length": 5,
"tooltip": false,
},
"custom/gows_next": {
"format": ">",
- "interval": "once",
"on-click": "sway_workspace goto next",
"min-length": 5,
"tooltip": false,
},
"custom/mvws_next": {
"format": "",
- "interval": "once",
"on-click": "sway_workspace move next",
"min-length": 5,
"tooltip": false,
},
"custom/okb": {
"format": "",
- "interval": "once",
"on-click": "toggle_onscreen_keyboard.py",
"min-length": 5,
"tooltip": false,
@@ -229,7 +217,6 @@
"custom/smenu": {
"format": "",
- "interval": "once",
"on-click": "toggle_menu.sh",
"min-length": 5,
"tooltip": false,
@@ -237,35 +224,30 @@
"custom/ws1": {
"format": "1",
- "interval": "once",
"on-click": "swaymsg workspace number 1",
"min-length": 5,
"tooltip": false,
},
"custom/ws2": {
"format": "2",
- "interval": "once",
"on-click": "swaymsg workspace number 2",
"min-length": 5,
"tooltip": false,
},
"custom/ws3": {
"format": "3",
- "interval": "once",
"on-click": "swaymsg workspace number 3",
"min-length": 5,
"tooltip": false,
},
"custom/ws4": {
"format": "4",
- "interval": "once",
"on-click": "swaymsg workspace number 4",
"min-length": 5,
"tooltip": false,
},
"custom/ws5": {
"format": "5",
- "interval": "once",
"on-click": "swaymsg workspace number 5",
"min-length": 5,
"tooltip": false,
@@ -273,28 +255,24 @@
"custom/blc_down": {
"format": "",
- "interval": "once",
"on-click": "brightnessctl --device=backlight_cool set 10%-",
"min-length": 5,
"tooltip": false,
},
"custom/blc_up": {
"format": "",
- "interval": "once",
"on-click": "brightnessctl --device=backlight_cool set 10%+",
"min-length": 5,
"tooltip": false,
},
"custom/blw_down": {
"format": "",
- "interval": "once",
"on-click": "brightnessctl --device=backlight_warm set 10%-",
"min-length": 5,
"tooltip": false,
},
"custom/blw_up": {
"format": "",
- "interval": "once",
"on-click": "brightnessctl --device=backlight_warm set 10%+",
"min-length": 5,
"tooltip": false,
@@ -310,28 +288,24 @@
},
"custom/ebc_dump_buffers": {
"format": "🐃",
- "interval": "once",
"on-click": "rockchip_ebc_dump_buffers.py",
"min-length": 5,
"tooltip": false,
},
"custom/ebc_cycle_driver_mode": {
"format": "🚲",
- "interval": "once",
"on-click": "python -c 'import rockchip_ebc_custom_ioctl as reci; reci.cycle_driver_mode()'",
"min-length": 5,
"tooltip": false,
},
"custom/ebc_refresh": {
"format": "",
- "interval": "once",
"on-click": "dbus-send --type=method_call --dest=org.pinenote.ebc_custom / org.pinenote.ebc_custom.GlobalRefresh",
"min-length": 5,
"tooltip": false,
},
"custom/rotate_0": {
"format": "R0",
- "interval": "once",
"on-click": "sway_rotate.sh rotnormal",
"min-length": 5,
"tooltip": false,
@@ -339,7 +313,6 @@
"custom/rotate_90": {
"format": "R90",
- "interval": "once",
"on-click": "sway_rotate.sh rotright",
"min-length": 5,
"tooltip": false,
@@ -347,7 +320,6 @@
"custom/rotate_180": {
"format": "R180",
- "interval": "once",
"on-click": "sway_rotate.sh rotinvert",
"min-length": 5,
"tooltip": false,
@@ -355,7 +327,6 @@
"custom/rotate_270": {
"format": "R270",
- "interval": "once",
"on-click": "sway_rotate.sh rotleft",
"min-length": 5,
"tooltip": false,
@@ -363,7 +334,6 @@
"custom/key_pageup": {
"format": "",
- "interval": "once",
// "on-click": "wtype -P page_up",
"on-click": "swaymsg resize grow width 10px; swaymsg resize grow height 10px",
"min-length": 5,
@@ -371,21 +341,12 @@
},
"custom/key_pagedown": {
"format": "",
- "interval": "once",
// "on-click": "wtype -P page_down",
"on-click": "swaymsg resize shrink width 10px; swaymsg resize shrink height 10px",
"min-length": 5,
"tooltip": false,
},
- "custom/battery_watts": {
- "exec": "battery_watts.sh",
- "format": " {}W",
- "interval": 10,
- "min-length": 5,
- "tooltip": false,
- },
-
"tray": {
"icon-size": 21,
"spacing": 10