ruby-gnome2-cvs — Ruby-GNOME2 CVS update announce.

[ruby-gnome2-cvs] ruby-gnome2/ruby-gnome2@1e9cced [master] Update TODO

[cedlemo <nu...@co...>]

cedlemo	2017-08-29 02:22:50 +0900 (Tue, 29 Aug 2017)

  New Revision: 1e9cced82d7c2fa81d43349d3e01eb69dbb8ebcf
  https://github.com/ruby-gnome2/ruby-gnome2/commit/1e9cced82d7c2fa81d43349d3e01eb69dbb8ebcf

  Merged b3f3ba3: Merge pull request #1098 from cedlemo/gtk3_sample_gtk_demo_css_blendmodes_rb

  Message:
    Update TODO

  Modified files:
    gtk3/sample/gtk-demo/TODO

  Modified: gtk3/sample/gtk-demo/TODO (+1 -1)
===================================================================
--- gtk3/sample/gtk-demo/TODO    2017-08-29 02:22:16 +0900 (9c373be13)
+++ gtk3/sample/gtk-demo/TODO    2017-08-29 02:22:50 +0900 (c77b05ce9)
@@ -56,12 +56,12 @@ images.c                ok              ok
 textview.c              ok              ok
 event_axes.c            ok              ok
 combobox.c              ok              ok
+css_blendmodes.c	ok		ok
 
 Remains :
 
 application.c           no              no
 changedisplay.c         ok              no
-css_blendmodes.c	no		no
 fishbowl.c		no		no
 flowbox.c               no              no
 foreigndrawing          no              no

[ruby-gnome2-cvs] ruby-gnome2/ruby-gnome2@c9d8760 [master] Add css_blendmodes demo

[cedlemo <nu...@co...>]

cedlemo	2017-08-29 02:19:01 +0900 (Tue, 29 Aug 2017)

  New Revision: c9d876071fedae2feeb027fc0942b3d4b19a5e55
  https://github.com/ruby-gnome2/ruby-gnome2/commit/c9d876071fedae2feeb027fc0942b3d4b19a5e55

  Merged b3f3ba3: Merge pull request #1098 from cedlemo/gtk3_sample_gtk_demo_css_blendmodes_rb

  Message:
    Add css_blendmodes demo

  Added files:
    gtk3/sample/gtk-demo/css_blendmodes.rb

  Added: gtk3/sample/gtk-demo/css_blendmodes.rb (+90 -0) 100644
===================================================================
--- /dev/null
+++ gtk3/sample/gtk-demo/css_blendmodes.rb    2017-08-29 02:19:01 +0900 (4cd5ec612)
@@ -0,0 +1,90 @@
+# Copyright (c) 2017 Ruby-GNOME2 Project Team
+# This program is licenced under the same licence as Ruby-GNOME2.
+#
+=begin
+=  Theming/CSS Blend Modes
+
+ You can blend multiple backgrounds using the CSS blend modes available.
+=end
+
+BlendMode = Struct.new(:name, :id)
+
+class CssBlendmodesDemo
+  def initialize(main_window)
+    @builder = Gtk::Builder.new(:resource => "/css_blendmodes/blendmodes.ui")
+    @window = @builder["window"]
+    @window.transient_for = main_window
+
+    # Setup the CSS provider for window
+    @provider  = Gtk::CssProvider.new
+    Gtk::StyleContext.add_provider_for_screen(Gdk::Screen.default,
+                                              @provider,
+                                              Gtk::StyleProvider::PRIORITY_APPLICATION)
+
+    initialize_blend_modes
+    setup_listbox
+  end
+
+  def run
+    if !@window.visible?
+      @window.show_all
+    else
+      @window.destroy
+    end
+    @window
+  end
+
+  private
+
+  def initialize_blend_modes
+    @blend_modes = []
+    @blend_modes << BlendMode.new("Color", "color")
+    @blend_modes << BlendMode.new("Color (burn)", "color-burn")
+    @blend_modes << BlendMode.new("Color (dodge)", "color-dodge")
+    @blend_modes << BlendMode.new("Darken", "darken")
+    @blend_modes << BlendMode.new("Difference", "difference")
+    @blend_modes << BlendMode.new("Exclusion", "exclusion")
+    @blend_modes << BlendMode.new("Hard Light", "hard-light")
+    @blend_modes << BlendMode.new("Hue", "hue")
+    @blend_modes << BlendMode.new("Lighten", "lighten")
+    @blend_modes << BlendMode.new("Luminosity", "luminosity")
+    @blend_modes << BlendMode.new("Multiply", "multiply")
+    @blend_modes << BlendMode.new("Normal", "normal")
+    @blend_modes << BlendMode.new("Overlay", "overlay")
+    @blend_modes << BlendMode.new("Saturate", "saturate")
+    @blend_modes << BlendMode.new("Screen", "screen")
+    @blend_modes << BlendMode.new("Soft Light", "soft-light")
+  end
+
+  def setup_listbox
+    normal_row = nil
+    listbox = Gtk::ListBox.new
+    @builder["scrolledwindow"].add(listbox)
+
+    listbox.signal_connect "row-activated" do |widget, w_row, w_provider|
+      blend_mode = @blend_modes[w_row.index].id
+      update_css_for_blend_mode(blend_mode)
+    end
+
+    @blend_modes.each do |blend_mode|
+      row = Gtk::ListBoxRow.new
+      label = Gtk::Label.new(blend_mode.name)
+      label.xalign = 0
+      row.add(label)
+      listbox.add(row)
+
+      normal_row = row if blend_mode.id == "normal"
+    end
+
+    # select the "normal" row
+    listbox.select_row(normal_row)
+    normal_row.signal_emit("activate")
+    normal_row.grab_focus
+  end
+
+  def update_css_for_blend_mode(blend_mode)
+    raw_css = Gio::Resources.lookup_data("/css_blendmodes/css_blendmodes.css", 0)
+    css = sprintf(raw_css, blend_mode, blend_mode, blend_mode)
+    @provider.load_from_data(css)
+  end
+end

[ruby-gnome2-cvs] ruby-gnome2/ruby-gnome2@b3f3ba3 [master] Merge pull request #1098 from cedlemo/gtk3_sample_gtk_demo_css_blendmodes_rb

[Kouhei S. <nu...@co...>]

