From 2d7dcde9c8d6967e03727d514764ba748c67389e Mon Sep 17 00:00:00 2001 From: Miro Hrončok Date: Dec 28 2020 00:27:12 +0000 Subject: Update to 2.6.3 https://fedoraproject.org/wiki/Changes/CMake_to_do_out-of-source_builds Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1865188 Fixes https://bugs.gentoo.org/726172 Makes all patches -p1. Cleans up old EPEL conditionals. --- diff --git a/.gitignore b/.gitignore index d536042..91eaa49 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /owncloudclient-2.4.0.tar.xz /owncloudclient-2.5.4.11654.tar.xz /owncloudclient-2.6.0.13018.tar.xz +/owncloudclient-2.6.3.14058.tar.xz diff --git a/owncloud-client-2.6.0-syslibs.patch b/owncloud-client-2.6.0-syslibs.patch index c3c34c9..da1e4dd 100644 --- a/owncloud-client-2.6.0-syslibs.patch +++ b/owncloud-client-2.6.0-syslibs.patch @@ -1,5 +1,5 @@ ---- src/gui/application.h~ 2019-03-18 04:08:22.000000000 -0500 -+++ src/gui/application.h 2019-06-12 15:33:55.941943652 -0500 +--- a/src/gui/application.h 2019-03-18 04:08:22.000000000 -0500 ++++ b/src/gui/application.h 2019-06-12 15:33:55.941943652 -0500 @@ -22,7 +22,7 @@ #include #include @@ -9,8 +9,8 @@ #include "syncresult.h" #include "logbrowser.h" ---- src/3rdparty/qtsingleapplication/qtlocalpeer.h~ 2019-03-18 04:08:22.000000000 -0500 -+++ src/3rdparty/qtsingleapplication/qtlocalpeer.h 2019-06-12 16:15:19.083450495 -0500 +--- a/src/3rdparty/qtsingleapplication/qtlocalpeer.h 2019-03-18 04:08:22.000000000 -0500 ++++ b/src/3rdparty/qtsingleapplication/qtlocalpeer.h 2019-06-12 16:15:19.083450495 -0500 @@ -27,7 +27,7 @@ ** ****************************************************************************/ @@ -20,8 +20,8 @@ #include #include ---- src/gui/application.cpp~ 2019-03-18 04:08:22.000000000 -0500 -+++ src/gui/application.cpp 2019-06-12 16:16:39.396142159 -0500 +--- a/src/gui/application.cpp 2019-03-18 04:08:22.000000000 -0500 ++++ b/src/gui/application.cpp 2019-06-12 16:16:39.396142159 -0500 @@ -157,7 +157,7 @@ } @@ -31,8 +31,8 @@ , _gui(0) , _theme(Theme::instance()) , _helpOnly(false) ---- src/gui/application.cpp~ 2019-06-12 16:16:39.000000000 -0500 -+++ src/gui/application.cpp 2019-06-12 16:17:37.579918781 -0500 +--- a/src/gui/application.cpp 2019-06-12 16:16:39.000000000 -0500 ++++ b/src/gui/application.cpp 2019-06-12 16:17:37.579918781 -0500 @@ -254,7 +254,7 @@ _folderManager.reset(new FolderMan); @@ -42,8 +42,8 @@ if (!AccountManager::instance()->restore()) { // If there is an error reading the account settings, try again ---- src/gui/application.cpp~ 2019-06-12 16:17:37.000000000 -0500 -+++ src/gui/application.cpp 2019-06-12 16:19:07.878572107 -0500 +--- a/src/gui/application.cpp 2019-06-12 16:17:37.000000000 -0500 ++++ b/src/gui/application.cpp 2019-06-12 16:19:07.878572107 -0500 @@ -487,7 +487,7 @@ _gui->slotComputeOverallSyncStatus(); } @@ -53,8 +53,8 @@ { if (msg.startsWith(QLatin1String("MSG_PARSEOPTIONS:"))) { const int lengthOfMsgPrefix = 17; ---- src/gui/application.h~ 2019-03-18 04:08:22.000000000 -0500 -+++ src/gui/application.h 2019-06-12 16:20:21.895287942 -0500 +--- a/src/gui/application.h 2019-03-18 04:08:22.000000000 -0500 ++++ b/src/gui/application.h 2019-06-12 16:20:21.895287942 -0500 @@ -52,7 +52,7 @@ * @brief The Application class * @ingroup gui @@ -73,8 +73,8 @@ void slotCheckConnection(); void slotUseMonoIconsChanged(bool); void slotCleanup(); ---- src/gui/CMakeLists.txt~ 2019-03-18 04:08:22.000000000 -0500 -+++ src/gui/CMakeLists.txt 2019-06-12 16:21:29.097029941 -0500 +--- a/src/gui/CMakeLists.txt 2019-03-18 04:08:22.000000000 -0500 ++++ b/src/gui/CMakeLists.txt 2019-06-12 16:21:29.097029941 -0500 @@ -285,6 +285,8 @@ target_link_libraries( ${APPLICATION_EXECUTABLE} Qt5::Widgets Qt5::Network Qt5::Xml) target_link_libraries( ${APPLICATION_EXECUTABLE} ${synclib_NAME} ) @@ -84,8 +84,8 @@ target_link_libraries( ${APPLICATION_EXECUTABLE} ${OS_SPECIFIC_LINK_LIBRARIES} ) target_include_directories(${APPLICATION_EXECUTABLE} PRIVATE ---- src/gui/application.cpp~ 2019-06-12 16:21:48.000000000 -0500 -+++ src/gui/application.cpp 2019-06-12 16:24:35.505314285 -0500 +--- a/src/gui/application.cpp 2019-06-12 16:21:48.000000000 -0500 ++++ b/src/gui/application.cpp 2019-06-12 16:24:35.505314285 -0500 @@ -759,7 +759,7 @@ QTimer::singleShot(0, this, [this, fn] { openVirtualFile(fn); }); } @@ -95,8 +95,8 @@ } } // namespace OCC ---- src/gui/CMakeLists.txt~ 2019-11-20 18:11:30.000000000 -0600 -+++ src/gui/CMakeLists.txt 2019-11-20 18:15:32.367903089 -0600 +--- a/src/gui/CMakeLists.txt 2019-11-20 18:11:30.000000000 -0600 ++++ b/src/gui/CMakeLists.txt 2019-11-20 18:15:32.367903089 -0600 @@ -150,18 +150,8 @@ set(3rdparty_SRC diff --git a/owncloud-client-2.6.3.14058-qt515.patch b/owncloud-client-2.6.3.14058-qt515.patch new file mode 100644 index 0000000..57dd209 --- /dev/null +++ b/owncloud-client-2.6.3.14058-qt515.patch @@ -0,0 +1,11 @@ +diff -Naur owncloudclient-2.6.3.14058.orig/src/libsync/networkjobs.cpp owncloudclient-2.6.3.14058/src/libsync/networkjobs.cpp +--- owncloudclient-2.6.3.14058.orig/src/libsync/networkjobs.cpp 2020-06-12 14:35:04.000000000 +0200 ++++ owncloudclient-2.6.3.14058/src/libsync/networkjobs.cpp 2020-06-13 11:18:28.822842347 +0200 +@@ -31,6 +31,7 @@ + #include + #ifndef TOKEN_AUTH_ONLY + #include ++#include + #endif + + #include "networkjobs.h" diff --git a/owncloud-client.spec b/owncloud-client.spec index b53b0b9..96452d2 100644 --- a/owncloud-client.spec +++ b/owncloud-client.spec @@ -1,9 +1,7 @@ -%global _hardened_build 1 - Name: owncloud-client -Version: 2.6.0 -%global vertag 13018 -Release: 4%{?dist} +Version: 2.6.3 +%global vertag 14058 +Release: 1%{?dist} Summary: The ownCloud Client # -libs are LGPLv2+, rest GPLv2 @@ -11,6 +9,7 @@ License: LGPLv2+ and GPLv2 Url: http://owncloud.org/sync-clients/ Source0: https://download.owncloud.com/desktop/stable/owncloudclient-%{version}.%{vertag}.tar.xz Source1: owncloud.appdata.xml + # The patch does 3 things: # - Depends on system lib for QtSingleApplication and QtLockedFile # - Remove the extraneous namespace when calling QtSingleApplication @@ -18,7 +17,11 @@ Source1: owncloud.appdata.xml # Application::slotParseMessage slot # These fix are needed because the system wide QtSingleApplication is slightly # different from the bundled one. -Patch0: %{name}-2.6.0-syslibs.patch +Patch0: owncloud-client-2.6.0-syslibs.patch + +# Qt 5.15+ fix from Gentoo by Bernard Cafarelli +# https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdbacd407eb7482df2e52d2232b97daae639d8bc +Patch1: owncloud-client-2.6.3.14058-qt515.patch BuildRequires: check BuildRequires: cmake @@ -40,11 +43,9 @@ BuildRequires: qt5-qttools qt5-qttools-devel BuildRequires: extra-cmake-modules # Plasma 5 Dolphin integration -%if 0%{?fedora} >= 24 || 0%{?rhel} > 7 BuildRequires: kf5-kio-devel BuildRequires: kf5-kcoreaddons-devel BuildRequires: kf5-rpm-macros -%endif BuildRequires: sqlite-devel Requires: %{name}-libs%{?_isa} = %{version}-%{release} @@ -101,8 +102,6 @@ Requires: python3-nemo This package provides overlay icons to visualize the sync state in the nemo file manager. -# Only Fedora has Mate, so there is no need for Caja extension on EPEL -%if 0%{?fedora} %package caja Summary: Caja overlay icons Requires: caja @@ -112,61 +111,41 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %description caja This package provides overlay icons to visualize the sync state in the caja file manager. -%endif -%if 0%{?fedora} >= 24 || 0%{?rhel} > 7 %package dolphin Summary: Dolphin overlay icons Requires: dolphin %description dolphin The owncloud desktop client dolphin extension. -%endif %prep -%setup -q -n owncloudclient-%{version}.%{vertag} -%patch0 -p0 +%autosetup -p1 -n owncloudclient-%{version}.%{vertag} rm -rf src/3rdparty/qtlockedfile src/3rdparty/qtsingleapplication %build -mkdir build -pushd build -%cmake_kf5 .. -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed" -make %{?_smp_mflags} -popd +%cmake_kf5 -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed" +%cmake_build %install -pushd build -make install DESTDIR=%{buildroot} -popd +%cmake_install %find_lang client --with-qt mkdir -p %{buildroot}%{_datadir}/appdata/ install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/appdata/owncloud.appdata.xml # for distros that do not have KDE Plasma 5 -%if 0%{?fedora} < 24 && 0%{?rhel} <= 7 rm -f %{buildroot}%{_libdir}/libnextclouddolphinpluginhelper.so rm -f %{buildroot}%{_kf5_plugindir}/overlayicon/nextclouddolphinoverlayplugin.so rm -f %{buildroot}%{_qt5_plugindir}/nextclouddolphinactionplugin.so rm -f %{buildroot}%{_kf5_datadir}/kservices5/nextclouddolphinactionplugin.desktop -%endif -# Only Fedora has Mate, so there is no need for Caja extension on EPEL -%if 0%{?rhel} -rm -rf %{buildroot}%{_datadir}/caja-python/ -%endif %check appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/owncloud.appdata.xml -%ldconfig_scriptlets libs - -%if 0%{?fedora} >= 24 || 0%{?rhel} > 7 -%ldconfig_scriptlets dolphin -%endif %files -f client.lang %{_bindir}/owncloud @@ -198,24 +177,21 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/owncloud.a %files nemo %{_datadir}/nemo-python/extensions/* -# Only Fedora has Mate, so there is no need for Caja extension on EPEL -%if 0%{?fedora} %files caja %{_datadir}/caja-python/extensions/* -%endif -%if 0%{?fedora} >= 24 || 0%{?rhel} > 7 %files dolphin %{_libdir}/libownclouddolphinpluginhelper.so %{_kf5_plugindir}/overlayicon/ownclouddolphinoverlayplugin.so %{_qt5_plugindir}/ownclouddolphinactionplugin.so %{_kf5_datadir}/kservices5/ownclouddolphinactionplugin.desktop -%endif + %changelog -* Sat Aug 01 2020 Fedora Release Engineering - 2.6.0-4 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild +* Mon Dec 28 2020 Miro Hrončok - 2.6.3-1 +- Update to 2.6.3 +- https://fedoraproject.org/wiki/Changes/CMake_to_do_out-of-source_builds +- Fixes: rhbz#1865188 * Tue Jul 28 2020 Fedora Release Engineering - 2.6.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 44b9c59..0ef26ca 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (owncloudclient-2.6.0.13018.tar.xz) = b8eb9dc6f9c061a74fee3f31926a3fb7f5093277955fe327d1169c84f929d1e1ad8da472a7098c1c10399f395c6bfc3b2684cf4c85cddc5e45b733abfb8e4046 +SHA512 (owncloudclient-2.6.3.14058.tar.xz) = e2159dc5668f263449e7a9a20ef10c6bb140ea5bd1128a6d3438abce03bc4913bb4eecbacc5160c8018398b6fa75ccfb2a9ab9ad637965e41caebc83994b80b3