gdk4 3.5.1 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0fb7506465a211eadc1a4e2494cf530e115c731a88f0aa0a2c416b94847ad53e
-  data.tar.gz: c0ccf28b74fa4ac4bc54a70992f27cd27a0303fc827efaa7e83b44317550eac9
+  metadata.gz: df4c73995ff99de3a9e7cb197fd85a3054e98f690b772fc71cb0b127b93c3e4d
+  data.tar.gz: f9dc155e83b4a054c991701394b45433a34e2257fedb29237919c4de27a32af0
 SHA512:
-  metadata.gz: 8cbaa1de9f1e1fc8524638a5bddcfb0ec8cd4c1854b8f0e246cedbb870c2afc751e8cf003fa339bf65c978edca36601bf5691d03a50256b210337b2d7b934f54
-  data.tar.gz: 593b11312aa89841c1ad5413e40bef45a45f3afd0ae3944efbcce8d9c0a5586231ba6a7b9fc27668488b9acc03b9cd059d3bc1d9e3fee9e6cf1a3290122b9b63
+  metadata.gz: 0e2795e7e3830e3a3b3a60f0b2f2da53ae9abd484129435fc72d54e95ec2b2d6d05fd6c1c711565f0a0164b55e3948c210a03e67ae26503ce0e8a6663bdd4856
+  data.tar.gz: ffb0f5a0fa906dd56206f71bc58f9d52a0990d4c67c41ec31c7d39aee85c1a59f17ed39ceebc01afaf0fa8ca556e02bcf4b530abd690006beb49ab6c4aeb3134

data/dependency-check/Rakefile

