[DRE-commits] [ruby-pkg-config] 03/19: New upstream version 1.1.9

[Daisuke Higuchi]

This is an automated email from the git hooks/post-receive script.

dai pushed a commit to branch master
in repository ruby-pkg-config.

commit 09aa9914c33ed5284c4919a93080312d05db4174
Author: HIGUCHI Daisuke (VDR dai) <dai at debian.org>
Date:   Sat Jul 15 12:02:07 2017 +0900

    New upstream version 1.1.9
---
 .travis.yml               | 10 +++++-----
 NEWS                      |  4 ++++
 lib/pkg-config.rb         | 12 +++++++++++-
 lib/pkg-config/version.rb |  4 ++--
 test/test_pkg_config.rb   |  3 ++-
 5 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c79aaa3..cebf9ae 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,9 @@
 rvm:
-  - 1.9.3
-  - 2.0.0
   - 2.1
   - 2.2
-  - ruby-head
+  - 2.3
+  - 2.4.1
 notifications:
-  recipients:
-    - ruby-gnome2-cvs at lists.sourceforge.net
+  email:
+    recipients:
+      - ruby-gnome2-cvs at lists.sourceforge.net
diff --git a/NEWS b/NEWS
index 5c009fb..6a433c1 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,9 @@
 = NEWS
 
+== 1.1.9 - 2017-04-20
+
+  * Supported C++ compiler.
+
 == 1.1.8 - 2017-04-19
 
   * Stopped to require mkmf.
diff --git a/lib/pkg-config.rb b/lib/pkg-config.rb
index b7077d5..0f83dc3 100644
--- a/lib/pkg-config.rb
+++ b/lib/pkg-config.rb
@@ -150,6 +150,10 @@ class PackageConfig
     collect_cflags[0].join(" ")
   end
 
+  def cflags_only_other
+    collect_cflags[1].join(" ")
+  end
+
   def libs
     path_flags, other_flags = collect_libs
     (path_flags + other_flags).join(" ")
@@ -406,6 +410,10 @@ module PKGConfig
     package_config(pkg).cflags_only_I
   end
 
+  def cflags_only_other(pkg)
+    package_config(pkg).cflags_only_other
+  end
+
   def modversion(pkg)
     package_config(pkg).version
   end
@@ -450,7 +458,9 @@ module PKGConfig
       else
         $LDFLAGS += ' ' + dldflags
       end
-      $CFLAGS += ' ' + cflags(pkg)
+      $CFLAGS += ' ' + cflags_only_other(pkg)
+      $CXXFLAGS += ' ' + cflags_only_other(pkg)
+      $INCFLAGS += ' ' + cflags_only_I(pkg)
     end
     enough_version
   end
diff --git a/lib/pkg-config/version.rb b/lib/pkg-config/version.rb
index ddab8f7..ce98250 100644
--- a/lib/pkg-config/version.rb
+++ b/lib/pkg-config/version.rb
@@ -1,4 +1,4 @@
-# Copyright 2012-2016 Kouhei Sutou <kou at cozmixng.org>
+# Copyright 2012-2017 Kouhei Sutou <kou at cozmixng.org>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -15,5 +15,5 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 module PKGConfig
-  VERSION = "1.1.8"
+  VERSION = "1.1.9"
 end
diff --git a/test/test_pkg_config.rb b/test/test_pkg_config.rb
index 61903eb..6a558cc 100644
--- a/test/test_pkg_config.rb
+++ b/test/test_pkg_config.rb
@@ -1,4 +1,5 @@
-require 'pkg-config'
+require "mkmf"
+require "pkg-config"
 
 class PkgConfigTest < Test::Unit::TestCase
   def setup

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-pkg-config.git