Skip to content

Commit

Permalink
Follow flathub recommendations
Browse files Browse the repository at this point in the history
  • Loading branch information
dgmarie committed Feb 19, 2023
1 parent 5516be6 commit e4f21c3
Show file tree
Hide file tree
Showing 26 changed files with 79 additions and 82 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div align="center">

![Remembrance](data/icons/com.github.dgsasha.Remembrance.svg)
![Remembrance](data/icons/io.github.dgsasha.Remembrance.svg)
# Remembrance, a simple reminder app for Linux

This is pre-release software, expect bugs.
Expand All @@ -16,10 +16,10 @@ flatpak install flathub org.gnome.Sdk//43

## Building (Flatpak):
```
flatpak-builder --user --install --force-clean build-dir com.github.dgsasha.Remembrance.yml
flatpak-builder --user --install --force-clean build-dir io.github.dgsasha.Remembrance.yml
```
```
flatpak run com.github.dgsasha.Remembrance.Devel --restart-service
flatpak run io.github.dgsasha.Remembrance.Devel --restart-service
```

## Dependencies (generic):
Expand Down
6 changes: 3 additions & 3 deletions REMEMBRANCE_SERVICE.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Remembrance DBus Service Info, version 0.1
name: com.github.dgsasha.Remembrance.Service
interface: com.github.dgsasha.Remembrance.Service
object: /com/github/dgsasha/Remembrance/Service
name: io.github.dgsasha.Remembrance.Service
interface: io.github.dgsasha.Remembrance.Service
object: /io/github/dgsasha/Remembrance/Service

Currently this is only packaged with Remembrance and anyone who wants to use it will have to have the full Remembrance app installed. The reason this exists is to allow integrating the Remembrance app with desktop environments through extensions.

Expand Down
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<schemalist gettext-domain="@APP_EXECUTABLE@">
<enum id="com.github.dgsasha.Remembrance.TimeFormat">
<enum id="io.github.dgsasha.Remembrance.TimeFormat">
<value value="0" nick="locale"/>
<value value="1" nick="12h"/>
<value value="2" nick="24h"/>
</enum>
<enum id="com.github.dgsasha.Remembrance.SortBy">
<enum id="io.github.dgsasha.Remembrance.SortBy">
<value value="0" nick="time"/>
<value value="1" nick="title"/>
</enum>
<schema id="com.github.dgsasha.Remembrance" path="/com/github/dgsasha/remembrance/">
<key name="time-format" enum="com.github.dgsasha.Remembrance.TimeFormat">
<schema id="io.github.dgsasha.Remembrance" path="/io/github/dgsasha/remembrance/">
<key name="time-format" enum="io.github.dgsasha.Remembrance.TimeFormat">
<default>'locale'</default>
<summary>Time format</summary>
<description>What format to display the time in</description>
</key>
<key name="sort" enum="com.github.dgsasha.Remembrance.SortBy">
<key name="sort" enum="io.github.dgsasha.Remembrance.SortBy">
<default>'time'</default>
<summary>Sort by</summary>
<description>How to sort the reminders</description>
Expand Down
8 changes: 4 additions & 4 deletions data/browser/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ conf.set('APP_ID', app_id)
conf.set('BINDIR', get_option('prefix') / get_option('bindir'))

configure_file(
input: 'com.github.dgsasha.Remembrance.service.in',
input: 'io.github.dgsasha.Remembrance.service.in',
output: '@[email protected]'.format(app_id),
install: true,
install_dir: get_option('datadir') / 'dbus-1/services',
configuration: conf,
)

appstream_file = configure_file(
input: 'com.github.dgsasha.Remembrance.metainfo.xml.in.in',
input: 'io.github.dgsasha.Remembrance.metainfo.xml.in.in',
output: '@[email protected]'.format(app_id),
configuration: conf,
)
Expand All @@ -35,7 +35,7 @@ if appstreamcli.found()
endif

desktop_file = configure_file(
input: 'com.github.dgsasha.Remembrance.desktop.in.in',
input: 'io.github.dgsasha.Remembrance.desktop.in.in',
output: '@[email protected]'.format(app_id),
configuration: conf,
)
Expand All @@ -57,7 +57,7 @@ if desktop_utils.found()
endif