Kouhei Sutou	2017-08-29 09:05:49 +0900 (Tue, 29 Aug 2017)

  New Revision: b3f3ba3e6c1d1cd526dfb5f68b8d3dc5d83a5ff5
  https://github.com/ruby-gnome2/ruby-gnome2/commit/b3f3ba3e6c1d1cd526dfb5f68b8d3dc5d83a5ff5

  Message:
    Merge pull request #1098 from cedlemo/gtk3_sample_gtk_demo_css_blendmodes_rb
    
    Gtk3 sample gtk demo css blendmodes rb
    
    Patch by cedlemo. Thanks!!!

[ruby-gnome2-cvs] ruby-gnome2/ruby-gnome2@08825d1 [master] Update copyright date in combobox.rb demo

[cedlemo <nu...@co...>]

cedlemo	2017-08-29 02:23:23 +0900 (Tue, 29 Aug 2017)

  New Revision: 08825d1c001a4472a69ff446599b635ab7a79c03
  https://github.com/ruby-gnome2/ruby-gnome2/commit/08825d1c001a4472a69ff446599b635ab7a79c03

  Merged b3f3ba3: Merge pull request #1098 from cedlemo/gtk3_sample_gtk_demo_css_blendmodes_rb

  Message:
    Update copyright date in combobox.rb demo

  Modified files:
    gtk3/sample/gtk-demo/combobox.rb

  Modified: gtk3/sample/gtk-demo/combobox.rb (+1 -1)
===================================================================
--- gtk3/sample/gtk-demo/combobox.rb    2017-08-29 02:22:50 +0900 (5e7b4cfc5)
+++ gtk3/sample/gtk-demo/combobox.rb    2017-08-29 02:23:23 +0900 (4ce3e2eac)
@@ -1,4 +1,4 @@
-# Copyright (c) 2016 Ruby-GNOME2 Project Team
+# Copyright (c) 2017 Ruby-GNOME2 Project Team
 # This program is licenced under the same licence as Ruby-GNOME2.
 #
 =begin

[ruby-gnome2-cvs] ruby-gnome2/ruby-gnome2@a8f69cb [master] Fix styles issues (Rubocop)

[cedlemo <nu...@co...>]

cedlemo	2017-08-29 02:22:16 +0900 (Tue, 29 Aug 2017)

  New Revision: a8f69cbb352c979058df1a9db3c1bf923870886b
  https://github.com/ruby-gnome2/ruby-gnome2/commit/a8f69cbb352c979058df1a9db3c1bf923870886b

  Merged b3f3ba3: Merge pull request #1098 from cedlemo/gtk3_sample_gtk_demo_css_blendmodes_rb

  Message:
    Fix styles issues (Rubocop)

  Modified files:
    gtk3/sample/gtk-demo/css_blendmodes.rb

  Modified: gtk3/sample/gtk-demo/css_blendmodes.rb (+3 -4)
===================================================================
--- gtk3/sample/gtk-demo/css_blendmodes.rb    2017-08-29 02:19:01 +0900 (4cd5ec612)
+++ gtk3/sample/gtk-demo/css_blendmodes.rb    2017-08-29 02:22:16 +0900 (26411c878)
@@ -16,7 +16,7 @@ class CssBlendmodesDemo
     @window.transient_for = main_window
 
     # Setup the CSS provider for window
-    @provider  = Gtk::CssProvider.new
+    @provider = Gtk::CssProvider.new
     Gtk::StyleContext.add_provider_for_screen(Gdk::Screen.default,
                                               @provider,
                                               Gtk::StyleProvider::PRIORITY_APPLICATION)
@@ -61,7 +61,7 @@ class CssBlendmodesDemo
     listbox = Gtk::ListBox.new
     @builder["scrolledwindow"].add(listbox)
 
-    listbox.signal_connect "row-activated" do |widget, w_row, w_provider|
+    listbox.signal_connect "row-activated" do |_widget, w_row, _provider|
       blend_mode = @blend_modes[w_row.index].id
       update_css_for_blend_mode(blend_mode)
     end
@@ -72,7 +72,6 @@ class CssBlendmodesDemo
       label.xalign = 0
       row.add(label)
       listbox.add(row)
-
       normal_row = row if blend_mode.id == "normal"
     end
 
@@ -84,7 +83,7 @@ class CssBlendmodesDemo
 
   def update_css_for_blend_mode(blend_mode)
     raw_css = Gio::Resources.lookup_data("/css_blendmodes/css_blendmodes.css", 0)
-    css = sprintf(raw_css, blend_mode, blend_mode, blend_mode)
+    css = format(raw_css, blend_mode, blend_mode, blend_mode)
     @provider.load_from_data(css)
   end
 end

[ruby-gnome2-cvs] ruby-gnome2/ruby-gnome2@0072138 [master] Add combobox demo

[cedlemo <nu...@co...>]

cedlemo	2017-08-26 22:34:12 +0900 (Sat, 26 Aug 2017)

  New Revision: 0072138d3ffecbfe348592f788d80a520994bc83
  https://github.com/ruby-gnome2/ruby-gnome2/commit/0072138d3ffecbfe348592f788d80a520994bc83

  Merged 4fc1e00: Merge pull request #1096 from cedlemo/gtk3_sample_gtk_demo_combobox_rb

  Message:
    Add combobox demo

  Added files:
    gtk3/sample/gtk-demo/combobox.rb

  Added: gtk3/sample/gtk-demo/combobox.rb (+284 -0) 100644
