Update GTK to version 4.20.1

gvsbuild/patches/libsass/LICENSE.build

@@ -0,0 +1,19 @@
+Copyright (c) 2021 The Meson development team
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

gvsbuild/patches/libsass/include/meson.build

@@ -0,0 +1,19 @@
+install_headers('sass.h', 'sass2scss.h')
+
+version_conf_data = configuration_data()
+version_conf_data.set('PACKAGE_VERSION', meson.project_version())
+
+version_h = configure_file(
+  input: 'sass/version.h.in',
+  output: 'version.h',
+  configuration: version_conf_data,
+)
+
+install_headers(
+  'sass/base.h',
+  'sass/context.h',
+  'sass/functions.h',
+  'sass/values.h',
+  version_h,
+  subdir: 'sass',
+)

gvsbuild/patches/libsass/meson.build

@@ -0,0 +1,20 @@
+project(
+  'libsass',
+  'c',
+  'cpp',
+  version: '3.6.6',
+  license: 'MIT',
+  meson_version: '>= 0.48.0',
+  default_options: ['c_std=c99', 'cpp_std=c++11'],
+)
+
+add_project_arguments(
+  '-DLIBSASS_VERSION="@0@"'.format(meson.project_version()),
+  language: ['cpp'],
+)
+
+inc = include_directories('include')
+winres_path = files(join_paths('res', 'resource.rc'))
+
+subdir('include')
+subdir('src')

gvsbuild/patches/libsass/src/meson.build

@@ -0,0 +1,120 @@
+cpp_sources = [
+  'ast.cpp',
+  'ast_values.cpp',
+  'ast_supports.cpp',
+  'ast_sel_cmp.cpp',
+  'ast_sel_unify.cpp',
+  'ast_sel_super.cpp',
+  'ast_sel_weave.cpp',
+  'ast_selectors.cpp',
+  'context.cpp',
+  'constants.cpp',
+  'fn_utils.cpp',
+  'fn_miscs.cpp',
+  'fn_maps.cpp',
+  'fn_lists.cpp',
+  'fn_colors.cpp',
+  'fn_numbers.cpp',
+  'fn_strings.cpp',
+  'fn_selectors.cpp',
+  'color_maps.cpp',
+  'environment.cpp',
+  'ast_fwd_decl.cpp',
+  'bind.cpp',
+  'file.cpp',
+  'util.cpp',
+  'util_string.cpp',
+  'json.cpp',
+  'units.cpp',
+  'values.cpp',
+  'plugins.cpp',
+  'source.cpp',
+  'position.cpp',
+  'lexer.cpp',
+  'parser.cpp',
+  'parser_selectors.cpp',
+  'prelexer.cpp',
+  'eval.cpp',
+  'eval_selectors.cpp',
+  'expand.cpp',
+  'listize.cpp',
+  'cssize.cpp',
+  'extender.cpp',
+  'extension.cpp',
+  'stylesheet.cpp',
+  'output.cpp',
+  'inspect.cpp',
+  'emitter.cpp',
+  'check_nesting.cpp',
+  'remove_placeholders.cpp',
+  'sass.cpp',
+  'sass_values.cpp',
+  'sass_context.cpp',
+  'sass_functions.cpp',
+  'sass2scss.cpp',
+  'backtrace.cpp',
+  'operators.cpp',
+  'ast2c.cpp',
+  'c2ast.cpp',
+  'to_value.cpp',
+  'source_map.cpp',
+  'error_handling.cpp',
+  'memory/allocator.cpp',
+  'memory/shared_ptr.cpp',
+  'utf8_string.cpp',
+  'base64vlq.cpp',
+]
+
+c_sources = ['cencode.c']
+
+sass_sources = cpp_sources + c_sources
+
+if host_machine.system() == 'windows'
+  windows = import('windows')
+  sass_sources += [windows.compile_resources(winres_path)]
+endif
+
+if host_machine.system() != 'windows'
+  if meson.version().version_compare('>= 0.62')
+    dl_dep = dependency('dl')
+  else
+    dl_dep = cc.find_library(
+      'dl',
+      required: false,
+    )
+  endif
+else
+  dl_dep = dependency(
+    '',
+    required: false,
+  )
+endif
+
+lib_args = []
+if host_machine.system() == 'windows' and get_option('default_library') != 'static'
+  lib_args += ['-DADD_EXPORTS']
+endif
+
+libsass = library(
+  'sass',
+  sass_sources,
+  dependencies: [dl_dep],
+  c_args: lib_args,
+  cpp_args: lib_args,
+  include_directories: inc,
+  soversion: '1',
+  install: true,
+)
+
+libsass_dep = declare_dependency(
+  link_with: libsass,
+  include_directories: [inc],
+)
+
+pkg = import('pkgconfig')
+pkg.generate(
+  libsass,
+  name: 'libsass',
+  description: 'A C implementation of a Sass compiler',
+  url: 'https://github.com/sass/libsass',
+)

