Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Stable merge window for week 47 of 2023 #754

Merged
merged 10 commits into from
Dec 6, 2023
Merged

Stable merge window for week 47 of 2023 #754

merged 10 commits into from
Dec 6, 2023

Conversation

Eeems
Copy link
Member

@Eeems Eeems commented Nov 22, 2023 •
edited
Loading

New Packages

  • template-daily-planner, template-weekly-planner, template-journal, template-meeting-notes, template-smart-goals, and template-good-time-journal - 0.0.0-1 (Add various Templates #712)
  • splashscreen-starting-wavey-lines, splashscreen-suspended-wavey-lines, splashscreen-poweroff-gallifreyan, splashscreen-suspended-gallifreyan, splashscreen-suspended-gallifreyan-dark, splashscreen-starting-gallifreyan, splashscreen-suspended-gallifreyan-2, splashscreen-suspended-flower-pause, splashscreen-batteryempty-barnsley_fern, splashscreen-poweroff-barnsley_fern, splashscreen-starting-barnsley_fern, splashscreen-suspended-barnsley_fern, splashscreen-batteryempty-chaotic_ribbon, splashscreen-poweroff-chaotic_ribbon, splashscreen-starting-chaotic_ribbon, splashscreen-suspended-chaotic_ribbon, splashscreen-batteryempty-collatz_sea_weed, splashscreen-poweroff-collatz_sea_weed, splashscreen-starting-collatz_sea_weed, splashscreen-suspended-collatz_sea_weed, splashscreen-batteryempty-dragon_curve, splashscreen-poweroff-dragon_curve, splashscreen-starting-dragon_curve, splashscreen-suspended-dragon_curve, splashscreen-batteryempty-fire, splashscreen-poweroff-fire, splashscreen-starting-fire, splashscreen-suspended-fire, splashscreen-batteryempty-fractal_tree, splashscreen-poweroff-fractal_tree, splashscreen-starting-fractal_tree, splashscreen-suspended-fractal_tree, splashscreen-batteryempty-sacks_spiral, splashscreen-poweroff-sacks_spiral, splashscreen-starting-sacks_spiral, splashscreen-suspended-sacks_spiral, splashscreen-batteryempty-sierpinski_triangle, splashscreen-poweroff-sierpinski_triangle, splashscreen-starting-sierpinski_triangle, splashscreen-suspended-sierpinski_triangle, splashscreen-batteryempty-snowy_hills, splashscreen-poweroff-snowy_hills, splashscreen-starting-snowy_hills, splashscreen-suspended-snowy_hills, splashscreen-batteryempty-starr, splashscreen-poweroff-starr, splashscreen-starting-starr, and splashscreen-suspended-starr - 0.0.0-1 (Add splashscreens and backup/restore on changescreen install/remove #724)
    • Installing a splashscreen will automatically enable it
    • Removing a splashscreen will automatically revert to the previous splashscreen

Updated Packages

Tooling

  • Packages that contain files in /opt/etc/draft or /opt/usr/share/applications will now automatically reload oxide applications as part of install, upgrade, and remove.

Documentation

  • Add documentation for the reload-oxide-apps hook.
  • Update category list to include the new splashscreens category.

Known Issues

Jayy001 and others added 9 commits November 22, 2023 13:05
@Jayy001 @Eeems
Update toltecctl to fix uninstalling error (#740)
11332d3 
* Update toltecctl to fix uninstalling error

---------

Co-authored-by: Nathaniel van Diepen <Eeems@users.noreply.github.com>
@Eeems
Add missing xdg-settings binary to oxide-utils (#745)
662cd6b
@TheLastZombie @Eeems
rmfm: Update to 1.5.0 (#746)
c19b4bf
@fenollp @Eeems
Release whiteboard-hypercard v0.3.7 (#747)
aa6bbd6 
* Release whiteboard-hypercard v0.3.7

Signed-off-by: Pierre Fenoll <pierrefenoll@gmail.com>
@FouzR @Eeems
Update YAFT to v0.0.10 (#736)
64be5d6 
* Update YAFT to v0.0.10

---------

Co-authored-by: Nathaniel van Diepen <Eeems@users.noreply.github.com>
@Eeems
Make sure xochtil shows up properly when run (#707)
05b766e 
* Make sure xochtil shows up properly when run
@Eeems
Add various Templates (#712)
2cc01e5 
* Add remarkable_templates
@Eeems
Update rguard to use install-lib (#689)
7820db0
@Eeems
Add splashscreens and backup/restore on changescreen install/remove (#…
b1744e4 
…724)

* Add splashscreens and backup/restore on changescreen install/remove

* Only backup if splashscreens are missing

* update docs
@Eeems Eeems added the merge Weekly merge of the testing branch into the stable branch label Nov 22, 2023
@Eeems
Copy link
Member Author

Eeems commented Nov 22, 2023 •
edited
Loading

@Eeems @LinusCDE @Jayy001
Call update-desktop-database to refresh Oxide's application cache on …
db2b195 
…install (#700)

* Update oxide to v2.6

* Style fixes

* Add missing pkgnames

* Update image paths

* Fix liboxide path

* Don't check to see if tarnish is active

update-desktop-database safely handles tarnish not running.

* update-desktop-database for all applicaitons

* Update build image for plato

* Re-trigger CI

Most likely a one-off error: Timeout when connecting to github

* Update to latest image for zoneinfo-utils

* Add libc6 build dependency to zoneinfo-utils

* Revert all changes to zoneinfo-utils

* Update all packages to use install-lib method

* Fix formatting

* Also run oxide hook for draft apps

* Remove manual reload-oxide-apps calls

* Bump all other packages that have draft/oxide files

* Format fixes

* Add back missing documentation change

* Don't update whiteboard-hypercard

This package is failing to build

* Revert folly version

* Bump whiteboard-hypercard now that the build is fixed

* Bump xochitl version number

* Use github for KOReader release

---------

Co-authored-by: Linus <linus@cosmos-ink.net>
Co-authored-by: Jayy001 <56607897+Jayy001@users.noreply.github.com>
@Eeems Eeems marked this pull request as ready for review November 24, 2023 20:50
@Eeems Eeems requested a review from Jayy001 November 24, 2023 20:57
@Eeems
Copy link
Member Author

Eeems commented Dec 3, 2023

Testing

  • Copied rm1/rmall folders to device, added new file named /opt/etc/opkg.conf.d/16-local.conf with the following content: 
    src/gz local-rmall file:///home/root/packages/local/rmall
src/gz local-rm1 file:///home/root/packages/local/rm1
  • Ran toltecctl generate-opkg-conf to generate the new opkg.conf file.
  • Tested installing packages and ensured they installed as expected
  • Quick smoke test of the packages to ensure that they work as expected

Issues

  • For some reason fingerterm's icon is
    fingerterm
    instead of
    fingerterm
    Not entirely sure why this is happening.

@Eeems Eeems mentioned this pull request Dec 5, 2023
Open
@Jayy001
Copy link

Jayy001 commented Dec 5, 2023

Name Launches Working as intended? Pass
Keywriter OK Able to open up command-prompt and type in commands. Input is recognised however no content shows up on the device. (Can attach video) NO
Harmony OK YES YES
NetSurf OK YES YES
chessMarkable OK YES YES
whiteboard OK YES YES
yaft OK YES (Switches automatically from horizontal -> Vertical) YES
xochitl OK YES YES
DOOMarkable FAIL "If you see this screen, then the game probably didn't start" NO
Dumbskull OK YES YES
reboot-guard OK YES (No functional change) YES
Changescrn OK YES YES
Update-Desktop-Database-Oxide OK YES (Working as intended) YES
Templates OK YES YES
Fingerterm OK YES (Functionality OK! But, Icon is like the one which Eeems got) NO

Apart from Fingerterms icon, keywriter content not showing up and doomarkable not loading, everything works fine!

@Jayy001
Copy link

Jayy001 commented Dec 6, 2023

Just tested on 2.15.1.1189 - all working well. The only weird thing I encountered was this new section that doesn't display anything when selected.

Dec 06 16:03:42 reMarkable xochitl[1533]: 16:03:42.234 default                  qrc:/qml/device/view/settings/Settings.qml:242: ReferenceError: menuItem is not defined (qrc:/qml/device/view/settings/Settings.qml:242)
Dec 06 16:03:48 reMarkable xochitl[1533]: 16:03:48.775 default                  qrc:/qml/device/view/settings/Settings.qml:241: ReferenceError: menuItem is not defined (qrc:/qml/device/view/settings/Settings.qml:241)
Dec 06 16:03:53 reMarkable xochitl[1533]: 16:03:53.134 default                  qrc:/qml/device/view/settings/Settings.qml:241: ReferenceError: menuItem is not defined (qrc:/qml/device/view/settings/Settings.qml:241)
Dec 06 16:04:00 reMarkable xochitl[1533]: 16:04:00.426 rm.network.notifications Notification error:  QAbstractSocket::RemoteHostClosedError "The remote host closed the connection" 1000 ""
Dec 06 16:05:12 reMarkable xochitl[1533]: 16:05:12.877 default                  qrc:/qml/device/view/settings/Settings.qml:241: ReferenceError: menuItem is not defined (qrc:/qml/device/view/settings/Settings.qml:241)

@Jayy001
Copy link

Jayy001 commented Dec 6, 2023

IMG_20231206_160502

@Eeems Eeems merged commit 231fc3a into stable Dec 6, 2023
8 checks passed
@Eeems Eeems deleted the merge/2023-W47 branch December 6, 2023 19:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Jayy001 Jayy001 Jayy001 approved these changes

Assignees
No one assigned
Labels
merge Weekly merge of the testing branch into the stable branch
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@Eeems @Jayy001 @TheLastZombie @fenollp @FouzR