From 06c344a036627babb563b8fb911def4d5176d841 Mon Sep 17 00:00:00 2001 From: teamcons Date: Sun, 15 Feb 2026 23:06:11 +0100 Subject: [PATCH 1/3] use legacy rdnn --- .github/workflows/CI.yml | 2 +- README.md | 10 +++---- data/cherrypick.desktop.in | 6 ++--- data/cherrypick.gresource.xml | 2 +- data/cherrypick.gschema.xml | 6 ++--- data/cherrypick.metainfo.xml.in | 26 +++++++++---------- ...ithub.ellie_commons.cherrypick.flathub.yml | 6 ++--- ... => io.github.ellie_commons.cherrypick.yml | 4 +-- meson.build | 2 +- po/README.md | 2 +- po/de.po | 2 +- po/es.po | 2 +- po/extra/de.po | 6 ++--- po/extra/es.po | 6 ++--- po/extra/extra.pot | 2 +- po/extra/fr.po | 6 ++--- po/extra/it.po | 4 +-- po/extra/ru.po | 6 ++--- po/fr.po | 2 +- ...=> io.github.ellie_commons.cherrypick.pot} | 4 +-- po/it.po | 4 +-- po/ru.po | 2 +- po/sv.po | 4 +-- src/Application.vala | 4 +-- src/Services/Settings.vala | 2 +- 25 files changed, 61 insertions(+), 61 deletions(-) rename io.github.elly_code.cherrypick.flathub.yml => io.github.ellie_commons.cherrypick.flathub.yml (83%) rename io.github.elly_code.cherrypick.yml => io.github.ellie_commons.cherrypick.yml (87%) rename po/{io.github.elly_code.cherrypick.pot => io.github.ellie_commons.cherrypick.pot} (94%) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 0149fae..6023ec3 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -27,7 +27,7 @@ jobs: uses: flatpak/flatpak-github-actions/flatpak-builder@v6 with: bundle: cherrypick.flatpak - manifest-path: io.github.elly_code.cherrypick.yml + manifest-path: io.github.ellie_commons.cherrypick.yml run-tests: true repository-name: appcenter repository-url: https://flatpak.elementary.io/repo.flatpakrepo diff --git a/README.md b/README.md index 5255d74..163e5c1 100644 --- a/README.md +++ b/README.md @@ -3,20 +3,20 @@ An icon of an eyedropper with a rainbow circle in the background

Cherrypick

Cherry-pick colors on your screen

