[DRE-commits] [ruby-gnome2] 02/09: glib2: do no use native-package-installer

[Daisuke Higuchi]

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

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

commit cb00b68621acb9006e9b00e644f2e3a9fca55fd5
Author: HIGUCHI Daisuke (VDR dai) <dai at debian.org>
Date:   Tue Jun 27 20:59:45 2017 +0900

    glib2: do no use native-package-installer
---
 .../do-not-use-native-package-installer.patch      | 45 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 46 insertions(+)

diff --git a/debian/patches/do-not-use-native-package-installer.patch b/debian/patches/do-not-use-native-package-installer.patch
new file mode 100644
index 0000000..d7957ea
--- /dev/null
+++ b/debian/patches/do-not-use-native-package-installer.patch
@@ -0,0 +1,45 @@
+Description: do not use native-package-installer
+Author: HIGUCHI Daisuke (VDR dai) <dai at debian.org>
+Forwarded: not-needed
+Last-Update: 2017-06-27
+
+Index: ruby-gnome2/glib2/lib/mkmf-gnome2.rb
+===================================================================
+--- ruby-gnome2.orig/glib2/lib/mkmf-gnome2.rb
++++ ruby-gnome2/glib2/lib/mkmf-gnome2.rb
+@@ -13,7 +13,6 @@ require 'English'
+ require 'mkmf'
+ require 'pkg-config'
+ require 'glib-mkenums'
+-require "native-package-installer"
+ 
+ $CFLAGS += " #{ENV['CFLAGS']}" if ENV['CFLAGS']
+ 
+@@ -147,17 +146,8 @@ def find_gem_spec(package)
+   end
+ end
+ 
+-def setup_homebrew_libffi
+-  platform = NativePackageInstaller::Platform.detect
+-  return unless platform.is_a?(NativePackageInstaller::Platform::Homebrew)
+-
+-  PKGConfig.add_path("/usr/local/opt/libffi/lib/pkgconfig")
+-end
+-
+ #add_depend_package("glib2", "ext/glib2", "/...../ruby-gnome2")
+ def add_depend_package(target_name, target_srcdir, top_srcdir, options={})
+-  setup_homebrew_libffi if target_name == "gobject-introspection"
+-
+   gem_spec = find_gem_spec(target_name)
+   if gem_spec
+     target_source_dir = File.join(gem_spec.full_gem_path, "ext/#{target_name}")
+@@ -481,9 +471,6 @@ def required_pkg_config_package(package_
+   else
+     required_package_info = [package_info]
+   end
+-  if required_package_info.include?("gobject-introspection-1.0")
+-    setup_homebrew_libffi
+-  end
+   return true if PKGConfig.have_package(*required_package_info)
+ 
+   native_package_info ||= {}
diff --git a/debian/patches/series b/debian/patches/series
index da437f0..9dd151b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ no-vte.patch
 Fail-the-build-if-any-subpackage-fails
 no-clutter-gst-2.0
 reject_gvlc.patch
+do-not-use-native-package-installer.patch

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