@@ -32,6 +32,7 @@ namespace :dependency do
     package_id = "gtk4"
     unless PKGConfig.check_version?(package_id)
       unless NativePackageInstaller.install(:alt_linux => "libgtk+4-devel",
+                                            :arch_linux => "gtk4",
                                             :debian => "libgtk-4-dev",
                                             :redhat => "pkgconfig(#{package_id})",
                                             :homebrew => "gtk+4",

data/lib/gdk4/cairo.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2018  Ruby-GNOME2 Project Team
+# Copyright (C) 2014-2022  Ruby-GNOME Project Team
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -16,17 +16,21 @@
 
 module Cairo
   class Context
-    alias_method :set_source_rgba_raw, :set_source_rgba
-    def set_source_rgba(rgba, g=nil, b=nil, a=nil)
-      case rgba
-      when Gdk::RGBA
-        set_source_gdk_rgba(rgba)
-      when Array
-        set_source_rgba_raw(rgba)
-      else
-        r = rgba
-        set_source_rgba_raw([r, g, b, a || 1.0])
+    if method_defined?(:set_source_rgba)
+      alias_method :set_source_rgba_raw, :set_source_rgba
+      def set_source_rgba(rgba, g=nil, b=nil, a=nil)
+        case rgba
+        when Gdk::RGBA
+          set_source_gdk_rgba(rgba)
+        when Array
+          set_source_rgba_raw(rgba)
+        else
+          r = rgba
+          set_source_rgba_raw([r, g, b, a || 1.0])
+        end
       end
+    else
+      alias_method :set_source_rgba, :set_source_gdk_rgba
     end
 
     def source_rgba=(rgba)

data/{test/test-gdk-event-type.rb → lib/gdk4/cursor.rb}

@@ -1,4 +1,4 @@
-# Copyright (C) 2014  Ruby-GNOME2 Project Team
+# Copyright (C) 2015-2022  Ruby-GNOME Project Team
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -14,12 +14,19 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-class TestGdkEventType < Test::Unit::TestCase
-  def test_2button_press
-    assert_equal("2button-press", Gdk::EventType::BUTTON2_PRESS.nick)
-  end
-
-  def test_3button_press
-    assert_equal("3button-press", Gdk::EventType::BUTTON3_PRESS.nick)
+module Gdk
+  class Cursor
+    @caches = {}
+    class << self
+      def new(*args)
+        first_arg = args.first
+        case first_arg
+        when String, Symbol
+          @caches[first_arg] ||= super
+        else
+          super
+        end
+      end
+    end
   end
 end

data/lib/gdk4/deprecated.rb

@@ -0,0 +1,156 @@
+# Copyright (C) 2011-2022  Ruby-GNOME Project Team
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+module Gdk
+  extend GLib::Deprecatable
+  define_deprecated_const :Atom, raise: "No longer available in GDK 4."
+  define_deprecated_const :Color, raise: "No longer available in GDK 4."
+  define_deprecated_const :Colormap, raise: "Use 'Gdk::Visual' instead."
+  define_deprecated_const :Color, raise: "No longer available in GDK 4."
+  define_deprecated_const :DragContext, raise: "No longer available in GDK 4."
+  define_deprecated_const :EventCrossing, "Gdk::CrossingEvent"
+  define_deprecated_const :EventMask, raise: "No longer available in GDK 4."
+  define_deprecated_const :EventOwnerChange, raise: "No longer available in GDK 4."
+  define_deprecated_const :EventProperty, raise: "No longer available in GDK 4."
+  define_deprecated_const :EventScroll, "Gdk::ScrollEvent"
+  define_deprecated_const :EventSetting, raise: "No longer available in GDK 4."
+  define_deprecated_const :EventVisibility, raise: "No longer available in GDK 4."
+  define_deprecated_const :EventWindowState, raise: "No longer available in GDK 4."
+  define_deprecated_const :FilterReturn, raise: "No longer available in GDK 4."
+  define_deprecated_const :GrabStatus, raise: "No longer available in GDK 4."
+  define_deprecated_const :Image,
+                          raise: "Use 'GdkPixbuf::Pixbuf' or 'Cairo::Surface' instead."
+  define_deprecated_const :Input, raise: "Use 'GLib::IOChannel' instead."
+  define_deprecated_const :Property, raise: "No longer available in GDK 4."
+  define_deprecated_const :Screen, raise: "No longer available in GDK 4."
+  define_deprecated_const :Selection, raise: "No longer available in GDK 4."
+  define_deprecated_const :Status, raise: "No longer available in GDK 4."
+  define_deprecated_const :Visual, raise: "No longer available in GDK 4."
+  define_deprecated_const :Window, raise: "Use 'Gdk::Surface' instead."
+  define_deprecated_const :WindowAttr, raise: "No longer available in GDK 4."
+  define_deprecated_const :WindowAttributesType,
+                          raise: "No longer available in GDK 4."
+  define_deprecated_const :WindowHints, raise: "No longer available in GDK 4."
+  define_deprecated_const :WindowType, raise: "No longer available in GDK 4."
+  define_deprecated_const :WindowTypeHint, raise: "No longer available in GDK 4."
+  define_deprecated_const :WindowWindowClass,
+                          raise: "No longer available in GDK 4."
+  define_deprecated_const :WMDecoration, raise: "No longer available in GDK 4."
+  define_deprecated_const :WMFunction, raise: "No longer available in GDK 4."
+  define_deprecated_const :X11, 'GdkX11'
+
+  class Cursor
+    extend GLib::Deprecatable
+    define_deprecated_const :CursorType, raise: "No longer available in GDK 4."
+    define_deprecated_method :pixmap?, :warn => "Don't use this method." do |_self|
+      false
+    end
+  end
+
+  class Device
+    extend GLib::Deprecatable
+    define_deprecated_enums :AxisUse, 'AXIS'
+    define_deprecated_const :EXTENSION_EVENTS_NONE,
+                            raise: "No longer available in GDK 4."
+    define_deprecated_const :EXTENSION_EVENTS_ALL,
+                            raise: "No longer available in GDK 4."
+    define_deprecated_const :EXTENSION_EVENTS_CURSOR,
+                            raise: "No longer available in GDK 4."
+    define_deprecated_const :ExtensionMode,
+                            raise: "No longer available in GDK 4."
+    define_deprecated_const :InputMode, raise: "No longer available in GDK 4."
+    define_deprecated_enums :InputSource, 'SOURCE'
+  end
+
+  class Display
+    extend GLib::Deprecatable
+    define_deprecated_method :double_click_time, :raise => "Don't use this method."
+    define_deprecated_method :double_click_distance, :raise => "Don't use this method."
+    define_deprecated_method :button_click_time, :raise => "Don't use this method."
+    define_deprecated_method :button_window, :raise => "Don't use this method."
+    define_deprecated_method :button_number, :raise => "Don't use this method."
+    define_deprecated_method :button_x, :raise => "Don't use this method."
+    define_deprecated_method :button_y, :raise => "Don't use this method."
+  end
+
+  class Event
+    extend GLib::Deprecatable
+
+    define_deprecated_const :CURRENT_TIME, "Gdk::CURRENT_TIME"
+
+    define_deprecated_const :Mask, raise: "No longer available in GDK 4."
+
+    define_deprecated_const :Type, "Gdk::EventType"
+    define_deprecated_enums "Gdk::EventType"
+  end
+
+  module Keyval
+    extend GLib::Deprecatable
+    constants.each do |key|
+      old_names = []
+      old_names << key.to_s.sub(/^KEY_/, 'GDK_KEY_')
+      old_names << key.to_s.sub(/^KEY_/, 'GDK_')
+      old_names.each do |old_name|
+        define_deprecated_const old_name, [self, key].join('::')
+      end
+    end
+  end
+
+  class Pixmap
+    extend GLib::Deprecatable
+    define_deprecated_method :initialize, :raise => "Use 'Gdk::Window#create_similar_surface'."
+    define_deprecated_singleton_method :create_from_data, :raise => "Use 'Cairo::ImageSurface.new'."
+    define_deprecated_singleton_method :create_from_xbm, :raise => "Use 'Cairo::ImageSurface.new'."
+    define_deprecated_singleton_method :create_from_xpm, :raise => "Use 'GdkPixbuf::Pixbuf.new'."
+    define_deprecated_singleton_method :create_from_xpm_d, :raise => "Use 'GdkPixbuf::Pixbuf.new'."
+    define_deprecated_singleton_method :colormap_create_from_xpm, :raise => "Use 'GdkPixbuf::Pixbuf.new'."
+    define_deprecated_singleton_method :colormap_create_from_xpm_d, :raise => "Use 'GdkPixbuf::Pixbuf.new'."
+    define_deprecated_singleton_method :foreign_new, :raise => "Don't use this method."
+    define_deprecated_singleton_method :lookup, :raise => "Don't use this method."
+  end
+
+  class Surface
+    extend GLib::Deprecatable
+
+    define_deprecated_const :Gravity, "Gdk::Gravity"
+    define_deprecated_enums "Gdk::Gravity"
+    define_deprecated_const :AttributesType,
+                            raise: "No longer available in GDK 4."
+    define_deprecated_const :Edge, "Gdk::SurfaceEdge"
+    define_deprecated_enums "Gdk::SurfaceEdge"
+    define_deprecated_const :FilterReturn,
+                            raise: "No longer available in GDK 4."
+    define_deprecated_const :Hints, raise: "No longer available in GDK 4."
+    define_deprecated_const :ModifierType, "Gdk::ModifierType"
+    define_deprecated_enums "Gdk::ModifierType"
+    define_deprecated_const :Type, raise: "No longer available in GDK 4."
+    define_deprecated_const :TypeHint, raise: "No longer available in GDK 4."
+    define_deprecated_const :Class, raise: "No longer available in GDK 4."
+    define_deprecated_const :WMDecoration, raise: "No longer available in GDK 4."
+    define_deprecated_const :WMFunction, raise: "No longer available in GDK 4."
+    define_deprecated_const :PARENT_RELATIVE, "Gdk::PARENT_RELATIVE"
+    define_deprecated_method :clear, :warn => "Don't use this method."
+    define_deprecated_method :clear_area, :warn => "Don't use this method."
+    define_deprecated_method :internal_paint_info, :raise => "Don't use this method."
+    define_deprecated_method :shape_combine_mask, :warn => "Don't use this method."
+    define_deprecated_method :input_shape_combine_mask, :warn => "Don't use this method."
+    define_deprecated_method :set_back_pixmap, :warn => "Don't use this method."
+    define_deprecated_method :size, :warn => "Use #width and #height instead." do |_self|
+      [_self.width, _self.height]
+    end
+  end
+end
+

data/lib/gdk4/loader.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2018  Ruby-GNOME2 Project Team
+# Copyright (C) 2013-2022  Ruby-GNOME Project Team
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -22,59 +22,217 @@ module Gdk
     end
 
     private
+    def event_class
+      @event_class ||= @base_module.const_get(:Event)
+    end
+
     def pre_load(repository, namespace)
-      define_version(repository, namespace)
+      setup_pending_constants
+      setup_pending_rectangle_functions
+      define_keyval_module
+      define_event_methods_module
+      define_cairo_context_methods_module
+      define_cairo_surface_methods_module
+      require_pre_libraries
     end
 
-    def define_version(repository, namespace)
-      major, minor, micro = repository.get_version(namespace).split(".")
-      version_module = Module.new do
-        const_set("MAJOR", Integer(major))
-        const_set("MINOR", Integer(minor))
-        micro = Integer(micro) unless micro.nil?
-        const_set("MICRO", micro)
-      end
-      @base_module.const_set("Version", version_module)
+    def define_keyval_module
+      @keyval_module = define_methods_module(:Keyval)
+    end
+
+    def post_keyval_module
+      post_methods_module(@keyval_module)
+    end
+
+    def define_event_methods_module
+      @event_methods_module =
+        define_methods_module(:EventMethods)
+    end
+
+    def apply_event_methods
+      apply_methods_module(@event_methods_module,
+                           event_class)
+    end
+
+    def define_cairo_context_methods_module
+      @cairo_context_methods_module =
+        define_methods_module(:CairoContextMethods)
+    end
+
+    def apply_cairo_context_methods
+      apply_methods_module(@cairo_context_methods_module, Cairo::Context)
+    end
+
+    def define_cairo_surface_methods_module
+      @cairo_surface_methods_module =
+        define_methods_module(:CairoSurfaceMethods)
+    end
+
+    def apply_cairo_surface_methods
+      apply_methods_module(@cairo_surface_methods_module, Cairo::Surface)
+    end
+
+    def require_pre_libraries
     end
 
     def post_load(repository, namespace)
-      require_libraries
+      apply_pending_constants
+      apply_pending_rectangle_functions
+      post_keyval_module
+      apply_event_methods
+      apply_cairo_context_methods
+      apply_cairo_surface_methods
+      require_post_libraries
+    end
+
+    def setup_pending_constants
+      @pending_constants = []
     end
 
-    def require_libraries
-      require "gdk4/cairo"
-      require "gdk4/rectangle"
-      require "gdk4/rgba"
-      require "gdk4/version"
+    def apply_pending_constants
+      @pending_constants.each do |info|
+        case info.name
+        when /\AEVENT_/
+          event_class.const_set($POSTMATCH, info.value)
+        end
+      end
+    end
+
+    def setup_pending_rectangle_functions
+      @pending_rectangle_get_type_function = nil
+      @pending_rectangle_functions = []
+    end
+
+    def apply_pending_rectangle_functions
+      get_type_info = @pending_rectangle_get_type_function
+      if get_type_info
+        rectangle_class = load_cairo_rectangle_int
+        gtype = get_type_info.invoke([])
+        self.class.register_boxed_class_converter(gtype) do |rectangle|
+          rectangle_class
+        end
+      else
+        rectangle_class = @base_module.const_get(:Rectangle)
+      end
+
+      @pending_rectangle_functions.each do |info|
+        name = rubyish_method_name(info, :prefix => "rectangle_")
+        define_method(info, rectangle_class, name)
+      end
+    end
+
+    def load_cairo_rectangle_int
+      info = find_cairo_rectangle_int_info
+      klass = self.class.define_class(info.gtype,
+                                      "Rectangle",
+                                      @base_module,
+                                      :size => info.size)
+      load_fields(info, klass)
+      load_methods(info, klass)
+      klass
+    end
+
+    def find_cairo_rectangle_int_info
+      repository = GObjectIntrospection::Repository.default
+      repository.each("cairo") do |info|
+        if info.name == "RectangleInt"
+          return info
+        end
+      end
+      nil
+    end
+
+    def require_post_libraries
+      require_relative "cursor"
+      require_relative "paintable"
+      require_relative "rectangle"
+      require_relative "rgba"
+      require_relative "texture"
+
+      require_relative "cairo"
+
+      require_relative "deprecated"
     end
 
     def load_function_info(info)
       name = info.name
       case name
+      when "rectangle_get_type"
+        @pending_rectangle_get_type_function = info
+      when /\Arectangle_/
+        @pending_rectangle_functions << info
+      when "init", /_get_type\z/
+        # ignore
       when /\Apixbuf_/
         target_class = nil
         case $POSTMATCH
         when "get_from_surface"
-          target_class = Cairo::Surface
+          target_class = @cairo_surface_methods_module
         end
         if target_class
           define_method(info, target_class, "to_pixbuf")
         else
           super
         end
+      when /\Aevents_/
+        method_name = rubyish_method_name(info, :prefix => "events_")
+        define_method(info, @event_methods_module, method_name)
       when /\Acairo_/
         name = $POSTMATCH
         case name
+        when "set_source_color"
+          define_method(info,
+                        @cairo_context_methods_module,
+                        "set_source_gdk_color")
         when "set_source_rgba"
-          define_method(info, Cairo::Context, "set_source_gdk_rgba")
+          define_method(info,
+                        @cairo_context_methods_module,
+                        "set_source_gdk_rgba")
         when "rectangle"
-          define_method(info, Cairo::Context, "gdk_rectangle")
+          define_method(info,
+                        @cairo_context_methods_module,
+                        "gdk_rectangle")
+        when "region_create_from_surface"
+          # TODO
         else
-          define_method(info, Cairo::Context, name)
+          define_method(info, @cairo_context_methods_module, name)
         end
+      when /\Akeyval_/
+        name = rubyish_method_name(info, :prefix => "keyval_")
+        case name
+        when "name"
+          name = "to_name"
+        end
+        define_module_function(@keyval_module, name, info)
+      else
+        super
+      end
+    end
+
+    def load_constant_info(info)
+      case info.name
+      when /\AEVENT_/
+        @pending_constants << info
+      when /\AKEY_/
+        @keyval_module.const_set(info.name, info.value)
       else
         super
       end
     end
+
+    def may_be_cached?(constructor_info, klass)
+      case klass.name
+      when "Gdk::Cursor"
+        case constructor_info.name
+        when "new_from_name", "new_for_display"
+          true
+          # false
+        else
+          false
+        end
+      else
+        false
+      end
+    end
   end
 end

data/{test/test-gdk-geometry.rb → lib/gdk4/paintable.rb}

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2013  Ruby-GNOME2 Project Team
+# Copyright (C) 2022  Ruby-GNOME Project Team
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -16,9 +14,17 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-class TestGdkGeometry < Test::Unit::TestCase
-  def test_min_width
-    geometry = Gdk::Geometry.new
-    assert_equal(0, geometry.min_width)
+module Gdk
+  module Paintable
+    class << self
+      def try_convert(value)
+        case value
+        when GdkPixbuf::Pixbuf
+          Texture.new(value)
+        else
+          nil
+        end
+      end
+    end
   end
 end

data/lib/gdk4/rgba.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014  Ruby-GNOME2 Project Team
+# Copyright (C) 2014-2022  Ruby-GNOME Project Team
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -35,6 +35,17 @@ module Gdk
         end
         rgba
       end
+
+      def try_convert(value)
+        case value
+        when String
+          parse(value)
+        when Symbol
+          parse(value.to_s)
+        else
+          nil
+        end
+      end
     end
 
     alias_method :initialize_raw, :initialize

data/{test/test-gdk-event-mask.rb → lib/gdk4/texture.rb}

@@ -1,4 +1,4 @@
-# Copyright (C) 2015  Ruby-GNOME2 Project Team
+# Copyright (C) 2022  Ruby-GNOME Project Team
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -14,8 +14,17 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-class TestGdkEventMask < Test::Unit::TestCase
-  def test_button_press_mask
-    assert_equal("button-press-mask", Gdk::EventMask::BUTTON_PRESS_MASK.nick)
+module Gdk
+  class Texture
+    class << self
+      def try_convert(value)
+        case value
+        when GdkPixbuf::Pixbuf
+          new(value)
+        else
+          nil
+        end
+      end
+    end
   end
 end

data/lib/gdk4/x11-loader.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2018  Ruby-GNOME2 Project Team
+# Copyright (C) 2017-2022  Ruby-GNOME Project Team
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -14,8 +14,8 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-module Gdk
-  class X11Loader < GObjectIntrospection::Loader
+module GdkX11
+  class Loader < GObjectIntrospection::Loader
     def load
       self.version = "4.0"
       begin
@@ -24,5 +24,19 @@ module Gdk
         # Ignore. Some environments such as Windows don't have it.
       end
     end
+
+    private
+    def post_load(repository, namespace)
+      @base_module.constants.each do |constant|
+        case constant
+        when :INVOKERS,
+             :Loader
+          next
+        else
+          value = @base_module.const_get(constant)
+          Gdk.const_set(constant, value)
+        end
+      end
+    end
   end
 end

data/lib/gdk4.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2018  Ruby-GNOME2 Project Team
+# Copyright (C) 2013-2022  Ruby-GNOME Project Team
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -14,11 +14,9 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-require "gobject-introspection"
 require "cairo-gobject"
-require "atk"
-require "pango"
 require "gdk_pixbuf2"
+require "pango"
 
 require "gdk4/loader"
 require "gdk4/x11-loader"
@@ -32,12 +30,6 @@ module Gdk
 
   loader = Loader.new(self)
   loader.load
-  x11_loader = X11Loader.new(self)
+  x11_loader = GdkX11::Loader.new(GdkX11)
   x11_loader.load
-
-  class << self
-    def cairo_available?
-      true
-    end
-  end
 end

data/test/gdk-test-utils.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2021  Ruby-GNOME Project Team
+# Copyright (C) 2013-2022  Ruby-GNOME Project Team
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -14,10 +14,18 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
+require "pkg-config"
+require "test-unit"
+
+require "gdk4"
+
 module GdkTestUtils
   private
   def only_gdk_version(major, minor, micro=nil)
-    unless Gdk::Version.or_later?(major, minor, micro)
+    micro ||= 0
+    gdk_version_raw = PKGConfig.modversion("gdk-4.0")
+    gdk_version = gdk_version_raw.split(".").collect(&:to_i)
+    unless (gdk_version <=> [major, minor, micro]) >= 0
       omit("Require GDK >= #{major}.#{minor}.#{micro}")
     end
   end