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
56
57
58
59
60
61
62
63
64
65
|
From: "HIGUCHI Daisuke (VDR dai)" <dai@debian.org>
Date: Sun, 25 Aug 2024 21:03:56 -0300
Subject: do not use native-package-installer
Forwarded: not-needed
Last-Update: 2019-03-14
---
glib2/glib2.gemspec | 1 -
glib2/lib/mkmf-gnome.rb | 17 -----------------
2 files changed, 18 deletions(-)
diff --git a/glib2/glib2.gemspec b/glib2/glib2.gemspec
index e656ded..3835d73 100644
--- a/glib2/glib2.gemspec
+++ b/glib2/glib2.gemspec
@@ -47,7 +47,6 @@ Gem::Specification.new do |s|
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"
diff --git a/glib2/lib/mkmf-gnome.rb b/glib2/lib/mkmf-gnome.rb
index e86ba33..9771510 100644
--- a/glib2/lib/mkmf-gnome.rb
+++ b/glib2/lib/mkmf-gnome.rb
@@ -18,7 +18,6 @@ require 'English'
require 'mkmf'
require 'pkg-config'
require 'glib-mkenums'
-require "native-package-installer"
$CFLAGS += " #{ENV['CFLAGS']}" if ENV['CFLAGS']
@@ -138,21 +137,6 @@ def find_gem_spec(package)
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={})
[
@@ -477,7 +461,6 @@ def required_pkg_config_package(package_info, native_package_info=nil)
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
|
