File fix-library-directory.patch of Package nulloy

Overview Repositories Revisions Requests Users Attributes Meta

File fix-library-directory.patch of Package nulloy (Revision 45674a9b03f0a0f5e1265f6966e540d4)

Currently displaying revision 45674a9b03f0a0f5e1265f6966e540d4 , Show latest

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
 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
 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 +197,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 @@
 Icon=nulloy
 Exec=nulloy %F
 
-Actions=PlayPause;Stop;Next;Previous
+Actions=PlayPause;Stop;Next;Previous;
 
 [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
@@ -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 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
@@ -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 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
@@ -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 (Revision 45674a9b03f0a0f5e1265f6966e540d4)

Places