glib2 3.0.3 → 3.0.4

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 5d4a496c50c6a76058f624e9bef644c12dca0ae3
4
- data.tar.gz: 5ea69b7f03e696cc777870af019daef0f56b36b8
3
+ metadata.gz: a74f6dacd02edc4062d599dab1d92da0723a2d24
4
+ data.tar.gz: 2fdc1bd0f5406628ee1a6085b361eddd96039349
5
5
  SHA512:
6
- metadata.gz: a239afd9f218e2cf41d937a95e83ec1785d242e98977520d9c1c8e3f0c3b329f80d2ef2f3d2348b567973d241b5e175498ad6a07d19b43edbee317a7eaa7dec1
7
- data.tar.gz: 48e7c03a44425b358bc6bab7f2a292355456d344a2a63f9cc09fd9572bc6421ef95969fae58d5e1ca95f284052cba047bdc1fa1c8c5847e4dc75595d2bc2c5f1
6
+ metadata.gz: 4606ad9af615b515e3722d80c493598f8534ae992ee95a77ecd96cecd22439aab1e99a8d750d69dbc0d002deb3359823cb01b04f82780274cdd83ae30beda7d4
7
+ data.tar.gz: 7c4a56bb9bbf2deca43055b442fdf1f5593607cefce0d69c3cd85e1e3e54bb6a88a1cec57feee4cf93072b519939de55b10f8cededd50a572cf1134df3367a63
@@ -19,6 +19,7 @@ setup_windows(module_name, base_dir)
19
19
  unless required_pkg_config_package([package_id, 2, 12, 0],
20
20
  :debian => "libglib2.0-dev",
21
21
  :redhat => "glib2-devel",
22
+ :arch => "glib2",
22
23
  :homebrew => "glib",
23
24
  :macports => "glib2")
24
25
  exit(false)
@@ -36,7 +36,7 @@ extern "C" {
36
36
 
37
37
  #define RBGLIB_MAJOR_VERSION 3
38
38
  #define RBGLIB_MINOR_VERSION 0
39
- #define RBGLIB_MICRO_VERSION 3
39
+ #define RBGLIB_MICRO_VERSION 4
40
40
 
41
41
  #ifndef RSTRING_PTR
42
42
  # define RSTRING_PTR(s) (RSTRING(s)->ptr)
@@ -287,13 +287,33 @@ class GNOME2WindowsBinaryBuildTask
287
287
  return
288
288
  end
289
289
 
290
+ g_ir_scanner = "#{@package.project_root_dir}/gobject-introspection/"
291
+ g_ir_scanner << "#{@package.native.relative_binary_dir}/bin/g-ir-scanner"
292
+ introspection_scanner = "INTROSPECTION_SCANNER=#{g_ir_scanner}"
293
+ common_make_args << introspection_scanner
294
+
295
+
290
296
  dependencies = [
291
297
  "gobject-introspection",
292
298
  @package.name,
293
299
  ]
294
300
  dependencies += @package.windows.gobject_introspection_dependencies
301
+
302
+ compute_base_dir = lambda do |package|
303
+ "#{@package.project_root_dir}/#{package}/vendor/local"
304
+ end
305
+
306
+ gi_base_dir = compute_base_dir.call("gobject-introspection")
307
+ introspection_compiler = "INTROSPECTION_COMPILER="
308
+ introspection_compiler << "#{gi_base_dir}/bin/g-ir-compiler.exe"
309
+ dependencies.each do |package|
310
+ gir_dir = "#{compute_base_dir.call(package)}/share/gir-1.0"
311
+ introspection_compiler << " --includedir=#{gir_dir}"
312
+ end
313
+ common_make_args << introspection_compiler
314
+
295
315
  data_dirs = dependencies.collect do |package|
296
- "#{@package.project_root_dir}/#{package}/vendor/local/share"
316
+ "#{compute_base_dir.call(package)}/share"
297
317
  end
298
318
  common_make_args << "XDG_DATA_DIRS=#{data_dirs.join(File::PATH_SEPARATOR)}"
299
319
  end
@@ -503,6 +503,8 @@ def package_platform
503
503
  :redhat
504
504
  elsif File.exist?("/etc/SuSE-release")
505
505
  :suse
506
+ elsif find_executable("pacman")
507
+ :arch
506
508
  elsif find_executable("brew")
507
509
  :homebrew
508
510
  elsif find_executable("port")
@@ -540,6 +542,8 @@ def install_missing_native_package(native_package_info)
540
542
  install_command = "yum install -y #{package_command_line}"
541
543
  when :suse
542
544
  install_command = "zypper --non-interactive install #{package_command_line}"
545
+ when :arch
546
+ install_command = "pacman -S --noconfirm #{package_command_line}"
543
547
  when :homebrew
544
548
  need_super_user_priviledge = false
545
549
  install_command = "brew install #{package_command_line}"
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: glib2
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.0.3
4
+ version: 3.0.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - The Ruby-GNOME2 Project Team
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-09-16 00:00:00.000000000 Z
11
+ date: 2015-09-21 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: pkg-config