gvsbuild/patches/sassc/LICENSE.build

@@ -0,0 +1,19 @@
+Copyright (c) 2021 The Meson development team
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

gvsbuild/patches/sassc/meson.build

@@ -0,0 +1,51 @@
+project(
+  'sassc',
+  'c',
+  version: '3.6.2',
+  meson_version: '>= 0.48.0',
+  default_options: ['c_std=c99'],
+)
+
+version_conf_data = configuration_data()
+version_conf_data.set('PACKAGE_VERSION', meson.project_version())
+
+add_project_arguments(
+  '-D_POSIX_C_SOURCE',
+  '-DSASSC_VERSION="@0@"'.format(meson.project_version()),
+  language: ['c'],
+)
+
+configure_file(
+  input: 'sassc_version.h.in',
+  output: 'sassc_version.h',
+  configuration: version_conf_data,
+)
+
+libsass_dep = dependency(
+  'libsass',
+  fallback: ['libsass', 'libsass_dep'],
+)
+
+sassc_sources = ['sassc.c']
+
+incs = []
+if host_machine.system() == 'windows'
+  windows = import('windows')
+  win_res = windows.compile_resources(
+    'res/libsass.rc',
+    depend_files: ['res/libsass.ico'],
+  )
+  sassc_sources += win_res
+  incs += include_directories('win/posix')
+  sassc_sources += 'win/posix/getopt.c'
+endif
+
+sassc = executable(
+  'sassc',
+  sassc_sources,
+  dependencies: [libsass_dep],
+  include_directories: incs,
+  install: true,
+)
+
+meson.override_find_program('sassc', sassc)

gvsbuild/projects/cairomm.py

@@ -24,10 +24,10 @@ def __init__(self):
         Meson.__init__(
             self,
             "cairomm",
-            version="1.18.0",
+            version="1.19.0",
             repository="https://gitlab.freedesktop.org/cairo/cairomm",
             archive_url="https://cairographics.org/releases/cairomm-{version}.tar.xz",
-            hash="b81255394e3ea8e8aa887276d22afa8985fc8daef60692eb2407d23049f03cfb",
+            hash="8b14f03a0e5178c7ff8f7b288cb342a61711c84c9fbed6e663442cfcc873ce5b",
             dependencies=["meson", "ninja", "libsigc++", "cairo"],
         )
 

gvsbuild/projects/gtk.py

@@ -124,12 +124,12 @@ def __init__(self):
             self,
             "gtk4",
             prj_dir="gtk4",
-            version="4.18.6",
+            version="4.20.1",
             lastversion_major=4,
             lastversion_even=True,
             repository="https://gitlab.gnome.org/GNOME/gtk",
             archive_url="https://download.gnome.org/sources/gtk/{major}.{minor}/gtk-{version}.tar.xz",
