Skip to content

Commit

Permalink
Simplify flatpak manifest
Browse files Browse the repository at this point in the history
  • Loading branch information
kebekus committed Aug 14, 2024
1 parent 5f5c755 commit db8362a
Show file tree
Hide file tree
Showing 2 changed files with 102 additions and 102 deletions.
2 changes: 1 addition & 1 deletion packaging/flatpak/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# Configure
#

configure_file(${APP_ID}.json.in ${APP_ID}.json)
configure_file(${APP_ID}.json.in ${APP_ID}.json @ONLY)


#
Expand Down
202 changes: 101 additions & 101 deletions packaging/flatpak/de.akaflieg_freiburg.enroute.json.in
Original file line number Diff line number Diff line change
@@ -1,106 +1,106 @@
{
"app-id": "de.akaflieg_freiburg.enroute",
"runtime": "org.kde.Platform",
"runtime-version": "6.7",
"sdk": "org.kde.Sdk",
"base": "io.qt.qtwebengine.BaseApp",
"base-version": "6.7",
"command": "enroute",
"finish-args": [
"--device=dri",
"--filesystem=host",
"--share=ipc",
"--share=network",
"--socket=fallback-x11",
"--socket=pulseaudio",
"--socket=wayland",
"--system-talk-name=org.freedesktop.GeoClue2",
"--system-talk-name=org.freedesktop.NetworkManager",
"--talk-name=org.freedesktop.Notifications",
"--env=QML_IMPORT_PATH=/app/qml",
"--env=QT_PLUGIN_PATH=/app/plugins"
],
"modules": [
{
"name": "flite",
"sources": [
{
"type": "git",
"url": "https://github.com/festvox/flite.git",
"tag": "v2.2"
}
],
"buildsystem": "simple",
"build-commands": [
"./configure --prefix=/app --with-langvox=ben --with-pic",
"make",
"make get_voices",
"echo >bin/flite_time",
"make install"
]
},
{
"name": "maplibre-native-qt",
"sources": [
{
"type": "archive",
"url": "https://github.com/Akaflieg-Freiburg/enrouteDependencies/releases/download/developerBuilds/maplibre-native-qt.tar.xz",
"sha256": "57cb9eaf8939cbd9b5b7e5891ddede70eddc0f6d56d15ad5050953469b7c28cc"
}
],
"buildsystem": "cmake-ninja",
"config-opts": [
"-DCMAKE_CXX_FLAGS=-Wno-error",
"-DMLN_QT_WITH_INTERNAL_ICU=ON",
"-DBUILD_TESTING=OFF"
]
},
"app-id": "de.akaflieg_freiburg.enroute",
"runtime": "org.kde.Platform",
"runtime-version": "6.7",
"sdk": "org.kde.Sdk",
"base": "io.qt.qtwebengine.BaseApp",
"base-version": "6.7",
"command": "enroute",
"finish-args": [
"--device=dri",
"--env=QML_IMPORT_PATH=/app/qml",
"--env=QT_PLUGIN_PATH=/app/plugins",
"--filesystem=host",
"--share=ipc",
"--share=network",
"--socket=fallback-x11",
"--socket=pulseaudio",
"--socket=wayland",
"--system-talk-name=org.freedesktop.GeoClue2",
"--system-talk-name=org.freedesktop.NetworkManager",
"--talk-name=org.freedesktop.Notifications"
],
"modules": [
{
"name": "flite",
"sources": [
{
"name": "libzip",
"sources": [
{
"type": "git",
"url": "https://github.com/nih-at/libzip",
"commit": "00259560701600e0830002e9273c6c9097be3719"
}
],
"buildsystem": "cmake-ninja"
},
"type": "git",
"url": "https://github.com/festvox/flite.git",
"tag": "v2.2"
}
],
"buildsystem": "simple",
"build-commands": [
"./configure --prefix=/app --with-langvox=ben --with-pic",
"make",
"make get_voices",
"echo >bin/flite_time",
"make install"
]
},
{
"name": "maplibre-native-qt",
"sources": [
{
"type": "archive",
"url": "https://github.com/Akaflieg-Freiburg/enrouteDependencies/releases/download/developerBuilds/maplibre-native-qt.tar.xz",
"sha256": "57cb9eaf8939cbd9b5b7e5891ddede70eddc0f6d56d15ad5050953469b7c28cc"
}
],
"buildsystem": "cmake-ninja",
"config-opts": [
"-DCMAKE_CXX_FLAGS=-Wno-error",
"-DMLN_QT_WITH_INTERNAL_ICU=ON",
"-DBUILD_TESTING=OFF"
]
},
{
"name": "libzip",
"sources": [
{
"name": "qthttpserver",
"sources": [
{
"type": "git",
"url": "https://github.com/qt/qthttpserver.git",
"tag": "v${Qt6_VERSION}"
}
],
"buildsystem": "cmake-ninja"
},
{
"name": "symlink",
"buildsystem": "simple",
"build-commands": [
"ln -sr ${FLATPAK_DEST}/lib/${FLATPAK_ARCH}-linux-gnu/libQt6HttpServer*.so* -t ${FLATPAK_DEST}/lib/"
]
},
"type": "git",
"url": "https://github.com/nih-at/libzip",
"commit": "00259560701600e0830002e9273c6c9097be3719"
}
],
"buildsystem": "cmake-ninja"
},
{
"name": "qthttpserver",
"sources": [
{
"type": "git",
"url": "https://github.com/qt/qthttpserver.git",
"tag": "v@Qt6_VERSION@"
}
],
"buildsystem": "cmake-ninja"
},
{
"name": "symlink",
"buildsystem": "simple",
"build-commands": [
"ln -sr ${FLATPAK_DEST}/lib/${FLATPAK_ARCH}-linux-gnu/libQt6HttpServer*.so* -t ${FLATPAK_DEST}/lib/"
]
},
{
"name": "enroute",
"buildsystem": "cmake-ninja",
"config-opts": [
"-DCMAKE_BUILD_TYPE=RelWithDebInfo"
],
"sources": [
{
"name": "enroute",
"buildsystem": "cmake-ninja",
"config-opts": [
"-DCMAKE_BUILD_TYPE=RelWithDebInfo"
],
"sources": [
{
"type": "git",
"url": "https://github.com/Akaflieg-Freiburg/enroute.git",
"commit": "${GIT_COMMIT}"
}
],
"post-install": [
"mkdir -p /app/usr/share/icons",
"cp /app/share/icons/hicolor/scalable/apps/de.akaflieg_freiburg.enroute.svg /app/usr/share/icons/de.akaflieg_freiburg.enroute.svg"
]
"type": "git",
"url": "https://github.com/Akaflieg-Freiburg/enroute.git",
"commit": "@GIT_COMMIT@"
}
]
}
],
"post-install": [
"mkdir -p /app/usr/share/icons",
"cp /app/share/icons/hicolor/scalable/apps/de.akaflieg_freiburg.enroute.svg /app/usr/share/icons/de.akaflieg_freiburg.enroute.svg"
]
}
]
}

0 comments on commit db8362a

Please sign in to comment.