From 81020b31a2684c132b6bbb84fafa6e4e9132e1d9 Mon Sep 17 00:00:00 2001 From: Joshua Goins Date: Tue, 19 Dec 2023 20:44:32 -0500 Subject: [PATCH] Update Flatpak manifest, add required manifests for KF6 --- flatpak/kf6.json | 615 +++++++++++++++++++++++++++ flatpak/kf6.json.license | 3 + flatpak/kirigami-addons.json | 12 + flatpak/kirigami-addons.json.license | 4 + zone.xiv.astra.yml | 78 +++- 5 files changed, 699 insertions(+), 13 deletions(-) create mode 100644 flatpak/kf6.json create mode 100644 flatpak/kf6.json.license create mode 100644 flatpak/kirigami-addons.json create mode 100644 flatpak/kirigami-addons.json.license diff --git a/flatpak/kf6.json b/flatpak/kf6.json new file mode 100644 index 0000000..b13acc1 --- /dev/null +++ b/flatpak/kf6.json @@ -0,0 +1,615 @@ +{ + "name" : "kf6", + "cleanup": [ + "/include", + "*.a", + "/share/wallpapers", + "/bin" + ], + "modules" : [ + { + "buildsystem" : "cmake-ninja", + "name" : "extra-cmake-modules", + "sources" : [ + { + "branch" : "master", + "type" : "git", + "url" : "https://invent.kde.org/frameworks/extra-cmake-modules.git" + } + ] + }, + { + "builddir" : true, + "buildsystem" : "cmake-ninja", + "config-opts" : [ + "-DBUILD_TESTING=OFF" + ], + "name" : "kirigami", + "sources" : [ + { + "branch" : "master", + "type" : "git", + "url" : "https://invent.kde.org/frameworks/kirigami.git" + } + ] + }, + { + "builddir" : true, + "buildsystem" : "cmake-ninja", + "config-opts" : [ + "-DBUILD_TESTING=OFF" + ], + "name" : "ki18n", + "sources" : [ + { + "branch" : "master", + "type" : "git", + "url" : "https://invent.kde.org/frameworks/ki18n.git" + } + ] + }, + { + "builddir" : true, + "buildsystem" : "cmake-ninja", + "config-opts" : [ + "-DBUILD_TESTING=OFF" + ], + "name" : "kcoreaddons", + "sources" : [ + { + "branch" : "master", + "type" : "git", + "url" : "https://invent.kde.org/frameworks/kcoreaddons.git" + } + ] + }, + { + "builddir" : true, + "buildsystem" : "cmake-ninja", + "config-opts" : [ + "-DBUILD_TESTING=OFF" + ], + "name" : "karchive", + "sources" : [ + { + "branch" : "master", + "type" : "git", + "url" : "https://invent.kde.org/frameworks/karchive.git" + } + ] + }, + { + "builddir" : true, + "buildsystem" : "cmake-ninja", + "config-opts" : [ + "-DBUILD_TESTING=OFF" + ], + "name" : "kcodecs", + "sources" : [ + { + "branch" : "master", + "type" : "git", + "url" : "https://invent.kde.org/frameworks/kcodecs.git" + } + ] + }, + { + "builddir" : true, + "buildsystem" : "cmake-ninja", + "config-opts" : [ + "-DBUILD_TESTING=OFF" + ], + "name" : "kcrash", + "sources" : [ + { + "branch" : "master", + "type" : "git", + "url" : "https://invent.kde.org/frameworks/kcrash.git" + } + ] + }, + { + "builddir" : true, + "buildsystem" : "cmake-ninja", + "config-opts" : [ + "-DBUILD_TESTING=OFF" + ], + "name" : "plasma-wayland-protocols", + "sources" : [ + { + "branch" : "master", + "type" : "git", + "url" : "https://invent.kde.org/libraries/plasma-wayland-protocols.git" + } + ] + }, + { + "builddir" : true, + "buildsystem" : "cmake-ninja", + "config-opts" : [ + "-DBUILD_TESTING=OFF" + ], + "name" : "kwindowsystem", + "sources" : [ + { + "branch" : "master", + "type" : "git", + "url" : "https://invent.kde.org/frameworks/kwindowsystem.git" + } + ] + }, + { + "builddir" : true, + "buildsystem" : "cmake-ninja", + "config-opts" : [ + "-DBUILD_TESTING=OFF" + ], + "name" : "kguiaddons", + "sources" : [ + { + "branch" : "master", + "type" : "git", + "url" : "https://invent.kde.org/frameworks/kguiaddons.git" + } + ] + }, + { + "builddir" : true, + "buildsystem" : "cmake-ninja", + "config-opts" : [ + "-DBUILD_TESTING=OFF" + ], + "name" : "kconfig", + "sources" : [ + { + "branch" : "master", + "type" : "git", + "url" : "https://invent.kde.org/frameworks/kconfig.git" + } + ] + }, + { + "builddir" : true, + "buildsystem" : "cmake-ninja", + "config-opts" : [ + "-DBUILD_TESTING=OFF" + ], + "name" : "kwidgetsaddons", + "sources" : [ + { + "branch" : "master", + "type" : "git", + "url" : "https://invent.kde.org/frameworks/kwidgetsaddons.git" + } + ] + }, + { + "builddir" : true, + "buildsystem" : "cmake-ninja", + "config-opts" : [ + "-DBUILD_TESTING=OFF" + ], + "name" : "kcolorscheme", + "sources" : [ + { + "branch" : "master", + "type" : "git", + "url" : "https://invent.kde.org/frameworks/kcolorscheme.git" + } + ] + }, + { + "builddir" : true, + "buildsystem" : "cmake-ninja", + "config-opts" : [ + "-DBUILD_TESTING=OFF" + ], + "name" : "kconfigwidgets", + "sources" : [ + { + "branch" : "master", + "type" : "git", + "url" : "https://invent.kde.org/frameworks/kconfigwidgets.git" + } + ] + }, + { + "builddir" : true, + "buildsystem" : "cmake-ninja", + "config-opts" : [ + "-DBUILD_TESTING=OFF" + ], + "name" : "kiconthemes", + "sources" : [ + { + "branch" : "master", + "type" : "git", + "url" : "https://invent.kde.org/frameworks/kiconthemes.git" + } + ] + }, + { + "builddir" : true, + "buildsystem" : "cmake-ninja", + "config-opts" : [ + "-DBUILD_TESTING=OFF" + ], + "name" : "breeze-icons", + "sources" : [ + { + "branch" : "master", + "type" : "git", + "url" : "https://invent.kde.org/frameworks/breeze-icons.git" + } + ] + }, + { + "builddir" : true, + "buildsystem" : "cmake-ninja", + "config-opts" : [ + "-DBUILD_TESTING=OFF" + ], + "name" : "kdecoration", + "sources" : [ + { + "branch" : "master", + "type" : "git", + "url" : "https://invent.kde.org/plasma/kdecoration.git" + } + ] + }, + { + "build-commands" : [ + "./bootstrap.sh --prefix=${FLATPAK_DEST} --with-libraries=headers", + "./b2 -j ${FLATPAK_BUILDER_N_JOBS} headers", + "./b2 -j ${FLATPAK_BUILDER_N_JOBS} install --layout=system" + ], + "buildsystem" : "simple", + "name" : "boost", + "sources" : [ + { + "sha256" : "0c6049764e80aa32754acd7d4f179fd5551d8172a83b71532ae093e7384e98da", + "type" : "archive", + "url" : "https://github.com/boostorg/boost/releases/download/boost-1.83.0/boost-1.83.0.tar.gz", + "x-checker-data" : { + "project-id" : 6845, + "stable-only" : true, + "type" : "anitya", + "url-template" : "https://github.com/boostorg/boost/releases/download/boost-$version/boost-$version.tar.gz" + } + } + ] + }, + { + "builddir" : true, + "buildsystem" : "cmake-ninja", + "config-opts" : [ + "-DBUILD_TESTING=OFF" + ], + "name" : "kactivities", + "sources" : [ + { + "branch" : "master", + "type" : "git", + "url" : "https://invent.kde.org/frameworks/kactivities.git" + } + ] + }, + { + "builddir" : true, + "buildsystem" : "cmake-ninja", + "config-opts" : [ + "-DBUILD_TESTING=OFF" + ], + "name" : "kservice", + "sources" : [ + { + "branch" : "master", + "type" : "git", + "url" : "https://invent.kde.org/frameworks/kservice.git" + } + ] + }, + { + "builddir" : true, + "buildsystem" : "cmake-ninja", + "config-opts" : [ + "-DBUILD_TESTING=OFF" + ], + "name" : "solid", + "sources" : [ + { + "branch" : "master", + "type" : "git", + "url" : "https://invent.kde.org/frameworks/solid.git" + } + ] + }, + { + "builddir" : true, + "buildsystem" : "cmake-ninja", + "config-opts" : [ + "-DBUILD_TESTING=OFF" + ], + "name" : "kdbusaddons", + "sources" : [ + { + "branch" : "master", + "type" : "git", + "url" : "https://invent.kde.org/frameworks/kdbusaddons.git" + } + ] + }, + { + "builddir" : true, + "buildsystem" : "cmake-ninja", + "config-opts" : [ + "-DBUILD_TESTING=OFF" + ], + "name" : "kbookmarks", + "sources" : [ + { + "branch" : "master", + "type" : "git", + "url" : "https://invent.kde.org/frameworks/kbookmarks.git" + } + ] + }, + { + "builddir" : true, + "buildsystem" : "cmake-ninja", + "config-opts" : [ + "-DBUILD_TESTING=OFF" + ], + "name" : "kcompletion", + "sources" : [ + { + "branch" : "master", + "type" : "git", + "url" : "https://invent.kde.org/frameworks/kcompletion.git" + } + ] + }, + { + "builddir" : true, + "buildsystem" : "cmake-ninja", + "config-opts" : [ + "-DBUILD_TESTING=OFF" + ], + "name" : "kitemviews", + "sources" : [ + { + "branch" : "master", + "type" : "git", + "url" : "https://invent.kde.org/frameworks/kitemviews.git" + } + ] + }, + { + "name" : "canberra", + "sources" : [ + { + "tag" : "master", + "type" : "git", + "url" : "git://git.0pointer.net/libcanberra.git" + } + ] + }, + { + "builddir" : true, + "buildsystem" : "cmake-ninja", + "config-opts" : [ + "-DBUILD_TESTING=OFF" + ], + "name" : "knotifications", + "sources" : [ + { + "branch" : "master", + "type" : "git", + "url" : "https://invent.kde.org/frameworks/knotifications.git" + } + ] + }, + { + "builddir" : true, + "buildsystem" : "cmake-ninja", + "config-opts" : [ + "-DBUILD_TESTING=OFF" + ], + "name" : "kjobwidgets", + "sources" : [ + { + "branch" : "master", + "type" : "git", + "url" : "https://invent.kde.org/frameworks/kjobwidgets.git" + } + ] + }, + { + "builddir" : true, + "buildsystem" : "cmake-ninja", + "config-opts" : [ + "-DBUILD_TESTING=OFF" + ], + "name" : "kauth", + "sources" : [ + { + "branch" : "master", + "type" : "git", + "url" : "https://invent.kde.org/frameworks/kauth.git" + } + ] + }, + { + "builddir" : true, + "buildsystem" : "cmake-ninja", + "config-opts" : [ + "-DBUILD_TESTING=OFF" + ], + "name" : "kio", + "sources" : [ + { + "branch" : "master", + "type" : "git", + "url" : "https://invent.kde.org/frameworks/kio.git" + } + ] + }, + { + "builddir" : true, + "buildsystem" : "cmake-ninja", + "config-opts" : [ + "-DBUILD_TESTING=OFF" + ], + "name" : "kglobalaccel", + "sources" : [ + { + "branch" : "master", + "type" : "git", + "url" : "https://invent.kde.org/frameworks/kglobalaccel.git" + } + ] + }, + { + "builddir" : true, + "buildsystem" : "cmake-ninja", + "config-opts" : [ + "-DBUILD_TESTING=OFF" + ], + "name" : "kxmlgui", + "sources" : [ + { + "branch" : "master", + "type" : "git", + "url" : "https://invent.kde.org/frameworks/kxmlgui.git" + } + ] + }, + { + "builddir" : true, + "buildsystem" : "cmake-ninja", + "config-opts" : [ + "-DBUILD_TESTING=OFF" + ], + "name" : "kcmutils", + "sources" : [ + { + "branch" : "master", + "type" : "git", + "url" : "https://invent.kde.org/frameworks/kcmutils.git" + } + ] + }, + { + "builddir" : true, + "buildsystem" : "cmake-ninja", + "config-opts" : [ + "-DBUILD_TESTING=OFF" + ], + "name" : "kitemmodels", + "sources" : [ + { + "branch" : "master", + "type" : "git", + "url" : "https://invent.kde.org/frameworks/kitemmodels.git" + } + ] + }, + { + "builddir" : true, + "buildsystem" : "cmake-ninja", + "config-opts" : [ + "-DBUILD_TESTING=OFF", + "-DBUILD_QT6=ON", + "-DBUILD_QT5=OFF" + ], + "name" : "breeze", + "sources" : [ + { + "branch" : "master", + "type" : "git", + "url" : "https://invent.kde.org/plasma/breeze.git" + } + ] + }, + { + "builddir" : true, + "buildsystem" : "cmake-ninja", + "config-opts" : [ + "-DBUILD_TESTING=OFF" + ], + "name" : "purpose", + "sources" : [ + { + "branch" : "master", + "type" : "git", + "url" : "https://invent.kde.org/frameworks/purpose.git" + } + ] + }, + { + "builddir" : true, + "buildsystem" : "cmake-ninja", + "config-opts" : [ + "-DBUILD_TESTING=OFF", + "-DBUILD_QT5=OFF" + ], + "name" : "kstatusnotifieritem", + "sources" : [ + { + "branch" : "master", + "type" : "git", + "url" : "https://invent.kde.org/frameworks/kstatusnotifieritem.git" + } + ] + }, + { + "builddir" : true, + "buildsystem" : "cmake-ninja", + "config-opts" : [ + "-DBUILD_TESTING=OFF", + "-DBUILD_QT5=OFF" + ], + "name" : "sonnet", + "sources" : [ + { + "branch" : "master", + "type" : "git", + "url" : "https://invent.kde.org/frameworks/sonnet.git" + } + ] + }, + { + "builddir" : true, + "buildsystem" : "cmake-ninja", + "config-opts" : [ + "-DBUILD_TESTING=OFF", + "-DBUILD_QT5=OFF" + ], + "name" : "qqc2-desktop-style", + "sources" : [ + { + "branch" : "master", + "type" : "git", + "url" : "https://invent.kde.org/frameworks/qqc2-desktop-style.git" + } + ] + }, + { + "builddir" : true, + "buildsystem" : "cmake-ninja", + "config-opts" : [ + "-DBUILD_TESTING=OFF", + "-DBUILD_QT5=OFF" + ], + "name" : "plasma-integration", + "sources" : [ + { + "branch" : "master", + "type" : "git", + "url" : "https://invent.kde.org/plasma/plasma-integration.git" + } + ] + } + ] +} diff --git a/flatpak/kf6.json.license b/flatpak/kf6.json.license new file mode 100644 index 0000000..3e3dd4b --- /dev/null +++ b/flatpak/kf6.json.license @@ -0,0 +1,3 @@ +SPDX-FileCopyrightText: 2023 Jonah Brüchert + +SPDX-License-Identifier: CC0-1.0 diff --git a/flatpak/kirigami-addons.json b/flatpak/kirigami-addons.json new file mode 100644 index 0000000..a485cf3 --- /dev/null +++ b/flatpak/kirigami-addons.json @@ -0,0 +1,12 @@ +{ + "name": "kirigami-addons", + "config-opts": [ + "-DBUILD_TESTING=OFF", + "-DCMAKE_BUILD_TYPE=Release", + "-DQT_MAJOR_VERSION=6" + ], + "buildsystem": "cmake-ninja", + "sources": [ + { "type": "git", "url": "https://invent.kde.org/libraries/kirigami-addons.git", "branch": "master" } + ] +} diff --git a/flatpak/kirigami-addons.json.license b/flatpak/kirigami-addons.json.license new file mode 100644 index 0000000..9cf7474 --- /dev/null +++ b/flatpak/kirigami-addons.json.license @@ -0,0 +1,4 @@ +SPDX-FileCopyrightText: 2022 Jonah Brüchert + +SPDX-License-Identifier: CC0-1.0 + diff --git a/zone.xiv.astra.yml b/zone.xiv.astra.yml index 92baf8d..b5904b4 100644 --- a/zone.xiv.astra.yml +++ b/zone.xiv.astra.yml @@ -1,6 +1,6 @@ app-id: zone.xiv.astra runtime: org.kde.Platform -runtime-version: '5.15-22.08' +runtime-version: '6.6' sdk: org.kde.Sdk sdk-extensions: - org.freedesktop.Sdk.Extension.rust-stable @@ -18,16 +18,37 @@ finish-args: - --share=network - --socket=pulseaudio modules: + - flatpak/kf6.json + - flatpak/kirigami-addons.json - name: unshield buildsystem: cmake-ninja sources: - type: git url: https://github.com/twogood/unshield.git branch: main + - name: unshield + buildsystem: meson + config-opts: + - -Dmanpage=false + - -Dvapi=false + - -Dgtk_doc=false + - -Dintrospection=false + - -Dgcrypt=false + sources: + - type: archive + url: https://download.gnome.org/sources/libsecret/0.20/libsecret-0.20.5.tar.xz + sha256: 3fb3ce340fcd7db54d87c893e69bfc2b1f6e4d4b279065ffe66dac9f0fd12b4d + x-checker-data: + - type: gnome + - name: libsecret + - stable-only: true - name: qtkeychain buildsystem: cmake-ninja config-opts: - - -DLIBSECRET_SUPPORT=OFF + - -DBUILD_WITH_QT6=ON + - -DCMAKE_INSTALL_LIBDIR=/app/lib + - -DLIB_INSTALL_DIR=/app/lib + - -DBUILD_TRANSLATIONS=NO sources: - type: git url: https://github.com/frankosterfeld/qtkeychain.git @@ -37,20 +58,51 @@ modules: sources: - type: git url: https://github.com/stachenov/quazip.git - - name: kirigami-addons - config-opts: - - -DBUILD_TESTING=OFF - - -DCMAKE_BUILD_TYPE=RelWithDebInfo + #- name: icon + # buildsystem: simple + # build-commands: + # - mkdir -p /app/share/icons/hicolor/32x32/apps/ + # - install -D /usr/share/icons/breeze/mimetypes/64/none.svg /app/share/icons/hicolor/32x32/apps/zone.xiv.astra.svg + - name: qcoro buildsystem: cmake-ninja + config-optios: + - -DQCORO_BUILD_EXAMPLES=OFF + - -DBUILD_TESTING=OFF sources: - type: archive - url: https://download.kde.org/stable/kirigami-addons/kirigami-addons-0.10.0.tar.xz - sha256: 9897e70bf167f579cec06d09d49a9a27aba184cbd1b2fce2c3ae757a87b01216 - - name: icon - buildsystem: simple - build-commands: - - mkdir -p /app/share/icons/hicolor/32x32/apps/ - - install -D /usr/share/icons/breeze/mimetypes/64/none.svg /app/share/icons/hicolor/32x32/apps/zone.xiv.astra.svg + url: https://github.com/danvratil/qcoro/archive/refs/tags/v0.7.0.tar.gz + sha256: 23ef0217926e67c8d2eb861cf91617da2f7d8d5a9ae6c62321b21448b1669210 + x-checker-data: + - type: anitya + project-id: 236236 + stable-only: true + url-template: https://github.com/danvratil/qcoro/archive/refs/tags/v$version.tar.gz + - name: qt6-qtwebview + buildsystem: cmake-ninja + cleanup-platform: + - /bin + sources: + - type: archive + url: https://download.qt.io/official_releases/qt/6.6/6.6.1/submodules/qtwebview-everywhere-src-6.6.1.tar.xz + sha256: d6de1ba33be93ae464147c9c069e115c7a24e3e475640016bc2f07c93c4a256c + x-checker-data: + - type: anitya + project-id: 7927 + stable-only: true + url-template: https://download.qt.io/official_releases/qt/6.6/$version/submodules/qtwebview-everywhere-src-$version.tar.xz + - name: corrosion + buildsystem: cmake-ninja + config-opts: + - DCORROSION_BUILD_TESTS=OFF + build-options: + - env: + - CARGO_HOME: /run/build/corrosion/cargo + cleanup: + - /app + sources: + - type: "git" + url: https://github.com/AndrewGaspar/corrosion + commit: v0.4.5 - name: astra buildsystem: cmake-ninja config-opts: