[SCM] qxgedit/master: Add patch to pass flags correctly.

mira-guest at users.alioth.debian.org mira-guest at users.alioth.debian.org
Thu Jun 29 06:36:44 UTC 2017


The following commit has been merged in the master branch:
commit 7965a1140f948b42a9182076888bf70a844d8e1b
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Thu Jun 29 08:27:51 2017 +0200

    Add patch to pass flags correctly.

diff --git a/debian/patches/03-fix_hardening.patch b/debian/patches/03-fix_hardening.patch
new file mode 100644
index 0000000..6769bd1
--- /dev/null
+++ b/debian/patches/03-fix_hardening.patch
@@ -0,0 +1,37 @@
+Description: Pass flags correctly to fix hardening 
+Author: Jaromír Mikeš <mira.mikes at seznam.cz>
+Forwarded: no
+
+Index: qxgedit/src/src.pri.in
+===================================================================
+--- qxgedit.orig/src/src.pri.in
++++ qxgedit/src/src.pri.in
+@@ -13,8 +13,9 @@ INCLUDEPATH += @ac_incpath@
+ LIBS += @ac_libs@
+ 
+ # Extra optimization flags
+-QMAKE_CXXFLAGS += @ac_cflags@
+-QMAKE_LFLAGS += @ac_ldflags@
++QMAKE_CXXFLAGS += $(CPPFLAGS) @ac_cflags@
++QMAKE_CFLAGS += $(CPPFLAGS)
++QMAKE_LFLAGS += $(LDFLAGS) @ac_ldflags@
+ 
+ # X11 support
+ unix:!macx {
+Index: qxgedit/skulpture/skulpture.pri.in
+===================================================================
+--- qxgedit.orig/skulpture/skulpture.pri.in
++++ qxgedit/skulpture/skulpture.pri.in
+@@ -7,8 +7,9 @@ DATADIR = @ac_datadir@
+ MANDIR  = @ac_mandir@
+ 
+ #INCLUDEPATH += @ac_incpath@
+-#LIBS += @ac_libs@
++LIBS += @ac_libs@
+ 
+ # Extra optimization flags
+-#QMAKE_CXXFLAGS += @ac_cflags@
+-#QMAKE_LFLAGS += @ac_ldflags@
++QMAKE_CXXFLAGS += $(CPPFLAGS) @ac_cflags@
++QMAKE_CFLAGS += $(CPPFLAGS)
++QMAKE_LFLAGS += $(LDFLAGS) @ac_ldflags@
diff --git a/debian/patches/series b/debian/patches/series
index fe90ca5..8f0e001 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0002-fix_multiarch_dir.patch
+03-fix_hardening.patch

-- 
qxgedit packaging



More information about the pkg-multimedia-commits mailing list