redstrate/astra
1
Fork 0
mirror of https://github.com/redstrate/Astra.git synced 2025-04-20 19:57:45 +00:00
Code Activity

Remove flatpak dependency directory, it's no longer needed

Browse source 
Now that the KF6 runtime is here, we don't need a whole folder dedicated
to it
This commit is contained in:
Joshua Goins 2024-03-23 09:38:05 -04:00
parent de61c0aa41
commit 1580e832f1
5 changed files with 15 additions and 678 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

652
flatpak/kf6.json
View file

@ -1,652 +0,0 @@
{
"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",
"cleanup": [
"/share/icons/breeze-dark"
],
"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",
"-DWITH_DECORATIONS=OFF",
"-DWITH_WALLPAPERS=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"
}
]
},
{
"builddir" : true,
"buildsystem" : "cmake-ninja",
"config-opts" : [
"-DBUILD_TESTING=OFF",
"-DBUILD_QT5=OFF"
],
"name" : "kquickcharts",
"sources" : [
{
"branch" : "master",
"type" : "git",
"url" : "https://invent.kde.org/frameworks/kquickcharts.git"
}
]
},
{
"builddir" : true,
"buildsystem" : "cmake-ninja",
"config-opts" : [
"-DBUILD_TESTING=OFF",
"-DBUILD_QT5=OFF"
],
"name" : "qqc2-breeze-style",
"sources" : [
{
"branch" : "master",
"type" : "git",
"url" : "https://invent.kde.org/plasma/qqc2-breeze-style.git"
}
]
}
]
}

3
flatpak/kf6.json.license
View file

@ -1,3 +0,0 @@
SPDX-FileCopyrightText: 2023 Jonah Brüchert <jbb@kaidan.im>
SPDX-License-Identifier: CC0-1.0

15
flatpak/kirigami-addons.json
View file

@ -1,15 +0,0 @@
{
"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" }
],
"cleanup": [
"/lib/debug"
]
}

4
flatpak/kirigami-addons.json.license
View file

@ -1,4 +0,0 @@
SPDX-FileCopyrightText: 2022 Jonah Brüchert <jbb@kaidan.im>
SPDX-License-Identifier: CC0-1.0

19
zone.xiv.astra.yml
View file

@ -24,7 +24,18 @@ finish-args:
- --device=all - --device=all
- --allow=devel - --allow=devel
modules: modules:
- flatpak/kirigami-addons.json - 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
cleanup:
- /lib/debug
- name: unshield - name: unshield
buildsystem: cmake-ninja buildsystem: cmake-ninja
sources: sources:
@ -94,9 +105,9 @@ modules:
- name: corrosion - name: corrosion
buildsystem: cmake-ninja buildsystem: cmake-ninja
config-opts: config-opts:
- DCORROSION_BUILD_TESTS=OFF - -DCORROSION_BUILD_TESTS=OFF
build-options: build-options:
- env: env:
- CARGO_HOME: /run/build/corrosion/cargo - CARGO_HOME: /run/build/corrosion/cargo
cleanup: cleanup:
- /app - /app
@ -112,7 +123,7 @@ modules:
- -DBUILD_FLATPAK=ON - -DBUILD_FLATPAK=ON
build-options: build-options:
build-args: build-args:
- --share=network # needed for cargo unfortunately, flatpak has no native support (yet) - --share=network # needed for cargo unfortunately, flatpak has no native support (yet)
sources: sources:
- type: dir - type: dir
path: . path: .