[SCM] synthv1/master: Patches refreshed.
mira-guest at users.alioth.debian.org
mira-guest at users.alioth.debian.org
Mon Nov 21 10:32:31 UTC 2016
The following commit has been merged in the master branch:
commit dc3d6e964e94af05158aab70e104c20b6f428468
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date: Mon Nov 21 11:22:46 2016 +0100
Patches refreshed.
diff --git a/debian/patches/0002-fix_hardening.patch b/debian/patches/0002-fix_hardening.patch
index e0e2e97..132894d 100644
--- a/debian/patches/0002-fix_hardening.patch
+++ b/debian/patches/0002-fix_hardening.patch
@@ -6,25 +6,25 @@ Index: synthv1/src/src_jack.pri.in
===================================================================
--- synthv1.orig/src/src_jack.pri.in
+++ synthv1/src/src_jack.pri.in
-@@ -11,5 +11,6 @@ INCLUDEPATH = @ac_jack_incpath@
+@@ -13,5 +13,6 @@ INCLUDEPATH += @ac_jack_incpath@
LIBS += @ac_jack_libs@
# Extra optimization flags
--QMAKE_CXXFLAGS += @ac_cflags@
--QMAKE_LFLAGS += @ac_ldflags@
-+QMAKE_CXXFLAGS += $(CPPFLAGS) @ac_cflags@
+-QMAKE_CXXFLAGS += @ac_jack_cflags@
+-QMAKE_LFLAGS += @ac_jack_ldflags@
++QMAKE_CXXFLAGS += $(CPPFLAGS) @ac_jack_cflags@
+QMAKE_CFLAGS += $(CPPFLAGS)
-+QMAKE_LFLAGS += $(LDFLAGS)
++QMAKE_LFLAGS += $(LDFLAGS) @ac_jack_ldflags@
Index: synthv1/src/src_lv2.pri.in
===================================================================
--- synthv1.orig/src/src_lv2.pri.in
+++ synthv1/src/src_lv2.pri.in
-@@ -11,5 +11,6 @@ INCLUDEPATH = @ac_lv2_incpath@
+@@ -13,5 +13,6 @@ INCLUDEPATH += @ac_lv2_incpath@
LIBS += @ac_lv2_libs@
# Extra optimization flags
--QMAKE_CXXFLAGS += @ac_cflags@
--QMAKE_LFLAGS += @ac_ldflags@
-+QMAKE_CXXFLAGS += $(CPPFLAGS) @ac_cflags@
+-QMAKE_CXXFLAGS += @ac_lv2_cflags@
+-QMAKE_LFLAGS += @ac_lv2_ldflags@
++QMAKE_CXXFLAGS += $(CPPFLAGS) @ac_lv2_cflags@
+QMAKE_CFLAGS += $(CPPFLAGS)
-+QMAKE_LFLAGS += $(LDFLAGS)
++QMAKE_LFLAGS += $(LDFLAGS) @ac_lv2_ldflags@
diff --git a/debian/patches/0004-fix_install_path.patch b/debian/patches/0004-fix_install_path.patch
index 49b52ae..2a51a20 100644
--- a/debian/patches/0004-fix_install_path.patch
+++ b/debian/patches/0004-fix_install_path.patch
@@ -6,7 +6,7 @@ Index: synthv1/src/src_lv2.pro
===================================================================
--- synthv1.orig/src/src_lv2.pro
+++ synthv1/src/src_lv2.pro
-@@ -38,7 +38,7 @@ unix {
+@@ -43,7 +43,7 @@ unix {
contains(PREFIX, $$system(echo $HOME)) {
LV2DIR = $${PREFIX}/.lv2
} else {
@@ -15,7 +15,7 @@ Index: synthv1/src/src_lv2.pro
}
TARGET_LV2 = $${NAME}.lv2/$${NAME}
-@@ -58,7 +58,7 @@ unix {
+@@ -63,7 +63,7 @@ unix {
QMAKE_CLEAN += $${TARGET_LV2}.so
@@ -28,7 +28,7 @@ Index: synthv1/src/src_lv2ui.pro
===================================================================
--- synthv1.orig/src/src_lv2ui.pro
+++ synthv1/src/src_lv2ui.pro
-@@ -69,7 +69,7 @@ unix {
+@@ -74,7 +74,7 @@ unix {
contains(PREFIX, $$system(echo $HOME)) {
LV2DIR = $${PREFIX}/.lv2
} else {
@@ -37,7 +37,7 @@ Index: synthv1/src/src_lv2ui.pro
}
TARGET_LV2UI = $${NAME}.lv2/$${NAME}_ui
-@@ -99,7 +99,7 @@ unix {
+@@ -104,7 +104,7 @@ unix {
QMAKE_CLEAN += $${TARGET_LV2UI}.so $${TARGET_LV2UI}.ttl
@@ -50,7 +50,7 @@ Index: synthv1/src/src_jack.pro
===================================================================
--- synthv1.orig/src/src_jack.pro
+++ synthv1/src/src_jack.pro
-@@ -104,7 +104,7 @@ unix {
+@@ -109,7 +109,7 @@ unix {
mimetypes_scalable.path = $${DATADIR}/icons/hicolor/scalable/mimetypes
mimetypes_scalable.files += mimetypes/application-x-$${NAME}-preset.svg
@@ -63,7 +63,7 @@ Index: synthv1/src/src_core.pro
===================================================================
--- synthv1.orig/src/src_core.pro
+++ synthv1/src/src_core.pro
-@@ -53,7 +53,7 @@ unix {
+@@ -58,7 +58,7 @@ unix {
INSTALLS += target
--
synthv1 packaging
More information about the pkg-multimedia-commits
mailing list