mirror of https://github.com/KDE/kasts.git
Remove workaround for FolderDialog for flatpak
Also update the flatpak manifest to align with the one on flathub. BUG: 485462
This commit is contained in:
parent
0bc16772f6
commit
6a8de7570e
|
@ -58,26 +58,6 @@
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"name": "taglib",
|
|
||||||
"buildsystem": "cmake-ninja",
|
|
||||||
"sources": [
|
|
||||||
{
|
|
||||||
"type": "archive",
|
|
||||||
"url": "https://taglib.github.io/releases/taglib-1.13.1.tar.gz",
|
|
||||||
"sha256": "c8da2b10f1bfec2cd7dbfcd33f4a2338db0765d851a50583d410bacf055cfd0b",
|
|
||||||
"x-checker-data": {
|
|
||||||
"type": "anitya",
|
|
||||||
"project-id": 1982,
|
|
||||||
"stable-only": true,
|
|
||||||
"url-template": "https://taglib.github.io/releases/taglib-$version.tar.gz"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"config-opts": [
|
|
||||||
"-DBUILD_SHARED_LIBS=ON"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"name": "libsecret",
|
"name": "libsecret",
|
||||||
"buildsystem": "meson",
|
"buildsystem": "meson",
|
||||||
|
@ -90,8 +70,8 @@
|
||||||
"sources": [
|
"sources": [
|
||||||
{
|
{
|
||||||
"type": "archive",
|
"type": "archive",
|
||||||
"url": "https://download.gnome.org/sources/libsecret/0.21/libsecret-0.21.2.tar.xz",
|
"url": "https://download.gnome.org/sources/libsecret/0.21/libsecret-0.21.4.tar.xz",
|
||||||
"sha256": "e4a341496a0815e64c8d3b8fabab33d7bae7efdeab77b843669731d5b181dcee",
|
"sha256": "163d08d783be6d4ab9a979ceb5a4fecbc1d9660d3c34168c581301cd53912b20",
|
||||||
"x-checker-data": {
|
"x-checker-data": {
|
||||||
"type": "gnome",
|
"type": "gnome",
|
||||||
"name": "libsecret",
|
"name": "libsecret",
|
||||||
|
@ -117,10 +97,10 @@
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"config-opts": [
|
"config-opts": [
|
||||||
"-DBUILD_WITH_QT6=ON",
|
|
||||||
"-DCMAKE_INSTALL_LIBDIR=/app/lib",
|
"-DCMAKE_INSTALL_LIBDIR=/app/lib",
|
||||||
"-DLIB_INSTALL_DIR=/app/lib",
|
"-DLIB_INSTALL_DIR=/app/lib",
|
||||||
"-DBUILD_TRANSLATIONS=NO"
|
"-DBUILD_TRANSLATIONS=NO",
|
||||||
|
"-DBUILD_WITH_QT6=ON"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -152,9 +132,6 @@
|
||||||
"type": "file",
|
"type": "file",
|
||||||
"path": ".patches/run_kasts.sh"
|
"path": ".patches/run_kasts.sh"
|
||||||
}
|
}
|
||||||
],
|
|
||||||
"config-opts": [
|
|
||||||
"-DKASTS_FLATPAK=ON"
|
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|
|
@ -113,6 +113,7 @@ qt_add_qml_module(kasts URI org.kde.kasts
|
||||||
qml/Settings/SettingsPage.qml
|
qml/Settings/SettingsPage.qml
|
||||||
qml/Settings/GeneralSettingsPage.qml
|
qml/Settings/GeneralSettingsPage.qml
|
||||||
qml/Settings/AppearanceSettingsPage.qml
|
qml/Settings/AppearanceSettingsPage.qml
|
||||||
|
qml/Settings/StorageDirDialog.qml
|
||||||
qml/Settings/NetworkSettingsPage.qml
|
qml/Settings/NetworkSettingsPage.qml
|
||||||
qml/Settings/StorageSettingsPage.qml
|
qml/Settings/StorageSettingsPage.qml
|
||||||
qml/Settings/SynchronizationSettingsPage.qml
|
qml/Settings/SynchronizationSettingsPage.qml
|
||||||
|
@ -216,21 +217,6 @@ if(ANDROID)
|
||||||
target_sources(kasts PRIVATE utils/androidlogging.h)
|
target_sources(kasts PRIVATE utils/androidlogging.h)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(KASTS_FLATPAK)
|
|
||||||
set_source_files_properties(qml/Settings/StorageDirDialogFlatpak.qml PROPERTIES
|
|
||||||
QT_RESOURCE_ALIAS qml/Settings/StorageDirDialog.qml
|
|
||||||
)
|
|
||||||
qt_target_qml_sources(kasts
|
|
||||||
QML_FILES
|
|
||||||
qml/Settings/StorageDirDialogFlatpak.qml
|
|
||||||
)
|
|
||||||
else()
|
|
||||||
qt_target_qml_sources(kasts
|
|
||||||
QML_FILES
|
|
||||||
qml/Settings/StorageDirDialog.qml
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
ecm_add_app_icon(kasts ICONS ${kasts_ICONS_PNG}
|
ecm_add_app_icon(kasts ICONS ${kasts_ICONS_PNG}
|
||||||
../icons/16-apps-kasts.png
|
../icons/16-apps-kasts.png
|
||||||
../icons/24-apps-kasts.png
|
../icons/24-apps-kasts.png
|
||||||
|
@ -252,10 +238,6 @@ if(TARGET KF6::BreezeIcons)
|
||||||
target_compile_definitions(kasts PRIVATE WITH_BREEZEICONS_LIB)
|
target_compile_definitions(kasts PRIVATE WITH_BREEZEICONS_LIB)
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
if(KASTS_FLATPAK)
|
|
||||||
target_compile_definitions(kasts PUBLIC KASTS_FLATPAK)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(ANDROID)
|
if(ANDROID)
|
||||||
target_link_libraries(kasts PRIVATE
|
target_link_libraries(kasts PRIVATE
|
||||||
OpenSSL::SSL
|
OpenSSL::SSL
|
||||||
|
|
|
@ -1,17 +0,0 @@
|
||||||
/**
|
|
||||||
* SPDX-FileCopyrightText: 2023 Bart De Vries <bart@mogwai.be>
|
|
||||||
*
|
|
||||||
* SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
|
|
||||||
*/
|
|
||||||
|
|
||||||
import QtQuick.Dialogs
|
|
||||||
|
|
||||||
import org.kde.kasts
|
|
||||||
|
|
||||||
FileDialog {
|
|
||||||
selectFolder: true
|
|
||||||
folder: "file://" + StorageManager.storagePath
|
|
||||||
onAccepted: {
|
|
||||||
StorageManager.setStoragePath(fileUrl);
|
|
||||||
}
|
|
||||||
}
|
|
Loading…
Reference in New Issue