-            hash="e1817c650ddc3261f9a8345b3b22a26a5d80af154630dedc03cc7becefffd0fa",
+            hash="bf32fac019171c45681b2c45d05658ee8598c6341572e32a6a6bcb0b5673998d",
             dependencies=[
                 "gdk-pixbuf",
                 "pango",

gvsbuild/projects/gtkmm.py

@@ -25,12 +25,12 @@ def __init__(self):
             self,
             "gtkmm",
             prj_dir="gtkmm",
-            version="4.18.0",
+            version="4.20.0",
             lastversion_major=4,
             lastversion_even=True,
             repository="https://gitlab.gnome.org/GNOME/gtkmm",
             archive_url="https://download.gnome.org/sources/gtkmm/{major}.{minor}/gtkmm-{version}.tar.xz",
-            hash="2ee31c15479fc4d8e958b03c8b5fbbc8e17bc122c2a2f544497b4e05619e33ec",
+            hash="daad9bf9b70f90975f91781fc7a656c923a91374261f576c883cd3aebd59c833",
             dependencies=[
                 "gdk-pixbuf",
                 "pangomm",

gvsbuild/projects/libadwaita.py

@@ -25,16 +25,17 @@ def __init__(self):
             self,
             "libadwaita",
             repository="https://gitlab.gnome.org/GNOME/libadwaita",
-            version="1.7.6",
+            version="1.8.1",
             archive_url="https://download.gnome.org/sources/libadwaita/{major}.{minor}/libadwaita-{version}.tar.xz",
-            hash="5eacc5550f0bdbba6a1568aebf25a3d88f5ee07d6b558becc6fd9487579c9a29",
+            hash="8b1d4d5f89373a5b6eea8d93ecdaee34cd26ad27a4dd396c06f5d9929fb313bc",
             dependencies=[
                 "ninja",
                 "meson",
                 "msys2",
                 "pkgconf",
                 "glib",
                 "gtk4",
+                "sassc",
             ],
             patches=[
                 "0001-remove-appstream-dependency.patch",
@@ -46,9 +47,9 @@ def __init__(self):
             gir = "enabled"
 
         self.add_param(f"-Dintrospection={gir}")
-        self.add_param("-Dgtk_doc=false")
+        self.add_param("-Ddocumentation=false")
         self.add_param("-Dvapi=false")
-        # https://gitlab.gnome.org/GNOME/libadwaita/-/issues/931
+        self.add_param("-Dexamples=false")
         self.add_param("-Dtests=false")
 
     def build(self, **kwargs):

gvsbuild/projects/libnice.py

@@ -25,7 +25,7 @@ def __init__(self):
             self,
             "libnice",
             version="0.1.22",
-            repository="https://gitlab.freedesktop.org/libnice/libnice",
+            repository="https://gitlab.freedesktop.org/libnice/libnice.git",
             fetch_submodules=False,
             tag="ae3eb16fd7d1237353bf64e899c612b8a63bca8a",
             dependencies=[

gvsbuild/projects/sass.py

@@ -0,0 +1,54 @@
+#  Copyright (C) 2025 The Gvsbuild Authors
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  This program 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 General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, see <http://www.gnu.org/licenses/>.
+
+from gvsbuild.utils.base_builders import Meson
+from gvsbuild.utils.base_expanders import Tarball
+from gvsbuild.utils.base_project import Project, project_add
+
+
+@project_add
+class Libsass(Tarball, Meson):
+    def __init__(self):
+        Project.__init__(
+            self,
+            "libsass",
+            version="3.6.6",
+            archive_url="https://github.com/sass/libsass/archive/refs/tags/{version}.tar.gz",
+            hash="11f0bb3709a4f20285507419d7618f3877a425c0131ea8df40fe6196129df15d",
+            archive_filename="libsass-{version}.tar.gz",
+            dependencies=["ninja", "meson"],
+        )
+
+    def build(self):
+        Meson.build(self)
+        self.install(r"LICENSE share\doc\libsass")
+
+
+@project_add
+class Sassc(Tarball, Meson):
+    def __init__(self):
+        Project.__init__(
+            self,
+            "sassc",
+            version="3.6.2",
+            archive_url="https://github.com/sass/sassc/archive/refs/tags/{version}.tar.gz",
+            hash="608dc9002b45a91d11ed59e352469ecc05e4f58fc1259fc9a9f5b8f0f8348a03",
+            archive_filename="sassc-{version}.tar.gz",
+            dependencies=["ninja", "meson", "libsass"],
+        )
+
+    def build(self):
+        Meson.build(self)
+        self.install(r"LICENSE share\doc\sassc")