Hello community,
here is the log from the commit of package owncloud-client for openSUSE:Factory
checked in at 2019-02-01 11:48:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/owncloud-client (Old)
and /work/SRC/openSUSE:Factory/.owncloud-client.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "owncloud-client"
Fri Feb 1 11:48:38 2019 rev:16 rq:670466 version:2.5.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/owncloud-client/owncloud-client.changes
2018-11-12 09:43:31.405001619 +0100
+++
/work/SRC/openSUSE:Factory/.owncloud-client.new.28833/owncloud-client.changes
2019-02-01 11:48:59.264334229 +0100
@@ -1,0 +2,7 @@
+Tue Jan 29 21:28:47 UTC 2019 - Klaas Freitag <[email protected]>
+
+- Update to upstream version 2.5.2
+ Changelog available at https://owncloud.org/changelog/desktop-client/
+- Added no_theme_icons.patch to avoid icon mix in the app
+
+-------------------------------------------------------------------
Old:
----
owncloudclient-2.5.1.10973.tar.xz
New:
----
no_theme_icons.patch
owncloudclient-2.5.2.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ owncloud-client.spec ++++++
--- /var/tmp/diff_new_pack.ZBwYJF/_old 2019-02-01 11:49:01.888331535 +0100
+++ /var/tmp/diff_new_pack.ZBwYJF/_new 2019-02-01 11:49:01.892331531 +0100
@@ -1,7 +1,7 @@
#
# spec file for package owncloud-client
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 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
@@ -18,7 +18,7 @@
Name: owncloud-client
-Version: 2.5.1.10973
+Version: 2.5.2
Release: 0
Summary: The ownCloud synchronization client
@@ -32,6 +32,7 @@
# PATCH-FIX-UPSTREAM fix position of systray menu
https://github.com/owncloud/client/issues/5968
# for all except tumbleweed and ongoing, as the Qt bug is fixed in there.
Patch0: fix-systray-menu-pos.patch
+Patch1: no_theme_icons.patch
%define cmake_args -DSYSCONF_INSTALL_DIR=%{_sysconfdir}
@@ -71,7 +72,6 @@
BuildRequires: libopenssl-devel
BuildRequires: update-desktop-files
-BuildRequires: python-Sphinx
BuildRequires: sqlite3-devel
BuildRequires: hicolor-icon-theme
@@ -206,6 +206,7 @@
%if 0%{?suse_version} <= 1500
%patch0 -p1
%endif
+%patch1 -p1
%build
echo suse_version 0%{?suse_version}
@@ -235,24 +236,9 @@
env LD_RUN_PATH=%{_libdir}/owncloud:%{_libdir}/owncloud make %{?_smp_mflags}
VERBOSE=1
-make doc-html-org
-make doc-man
-
%install
%cmake_install
-mkdir -p %{buildroot}%{_docdir}/%{name}
-mv %{buildroot}/usr/share/doc/client/owncloud-client/*
%{buildroot}%{_docdir}/%{name}
-rmdir %{buildroot}/usr/share/doc/client/owncloud-client
-rmdir %{buildroot}/usr/share/doc/client
-rm %{buildroot}%{_docdir}/%{name}/html/unthemed/.buildinfo
-mv %{buildroot}%{_docdir}/%{name}/html/unthemed/*
%{buildroot}%{_docdir}/%{name}/html/
-rmdir %{buildroot}%{_docdir}/%{name}/html/unthemed
-rm -r %{buildroot}%{_docdir}/%{name}/html/com/
-rm -r %{buildroot}%{_docdir}/%{name}/html/org/
-# Copy the
-cp COPYING.documentation %{buildroot}%{_docdir}/%{name}/
-
# Copy the source README here to be picked up by doc macro
cp %{SOURCE2} .
@@ -295,25 +281,12 @@
%{_datadir}/applications/owncloud.desktop
%{_datadir}/icons/hicolor
%{_datadir}/mime/packages/owncloud.xml
-%{_mandir}/man1/owncloud*
-%doc CONTRIBUTING.md COPYING ChangeLog README.md README.source
-%exclude %{_docdir}/%{name}/COPYING.documentation
-%exclude %{_docdir}/%{name}/html
+%doc CONTRIBUTING.md COPYING ChangeLog README.md README.source
COPYING.documentation
%config /etc/ownCloud
# https://github.com/owncloud/client/issues/4107
%config /etc/sysctl.d/101-sync-inotify.conf
-%files -n %{name}-doc
-%defattr(-,root,root,-)
-%doc %{_docdir}/%{name}/html
-%doc %{_docdir}/%{name}/COPYING.documentation
-%exclude %{_docdir}/%{name}/CONTRIBUTING.md
-%exclude %{_docdir}/%{name}/COPYING
-%exclude %{_docdir}/%{name}/ChangeLog
-%exclude %{_docdir}/%{name}/README.md
-%exclude %{_docdir}/%{name}/README.source
-
%files -n %{name}-l10n
%defattr(-,root,root,-)
%{_datadir}/owncloud/
++++++ no_theme_icons.patch ++++++
diff --git a/src/libsync/theme.cpp b/src/libsync/theme.cpp
index 245c8d7..3ba9e22 100644
--- a/src/libsync/theme.cpp
+++ b/src/libsync/theme.cpp
@@ -136,11 +136,6 @@ QIcon Theme::themeIcon(const QString &name, bool sysTray,
bool sysTrayMenuVisibl
QString key = name + "," + flavor;
QIcon &cached = _iconCache[key]; // Take reference, this will also "set"
the cache entry
if (cached.isNull()) {
- if (QIcon::hasThemeIcon(name)) {
- // use from theme
- return cached = QIcon::fromTheme(name);
- }
-
QList<int> sizes;
sizes << 16 << 22 << 32 << 48 << 64 << 128 << 256 << 512 << 1024;
foreach (int size, sizes) {
++++++ owncloudclient-2.5.1.10973.tar.xz -> owncloudclient-2.5.2.tar.xz ++++++
/work/SRC/openSUSE:Factory/owncloud-client/owncloudclient-2.5.1.10973.tar.xz
/work/SRC/openSUSE:Factory/.owncloud-client.new.28833/owncloudclient-2.5.2.tar.xz
differ: char 25, line 1
