[SCM] drumkv1/master: Patch refreshed.
mira-guest at users.alioth.debian.org
mira-guest at users.alioth.debian.org
Thu Nov 2 14:54:13 UTC 2017
The following commit has been merged in the master branch:
commit f82b9e070f295127376e21ea9122ad266a1757f9
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date: Thu Nov 2 15:35:16 2017 +0100
Patch refreshed.
diff --git a/debian/patches/0004-fix_install_path.patch b/debian/patches/0004-fix_install_path.patch
index 72dfde3..114258c 100644
--- a/debian/patches/0004-fix_install_path.patch
+++ b/debian/patches/0004-fix_install_path.patch
@@ -6,7 +6,7 @@ Index: drumkv1/src/src_lv2.pro
===================================================================
--- drumkv1.orig/src/src_lv2.pro
+++ drumkv1/src/src_lv2.pro
-@@ -43,7 +43,7 @@ unix {
+@@ -39,7 +39,7 @@ unix {
contains(PREFIX, $$system(echo $HOME)) {
LV2DIR = $${PREFIX}/.lv2
} else {
@@ -15,12 +15,12 @@ Index: drumkv1/src/src_lv2.pro
}
TARGET_LV2 = $${NAME}.lv2/$${NAME}
-@@ -63,7 +63,7 @@ unix {
+@@ -59,7 +59,7 @@ unix {
QMAKE_CLEAN += $${TARGET_LV2}.so
-- LIBS += -L. -l$${NAME} -Wl,-rpath,$${LIBDIR}
-+ LIBS += -L. -l$${NAME} -Wl,-rpath,$${PREFIX}/lib/$${NAME}
+- LIBS += -l$${NAME} -Wl,-rpath,$${LIBDIR}
++ LIBS += -l$${NAME} -Wl,-rpath,$${PREFIX}/lib/$${NAME}
}
QT -= gui
@@ -28,7 +28,7 @@ Index: drumkv1/src/src_lv2ui.pro
===================================================================
--- drumkv1.orig/src/src_lv2ui.pro
+++ drumkv1/src/src_lv2ui.pro
-@@ -78,7 +78,7 @@ unix {
+@@ -41,7 +41,7 @@ unix {
contains(PREFIX, $$system(echo $HOME)) {
LV2DIR = $${PREFIX}/.lv2
} else {
@@ -37,12 +37,12 @@ Index: drumkv1/src/src_lv2ui.pro
}
TARGET_LV2UI = $${NAME}.lv2/$${NAME}_ui
-@@ -108,7 +108,7 @@ unix {
+@@ -71,7 +71,7 @@ unix {
QMAKE_CLEAN += $${TARGET_LV2UI}.so $${TARGET_LV2UI}.ttl
-- LIBS += -L. -l$${NAME} -L$${NAME}.lv2 -Wl,-rpath,$${LIBDIR}:$${LV2DIR}/$${NAME}.lv2
-+ LIBS += -L. -l$${NAME} -L$${NAME}.lv2 -Wl,-rpath,$${PREFIX}/lib/$${NAME}
+- LIBS += -l$${NAME} -l$${NAME}_ui -L$${NAME}.lv2 -Wl,-rpath,$${LIBDIR}:$${LV2DIR}/$${NAME}.lv2
++ LIBS += -l$${NAME} -l$${NAME}_ui -L$${NAME}.lv2 -Wl,-rpath,$${PREFIX}/lib/$${NAME}
}
QT += xml
@@ -50,12 +50,12 @@ Index: drumkv1/src/src_jack.pro
===================================================================
--- drumkv1.orig/src/src_jack.pro
+++ drumkv1/src/src_jack.pro
-@@ -113,7 +113,7 @@ unix {
+@@ -75,7 +75,7 @@ unix {
mimetypes_scalable.path = $${DATADIR}/icons/hicolor/scalable/mimetypes
mimetypes_scalable.files += mimetypes/application-x-$${NAME}-preset.svg
-- LIBS += -L. -l$${NAME} -Wl,-rpath,$${LIBDIR}
-+ LIBS += -L. -l$${NAME} -Wl,-rpath,$${PREFIX}/lib/$${NAME}
+- LIBS += -l$${NAME} -l$${NAME}_ui -Wl,-rpath,$${LIBDIR}
++ LIBS += -l$${NAME} -l$${NAME}_ui -Wl,-rpath,$${PREFIX}/lib/$${NAME}
}
QT += xml
@@ -72,3 +72,19 @@ Index: drumkv1/src/src_core.pro
}
QT -= gui
+Index: drumkv1/src/src_ui.pro
+===================================================================
+--- drumkv1.orig/src/src_ui.pro
++++ drumkv1/src/src_ui.pro
+@@ -71,9 +71,9 @@ unix {
+
+ INSTALLS += target
+
+- target.path = $${LIBDIR}
++ target.path = $${PREFIX}/lib/$${NAME}
+
+- LIBS += -l$${NAME} -Wl,-rpath,$${LIBDIR}
++ LIBS += -l$${NAME} -Wl,-rpath,$${PREFIX}/lib/$${NAME}
+ }
+
+ QT += xml
--
drumkv1 packaging
More information about the pkg-multimedia-commits
mailing list