configure_file(
input: 'com.github.dgsasha.Remembrance.gschema.xml.in',
input: 'io.github.dgsasha.Remembrance.gschema.xml.in',
output: '@[email protected]'.format(app_id),
install: true,
install_dir: join_paths(get_option('datadir'), 'glib-2.0/schemas'),
Expand Down

This file was deleted.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 4 additions & 4 deletions data/icons/meson.build
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
dir = get_option('datadir') / 'icons/hicolor'

install_data(
'com.github.dgsasha.Remembrance.svg',
'io.github.dgsasha.Remembrance.svg',
rename: base_app_id + '.svg',
install_dir: dir / 'scalable/apps',
)

install_data(
'com.github.dgsasha.Remembrance.Devel.svg',
'io.github.dgsasha.Remembrance.Devel.svg',
rename: devel_app_id + '.svg',
install_dir: dir / 'scalable/apps',
)

install_data(
'com.github.dgsasha.Remembrance-symbolic.svg',
'io.github.dgsasha.Remembrance-symbolic.svg',
rename: base_app_id + '-symbolic.svg',
install_dir: dir / 'symbolic/apps',
)

install_data(
'com.github.dgsasha.Remembrance.Devel-symbolic.svg',
'io.github.dgsasha.Remembrance.Devel-symbolic.svg',
rename: devel_app_id + '-symbolic.svg',
install_dir: dir / 'symbolic/apps',
)
4 changes: 2 additions & 2 deletions data/service/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ conf.set('APP_ID', app_id)
conf.set('LIBEXECDIR', get_option('prefix') / get_option('libexecdir'))

desktop_file = configure_file(
input: 'com.github.dgsasha.Remembrance.Service.desktop.in.in',
input: 'io.github.dgsasha.Remembrance.Service.desktop.in.in',
output: '@[email protected]'.format(service_id),
configuration: conf,
)
Expand Down Expand Up @@ -33,7 +33,7 @@ if desktop_utils.found()
endif

configure_file(
input: 'com.github.dgsasha.Remembrance.Service.service.in',
input: 'io.github.dgsasha.Remembrance.Service.service.in',
output: '@[email protected]'.format(service_id),
install: true,
install_dir: get_option('datadir') / 'dbus-1/services',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
app-id: com.github.dgsasha.Remembrance.Devel
app-id: io.github.dgsasha.Remembrance.Devel
runtime: org.gnome.Platform
runtime-version: '43'
sdk: org.gnome.Sdk
Expand All @@ -9,10 +9,7 @@ finish-args:
- --device=dri
- --socket=wayland
- --socket=fallback-x11
- --talk-name=org.freedesktop.Notifications
- --system-talk-name=org.freedesktop.login1
- --own-name=com.github.dgsasha.Remembrance.Devel
- --own-name=com.github.dgsasha.Remembrance.Devel.Service

modules:
- name: libportal
Expand Down
4 changes: 2 additions & 2 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ service_version = '0.1'

app_executable = 'remembrance'

base_app_id = 'com.github.dgsasha.Remembrance'
base_app_id = 'io.github.dgsasha.Remembrance'
devel_app_id = base_app_id + '.Devel'

app_id = devel ? devel_app_id : base_app_id

base_path = '/com/github/dgsasha/Remembrance'
base_path = '/io/github/dgsasha/Remembrance'
path = devel ? base_path + '/Devel' : base_path

service_executable = 'remembrance-service'
Expand Down
8 changes: 4 additions & 4 deletions po/POTFILES
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# List of source files containing translatable strings.
# Please keep this file sorted alphabetically.
data/browser/com.github.dgsasha.Remembrance.desktop.in.in
data/browser/com.github.dgsasha.Remembrance.gschema.xml.in
data/browser/com.github.dgsasha.Remembrance.metainfo.xml.in.in
data/service/com.github.dgsasha.Remembrance.Service.desktop.in.in
data/browser/io.github.dgsasha.Remembrance.desktop.in.in
data/browser/io.github.dgsasha.Remembrance.gschema.xml.in
data/browser/io.github.dgsasha.Remembrance.metainfo.xml.in.in
data/service/io.github.dgsasha.Remembrance.Service.desktop.in.in
src/browser/resources/ui/main.ui
src/browser/resources/ui/preferences.ui
src/browser/resources/ui/reminder.ui
Expand Down
Loading

0 comments on commit e4f21c3

Please sign in to comment.