* [PR PATCH] owncloudclient: update to 3.0.0.rc2.
@ 2022-11-29 19:00 tornaria
2022-11-30 0:32 ` [PR PATCH] [Updated] " tornaria
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: tornaria @ 2022-11-29 19:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1665 bytes --]
There is a new pull request by tornaria against master on the void-packages repository
https://github.com/tornaria/void-packages owncloudclient
https://github.com/void-linux/void-packages/pull/40841
owncloudclient: update to 3.0.0.rc2.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
I'm running this in my laptop, so far it seems to be working ok.
Since this is a release candidate I'm creating the PR as a draft in case someone wants to try it. I will change it to a regular PR once they release.
There is a new build dependency that is not runtime dependency... Maybe it could be built as part of the same template since the package would not be useful for anything else.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/40841.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-owncloudclient-40841.patch --]
[-- Type: text/x-diff, Size: 10120 bytes --]
From 100ff058b942323c23f4d42674115c22708e0b9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
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 | 13 +++++++++++++
1 file changed, 13 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..50157dee9734
--- /dev/null
+++ b/srcpkgs/libre-graph-api-cpp-qt-client/template
@@ -0,0 +1,13 @@
+# 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
+makedepends="qt5-devel"
+short_desc="Libre Graph API for owncloudclient"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+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 f00f1c42e877104cf9d633e1bc76005ab9e15ccf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 29 Nov 2022 15:42:13 -0300
Subject: [PATCH 2/2] owncloudclient: update to 3.0.0.rc2.
---
...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 <hannah.vonreth@owncloud.com>
-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<void (QComboBox::*)(int)>(&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 <QTimer>
- #include <QMessageBox>
-@@ -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..16074553b8fa 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.rc2
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 <tornaria@cmat.edu.uy>"
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=f8f0ac22d6c26d8264487cb6d35c2c51efb2fccb38554ef18d73a68d637b1344
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-host-tools qt5-tools-devel"
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Updated] owncloudclient: update to 3.0.0.rc2.
2022-11-29 19:00 [PR PATCH] owncloudclient: update to 3.0.0.rc2 tornaria
@ 2022-11-30 0:32 ` tornaria
2022-12-02 4:00 ` tornaria
2022-12-08 20:38 ` [PR PATCH] [Merged]: owncloudclient: update to 3.0.0 Piraty
2 siblings, 0 replies; 4+ messages in thread
From: tornaria @ 2022-11-30 0:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1670 bytes --]
There is an updated pull request by tornaria against master on the void-packages repository
https://github.com/tornaria/void-packages owncloudclient
https://github.com/void-linux/void-packages/pull/40841
owncloudclient: update to 3.0.0.rc2.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
I'm running this in my laptop, so far it seems to be working ok.
Since this is a release candidate I'm creating the PR as a draft in case someone wants to try it. I will change it to a regular PR once they release.
There is a new build dependency that is not runtime dependency... Maybe it could be built as part of the same template since the package would not be useful for anything else.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/40841.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-owncloudclient-40841.patch --]
[-- Type: text/x-diff, Size: 10965 bytes --]
From 100ff058b942323c23f4d42674115c22708e0b9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 29 Nov 2022 15:42:08 -0300
Subject: [PATCH 1/3] New package: libre-graph-api-cpp-qt-client-1.0.0
---
srcpkgs/libre-graph-api-cpp-qt-client/template | 13 +++++++++++++
1 file changed, 13 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..50157dee9734
--- /dev/null
+++ b/srcpkgs/libre-graph-api-cpp-qt-client/template
@@ -0,0 +1,13 @@
+# 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
+makedepends="qt5-devel"
+short_desc="Libre Graph API for owncloudclient"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+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 f00f1c42e877104cf9d633e1bc76005ab9e15ccf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 29 Nov 2022 15:42:13 -0300
Subject: [PATCH 2/3] owncloudclient: update to 3.0.0.rc2.
---
...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 <hannah.vonreth@owncloud.com>
-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<void (QComboBox::*)(int)>(&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 <QTimer>
- #include <QMessageBox>
-@@ -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..16074553b8fa 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.rc2
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 <tornaria@cmat.edu.uy>"
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=f8f0ac22d6c26d8264487cb6d35c2c51efb2fccb38554ef18d73a68d637b1344
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-host-tools qt5-tools-devel"
From 1662438196735feacfd25c41a0786c84dcc6a336 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 29 Nov 2022 21:31:38 -0300
Subject: [PATCH 3/3] libre-graph-api-cpp-qt-client: fix cross build
---
srcpkgs/libre-graph-api-cpp-qt-client/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/libre-graph-api-cpp-qt-client/template b/srcpkgs/libre-graph-api-cpp-qt-client/template
index 50157dee9734..8f2883cfe798 100644
--- a/srcpkgs/libre-graph-api-cpp-qt-client/template
+++ b/srcpkgs/libre-graph-api-cpp-qt-client/template
@@ -4,6 +4,7 @@ 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 <tornaria@cmat.edu.uy>"
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Updated] owncloudclient: update to 3.0.0.rc2.
2022-11-29 19:00 [PR PATCH] owncloudclient: update to 3.0.0.rc2 tornaria
2022-11-30 0:32 ` [PR PATCH] [Updated] " tornaria
@ 2022-12-02 4:00 ` tornaria
2022-12-08 20:38 ` [PR PATCH] [Merged]: owncloudclient: update to 3.0.0 Piraty
2 siblings, 0 replies; 4+ messages in thread
From: tornaria @ 2022-12-02 4:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1670 bytes --]
There is an updated pull request by tornaria against master on the void-packages repository
https://github.com/tornaria/void-packages owncloudclient
https://github.com/void-linux/void-packages/pull/40841
owncloudclient: update to 3.0.0.rc2.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
I'm running this in my laptop, so far it seems to be working ok.
Since this is a release candidate I'm creating the PR as a draft in case someone wants to try it. I will change it to a regular PR once they release.
There is a new build dependency that is not runtime dependency... Maybe it could be built as part of the same template since the package would not be useful for anything else.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/40841.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-owncloudclient-40841.patch --]
[-- Type: text/x-diff, Size: 10157 bytes --]
From 4145cb43206874c32c441db14260427a6e405124 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
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 <tornaria@cmat.edu.uy>"
+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?= <tornaria@cmat.edu.uy>
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 <hannah.vonreth@owncloud.com>
-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<void (QComboBox::*)(int)>(&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 <QTimer>
- #include <QMessageBox>
-@@ -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 <tornaria@cmat.edu.uy>"
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"
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Merged]: owncloudclient: update to 3.0.0.
2022-11-29 19:00 [PR PATCH] owncloudclient: update to 3.0.0.rc2 tornaria
2022-11-30 0:32 ` [PR PATCH] [Updated] " tornaria
2022-12-02 4:00 ` tornaria
@ 2022-12-08 20:38 ` Piraty
2 siblings, 0 replies; 4+ messages in thread
From: Piraty @ 2022-12-08 20:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1511 bytes --]
There's a merged pull request on the void-packages repository
owncloudclient: update to 3.0.0.
https://github.com/void-linux/void-packages/pull/40841
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
I've been running this in my laptop, so far it seems to be working ok.
~Since this is a release candidate I'm creating the PR as a draft in case someone wants to try it. I will change it to a regular PR once they release.~
There is a new build dependency that is not runtime dependency... ~Maybe it could be built as part of the same template since the package would not be useful for anything else.~
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-12-08 20:38 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-11-29 19:00 [PR PATCH] owncloudclient: update to 3.0.0.rc2 tornaria
2022-11-30 0:32 ` [PR PATCH] [Updated] " tornaria
2022-12-02 4:00 ` tornaria
2022-12-08 20:38 ` [PR PATCH] [Merged]: owncloudclient: update to 3.0.0 Piraty
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).