- A screenshot of a window with a side displaying options and the other a single solid color + A screenshot of a window with a side displaying options and the other a single solid color - Made for elementary OS + Made for elementary OS ## Installation Cherrypick is designed and developed primarily for [elementary OS]. The latest stable release is available via AppCenter. -[![Get it on AppCenter](https://appcenter.elementary.io/badge.svg?new)](https://appcenter.elementary.io/io.github.elly_code.cherrypick) +[![Get it on AppCenter](https://appcenter.elementary.io/badge.svg?new)](https://appcenter.elementary.io/io.github.ellie_commons.cherrypick) -[Download on Flathub](https://flathub.org/apps/io.github.elly_code.cherrypick) +[Download on Flathub](https://flathub.org/apps/io.github.ellie_commons.cherrypick) @@ -35,7 +35,7 @@ and run the following command: ### On elementary OS or with its appcenter remote installed ```bash -flatpak-builder --force-clean --user --install-deps-from=appcenter --install builddir ./io.github.elly_code.cherrypick.yml +flatpak-builder --force-clean --user --install-deps-from=appcenter --install builddir ./io.github.ellie_commons.cherrypick.yml ``` ### On other systems: diff --git a/data/cherrypick.desktop.in b/data/cherrypick.desktop.in index 5585354..f03e3e6 100644 --- a/data/cherrypick.desktop.in +++ b/data/cherrypick.desktop.in @@ -6,8 +6,8 @@ GenericName=Color Picker Comment=Pick colors on your screen Categories=Graphics;Utility; -Icon=io.github.elly_code.cherrypick -Exec=io.github.elly_code.cherrypick +Icon=io.github.ellie_commons.cherrypick +Exec=io.github.ellie_commons.cherrypick SingleMainWindow=true Terminal=false Keywords=Color;Pick;Eyedropper;Picker; @@ -16,4 +16,4 @@ Actions=ImmediatelyPick; [Desktop Action ImmediatelyPick] Name=Pick a color Icon=color-picker -Exec=io.github.elly_code.cherrypick --immediately-pick +Exec=io.github.ellie_commons.cherrypick --immediately-pick diff --git a/data/cherrypick.gresource.xml b/data/cherrypick.gresource.xml index 14ab6a2..a9fa1b9 100644 --- a/data/cherrypick.gresource.xml +++ b/data/cherrypick.gresource.xml @@ -1,6 +1,6 @@ - + Application.css diff --git a/data/cherrypick.gschema.xml b/data/cherrypick.gschema.xml index 84806e8..ee74f64 100644 --- a/data/cherrypick.gschema.xml +++ b/data/cherrypick.gschema.xml @@ -1,6 +1,6 @@ - + @@ -9,7 +9,7 @@ - + ["rgba(237, 83, 83, 1)", "rgba(243, 115, 41, 1)", "rgba(249, 196, 64, 1)", "rgba(155, 219, 77, 1)", "rgba(165, 109, 226, 1)"] @@ -22,7 +22,7 @@ Color history The rgba values for saved snapshot - + "rgba" Color format Last selected color format diff --git a/data/cherrypick.metainfo.xml.in b/data/cherrypick.metainfo.xml.in index e0760bd..c49a7d0 100644 --- a/data/cherrypick.metainfo.xml.in +++ b/data/cherrypick.metainfo.xml.in @@ -1,9 +1,9 @@ - io.github.elly_code.cherrypick + io.github.ellie_commons.cherrypick Cherrypick Pick colors on your screen - io.github.elly_code.cherrypick.desktop + io.github.ellie_commons.cherrypick.desktop CC-BY-4.0 GPL-3.0-or-later @@ -28,33 +28,33 @@ - io.github.elly_code.cherrypick + io.github.ellie_commons.cherrypick pointing touch - + PhoneyBadger + Stella and Charlie - elly-code - https://github.com/elly-code/cherrypick - https://github.com/elly-code/cherrypick/issues - https://github.com/elly-code/cherrypick/issues + ellie-commons + https://github.com/ellie-commons/cherrypick + https://github.com/ellie-commons/cherrypick/issues + https://github.com/ellie-commons/cherrypick/issues https://ko-fi.com/teamcons - https://github.com/elly-code/cherrypick + https://github.com/ellie-commons/cherrypick Cherrypick's main window - https://github.com/elly-code/cherrypick/blob/main/data/screenshots/window-light.png?raw=true + https://github.com/ellie-commons/cherrypick/blob/main/data/screenshots/window-light.png?raw=true Main window with dark theme - https://github.com/elly-code/cherrypick/blob/main/data/screenshots/window-dark.png?raw=true + https://github.com/ellie-commons/cherrypick/blob/main/data/screenshots/window-dark.png?raw=true @@ -89,7 +89,7 @@ - Fix alpha not being restored properly + Fix alpha not being restored properly @@ -114,7 +114,7 @@
  • App now works on ARM thanks to @ryonakano!
  • Add the ability to immediately pick and copy to clipboard
  • You can right-click on app icon and choose "Immediately pick"
    • -
  • Or set a keybind to "flatpak run io.elly_code.cherrypick --immediately-pick"
    • +
  • Or set a keybind to "flatpak run io.ellie_commons.cherrypick --immediately-pick"
  • Updated deprecated widgets
  • Minute tweaks by @ryonakano thanks again!
    • diff --git a/io.github.elly_code.cherrypick.flathub.yml b/io.github.ellie_commons.cherrypick.flathub.yml similarity index 83% rename from io.github.elly_code.cherrypick.flathub.yml rename to io.github.ellie_commons.cherrypick.flathub.yml index 0c4ce16..611ec63 100644 --- a/io.github.elly_code.cherrypick.flathub.yml +++ b/io.github.ellie_commons.cherrypick.flathub.yml @@ -1,11 +1,11 @@ -id: io.github.elly_code.cherrypick +id: io.github.ellie_commons.cherrypick # elementary SDK is not available on Flathub, so use the elementary BaseApp instead base: io.elementary.BaseApp base-version: 'circe-25.08' runtime: org.gnome.Platform runtime-version: '49' sdk: org.gnome.Sdk -command: io.github.elly_code.cherrypick +command: io.github.ellie_commons.cherrypick finish-args: - '--share=ipc' @@ -30,7 +30,7 @@ modules: buildsystem: meson sources: - type: git - url: https://github.com/elly-code/cherrypick.git + url: https://github.com/ellie-commons/cherrypick.git tag: 2.3.0 commit: ed215bda8d53d2475597317fb44844a3c35ed325 x-checker-data: diff --git a/io.github.elly_code.cherrypick.yml b/io.github.ellie_commons.cherrypick.yml similarity index 87% rename from io.github.elly_code.cherrypick.yml rename to io.github.ellie_commons.cherrypick.yml index c163fc8..5fc53df 100644 --- a/io.github.elly_code.cherrypick.yml +++ b/io.github.ellie_commons.cherrypick.yml @@ -1,9 +1,9 @@ -id: io.github.elly_code.cherrypick +id: io.github.ellie_commons.cherrypick runtime: io.elementary.Platform # Currently this crashes for 8.2 (which flathub has) bc https://github.com/elementary/granite/pull/893 runtime-version: '8' sdk: io.elementary.Sdk -command: io.github.elly_code.cherrypick +command: io.github.ellie_commons.cherrypick finish-args: - '--share=ipc' diff --git a/meson.build b/meson.build index 3989f71..11205ff 100644 --- a/meson.build +++ b/meson.build @@ -1,4 +1,4 @@ -project('io.github.elly_code.cherrypick', +project('io.github.ellie_commons.cherrypick', 'c', 'vala', version: '2.3.0') diff --git a/po/README.md b/po/README.md index bc47966..e99e4da 100644 --- a/po/README.md +++ b/po/README.md @@ -2,7 +2,7 @@ ## First Things First -* Clone this repository by opening the terminal in a folder of your choice and typing ```git clone https://github.com/elly_code/cherrypick``` +* Clone this repository by opening the terminal in a folder of your choice and typing ```git clone https://github.com/ellie_commons/cherrypick``` ## Basics diff --git a/po/de.po b/po/de.po index e4113c2..598671e 100644 --- a/po/de.po +++ b/po/de.po @@ -9,7 +9,7 @@ msgstr "" "PO-Revision-Date: 2022-05-29 02:15+0530\n" "POT-Creation-Date: 2025-12-26 17:04+0100\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"Project-Id-Version: io.github.elly_code.cherrypick\n" +"Project-Id-Version: io.github.ellie_commons.cherrypick\n" "Report-Msgid-Bugs-To: \n" #. /TRANSLATORS: Do not translate app name diff --git a/po/es.po b/po/es.po index 58a4d44..8277761 100644 --- a/po/es.po +++ b/po/es.po @@ -9,7 +9,7 @@ msgstr "" "PO-Revision-Date: 2022-05-29 02:15+0530\n" "POT-Creation-Date: 2025-12-26 17:04+0100\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"Project-Id-Version: io.github.elly_code.cherrypick\n" +"Project-Id-Version: io.github.ellie_commons.cherrypick\n" "Report-Msgid-Bugs-To: \n" #. /TRANSLATORS: Do not translate app name diff --git a/po/extra/de.po b/po/extra/de.po index c84d563..12ce1fb 100644 --- a/po/extra/de.po +++ b/po/extra/de.po @@ -9,7 +9,7 @@ msgstr "" "PO-Revision-Date: 2022-05-29 02:15+0530\n" "POT-Creation-Date: 2025-12-26 17:04+0100\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"Project-Id-Version: io.github.elly_code.cherrypick\n" +"Project-Id-Version: io.github.ellie_commons.cherrypick\n" "Report-Msgid-Bugs-To: \n" #: data/cherrypick.desktop.in:5 @@ -111,8 +111,8 @@ msgid "You can right-click on app icon and choose \"Immediately pick\"" msgstr "Sie können mit der rechten Maustaste auf das App-Symbol klicken und \"Sofort auswählen\" wählen." #: data/cherrypick.metainfo.xml.in:92 -msgid "Or set a keybind to \"flatpak run io.elly_code.cherrypick --immediately-pick\"" -msgstr "Oder setzen Sie eine Schlüsselbindung auf \"flatpak run io.elly_code.cherrypick --immediately-pick\"" +msgid "Or set a keybind to \"flatpak run io.ellie_commons.cherrypick --immediately-pick\"" +msgstr "Oder setzen Sie eine Schlüsselbindung auf \"flatpak run io.ellie_commons.cherrypick --immediately-pick\"" #: data/cherrypick.metainfo.xml.in:93 msgid "Updated deprecated widgets" diff --git a/po/extra/es.po b/po/extra/es.po index 7563d0b..d3e7e73 100644 --- a/po/extra/es.po +++ b/po/extra/es.po @@ -9,7 +9,7 @@ msgstr "" "PO-Revision-Date: 2022-05-29 02:15+0530\n" "POT-Creation-Date: 2025-12-26 17:04+0100\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"Project-Id-Version: io.github.elly_code.cherrypick\n" +"Project-Id-Version: io.github.ellie_commons.cherrypick\n" "Report-Msgid-Bugs-To: \n" #: data/cherrypick.desktop.in:5 @@ -113,8 +113,8 @@ msgid "You can right-click on app icon and choose \"Immediately pick\"" msgstr "Puedes hacer clic con el botón derecho en el icono de la aplicación y elegir \"Elegir inmediatamente\"." #: data/cherrypick.metainfo.xml.in:92 -msgid "Or set a keybind to \"flatpak run io.elly_code.cherrypick --immediately-pick\"" -msgstr "O establece un keybind a \"flatpak run io.elly_code.cherrypick --immediately-pick\"" +msgid "Or set a keybind to \"flatpak run io.ellie_commons.cherrypick --immediately-pick\"" +msgstr "O establece un keybind a \"flatpak run io.ellie_commons.cherrypick --immediately-pick\"" #: data/cherrypick.metainfo.xml.in:93 msgid "Updated deprecated widgets" diff --git a/po/extra/extra.pot b/po/extra/extra.pot index 96f5a00..3a708aa 100644 --- a/po/extra/extra.pot +++ b/po/extra/extra.pot @@ -117,7 +117,7 @@ msgstr "" #: data/cherrypick.metainfo.xml.in:92 msgid "" -"Or set a keybind to \"flatpak run io.elly_code.cherrypick --immediately-" +"Or set a keybind to \"flatpak run io.ellie_commons.cherrypick --immediately-" "pick\"" msgstr "" diff --git a/po/extra/fr.po b/po/extra/fr.po index 80898a8..d82ade2 100644 --- a/po/extra/fr.po +++ b/po/extra/fr.po @@ -9,7 +9,7 @@ msgstr "" "PO-Revision-Date: 2022-05-29 02:15+0530\n" "POT-Creation-Date: 2025-12-26 17:04+0100\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"Project-Id-Version: io.github.elly_code.cherrypick\n" +"Project-Id-Version: io.github.ellie_commons.cherrypick\n" "Report-Msgid-Bugs-To: \n" #: data/cherrypick.desktop.in:5 @@ -111,8 +111,8 @@ msgid "You can right-click on app icon and choose \"Immediately pick\"" msgstr "Vous pouvez cliquer avec le bouton droit de la souris sur l'icône de l'application et choisir \"Récupérer immédiatement\"" #: data/cherrypick.metainfo.xml.in:92 -msgid "Or set a keybind to \"flatpak run io.elly_code.cherrypick --immediately-pick\"" -msgstr "Ou mettre un keybind à \"flatpak run io.elly_code.cherrypick --immediately-pick\"" +msgid "Or set a keybind to \"flatpak run io.ellie_commons.cherrypick --immediately-pick\"" +msgstr "Ou mettre un keybind à \"flatpak run io.ellie_commons.cherrypick --immediately-pick\"" #: data/cherrypick.metainfo.xml.in:93 msgid "Updated deprecated widgets" diff --git a/po/extra/it.po b/po/extra/it.po index 163b0ac..18b6cd7 100644 --- a/po/extra/it.po +++ b/po/extra/it.po @@ -118,10 +118,10 @@ msgstr "Puoi fare clic con il tasto destro sull'icona dell'app e scegliere \"Sel #: data/cherrypick.metainfo.xml.in:92 msgid "" -"Or set a keybind to \"flatpak run io.elly_code.cherrypick --immediately-" +"Or set a keybind to \"flatpak run io.ellie_commons.cherrypick --immediately-" "pick\"" msgstr "" -"Oppure imposta un tasto di scelta rapida a \"flatpak run io.elly_code.cherrypick --immediately-pick\"" +"Oppure imposta un tasto di scelta rapida a \"flatpak run io.ellie_commons.cherrypick --immediately-pick\"" #: data/cherrypick.metainfo.xml.in:93 msgid "Updated deprecated widgets" diff --git a/po/extra/ru.po b/po/extra/ru.po index 2092e13..b36bfe8 100644 --- a/po/extra/ru.po +++ b/po/extra/ru.po @@ -1,6 +1,6 @@ msgid "" msgstr "" -"Project-Id-Version: io.github.elly_code.cherrypick\n" +"Project-Id-Version: io.github.ellie_commons.cherrypick\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-12-26 17:04+0100\n" "PO-Revision-Date: 2022-09-27 20:44+0900\n" @@ -126,10 +126,10 @@ msgstr "" #: data/cherrypick.metainfo.xml.in:92 msgid "" -"Or set a keybind to \"flatpak run io.elly_code.cherrypick --immediately-" +"Or set a keybind to \"flatpak run io.ellie_commons.cherrypick --immediately-" "pick\"" msgstr "" -"Или установите привязку клавиш на \"flatpak run io.elly_code.cherrypick " +"Или установите привязку клавиш на \"flatpak run io.ellie_commons.cherrypick " "--immediately-pick\"." #: data/cherrypick.metainfo.xml.in:93 diff --git a/po/fr.po b/po/fr.po index a572c5a..c3bc3a4 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9,7 +9,7 @@ msgstr "" "PO-Revision-Date: 2022-05-29 02:15+0530\n" "POT-Creation-Date: 2025-12-26 17:04+0100\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"Project-Id-Version: io.github.elly_code.cherrypick\n" +"Project-Id-Version: io.github.ellie_commons.cherrypick\n" "Report-Msgid-Bugs-To: \n" #. /TRANSLATORS: Do not translate app name diff --git a/po/io.github.elly_code.cherrypick.pot b/po/io.github.ellie_commons.cherrypick.pot similarity index 94% rename from po/io.github.elly_code.cherrypick.pot rename to po/io.github.ellie_commons.cherrypick.pot index b43205c..64f052c 100644 --- a/po/io.github.elly_code.cherrypick.pot +++ b/po/io.github.ellie_commons.cherrypick.pot @@ -1,12 +1,12 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the io.github.elly_code.cherrypick package. +# This file is distributed under the same license as the io.github.ellie_commons.cherrypick package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: io.github.elly_code.cherrypick\n" +"Project-Id-Version: io.github.ellie_commons.cherrypick\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-12-26 17:04+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" diff --git a/po/it.po b/po/it.po index c12ecef..9d77220 100644 --- a/po/it.po +++ b/po/it.po @@ -1,12 +1,12 @@ # ITALIAN TRANSLATION. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the io.github.elly_code.cherrypick package. +# This file is distributed under the same license as the io.github.ellie_commons.cherrypick package. # ALBANO BATTISTELLA , 2025. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: io.github.elly_code.cherrypick\n" +"Project-Id-Version: io.github.ellie_commons.cherrypick\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-12-26 17:04+0100\n" "PO-Revision-Date: 2025-12-27 16:41+0100\n" diff --git a/po/ru.po b/po/ru.po index 4390391..9caba2f 100644 --- a/po/ru.po +++ b/po/ru.po @@ -1,6 +1,6 @@ msgid "" msgstr "" -"Project-Id-Version: io.github.elly_code.cherrypick\n" +"Project-Id-Version: io.github.ellie_commons.cherrypick\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-12-26 17:04+0100\n" "PO-Revision-Date: 2022-09-27 20:44+0900\n" diff --git a/po/sv.po b/po/sv.po index 5aadd76..893e3f2 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1,12 +1,12 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the io.github.elly_code.cherrypick package. +# This file is distributed under the same license as the io.github.ellie_commons.cherrypick package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: io.github.elly_code.cherrypick\n" +"Project-Id-Version: io.github.ellie_commons.cherrypick\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-12-26 17:04+0100\n" "PO-Revision-Date: 2026-01-14 15:57+0100\n" diff --git a/src/Application.vala b/src/Application.vala index f4aaa0d..745185f 100644 --- a/src/Application.vala +++ b/src/Application.vala @@ -25,7 +25,7 @@ public class Cherrypick.Application : Gtk.Application { public Application () { Object ( - application_id: "io.github.elly_code.cherrypick", + application_id: "io.github.ellie_commons.cherrypick", flags: ApplicationFlags.HANDLES_COMMAND_LINE ); } @@ -76,7 +76,7 @@ public class Cherrypick.Application : Gtk.Application { }); var provider = new Gtk.CssProvider (); - provider.load_from_resource ("/io/github/elly_code/cherrypick/Application.css"); + provider.load_from_resource ("/io/github/ellie_commons/cherrypick/Application.css"); Gtk.StyleContext.add_provider_for_display ( Gdk.Display.get_default (), provider, diff --git a/src/Services/Settings.vala b/src/Services/Settings.vala index e2b5989..6363e99 100644 --- a/src/Services/Settings.vala +++ b/src/Services/Settings.vala @@ -20,7 +20,7 @@ public class Cherrypick.Settings: GLib.Settings { private Settings () { Object ( - schema_id: "io.github.elly_code.cherrypick" + schema_id: "io.github.ellie_commons.cherrypick" ); } } From 5d974dfa47644b8d6e8d3976355391c70f63806e Mon Sep 17 00:00:00 2001 From: teamcons Date: Sun, 15 Feb 2026 23:07:46 +0100 Subject: [PATCH 2/3] manifest --- ...ithub.ellie_commons.cherrypick.flathub.yml | 38 ------------------- io.github.ellie_commons.cherrypick.yml | 21 ++++++---- 2 files changed, 14 insertions(+), 45 deletions(-) delete mode 100644 io.github.ellie_commons.cherrypick.flathub.yml diff --git a/io.github.ellie_commons.cherrypick.flathub.yml b/io.github.ellie_commons.cherrypick.flathub.yml deleted file mode 100644 index 611ec63..0000000 --- a/io.github.ellie_commons.cherrypick.flathub.yml +++ /dev/null @@ -1,38 +0,0 @@ -id: io.github.ellie_commons.cherrypick -# elementary SDK is not available on Flathub, so use the elementary BaseApp instead -base: io.elementary.BaseApp -base-version: 'circe-25.08' -runtime: org.gnome.Platform -runtime-version: '49' -sdk: org.gnome.Sdk -command: io.github.ellie_commons.cherrypick - -finish-args: - - '--share=ipc' - - '--device=dri' - - '--socket=fallback-x11' - - '--socket=wayland' - -cleanup: - - '/include' - - '/lib/pkgconfig' - - '/man' - - '/share/doc' - - '/share/gtk-doc' - - '/share/man' - - '/share/pkgconfig' - - '/share/installed-tests' - - '*.la' - - '*.a' - -modules: - - name: cherrypick - buildsystem: meson - sources: - - type: git - url: https://github.com/ellie-commons/cherrypick.git - tag: 2.3.0 - commit: ed215bda8d53d2475597317fb44844a3c35ed325 - x-checker-data: - type: git - tag-pattern: '^([\d.]+)$' \ No newline at end of file diff --git a/io.github.ellie_commons.cherrypick.yml b/io.github.ellie_commons.cherrypick.yml index 5fc53df..611ec63 100644 --- a/io.github.ellie_commons.cherrypick.yml +++ b/io.github.ellie_commons.cherrypick.yml @@ -1,15 +1,17 @@ id: io.github.ellie_commons.cherrypick -runtime: io.elementary.Platform -# Currently this crashes for 8.2 (which flathub has) bc https://github.com/elementary/granite/pull/893 -runtime-version: '8' -sdk: io.elementary.Sdk +# elementary SDK is not available on Flathub, so use the elementary BaseApp instead +base: io.elementary.BaseApp +base-version: 'circe-25.08' +runtime: org.gnome.Platform +runtime-version: '49' +sdk: org.gnome.Sdk command: io.github.ellie_commons.cherrypick finish-args: - '--share=ipc' + - '--device=dri' - '--socket=fallback-x11' - '--socket=wayland' - - '--device=dri' cleanup: - '/include' @@ -27,5 +29,10 @@ modules: - name: cherrypick buildsystem: meson sources: - - type: dir - path: . + - type: git + url: https://github.com/ellie-commons/cherrypick.git + tag: 2.3.0 + commit: ed215bda8d53d2475597317fb44844a3c35ed325 + x-checker-data: + type: git + tag-pattern: '^([\d.]+)$' \ No newline at end of file From b58b2fd469bdae35f7d915dc4e06acfe42d2ed50 Mon Sep 17 00:00:00 2001 From: teamcons Date: Sun, 15 Feb 2026 23:18:39 +0100 Subject: [PATCH 3/3] remove circular ref --- data/cherrypick.metainfo.xml.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/cherrypick.metainfo.xml.in b/data/cherrypick.metainfo.xml.in index c49a7d0..a021312 100644 --- a/data/cherrypick.metainfo.xml.in +++ b/data/cherrypick.metainfo.xml.in @@ -20,11 +20,11 @@ - io.github.ellie_commons.cherrypick - io.github.ellie_commons.cherrypick + io.github.elly_code.cherrypick + io.github.elly_code.cherrypick - io.github.ellie_commons.cherrypick + io.github.elly_code.cherrypick