Hello community,
here is the log from the commit of package nextcloud-client for
openSUSE:Factory checked in at 2018-11-26 10:18:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/nextcloud-client (Old)
and /work/SRC/openSUSE:Factory/.nextcloud-client.new.19453 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nextcloud-client"
Mon Nov 26 10:18:15 2018 rev:12 rq:648998 version:2.5.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/nextcloud-client/nextcloud-client.changes
2018-06-19 11:57:23.364009256 +0200
+++
/work/SRC/openSUSE:Factory/.nextcloud-client.new.19453/nextcloud-client.changes
2018-11-26 10:18:48.357838310 +0100
@@ -1,0 +2,12 @@
+Wed Nov 14 12:28:56 UTC 2018 - [email protected]
+
+- Update to version 2.5.0:
+ * See https://github.com/nextcloud/desktop/compare/57bc791...v2.5.0
+- Remove nextcloud-client-2.3.3-fix-qt-5.11.patch,
+ nextcloud-client-fix-caja-nemo-appnames.patch: fixed upstream.
+- Rebase nextcloud-client-fix-rpath.patch,
+ nextcloud-client-remove-datetime.patch.
+- Build with libcloudproviders.
+- Drop openSUSE Leap 42.3 and older support.
+
+-------------------------------------------------------------------
Old:
----
nextcloud-client-2.3.3-fix-qt-5.11.patch
nextcloud-client-fix-caja-nemo-appnames.patch
nextcloud-client_2.3.3.orig.tar.bz2
New:
----
nextcloud-client-2.5.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ nextcloud-client.spec ++++++
--- /var/tmp/diff_new_pack.7mejjw/_old 2018-11-26 10:18:49.225837296 +0100
+++ /var/tmp/diff_new_pack.7mejjw/_new 2018-11-26 10:18:49.225837296 +0100
@@ -12,30 +12,27 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%define soname libnextcloudsync
%define sover 0
Name: nextcloud-client
-Version: 2.3.3
+Version: 2.5.0
Release: 0
Summary: Nextcloud desktop synchronisation client
License: GPL-2.0-or-later AND LGPL-3.0-or-later
Group: Productivity/Networking/File-Sharing
URL: https://nextcloud.com/
-Source:
https://launchpad.net/~nextcloud-devs/+archive/ubuntu/client/+files/%{name}_%{version}.orig.tar.bz2
+Source:
https://github.com/nextcloud/desktop/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
Source1: sysctl-sync-inotify.conf
# PATCH-FIX-OPENSUSE nextcloud-client-fix-rpath.patch [email protected] --
Fix RPATH.
Patch0: nextcloud-client-fix-rpath.patch
# PATCH-FIX-OPENSUSE nextcloud-client-remove-datetime.patch
[email protected] -- Remove __TIME__ and __DATE__.
Patch1: nextcloud-client-remove-datetime.patch
-# PATCH-FIX-OPENSUSE nextcloud-client-fix-caja-nemo-appnames.patch
[email protected] -- Fix the Caja and Nemo extensions appname.
-Patch2: nextcloud-client-fix-caja-nemo-appnames.patch
-# PATCH-FIX-OPENSUSE nextcloud-client-2.3.3-fix-qt-5.11.patch -- Fix Qt 5.11+
compatibility.
-Patch3: nextcloud-client-2.3.3-fix-qt-5.11.patch
-BuildRequires: cmake >= 2.8.0
+BuildRequires: AppStream
+BuildRequires: cmake >= 3.2
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: glibc-devel
@@ -53,18 +50,18 @@
BuildRequires: pkgconfig(Qt5Network)
BuildRequires: pkgconfig(Qt5PrintSupport)
BuildRequires: pkgconfig(Qt5Sql)
-BuildRequires: pkgconfig(Qt5WebKit)
+BuildRequires: pkgconfig(Qt5WebEngineWidgets)
BuildRequires: pkgconfig(Qt5WebKitWidgets)
BuildRequires: pkgconfig(Qt5Xml)
-BuildRequires: pkgconfig(openssl)
+BuildRequires: pkgconfig(cloudproviders)
+BuildRequires: pkgconfig(dbus-1)
+BuildRequires: pkgconfig(openssl) >= 1.1
BuildRequires: pkgconfig(sqlite3)
Requires: %{soname}%{sover} = %{version}
Recommends: %{name}-lang
-%if 0%{?suse_version} >= 1500 || (0%{?sle_version} >= 120200 &&
0%{?is_opensuse})
-BuildRequires: kio-devel
-%endif
-%if 0%{?suse_version} >= 1500 || (0%{?sle_version} >= 120300 &&
0%{?is_opensuse})
+%if 0%{?is_opensuse}
BuildRequires: doxygen
+BuildRequires: kio-devel
BuildRequires: python3-Sphinx
Suggests: %{name}-doc = %{version}
%endif
@@ -81,7 +78,7 @@
%lang_package
-%if 0%{?suse_version} >= 1500 || (0%{?sle_version} >= 120300 &&
0%{?is_opensuse})
+%if 0%{?is_opensuse}
%package doc
Summary: Documentation for nextcloud-client
Group: Documentation/HTML
@@ -110,7 +107,7 @@
Development files for the Nextcloud Desktop Client synchronisation
library.
-%if 0%{?suse_version} > 1310 && !(0%{?sle_version} && !0%{?is_opensuse})
+%if 0%{?is_opensuse}
%package -n caja-extension-nextcloud
Summary: Caja overlay icons
Group: Productivity/File utilities
@@ -138,7 +135,7 @@
This package provides overlay icons to visualise the
synchronisation state in the Nautilus file manager.
-%if 0%{?suse_version} >= 1500 || (0%{?sle_version} >= 120200 &&
0%{?is_opensuse})
+%if 0%{?is_opensuse}
%package -n nemo-extension-nextcloud
Summary: Nemo overlay icons
Group: Productivity/File utilities
@@ -165,42 +162,30 @@
%endif
%prep
-%setup -q -n %{name}_%{version}
+%setup -q -n desktop-%{version}
%patch0 -p1
%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-cp -f %{SOURCE1} sysctl-sync-inotify.conf
-
-# A workaround for gh#owncloud/ownbrander#322
-sed -i 's/^\(Icon\(\[.*\]\)*=\).*$/\1@APPLICATION_NAME@/'
client/mirall.desktop.in
+cp -a %{SOURCE1} sysctl-sync-inotify.conf
%build
-nextcloud_theme="$PWD/nextcloudtheme"
-pushd client
%cmake \
- -DGIT_SHA1="GITDIR-NOTFOUND" \
- -DCMAKE_SKIP_RPATH=OFF \
-%if 0%{?suse_version} >= 1500 || (0%{?sle_version} >= 120300 &&
0%{?is_opensuse})
+%if 0%{?is_opensuse}
-DWITH_DOC=ON \
%endif
- -DOEM_THEME_DIR="$nextcloud_theme"
-make %{?_smp_mflags} V=1
-popd
+ -DCMAKE_SKIP_RPATH=OFF
+%make_jobs
%install
-pushd client
%cmake_install
-popd
-
-%if 0%{?suse_version} <= 1310 || (0%{?sle_version} && !0%{?is_opensuse})
-# There's no Caja in SLE.
-rm -rf %{buildroot}%{_datadir}/caja-python/
-%endif
-%if 0%{?suse_version} < 1500 && (0%{?sle_version} < 120200 && 0%{?is_opensuse})
-# There's no Nemo in openSUSE Leap 42.1 and older.
-rm -rf %{buildroot}%{_datadir}/nemo-python/
+%if 0%{?is_opensuse}
+mkdir -p %{buildroot}%{_docdir}/%{name}-doc/
+mv -f %{buildroot}%{_datadir}/doc/client/%{name}/html/ \
+ %{buildroot}%{_docdir}/%{name}-doc/html/
+%else
+# There's no Caja and Nemo in SLE.
+rm -r %{buildroot}%{_datadir}/caja-python/
+rm -r %{buildroot}%{_datadir}/nemo-python/
%endif
# Generate bytecode for extensions.
@@ -210,16 +195,6 @@
fi
done
-%if 0%{?suse_version} >= 1500 || (0%{?sle_version} >= 120300 &&
0%{?is_opensuse})
-# Properly rename mans.
-mv -f %{buildroot}%{_mandir}/man1/{owncloud,nextcloud}.1
-mv -f %{buildroot}%{_mandir}/man1/{owncloudcmd,nextcloudcmd}.1
-
-mkdir -p %{buildroot}%{_docdir}/%{name}-doc/
-mv -f %{buildroot}%{_datadir}/doc/client/html/ \
- %{buildroot}%{_docdir}/%{name}-doc/html/
-%endif
-
# A workaround for gh#owncloud/client#4107
install -Dpm 0644 sysctl-sync-inotify.conf \
%{buildroot}%{_sysconfdir}/sysctl.d/100-%{name}-sync-inotify.conf
@@ -242,39 +217,29 @@
%endif
%files
-%if 0%{?suse_version} >= 1500
-%license LICENSE
-%else
-%doc LICENSE
-%endif
+%license COPYING*
%config %{_sysconfdir}/Nextcloud/
%config %{_sysconfdir}/sysctl.d/100-%{name}-sync-inotify.conf
%{_bindir}/nextcloud*
%dir %{_datadir}/nextcloud/
%{_datadir}/applications/nextcloud.desktop
-%if 0%{?suse_version} < 1500 && 0%{?sle_version} < 120200
-%dir %{_datadir}/icons/hicolor/512x512/
-%dir %{_datadir}/icons/hicolor/512x512/apps/
-%endif
+%dir %{_datadir}/icons/hicolor/1024x1024/
+%dir %{_datadir}/icons/hicolor/1024x1024/apps/
%{_datadir}/icons/hicolor/*/apps/Nextcloud*.*
-%if 0%{?suse_version} >= 1500 || (0%{?sle_version} >= 120300 &&
0%{?is_opensuse})
-%{_mandir}/man1/nextcloud*.1%{?ext_man}
-%endif
+%dir %{_datadir}/cloud-providers/
+%{_datadir}/cloud-providers/com.nextcloudgmbh.Nextcloud.ini
+%{_datadir}/dbus-1/services/com.nextcloudgmbh.Nextcloud.service
%files lang
%{_datadir}/nextcloud/i18n/
-%if 0%{?suse_version} >= 1500 || (0%{?sle_version} >= 120300 &&
0%{?is_opensuse})
+%if 0%{?is_opensuse}
%files doc
%doc %{_docdir}/%{name}-doc/
%endif
%files -n %{soname}%{sover}
-%if 0%{?suse_version} >= 1500
-%license LICENSE
-%else
-%doc LICENSE
-%endif
+%license COPYING*
%{_libdir}/%{soname}.so.*
%dir %{_libdir}/nextcloud/
%{_libdir}/nextcloud/libocsync.so.*
@@ -284,7 +249,7 @@
%{_libdir}/%{soname}.so
%{_libdir}/nextcloud/libocsync.so
-%if 0%{?suse_version} > 1310 && !(0%{?sle_version} && !0%{?is_opensuse})
+%if 0%{?is_opensuse}
%files -n caja-extension-nextcloud
%dir %{_datadir}/caja-python/
%dir %{_datadir}/caja-python/extensions/
@@ -296,7 +261,7 @@
%dir %{_datadir}/nautilus-python/extensions/
%{_datadir}/nautilus-python/extensions/syncstate-Nextcloud.py*
-%if 0%{?suse_version} >= 1500 || (0%{?sle_version} >= 120200 &&
0%{?is_opensuse})
+%if 0%{?is_opensuse}
%files -n nemo-extension-nextcloud
%dir %{_datadir}/nemo-python/
%dir %{_datadir}/nemo-python/extensions/
++++++ nextcloud-client-fix-rpath.patch ++++++
--- /var/tmp/diff_new_pack.7mejjw/_old 2018-11-26 10:18:49.241837277 +0100
+++ /var/tmp/diff_new_pack.7mejjw/_new 2018-11-26 10:18:49.241837277 +0100
@@ -1,66 +1,68 @@
---- a/client/src/cmd/CMakeLists.txt
-+++ b/client/src/cmd/CMakeLists.txt
-@@ -25,8 +25,13 @@ if(NOT BUILD_LIBRARIES_ONLY)
- qt5_use_modules(${cmd_NAME} Network Sql)
+--- a/src/cmd/CMakeLists.txt
++++ b/src/cmd/CMakeLists.txt
+@@ -23,8 +23,13 @@ if(NOT BUILD_LIBRARIES_ONLY)
+ add_executable(${cmd_NAME} ${cmd_SRC})
set_target_properties(${cmd_NAME} PROPERTIES
RUNTIME_OUTPUT_DIRECTORY ${BIN_OUTPUT_DIRECTORY} )
- set_target_properties(${cmd_NAME} PROPERTIES
-+ if(LIB_INSTALL_DIR MATCHES "^/")
-+ set_target_properties(${cmd_NAME} PROPERTIES
-+ INSTALL_RPATH "${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" )
-+ else(LIB_INSTALL_DIR MATCHES "^/")
-+ set_target_properties(${cmd_NAME} PROPERTIES
- INSTALL_RPATH
"${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" )
-+ endif()
+- INSTALL_RPATH
"${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE};${CMAKE_INSTALL_RPATH}"
)
++ if(LIB_INSTALL_DIR MATCHES "^/")
++ set_target_properties(${cmd_NAME} PROPERTIES
++ INSTALL_RPATH
"${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE};${CMAKE_INSTALL_RPATH}" )
++ else()
++ set_target_properties(${cmd_NAME} PROPERTIES
++ INSTALL_RPATH
"${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE};${CMAKE_INSTALL_RPATH}"
)
++ endif()
- target_link_libraries(${cmd_NAME} ${synclib_NAME})
- endif()
---- a/client/src/crashreporter/CMakeLists.txt
-+++ b/client/src/crashreporter/CMakeLists.txt
-@@ -36,7 +36,11 @@ if(NOT BUILD_LIBRARIES_ONLY)
+ target_link_libraries(${cmd_NAME} ocsync ${synclib_NAME} Qt5::Core
Qt5::Network)
+--- a/src/crashreporter/CMakeLists.txt
++++ b/src/crashreporter/CMakeLists.txt
+@@ -29,7 +29,11 @@ if(NOT BUILD_LIBRARIES_ONLY)
+ target_include_directories(${CRASHREPORTER_EXECUTABLE} PRIVATE
${CMAKE_CURRENT_BINARY_DIR})
set_target_properties(${CRASHREPORTER_EXECUTABLE} PROPERTIES AUTOMOC ON)
set_target_properties(${CRASHREPORTER_EXECUTABLE} PROPERTIES
RUNTIME_OUTPUT_DIRECTORY ${BIN_OUTPUT_DIRECTORY} )
- set_target_properties(${CRASHREPORTER_EXECUTABLE} PROPERTIES
INSTALL_RPATH
"${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" )
+ if(LIB_INSTALL_DIR MATCHES "^/")
-+ set_target_properties(${CRASHREPORTER_EXECUTABLE} PROPERTIES
INSTALL_RPATH "${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" )
-+ else(LIB_INSTALL_DIR MATCHES "^/")
-+ set_target_properties(${CRASHREPORTER_EXECUTABLE} PROPERTIES
INSTALL_RPATH
"${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" )
++ set_target_properties(${CRASHREPORTER_EXECUTABLE} PROPERTIES
INSTALL_RPATH "${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" )
++ else()
++ set_target_properties(${CRASHREPORTER_EXECUTABLE} PROPERTIES
INSTALL_RPATH
"${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" )
+ endif()
target_link_libraries(${CRASHREPORTER_EXECUTABLE}
crashreporter-gui
- ${QT_LIBRARIES}
---- a/client/src/gui/CMakeLists.txt
-+++ b/client/src/gui/CMakeLists.txt
-@@ -282,8 +282,13 @@ set_target_properties( ${APPLICATION_EXE
+ Qt5::Core Qt5::Widgets
+--- a/src/gui/CMakeLists.txt
++++ b/src/gui/CMakeLists.txt
+@@ -302,8 +302,13 @@ set_target_properties( ${APPLICATION_EXE
RUNTIME_OUTPUT_DIRECTORY ${BIN_OUTPUT_DIRECTORY}
)
# Only relevant for Linux? On OS X it by default properly checks in the
bundle directory next to the exe
-set_target_properties( ${APPLICATION_EXECUTABLE} PROPERTIES
+if(LIB_INSTALL_DIR MATCHES "^/")
-+ set_target_properties( ${APPLICATION_EXECUTABLE} PROPERTIES
-+ INSTALL_RPATH "${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" )
-+else(LIB_INSTALL_DIR MATCHES "^/")
-+ set_target_properties( ${APPLICATION_EXECUTABLE} PROPERTIES
- INSTALL_RPATH
"${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" )
++ set_target_properties( ${APPLICATION_EXECUTABLE} PROPERTIES
++ INSTALL_RPATH
"${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE};${CMAKE_INSTALL_RPATH}" )
++else()
++ set_target_properties( ${APPLICATION_EXECUTABLE} PROPERTIES
+ INSTALL_RPATH
"${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE};${CMAKE_INSTALL_RPATH}"
)
+endif()
- target_link_libraries( ${APPLICATION_EXECUTABLE} ${QT_LIBRARIES} )
+ target_link_libraries( ${APPLICATION_EXECUTABLE} Qt5::Widgets Qt5::Network
Qt5::Xml)
target_link_libraries( ${APPLICATION_EXECUTABLE} ${synclib_NAME} )
---- a/client/src/libsync/CMakeLists.txt
-+++ b/client/src/libsync/CMakeLists.txt
-@@ -147,8 +147,13 @@ set_target_properties( ${synclib_NAME}
+--- a/src/libsync/CMakeLists.txt
++++ b/src/libsync/CMakeLists.txt
+@@ -128,8 +128,13 @@ set_target_properties( ${synclib_NAME}
SOVERSION ${MIRALL_SOVERSION}
RUNTIME_OUTPUT_DIRECTORY ${BIN_OUTPUT_DIRECTORY}
)
-set_target_properties( ${synclib_NAME} PROPERTIES
+- INSTALL_RPATH
"${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE};${CMAKE_INSTALL_RPATH}"
)
+if(LIB_INSTALL_DIR MATCHES "^/")
-+ set_target_properties( ${synclib_NAME} PROPERTIES
-+ INSTALL_RPATH "${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" )
-+else(LIB_INSTALL_DIR MATCHES "^/")
-+ set_target_properties( ${synclib_NAME} PROPERTIES
- INSTALL_RPATH
"${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" )
++ set_target_properties( ${synclib_NAME} PROPERTIES
++ INSTALL_RPATH
"${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE};${CMAKE_INSTALL_RPATH}" )
++else()
++ set_target_properties( ${synclib_NAME} PROPERTIES
++ INSTALL_RPATH
"${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE};${CMAKE_INSTALL_RPATH}"
)
+endif()
- target_link_libraries(${synclib_NAME} ${libsync_LINK_TARGETS} )
-
+ if(NOT BUILD_OWNCLOUD_OSX_BUNDLE)
+ install(TARGETS ${synclib_NAME}
++++++ nextcloud-client-remove-datetime.patch ++++++
--- /var/tmp/diff_new_pack.7mejjw/_old 2018-11-26 10:18:49.245837272 +0100
+++ /var/tmp/diff_new_pack.7mejjw/_new 2018-11-26 10:18:49.245837272 +0100
@@ -1,6 +1,6 @@
---- a/client/doc/conf.py.in
-+++ b/client/doc/conf.py.in
-@@ -124,7 +124,7 @@ html_static_path = ['@CMAKE_CURRENT_SOUR
+--- a/doc/conf.py
++++ b/doc/conf.py
+@@ -124,7 +124,7 @@ html_static_path = ['_shared_assets/stat
# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
# using the given strftime format.
@@ -9,77 +9,18 @@
# If true, SmartyPants will be used to convert quotes and dashes to
# typographically correct entities.
---- a/client/src/libsync/owncloudtheme.cpp
-+++ b/client/src/libsync/owncloudtheme.cpp
-@@ -58,7 +58,6 @@ QString ownCloudTheme::about() const
- Utility::escape("https://";
MIRALL_STRINGIFY(APPLICATION_DOMAIN)),
- Utility::escape(MIRALL_STRINGIFY(APPLICATION_DOMAIN)));
-
-- devString += gitSHA1();
- return devString;
-
- }
---- a/client/src/libsync/theme.cpp
-+++ b/client/src/libsync/theme.cpp
-@@ -286,29 +286,6 @@ bool Theme::wizardHideFolderSizeLimitChe
- return false;
- }
-
--QString Theme::gitSHA1() const
--{
-- QString devString;
--#ifdef GIT_SHA1
-- const QString githubPrefix(QLatin1String(
--
"https://github.com/owncloud/client/commit/";));
-- const QString gitSha1(QLatin1String(GIT_SHA1));
-- devString = QCoreApplication::translate("ownCloudTheme::about()",
-- "<p><small>Built from Git revision <a href=\"%1\">%2</a>"
-- " on %3, %4 using Qt %5, %6</small></p>")
-- .arg(githubPrefix+gitSha1).arg(gitSha1.left(6))
-- .arg(__DATE__).arg(__TIME__)
-- .arg(QString::fromAscii(qVersion()))
--#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
-- .arg(QSslSocket::sslLibraryVersionString());
--#else
-- .arg(QCoreApplication::translate("ownCloudTheme::about()", "built
with %1").arg(
-- QString::fromAscii(OPENSSL_VERSION_TEXT)));
--#endif
--#endif
-- return devString;
--}
--
- QString Theme::about() const
- {
- QString re;
-@@ -322,7 +299,6 @@ QString Theme::about() const
- "United States, other countries, or both.</p>")
- .arg(APPLICATION_VENDOR).arg(APPLICATION_NAME);
-
-- re += gitSHA1();
- return re;
- }
-
---- a/client/src/libsync/theme.h
-+++ b/client/src/libsync/theme.h
-@@ -182,11 +182,6 @@ public:
+--- a/src/libsync/theme.cpp
++++ b/src/libsync/theme.cpp
+@@ -319,11 +319,9 @@ QString Theme::gitSHA1() const
+ const QString gitSha1(QLatin1String(GIT_SHA1));
+ devString = QCoreApplication::translate("nextcloudTheme::about()",
+ "<p><small>Built from Git revision <a href=\"%1\">%2</a>"
+- " on %3, %4 using Qt %5, %6</small></p>")
++ " using Qt %3, %4</small></p>")
+ .arg(githubPrefix + gitSha1)
+ .arg(gitSha1.left(6))
+- .arg(__DATE__)
+- .arg(__TIME__)
+ .arg(qVersion())
+ .arg(QSslSocket::sslLibraryVersionString());
#endif
-
- /**
-- * The SHA sum of the released git commit
-- */
-- QString gitSHA1() const;
--
-- /**
- * About dialog contents
- */
- virtual QString about() const;
---- a/nextcloudtheme/nextcloudtheme.h
-+++ b/nextcloudtheme/nextcloudtheme.h
-@@ -85,7 +85,6 @@ public:
- "European Union, other countries, or both.</p>")
- .arg(APPLICATION_VENDOR).arg(APPLICATION_NAME);
-
-- re += gitSHA1();
- return re;
- }
-
