Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build v3.14.0 using QT 6 #164

Merged
merged 4 commits into from
Sep 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions com.nextcloud.desktopclient.nextcloud.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
app-id: com.nextcloud.desktopclient.nextcloud

runtime: org.kde.Platform
runtime-version: 5.15-23.08
runtime-version: '6.7'
sdk: org.kde.Sdk

base: io.qt.qtwebengine.BaseApp
base-version: 5.15-23.08
base-version: '6.7'

command: nextcloud

Expand Down Expand Up @@ -38,14 +38,15 @@ modules:
config-opts:
- -DCMAKE_INSTALL_LIBDIR=lib
- -DBUILD_TRANSLATIONS=NO
- -DBUILD_WITH_QT6=1
cleanup:
- /include
- /mkspecs
- /lib/cmake
sources:
- type: archive
url: https://github.com/frankosterfeld/qtkeychain/archive/0.14.2.tar.gz
sha256: cf2e972b783ba66334a79a30f6b3a1ea794a1dc574d6c3bebae5ffd2f0399571
url: https://github.com/frankosterfeld/qtkeychain/archive/0.14.3.tar.gz
sha256: a22c708f351431d8736a0ac5c562414f2b7bb919a6292cbca1ff7ac0849cb0a7
x-checker-data:
type: anitya
url-template: https://github.com/frankosterfeld/qtkeychain/archive/$version.tar.gz
Expand Down Expand Up @@ -83,15 +84,16 @@ modules:
- -DBUILD_UPDATER=OFF
- -DPLUGIN_INSTALL_DIR=/app/lib/plugins
- -DPLUGINDIR=/app/lib/plugins
- -DQT_MAJOR_VERSION=6
cleanup:
- /include
post-install:
- install -Dm644 -t /app/share/metainfo com.nextcloud.desktopclient.nextcloud.metainfo.xml
sources:
- type: git
url: https://github.com/nextcloud/desktop.git
tag: v3.12.3
commit: e4ad64aa1950ed482485be416d50296bc2130e20
tag: v3.14.0
commit: d8fcb9273729c0e70f99d6f42ed7185c2bb69779
x-checker-data:
type: json
url: https://api.github.com/repos/nextcloud/desktop/releases/latest
Expand Down
5 changes: 5 additions & 0 deletions dbus-service-path.patch
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,13 @@ index 2e7349ef7..f7a161c05 100644
+++ b/shell_integration/libcloudproviders/CMakeLists.txt
@@ -1,5 +1,5 @@
macro(dbus_add_activation_service _sources)
if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.28.0")
- pkg_get_variable(_install_dir dbus-1 session_bus_services_dir DEFINE_VARIABLES datadir=${CMAKE_INSTALL_DATADIR})
+ set(_install_dir "${CMAKE_INSTALL_PREFIX}/share/dbus-1/services")
else()
- pkg_get_variable(_install_dir dbus-1 session_bus_services_dir)
+ set(_install_dir "${CMAKE_INSTALL_PREFIX}/share/dbus-1/services")
endif()
foreach (_i ${_sources})
get_filename_component(_service_file ${_i} ABSOLUTE)
string(REGEX REPLACE "\\.service.*$" ".service" _output_file ${_i})
3 changes: 0 additions & 3 deletions flathub.json

This file was deleted.