===================================================================
--- /dev/null
+++ gtk3/sample/gtk-demo/combobox.rb    2017-08-26 22:34:12 +0900 (fbd6f7c7d)
@@ -0,0 +1,284 @@
+# Copyright (c) 2016 Ruby-GNOME2 Project Team
+# This program is licenced under the same licence as Ruby-GNOME2.
+#
+=begin
+=  Combo Boxes
+
+ The GtkComboBox widget allows to select one option out of a list.
+ The GtkComboBoxEntry additionally allows the user to enter a value
+ that is not in the list of options.
+
+ How the options are displayed is controlled by cell renderers.
+=end
+Icon = Struct.new(:name, :label)
+CapitalItem = Struct.new(:group, :name)
+
+class ComboboxDemo
+  ICON_NAME_COL = 0
+  TEXT_COL = 1
+
+  def initialize(main_window)
+    @window = Gtk::Window.new(:toplevel)
+    @window.screen = main_window.screen
+    @window.title = "Combo Boxes"
+    vbox = Gtk::Box.new(:vertical, 2)
+    vbox.margin = 10
+    @window.add(vbox)
+
+    # A combobox demonstrating cell renderers, separators and
+    # insensitive rows.
+
+    frame = Gtk::Frame.new("Items with icons")
+    vbox.pack_start(frame, :expand => false, :fill => false, :padding => 0)
+
+    box = Gtk::Box.new(:vertical, 0)
+    box.margin = 5
+    frame.add(box)
+
+    model = create_icon_store
+    combo = Gtk::ComboBox.new(:model => model)
+    box.add(combo)
+
+    renderer = Gtk::CellRendererPixbuf.new
+    combo.pack_start(renderer, false)
+    combo.set_attributes(renderer, "icon-name" => ICON_NAME_COL)
+
+    combo.set_cell_data_func(renderer) do |_layout, cell_renderer, model, iter|
+      set_sensitive(cell_renderer, model, iter)
+    end
+
+    renderer = Gtk::CellRendererText.new
+    combo.pack_start(renderer, true)
+    combo.set_attributes(renderer, "text" => TEXT_COL)
+
+    combo.set_cell_data_func(renderer) do |_layout, cell_renderer, model, iter|
+      set_sensitive(cell_renderer, model, iter)
+    end
+
+    combo.set_row_separator_func do |model, iter|
+      is_separator(model, iter)
+    end
+
+    combo.active = 0
+
+    # A combobox demonstrating trees
+    frame = Gtk::Frame.new("Where are we?")
+    vbox.pack_start(frame, :expand => false, :fill => false, :padding => 0)
+
+    box = Gtk::Box.new(:vertical, 0)
+    box.margin = 5
+    frame.add(box)
+
+    model = create_capital_store
+    combo = Gtk::ComboBox.new(:model => model)
+    box.add(combo)
+
+    renderer = Gtk::CellRendererText.new
+    combo.pack_start(renderer, true)
+    combo.set_attributes(renderer, "text" => 0)
+    combo.set_cell_data_func(renderer) do |_layout, cell_renderer, model, iter|
+      is_capital_sensitive(cell_renderer, model, iter)
+    end
+
+    path = Gtk::TreePath.new([0, 8, -1])
+    iter = model.get_iter(path)
+    combo.set_active_iter(iter)
+
+    # A GtkComboBoxEntry with validation
+    frame = Gtk::Frame.new("Editable")
+    vbox.pack_start(frame, :expand => true, :fill => true, :padding => 0)
+    box = Gtk::Box.new(:vertical, 0)
+    box.margin = 5
+    frame.add(box)
+
+    combo = Gtk::ComboBoxText.new(:entry => true)
+    fill_combo_entry(combo)
+    box.add(combo)
+
+    entry = MaskEntry.new
+    entry.mask = "^([0-9]*|One|Two|2\302\275|Three)$"
+
+    combo.remove(combo.child.gtype)
+    combo.add(entry)
+
+    # A combobox with string IDs
+    frame = Gtk::Frame.new("String IDs")
+    vbox.pack_start(frame, :expand => false, :fill => false, :padding => 0)
+
+    box = Gtk::Box.new(:vertical, 0)
+    box.margin = 5
+    frame.add(box)
+
+    combo = Gtk::ComboBoxText.new
+    combo.append("never", "Not visible")
+    combo.append("when-active", "Visible")
+    combo.append("always", "Always visible")
+    box.add(combo)
+
+    entry = Gtk::Entry.new
+    combo.bind_property("active-id", entry, "text", :bidirectional)
+    box.add(entry)
+  end
+
+  def run
+    if !@window.visible?
+      @window.show_all
+    else
+      @window.destroy
+    end
+    @window
+  end
+
+  private
+
+  def create_icon_store
+    icons = []
+    icons << Icon.new("dialog-warning", "Warning")
+    icons << Icon.new("process-stop", "Stop")
+    icons << Icon.new("document-new", "New")
+    icons << Icon.new("edit-clear", "Clear")
+    icons << Icon.new(nil, nil)
+    icons << Icon.new("document-open", "Open")
+    model = Gtk::ListStore.new(String, String)
+
+    icons.each do |icon|
+      iter = model.append
+      if icon.name
+        iter[ICON_NAME_COL] = icon.name
+        iter[TEXT_COL] = icon.label
+      else
+        iter[ICON_NAME_COL] = nil
+        iter[TEXT_COL] = "separator"
+      end
+    end
+    model
+  end
+
+  # A GtkCellLayoutDataFunc that demonstrates how one can control
+  # sensitivity of rows. This particular function does nothing
+  # useful and just makes the second row insensitive.
+
+  def set_sensitive(cell_renderer, model, iter)
+    path = model.get_path(iter)
+    indices = path.indices
+    cell_renderer.sensitive = indices[0] != 1
+  end
+
+  def is_separator(model, iter)
+    path = model.get_path(iter)
+    path.indices[0] == 4
+  end
+
+  def create_capital_store
+    capitals = []
+    capitals << CapitalItem.new("A - B", nil)
+    capitals << CapitalItem.new(nil, "Albany")
+    capitals << CapitalItem.new(nil, "Annapolis")
+    capitals << CapitalItem.new(nil, "Atlanta")
+    capitals << CapitalItem.new(nil, "Augusta")
+    capitals << CapitalItem.new(nil, "Austin")
+    capitals << CapitalItem.new(nil, "Baton Rouge")
+    capitals << CapitalItem.new(nil, "Bismarck")
+    capitals << CapitalItem.new(nil, "Boise")
+    capitals << CapitalItem.new(nil, "Boston")
+    capitals << CapitalItem.new("C - D", nil)
+    capitals << CapitalItem.new(nil, "Carson City")
+    capitals << CapitalItem.new(nil, "Charleston")
+    capitals << CapitalItem.new(nil, "Cheyenne")
+    capitals << CapitalItem.new(nil, "Columbia")
+    capitals << CapitalItem.new(nil, "Columbus")
+    capitals << CapitalItem.new(nil, "Concord")
+    capitals << CapitalItem.new(nil, "Denver")
+    capitals << CapitalItem.new(nil, "Des Moines")
+    capitals << CapitalItem.new(nil, "Dover")
+    capitals << CapitalItem.new("E - J", nil)
+    capitals << CapitalItem.new(nil, "Frankfort")
+    capitals << CapitalItem.new(nil, "Harrisburg")
+    capitals << CapitalItem.new(nil, "Hartford")
+    capitals << CapitalItem.new(nil, "Helena")
+    capitals << CapitalItem.new(nil, "Honolulu")
+    capitals << CapitalItem.new(nil, "Indianapolis")
+    capitals << CapitalItem.new(nil, "Jackson")
+    capitals << CapitalItem.new(nil, "Jefferson City")
+    capitals << CapitalItem.new(nil, "Juneau")
+    capitals << CapitalItem.new("K - O", nil)
+    capitals << CapitalItem.new(nil, "Lansing")
+    capitals << CapitalItem.new(nil, "Lincoln")
+    capitals << CapitalItem.new(nil, "Little Rock")
+    capitals << CapitalItem.new(nil, "Madison")
+    capitals << CapitalItem.new(nil, "Montgomery")
+    capitals << CapitalItem.new(nil, "Montpelier")
+    capitals << CapitalItem.new(nil, "Nashville")
+    capitals << CapitalItem.new(nil, "Oklahoma City")
+    capitals << CapitalItem.new(nil, "Olympia")
+    capitals << CapitalItem.new(nil, "P - S")
+    capitals << CapitalItem.new(nil, "Phoenix")
+    capitals << CapitalItem.new(nil, "Pierre")
+    capitals << CapitalItem.new(nil, "Providence")
+    capitals << CapitalItem.new(nil, "Raleigh")
+    capitals << CapitalItem.new(nil, "Richmond")
+    capitals << CapitalItem.new(nil, "Sacramento")
+    capitals << CapitalItem.new(nil, "Salem")
+    capitals << CapitalItem.new(nil, "Salt Lake City")
+    capitals << CapitalItem.new(nil, "Santa Fe")
+    capitals << CapitalItem.new(nil, "Springfield")
+    capitals << CapitalItem.new(nil, "St. Paul")
+    capitals << CapitalItem.new("T - Z", nil )
+    capitals << CapitalItem.new(nil, "Tallahassee")
+    capitals << CapitalItem.new(nil, "Topeka")
+    capitals << CapitalItem.new(nil, "Trenton")
+    model = Gtk::TreeStore.new(String)
+    iter = nil
+    iter2 = nil
+    capitals.each do |capital|
+      if capital.group
+        iter = model.append(nil)
+        iter[0] = capital.group
+      else
+        iter2 = model.append(iter)
+        iter2[0] = capital.name
+      end
+    end
+    model
+  end
+
+  def is_capital_sensitive(cell, tree_model, iter)
+    sensitive = !tree_model.iter_has_child(iter)
+    cell.sensitive = sensitive
+  end
+
+  def fill_combo_entry(combo)
+    combo.append_text("One")
+    combo.append_text("Two")
+    combo.append_text("2\302\275")
+    combo.append_text("Three")
+  end
+end
+
+class MaskEntry < Gtk::Entry
+  type_register
+  def initialize
+    super
+    signal_connect "changed" do |editable|
+      set_background
+    end
+  end
+
+  def mask=(value)
+    @mask = value
+  end
+
+  private
+
+  def set_background
+    if @mask
+      if !GLib::Regex.match?(@mask, text)
+        attrs = Pango::AttrList.new
+        attrs.insert(Pango::AttrForeground.new(65535, 32767, 32767))
+        set_attributes(attrs)
+      else
+        set_attributes(nil)
+      end
+    end
+  end
+end

