Next release

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -54,7 +54,7 @@ body:
       options:
         - I installed from Flathub (all Linuxes)
         - I installed from Appcenter (elementary OS)
-        - I built it from sources (with Meson+Ninja)
+        - I built it from sources (with Meson+Ninja, or from AUR)
     validations:
       required: true
 

.github/workflows/CI.yml

@@ -15,15 +15,15 @@ jobs:
     runs-on: ubuntu-latest
 
     container:
-      image: ghcr.io/elementary/flatpak-platform/runtime:8
+      image: ghcr.io/elementary/flatpak-platform/runtime:8.2
       options: --privileged
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Build
-        uses: flatpak/flatpak-github-actions/flatpak-builder@v6
+        uses: flatpak/flatpak-github-actions/flatpak-builder@v6.6
         with:
           bundle: jorts.flatpak
           manifest-path: io.github.elly_code.jorts.yml

.github/workflows/lint.yml

@@ -1,4 +1,4 @@
-name: "CI: Lint"
+name: "Lint"
 
 on:
   pull_request:

data/Application.css

@@ -164,3 +164,10 @@ window.animated editablelabel,
 window.animated actionbar image {
     transition: color 750ms cubic-bezier(0.4, 0, 0.2, 1);
 }
+
+/* Devel builds get these. Libadwaita has that too, but we do not use it. */
+window.devel {
+	border-style: solid;
+	border-width: 3px;
+	border-color: @warning_color;
+}

data/jorts.desktop.in → data/jorts.desktop.in.in

@@ -1,11 +1,11 @@
 [Desktop Entry]
 Type=Application
 Version=1.5
-Name=Jorts
+Name=@APP_NAME@
 GenericName=Sticky notes
 Comment=Write down notes, reminders, random thoughts and other short-term informations
-Icon=io.github.elly_code.jorts
-Exec=io.github.elly_code.jorts
+Icon=@APP_ID@
+Exec=@APP_ID@
 Terminal=false
 Actions=NewNote;Preferences;
 Categories=Office;GTK;
@@ -16,9 +16,9 @@ SingleMainWindow=false
 [Desktop Action NewNote]
 Name=New sticky note
 Icon=list-add
-Exec=io.github.elly_code.jorts --new-note
+Exec=@APP_ID@ --new-note
 
 [Desktop Action Preferences]
 Name=Show Preferences
 Icon=open-menu
-Exec=io.github.elly_code.jorts --preferences
+Exec=@APP_ID@ --preferences

data/jorts.gschema.xml → data/jorts.gschema.xml.in

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <schemalist>
-  <schema path="/io/github/elly_code/jorts/" id="io.github.elly_code.jorts">
+  <schema path="/io/github/elly_code/jorts/" id="@APP_ID@">
 		<key name="scribbly-mode-active" type="b">
 			<default>false</default>
 			<summary>Change font to an illegible one</summary>

data/jorts.metainfo.xml.in → data/jorts.metainfo.xml.in.in

@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="desktop-application">
-    <id>io.github.elly_code.jorts</id>
+    <id>@APP_ID@</id>
     <metadata_license>CC0-1.0</metadata_license>
     <project_license>GPL-3.0+</project_license>
+    <launchable type="desktop-id">@APP_ID@.desktop</launchable>
 
-    <name translate="no">Jorts</name>
+    <name translate="no">@APP_NAME@</name>
     <summary>Write on colourful little squares</summary>
     <description>
         <p>Neither jeans nor shorts, just like jorts!</p>
@@ -18,7 +19,6 @@
         </ul>
         <p>This is a fork of an old version of "Notejot" by lainsce. The community liked it so much, we thought it would be great to revive it!</p>
     </description>
-    <launchable type="desktop-id">io.github.elly_code.jorts.desktop</launchable>
 
     <provides>
         <id>io.github.ellie_commons.jorts</id>
@@ -68,9 +68,6 @@
       <control>pointing</control>
       <control>touch</control>
     </recommends>
-    <custom>
-        <value key="x-appcenter-suggested-price">1</value>
-    </custom>
 
     <screenshots>
         <screenshot type="default">

data/meson.build

@@ -1,34 +1,6 @@
-#======== SETTINGS ========
-install_data (
-    'jorts.gschema.xml',
-    install_dir: get_option('datadir') / 'glib-2.0' / 'schemas',
-    rename: meson.project_name() + '.gschema.xml'
-)
-
 # metainfo confuses windows, and icons are 
 if not windows_build
 
-    #======== Internationalization ========
-    #Translate and install our .desktop file
-    i18n.merge_file(
-        input: 'jorts.desktop.in',
-        output: meson.project_name() + '.desktop',
-        po_dir: meson.project_source_root() / 'po' / 'extra',
-        type: 'desktop',
-        install: true,
-        install_dir: get_option('datadir') / 'applications'
-    )
-
-    #======== Metainfo ========
-    #Translate and install our .metainfo file
-    i18n.merge_file(
-        input: 'jorts.metainfo.xml.in',
-        output: meson.project_name() + '.metainfo.xml',
-        po_dir: meson.project_source_root() / 'po' / 'extra',
-        install: true,
-        install_dir: get_option('datadir') / 'metainfo'
-    )
-
     #======== ICONS ========
     # Install our icons in all the required sizes
     # "variant" variable has been declared earlier in the base meson
