Skip to content

Commit

Permalink
Avoid flatpak warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
@kebekus
kebekus committed Jul 11, 2024
1 parent 11471dc commit 62ceb1f
Show file tree
Hide file tree
Showing 3 changed files with 147 additions and 142 deletions.
20 changes: 10 additions & 10 deletions metadata/de.akaflieg_freiburg.cavok.add_hours_and_minutes.appdata.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
<name xml:lang="fr">Calculer avec des temps</name>
<name xml:lang="it">Calcolo con i tempi</name>
<name xml:lang="pl">Dodaj czasy</name>
<summary>Simple calculator for adding hours and minutes</summary>
<summary xml:lang="de">Einfacher Rechner zum Addieren von Stunden und Minuten</summary>
<summary xml:lang="es">Calculadora sencilla para sumar horas y minutos</summary>
<summary xml:lang="fr">Calculatrice simple pour additionner les heures et les minutes</summary>
<summary xml:lang="it">Semplice calcolatrice per aggiungere ore e minuti</summary>
<summary xml:lang="pl">Prosty kalkulator do zliczania godzin i minut</summary>
<summary>Calculator for adding hours and minutes</summary>
<summary xml:lang="de">Rechner zum Addieren von Stunden und Minuten</summary>
<summary xml:lang="es">Calculadora para sumar horas y minutos</summary>
<summary xml:lang="fr">Calculatrice pour additionner les heures et les minutes</summary>
<summary xml:lang="it">Calcolatrice per aggiungere ore e minuti</summary>
<summary xml:lang="pl">Kalkulator do zliczania godzin i minut</summary>
<description>
<p>This calculator adds times given in hours and minutes. It helps with the
recording of machine running times, with the addition of flight times for
Expand Down Expand Up @@ -44,11 +44,12 @@
<releases>
<release version="${PROJECT_VERSION}" date="${GIT_DATE}"/>
</releases>
<developer_name>
Akaflieg Freiburg
</developer_name>
<developer id="de.akaflieg-freiburg">
<name>Akaflieg Freiburg</name>
</developer>
<screenshots>
<screenshot type="default">
<caption>Calculator in Action</caption>
<image type="source">https://akaflieg-freiburg.github.io/addhoursandminutes/assets/images/screenshot-linux.png</image>
</screenshot>
</screenshots>
Expand All @@ -64,6 +65,5 @@
</provides>
<custom>
<value key="Purism::form_factor">workstation</value>
<value key="Purism::form_factor">mobile</value>
</custom>
</component>
13 changes: 10 additions & 3 deletions packaging/flatpak/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,9 @@

configure_file(${APP_ID}.json ${APP_ID}.json)


#
# Sample build
#

