commit nulloy for openSUSE:Factory
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.changes2019-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
+
+- 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
Date: Sat 6 Jun 09:45:43 SAST 2020
Subject: Fix missing QPainterPath include
Author: Dave Plater
Qt5.15 needs #include 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
#include
#include
+#include
#include
#define IDLE_INTERVAL 60
commit nulloy for openSUSE:Factory
Hello community,
here is the log from the commit of package nulloy for openSUSE:Factory checked
in at 2019-11-07 23:19:58
Comparing /work/SRC/openSUSE:Factory/nulloy (Old)
and /work/SRC/openSUSE:Factory/.nulloy.new.2990 (New)
Package is "nulloy"
Thu Nov 7 23:19:58 2019 rev:9 rq:746150 version:0.8.2.pre61qt5
Changes:
--- /work/SRC/openSUSE:Factory/nulloy/nulloy.changes2019-09-17
13:39:44.937820475 +0200
+++ /work/SRC/openSUSE:Factory/.nulloy.new.2990/nulloy.changes 2019-11-07
23:20:09.812770452 +0100
@@ -1,0 +2,5 @@
+Wed Nov 6 14:56:49 UTC 2019 - Bernhard Wiedemann
+
+- Add reproducible.patch to make zip timestamps reproducible (boo#1134568)
+
+---
New:
reproducible.patch
Other differences:
--
++ nulloy.spec ++
--- /var/tmp/diff_new_pack.Kd2ZAQ/_old 2019-11-07 23:20:10.768771478 +0100
+++ /var/tmp/diff_new_pack.Kd2ZAQ/_new 2019-11-07 23:20:10.776771486 +0100
@@ -29,6 +29,7 @@
Patch0: 0001-configurable-library-directory.patch
Patch1: 0001-vlc-phonon-plugins-update.patch
Patch2: 0001-pkg_check_lib-fix.patch
+Patch3: reproducible.patch
BuildRequires: gcc-c++
BuildRequires: hicolor-icon-theme
BuildRequires: libQt5Gui-private-headers-devel
++ reproducible.patch ++
https://github.com/nulloy/nulloy/pull/149
commit c6d8e5cf2774da57be2fe02aca3f004be0be7744
Author: Bernhard M. Wiedemann
Date: Thu May 9 12:28:07 2019 +0200
skins: Do not save extra file attributes in .zip
to make it easier to make a reproducible build
See https://reproducible-builds.org/ for why this is good.
Index: nulloy-0.8.2/src/skins/skins.pri
===
--- nulloy-0.8.2.orig/src/skins/skins.pri
+++ nulloy-0.8.2/src/skins/skins.pri
@@ -4,7 +4,7 @@ win32:SKIN_DEST_DIR = $$SRC_DIR/../Skins
system($$QMAKE_MKDIR $$fixSlashes($$SKIN_DEST_DIR))
unix {
-ZIP_ADD_CMD = zip -j
+ZIP_ADD_CMD = zip -j -X
ZIP_DEL_CMD = zip -d
}
win32 {
commit nulloy for openSUSE:Factory
Hello community,
here is the log from the commit of package nulloy for openSUSE:Factory checked
in at 2019-09-17 13:39:42
Comparing /work/SRC/openSUSE:Factory/nulloy (Old)
and /work/SRC/openSUSE:Factory/.nulloy.new.7948 (New)
Package is "nulloy"
Tue Sep 17 13:39:42 2019 rev:8 rq:731385 version:0.8.2.pre61qt5
Changes:
--- /work/SRC/openSUSE:Factory/nulloy/nulloy.changes2019-05-20
10:28:50.569907399 +0200
+++ /work/SRC/openSUSE:Factory/.nulloy.new.7948/nulloy.changes 2019-09-17
13:39:44.937820475 +0200
@@ -1,0 +2,6 @@
+Tue Sep 17 05:39:33 UTC 2019 - Dave Plater
+
+- Fix Factory build with -isystem pointing to phonon4qt5 include
+ directory.
+
+---
Other differences:
--
++ nulloy.spec ++
--- /var/tmp/diff_new_pack.fMyvj3/_old 2019-09-17 13:39:45.425820397 +0200
+++ /var/tmp/diff_new_pack.fMyvj3/_new 2019-09-17 13:39:45.429820397 +0200
@@ -99,8 +99,8 @@
%build
# This is not an autotools configure
-CFLAGS="%{optflags}" \
-CXXFLAGS="%{optflags}" \
+CFLAGS="%{optflags} -isystem %{_includedir}/phonon4qt5"
+CXXFLAGS="$CFLAGS" \
QMAKE=qmake-qt5 \
LRELEASE=lrelease-qt5 \
./configure \
commit nulloy for openSUSE:Factory
Hello community,
here is the log from the commit of package nulloy for openSUSE:Factory checked
in at 2019-05-20 10:28:47
Comparing /work/SRC/openSUSE:Factory/nulloy (Old)
and /work/SRC/openSUSE:Factory/.nulloy.new.5148 (New)
Package is "nulloy"
Mon May 20 10:28:47 2019 rev:7 rq:703938 version:0.8.2.pre61qt5
Changes:
--- /work/SRC/openSUSE:Factory/nulloy/nulloy.changes2019-05-07
23:20:23.361110182 +0200
+++ /work/SRC/openSUSE:Factory/.nulloy.new.5148/nulloy.changes 2019-05-20
10:28:50.569907399 +0200
@@ -1,0 +2,7 @@
+Sat May 18 08:46:27 UTC 2019 - plater
+
+- Removed fix-library-directory.patch and replaced with modified
+ patch from git 0001-configurable-library-directory.patch.
+- Removed unneeded build conditonals for phonon and vlc.
+
+---
Old:
fix-library-directory.patch
New:
0001-configurable-library-directory.patch
Other differences:
--
++ nulloy.spec ++
--- /var/tmp/diff_new_pack.CaUZzU/_old 2019-05-20 10:28:51.689907027 +0200
+++ /var/tmp/diff_new_pack.CaUZzU/_new 2019-05-20 10:28:51.693907026 +0200
@@ -12,15 +12,12 @@
# 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 rev d15e0f3aee22ef1cdd84729cf75f505adcc0ffda
-%bcond_without libvlc
-%bcond_without phonon
-
Name: nulloy
Version:0.8.2.pre61qt5
Release:0
@@ -29,7 +26,7 @@
Group: Productivity/Multimedia/Sound/Players
Url:http://nulloy.com
Source:
https://github.com/nulloy/nulloy/archive/%{rev}.tar.gz#/%{name}-%{version}.tar.gz
-Patch0: fix-library-directory.patch
+Patch0: 0001-configurable-library-directory.patch
Patch1: 0001-vlc-phonon-plugins-update.patch
Patch2: 0001-pkg_check_lib-fix.patch
BuildRequires: gcc-c++
@@ -46,15 +43,13 @@
BuildRequires: pkgconfig(Qt5Widgets)
BuildRequires: pkgconfig(gstreamer-1.0)
BuildRequires: pkgconfig(gstreamer-pbutils-1.0)
-%if %{with libvlc}
BuildRequires: pkgconfig(libvlc)
-%endif
-%if %{with phonon}
BuildRequires: pkgconfig(phonon4qt5)
-%endif
BuildRequires: pkgconfig(taglib)
Recommends: %{name}-gstreamer
Recommends: %{name}-taglib
+Recommends: %{name}-phonon
+Recommends: %{name}-vlc
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -106,31 +101,28 @@
# This is not an autotools configure
CFLAGS="%{optflags}" \
CXXFLAGS="%{optflags}" \
+QMAKE=qmake-qt5 \
+LRELEASE=lrelease-qt5 \
./configure \
--no-update-check \
--prefix %{_prefix} \
-%if %{with libvlc}
--vlc \
-%endif
-%if %{with phonon}
--phonon \
-%endif
--libdir "%{_lib}" \
--gstreamer-tagreader
-#
make %{?_smp_mflags}
%install
+CFLAGS="%{optflags}" \
+CXXFLAGS="%{optflags}" \
+QMAKE=qmake-qt5 \
+LRELEASE=lrelease-qt5 \
./configure \
--no-update-check \
--prefix %{buildroot}%{_prefix} \
-%if %{with libvlc}
--vlc \
-%endif
-%if %{with phonon}
--phonon \
-%endif
--libdir "%{_lib}" \
--gstreamer-tagreader
@@ -166,16 +158,12 @@
%defattr(-,root,root)
%{_libdir}/nulloy/plugins/libplugin_gstreamer.so
-%if %{with phonon}
%files phonon
%defattr(-,root,root)
%{_libdir}/nulloy/plugins/libplugin_phonon.so
-%endif
-%if %{with libvlc}
%files vlc
%defattr(-,root,root)
%{_libdir}/nulloy/plugins/libplugin_vlc.so
-%endif
%changelog
++ 0001-configurable-library-directory.patch ++
>From d3534e7f60842365542ab39d3f26f85fdccbba0c Mon Sep 17 00:00:00 2001
From: Sergey Vlasov
Date: Fri, 17 May 2019 15:14:25 +
Subject: [PATCH] configurable library directory
---
configure | 9 -
nulloy.desktop | 2 +-
src/pluginLoader.cpp | 2 +-
src/plugins/plugin.pri | 2 +-
src/src.pro| 1 +
5 files changed, 12 insertions(+), 4 deletions(-)
Index: nulloy-d15e0f3aee22ef1cdd84729cf75f505adcc0ffda/configure
===
--- nulloy-d15e0f3aee22ef1cdd84729cf75f505adcc0ffda.orig/configure
2019-01-03 01:47:17.0 +0200
+++ nulloy-d15e0f3aee22ef1cdd84729cf75f505adcc0ffda/configure 2019-05-18
10:05:29.953428079 +0200
@@ -3,6 +3,7 @@
BASENAME=$(basename $0)
CWD=$(dirname $0)
PREFIX=/usr
+LIBDIR=lib
DEBUG=no
APP_NAME=nulloy
@@ -30,7 +31,8 @@ echo_help() {
echo '--no-skins disable skins support'
echo '--force-version VERSION overrides version.pri'
echo '--no-update-check disable on
commit nulloy for openSUSE:Factory
Hello community,
here is the log from the commit of package nulloy for openSUSE:Factory checked
in at 2019-05-07 23:20:20
Comparing /work/SRC/openSUSE:Factory/nulloy (Old)
and /work/SRC/openSUSE:Factory/.nulloy.new.5148 (New)
Package is "nulloy"
Tue May 7 23:20:20 2019 rev:6 rq:701341 version:0.8.2.pre61qt5
Changes:
--- /work/SRC/openSUSE:Factory/nulloy/nulloy.changes2019-05-06
13:28:07.753369295 +0200
+++ /work/SRC/openSUSE:Factory/.nulloy.new.5148/nulloy.changes 2019-05-07
23:20:23.361110182 +0200
@@ -1,0 +2,6 @@
+Tue May 7 14:09:33 UTC 2019 - plater
+
+- Fix vlc plugin build with 0001-vlc-phonon-plugins-update.patch
+- Add 0001-pkg_check_lib-fix.patch from git.
+
+---
New:
0001-pkg_check_lib-fix.patch
0001-vlc-phonon-plugins-update.patch
Other differences:
--
++ nulloy.spec ++
--- /var/tmp/diff_new_pack.b4PkWO/_old 2019-05-07 23:20:23.817111222 +0200
+++ /var/tmp/diff_new_pack.b4PkWO/_new 2019-05-07 23:20:23.82231 +0200
@@ -12,14 +12,14 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via https://bugs.opensuse.org/
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
%define rev d15e0f3aee22ef1cdd84729cf75f505adcc0ffda
-%bcond_with libvlc
-%bcond_with phonon
+%bcond_without libvlc
+%bcond_without phonon
Name: nulloy
Version:0.8.2.pre61qt5
@@ -30,6 +30,8 @@
Url:http://nulloy.com
Source:
https://github.com/nulloy/nulloy/archive/%{rev}.tar.gz#/%{name}-%{version}.tar.gz
Patch0: fix-library-directory.patch
+Patch1: 0001-vlc-phonon-plugins-update.patch
+Patch2: 0001-pkg_check_lib-fix.patch
BuildRequires: gcc-c++
BuildRequires: hicolor-icon-theme
BuildRequires: libQt5Gui-private-headers-devel
@@ -48,7 +50,7 @@
BuildRequires: pkgconfig(libvlc)
%endif
%if %{with phonon}
-BuildRequires: pkgconfig(phonon)
+BuildRequires: pkgconfig(phonon4qt5)
%endif
BuildRequires: pkgconfig(taglib)
Recommends: %{name}-gstreamer
@@ -98,7 +100,7 @@
%prep
%setup -qn %{name}-%{rev}
-%patch0 -p1
+%autopatch -p1
%build
# This is not an autotools configure
++ 0001-pkg_check_lib-fix.patch ++
>From 39e7b6d0144800e2f1c8824b38863f9f1cc52e82 Mon Sep 17 00:00:00 2001
From: Sergey Vlasov
Date: Tue, 7 May 2019 11:54:58 +
Subject: [PATCH] pkg_check_lib fix
---
configure | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/configure b/configure
index 645d280..cabd0c3 100755
--- a/configure
+++ b/configure
@@ -117,9 +117,9 @@ echo "PKG_CONFIG = $PKG_CONFIG" >> $QMAKE_CACHE
[[ -n "$LDFLAGS" ]] && echo "QMAKE_LFLAGS += ${LDFLAGS}">> $QMAKE_CACHE
pkg_check_lib() {
-for P in $@; do
-if $PKG_CONFIG --print-errors $1; then
-echo "Found $1"
+for LIB in $@; do
+if $PKG_CONFIG --print-errors $LIB; then
+echo "Found '$LIB'"
else
echo
exit 1
--
2.16.4
++ 0001-vlc-phonon-plugins-update.patch ++
>From fc10f2d746c58e8fecb52319d1209a49e1cf8aa9 Mon Sep 17 00:00:00 2001
From: Sergey Vlasov
Date: Tue, 7 May 2019 11:39:24 +
Subject: [PATCH] vlc & phonon plugins update
---
configure | 19 +++
src/main.cpp| 4
src/plugins/phonon/containerPhonon.cpp | 3 ---
src/plugins/phonon/containerPhonon.h| 1 +
src/plugins/phonon/playbackEnginePhonon.cpp | 4 ++--
src/plugins/phonon/playbackEnginePhonon.h | 2 +-
src/plugins/phonon/pluginPhonon.pro | 2 +-
src/plugins/vlc/containerVlc.cpp| 3 ---
src/plugins/vlc/containerVlc.h | 1 +
src/plugins/vlc/playbackEngineVlc.cpp | 2 +-
src/plugins/vlc/playbackEngineVlc.h | 2 +-
11 files changed, 23 insertions(+), 20 deletions(-)
diff --git a/configure b/configure
index a4583f4..645d280 100755
--- a/configure
+++ b/configure
@@ -117,18 +117,21 @@ echo "PKG_CONFIG = $PKG_CONFIG" >> $QMAKE_CACHE
[[ -n "$LDFLAGS" ]] && echo "QMAKE_LFLAGS += ${LDFLAGS}">> $QMAKE_CACHE
pkg_check_lib() {
-if $PKG_CONFIG --print-errors $1; then
-echo "Found $1"
-else
-echo
-exit 1
-fi
+for P in $@; do
+if $PKG_CONFIG --print-errors $1; then
+echo "Found $1"
+else
+echo
+exit 1
+fi
+shift
+done
}
[[ $BUILD_GSTREAMER == "yes" ]] && pkg_check_lib gstreamer-1.0
[[ $BUILD_GSTREAMER_TAGREADER == "yes" ]] && pkg_check_lib
gstreamer-pbutils-1.0
-[[ $BUILD_VLC ==
commit nulloy for openSUSE:Factory
Hello community,
here is the log from the commit of package nulloy for openSUSE:Factory checked
in at 2019-05-06 13:28:02
Comparing /work/SRC/openSUSE:Factory/nulloy (Old)
and /work/SRC/openSUSE:Factory/.nulloy.new.5148 (New)
Package is "nulloy"
Mon May 6 13:28:02 2019 rev:5 rq:700959 version:0.8.2.pre61qt5
Changes:
--- /work/SRC/openSUSE:Factory/nulloy/nulloy.changes2019-05-05
21:22:30.549455316 +0200
+++ /work/SRC/openSUSE:Factory/.nulloy.new.5148/nulloy.changes 2019-05-06
13:28:07.753369295 +0200
@@ -1,0 +2,5 @@
+Sun May 5 18:57:07 UTC 2019 - Jan Engelhardt
+
+- Remove %if..%endif guards that do not affect the build result.
+
+---
Other differences:
--
++ nulloy.spec ++
--- /var/tmp/diff_new_pack.nPH1pj/_old 2019-05-06 13:28:09.517373136 +0200
+++ /var/tmp/diff_new_pack.nPH1pj/_new 2019-05-06 13:28:09.521373144 +0200
@@ -12,7 +12,7 @@
# 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/
#
@@ -78,7 +78,6 @@
This package contains the gstreamer playback plugin for %{name} - a lightweight
music player with a Waveform Progressbar.
-%if %{with phonon}
%package phonon
Summary:Phonon plugin for %{name}
Group: Productivity/Multimedia/Sound/Players
@@ -87,9 +86,7 @@
%description phonon
This package contains the phonon playback plugin for %{name} - a lightweight
music player with a Waveform Progressbar.
-%endif
-%if %{with libvlc}
%package vlc
Summary:VLC plugin for %{name}
Group: Productivity/Multimedia/Sound/Players
@@ -98,7 +95,6 @@
%description vlc
This package contains the vlc playback plugin for %{name} - a lightweight
music player with a Waveform Progressbar.
-%endif
%prep
%setup -qn %{name}-%{rev}
commit nulloy for openSUSE:Factory
Hello community,
here is the log from the commit of package nulloy for openSUSE:Factory checked
in at 2019-05-05 21:22:26
Comparing /work/SRC/openSUSE:Factory/nulloy (Old)
and /work/SRC/openSUSE:Factory/.nulloy.new.5148 (New)
Package is "nulloy"
Sun May 5 21:22:26 2019 rev:4 rq:700859 version:0.8.2.pre61qt5
Changes:
--- /work/SRC/openSUSE:Factory/nulloy/nulloy.changes2016-04-28
16:57:08.0 +0200
+++ /work/SRC/openSUSE:Factory/.nulloy.new.5148/nulloy.changes 2019-05-05
21:22:30.549455316 +0200
@@ -1,0 +2,6 @@
+Thu May 2 16:03:44 UTC 2019 - plater
+
+- Update to 0.8.2.pre61qt5 git snapshot to build with qt5
+- Rebased fix-library-directory.patch
+
+---
Old:
nulloy-0.8.2.tar.gz
New:
nulloy-0.8.2.pre61qt5.tar.gz
Other differences:
--
++ nulloy.spec ++
--- /var/tmp/diff_new_pack.UKH36j/_old 2019-05-05 21:22:30.973456471 +0200
+++ /var/tmp/diff_new_pack.UKH36j/_new 2019-05-05 21:22:30.977456482 +0200
@@ -1,7 +1,7 @@
#
# spec file for package nulloy
#
-# Copyright (c) 2016 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
@@ -16,25 +16,40 @@
#
+%define rev d15e0f3aee22ef1cdd84729cf75f505adcc0ffda
+
+%bcond_with libvlc
+%bcond_with phonon
+
Name: nulloy
-Version:0.8.2
+Version:0.8.2.pre61qt5
Release:0
Summary:Music player with a Waveform Progress Bar
-License:GPL-3.0
+License:GPL-3.0-only
Group: Productivity/Multimedia/Sound/Players
Url:http://nulloy.com
-Source:
https://github.com/nulloy/nulloy/releases/download/%{version}/%{name}-%{version}.tar.gz
+Source:
https://github.com/nulloy/nulloy/archive/%{rev}.tar.gz#/%{name}-%{version}.tar.gz
Patch0: fix-library-directory.patch
BuildRequires: gcc-c++
BuildRequires: hicolor-icon-theme
-BuildRequires: libqt4-devel
+BuildRequires: libQt5Gui-private-headers-devel
BuildRequires: pkgconfig
BuildRequires: update-desktop-files
BuildRequires: zip
+BuildRequires: pkgconfig(Qt5Core) >= 5.6
+BuildRequires: pkgconfig(Qt5Designer)
+BuildRequires: pkgconfig(Qt5Gui)
+BuildRequires: pkgconfig(Qt5Network)
+BuildRequires: pkgconfig(Qt5Script)
+BuildRequires: pkgconfig(Qt5Widgets)
BuildRequires: pkgconfig(gstreamer-1.0)
BuildRequires: pkgconfig(gstreamer-pbutils-1.0)
+%if %{with libvlc}
BuildRequires: pkgconfig(libvlc)
+%endif
+%if %{with phonon}
BuildRequires: pkgconfig(phonon)
+%endif
BuildRequires: pkgconfig(taglib)
Recommends: %{name}-gstreamer
Recommends: %{name}-taglib
@@ -63,6 +78,7 @@
This package contains the gstreamer playback plugin for %{name} - a lightweight
music player with a Waveform Progressbar.
+%if %{with phonon}
%package phonon
Summary:Phonon plugin for %{name}
Group: Productivity/Multimedia/Sound/Players
@@ -71,7 +87,9 @@
%description phonon
This package contains the phonon playback plugin for %{name} - a lightweight
music player with a Waveform Progressbar.
+%endif
+%if %{with libvlc}
%package vlc
Summary:VLC plugin for %{name}
Group: Productivity/Multimedia/Sound/Players
@@ -80,9 +98,10 @@
%description vlc
This package contains the vlc playback plugin for %{name} - a lightweight
music player with a Waveform Progressbar.
+%endif
%prep
-%setup -q
+%setup -qn %{name}-%{rev}
%patch0 -p1
%build
@@ -91,16 +110,35 @@
CXXFLAGS="%{optflags}" \
./configure \
--no-update-check \
- --taglib \
- --phonon \
+ --prefix %{_prefix} \
+%if %{with libvlc}
--vlc \
- --prefix %{buildroot}%{_prefix} \
- --libdir "%{_lib}"
+%endif
+%if %{with phonon}
+--phonon \
+%endif
+ --libdir "%{_lib}" \
+ --gstreamer-tagreader
+#
make %{?_smp_mflags}
%install
-make DESTDIR=%{buildroot} install %{?_smp_mflags}
+./configure \
+ --no-update-check \
+ --prefix %{buildroot}%{_prefix} \
+%if %{with libvlc}
+ --vlc \
+%endif
+%if %{with phonon}
+--phonon \
+%endif
+ --libdir "%{_lib}" \
+ --gstreamer-tagreader
+
+%makeinstall
+mkdir -p %{buildroot}%{_libdir}
+mv %{buildroot}%{_prefix}/%{name} %{buildroot}%{_libdir}
%suse_update_desktop_file %{name}
%post
@@ -113,7 +151,8 @@
%files
%defattr(-,root,root)
-%doc AUTHORS ChangeLog LICENSE.GPL3 THANKS
+%doc AUTHORS ChangeLog THANKS
+%license LICENSE.GPL3
%{_bindir}/nulloy
%{_datadir}/applications/nulloy.desktop
%{_datadir}/icons/hicolor/*/apps/nulloy.png
@@ -129,12 +168,16 @@
commit nulloy for openSUSE:Factory
Hello community,
here is the log from the commit of package nulloy for openSUSE:Factory checked
in at 2016-04-28 16:54:13
Comparing /work/SRC/openSUSE:Factory/nulloy (Old)
and /work/SRC/openSUSE:Factory/.nulloy.new (New)
Package is "nulloy"
Changes:
--- /work/SRC/openSUSE:Factory/nulloy/nulloy.changes2016-02-01
19:57:50.0 +0100
+++ /work/SRC/openSUSE:Factory/.nulloy.new/nulloy.changes 2016-04-28
16:57:08.0 +0200
@@ -1,0 +2,8 @@
+Fri Apr 15 13:04:59 UTC 2016 - r...@fthiessen.de
+
+- Updated to 0.8.2:
+ * Chinese translation
+ * Fix: tags encoding doesn't apply to playlist
+ * Other minor bug fixes and improvements
+
+---
Old:
nulloy-0.8.1.tar.gz
New:
nulloy-0.8.2.tar.gz
Other differences:
--
++ nulloy.spec ++
--- /var/tmp/diff_new_pack.E747mn/_old 2016-04-28 16:57:09.0 +0200
+++ /var/tmp/diff_new_pack.E747mn/_new 2016-04-28 16:57:09.0 +0200
@@ -17,7 +17,7 @@
Name: nulloy
-Version:0.8.1
+Version:0.8.2
Release:0
Summary:Music player with a Waveform Progress Bar
License:GPL-3.0
++ fix-library-directory.patch ++
--- /var/tmp/diff_new_pack.E747mn/_old 2016-04-28 16:57:09.0 +0200
+++ /var/tmp/diff_new_pack.E747mn/_new 2016-04-28 16:57:09.0 +0200
@@ -1,43 +1,35 @@
-diff -Nur old/configure new/configure
old/configure 2015-12-06 17:17:09.0 +0100
-+++ new/configure 2016-01-30 07:41:44.242270474 +0100
-@@ -3,6 +3,7 @@
- BASENAME=`basename $0`
-
- PREFIX=/usr
-+LIBDIR=lib
- DEBUG=no
- APP_NAME=nulloy
-
-@@ -33,6 +34,7 @@
- echo '--force-version VERSION overrides version.pri'
- echo '--no-update-check disable online check
functionality'
- echo '--prefix PREFIX installation prefix'
-+ echo '--libdir LIBDIR library installation path
{prefix}/{libdir}'
- echo '--no-app-bundle do not make .app (Mac only)'
- echo '--universal build for both i386 and x86_64
(Mac only)'
- echo '--debug build in debug mode'
-@@ -52,7 +54,7 @@
- exit 1
+diff -Nur nulloy-0.8.2/configure new/configure
+--- nulloy-0.8.2/configure 2016-02-03 23:19:41.0 +0100
new/configure 2016-04-15 16:32:35.746385532 +0200
+@@ -33,6 +33,7 @@
+ echo '--force-version VERSION overrides version.pri'
+ echo '--no-update-check disable online check functionality'
+ echo '--prefix PREFIX installation prefix'
++echo '--libdir LIBDIR library installation path
{prefix}/{libdir}'
+ echo '--no-app-bundle do not make .app (Mac only)'
+ echo '--universal build for both i386 and x86_64 (Mac
only)'
+ echo '--debug build in debug mode'
+@@ -52,7 +53,7 @@
+ exit 1
fi
-args=`getopt -n$BASENAME -o h --longoptions="force-version: no-update-check
no-gstreamer no-gstreamer-tagreader vlc phonon taglib no-skins debug prefix:
no-app-bundle universal help" -- "$@"`
+args=`getopt -n$BASENAME -o h --longoptions="force-version: no-update-check
no-gstreamer no-gstreamer-tagreader vlc phonon taglib no-skins debug prefix:
libdir: no-app-bundle universal help" -- "$@"`
if test $? != 0; then
- echo_try; exit 1
-@@ -67,6 +69,9 @@
- else
- PREFIX=`readlink -m "$1"`
- fi
-+ elif [ $1 == "--libdir" ]; then
-+ shift
-+ LIBDIR="$1"
- elif [ $1 == "--debug" ]; then
- DEBUG=yes
- elif [ $1 == "--force-version" ]; then
-@@ -172,6 +177,8 @@
- echo "N_CONFIG_FORCE_VERSION = $FORCE_VERSION" > $QMAKE_CACHE
+ echo_try; exit 1
+@@ -67,6 +68,9 @@
+ else
+ PREFIX=`readlink -m "$1"`
+ fi
++elif [ $1 == "--libdir" ]; then
++shift
++LIBDIR="$1"
+ elif [ $1 == "--debug" ]; then
+ DEBUG=yes
+ elif [ $1 == "--force-version" ]; then
+@@ -172,6 +176,8 @@
+ echo "N_CONFIG_FORCE_VERSION = $FORCE_VERSION" > $QMAKE_CACHE
fi
+echo "N_LIBDIR = $LIBDIR" >> $QMAKE_CACHE
@@ -45,24 +37,19 @@
echo "N_CONFIG_SUCCESS = yes" >> $QMAKE_CACHE
[ -z "$NULLOY_BUILD_TMP_DIR" ] && NULLOY_BUILD_TMP_DIR=`pwd`/.tmp
-@@ -190,7 +197,7 @@
+@@ -190,7 +196,7 @@
echo
echo "Running qmake..."
-$QMAKE "CONFIG+=$QMAKE_CONFIG" PREFIX="$PREFIX" APP_NAME="$APP_NAME"
$QMAKE_EXTRA_OPTIONS
+$QMAKE "CONFIG+=$QMAKE_CONFIG" PREFIX="$PREFIX" LIBDIR="$LIBDIR"
APP_NAME="$APP_NAME" $QMAKE_EXTRA_OPTIONS
if [ $? -ne 0 ]; th
commit nulloy for openSUSE:Factory
Hello community,
here is the log from the commit of package nulloy for openSUSE:Factory checked
in at 2016-02-01 19:57:33
Comparing /work/SRC/openSUSE:Factory/nulloy (Old)
and /work/SRC/openSUSE:Factory/.nulloy.new (New)
Package is "nulloy"
Changes:
--- /work/SRC/openSUSE:Factory/nulloy/nulloy.changes2015-11-18
22:34:30.0 +0100
+++ /work/SRC/openSUSE:Factory/.nulloy.new/nulloy.changes 2016-02-01
19:57:50.0 +0100
@@ -1,0 +2,16 @@
+Sat Jan 30 06:05:17 UTC 2016 - r...@fthiessen.de
+
+- Updated to 0.8.1:
+ * Fixed phonon plugin
+ * Added Spanish, Ukrainian and Lithuanian translations
+ * Setting tags encoding
+ * Fixed vlc plugin
+ * Some other fixes and improvements
+- Build phonon plugin
+- Removed upstream fixed fix-upstream-desktop.patch,
+ fix-upstream-gstreamer-encoding-error.patch and
+ fix-upstream-handle-flags.patch
+- Renamed fix-libsuffix.patch to fix-library-directory.patch
+ and rebased it.
+
+---
Old:
fix-libsuffix.patch
fix-upstream-desktop.patch
fix-upstream-gstreamer-encoding-error.patch
fix-upstream-handle-flags.patch
nulloy-0.8.tar.gz
New:
fix-library-directory.patch
nulloy-0.8.1.tar.gz
Other differences:
--
++ nulloy.spec ++
--- /var/tmp/diff_new_pack.wjSv04/_old 2016-02-01 19:57:51.0 +0100
+++ /var/tmp/diff_new_pack.wjSv04/_new 2016-02-01 19:57:51.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package nulloy
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 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
@@ -17,26 +17,25 @@
Name: nulloy
-Version:0.8
+Version:0.8.1
Release:0
Summary:Music player with a Waveform Progress Bar
License:GPL-3.0
Group: Productivity/Multimedia/Sound/Players
Url:http://nulloy.com
Source:
https://github.com/nulloy/nulloy/releases/download/%{version}/%{name}-%{version}.tar.gz
-# Fix invalid .desktop file, reported upstream
-Patch0: fix-upstream-desktop.patch
-# Fix problem that nulloy ignores CFLAGS, reported upstream:
https://github.com/nulloy/nulloy/pull/82
-Patch1: fix-upstream-handle-flags.patch
-# Fix gstreamer encoding / autosink. Issue fixed upstream in git a2fc81a
-Patch2: fix-upstream-gstreamer-encoding-error.patch
-Patch3: fix-libsuffix.patch
+Patch0: fix-library-directory.patch
BuildRequires: gcc-c++
BuildRequires: hicolor-icon-theme
BuildRequires: libqt4-devel
-BuildRequires: pkg-config
+BuildRequires: pkgconfig
BuildRequires: update-desktop-files
BuildRequires: zip
+BuildRequires: pkgconfig(gstreamer-1.0)
+BuildRequires: pkgconfig(gstreamer-pbutils-1.0)
+BuildRequires: pkgconfig(libvlc)
+BuildRequires: pkgconfig(phonon)
+BuildRequires: pkgconfig(taglib)
Recommends: %{name}-gstreamer
Recommends: %{name}-taglib
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -48,7 +47,6 @@
%package taglib
Summary:Taglib plugin for %{name}
Group: Productivity/Multimedia/Sound/Players
-BuildRequires: pkgconfig(taglib)
Requires: %{name} = %{version}
%description taglib
@@ -58,8 +56,6 @@
%package gstreamer
Summary:Gstreamer plugin for %{name}
Group: Productivity/Multimedia/Sound/Players
-BuildRequires: pkgconfig(gstreamer-1.0)
-BuildRequires: pkgconfig(gstreamer-pbutils-1.0)
Requires: %{name} = %{version}
Recommends: gstreamer-plugins-good
@@ -67,25 +63,39 @@
This package contains the gstreamer playback plugin for %{name} - a lightweight
music player with a Waveform Progressbar.
+%package phonon
+Summary:Phonon plugin for %{name}
+Group: Productivity/Multimedia/Sound/Players
+Requires: %{name} = %{version}
+
+%description phonon
+This package contains the phonon playback plugin for %{name} - a lightweight
+music player with a Waveform Progressbar.
+
+%package vlc
+Summary:VLC plugin for %{name}
+Group: Productivity/Multimedia/Sound/Players
+Requires: %{name} = %{version}
+
+%description vlc
+This package contains the vlc playback plugin for %{name} - a lightweight
+music player with a Waveform Progressbar.
+
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
%build
-CFLAGS="%{optflags}"
-export CFLAGS
-CXXFLAGS="%{optflags}"
-export CXXFLAGS
-LIBSUF=$(echo "%{_lib}" | sed 's/lib//')
-# This is not a autotools configure
+# This is not an autotools configure
+CFLAGS="%{optflags}" \
+CXXFLAGS="%{optflags}" \