@@ -38,20 +10,93 @@ if not windows_build
         install_data(
             'icons' / variant / 'hicolor' / i + '.png',
             install_dir: get_option('datadir') / 'icons' / 'hicolor' / i + 'x' + i / 'apps',
-            rename: meson.project_name() + '.png'
+            rename: app_id + '.png'
         )
         install_data(
             'icons' / variant / 'hicolor@2' / i + '@2.png',
             install_dir: get_option('datadir') / 'icons' / 'hicolor' / i + 'x' + i + '@2' / 'apps',
-            rename: meson.project_name() + '.png'
+            rename: app_id + '.png'
         )
     endforeach
 
     install_data(
         'icons' / variant / 'scalable.svg',
         install_dir: get_option('datadir') / 'icons' / 'scalable' / 'apps',
-        rename: meson.project_name() + '.svg'
+        rename: app_id + '.svg'
+    )
+
+
+    # Inject some variables into the desktop file before merging in the translations
+    desktop_conf = configuration_data()
+    desktop_conf.set('APP_NAME', app_name)
+    desktop_conf.set('APP_ID', app_id)
+    desktop_file_in = configure_file(
+    input: 'jorts.desktop.in.in',
+    output: '@0@.desktop.in'.format(app_id),
+    configuration: desktop_conf,
+    )
+
+    desktop_file = i18n.merge_file(
+    input: desktop_file_in,
+    output: '@0@.desktop'.format(app_id),
+    po_dir: meson.project_source_root() / 'po',
+    type: 'desktop',
+    install: true,
+    install_dir: get_option('datadir') / 'applications',
+    )
+
+
+    # Inject some variables into the metainfo file before merging in the translations
+    appstream_conf = configuration_data()
+    appstream_conf.set('APP_NAME', app_name)
+    appstream_conf.set('APP_ID', app_id)
+    appstream_conf.set('GETTEXT_PACKAGE', app_id)
+    appstream_file_in = configure_file(
+        input: 'jorts.metainfo.xml.in.in',
+        output: '@0@.metainfo.xml.in'.format(app_id),
+        configuration: appstream_conf,
+    )
+
+    appstream_file = i18n.merge_file(
+        input: appstream_file_in,
+        output: '@0@.metainfo.xml'.format(app_id),
+        po_dir: meson.project_source_root() / 'po',
+        install: true,
+        install_dir: get_option('datadir') / 'metainfo',
     )
 
+
+
+    # Test definitions
+    desktop_utils = find_program('desktop-file-validate', required: false)
+    if desktop_utils.found()
+    test('Validate desktop file', desktop_utils, args: [desktop_file])
+    endif
+
+    appstreamcli = find_program('appstreamcli', required: false, disabler: true)
+    test('Validate appstream file',
+    appstreamcli,
+    args: ['validate', '--no-net', '--explain', appstream_file],
+    )
 endif
 
+
+gschema_conf = configuration_data()
+gschema_conf.set('APP_ID', app_id)
+gschema_file = configure_file(
+    input: 'jorts.gschema.xml.in',
+    output: '@0@.gschema.xml'.format(app_id),
+    configuration: gschema_conf,
+)
+
+install_data(
+    gschema_file,
+    install_dir: get_option('datadir') / 'glib-2.0' / 'schemas',
+)
+
+compile_schemas = find_program('glib-compile-schemas', required: false, disabler: true)
+test('Validate schema file',
+compile_schemas,
+args: ['--strict', '--dry-run', meson.current_source_dir()],
+)
+

io.github.elly_code.jorts.devel.yml

@@ -0,0 +1,65 @@
+#
+# This is danger
+#
+id: io.github.elly_code.jorts.devel
+# 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.jorts.devel
+
+tags: ['devel']
+desktop-file-name-prefix: '(devel)'
+
+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:
+  # Needed for the Scribbly mode
+  # It should be present by default on elementary OS, but better not assume it is the case
+  - name: RedactedScript
+    buildsystem: simple
+    build-commands:
+     - install -Dm0644 RedactedScript-Regular.ttf -t ${FLATPAK_DEST}/share/fonts
+     - install -Dm0644 OFL.txt -t ${FLATPAK_DEST}/share/doc/redacted-font
+     - install -Dm0644 AUTHORS.txt -t ${FLATPAK_DEST}/share/doc/redacted-font
+     - install -Dm0644 README.md -t ${FLATPAK_DEST}/share/doc/redacted-font
+    sources:
+      - type: file
+        url: https://github.com/christiannaths/redacted-font/raw/63e542017bab347ba9be54d7d99b99d4754c3d97/RedactedScript/fonts/ttf/RedactedScript-Regular.ttf
+        sha256: 1ebaab9642a2f43fa33f449760469903143fd1d08b2433eb6c15e28602d9360d
+      - type: file
+        url: https://raw.githubusercontent.com/christiannaths/redacted-font/284dfb0397d1911c3388f72389f08b3c13446134/OFL.txt
+        sha256: ed836da2ff14b9b2d04001057e03c0531afdd2626bf66a612b17124589f58efa
+      - type: file
+        url: https://raw.githubusercontent.com/christiannaths/redacted-font/284dfb0397d1911c3388f72389f08b3c13446134/AUTHORS.txt
+        sha256: 84977eeb6e582a6d10bea0eda40e1c6dfdc8904309c6011932a9e2632c727043
+      - type: file
+        url: https://raw.githubusercontent.com/christiannaths/redacted-font/284dfb0397d1911c3388f72389f08b3c13446134/README.md
+        sha256: e594f7f6bf03f7b11897d219184e215466cdfb9a8268b54cb7d5a626482dd722
+
+  - name: jorts
+    buildsystem: meson
+    config-opts:
+      - -Dvariant=['default']
+      - -Ddevelopment=true
+    sources:
+      - type: dir
+        path: .