From 7a6ae29fad3891ce8f3c58ee2e346f140f0a3f9c Mon Sep 17 00:00:00 2001 From: Tulip Blossom Date: Wed, 30 Oct 2024 21:15:07 -0300 Subject: [PATCH 1/3] feat: add RSS feed reader for Bluefin/Aurora changelogs --- build_files/copr-repos.sh | 3 + packages.json | 1 + .../applications/system-changelog.desktop | 8 ++ .../usr/share/pixmaps/ublue-changelog.svg | 101 ++++++++++++++++++ .../usr/share/ublue-os/changelog.config.toml | 8 ++ .../usr/share/ublue-os/just/10-update.just | 2 +- 6 files changed, 122 insertions(+), 1 deletion(-) create mode 100644 system_files/shared/usr/share/applications/system-changelog.desktop create mode 100644 system_files/shared/usr/share/pixmaps/ublue-changelog.svg create mode 100644 system_files/shared/usr/share/ublue-os/changelog.config.toml diff --git a/build_files/copr-repos.sh b/build_files/copr-repos.sh index dc59225d0ee..fd413f811cf 100755 --- a/build_files/copr-repos.sh +++ b/build_files/copr-repos.sh @@ -88,3 +88,6 @@ rm /etc/yum.repos.d/_copr_sentry-switcheroo-control_discrete.repo # Add Nerd Fonts curl -Lo /etc/yum.repos.d/_copr_che-nerd-fonts-"${FEDORA_MAJOR_VERSION}".repo https://copr.fedorainfracloud.org/coprs/che/nerd-fonts/repo/fedora-"${FEDORA_MAJOR_VERSION}"/che-nerd-fonts-fedora-"${FEDORA_MAJOR_VERSION}".repo + +# RSS changelog viewer +curl -Lo /etc/yum.repos.d/_copr_tulilirockz-juicerss-"${FEDORA_MAJOR_VERSION}".repo https://copr.fedorainfracloud.org/coprs/tulilirockz/juicerss/repo/fedora-"${FEDORA_MAJOR_VERSION}"/tulilirockz-juicerss-fedora-"${FEDORA_MAJOR_VERSION}".repo diff --git a/packages.json b/packages.json index a64b0977188..3ff9312f9f5 100644 --- a/packages.json +++ b/packages.json @@ -27,6 +27,7 @@ "input-leap", "input-remapper", "jetbrains-mono-fonts-all", + "juicerss", "libimobiledevice", "libxcrypt-compat", "libsss_autofs", diff --git a/system_files/shared/usr/share/applications/system-changelog.desktop b/system_files/shared/usr/share/applications/system-changelog.desktop new file mode 100644 index 00000000000..7614e5fed97 --- /dev/null +++ b/system_files/shared/usr/share/applications/system-changelog.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Type=Application +Name=Changelog +Comment=See the operating system version changelog +Icon=ublue-changelog +Categories=ConsoleOnly;System; +Terminal=true +Exec=/usr/bin/ujust changelog diff --git a/system_files/shared/usr/share/pixmaps/ublue-changelog.svg b/system_files/shared/usr/share/pixmaps/ublue-changelog.svg new file mode 100644 index 00000000000..f6539bf43e5 --- /dev/null +++ b/system_files/shared/usr/share/pixmaps/ublue-changelog.svg @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + diff --git a/system_files/shared/usr/share/ublue-os/changelog.config.toml b/system_files/shared/usr/share/ublue-os/changelog.config.toml new file mode 100644 index 00000000000..714af47f11e --- /dev/null +++ b/system_files/shared/usr/share/ublue-os/changelog.config.toml @@ -0,0 +1,8 @@ +nerd_fonts = true +list_format = "extended" + +[[feeds]] +name = "Bluefin and Aurora Updates" +url = "https://github.com/ublue-os/bluefin/releases.atom" +enabled = true + diff --git a/system_files/shared/usr/share/ublue-os/just/10-update.just b/system_files/shared/usr/share/ublue-os/just/10-update.just index 68b86dad067..0f579ff690a 100644 --- a/system_files/shared/usr/share/ublue-os/just/10-update.just +++ b/system_files/shared/usr/share/ublue-os/just/10-update.just @@ -39,4 +39,4 @@ alias changelog := changelogs # Show the changelog changelogs: - rpm-ostree db diff --changelogs + /usr/bin/juicerss --config=/usr/share/ublue-os/changelog.config.toml From 5116a500ffa01a503ca5dded858937ee138cc758 Mon Sep 17 00:00:00 2001 From: Tulip Blossom Date: Wed, 30 Oct 2024 22:01:03 -0300 Subject: [PATCH 2/3] feat(ujust): release-notes for new changelog viewer --- .../shared/usr/share/applications/system-changelog.desktop | 2 +- system_files/shared/usr/share/ublue-os/just/10-update.just | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/system_files/shared/usr/share/applications/system-changelog.desktop b/system_files/shared/usr/share/applications/system-changelog.desktop index 7614e5fed97..d0ad459c701 100644 --- a/system_files/shared/usr/share/applications/system-changelog.desktop +++ b/system_files/shared/usr/share/applications/system-changelog.desktop @@ -5,4 +5,4 @@ Comment=See the operating system version changelog Icon=ublue-changelog Categories=ConsoleOnly;System; Terminal=true -Exec=/usr/bin/ujust changelog +Exec=/usr/bin/ujust release-notes diff --git a/system_files/shared/usr/share/ublue-os/just/10-update.just b/system_files/shared/usr/share/ublue-os/just/10-update.just index 0f579ff690a..08902b9ce03 100644 --- a/system_files/shared/usr/share/ublue-os/just/10-update.just +++ b/system_files/shared/usr/share/ublue-os/just/10-update.just @@ -39,4 +39,8 @@ alias changelog := changelogs # Show the changelog changelogs: + rpm-ostree db diff --changelogs + +# Release notes in a TUI viewer +release-notes: /usr/bin/juicerss --config=/usr/share/ublue-os/changelog.config.toml From fbc600690b30cb51a5c5f86208dee9fe80570186 Mon Sep 17 00:00:00 2001 From: Tulip Blossom Date: Fri, 1 Nov 2024 14:28:06 -0300 Subject: [PATCH 3/3] fix(ublue-changelog, icon): make icon more fitting with other icons' styles --- .../usr/share/pixmaps/ublue-changelog.svg | 407 +++++++++++++++--- 1 file changed, 354 insertions(+), 53 deletions(-) diff --git a/system_files/shared/usr/share/pixmaps/ublue-changelog.svg b/system_files/shared/usr/share/pixmaps/ublue-changelog.svg index f6539bf43e5..f992450f5be 100644 --- a/system_files/shared/usr/share/pixmaps/ublue-changelog.svg +++ b/system_files/shared/usr/share/pixmaps/ublue-changelog.svg @@ -1,14 +1,14 @@ - - + id="stop11" /> + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1" + d="M 296.208,159.16 C 242.27166,105.22366 172.76574,72.448401 97.772469,65.007903 79.63472,63.208357 64.81,78.163766 64.81,96.397999 c 0,17.304471 14.848573,31.115741 32.93286,33.357281 57.78283,7.16216 111.19158,33.13216 152.96514,74.90572 41.77272,41.77356 67.74329,95.18231 74.90566,152.96515 2.2416,18.08427 16.80711,32.93285 35.04134,32.93285 17.30447,0 31.50547,-14.82472 29.70577,-32.96245 C 382.91962,282.60306 350.14436,213.09636 296.208,159.16 Z" + id="path8" + inkscape:path-effect="#path-effect11" + inkscape:original-d="M 296.208,159.16 C 234.445,97.397 152.266,63.382 64.81,63.382 v 64.348 c 70.268,0 136.288,27.321 185.898,76.931 49.609,49.61 76.931,115.63 76.931,185.898 h 64.348 C 391.986,303.103 357.971,220.923 296.208,159.16 Z" /> + style="fill:#cccccc;fill-opacity:1" + d="m 64.143,206.16395 c 0,16.82125 15.390358,30.07843 33.619783,34.155 57.943167,12.95757 103.662897,58.67708 116.620367,116.62125 4.07647,18.22945 18.87134,33.6198 37.5888,33.6198 16.82125,0 30.73125,-15.28108 27.85103,-33.75672 C 265.26439,263.41479 191.28806,189.43778 97.899714,174.87905 79.424081,171.99879 64.143,187.44649 64.143,206.16395 Z" + id="path9" + inkscape:path-effect="#path-effect13" + inkscape:original-d="m 64.143,172.273 v 64.348 c 84.881,0 153.938,69.056 153.938,153.939 h 64.348 c 0,-120.364 -97.922,-218.287 -218.286,-218.287 z" /> - - - - + id="circle9" /> + + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#eaeaee;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1" + d="M 296.208,159.16 C 242.27166,105.22366 172.76574,72.448401 97.772469,65.007903 79.63472,63.208357 64.81,78.163766 64.81,96.397999 c 0,17.304471 14.848573,31.115741 32.93286,33.357281 57.78283,7.16216 111.19158,33.13216 152.96514,74.90572 41.77272,41.77356 67.74329,95.18231 74.90566,152.96515 2.2416,18.08427 16.80711,32.93285 35.04134,32.93285 17.30447,0 31.50547,-14.82472 29.70577,-32.96245 C 382.91962,282.60306 350.14436,213.09636 296.208,159.16 Z" + id="path1-3" + inkscape:path-effect="#path-effect2" + inkscape:original-d="M 296.208,159.16 C 234.445,97.397 152.266,63.382 64.81,63.382 v 64.348 c 70.268,0 136.288,27.321 185.898,76.931 49.609,49.61 76.931,115.63 76.931,185.898 h 64.348 C 391.986,303.103 357.971,220.923 296.208,159.16 Z" /> + style="fill:#eaeaee;fill-opacity:1" + d="m 64.143,206.16395 c 0,16.82125 15.390358,30.07843 33.619783,34.155 57.943167,12.95757 103.662897,58.67708 116.620367,116.62125 4.07647,18.22945 18.87134,33.6198 37.5888,33.6198 16.82125,0 30.73125,-15.28108 27.85103,-33.75672 C 265.26439,263.41479 191.28806,189.43778 97.899714,174.87905 79.424081,171.99879 64.143,187.44649 64.143,206.16395 Z" + id="path2" + inkscape:path-effect="#path-effect1" + inkscape:original-d="m 64.143,172.273 v 64.348 c 84.881,0 153.938,69.056 153.938,153.939 h 64.348 c 0,-120.364 -97.922,-218.287 -218.286,-218.287 z" /> - - +