commit nulloy for openSUSE:Factory
![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
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.changes 2016-02-01 19:57:50.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.nulloy.new/nulloy.changes 2016-04-28 16:57:08.000000000 +0200 @@ -1,0 +2,8 @@ +Fri Apr 15 13:04:59 UTC 2016 - rpm@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.000000000 +0200 +++ /var/tmp/diff_new_pack.E747mn/_new 2016-04-28 16:57:09.000000000 +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.000000000 +0200 +++ /var/tmp/diff_new_pack.E747mn/_new 2016-04-28 16:57:09.000000000 +0200 @@ -1,43 +1,35 @@ -diff -Nur old/configure new/configure ---- old/configure 2015-12-06 17:17:09.000000000 +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.000000000 +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 ]; then - echo "$BASENAME: qmake failed" - exit 1 -diff -Nur old/nulloy.desktop new/nulloy.desktop ---- old/nulloy.desktop 2015-12-06 17:17:09.000000000 +0100 -+++ new/nulloy.desktop 2016-01-30 08:07:26.494259440 +0100 -@@ -1,4 +1,3 @@ -- - [Desktop Entry] - Version=1.0 - Type=Application -@@ -11,7 +10,7 @@ + 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 @@ Icon=nulloy Exec=nulloy %F @@ -71,38 +58,38 @@ [Desktop Action PlayPause] Name=Play / Pause -diff -Nur old/src/pluginLoader.cpp new/src/pluginLoader.cpp ---- old/src/pluginLoader.cpp 2015-12-06 17:17:09.000000000 +0100 -+++ new/src/pluginLoader.cpp 2016-01-30 07:45:25.356058245 +0100 +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 @@ - 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(); - } + 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 -diff -Nur old/src/plugins/plugin.pri new/src/plugins/plugin.pri ---- old/src/plugins/plugin.pri 2015-12-06 17:17:09.000000000 +0100 -+++ new/src/plugins/plugin.pri 2016-01-30 07:34:13.190635545 +0100 +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 @@ - 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 + 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 } -diff -Nur old/src/src.pro new/src/src.pro ---- old/src/src.pro 2015-12-06 17:17:09.000000000 +0100 -+++ new/src/src.pro 2016-01-30 07:45:54.868295368 +0100 +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 @@ include(version.pri) DEFINES += _N_VERSION_=\""\\\"$${N_VERSION}\\\""\" +DEFINES += N_LIBDIR=\""\\\"$${N_LIBDIR}\\\""\" build_pass:CONFIG(static, static|shared) { - DEFINES += _N_STATIC_BUILD_ + DEFINES += _N_STATIC_BUILD_ } else { ++++++ nulloy-0.8.1.tar.gz -> nulloy-0.8.2.tar.gz ++++++ ++++ 23200 lines of diff (skipped)
participants (1)
-
root@hilbert.suse.de