File fix-library-directory.patch of Package nulloy

Overview Repositories Revisions Requests Users Attributes Meta

File fix-library-directory.patch of Package nulloy

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 +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
+
 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 @@
 Icon=nulloy
 Exec=nulloy %F
 
-Actions=PlayPause;Stop;Next;Previous
+Actions=PlayPause;Stop;Next;Previous;
 
 [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 @@
         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 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
 }
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_
 } else {

Places

File fix-library-directory.patch of Package nulloy

Places