1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55
|
Description: do not use native-package-installer
Author: HIGUCHI Daisuke (VDR dai) <dai@debian.org>
Forwarded: not-needed
Last-Update: 2019-03-14
--- a/glib2/lib/mkmf-gnome.rb
+++ b/glib2/lib/mkmf-gnome.rb
@@ -18,7 +18,6 @@
require 'mkmf'
require 'pkg-config'
require 'glib-mkenums'
-require "native-package-installer"
$CFLAGS += " #{ENV['CFLAGS']}" if ENV['CFLAGS']
@@ -137,21 +136,6 @@
end
end
-def setup_homebrew
- checking_for(checking_message("Homebrew")) do
- platform = NativePackageInstaller::Platform.detect
- if platform.is_a?(NativePackageInstaller::Platform::Homebrew)
- libffi_prefix = `brew --prefix libffi`.chomp
- PKGConfig.add_path("#{libffi_prefix}/lib/pkgconfig")
- true
- else
- false
- end
- end
-end
-
-setup_homebrew
-
#add_depend_package("glib2", "ext/glib2", "/...../ruby-gnome2")
def add_depend_package(target_name, target_srcdir, top_srcdir, options={})
gem_spec = find_gem_spec(target_name)
@@ -458,7 +442,6 @@
return true if PKGConfig.have_package(*required_package_info)
native_package_info ||= {}
- return false unless install_missing_native_package(native_package_info)
PKGConfig.have_package(*required_package_info)
end
--- a/glib2/glib2.gemspec
+++ b/glib2/glib2.gemspec
@@ -47,7 +47,6 @@
s.files += Dir.glob("test/**/*")
s.add_runtime_dependency("pkg-config", ">= 1.3.5")
- s.add_runtime_dependency("native-package-installer", ">= 1.0.3")
s.add_development_dependency("test-unit", ">= 2")
s.metadata["msys2_mingw_dependencies"] = "glib2"
|