[ruby-gnome2-cvs] ruby-gnome2/ruby-gnome2@33fee27 [master] Fix styles issues (Rubocop)

[cedlemo <nu...@co...>]

cedlemo	2017-08-26 22:41:55 +0900 (Sat, 26 Aug 2017)

  New Revision: 33fee27cb20badda0a271350e8932e39b8cf053c
  https://github.com/ruby-gnome2/ruby-gnome2/commit/33fee27cb20badda0a271350e8932e39b8cf053c

  Merged 4fc1e00: Merge pull request #1096 from cedlemo/gtk3_sample_gtk_demo_combobox_rb

  Message:
    Fix styles issues (Rubocop)

  Modified files:
    gtk3/sample/gtk-demo/combobox.rb

  Modified: gtk3/sample/gtk-demo/combobox.rb (+20 -23)
===================================================================
--- gtk3/sample/gtk-demo/combobox.rb    2017-08-26 22:34:12 +0900 (fbd6f7c7d)
+++ gtk3/sample/gtk-demo/combobox.rb    2017-08-26 22:41:55 +0900 (5e7b4cfc5)
@@ -10,6 +10,7 @@
 
  How the options are displayed is controlled by cell renderers.
 =end
+
 Icon = Struct.new(:name, :label)
 CapitalItem = Struct.new(:group, :name)
 
@@ -35,8 +36,8 @@ class ComboboxDemo
     box.margin = 5
     frame.add(box)
 
-    model = create_icon_store
-    combo = Gtk::ComboBox.new(:model => model)
+    store = create_icon_store
+    combo = Gtk::ComboBox.new(:model => store)
     box.add(combo)
 
     renderer = Gtk::CellRendererPixbuf.new
@@ -56,7 +57,7 @@ class ComboboxDemo
     end
 
     combo.set_row_separator_func do |model, iter|
-      is_separator(model, iter)
+      separator?(model, iter)
     end
 
     combo.active = 0
@@ -69,19 +70,19 @@ class ComboboxDemo
     box.margin = 5
     frame.add(box)
 
-    model = create_capital_store
-    combo = Gtk::ComboBox.new(:model => model)
+    store = create_capital_store
+    combo = Gtk::ComboBox.new(:model => store)
     box.add(combo)
 
     renderer = Gtk::CellRendererText.new
     combo.pack_start(renderer, true)
     combo.set_attributes(renderer, "text" => 0)
     combo.set_cell_data_func(renderer) do |_layout, cell_renderer, model, iter|
-      is_capital_sensitive(cell_renderer, model, iter)
+      capital_sensitive?(cell_renderer, model, iter)
     end
 
     path = Gtk::TreePath.new([0, 8, -1])
-    iter = model.get_iter(path)
+    iter = store.get_iter(path)
     combo.set_active_iter(iter)
 
     # A GtkComboBoxEntry with validation
@@ -164,7 +165,7 @@ class ComboboxDemo
     cell_renderer.sensitive = indices[0] != 1
   end
 
-  def is_separator(model, iter)
+  def separator?(model, iter)
     path = model.get_path(iter)
     path.indices[0] == 4
   end
@@ -223,7 +224,7 @@ class ComboboxDemo
     capitals << CapitalItem.new(nil, "Santa Fe")
     capitals << CapitalItem.new(nil, "Springfield")
     capitals << CapitalItem.new(nil, "St. Paul")
-    capitals << CapitalItem.new("T - Z", nil )
+    capitals << CapitalItem.new("T - Z", nil)
     capitals << CapitalItem.new(nil, "Tallahassee")
     capitals << CapitalItem.new(nil, "Topeka")
     capitals << CapitalItem.new(nil, "Trenton")
@@ -242,7 +243,7 @@ class ComboboxDemo
     model
   end
 
