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.changes 2019-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 <[email protected]> + +- 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 <[email protected]> Date: Fri, 17 May 2019 15:14:25 +0000 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.000000000 +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 online check functionality' - echo ' --prefix PREFIX installation prefix (ignored on Mac)' + echo ' --prefix PREFIX installation prefix (default: /usr, ignored on Mac)' + echo ' --libdir LIBDIR library directory under prefix (default: lib)' echo ' --debug build in debug mode' echo ' --tests build unit tests' } @@ -44,7 +46,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 +70,8 @@ while test $# -gt 0; do BUILD_TESTS=yes ;; --no-skins) SUPPORT_SKINS=no ;; + --libdir) + shift; LIBDIR=$1 ;; --no-update-check) UPDATE_CHECK=no ;; --help|-h) @@ -164,6 +168,9 @@ else fi echo "PREFIX = $PREFIX" >> $QMAKE_CACHE +echo "N_LIBDIR = $LIBDIR" >> $QMAKE_CACHE +echo "Library directory: $LIBDIR" + echo "N_CONFIG_SUCCESS = yes" >> $QMAKE_CACHE echo Index: nulloy-d15e0f3aee22ef1cdd84729cf75f505adcc0ffda/nulloy.desktop =================================================================== --- nulloy-d15e0f3aee22ef1cdd84729cf75f505adcc0ffda.orig/nulloy.desktop 2019-01-03 01:47:17.000000000 +0200 +++ nulloy-d15e0f3aee22ef1cdd84729cf75f505adcc0ffda/nulloy.desktop 2019-05-18 09:55:34.378262401 +0200 @@ -10,7 +10,7 @@ MimeType=x-content/audio-player;audio/ba Icon=nulloy Exec=nulloy %F -Actions=PlayPause;Stop;Next;Previous +Actions=PlayPause;Stop;Next;Previous; [Desktop Action PlayPause] Name=Play / Pause 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-18 09:55:34.378262401 +0200 @@ -113,7 +113,7 @@ void NPluginLoader::init() pluginsDirList << NCore::rcDir() + "/" + _pluginsDirName; if (QDir(QCoreApplication::applicationDirPath()).dirName() == "bin") { QDir dir(QCoreApplication::applicationDirPath()); - dir.cd(QString() + "../lib/nulloy/" + _pluginsDirName); + dir.cd(QString() + "../" + N_LIBDIR + "/nulloy/" + _pluginsDirName); pluginsDirList << dir.absolutePath(); } #endif 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-18 09:55:34.378262401 +0200 @@ -17,7 +17,7 @@ unix { mac { target.path = ../../../$${APP_NAME}.app/Contents/MacOS/plugins } else { - target.path = $$PREFIX/lib/$$APP_NAME/plugins + target.path = $$PREFIX/$$LIBDIR/$$APP_NAME/plugins } INSTALLS += target } 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-18 09:55:34.378262401 +0200 @@ -4,4 +4,5 @@ DESTDIR = .. SRC_DIR = $$PWD include($$SRC_DIR/src.pri) +DEFINES += N_LIBDIR=\""\\\"$${N_LIBDIR}\\\""\" SOURCES += $$SRC_DIR/main.cpp
