Hello community,
here is the log from the commit of package nextcloud-client for
openSUSE:Factory checked in at 2017-01-25 23:34:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/nextcloud-client (Old)
and /work/SRC/openSUSE:Factory/.nextcloud-client.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nextcloud-client"
Changes:
--------
--- /work/SRC/openSUSE:Factory/nextcloud-client/nextcloud-client.changes
2016-10-02 00:09:45.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.nextcloud-client.new/nextcloud-client.changes
2017-01-25 23:34:54.410125488 +0100
@@ -1,0 +2,6 @@
+Tue Jan 24 17:08:34 UTC 2017 - sor.ale...@meowr.ru
+
+- Add nextcloud-client-fix-tray-workaround.patch: fix the tray
+ workaround (from commit 98efb07 of owncloud-client).
+
+-------------------------------------------------------------------
New:
----
nextcloud-client-fix-tray-workaround.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ nextcloud-client.spec ++++++
--- /var/tmp/diff_new_pack.gi07tb/_old 2017-01-25 23:34:55.741924814 +0100
+++ /var/tmp/diff_new_pack.gi07tb/_new 2017-01-25 23:34:55.745924212 +0100
@@ -1,7 +1,7 @@
#
# spec file for package nextcloud-client
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -33,6 +33,8 @@
Patch1: nextcloud-client-fix-nemo-appname.patch
# PATCH-FIX-OPENSUSE nextcloud-client-fix-ru-typo.patch sor.ale...@meowr.ru --
Fix Russian localisation.
Patch2: nextcloud-client-fix-ru-typo.patch
+# PATCH-FIX-UPSTREAM nextcloud-client-fix-tray-workaround.patch -- Fix the
tray workaround (from commit 98efb07 of owncloud-client).
+Patch3: nextcloud-client-fix-tray-workaround.patch
BuildRequires: cmake >= 2.8.0
BuildRequires: doxygen
BuildRequires: fdupes
@@ -173,6 +175,7 @@
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
cp -f %{SOURCE1} sysctl-sync-inotify.conf
# A workaround for gh#owncloud/ownbrander#322
@@ -189,8 +192,8 @@
-DBUILD_WITH_QT4=ON \
%endif
-DOEM_THEME_DIR="$nextcloud_theme"
-make %{?_smp_mflags}
-make doc %{?_smp_mflags}
+make %{?_smp_mflags} V=1
+make doc %{?_smp_mflags} V=1
popd
%install
++++++ nextcloud-client-fix-tray-workaround.patch ++++++
--- a/client/src/gui/owncloudgui.cpp
+++ b/client/src/gui/owncloudgui.cpp
@@ -465,13 +465,17 @@ void ownCloudGui::setupContextMenu()
// The Qt version check intentionally uses 5.0.0 (where platformMenu()
// was introduced) instead of 5.5.0 to avoid issues where the Qt
// version used to build is different from the one used at runtime.
+ // If we build with 5.6.1 or newer, we can skip this because the
+ // bugs should be fixed there.
#ifdef Q_OS_LINUX
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
- QObject* platformMenu =
reinterpret_cast<QObject*>(_tray->contextMenu()->platformMenu());
- if (platformMenu
- && platformMenu->metaObject()->className() ==
QLatin1String("QDBusPlatformMenu")) {
- _qdbusmenuWorkaround = true;
- qDebug() << "Enabled QDBusPlatformMenu workaround";
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)) && (QT_VERSION <
QT_VERSION_CHECK(5, 6, 0))
+ if (qVersion() == QByteArray("5.5.0")) {
+ QObject* platformMenu =
reinterpret_cast<QObject*>(_tray->contextMenu()->platformMenu());
+ if (platformMenu &&
+ platformMenu->metaObject()->className() ==
QLatin1String("QDBusPlatformMenu")) {
+ _qdbusmenuWorkaround = true;
+ qDebug() << "Enabled QDBusPlatformMenu workaround";
+ }
}
#endif
#endif
