]>
Commit | Line | Data |
---|---|---|
27a4fd39 JR |
1 | diff -ur rcairo-1.15.10/ext/cairo/extconf.rb rcairo-1.15.10-no-native-pkgs/ext/cairo/extconf.rb |
2 | --- rcairo-1.15.10/ext/cairo/extconf.rb 2017-10-15 16:21:01.000000000 +0200 | |
3 | +++ rcairo-1.15.10-no-native-pkgs/ext/cairo/extconf.rb 2017-11-09 09:19:45.074637717 +0100 | |
27a4fd39 JR |
4 | @@ -43,29 +42,7 @@ |
5 | end | |
6 | end | |
7 | ||
8 | -def required_pkg_config_package(package_info, native_package_info=nil) | |
9 | - if package_info.is_a?(Array) | |
10 | - required_package_info = package_info | |
11 | - else | |
12 | - required_package_info = [package_info] | |
13 | - end | |
14 | - return true if PKGConfig.have_package(*required_package_info) | |
15 | - | |
16 | - native_package_info ||= {} | |
17 | - return false unless NativePackageInstaller.install(native_package_info) | |
18 | - | |
19 | - PKGConfig.have_package(*required_package_info) | |
20 | -end | |
21 | - | |
22 | -unless required_pkg_config_package([package, major, minor, micro], | |
23 | - :debian => "libcairo2-dev", | |
24 | - :redhat => "cairo-devel", | |
25 | - :homebrew => "cairo", | |
26 | - :macports => "cairo", | |
27 | - :msys2 => "cairo") | |
28 | - exit(false) | |
29 | -end | |
30 | - | |
31 | +PKGConfig.have_package(package, major, minor, micro) | |
32 | PKGConfig.have_package("cairo-ft") | |
33 | ||
34 | checking_for(checking_message("Mac OS X")) do |