-  def is_capital_sensitive(cell, tree_model, iter)
+  def capital_sensitive?(cell, tree_model, iter)
     sensitive = !tree_model.iter_has_child(iter)
     cell.sensitive = sensitive
   end
@@ -257,28 +258,24 @@ end
 
 class MaskEntry < Gtk::Entry
   type_register
+  attr_writer :mask
   def initialize
     super
-    signal_connect "changed" do |editable|
+    signal_connect "changed" do
       set_background
     end
   end
 
-  def mask=(value)
-    @mask = value
-  end
-
   private
 
   def set_background
-    if @mask
-      if !GLib::Regex.match?(@mask, text)
-        attrs = Pango::AttrList.new
-        attrs.insert(Pango::AttrForeground.new(65535, 32767, 32767))
-        set_attributes(attrs)
-      else
-        set_attributes(nil)
-      end
+    return unless @mask
+    if !GLib::Regex.match?(@mask, text)
+      attrs = Pango::AttrList.new
+      attrs.insert(Pango::AttrForeground.new(65_535, 32_767, 32_767))
+      set_attributes(attrs)
+    else
+      set_attributes(nil)
     end
   end
 end

[ruby-gnome2-cvs] ruby-gnome2/ruby-gnome2@4fc1e00 [master] Merge pull request #1096 from cedlemo/gtk3_sample_gtk_demo_combobox_rb

[Kouhei S. <nu...@co...>]

Kouhei Sutou	2017-08-27 13:27:48 +0900 (Sun, 27 Aug 2017)

  New Revision: 4fc1e0093ade0487adec7609d711596c0f813282
  https://github.com/ruby-gnome2/ruby-gnome2/commit/4fc1e0093ade0487adec7609d711596c0f813282

  Message:
    Merge pull request #1096 from cedlemo/gtk3_sample_gtk_demo_combobox_rb
    
    Gtk3 sample gtk demo combobox rb
    
    Patch by cedlemo. Thanks!!!

[ruby-gnome2-cvs] ruby-gnome2/ruby-gnome2@087101d [master] Update ruby demos TODO

[cedlemo <nu...@co...>]

cedlemo	2017-08-26 22:42:46 +0900 (Sat, 26 Aug 2017)

  New Revision: 087101d9e1a58a6d76c8aadb1f2a1a81be1026ee
  https://github.com/ruby-gnome2/ruby-gnome2/commit/087101d9e1a58a6d76c8aadb1f2a1a81be1026ee

  Merged 4fc1e00: Merge pull request #1096 from cedlemo/gtk3_sample_gtk_demo_combobox_rb

  Message:
    Update ruby demos TODO

  Modified files:
    gtk3/sample/gtk-demo/TODO

  Modified: gtk3/sample/gtk-demo/TODO (+1 -1)
===================================================================
--- gtk3/sample/gtk-demo/TODO    2017-08-26 22:41:55 +0900 (36e452429)
+++ gtk3/sample/gtk-demo/TODO    2017-08-26 22:42:46 +0900 (9c373be13)
@@ -55,12 +55,12 @@ transparent.c           ok              ok
 images.c                ok              ok
 textview.c              ok              ok
 event_axes.c            ok              ok
+combobox.c              ok              ok
 
 Remains :
 
 application.c           no              no
 changedisplay.c         ok              no
-combobox.c              no              no
 css_blendmodes.c	no		no
 fishbowl.c		no		no
 flowbox.c               no              no

[ruby-gnome2-cvs] Passed: ruby-gnome2/pkg-config#88 (1.2.7 - 195dc07)

[Travis CI <bu...@tr...>]

Build Update for ruby-gnome2/pkg-config
-------------------------------------

Build: #88
Status: Passed

Duration: 48 seconds
Commit: 195dc07 (1.2.7)
Author: Kouhei Sutou
Message: Add 1.2.7 entry

View the changeset: https://github.com/ruby-gnome2/pkg-config/compare/1.2.7

View the full build log and details: https://travis-ci.org/ruby-gnome2/pkg-config/builds/264974251?utm_source=email&utm_medium=notification

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

[ruby-gnome2-cvs] ruby-gnome2/pkg-config@a68ff1c [master] Bump version

[Kouhei S. <nu...@co...>]

Kouhei Sutou	2017-08-16 10:40:21 +0900 (Wed, 16 Aug 2017)

  New Revision: a68ff1c66350852fe71c52ce28a9bdacb7138947
  https://github.com/ruby-gnome2/pkg-config/commit/a68ff1c66350852fe71c52ce28a9bdacb7138947

  Message:
    Bump version

  Modified files:
    lib/pkg-config/version.rb

  Modified: lib/pkg-config/version.rb (+1 -1)
===================================================================
--- lib/pkg-config/version.rb    2017-08-16 10:39:35 +0900 (e86910f)
+++ lib/pkg-config/version.rb    2017-08-16 10:40:21 +0900 (b7538eb)
@@ -15,5 +15,5 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 module PKGConfig
-  VERSION = "1.2.7"
+  VERSION = "1.2.8"
 end

[ruby-gnome2-cvs] ruby-gnome2/pkg-config@195dc07 [master] Add 1.2.7 entry

[Kouhei S. <nu...@co...>]

Kouhei Sutou	2017-08-16 10:39:35 +0900 (Wed, 16 Aug 2017)

  New Revision: 195dc075efae8bb8ccc808177ecebf53f96ba108
  https://github.com/ruby-gnome2/pkg-config/commit/195dc075efae8bb8ccc808177ecebf53f96ba108

  Message:
    Add 1.2.7 entry

  Modified files:
    NEWS

  Modified: NEWS (+11 -0)
===================================================================
--- NEWS    2017-08-16 10:38:22 +0900 (abaeccc)
+++ NEWS    2017-08-16 10:39:35 +0900 (5b2efc9)
@@ -1,5 +1,16 @@
 = NEWS
 
+== 1.2.7 - 2017-08-16
+
+=== Improvements
+
+  * Improved Homebrew repository detection.
+    [Reported by Wyatt Kirby]
+
+=== Thanks
+
+  * Wyatt Kirby
+
 == 1.2.6 - 2017-08-13
 
 === Improvements

[ruby-gnome2-cvs] ruby-gnome2/pkg-config@42ba8a9 [master] Relax macOS version detection

[Kouhei S. <nu...@co...>]

