From 4145cb43206874c32c441db14260427a6e405124 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Tue, 29 Nov 2022 15:42:08 -0300 Subject: [PATCH 1/2] New package: libre-graph-api-cpp-qt-client-1.0.0 --- srcpkgs/libre-graph-api-cpp-qt-client/template | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 srcpkgs/libre-graph-api-cpp-qt-client/template diff --git a/srcpkgs/libre-graph-api-cpp-qt-client/template b/srcpkgs/libre-graph-api-cpp-qt-client/template new file mode 100644 index 000000000000..8f2883cfe798 --- /dev/null +++ b/srcpkgs/libre-graph-api-cpp-qt-client/template @@ -0,0 +1,14 @@ +# Template file for 'libre-graph-api-cpp-qt-client' +pkgname=libre-graph-api-cpp-qt-client +version=1.0.0 +revision=1 +build_wrksrc=client +build_style=cmake +hostmakedepends="qt5-qmake qt5-host-tools" +makedepends="qt5-devel" +short_desc="Libre Graph API for owncloudclient" +maintainer="Gonzalo Tornaría " +license="Apache-2.0" +homepage="https://github.com/owncloud/libre-graph-api-cpp-qt-client" +distfiles="https://github.com/owncloud/libre-graph-api-cpp-qt-client/archive/refs/tags/v${version}.tar.gz" +checksum=c70f66f644c64137516e62c94f14ab94157327140ac71a953c4948cecd446d10 From 0e91fadcb176ea2046a8962c88a40f23f39f4169 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Tue, 29 Nov 2022 15:42:13 -0300 Subject: [PATCH 2/2] owncloudclient: update to 3.0.0. --- ...3af11673122be4178a9e4a15051b21dd2158.patch | 185 ------------------ srcpkgs/owncloudclient/template | 10 +- 2 files changed, 5 insertions(+), 190 deletions(-) delete mode 100644 srcpkgs/owncloudclient/patches/63ae3af11673122be4178a9e4a15051b21dd2158.patch diff --git a/srcpkgs/owncloudclient/patches/63ae3af11673122be4178a9e4a15051b21dd2158.patch b/srcpkgs/owncloudclient/patches/63ae3af11673122be4178a9e4a15051b21dd2158.patch deleted file mode 100644 index 6f82fea64130..000000000000 --- a/srcpkgs/owncloudclient/patches/63ae3af11673122be4178a9e4a15051b21dd2158.patch +++ /dev/null @@ -1,185 +0,0 @@ -From 63ae3af11673122be4178a9e4a15051b21dd2158 Mon Sep 17 00:00:00 2001 -From: Hannah von Reth -Date: Wed, 22 Jun 2022 17:14:38 +0200 -Subject: [PATCH] CMake: Implement WITH_AUTO_UPDATER - -Fixes: #9082 ---- - CMakeLists.txt | 3 +++ - changelog/unreleased/9082 | 5 +++++ - src/gui/CMakeLists.txt | 5 ++++- - src/gui/application.cpp | 5 +++++ - src/gui/generalsettings.cpp | 11 +++++++++++ - src/gui/main.cpp | 5 +++++ - 6 files changed, 33 insertions(+), 1 deletion(-) - create mode 100644 changelog/unreleased/9082 - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 546a5cf42e5..e95689fda78 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -104,6 +104,9 @@ option(BUILD_LIBRARIES_ONLY "BUILD_LIBRARIES_ONLY" OFF) - # build the GUI component, when disabled only owncloudcmd is built - option(BUILD_GUI "BUILD_GUI" ON) - -+# build the auto updater component -+option(WITH_AUTO_UPDATER "WITH_AUTO_UPDATER" ON) -+ - # specify additional vfs plugins - set(VIRTUAL_FILE_SYSTEM_PLUGINS off suffix win CACHE STRING "Name of internal plugin in src/libsync/vfs or the locations of virtual file plugins") - -diff --git a/changelog/unreleased/9082 b/changelog/unreleased/9082 -new file mode 100644 -index 00000000000..97cf81b1527 ---- /dev/null -+++ b/changelog/unreleased/9082 -@@ -0,0 +1,5 @@ -+Enhancement: Add CMakeOption WITH_AUTO_UPDATER -+ -+WITH_AUTO_UPDATER allows to build the client without the auto updater. -+ -+https://github.com/owncloud/client/issues/9082 -diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt -index b87a444044b..733e0401fea 100644 ---- a/src/gui/CMakeLists.txt -+++ b/src/gui/CMakeLists.txt -@@ -168,7 +168,10 @@ elseif(UNIX AND NOT APPLE ) - guiutility_unix.cpp) - endif() - --add_subdirectory(updater) -+if(WITH_AUTO_UPDATER) -+ add_subdirectory(updater) -+ target_compile_definitions(owncloudCore PRIVATE WITH_AUTO_UPDATER) -+endif() - - - if(WITH_CRASHREPORTER) -diff --git a/src/gui/application.cpp b/src/gui/application.cpp -index f9cd5c07f79..f2f3eac8f83 100644 ---- a/src/gui/application.cpp -+++ b/src/gui/application.cpp -@@ -36,7 +36,9 @@ - #include "sharedialog.h" - #include "accountmanager.h" - #include "creds/abstractcredentials.h" -+#ifdef WITH_AUTO_UPDATER - #include "updater/ocupdater.h" -+#endif - #include "owncloudsetupwizard.h" - #include "version.h" - #include "csync_exclude.h" -@@ -370,6 +373,7 @@ Application::Application(int &argc, char **argv) - connect(&_networkConfigurationManager, &QNetworkConfigurationManager::configurationChanged, - this, &Application::slotSystemOnlineConfigurationChanged); - -+#ifdef WITH_AUTO_UPDATER - // Update checks - UpdaterScheduler *updaterScheduler = new UpdaterScheduler(this); - connect(updaterScheduler, &UpdaterScheduler::updaterAnnouncement, -@@ -378,6 +382,7 @@ Application::Application(int &argc, char **argv) - }); - connect(updaterScheduler, &UpdaterScheduler::requestRestart, - _folderManager.data(), &FolderMan::slotScheduleAppRestart); -+#endif - - // Cleanup at Quit. - connect(this, &QCoreApplication::aboutToQuit, this, &Application::slotCleanup); -diff --git a/src/gui/generalsettings.cpp b/src/gui/generalsettings.cpp -index 88fca875eac..b9f74984522 100644 ---- a/src/gui/generalsettings.cpp -+++ b/src/gui/generalsettings.cpp -@@ -21,12 +21,15 @@ - #include "configfile.h" - #include "theme.h" - -+#ifdef WITH_AUTO_UPDATER - #include "updater/updater.h" - #include "updater/ocupdater.h" - #ifdef Q_OS_MAC - // FIXME We should unify those, but Sparkle does everything behind the scene transparently - #include "updater/sparkleupdater.h" - #endif -+#endif -+ - #include "ignorelisteditor.h" - - #include "config.h" -@@ -110,6 +113,7 @@ GeneralSettings::GeneralSettings(QWidget *parent) - connect(AccountManager::instance(), &AccountManager::accountAdded, this, &GeneralSettings::loadMiscSettings); - - // Only our standard brandings currently support beta channel -+#ifdef WITH_AUTO_UPDATER - if (Theme::instance()->appName() != QLatin1String("testpilotcloud")) { - #ifdef Q_OS_MAC - // Because we don't have any statusString from the SparkleUpdater anyway we can hide the whole thing -@@ -122,6 +126,9 @@ GeneralSettings::GeneralSettings(QWidget *parent) - } - #endif - } -+#else -+ _ui->updaterWidget->hide(); -+#endif - connect(_ui->about_pushButton, &QPushButton::clicked, this, &GeneralSettings::showAbout); - - if (!Theme::instance()->aboutShowCopyright()) { -@@ -166,6 +173,7 @@ void GeneralSettings::showEvent(QShowEvent *) - - void GeneralSettings::slotUpdateInfo() - { -+#ifdef WITH_AUTO_UPDATER - if (ConfigFile().skipUpdateCheck() || !Updater::instance()) { - // updater disabled on compile - _ui->updaterWidget->setVisible(false); -@@ -194,10 +202,12 @@ void GeneralSettings::slotUpdateInfo() - _ui->updateChannel->setCurrentIndex(ConfigFile().updateChannel() == "beta" ? 1 : 0); - connect(_ui->updateChannel, static_cast(&QComboBox::currentIndexChanged), - this, &GeneralSettings::slotUpdateChannelChanged, Qt::UniqueConnection); -+#endif - } - - void GeneralSettings::slotUpdateChannelChanged(int index) - { -+#ifdef WITH_AUTO_UPDATER - QString channel = index == 0 ? QStringLiteral("stable") : QStringLiteral("beta"); - if (channel == ConfigFile().updateChannel()) - return; -@@ -239,6 +249,7 @@ void GeneralSettings::slotUpdateChannelChanged(int index) - } - }); - msgBox->open(); -+#endif - } - - void GeneralSettings::saveMiscSettings() -diff --git a/src/gui/main.cpp b/src/gui/main.cpp -index dec162d04a3..903dc5ff36b 100644 ---- a/src/gui/main.cpp -+++ b/src/gui/main.cpp -@@ -21,7 +21,9 @@ - #include "resources/loadresources.h" - #include "theme.h" - -+#ifdef WITH_AUTO_UPDATER - #include "updater/updater.h" -+#endif - - #include - #include -@@ -59,6 +61,8 @@ int main(int argc, char **argv) - // TODO: 2.11 move to platform class - Utility::startShutdownWatcher(); - #endif -+ -+#ifdef WITH_AUTO_UPDATER - // if handleStartup returns true, main() - // needs to terminate here, e.g. because - // the updater is triggered -@@ -66,6 +70,7 @@ int main(int argc, char **argv) - if (updater && updater->handleStartup()) { - return 1; - } -+#endif - - // if the application is already running, notify it. - if (app.isRunning()) { diff --git a/srcpkgs/owncloudclient/template b/srcpkgs/owncloudclient/template index 27a7ebc65e66..43b6f04b5ac9 100644 --- a/srcpkgs/owncloudclient/template +++ b/srcpkgs/owncloudclient/template @@ -1,13 +1,13 @@ # Template file for 'owncloudclient' pkgname=owncloudclient -version=2.11.1 +version=3.0.0 revision=1 build_style=cmake -configure_args="-Wno-dev -DNO_SHIBBOLETH=TRUE -DWITH_AUTO_UPDATER=OFF" +configure_args="-Wno-dev -DWITH_AUTO_UPDATER=OFF" hostmakedepends="pkg-config extra-cmake-modules" makedepends="qtkeychain-qt5-devel sqlite-devel qt5-declarative-devel qt5-tools-devel qt5-plugin-odbc qt5-plugin-tds qt5-plugin-pgsql qt5-plugin-mysql - qt5-plugin-sqlite" + qt5-plugin-sqlite libre-graph-api-cpp-qt-client libcloudproviders-devel" depends="qt5-plugin-sqlite qt5-svg" conf_files="/etc/ownCloud/sync-exclude.lst" short_desc="Connect to ownCloud servers" @@ -15,8 +15,8 @@ maintainer="Gonzalo Tornaría " license="GPL-2.0-or-later" homepage="https://www.owncloud.org" changelog="https://raw.githubusercontent.com/owncloud/client/master/CHANGELOG.md" -distfiles="https://github.com/owncloud/client/archive/v${version}.tar.gz" -checksum=72e13d90e4d1c71bdf863a2387f36bcccbc5b410aac2d93144fe3567056ba599 +distfiles="https://github.com/owncloud/client/archive/v${version/.rc/-rc}.tar.gz" +checksum=63e5892d88fd59d1f55ef8f35aa284e38e2a2019442b218b32c92a87135ed52a if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-tools-devel"