[SCM] portsmf/master: Fix bad pkg-config directive

[bdrung at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 77730aa5bd88dfcd9cab844c0ab85e48d80025a1
Author: Benjamin Drung <bdrung at debian.org>
Date:   Sun Dec 25 17:43:16 2016 +0100

    Fix bad pkg-config directive
    
    portsmf adds its CXXFLAGS flags to the pkg-config cflags directive. This
    leaks its private compile flags to another package and could lead to
    build failures.
    
    On Debian the flags "-g -O2 -fstack-protector-strong -Wformat
    -Werror=format-security -Wall" are leaked and cause lintian to
    complain.

diff --git a/debian/patches/fix-bad-pkg-config-directive.patch b/debian/patches/fix-bad-pkg-config-directive.patch
new file mode 100644
index 0000000..142d519
--- /dev/null
+++ b/debian/patches/fix-bad-pkg-config-directive.patch
@@ -0,0 +1,18 @@
+Description: Fix bad pkg-config directive
+ portsmf adds its CXXFLAGS flags to the pkg-config cflags directive. This
+ leaks its private compile flags to another package and could lead to
+ build failures.
+ .
+ On Debian the flags "-g -O2 -fstack-protector-strong -Wformat
+ -Werror=format-security -Wall" are leaked and cause lintian to
+ complain.
+Author: Benjamin Drung <bdrung at debian.org>
+
+--- a/portSMF.pc.in
++++ b/portSMF.pc.in
+@@ -7,4 +7,4 @@
+ Version: 0.1
+ 
+ Libs: -L${libdir} -lportSMF @LIBS@
+-Cflags: -I${includedir} @CXXFLAGS@
++Cflags: -I${includedir}
diff --git a/debian/patches/header-in-subdirectory.patch b/debian/patches/header-in-subdirectory.patch
index 250a9a1..d9148c5 100644
--- a/debian/patches/header-in-subdirectory.patch
+++ b/debian/patches/header-in-subdirectory.patch
@@ -8,8 +8,8 @@ Bug-Debian: http://bugs.debian.org/621873
  Version: 0.1
  
  Libs: -L${libdir} -lportSMF @LIBS@
--Cflags: -I${includedir} @CXXFLAGS@
-+Cflags: -I${includedir}/portSMF @CXXFLAGS@
+-Cflags: -I${includedir}
++Cflags: -I${includedir}/portSMF
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -24,7 +24,8 @@
diff --git a/debian/patches/series b/debian/patches/series
index 2e1b3b7..d16dd30 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+fix-bad-pkg-config-directive.patch
 libtool-support.patch
 pkgconfig-file.patch
 header-in-subdirectory.patch

-- 
portsmf packaging