Kouhei Sutou	2017-08-16 10:38:22 +0900 (Wed, 16 Aug 2017)

  New Revision: 42ba8a9e4a0aaa1e6fb7d91227cbe62c36fcf854
  https://github.com/ruby-gnome2/pkg-config/commit/42ba8a9e4a0aaa1e6fb7d91227cbe62c36fcf854

  Message:
    Relax macOS version detection
    
    GitHub: fix rcairo/rcairo#49
    
    Reported by Wyatt Kirby. Thanks!!!

  Modified files:
    lib/pkg-config.rb

  Modified: lib/pkg-config.rb (+1 -1)
===================================================================
--- lib/pkg-config.rb    2017-08-13 20:23:52 +0900 (f1ff34a)
+++ lib/pkg-config.rb    2017-08-16 10:38:22 +0900 (7fd5971)
@@ -374,7 +374,7 @@ class PackageConfig
     paths << (pkg_config_prefix + "lib/pkgconfig").to_s
     paths << (pkg_config_prefix + "libdata/pkgconfig").to_s
     if /-darwin\d+\z/ =~ RUBY_PLATFORM and
-        /\A(\d+\.\d+)\./ =~ `sw_vers -productVersion`
+        /\A(\d+\.\d+)/ =~ `sw_vers -productVersion`
       mac_os_version = $1
       homebrew_repository_candidates = []
       brew_path = pkg_config_prefix + "bin" + "brew"

[ruby-gnome2-cvs] Passed: ruby-gnome2/pkg-config#84 (1.2.6 - a6793a9)

[Travis CI <bu...@tr...>]

Build Update for ruby-gnome2/pkg-config
-------------------------------------

Build: #84
Status: Passed

Duration: 1 minute and 16 seconds
Commit: a6793a9 (1.2.6)
Author: Kouhei Sutou
Message: Add 1.2.6 entry

View the changeset: https://github.com/ruby-gnome2/pkg-config/compare/1.2.6

View the full build log and details: https://travis-ci.org/ruby-gnome2/pkg-config/builds/264041816?utm_source=email&utm_medium=notification

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

[ruby-gnome2-cvs] ruby-gnome2/pkg-config@b2a8a3e [master] Bump version

[Kouhei S. <nu...@co...>]

Kouhei Sutou	2017-08-13 20:23:52 +0900 (Sun, 13 Aug 2017)

  New Revision: b2a8a3e1b389fd421f68b8ed4e96c8bb7016b90d
  https://github.com/ruby-gnome2/pkg-config/commit/b2a8a3e1b389fd421f68b8ed4e96c8bb7016b90d

  Message:
    Bump version

  Modified files:
    lib/pkg-config/version.rb

  Modified: lib/pkg-config/version.rb (+1 -1)
===================================================================
--- lib/pkg-config/version.rb    2017-08-13 20:22:52 +0900 (a962a3b)
+++ lib/pkg-config/version.rb    2017-08-13 20:23:52 +0900 (e86910f)
@@ -15,5 +15,5 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 module PKGConfig
-  VERSION = "1.2.6"
+  VERSION = "1.2.7"
 end

[ruby-gnome2-cvs] ruby-gnome2/pkg-config@a6793a9 [master] Add 1.2.6 entry

[Kouhei S. <nu...@co...>]

Kouhei Sutou	2017-08-13 20:22:52 +0900 (Sun, 13 Aug 2017)

  New Revision: a6793a96382069908ee1a8b474b39c655619ad33
  https://github.com/ruby-gnome2/pkg-config/commit/a6793a96382069908ee1a8b474b39c655619ad33

  Message:
    Add 1.2.6 entry

  Modified files:
    NEWS

  Modified: NEWS (+6 -0)
===================================================================
--- NEWS    2017-08-13 20:20:39 +0900 (1214eca)
+++ NEWS    2017-08-13 20:22:52 +0900 (abaeccc)
@@ -1,5 +1,11 @@
 = NEWS
 
+== 1.2.6 - 2017-08-13
+
+=== Improvements
+
+  * Improved Homebrew repository detection.
+
 == 1.2.5 - 2017-08-10
 
 === Improvements

[ruby-gnome2-cvs] ruby-gnome2/pkg-config@5f12c2a [master] Improve Homebrew repository path detection

[Kouhei S. <nu...@co...>]

Kouhei Sutou	2017-08-13 20:20:39 +0900 (Sun, 13 Aug 2017)

  New Revision: 5f12c2a9b8409b8016fc9b614f70200cced42d80
  https://github.com/ruby-gnome2/pkg-config/commit/5f12c2a9b8409b8016fc9b614f70200cced42d80

  Message:
    Improve Homebrew repository path detection

  Modified files:
    lib/pkg-config.rb

  Modified: lib/pkg-config.rb (+14 -3)
===================================================================
--- lib/pkg-config.rb    2017-08-10 23:47:58 +0900 (7985bd1)
+++ lib/pkg-config.rb    2017-08-13 20:20:39 +0900 (f1ff34a)
@@ -376,9 +376,20 @@ class PackageConfig
     if /-darwin\d+\z/ =~ RUBY_PLATFORM and
         /\A(\d+\.\d+)\./ =~ `sw_vers -productVersion`
       mac_os_version = $1
-      path = pkg_config_prefix +
-        "Library/Homebrew/os/mac/pkgconfig/#{mac_os_version}"
-      paths << path.to_s if path.exist?
+      homebrew_repository_candidates = []
+      brew_path = pkg_config_prefix + "bin" + "brew"
+      if brew_path.exist?
+        escaped_brew_path = Shellwords.escape(brew_path.to_s)
+        homebrew_repository = `#{escaped_brew_path} --repository`.chomp
+        homebrew_repository_candidates << Pathname.new(homebrew_repository)
+      else
+        homebrew_repository_candidates << pkg_config_prefix + "Homebrew"
+        homebrew_repository_candidates << pkg_config_prefix
+      end
+      homebrew_repository_candidates.each do |candidate|
+        path = candidate + "Library/Homebrew/os/mac/pkgconfig/#{mac_os_version}"
+        paths << path.to_s if path.exist?
+      end
     end
     paths.concat(default_paths)
     paths.join(SEPARATOR)

[ruby-gnome2-cvs] ruby-gnome2/ruby-gnome2@0c5d625 [master] webkit2-gtk test: relax to support the latest WebKit2GTK+

[Kouhei S. <nu...@co...>]

Kouhei Sutou	2017-08-12 00:10:22 +0900 (Sat, 12 Aug 2017)

  New Revision: 0c5d625a178dd33429dcc4c1d28f66eab55410b4
  https://github.com/ruby-gnome2/ruby-gnome2/commit/0c5d625a178dd33429dcc4c1d28f66eab55410b4

  Message:
    webkit2-gtk test: relax to support the latest WebKit2GTK+
    
    GitHub: fix #1095
    
    Reported by Jeremy Bicha. Thanks!!!

  Modified files:
    webkit2-gtk/test/test-webkit2-gtk-web-view.rb

  Modified: webkit2-gtk/test/test-webkit2-gtk-web-view.rb (+0 -2)
