Skip to content

Commit 0432a6d

Browse files
committed
fix: fix flatpak linter
also rename he app, as the flatpak linter requires it to be lower case also use a proper url schema for github projects, see https://docs.flathub.org/docs/for-app-authors/requirements/#control-over-domain-or-repository
1 parent 67d4f11 commit 0432a6d

File tree

8 files changed

+18
-14
lines changed

8 files changed

+18
-14
lines changed

.github/workflows/flatpak.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@ jobs:
2020
- uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v6
2121
with:
2222
bundle: oopetris.flatpak
23-
manifest-path: com.github.mgerhold.OOPetris.yml
23+
manifest-path: io.github.openbrickprotocolfoundation.oopetris.yml
2424
verbose: ${{ runner.debug == '1' && 'true' || 'false' }}

assets/com.github.mgerhold.OOPetris.metainfo.xml.in renamed to assets/io.github.openbrickprotocolfoundation.oopetris.metainfo.xml.in

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,15 @@
1313
</supports>
1414
<description>
1515
<p>
16-
A Tetris clone in OOP
16+
A Tetris clone in OOP. Supports multiplayer, recordings and many more features. For more information vist the github repository.
1717
</p>
1818
</description>
1919
<launchable type="desktop-id">@[email protected]</launchable>
2020
<content_rating type="oars-1.0" />
21+
<developer id="lt.totto">
22+
<name>Totto16</name>
23+
</developer>
2124
<releases>
22-
<release date="2022-03-01" version="0.0.1"/>
2325
<release version="0.5.6" date="2024-05-17">
2426
<url type="details">https://github.com/OpenBrickProtocolFoundation/oopetris/releases/tag/0.5.6</url>
2527
</release>

docs/linux.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
You just have to call these commands:
1212

13-
1413
```bash
1514
meson setup build
1615

@@ -19,14 +18,15 @@ meson compile -C build
1918
./build/oopetris # to run the executable
2019
```
2120

22-
2321
## Compiling for flatpak
2422

2523
You optionally can compile a flatpak image.
2624

2725
For that you need some additional binaries, namely the flatpak-builder, than just run:
2826

29-
<!-- WIP: that is not entirely correct -->
27+
> [!NOTE]
28+
> that is not entirely correct
29+
3030
```bash
31-
flatpak-build com.github.mgerhold.OOPetris.yml
31+
flatpak-build io.github.openbrickprotocolfoundation.oopetris.yml
3232
```

docs/releases.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ flatpak remote-add --if-not-exists oopetris-beta https://oopetris.totto.lt/repo/
3232
Than install it by using this command:
3333

3434
```bash
35-
flatpak install -v com.github.mgerhold.OOPetris
35+
flatpak install -v io.github.openbrickprotocolfoundation.oopetris
3636
```
3737

3838
To update use the normal flatpak update command, keep in mind, that the bet may be unstable and break things, use with caution!

com.github.mgerhold.OOPetris.yml renamed to io.github.openbrickprotocolfoundation.oopetris.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
app-id: com.github.mgerhold.OOPetris
1+
app-id: io.github.openbrickprotocolfoundation.oopetris
22
runtime: org.freedesktop.Platform
33
runtime-version: "24.08"
44
sdk: org.freedesktop.Sdk

src/discord/core.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ namespace constants::discord {
2626
#elif defined(__CONSOLE__)
2727
#error "Not supported"
2828
#elif defined(FLATPAK_BUILD)
29-
constexpr const char* platform_dependent_launch_arguments = "flatpak run com.github.mgerhold.OOPetris --discord";
29+
constexpr const char* platform_dependent_launch_arguments = "flatpak run io.github.openbrickprotocolfoundation.oopetris --discord";
3030
#elif defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__)
3131
constexpr const char* platform_dependent_launch_arguments = "oopetris.exe --discord";
3232
#elif defined(__APPLE__)

tools/dependencies/meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ if build_application
305305
endif
306306

307307
if is_flatpak_build
308-
app_name = 'com.github.mgerhold.OOPetris'
308+
app_name = 'io.github.openbrickprotocolfoundation.oopetris'
309309

310310
temp = core_lib.get('compile_args')
311311
temp += '-DFLATPAK_BUILD'

tools/install/meson.build

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
if build_application
22

3+
flatpak_app_name = 'io.github.openbrickprotocolfoundation.oopetris'
4+
35
## TODO: only install needed ones, since sometimes we only need e.g. flacs or mp3 and no icons etc.
46
## install assets
57
install_subdir(
@@ -8,7 +10,7 @@ if build_application
810
install_tag: 'assets',
911
exclude_files: [
1012
'oopetris.desktop.in',
11-
'com.github.mgerhold.OOPetris.metainfo.xml.in',
13+
flatpak_app_name+'.metainfo.xml.in',
1214
'OOPetris.svg',
1315
'recordings.magic',
1416
],
@@ -17,7 +19,7 @@ if build_application
1719

1820
app_name = 'oopetris'
1921
if is_flatpak_build
20-
app_name = 'com.github.mgerhold.OOPetris'
22+
app_name = flatpak_app_name
2123
endif
2224

2325
require_checks = get_option('tests')
@@ -87,7 +89,7 @@ if build_application
8789
flaptak_conf.set('APP_VERSION', meson.project_version())
8890

8991
metainfo_file = configure_file(
90-
input: meson.project_source_root() / 'assets' / 'com.github.mgerhold.OOPetris.metainfo.xml.in',
92+
input: meson.project_source_root() / 'assets' / (flatpak_app_name+'.metainfo.xml.in'),
9193
output: app_name + '.metainfo.xml',
9294
configuration: flaptak_conf,
9395
install: true,

0 commit comments

Comments
 (0)