add_custom_target(flatpak-binary
COMMAND rm -rf flatpakBuildDirectory .flatpak-builder
COMMAND flatpak-builder flatpakBuildDirectory de.akaflieg_freiburg.cavok.add_hours_and_minutes.json
Expand All @@ -23,11 +21,20 @@ add_custom_target(flatpak-binary
COMMENT "Generating flatpak binary"
)

#
# Run linter on sample build
#
add_custom_target(flatpak-lint
COMMAND flatpak run --command=flatpak-builder-lint org.flatpak.Builder manifest de.akaflieg_freiburg.cavok.add_hours_and_minutes.json
COMMAND flatpak run --command=flatpak-builder-lint org.flatpak.Builder appstream ../../metadata/de.akaflieg_freiburg.cavok.add_hours_and_minutes.appdata.xml
COMMAND flatpak run --command=flatpak-builder-lint org.flatpak.Builder builddir flatpakBuildDirectory
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
COMMENT "Linting flatpak build"
)

#
# Publication
#

add_custom_target(flatpak-publish
COMMAND rm -rf de.akaflieg_freiburg.cavok.add_hours_and_minutes
COMMAND git clone --depth 1 --branch upstream [email protected]:flathub/de.akaflieg_freiburg.cavok.add_hours_and_minutes.git
Expand Down
256 changes: 127 additions & 129 deletions packaging/flatpak/de.akaflieg_freiburg.cavok.add_hours_and_minutes.json
View file
Original file line number Diff line number Diff line change
@@ -1,137 +1,135 @@
{
"app-id": "${APP_ID}",
"runtime": "org.freedesktop.Platform",
"runtime-version": "23.08",
"sdk": "org.freedesktop.Sdk",
"command": "addhoursandminutes",
"finish-args": [
"--share=ipc",
"--socket=x11",
"--socket=wayland",
"--device=dri"
],
"cleanup": [
"/app/qtTemporary",
"/qtTemporary"
],
"modules": [
"app-id": "${APP_ID}",
"runtime": "org.freedesktop.Platform",
"runtime-version": "23.08",
"sdk": "org.freedesktop.Sdk",
"command": "addhoursandminutes",
"finish-args": [
"--share=ipc",
"--socket=x11",
"--device=dri"
],
"cleanup": [
"/app/qtTemporary",
"/qtTemporary"
],
"modules": [
{
"name": "qtbase",
"sources": [
{
"name": "qtbase",
"sources": [
{
"type": "git",
"url": "https://github.com/qt/qtbase.git",
"tag": "v${Qt6_VERSION}"
}
],
"buildsystem": "cmake-ninja",
"config-opts": [
"-DCMAKE_BUILD_TYPE=Release",
"-DCMAKE_INSTALL_PREFIX:PATH=/app/qtTemporary",
"-DQT_BUILD_EXAMPLES_BY_DEFAULT=OFF",
"-DQT_BUILD_TESTS_BY_DEFAULT=OFF"
]
},
"type": "git",
"url": "https://github.com/qt/qtbase.git",
"tag": "v${Qt6_VERSION}"
}
],
"buildsystem": "cmake-ninja",
"config-opts": [
"-DCMAKE_BUILD_TYPE=Release",
"-DCMAKE_INSTALL_PREFIX:PATH=/app/qtTemporary",
"-DQT_BUILD_EXAMPLES_BY_DEFAULT=OFF",
"-DQT_BUILD_TESTS_BY_DEFAULT=OFF"
]
},
{
"name": "qtsvg",
"sources": [
{
"name": "qtsvg",
"sources": [
{
"type": "git",
"url": "https://github.com/qt/qtsvg.git",
"tag": "v${Qt6_VERSION}"
}
],
"buildsystem": "cmake-ninja",
"config-opts": [
"-DCMAKE_BUILD_TYPE:STRING=Release",
"-DCMAKE_FIND_ROOT_PATH:PATH=/app/qtTemporary",
"-DCMAKE_INSTALL_PREFIX:PATH=/app/qtTemporary"
]
},
"type": "git",
"url": "https://github.com/qt/qtsvg.git",
"tag": "v${Qt6_VERSION}"
}
],
"buildsystem": "cmake-ninja",
"config-opts": [
"-DCMAKE_BUILD_TYPE:STRING=Release",
"-DCMAKE_FIND_ROOT_PATH:PATH=/app/qtTemporary",
"-DCMAKE_INSTALL_PREFIX:PATH=/app/qtTemporary"
]
},
{
"name": "qttools",
"sources": [
{
"name": "qttools",
"sources": [
{
"type": "git",
"url": "https://github.com/qt/qttools.git",
"tag": "v${Qt6_VERSION}"
}
],
"buildsystem": "cmake-ninja",
"config-opts": [
"-DCMAKE_BUILD_TYPE:STRING=Release",
"-DCMAKE_FIND_ROOT_PATH:PATH=/app/qtTemporary",
"-DCMAKE_INSTALL_PREFIX:PATH=/app/qtTemporary",
"-DQT_BUILD_EXAMPLES_BY_DEFAULT=OFF",
"-DQT_BUILD_TESTS_BY_DEFAULT=OFF",
"-DFEATURE_assistant=ON",
"-DFEATURE_clang=OFF",
"-DFEATURE_clangcpp=OFF",
"-DFEATURE_designer=ON",
"-DFEATURE_distancefieldgenerator=OFF",
"-DFEATURE_kmap2qmap=OFF",
"-DFEATURE_macdeployqt=OFF",
"-DFEATURE_pixeltool=OFF",
"-DFEATURE_pkg_config=OFF",
"-DFEATURE_qdbus=OFF",
"-DFEATURE_qev=OFF",
"-DFEATURE_qtattributionsscanner=OFF",
"-DFEATURE_qtdiag=OFF",
"-DFEATURE_qtplugininfo=OFF",
"-DFEATURE_windeployqt=OFF"
]
},
"type": "git",
"url": "https://github.com/qt/qttools.git",
"tag": "v${Qt6_VERSION}"
}
],
"buildsystem": "cmake-ninja",
"config-opts": [
"-DCMAKE_BUILD_TYPE:STRING=Release",
"-DCMAKE_FIND_ROOT_PATH:PATH=/app/qtTemporary",
"-DCMAKE_INSTALL_PREFIX:PATH=/app/qtTemporary",
"-DQT_BUILD_EXAMPLES_BY_DEFAULT=OFF",
"-DQT_BUILD_TESTS_BY_DEFAULT=OFF",
"-DFEATURE_assistant=ON",
"-DFEATURE_clang=OFF",
"-DFEATURE_clangcpp=OFF",
"-DFEATURE_designer=ON",
"-DFEATURE_distancefieldgenerator=OFF",
"-DFEATURE_kmap2qmap=OFF",
"-DFEATURE_macdeployqt=OFF",
"-DFEATURE_pixeltool=OFF",
"-DFEATURE_pkg_config=OFF",
"-DFEATURE_qdbus=OFF",
"-DFEATURE_qev=OFF",
"-DFEATURE_qtattributionsscanner=OFF",
"-DFEATURE_qtdiag=OFF",
"-DFEATURE_qtplugininfo=OFF",
"-DFEATURE_windeployqt=OFF"
]
},
{
"name": "qtshadertools",
"sources": [
{
"name": "qtshadertools",
"sources": [
{
"type": "git",
"url": "https://github.com/qt/qtshadertools.git",
"tag": "v${Qt6_VERSION}"
}
],
"buildsystem": "cmake-ninja",
"config-opts": [
"-DCMAKE_BUILD_TYPE:STRING=Release",
"-DCMAKE_FIND_ROOT_PATH:PATH=/app/qtTemporary",
"-DCMAKE_INSTALL_PREFIX:PATH=/app/qtTemporary"

]
},
"type": "git",
"url": "https://github.com/qt/qtshadertools.git",
"tag": "v${Qt6_VERSION}"
}
],
"buildsystem": "cmake-ninja",
"config-opts": [
"-DCMAKE_BUILD_TYPE:STRING=Release",
"-DCMAKE_FIND_ROOT_PATH:PATH=/app/qtTemporary",
"-DCMAKE_INSTALL_PREFIX:PATH=/app/qtTemporary"
]
},
{
"name": "qtdeclarative",
"sources": [
{
"name": "qtdeclarative",
"sources": [
{
"type": "git",
"url": "https://github.com/qt/qtdeclarative.git",
"tag": "v${Qt6_VERSION}"
}
],
"buildsystem": "cmake-ninja",
"config-opts": [
"-DCMAKE_BUILD_TYPE:STRING=Release",
"-DCMAKE_FIND_ROOT_PATH:PATH=/app/qtTemporary",
"-DCMAKE_INSTALL_PREFIX:PATH=/app/qtTemporary",
"-DFEATURE_qml_debug=OFF",
"-DQT_BUILD_EXAMPLES_BY_DEFAULT=OFF",
"-DQT_BUILD_TESTS_BY_DEFAULT=OFF"
]
},
"type": "git",
"url": "https://github.com/qt/qtdeclarative.git",
"tag": "v${Qt6_VERSION}"
}
],
"buildsystem": "cmake-ninja",
"config-opts": [
"-DCMAKE_BUILD_TYPE:STRING=Release",
"-DCMAKE_FIND_ROOT_PATH:PATH=/app/qtTemporary",
"-DCMAKE_INSTALL_PREFIX:PATH=/app/qtTemporary",
"-DFEATURE_qml_debug=OFF",
"-DQT_BUILD_EXAMPLES_BY_DEFAULT=OFF",
"-DQT_BUILD_TESTS_BY_DEFAULT=OFF"
]
},
{
"name": "addHoursAndMinutes",
"buildsystem": "cmake-ninja",
"sources": [
{
"name": "addHoursAndMinutes",
"buildsystem": "cmake-ninja",
"sources": [
{
"type": "git",
"url": "https://github.com/Akaflieg-Freiburg/addhoursandminutes.git",
"commit": "${GIT_COMMIT}"
}
],
"buildsystem": "cmake-ninja",
"config-opts": [
"-DCMAKE_BUILD_TYPE:STRING=Release",
"-DCMAKE_FIND_ROOT_PATH:PATH=/app/qtTemporary"
]
"type": "git",
"url": "https://github.com/Akaflieg-Freiburg/addhoursandminutes.git",
"commit": "${GIT_COMMIT}"
}
]
}
],
"buildsystem": "cmake-ninja",
"config-opts": [
"-DCMAKE_BUILD_TYPE:STRING=Release",
"-DCMAKE_FIND_ROOT_PATH:PATH=/app/qtTemporary"
]
}
]
}

0 comments on commit 62ceb1f

Please sign in to comment.