===================================================================
--- webkit2-gtk/test/test-webkit2-gtk-web-view.rb    2017-08-12 00:06:43 +0900 (1ac81ea0e)
+++ webkit2-gtk/test/test-webkit2-gtk-web-view.rb    2017-08-12 00:10:22 +0900 (8f8ef0d48)
@@ -24,14 +24,12 @@ class TestWebKit2GtkWebView < Test::Unit::TestCase
         context = WebKit2Gtk::WebContext.new
         webview = WebKit2Gtk::WebView.new(context: context)
         assert_equal(context, webview.context)
-        assert_nil(webview.user_content_manager)
       end
 
       test "with settings" do
         settings = WebKit2Gtk::Settings.new
         webview = WebKit2Gtk::WebView.new(settings: settings)
         assert_equal(settings, webview.settings)
-        assert_nil(webview.user_content_manager)
       end
 
       test "with user content manager" do

[ruby-gnome2-cvs] ruby-gnome2/ruby-gnome2@c8e9cc5 [master] webkit2-gtk: follow new_with_related_view fix in upstream

[Kouhei S. <nu...@co...>]

Kouhei Sutou	2017-08-12 00:06:43 +0900 (Sat, 12 Aug 2017)

  New Revision: c8e9cc5d482f7ae720914b65a4d11671d7c2981d
  https://github.com/ruby-gnome2/ruby-gnome2/commit/c8e9cc5d482f7ae720914b65a4d11671d7c2981d

  Message:
    webkit2-gtk: follow new_with_related_view fix in upstream
    
    GitHub: #1095
    
    Reported by Jeremy Bicha. Thanks!!!

  Modified files:
    webkit2-gtk/lib/webkit2-gtk/web-view.rb
    webkit2-gtk/test/test-webkit2-gtk-web-view.rb

  Modified: webkit2-gtk/lib/webkit2-gtk/web-view.rb (+12 -9)
===================================================================
--- webkit2-gtk/lib/webkit2-gtk/web-view.rb    2017-08-10 08:59:56 +0900 (f226edd47)
+++ webkit2-gtk/lib/webkit2-gtk/web-view.rb    2017-08-12 00:06:43 +0900 (513571c8f)
@@ -16,16 +16,16 @@
 
 module WebKit2Gtk
   class WebView
-    class << self
-      def new(*args)
-        return super unless args.size == 1
-        return super unless args[0].is_a?(Hash)
+    unless private_method_defined?(:initialize_new_with_related_view)
+      class << self
+        def new(*args)
+          return super unless args.size == 1
+          return super unless args[0].is_a?(Hash)
 
-        related_view = args[0][:related_view]
-        return super unless related_view
-        # TODO: Workaround for webkit_web_view_new_with_related_view is
-        # handled as method not constructor.
-        related_view.new_with_related_view
+          related_view = args[0][:related_view]
+          return super unless related_view
+          related_view.new_with_related_view
+        end
       end
     end
 
@@ -53,6 +53,7 @@ module WebKit2Gtk
       context = options[:context]
       settings = options[:settings]
       user_content_manager = options[:user_content_manager]
+      related_view = options[:related_view]
 
       if context
         initialize_new_with_context(context)
@@ -60,6 +61,8 @@ module WebKit2Gtk
         initialize_new_with_settings(settings)
       elsif user_content_manager
         initialize_new_with_user_content_manager(user_content_manager)
+      elsif related_view
+        initialize_new_with_related_view(related_view)
       else
         message =
           "must specify :context, :settings, :user_content_manager or :related_view"

  Modified: webkit2-gtk/test/test-webkit2-gtk-web-view.rb (+1 -1)
===================================================================
--- webkit2-gtk/test/test-webkit2-gtk-web-view.rb    2017-08-10 08:59:56 +0900 (b2d17145a)
+++ webkit2-gtk/test/test-webkit2-gtk-web-view.rb    2017-08-12 00:06:43 +0900 (1ac81ea0e)
@@ -43,7 +43,7 @@ class TestWebKit2GtkWebView < Test::Unit::TestCase
       test "with related view" do
         settings = WebKit2Gtk::Settings.new
         related = WebKit2Gtk::WebView.new(settings: settings)
-        webview = related.new_with_related_view
+        webview = WebKit2Gtk::WebView.new(related_view: related)
         assert_equal(settings, webview.settings)
       end
 

[ruby-gnome2-cvs] Passed: ruby-gnome2/pkg-config#80 (1.2.5 - 90fb95e)

[Travis CI <bu...@tr...>]

Build Update for ruby-gnome2/pkg-config
-------------------------------------

Build: #80
Status: Passed

Duration: 2 minutes and 59 seconds
Commit: 90fb95e (1.2.5)
Author: Kouhei Sutou
Message: Add 1.2.5 entry

View the changeset: https://github.com/ruby-gnome2/pkg-config/compare/1.2.5

View the full build log and details: https://travis-ci.org/ruby-gnome2/pkg-config/builds/263119467?utm_source=email&utm_medium=notification

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

[ruby-gnome2-cvs] ruby-gnome2/pkg-config@f420344 [master] Bump version

[Kouhei S. <nu...@co...>]

Kouhei Sutou	2017-08-10 23:47:58 +0900 (Thu, 10 Aug 2017)

  New Revision: f420344d782dfaea4d29087d009ac112c4b630c2
  https://github.com/ruby-gnome2/pkg-config/commit/f420344d782dfaea4d29087d009ac112c4b630c2

  Message:
    Bump version

  Modified files:
    lib/pkg-config/version.rb

  Modified: lib/pkg-config/version.rb (+1 -1)
===================================================================
--- lib/pkg-config/version.rb    2017-08-10 23:46:19 +0900 (e6427e6)
+++ lib/pkg-config/version.rb    2017-08-10 23:47:58 +0900 (a962a3b)
@@ -15,5 +15,5 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 module PKGConfig
-  VERSION = "1.2.5"
+  VERSION = "1.2.6"
 end

[ruby-gnome2-cvs] ruby-gnome2/pkg-config@90fb95e [master] Add 1.2.5 entry

[Kouhei S. <nu...@co...>]

