Hello community, here is the log from the commit of package nitroshare for openSUSE:Factory checked in at 2018-06-19 11:56:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nitroshare (Old) and /work/SRC/openSUSE:Factory/.nitroshare.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nitroshare" Tue Jun 19 11:56:30 2018 rev:8 rq:616322 version:0.3.4 Changes: -------- --- /work/SRC/openSUSE:Factory/nitroshare/nitroshare.changes 2018-02-13 10:31:01.817576440 +0100 +++ /work/SRC/openSUSE:Factory/.nitroshare.new/nitroshare.changes 2018-06-19 11:56:35.677779692 +0200 @@ -1,0 +2,7 @@ +Tue Jun 12 11:12:00 UTC 2018 - [email protected] + +- Add nitroshare-fix-qt-5.11-build.patch: Fix Qt 5.11+ + compatibility. +- Some clean-up. + +------------------------------------------------------------------- New: ---- nitroshare-fix-qt-5.11-build.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nitroshare.spec ++++++ --- /var/tmp/diff_new_pack.DGax89/_old 2018-06-19 11:56:36.293756824 +0200 +++ /var/tmp/diff_new_pack.DGax89/_new 2018-06-19 11:56:36.297756675 +0200 @@ -23,12 +23,14 @@ Summary: Network file transfer application License: MIT Group: Productivity/Networking/File-Sharing -Url: https://nitroshare.net/ +URL: https://nitroshare.net/ Source: https://launchpad.net/%{name}/%{_version}/%{version}/+download/%{name}-%{version}.tar.gz Source1: https://launchpad.net/%{name}/%{_version}/%{version}/+download/%{name}-%{version}.tar.gz.asc Source2: %{name}.keyring # PATCH-FIX-UPSTREAM nitroshare-fix-caja.patch [email protected] -- Use a correct Caja GI API version. Patch0: %{name}-fix-caja.patch +# PATCH-FIX-OPENSUSE nitroshare-fix-qt-5.11-build.patch -- Fix Qt 5.11+ compatibility. +Patch1: %{name}-fix-qt-5.11-build.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: gobject-introspection-devel @@ -53,7 +55,6 @@ Group: Productivity/File utilities Requires: %{name} = %{version} Requires: caja -Requires: python-caja Supplements: packageand(caja:%{name}) %description -n caja-extension-%{name} @@ -65,26 +66,22 @@ Group: Productivity/File utilities Requires: %{name} = %{version} Requires: nautilus -Requires: python-nautilus Supplements: packageand(nautilus:%{name}) %description -n nautilus-extension-%{name} A network file transfer application. This package integrates NitroShare into Nautilus. -%if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120200 && 0%{?is_opensuse}) %package -n nemo-extension-%{name} Summary: NitroShare integration for Nemo Group: Productivity/File utilities Requires: %{name} = %{version} Requires: nemo -Requires: python-nemo Supplements: packageand(nemo:%{name}) %description -n nemo-extension-%{name} A network file transfer application. This package integrates NitroShare into Nemo. -%endif %package kde Summary: NitroShare integration into KDE @@ -98,6 +95,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build %cmake @@ -107,10 +105,7 @@ %cmake_install %suse_update_desktop_file -r %{name} Network FileTransfer -%if 0%{?suse_version} <= 1320 && !(0%{?sle_version} >= 120200 && 0%{?is_opensuse}) -rm -rf %{buildroot}%{_datadir}/nemo-python/ -%endif - +%if 0%{?suse_version} < 1500 %post %desktop_database_post %icon_theme_cache_post @@ -118,10 +113,15 @@ %postun %desktop_database_postun %icon_theme_cache_postun +%endif %files -%defattr(-,root,root) -%doc LICENSE.txt README.md +%if 0%{?suse_version} >= 1500 +%license LICENSE.txt +%else +%doc LICENSE.txt +%endif +%doc README.md %{_bindir}/%{name} %{_bindir}/%{name}-send %{_datadir}/applications/%{name}.desktop @@ -129,25 +129,16 @@ %{_mandir}/man?/%{name}.?%{?ext_man} %files -n caja-extension-%{name} -%defattr(-,root,root) -%doc LICENSE.txt %{_datadir}/caja-python/ %files -n nautilus-extension-%{name} -%defattr(-,root,root) -%doc LICENSE.txt %{_datadir}/nautilus-python/ -%if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120200 && 0%{?is_opensuse}) %files -n nemo-extension-%{name} -%defattr(-,root,root) -%doc LICENSE.txt %{_datadir}/nemo-python/ -%endif %files kde -%defattr(-,root,root) -%dir %{_datadir}/kservices5 +%dir %{_datadir}/kservices5/ %{_datadir}/kservices5/nitroshare_addtoservicemenu.desktop %changelog ++++++ nitroshare-fix-qt-5.11-build.patch ++++++ --- a/src/application/splashdialog.cpp +++ b/src/application/splashdialog.cpp @@ -24,6 +24,7 @@ #include <QApplication> #include <QDesktopWidget> +#include <QStyle> #include "splashdialog.h"
