Hello community,

here is the log from the commit of package nulloy for openSUSE:Factory checked 
in at 2020-06-06 23:40:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/nulloy (Old)
 and      /work/SRC/openSUSE:Factory/.nulloy.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "nulloy"

Sat Jun  6 23:40:46 2020 rev:10 rq:812037 version:0.8.2.pre61qt5.9b036e

Changes:
--------
--- /work/SRC/openSUSE:Factory/nulloy/nulloy.changes    2019-11-07 
23:20:09.812770452 +0100
+++ /work/SRC/openSUSE:Factory/.nulloy.new.3606/nulloy.changes  2020-06-06 
23:40:59.081213427 +0200
@@ -1,0 +2,13 @@
+Sat Jun  6 07:48:43 UTC 2020 - Dave Plater <[email protected]>
+
+- Update to snapshot 0.8.2.pre61qt5.9b036e and fix qt5.15 build
+  with nulloy-QPainterPath-patch see:
+  https://github.com/nulloy/nulloy/issues/156
+- Remove incorporated patches:
+  0001-configurable-library-directory.patch,
+  0001-vlc-phonon-plugins-update.patch and
+  0001-pkg_check_lib-fix.patch
+- Upstream changes beside patches:
+  *Fix LIBDIR variable reference
+
+-------------------------------------------------------------------

Old:
----
  0001-configurable-library-directory.patch
  0001-pkg_check_lib-fix.patch
  0001-vlc-phonon-plugins-update.patch
  nulloy-0.8.2.pre61qt5.tar.gz

New:
----
  nulloy-0.8.2.pre61qt5.9b036e.tar.gz
  nulloy-QPainterPath-patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ nulloy.spec ++++++
--- /var/tmp/diff_new_pack.MZ1Frr/_old  2020-06-06 23:41:00.417217620 +0200
+++ /var/tmp/diff_new_pack.MZ1Frr/_new  2020-06-06 23:41:00.421217632 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package nulloy
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,20 +16,18 @@
 #
 
 
-%define rev d15e0f3aee22ef1cdd84729cf75f505adcc0ffda
+%define rev 9b036eafd1b526c70c8fce8f5f6c1e76b9d74761
 
 Name:           nulloy
-Version:        0.8.2.pre61qt5
+Version:        0.8.2.pre61qt5.9b036e
 Release:        0
 Summary:        Music player with a Waveform Progress Bar
 License:        GPL-3.0-only
 Group:          Productivity/Multimedia/Sound/Players
-Url:            http://nulloy.com
+URL:            http://nulloy.com
 Source:         
https://github.com/nulloy/nulloy/archive/%{rev}.tar.gz#/%{name}-%{version}.tar.gz
-Patch0:         0001-configurable-library-directory.patch
-Patch1:         0001-vlc-phonon-plugins-update.patch
-Patch2:         0001-pkg_check_lib-fix.patch
-Patch3:         reproducible.patch
+Patch0:         reproducible.patch
+Patch1:         nulloy-QPainterPath-patch
 BuildRequires:  gcc-c++
 BuildRequires:  hicolor-icon-theme
 BuildRequires:  libQt5Gui-private-headers-devel
@@ -100,8 +98,8 @@
 
 %build
 # This is not an autotools configure
-CFLAGS="%{optflags} -isystem %{_includedir}/phonon4qt5"
-CXXFLAGS="$CFLAGS" \
+CFLAGS="%{optflags}" \
+CXXFLAGS="%{optflags}" \
 QMAKE=qmake-qt5 \
 LRELEASE=lrelease-qt5 \
 ./configure \
@@ -128,18 +126,8 @@
        --gstreamer-tagreader
 
 %makeinstall
-mkdir -p %{buildroot}%{_libdir}
-mv %{buildroot}%{_prefix}/%{name} %{buildroot}%{_libdir}
 %suse_update_desktop_file %{name}
 
-%post
-%icon_theme_cache_post
-%desktop_database_post
-
-%postun
-%desktop_database_postun
-%icon_theme_cache_postun
-
 %files
 %defattr(-,root,root)
 %doc AUTHORS ChangeLog THANKS

++++++ nulloy-QPainterPath-patch ++++++
From: Dave Plater <[email protected]>
Date: Sat  6 Jun 09:45:43 SAST 2020
Subject: Fix missing QPainterPath include
Author: Dave Plater <[email protected]>

Qt5.15 needs #include <QPainterPath> for QPainterPath class

diff --git a/src/widgetCollection/waveformSlider.cpp 
b/src/widgetCollection/waveformSlider.cpp
index 38c4fea..af314e7 100644
--- a/src/widgetCollection/waveformSlider.cpp
+++ b/src/widgetCollection/waveformSlider.cpp
@@ -26,6 +26,7 @@
 #include <QMouseEvent>
 #include <QFile>
 #include <QStylePainter>
+#include <QPainterPath>
 #include <QStyleOptionFocusRect>
 
 #define IDLE_INTERVAL 60

Reply via email to