Kouhei Sutou	2017-08-10 23:46:19 +0900 (Thu, 10 Aug 2017)

  New Revision: 90fb95ee6c874533cbdd16f8f5e97b4de2d8b2cc
  https://github.com/ruby-gnome2/pkg-config/commit/90fb95ee6c874533cbdd16f8f5e97b4de2d8b2cc

  Message:
    Add 1.2.5 entry

  Modified files:
    NEWS

  Modified: NEWS (+11 -0)
===================================================================
--- NEWS    2017-08-10 23:42:11 +0900 (af89a9d)
+++ NEWS    2017-08-10 23:46:19 +0900 (1214eca)
@@ -1,5 +1,16 @@
 = NEWS
 
+== 1.2.5 - 2017-08-10
+
+=== Improvements
+
+  * Supported Homebrew bundled .pc files.
+    [GitHub:rcairo/rcairo#49][Reported by choboy11]
+
+=== Thanks
+
+  * choboy11
+
 == 1.2.4 - 2017-08-07
 
 === Improvements

[ruby-gnome2-cvs] ruby-gnome2/pkg-config@e98d136 [master] Support Homebrew bundled .pc

[Kouhei S. <nu...@co...>]

Kouhei Sutou	2017-08-10 23:42:11 +0900 (Thu, 10 Aug 2017)

  New Revision: e98d13699de6cbd881971e161e9419dbaec9751c
  https://github.com/ruby-gnome2/pkg-config/commit/e98d13699de6cbd881971e161e9419dbaec9751c

  Message:
    Support Homebrew bundled .pc
    
    GitHub: fix #49
    
    Reported by choboy11. Thanks!!!

  Modified files:
    lib/pkg-config.rb

  Modified: lib/pkg-config.rb (+7 -0)
===================================================================
--- lib/pkg-config.rb    2017-08-10 23:31:25 +0900 (d83fb5f)
+++ lib/pkg-config.rb    2017-08-10 23:42:11 +0900 (7985bd1)
@@ -373,6 +373,13 @@ class PackageConfig
     paths << (pkg_config_prefix + "libx32/pkgconfig").to_s
     paths << (pkg_config_prefix + "lib/pkgconfig").to_s
     paths << (pkg_config_prefix + "libdata/pkgconfig").to_s
+    if /-darwin\d+\z/ =~ RUBY_PLATFORM and
+        /\A(\d+\.\d+)\./ =~ `sw_vers -productVersion`
+      mac_os_version = $1
+      path = pkg_config_prefix +
+        "Library/Homebrew/os/mac/pkgconfig/#{mac_os_version}"
+      paths << path.to_s if path.exist?
+    end
     paths.concat(default_paths)
     paths.join(SEPARATOR)
   end

[ruby-gnome2-cvs] ruby-gnome2/pkg-config@2902b6c [master] Join paths only once

[Kouhei S. <nu...@co...>]

Kouhei Sutou	2017-08-10 23:31:25 +0900 (Thu, 10 Aug 2017)

  New Revision: 2902b6c8442f76100725a721e5ee5c6eda77b96e
  https://github.com/ruby-gnome2/pkg-config/commit/2902b6c8442f76100725a721e5ee5c6eda77b96e

  Message:
    Join paths only once

  Modified files:
    lib/pkg-config.rb

  Modified: lib/pkg-config.rb (+13 -13)
===================================================================
--- lib/pkg-config.rb    2017-08-10 23:31:04 +0900 (542d1c3)
+++ lib/pkg-config.rb    2017-08-10 23:31:25 +0900 (d83fb5f)
@@ -358,23 +358,23 @@ class PackageConfig
     when "x64-mingw32"
       default_paths.concat(Dir.glob("c:/msys*/mingw64/lib/pkgconfig"))
     end
-    default_path = default_paths.join(SEPARATOR)
     libdir = ENV["PKG_CONFIG_LIBDIR"]
-    default_path = [libdir, default_path].join(SEPARATOR) if libdir
+    default_paths.unshift(libdir) if libdir
 
     pkg_config = self.class.native_pkg_config
-    return default_path unless pkg_config.absolute?
+    return default_paths.join(SEPARATOR) unless pkg_config.absolute?
+
     pkg_config_prefix = pkg_config.parent.parent
-    pkg_config_arch_depended_path =
-      Dir.glob((pkg_config_prefix + "lib/*/pkgconfig").to_s).join(SEPARATOR)
-    [
-      pkg_config_arch_depended_path,
-      (pkg_config_prefix + "lib64/pkgconfig").to_s,
-      (pkg_config_prefix + "libx32/pkgconfig").to_s,
-      (pkg_config_prefix + "lib/pkgconfig").to_s,
-      (pkg_config_prefix + "libdata/pkgconfig").to_s,
-      default_path,
-    ].join(SEPARATOR)
+    pkg_config_arch_depended_paths =
+      Dir.glob((pkg_config_prefix + "lib/*/pkgconfig").to_s)
+    paths = []
+    paths.concat(pkg_config_arch_depended_paths)
+    paths << (pkg_config_prefix + "lib64/pkgconfig").to_s
+    paths << (pkg_config_prefix + "libx32/pkgconfig").to_s
+    paths << (pkg_config_prefix + "lib/pkgconfig").to_s
+    paths << (pkg_config_prefix + "libdata/pkgconfig").to_s
+    paths.concat(default_paths)
+    paths.join(SEPARATOR)
   end
 
   def required_packages

[ruby-gnome2-cvs] ruby-gnome2/pkg-config@b87efe0 [master] test: fix condition

[Kouhei S. <nu...@co...>]

Kouhei Sutou	2017-08-10 23:31:04 +0900 (Thu, 10 Aug 2017)

  New Revision: b87efe04a7e3c0a9e6f9e5603366287bebb23f2b
  https://github.com/ruby-gnome2/pkg-config/commit/b87efe04a7e3c0a9e6f9e5603366287bebb23f2b

  Message:
    test: fix condition

  Modified files:
    test/test_pkg_config.rb

  Modified: test/test_pkg_config.rb (+1 -1)
===================================================================
--- test/test_pkg_config.rb    2017-08-10 23:27:03 +0900 (f256940)
+++ test/test_pkg_config.rb    2017-08-10 23:31:04 +0900 (1321562)
@@ -12,7 +12,7 @@ class PkgConfigTest < Test::Unit::TestCase
   def only_pkg_config_version(major, minor)
     pkg_config_version = `pkg-config --version`.chomp
     current_major, current_minor = pkg_config_version.split(".").collect(&:to_i)
-    return if ([major, minor] <=> [current_major, current_minor]) < 0
+    return if ([major, minor] <=> [current_major, current_minor]) <= 0
     omit("Require pkg-config #{pkg_config_version} or later")
   end