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.changes 2016-04-28 16:57:08.000000000 +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 <[email protected]> + +- 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 @@ %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 ++++++ fix-library-directory.patch ++++++ --- /var/tmp/diff_new_pack.UKH36j/_old 2019-05-05 21:22:30.989456515 +0200 +++ /var/tmp/diff_new_pack.UKH36j/_new 2019-05-05 21:22:30.989456515 +0200 @@ -1,55 +1,67 @@ -diff -Nur nulloy-0.8.2/configure new/configure ---- nulloy-0.8.2/configure 2016-02-03 23:19:41.000000000 +0100 -+++ new/configure 2016-04-15 16:32:35.746385532 +0200 -@@ -33,6 +33,7 @@ +Index: nulloy-d15e0f3aee22ef1cdd84729cf75f505adcc0ffda/configure +=================================================================== +--- nulloy-d15e0f3aee22ef1cdd84729cf75f505adcc0ffda.orig/configure 2019-01-03 01:47:17.000000000 +0200 ++++ nulloy-d15e0f3aee22ef1cdd84729cf75f505adcc0ffda/configure 2019-05-05 12:22:27.155741057 +0200 +@@ -5,7 +5,7 @@ CWD=$(dirname $0) + PREFIX=/usr + DEBUG=no + APP_NAME=nulloy +- ++LIBDIR=lib + FORCE_VERSION=no + BUILD_GSTREAMER=yes + BUILD_GSTREAMER_TAGREADER=no +@@ -30,6 +30,7 @@ echo_help() { + echo ' --no-skins disable skins support' 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 ' --prefix PREFIX installation prefix (ignored on Mac)' 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" -- "$@"` + echo ' --tests build unit tests' +@@ -44,7 +45,7 @@ while test $# -gt 0; do + case "$1" in + --prefix) + shift +- if command -v realpath &> /dev/null && -d $(dirname "$1"); then ++ if command -v realpath &> /dev/null && [ -d $(dirname "$1") ]; then + PREFIX=$(realpath "$1") + else + PREFIX=$(readlink -m "$1") +@@ -68,6 +69,8 @@ while test $# -gt 0; do + BUILD_TESTS=yes ;; + --no-skins) + SUPPORT_SKINS=no ;; ++ --libdir) ++ shift; LIBDIR=$1; echo $LIBDIR ;; + --no-update-check) + UPDATE_CHECK=no ;; + --help|-h) +@@ -106,8 +109,8 @@ check_executable() { - if test $? != 0; then - 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 + echo "$FNAME" + } +-check_executable QMAKE qmake +-check_executable LRELEASE lrelease ++check_executable QMAKE qmake-qt5 ++check_executable LRELEASE lrelease-qt5 + echo "LRELEASE = $LRELEASE" >> $QMAKE_CACHE + check_executable PKG_CONFIG pkg-config + echo "PKG_CONFIG = $PKG_CONFIG" >> $QMAKE_CACHE +@@ -164,6 +167,8 @@ else fi + echo "PREFIX = $PREFIX" >> $QMAKE_CACHE +echo "N_LIBDIR = $LIBDIR" >> $QMAKE_CACHE + echo "N_CONFIG_SUCCESS = yes" >> $QMAKE_CACHE - [ -z "$NULLOY_BUILD_TMP_DIR" ] && NULLOY_BUILD_TMP_DIR=`pwd`/.tmp -@@ -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 ]; then - echo "$BASENAME: qmake failed" - exit 1 -diff -Nur nulloy-0.8.2/nulloy.desktop new/nulloy.desktop ---- nulloy-0.8.2/nulloy.desktop 2016-02-03 23:19:41.000000000 +0100 -+++ new/nulloy.desktop 2016-04-15 16:33:28.302767421 +0200 -@@ -10,7 +10,7 @@ +Index: nulloy-d15e0f3aee22ef1cdd84729cf75f505adcc0ffda/nulloy.desktop +=================================================================== +--- nulloy-d15e0f3aee22ef1cdd84729cf75f505adcc0ffda.orig/nulloy.desktop 2019-01-03 01:47:17.000000000 +0200 ++++ nulloy-d15e0f3aee22ef1cdd84729cf75f505adcc0ffda/nulloy.desktop 2019-05-05 10:14:49.156767355 +0200 +@@ -10,7 +10,7 @@ MimeType=x-content/audio-player;audio/ba Icon=nulloy Exec=nulloy %F @@ -58,10 +70,11 @@ [Desktop Action PlayPause] Name=Play / Pause -diff -Nur nulloy-0.8.2/src/pluginLoader.cpp new/src/pluginLoader.cpp ---- nulloy-0.8.2/src/pluginLoader.cpp 2016-02-03 23:19:41.000000000 +0100 -+++ new/src/pluginLoader.cpp 2016-04-15 16:34:40.643295115 +0200 -@@ -107,7 +107,7 @@ +Index: nulloy-d15e0f3aee22ef1cdd84729cf75f505adcc0ffda/src/pluginLoader.cpp +=================================================================== +--- nulloy-d15e0f3aee22ef1cdd84729cf75f505adcc0ffda.orig/src/pluginLoader.cpp 2019-01-03 01:47:17.000000000 +0200 ++++ nulloy-d15e0f3aee22ef1cdd84729cf75f505adcc0ffda/src/pluginLoader.cpp 2019-05-05 10:14:49.164767652 +0200 +@@ -113,7 +113,7 @@ void NPluginLoader::init() pluginsDirList << NCore::rcDir() + "/" + _pluginsDirName; if (QDir(QCoreApplication::applicationDirPath()).dirName() == "bin") { QDir dir(QCoreApplication::applicationDirPath()); @@ -70,10 +83,11 @@ pluginsDirList << dir.absolutePath(); } #endif -diff -Nur nulloy-0.8.2/src/plugins/plugin.pri new/src/plugins/plugin.pri ---- nulloy-0.8.2/src/plugins/plugin.pri 2016-02-03 23:19:41.000000000 +0100 -+++ new/src/plugins/plugin.pri 2016-04-15 16:35:19.579580106 +0200 -@@ -17,7 +17,7 @@ +Index: nulloy-d15e0f3aee22ef1cdd84729cf75f505adcc0ffda/src/plugins/plugin.pri +=================================================================== +--- nulloy-d15e0f3aee22ef1cdd84729cf75f505adcc0ffda.orig/src/plugins/plugin.pri 2019-01-03 01:47:17.000000000 +0200 ++++ nulloy-d15e0f3aee22ef1cdd84729cf75f505adcc0ffda/src/plugins/plugin.pri 2019-05-05 10:14:49.164767652 +0200 +@@ -17,7 +17,7 @@ unix { mac { target.path = ../../../$${APP_NAME}.app/Contents/MacOS/plugins } else { @@ -82,14 +96,13 @@ } INSTALLS += target } -diff -Nur nulloy-0.8.2/src/src.pro new/src/src.pro ---- nulloy-0.8.2/src/src.pro 2016-02-03 23:19:41.000000000 +0100 -+++ new/src/src.pro 2016-04-15 16:35:55.279841984 +0200 -@@ -79,6 +79,7 @@ +Index: nulloy-d15e0f3aee22ef1cdd84729cf75f505adcc0ffda/src/src.pro +=================================================================== +--- nulloy-d15e0f3aee22ef1cdd84729cf75f505adcc0ffda.orig/src/src.pro 2019-01-03 01:47:17.000000000 +0200 ++++ nulloy-d15e0f3aee22ef1cdd84729cf75f505adcc0ffda/src/src.pro 2019-05-05 10:14:49.164767652 +0200 +@@ -4,4 +4,5 @@ DESTDIR = .. - include(version.pri) - DEFINES += _N_VERSION_=\""\\\"$${N_VERSION}\\\""\" + SRC_DIR = $$PWD + include($$SRC_DIR/src.pri) +DEFINES += N_LIBDIR=\""\\\"$${N_LIBDIR}\\\""\" - build_pass:CONFIG(static, static|shared) { - DEFINES += _N_STATIC_BUILD_ - } else { + SOURCES += $$SRC_DIR/main.cpp
