[SCM] ffdiaporama/master: Fix common.pri file to get LDFLAGS and CFLAGS from env This allow the compilation to use the hardening flags and get rid of the missing hardening flags warnings when running lintian

[fabricesp-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit e1a29bf9db96efeaa3d0209117641815776b271f
Author: Fabrice Coutadeur <coutadeurf at gmail.com>
Date:   Wed Jul 18 22:04:16 2012 +0200

    Fix common.pri file to get LDFLAGS and CFLAGS from env
    This allow the compilation to use the hardening flags and get rid of the missing hardening flags warnings when running lintian

diff --git a/debian/patches/fix_hardening_flags.patch b/debian/patches/fix_hardening_flags.patch
new file mode 100644
index 0000000..2bc33b3
--- /dev/null
+++ b/debian/patches/fix_hardening_flags.patch
@@ -0,0 +1,15 @@
+Description: add LDFLAGS and CPPFLAGS to QMAKE flags. This allow the hardening
+ flags to be used to compile ffdiaporama
+Author: Fabrice Coutadeur <coutadeurf at gmail.com>
+--- a/src/common.pri
++++ b/src/common.pri
+@@ -5,6 +5,9 @@
+ 
+ DEFINES +=SHARE_DIR=\\\"$$PREFIX\\\"
+ 
++QMAKE_LFLAGS += ${LDFLAGS}
++QMAKE_CXXFLAGS += ${CPPFLAGS}
++
+ unix {
+     CONFIG(release, debug|release) {
+         DESTDIR         += ../../../build
diff --git a/debian/patches/series b/debian/patches/series
index 6596b01..e49f162 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+fix_hardening_flags.patch
 fix-desktop-files.patch
 fix-ftbfs-libav-0.7.patch

-- 
ffdiaporama packaging