开源软件构建与测试

_service:tar_scm:gobject-introspection.spec Changed

@@ -1,12 +1,12 @@
-%global glib2_version 2.58.0
+%global glib2_version 2.74.0
 
 Name:           gobject-introspection
-Version:        1.72.0
+Version:        1.74.0
 Release:        1
 Summary:        Introspection system for GObject-based libraries
 License:        GPLv2+ and LGPLv2+ and MIT
 URL:            https://wiki.gnome.org/Projects/GObjectIntrospection
-Source0:        https://download.gnome.org/sources/gobject-introspection/1.72/%{name}-%{version}.tar.xz
+Source0:        https://download.gnome.org/sources/gobject-introspection/1.74/%{name}-%{version}.tar.xz
 
 BuildRequires:  gcc bison cairo-gobject-devel chrpath flex fontconfig-devel freetype-devel gettext glib2-devel >= %{glib2_version} libxslt  meson
 BuildRequires:  gtk-doc libffi-devel libX11-devel libXfixes-devel libXft-devel libxml2-devel mesa-libGL-devel python3-devel python3-mako python3-markdown
@@ -67,9 +67,16 @@
 
 %files help
 %doc NEWS README.rst
+%{_datadir}/gtk-doc/
 %{_mandir}/man1/*.1*
 
 %changelog
+* Mon Jan 02 2023 lin zhang <lin.zhang@turbolinux.com.cn> - 1.74.0-1
+- update to 1.74.0
+
+* Tue Oct 25 2022 yanglongkang <yanglongkang@h-partners.com> - 1.72.0-2
+- rebuild for next release
+
 * Fri Apr 22 2022 dillon chen <dillon.chen@gmail.com> - 1.72.0-1
 - Update to 1.72.0
 
@@ -103,3 +110,4 @@
 
 * Mon Oct 14 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.58.0-3
 - Package init
+

_service Changed

_service:tar_scm:gobject-introspection-1.72.0.tar.xz/.gitlab-ci.yml -> _service:tar_scm:gobject-introspection-1.74.0.tar.xz/.gitlab-ci.yml Changed

_service:tar_scm:gobject-introspection-1.72.0.tar.xz/.gitlab-ci/Dockerfile -> _service:tar_scm:gobject-introspection-1.74.0.tar.xz/.gitlab-ci/Dockerfile Changed

_service:tar_scm:gobject-introspection-1.72.0.tar.xz/.gitlab-ci/minimal.Dockerfile -> _service:tar_scm:gobject-introspection-1.74.0.tar.xz/.gitlab-ci/minimal.Dockerfile Changed

_service:tar_scm:gobject-introspection-1.72.0.tar.xz/.gitlab-ci/run-docker-minimal.sh -> _service:tar_scm:gobject-introspection-1.74.0.tar.xz/.gitlab-ci/run-docker-minimal.sh Changed

_service:tar_scm:gobject-introspection-1.72.0.tar.xz/.gitlab-ci/run-docker.sh -> _service:tar_scm:gobject-introspection-1.74.0.tar.xz/.gitlab-ci/run-docker.sh Changed

_service:tar_scm:gobject-introspection-1.72.0.tar.xz/.gitlab-ci/test-msvc.bat -> _service:tar_scm:gobject-introspection-1.74.0.tar.xz/.gitlab-ci/test-msvc.bat Changed

_service:tar_scm:gobject-introspection-1.72.0.tar.xz/.gitlab-ci/test-msys2-meson.sh -> _service:tar_scm:gobject-introspection-1.74.0.tar.xz/.gitlab-ci/test-msys2-meson.sh Changed

@@ -2,44 +2,46 @@
 
 set -e
 
-if  "$MSYSTEM" == "MINGW32" ; then
-    export MSYS2_ARCH="i686"
-else
-    export MSYS2_ARCH="x86_64"
-fi
-
 pacman --noconfirm -Suy
 
 pacman --noconfirm -S --needed \
     git \
     base-devel \
-    mingw-w64-$MSYS2_ARCH-toolchain \
-    mingw-w64-$MSYS2_ARCH-ccache \
-    mingw-w64-$MSYS2_ARCH-meson \
-    mingw-w64-$MSYS2_ARCH-python3 \
-    mingw-w64-$MSYS2_ARCH-python3-pip \
-    mingw-w64-$MSYS2_ARCH-python3-mako \
-    mingw-w64-$MSYS2_ARCH-python3-markdown \
-    mingw-w64-$MSYS2_ARCH-libffi \
-    mingw-w64-$MSYS2_ARCH-pkg-config \
-    mingw-w64-$MSYS2_ARCH-cairo \
-    mingw-w64-$MSYS2_ARCH-pcre \
-    mingw-w64-$MSYS2_ARCH-zlib \
-    mingw-w64-$MSYS2_ARCH-gettext
+    ${MINGW_PACKAGE_PREFIX}-toolchain \
+    ${MINGW_PACKAGE_PREFIX}-ccache \
+    ${MINGW_PACKAGE_PREFIX}-meson \
+    ${MINGW_PACKAGE_PREFIX}-python3 \
+    ${MINGW_PACKAGE_PREFIX}-python3-pip \
+    ${MINGW_PACKAGE_PREFIX}-python3-mako \
+    ${MINGW_PACKAGE_PREFIX}-python3-markdown \
+    ${MINGW_PACKAGE_PREFIX}-libffi \
+    ${MINGW_PACKAGE_PREFIX}-pkg-config \
+    ${MINGW_PACKAGE_PREFIX}-cairo \
+    ${MINGW_PACKAGE_PREFIX}-pcre2 \
+    ${MINGW_PACKAGE_PREFIX}-zlib \
+    ${MINGW_PACKAGE_PREFIX}-gettext
 
 export CCACHE_BASEDIR="${CI_PROJECT_DIR}"
 export CCACHE_DIR="${CCACHE_BASEDIR}/_ccache"
 
-pip3 install --upgrade --user meson==0.58.2 flake8 mypy==0.931 types-Markdown
+pip3 install --upgrade --user meson==0.60 flake8 mypy==0.931 types-Markdown
 export PATH="$HOME/.local/bin:$PATH"
 
-export CFLAGS="-Werror"
-meson -Dcairo=enabled -Ddoctool=enabled --buildtype debug _build
-cd _build
-ninja
-
-meson test --print-errorlogs --suite=gobject-introspection --no-suite=glib
-cd ..
+meson setup \
+        -Dwerror=true \
+        -Dglib:werror=false \
+        -Dcairo=enabled \
+        -Ddoctool=enabled \
+        --buildtype debug \
+        _build
+
+meson compile -C _build
+
+meson test \
+        --print-errorlogs \
+        --suite=gobject-introspection \
+        --no-suite=glib \
+        -C _build
 
 python3 -m flake8 --count
 python3 -m mypy _build

_service:tar_scm:gobject-introspection-1.72.0.tar.xz/NEWS -> _service:tar_scm:gobject-introspection-1.74.0.tar.xz/NEWS Changed

_service:tar_scm:gobject-introspection-1.72.0.tar.xz/docs/gir-1.2.rnc -> _service:tar_scm:gobject-introspection-1.74.0.tar.xz/docs/gir-1.2.rnc Changed

@@ -471,7 +471,7 @@
     }
 
   TransferOwnership =
-    ## attributes used by many elements for the transfer of ownership, with for example, a returned value. "none" if the recipient does not own the value, "container" if the recipient owns the container but not the value (for arrays or lists for example) , "full" the recipient owns the entire value. For details, see https://wiki.gnome.org/Projects/GObjectIntrospection/Annotations#Memory_and_lifecycle_management
+    ## attributes used by many elements for the transfer of ownership, with for example, a returned value. "none" if the recipient does not own the value, "container" if the recipient owns the container but not the value (for arrays or lists for example) , "full" the recipient owns the entire value. For details, see https://gi.readthedocs.io/en/latest/annotations/giannotations.html#memory-and-lifecycle-management
     attribute transfer-ownership { "none" | "container" | "full" }
 
   Constructor =
@@ -507,7 +507,7 @@
       empty
     }
 
-  # Refer to https://wiki.gnome.org/Projects/GObjectIntrospection/Annotations#Support_for_GObject_closures 
+  # Refer to https://gi.readthedocs.io/en/latest/annotations/giannotations.html#support-for-gobject-closures
   Callable.params =
     ## parameters element of a callable, that is in general parameters of a function or similar
     element parameters {

_service:tar_scm:gobject-introspection-1.72.0.tar.xz/examples/girepository/glib-print.c -> _service:tar_scm:gobject-introspection-1.74.0.tar.xz/examples/girepository/glib-print.c Changed

_service:tar_scm:gobject-introspection-1.72.0.tar.xz/gir/fontconfig-2.0.gir -> _service:tar_scm:gobject-introspection-1.74.0.tar.xz/gir/fontconfig-2.0.gir Changed

_service:tar_scm:gobject-introspection-1.72.0.tar.xz/gir/gio-2.0.c -> _service:tar_scm:gobject-introspection-1.74.0.tar.xz/gir/gio-2.0.c Changed

@@ -243,6 +243,10 @@
  * fails. The startup notification id is provided, so that the launcher
  * can cancel the startup notification.
  *
+ * Because a launch operation may involve spawning multiple instances of the
+ * target application, you should expect this signal to be emitted multiple
+ * times, one for each spawned instance.
+ *
  * Since: 2.36
  */
 
@@ -268,6 +272,10 @@
  * It is guaranteed that this signal is followed by either a #GAppLaunchContext::launched or
  * #GAppLaunchContext::launch-failed signal.
  *
+ * Because a launch operation may involve spawning multiple instances of the
+ * target application, you should expect this signal to be emitted multiple
+ * times, one for each spawned instance.
+ *
  * Since: 2.72
  */
 
@@ -279,7 +287,13 @@
  * @platform_data: additional platform-specific data for this launch
  *
  * The #GAppLaunchContext::launched signal is emitted when a #GAppInfo is successfully
- * launched. The @platform_data is an GVariant dictionary mapping
+ * launched.
+ *
+ * Because a launch operation may involve spawning multiple instances of the
+ * target application, you should expect this signal to be emitted multiple
+ * times, one time for each spawned instance.
+ *
+ * The @platform_data is an GVariant dictionary mapping
  * strings to variants (ie `a{sv}`), which contains additional,
  * platform-specific data about this launch. On UNIX, at least the
  * `pid` and `startup-notification-id` keys will be present.
@@ -288,6 +302,11 @@
  * example if the process was launched via D-Bus). The `pid` may not be
  * set at all in subsequent releases.
  *
+ * On Windows, `pid` is guaranteed to be valid only for the duration of the
+ * #GAppLaunchContext::launched signal emission; after the signal is emitted,
+ * GLib will call g_spawn_close_pid(). If you need to keep the #GPid after the
+ * signal has been emitted, then you can duplicate `pid` using `DuplicateHandle()`.
+ *
  * Since: 2.36
  */
 
@@ -1681,7 +1700,20 @@
  * ways indicated here will be rejected unless the application
  * overrides the default via #GDtlsConnection::accept-certificate.
  *
+ * GLib guarantees that if certificate verification fails, at least one
+ * flag will be set, but it does not guarantee that all possible flags
+ * will be set. Accordingly, you may not safely decide to ignore any
+ * particular type of error. For example, it would be incorrect to mask
+ * %G_TLS_CERTIFICATE_EXPIRED if you want to allow expired certificates,
+ * because this could potentially be the only error flag set even if
+ * other problems exist with the certificate. Therefore, there is no
+ * safe way to use this property. This is not a horrible problem,
+ * though, because you should not be attempting to ignore validation
+ * errors anyway. If you really must ignore TLS certificate errors,
+ * connect to #GDtlsConnection::accept-certificate.
+ *
  * Since: 2.48
+ * Deprecated: 2.74: Do not attempt to ignore validation errors.
  */
 
 
@@ -2251,6 +2283,15 @@
 
 
 /**
+ * GListStore:n-items:
+ *
+ * The number of items contained in this list store.
+ *
+ * Since: 2.74
+ */
+
+
+/**
  * GMemoryMonitor:
  *
  * #GMemoryMonitor monitors system memory and indicates when
@@ -3381,7 +3422,7 @@
 
 
 /**
- * GSimpleProxyResolver:default-proxy:
+ * GSimpleProxyResolver:default-proxy: (nullable)
  *
  * The default proxy URI that will be used for any URI that doesn't
  * match #GSimpleProxyResolver:ignore-hosts, and doesn't match any
@@ -6739,6 +6780,8 @@
  * - g_file_new_for_uri() if you have a URI.
  * - g_file_new_for_commandline_arg() for a command line argument.
  * - g_file_new_tmp() to create a temporary file from a template.
+ * - g_file_new_tmp_async() to asynchronously create a temporary file.
+ * - g_file_new_tmp_dir_async() to asynchronously create a temporary directory.
  * - g_file_parse_name() from a UTF-8 string gotten from g_file_get_parse_name().
  * - g_file_new_build_filename() to create a file from path elements.
  *
@@ -7420,6 +7463,21 @@
  * implementation, but typically it will be from the thread that owns
  * the thread-default main contextg-main-context-push-thread-default
  * in effect at the time that the model was created.
+ *
+ * Over time, it has established itself as good practice for listmodel
+ * implementations to provide properties `item-type` and `n-items` to
+ * ease working with them. While it is not required, it is recommended
+ * that implementations provide these two properties. They should return
+ * the values of g_list_model_get_item_type() and g_list_model_get_n_items()
+ * respectively and be defined as such:
+ * |
+ * propertiesPROP_ITEM_TYPE =
+ *   g_param_spec_gtype ("item-type", "", "", G_TYPE_OBJECT,
+ *                       G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+ * propertiesPROP_N_ITEMS =
+ *   g_param_spec_uint ("n-items", "", "", 0, G_MAXUINT, 0,
+ *                      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
+ * |
  */
 
 
@@ -7981,10 +8039,10 @@
  * some systems).
  *
  * When in “Low Power” mode, it is recommended that applications:
- * - disabling automatic downloads
+ * - disable automatic downloads;
  * - reduce the rate of refresh from online sources such as calendar or
- *   email synchronisation
- * - if the application has expensive visual effects, reduce them
+ *   email synchronisation;
+ * - reduce the use of expensive visual effects.
  *
  * It is also likely that OS components providing services to applications will
  * lower their own background activity, for the sake of the system.
@@ -10340,9 +10398,11 @@
  * the %G_SOCKET_FAMILY_UNIX family by using g_socket_send_message()
  * and received using g_socket_receive_message().
  *
- * Note that `<gio/gunixfdlist.h>` belongs to the UNIX-specific GIO
- * interfaces, thus you have to use the `gio-unix-2.0.pc` pkg-config
- * file when using it.
+ * Before 2.74, `<gio/gunixfdlist.h>` belonged to the UNIX-specific GIO
+ * interfaces, thus you had to use the `gio-unix-2.0.pc` pkg-config file when
+ * using it.
+ *
+ * Since 2.74, the API is available for Windows.
  */
 
 
@@ -11379,8 +11439,8 @@
  * @action_group: a #GActionGroup
  * @action_name: the name of an action in the group
  * @enabled: (out): if the action is presently enabled
- * @parameter_type: (out) (optional): the parameter type, or %NULL if none needed
- * @state_type: (out) (optional): the state type, or %NULL if stateless
+ * @parameter_type: (out) (transfer none) (optional): the parameter type, or %NULL if none needed
+ * @state_type: (out) (transfer none) (optional): the state type, or %NULL if stateless
  * @state_hint: (out) (optional): the state hint, or %NULL if none
  * @state: (out) (optional): the current state, or %NULL if stateless
  *
@@ -11737,6 +11797,37 @@
 
 
 /**
+ * g_app_info_get_default_for_type_async:
+ * @content_type: the content type to find a #GAppInfo for
+ * @must_support_uris: if %TRUE, the #GAppInfo is expected to
+ *     support URIs
+ * @cancellable: optional #GCancellable object, %NULL to ignore
+ * @callback: (nullable): a #GAsyncReadyCallback to call when the request is done
+ * @user_data: (nullable): data to pass to @callback
+ *
+ * Asynchronously gets the default #GAppInfo for a given content type.
+ *
+ * Since: 2.74
+ */
+
+
+/**
+ * g_app_info_get_default_for_type_finish:
+ * @result: a #GAsyncResult
+ * @error: (nullable): a #GError
+ *
+ * Finishes a default #GAppInfo lookup started by
+ * g_app_info_get_default_for_type_async().
+ *
+ * If no #GAppInfo is found, then @error will be set to %G_IO_ERROR_NOT_FOUND.
+ *
+ * Returns: (transfer full): #GAppInfo for given @content_type or
+ *     %NULL on error.
+ * Since: 2.74
+ */
+
+

_service:tar_scm:gobject-introspection-1.72.0.tar.xz/gir/glib-2.0.c -> _service:tar_scm:gobject-introspection-1.74.0.tar.xz/gir/glib-2.0.c Changed

@@ -539,6 +539,12 @@
  *     Network and storage sizes should be reported in the normal SI units.
  * @G_FORMAT_SIZE_BITS: set the size as a quantity in bits, rather than
  *     bytes, and return units in bits. For example, ‘Mb’ rather than ‘MB’.
+ * @G_FORMAT_SIZE_ONLY_VALUE: return only value, without unit; this should
+ *     not be used together with @G_FORMAT_SIZE_LONG_FORMAT
+ *     nor @G_FORMAT_SIZE_ONLY_UNIT. Since: 2.74
+ * @G_FORMAT_SIZE_ONLY_UNIT: return only unit, without value; this should
+ *     not be used together with @G_FORMAT_SIZE_LONG_FORMAT
+ *     nor @G_FORMAT_SIZE_ONLY_VALUE. Since: 2.74
  *
  * Flags to modify the format of the string returned by g_format_size_full().
  */
@@ -676,7 +682,7 @@
 /**
  * GHookCheckMarshaller:
  * @hook: a #GHook
- * @marshal_data: user data
+ * @user_data: user data
  *
  * Defines the type of function used by g_hook_list_marshal_check().
  *
@@ -709,7 +715,7 @@
 /**
  * GHookFindFunc:
  * @hook: a #GHook
- * @data: user data passed to g_hook_find_func()
+ * @user_data: user data passed to g_hook_find_func()
  *
  * Defines the type of the function passed to g_hook_find().
  *
@@ -755,7 +761,7 @@
 /**
  * GHookMarshaller:
  * @hook: a #GHook
- * @marshal_data: user data
+ * @user_data: user data
  *
  * Defines the type of function used by g_hook_list_marshal().
  */
@@ -988,6 +994,7 @@
 
 /**
  * GIOFlags:
+ * @G_IO_FLAG_NONE: no special flags set. Since: 2.74
  * @G_IO_FLAG_APPEND: turns on append mode, corresponds to %O_APPEND
  *     (see the documentation of the UNIX open() syscall)
  * @G_IO_FLAG_NONBLOCK: turns on nonblocking mode, corresponds to
@@ -1019,7 +1026,7 @@
  * GIOFunc:
  * @source: the #GIOChannel event source
  * @condition: the condition which has been satisfied
- * @data: user data set in g_io_add_watch() or g_io_add_watch_full()
+ * @user_data: user data set in g_io_add_watch() or g_io_add_watch_full()
  *
  * Specifies the type of function passed to g_io_add_watch() or
  * g_io_add_watch_full(), which is called when the requested condition
@@ -1121,8 +1128,10 @@
  * @minor: the minor version to check for
  * @micro: the micro version to check for
  *
- * Checks the version of the GLib library that is being compiled
- * against. See glib_check_version() for a runtime check.
+ * Checks whether the version of the GLib library that is being compiled
+ * against is greater than or equal to the given one.
+ *
+ * See glib_check_version() for a runtime check.
  *
  * Returns: %TRUE if the version of the GLib header files
  * is the same as or newer than the passed-in version.
@@ -1378,7 +1387,7 @@
 /**
  * GNodeForeachFunc:
  * @node: a #GNode.
- * @data: user data passed to g_node_children_foreach().
+ * @user_data: user data passed to g_node_children_foreach().
  *
  * Specifies the type of function passed to g_node_children_foreach().
  * The function is called with each child node, together with the user
@@ -1389,7 +1398,7 @@
 /**
  * GNodeTraverseFunc:
  * @node: a #GNode.
- * @data: user data passed to g_node_traverse().
+ * @user_data: user data passed to g_node_traverse().
  *
  * Specifies the type of function passed to g_node_traverse(). The
  * function is called with each of the nodes visited, together with the
@@ -1849,7 +1858,7 @@
  * GSequenceIterCompareFunc:
  * @a: a #GSequenceIter
  * @b: a #GSequenceIter
- * @data: user data
+ * @user_data: user data
  *
  * A #GSequenceIterCompareFunc is a function used to compare iterators.
  * It must return zero if the iterators compare equal, a negative value
@@ -1985,6 +1994,7 @@
 
 /**
  * GTestSubprocessFlags:
+ * @G_TEST_SUBPROCESS_DEFAULT: Default behaviour. Since: 2.74
  * @G_TEST_SUBPROCESS_INHERIT_STDIN: If this flag is given, the child
  *     process will inherit the parent's stdin. Otherwise, the child's
  *     stdin is redirected to `/dev/null`.
@@ -2041,7 +2051,7 @@
 
 /**
  * GThreadFunc:
- * @data: data passed to the thread
+ * @user_data: data passed to the thread
  *
  * Specifies the type of the @func functions passed to g_thread_new()
  * or g_thread_try_new().
@@ -2214,7 +2224,7 @@
  * GTraverseFunc:
  * @key: a key of a #GTree node
  * @value: the value corresponding to the key
- * @data: user data passed to g_tree_traverse()
+ * @user_data: user data passed to g_tree_traverse()
  *
  * Specifies the type of function passed to g_tree_traverse(). It is
  * passed the key and value of each node, together with the @user_data
@@ -9223,6 +9233,9 @@
  * alignment value. Additionally, it will detect possible overflow during
  * multiplication.
  *
+ * If the allocation fails (because the system is out of memory),
+ * the program is terminated.
+ *
  * Aligned memory allocations returned by this function can only be
  * freed using g_aligned_free().
  *
@@ -11148,6 +11161,31 @@
 
 
 /**
+ * g_atomic_int_compare_and_exchange_full:
+ * @atomic: a pointer to a #gint or #guint
+ * @oldval: the value to compare with
+ * @newval: the value to conditionally replace with
+ * @preval: (out): the contents of @atomic before this operation
+ *
+ * Compares @atomic to @oldval and, if equal, sets it to @newval.
+ * If @atomic was not equal to @oldval then no change occurs.
+ * In any case the value of @atomic before this operation is stored in @preval.
+ *
+ * This compare and exchange is done atomically.
+ *
+ * Think of this operation as an atomic version of
+ * `{ *preval = *atomic; if (*atomic == oldval) { *atomic = newval; return TRUE; } else return FALSE; }`.
+ *
+ * This call acts as a full compiler and hardware memory barrier.
+ *
+ * See also g_atomic_int_compare_and_exchange()
+ *
+ * Returns: %TRUE if the exchange took place
+ * Since: 2.74
+ */
+
+
+/**
  * g_atomic_int_dec_and_test:
  * @atomic: a pointer to a #gint or #guint
  *
@@ -11167,6 +11205,25 @@
 
 
 /**
+ * g_atomic_int_exchange:
+ * @atomic: a pointer to a #gint or #guint
+ * @newval: the value to replace with
+ *
+ * Sets the @atomic to @newval and returns the old value from @atomic.
+ *
+ * This exchange is done atomically.
+ *
+ * Think of this operation as an atomic version of
+ * `{ tmp = *atomic; *atomic = val; return tmp; }`.
+ *
+ * This call acts as a full compiler and hardware memory barrier.
+ *
+ * Returns: the value of @atomic before the exchange, signed
+ * Since: 2.74
+ */
+
+
+/**
  * g_atomic_int_exchange_and_add:
  * @atomic: a pointer to a #gint
  * @val: the value to add
@@ -11340,6 +11397,50 @@
 
 
 /**
+ * g_atomic_pointer_compare_and_exchange_full:
+ * @atomic: (not nullable): a pointer to a #gpointer-sized value
+ * @oldval: the value to compare with
+ * @newval: the value to conditionally replace with
+ * @preval: (not nullable) (out): the contents of @atomic before this operation

_service:tar_scm:gobject-introspection-1.72.0.tar.xz/gir/gobject-2.0.c -> _service:tar_scm:gobject-introspection-1.74.0.tar.xz/gir/gobject-2.0.c Changed

@@ -2879,9 +2879,11 @@
  * class initialization:
  *
  * |
- * enum {
- *   PROP_0, PROP_FOO, PROP_BAR, N_PROPERTIES
- * };
+ * typedef enum {
+ *   PROP_FOO = 1,
+ *   PROP_BAR,
+ *   N_PROPERTIES
+ * } MyObjectProperty;
  *
  * static GParamSpec *obj_propertiesN_PROPERTIES = { NULL, };
  *
@@ -2894,17 +2896,17 @@
  *     g_param_spec_int ("foo", "Foo", "Foo",
  *                       -1, G_MAXINT,
  *                       0,
- *                       G_PARAM_READWRITE);
+ *                       G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
  *
  *   obj_propertiesPROP_BAR =
  *     g_param_spec_string ("bar", "Bar", "Bar",
  *                          NULL,
- *                          G_PARAM_READWRITE);
+ *                          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
  *
  *   gobject_class->set_property = my_object_set_property;
  *   gobject_class->get_property = my_object_get_property;
  *   g_object_class_install_properties (gobject_class,
- *                                      N_PROPERTIES,
+ *                                      G_N_ELEMENTS (obj_properties),
  *                                      obj_properties);
  * }
  * |
@@ -2998,8 +3000,8 @@
  *
  * The signal specs expected by this function have the form
  * "modifier::signal_name", where modifier can be one of the following:
- * - signal: equivalent to g_signal_connect_data (..., NULL, 0)
- * - object-signal, object_signal: equivalent to g_signal_connect_object (..., 0)
+ * - signal: equivalent to g_signal_connect_data (..., NULL, G_CONNECT_DEFAULT)
+ * - object-signal, object_signal: equivalent to g_signal_connect_object (..., G_CONNECT_DEFAULT)
  * - swapped-signal, swapped_signal: equivalent to g_signal_connect_data (..., NULL, G_CONNECT_SWAPPED)
  * - swapped_object_signal, swapped-object-signal: equivalent to g_signal_connect_object (..., G_CONNECT_SWAPPED)
  * - signal_after, signal-after: equivalent to g_signal_connect_data (..., NULL, G_CONNECT_AFTER)
@@ -3451,12 +3453,11 @@
  * g_object_class_install_property() inside a static array, e.g.:
  *
  * |
- *   enum
+ *   typedef enum
  *   {
- *     PROP_0,
- *     PROP_FOO,
+ *     PROP_FOO = 1,
  *     PROP_LAST
- *   };
+ *   } MyObjectProperty;
  *
  *   static GParamSpec *propertiesPROP_LAST;
  *
@@ -3466,7 +3467,7 @@
  *     propertiesPROP_FOO = g_param_spec_int ("foo", "Foo", "The foo",
  *                                              0, 100,
  *                                              50,
- *                                              G_PARAM_READWRITE);
+ *                                              G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
  *     g_object_class_install_property (gobject_class,
  *                                      PROP_FOO,
  *                                      propertiesPROP_FOO);
@@ -3925,8 +3926,8 @@
 /**
  * g_param_spec_boolean:
  * @name: canonical name of the property specified
- * @nick: nick name for the property specified
- * @blurb: description of the property specified
+ * @nick: (nullable): nick name for the property specified
+ * @blurb: (nullable): description of the property specified
  * @default_value: default value for the property specified
  * @flags: flags for the property specified
  *
@@ -3945,8 +3946,8 @@
 /**
  * g_param_spec_boxed:
  * @name: canonical name of the property specified
- * @nick: nick name for the property specified
- * @blurb: description of the property specified
+ * @nick: (nullable): nick name for the property specified
+ * @blurb: (nullable): description of the property specified
  * @boxed_type: %G_TYPE_BOXED derived type of this property
  * @flags: flags for the property specified
  *
@@ -3962,8 +3963,8 @@
 /**
  * g_param_spec_char:
  * @name: canonical name of the property specified
- * @nick: nick name for the property specified
- * @blurb: description of the property specified
+ * @nick: (nullable): nick name for the property specified
+ * @blurb: (nullable): description of the property specified
  * @minimum: minimum value for the property specified
  * @maximum: maximum value for the property specified
  * @default_value: default value for the property specified
@@ -3978,8 +3979,8 @@
 /**
  * g_param_spec_double:
  * @name: canonical name of the property specified
- * @nick: nick name for the property specified
- * @blurb: description of the property specified
+ * @nick: (nullable): nick name for the property specified
+ * @blurb: (nullable): description of the property specified
  * @minimum: minimum value for the property specified
  * @maximum: maximum value for the property specified
  * @default_value: default value for the property specified
@@ -3997,8 +3998,8 @@
 /**
  * g_param_spec_enum:
  * @name: canonical name of the property specified
- * @nick: nick name for the property specified
- * @blurb: description of the property specified
+ * @nick: (nullable): nick name for the property specified
+ * @blurb: (nullable): description of the property specified
  * @enum_type: a #GType derived from %G_TYPE_ENUM
  * @default_value: default value for the property specified
  * @flags: flags for the property specified
@@ -4015,8 +4016,8 @@
 /**
  * g_param_spec_flags:
  * @name: canonical name of the property specified
- * @nick: nick name for the property specified
- * @blurb: description of the property specified
+ * @nick: (nullable): nick name for the property specified
+ * @blurb: (nullable): description of the property specified
  * @flags_type: a #GType derived from %G_TYPE_FLAGS
  * @default_value: default value for the property specified
  * @flags: flags for the property specified
@@ -4033,8 +4034,8 @@
 /**
  * g_param_spec_float:
  * @name: canonical name of the property specified
- * @nick: nick name for the property specified
- * @blurb: description of the property specified
+ * @nick: (nullable): nick name for the property specified
+ * @blurb: (nullable): description of the property specified
  * @minimum: minimum value for the property specified
  * @maximum: maximum value for the property specified
  * @default_value: default value for the property specified
@@ -4137,8 +4138,8 @@
 /**
  * g_param_spec_gtype:
  * @name: canonical name of the property specified
- * @nick: nick name for the property specified
- * @blurb: description of the property specified
+ * @nick: (nullable): nick name for the property specified
+ * @blurb: (nullable): description of the property specified
  * @is_a_type: a #GType whose subtypes are allowed as values
  *  of the property (use %G_TYPE_NONE for any type)
  * @flags: flags for the property specified
@@ -4156,8 +4157,8 @@
 /**
  * g_param_spec_int:
  * @name: canonical name of the property specified
- * @nick: nick name for the property specified
- * @blurb: description of the property specified
+ * @nick: (nullable): nick name for the property specified
+ * @blurb: (nullable): description of the property specified
  * @minimum: minimum value for the property specified
  * @maximum: maximum value for the property specified
  * @default_value: default value for the property specified
@@ -4174,8 +4175,8 @@
 /**
  * g_param_spec_int64:
  * @name: canonical name of the property specified
- * @nick: nick name for the property specified
- * @blurb: description of the property specified
+ * @nick: (nullable): nick name for the property specified
+ * @blurb: (nullable): description of the property specified
  * @minimum: minimum value for the property specified
  * @maximum: maximum value for the property specified
  * @default_value: default value for the property specified
@@ -4193,8 +4194,8 @@
  * g_param_spec_internal: (skip)
  * @param_type: the #GType for the property; must be derived from %G_TYPE_PARAM
  * @name: the canonical name of the property
- * @nick: the nickname of the property
- * @blurb: a short description of the property
+ * @nick: (nullable): the nickname of the property
+ * @blurb: (nullable): a short description of the property
  * @flags: a combination of #GParamFlags
  *
  * Creates a new #GParamSpec instance.
@@ -4203,11 +4204,12 @@
  * the rules for @name. Names which violate these rules lead to undefined
  * behaviour.
  *
- * Beyond the name, #GParamSpecs have two more descriptive
- * strings associated with them, the @nick, which should be suitable
- * for use as a label for the property in a property editor, and the

_service:tar_scm:gobject-introspection-1.72.0.tar.xz/gir/meson.build -> _service:tar_scm:gobject-introspection-1.74.0.tar.xz/gir/meson.build Changed

@@ -1,3 +1,24 @@
+gir_files = 
+  'DBus-1.0.gir',
+  'DBusGLib-1.0.gir',
+  'fontconfig-2.0.gir',
+  'freetype2-2.0.gir',
+  'GL-1.0.gir',
+  'libxml2-2.0.gir',
+  'Vulkan-1.0.gir',
+  'xft-2.0.gir',
+  'xlib-2.0.gir',
+  'xfixes-4.0.gir',
+  'xrandr-1.3.gir',
+  'win32-1.0.gir',
+
+# Copy gir files to build directory to have them all in a single place.
+# This is needed when gobject-introspection is a subproject because Meson
+# will add --includedir pointing to build directory automatically.
+foreach gir : gir_files
+  configure_file(input: gir, output: gir, copy: true)
+endforeach
+
 cairo_conf = configuration_data()
 if get_option('cairo_libname') != ''
   cairo_library_name = get_option('cairo_libname')
@@ -21,22 +42,7 @@
   output: 'cairo-1.0.gir',
   configuration: cairo_conf,
 )
-
-gir_files = 
-  cairo_gir,
-  'DBus-1.0.gir',
-  'DBusGLib-1.0.gir',
-  'fontconfig-2.0.gir',
-  'freetype2-2.0.gir',
-  'GL-1.0.gir',
-  'libxml2-2.0.gir',
-  'Vulkan-1.0.gir',
-  'xft-2.0.gir',
-  'xlib-2.0.gir',
-  'xfixes-4.0.gir',
-  'xrandr-1.3.gir',
-  'win32-1.0.gir',
-
+gir_files += cairo_gir
 
 typelibdir = join_paths(get_option('libdir'), 'girepository-1.0')
 install_data(gir_files, install_dir: girdir)
@@ -107,7 +113,7 @@
     glib_files += join_paths(glib_incdir, 'glib-unix.h')
   endif
   # Parse glob to get installed header list
-  ret = run_command(python, '-c', globber.format(join_paths(glib_incdir, 'glib', '*.h')))
+  ret = run_command(python, '-c', globber.format(join_paths(glib_incdir, 'glib', '*.h')), check: true)
   if ret.returncode() != 0
     error('Failed to get glib header list')
   endif
@@ -115,7 +121,7 @@
   # Get a list of all source files
   glib_srcdir = get_option('glib_src_dir')
   if glib_srcdir != ''
-    ret = run_command(python, '-c', globber.format(join_paths(glib_srcdir, 'glib', '*.c')))
+    ret = run_command(python, '-c', globber.format(join_paths(glib_srcdir, 'glib', '*.c')), check: true)
     if ret.returncode() != 0
       error('Failed to get glib source list')
     endif
@@ -133,20 +139,20 @@
   # We know exactly what headers will be installed, so just fetch that
   glib_subproject = subproject('glib')
 
-  glibproj_sourcedir = join_paths(meson.project_source_root(), subprojdir, 'glib')
-  glibproj_builddir = join_paths(meson.project_build_root(), subprojdir, 'glib')
+  glibproj_sourcedir = join_paths(meson.global_source_root(), subprojdir, 'glib')
+  glibproj_builddir = join_paths(meson.global_build_root(), subprojdir, 'glib')
 
-  glib_files += join_paths(glibproj_sourcedir, 'gobject', 'glib-types.h')
+  glib_files += glib_subproject.get_variable('glib_types_h')
 
   # Generated files, relative to the build directory
   glib_files += 
-    join_paths(glibproj_builddir, 'glib', 'glibconfig.h'),
+    glib_subproject.get_variable('glibconfig_h'),
     glib_subproject.get_variable('glib_enumtypes_h'),
   
 
   if giounix_dep.found()
     glib_files += 
-      join_paths(glibproj_sourcedir, 'glib', 'glib-unix.h'),
+      glib_subproject.get_variable('glib_unix_h')
     
   endif
 
@@ -184,13 +190,13 @@
   # XXX: We need include paths to all glib dependencies too. We assume that the
   # dependencies are only libffi and proxy-libintl, and that they are used as
   # subprojects. In the worst case we add paths to non-existent directories.
-  ffi_incdir = join_paths(meson.project_build_root(), subprojdir, 'libffi', 'include')
+  ffi_incdir = join_paths(meson.global_build_root(), subprojdir, 'libffi', 'include')
   glib_includes += '-I' + ffi_incdir
-  intl_incdir = join_paths(meson.project_source_root(), subprojdir, 'proxy-libintl')
+  intl_incdir = join_paths(meson.global_source_root(), subprojdir, 'proxy-libintl')
   glib_includes += '-I' + intl_incdir
 
-  ffi_libdir = join_paths(meson.project_build_root(), subprojdir, 'libffi', 'src')
-  intl_libdir = join_paths(meson.project_build_root(), subprojdir, 'proxy-libintl')
+  ffi_libdir = join_paths(meson.global_build_root(), subprojdir, 'libffi', 'src')
+  intl_libdir = join_paths(meson.global_build_root(), subprojdir, 'proxy-libintl')
   glib_libpaths = 
     '-L' + ffi_libdir,
     '-L' + intl_libdir,
@@ -257,13 +263,13 @@
 if dep_type == 'pkgconfig'
   gobject_command += '--external-library', '--pkg=gobject-2.0'
   # Get the installed header list
-  ret = run_command(python, '-c', globber.format(join_paths(glib_incdir, 'gobject', '*.h')))
+  ret = run_command(python, '-c', globber.format(join_paths(glib_incdir, 'gobject', '*.h')), check: true)
   if ret.returncode() != 0
     error('Failed to get gobject header list')
   endif
   gobject_headers = ret.stdout().strip().split('\n')
   if glib_srcdir != ''
-    ret = run_command(python, '-c', globber.format(join_paths(glib_srcdir, 'gobject', '*.c')))
+    ret = run_command(python, '-c', globber.format(join_paths(glib_srcdir, 'gobject', '*.c')), check: true)
     if ret.returncode() != 0
       error('Failed to get gobject source list')
     endif
@@ -332,8 +338,8 @@
   gmodule_command += '--pkg-export=gmodule-2.0'
   gmodule_command += glib_libpaths
   gmodule_files += 
-    join_paths(glibproj_sourcedir, 'gmodule', 'gmodule.h'),
-    join_paths(glibproj_sourcedir, 'gmodule', 'gmodule.c'),
+    glib_subproject.get_variable('gmodule_h'),
+    glib_subproject.get_variable('gmodule_c'),
     glib_subproject.get_variable('gmoduleconf_h'),
   
   gmodule_gir_dep = glib_subproject.get_variable('libgmodule')
@@ -373,7 +379,7 @@
 if dep_type == 'pkgconfig'
   gio_command += '--external-library', '--pkg=gio-2.0'
   # Get the installed header list
-  ret = run_command(python, '-c', globber.format(join_paths(glib_incdir, 'gio', '*.h')))
+  ret = run_command(python, '-c', globber.format(join_paths(glib_incdir, 'gio', '*.h')), check: true)
   if ret.returncode() != 0
     error('Failed to get gio header list')
   endif
@@ -382,7 +388,7 @@
   # probably fine since it matches what Autotools does. We are more exact in
   # the subproject case.
   if glib_srcdir != ''
-    ret = run_command(python, '-c', globber.format(join_paths(glib_srcdir, 'gio', '*.c')))
+    ret = run_command(python, '-c', globber.format(join_paths(glib_srcdir, 'gio', '*.c')), check: true)
     if ret.returncode() != 0
       error('Failed to get gio source list')
     endif
@@ -414,7 +420,7 @@
     gio_command += '--pkg=gio-unix-2.0'
     giounix_includedir = get_option('gi_cross_pkgconfig_sysroot_path') + join_paths(giounix_dep.get_variable(pkgconfig: 'includedir'), 'gio-unix-2.0')
     # Get the installed gio-unix header list
-    ret = run_command(python, '-c', globber.format(join_paths(giounix_includedir, 'gio', '*.h')))
+    ret = run_command(python, '-c', globber.format(join_paths(giounix_includedir, 'gio', '*.h')), check: true)
     if ret.returncode() != 0
       error('Failed to get gio-unix header list')
     endif

_service:tar_scm:gobject-introspection-1.72.0.tar.xz/gir/win32-1.0.gir -> _service:tar_scm:gobject-introspection-1.74.0.tar.xz/gir/win32-1.0.gir Changed

_service:tar_scm:gobject-introspection-1.72.0.tar.xz/girepository/cmph/meson.build -> _service:tar_scm:gobject-introspection-1.74.0.tar.xz/girepository/cmph/meson.build Changed

_service:tar_scm:gobject-introspection-1.72.0.tar.xz/girepository/gicallableinfo.c -> _service:tar_scm:gobject-introspection-1.74.0.tar.xz/girepository/gicallableinfo.c Changed

_service:tar_scm:gobject-introspection-1.72.0.tar.xz/girepository/gifunctioninfo.c -> _service:tar_scm:gobject-introspection-1.74.0.tar.xz/girepository/gifunctioninfo.c Changed

_service:tar_scm:gobject-introspection-1.72.0.tar.xz/girepository/gitypeinfo.c -> _service:tar_scm:gobject-introspection-1.74.0.tar.xz/girepository/gitypeinfo.c Changed

_service:tar_scm:gobject-introspection-1.72.0.tar.xz/giscanner/ccompiler.py -> _service:tar_scm:gobject-introspection-1.74.0.tar.xz/giscanner/ccompiler.py Changed

@@ -95,6 +95,41 @@
         compiler.shared_lib_extension = shlib_suffix
 
 
+def resolve_mingw_lib(implib, libtool=None):
+    """Returns a DLL name given a path to an import lib
+
+    /full/path/to/libgtk-3.dll.a -> libgtk-3-0.dll
+    """
+
+    args = 
+    if libtool:
+        args.extend(libtool)
+        args.append('--mode=execute')
+
+    # Figure out if we have a gcc toolchain or llvm one
+    dlltool = os.environ.get('DLLTOOL', 'dlltool.exe')
+    dlltool_output = subprocess.run(
+        dlltool, stdout=subprocess.PIPE,
+        stderr=subprocess.STDOUT,
+        universal_newlines=True).stdout
+    is_llvm = 'llvm-dlltool' in dlltool_output
+
+    if not is_llvm:
+        # gcc dlltool provides this via --identify
+        dlltool_args = args + dlltool, '--identify'
+        output = subprocess.check_output(dlltool_args + implib, universal_newlines=True)
+        for line in output.splitlines():
+            return line
+    else:
+        # for llvm we need to parse the output of nm
+        # https://github.com/msys2/MINGW-packages/issues/11994#issuecomment-1176691216
+        output = subprocess.check_output(args + 'nm', implib, universal_newlines=True)
+        for line in output.splitlines():
+            if line.endswith(':'):
+                return line:-1
+    return None
+
+
 # Flags that retain macros in preprocessed output.
 FLAGS_RETAINING_MACROS = '-g3', '-ggdb3', '-gstabs3', '-gcoff3', '-gxcoff3', '-gvms3'
 
@@ -208,7 +243,7 @@
                 args.append('-libpath:' + library_path)
             else:
                 args.append('-L' + library_path)
-                if os.path.isabs(library_path):
+                if os.name != 'nt' and os.path.isabs(library_path):
                     if libtool:
                         args.append('-rpath')
                         args.append(library_path)
@@ -341,10 +376,6 @@
         # When we are not using Visual C++ nor clang-cl (i.e. we are using GCC)...
         else:
             libtool = utils.get_libtool_command(options)
-            if libtool:
-                args.extend(libtool)
-                args.append('--mode=execute')
-            args.extend(os.environ.get('DLLTOOL', 'dlltool.exe'), '--identify')
             proc = subprocess.Popen(self.compiler_cmd, '-print-search-dirs',
                                     stdout=subprocess.PIPE)
             o, e = proc.communicate()
@@ -400,13 +431,10 @@
                             tmp_fileobj.close()
                             os.unlink(tmp_filename)
                         else:
-                            proc = subprocess.Popen(args + implib,
-                                                    stdout=subprocess.PIPE)
-                            o, e = proc.communicate()
-                            for line in o.decode('ascii').splitlines():
-                                shlibs.append(line)
+                            shlib = resolve_mingw_lib(implib, libtool)
+                            if shlib is not None:
+                                shlibs.append(shlib)
                                 found = True
-                                break
             if not found:
                 not_resolved.append(lib)
         if len(not_resolved) > 0:

_service:tar_scm:gobject-introspection-1.72.0.tar.xz/giscanner/doctemplates/devdocs/Gjs/_index.tmpl -> _service:tar_scm:gobject-introspection-1.74.0.tar.xz/giscanner/doctemplates/devdocs/Gjs/_index.tmpl Changed

_service:tar_scm:gobject-introspection-1.72.0.tar.xz/giscanner/doctemplates/devdocs/Gjs/_method.tmpl -> _service:tar_scm:gobject-introspection-1.74.0.tar.xz/giscanner/doctemplates/devdocs/Gjs/_method.tmpl Changed

_service:tar_scm:gobject-introspection-1.72.0.tar.xz/giscanner/doctemplates/devdocs/Gjs/_signals.tmpl -> _service:tar_scm:gobject-introspection-1.74.0.tar.xz/giscanner/doctemplates/devdocs/Gjs/_signals.tmpl Changed

_service:tar_scm:gobject-introspection-1.72.0.tar.xz/giscanner/docwriter.py -> _service:tar_scm:gobject-introspection-1.74.0.tar.xz/giscanner/docwriter.py Changed

_service:tar_scm:gobject-introspection-1.72.0.tar.xz/giscanner/dumper.py -> _service:tar_scm:gobject-introspection-1.74.0.tar.xz/giscanner/dumper.py Changed

_service:tar_scm:gobject-introspection-1.72.0.tar.xz/giscanner/meson.build -> _service:tar_scm:gobject-introspection-1.74.0.tar.xz/giscanner/meson.build Changed

_service:tar_scm:gobject-introspection-1.72.0.tar.xz/giscanner/scannerparser.y -> _service:tar_scm:gobject-introspection-1.74.0.tar.xz/giscanner/scannerparser.y Changed

@@ -307,6 +307,7 @@
 %type <symbol> parameter_declaration
 %type <symbol> struct_declarator
 %type <list> enumerator_list
+%type <list> function_macro_argument_list
 %type <list> identifier_list
 %type <list> init_declarator_list
 %type <list> parameter_list
@@ -1405,8 +1406,23 @@
 	;
 
 initializer_list
-	: initializer
-	| initializer_list ',' initializer
+	: initializer_list_item
+	| initializer_list ',' initializer_list_item
+	;
+
+initializer_list_item
+	: designator_list '=' initializer
+	| initializer
+	;
+
+designator_list
+	: designator
+	| designator_list designator
+	;
+
+designator
+	: '' constant_expression ''
+	| '.' identifier
 	;
 
 /* A.2.3 Statements. */
@@ -1513,8 +1529,28 @@
 	  }
 	;
 
+function_macro_argument_list
+	: identifier
+	  {
+		GISourceSymbol *sym = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, scanner->current_file, lineno);
+		sym->ident = $1;
+		$$ = g_list_append (NULL, sym);
+	  }
+	| ELLIPSIS
+	  {
+		GISourceSymbol *sym = gi_source_symbol_new (CSYMBOL_TYPE_ELLIPSIS, scanner->current_file, lineno);
+		$$ = g_list_append (NULL, sym);
+	  }
+	| identifier ',' function_macro_argument_list
+	  {
+		GISourceSymbol *sym = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, scanner->current_file, lineno);
+		sym->ident = $1;
+		$$ = g_list_prepend ($3, sym);
+	  }
+	;
+
 function_macro_define
-	: function_macro '(' identifier_list ')'
+	: function_macro '(' function_macro_argument_list ')'
 	   {
 		GISourceSymbol *sym = gi_source_symbol_new (CSYMBOL_TYPE_FUNCTION_MACRO, scanner->current_file, lineno);
 		GISourceType *func = gi_source_function_new ();
@@ -1524,6 +1560,16 @@
 		gi_source_scanner_add_symbol (scanner, sym);
 		gi_source_symbol_unref (sym);
 	   }
+	| function_macro '(' ')'
+	   {
+		GISourceSymbol *sym = gi_source_symbol_new (CSYMBOL_TYPE_FUNCTION_MACRO, scanner->current_file, lineno);
+		GISourceType *func = gi_source_function_new ();
+		sym->ident = g_strdup ($1);
+		func->child_list = NULL;
+		gi_source_symbol_merge_type (sym, func);
+		gi_source_scanner_add_symbol (scanner, sym);
+		gi_source_symbol_unref (sym);
+	   }
 	;
 
 object_macro_define

_service:tar_scm:gobject-introspection-1.72.0.tar.xz/meson.build -> _service:tar_scm:gobject-introspection-1.74.0.tar.xz/meson.build Changed

@@ -1,7 +1,8 @@
 project('gobject-introspection', 'c',
-  version: '1.72.0',
-  meson_version: '>= 0.58.2',
+  version: '1.74.0',
+  meson_version: '>= 0.60.0',
   default_options: 
+    'c_std=gnu99',
     'warning_level=2',
     'buildtype=debugoptimized',
   ,
@@ -31,7 +32,6 @@
     project_c_args += 
       '-Warray-bounds',
       '-Wcast-align',
-      '-Wdeclaration-after-statement',
       '-Wduplicated-branches',
       '-Wformat=2',
       '-Wformat-nonliteral',
@@ -124,9 +124,7 @@
 endif
 
 
-# FIXME: Always bumped to match our version
-#glib_version = '>=2.@0@.@1@'.format(gi_versions1, gi_versions2)
-glib_version = '>= 2.58.0'
+glib_version = '>=2.@0@.@1@'.format(gi_versions1, gi_versions2)
 
 glib_dep = dependency('glib-2.0', version : glib_version,
   fallback: 'glib', 'libglib_dep')
@@ -200,8 +198,8 @@
 if doctool_option.disabled()
   with_doctool = false
 else
-  has_mako = run_command(python, '-c', 'import mako').returncode() == 0
-  has_markdown = run_command(python, '-c', 'import markdown').returncode() == 0
+  has_mako = run_command(python, '-c', 'import mako', check: false).returncode() == 0
+  has_markdown = run_command(python, '-c', 'import markdown', check: false).returncode() == 0
   if not has_mako or not has_markdown
     if doctool_option.enabled()
       error('doctool requires markdown and mako')
@@ -290,10 +288,7 @@
 # be named girepo_dep for backward compatibility with projects that where already
 # using that name as fallback: dependency('gobject-introspection-1.0',
 # fallback : 'gobject-introspection', 'girepo_dep')
-# FIXME: meson.override_dependency() and declare_dependency()'s variable arguments
-# are new in Meson 0.54.0, older versions of Meson won't be able to use g-i as
-# subproject anyway
-if meson.version().version_compare('>=0.54.0') and get_option('build_introspection_data') == true
+if get_option('build_introspection_data') == true
   girepo_dep = declare_dependency(
     sources: typelibs,
     dependencies: girepo_dep,

_service:tar_scm:gobject-introspection-1.72.0.tar.xz/subprojects/zlib.wrap -> _service:tar_scm:gobject-introspection-1.74.0.tar.xz/subprojects/zlib.wrap Changed

_service:tar_scm:gobject-introspection-1.72.0.tar.xz/tests/gimarshallingtests.c -> _service:tar_scm:gobject-introspection-1.74.0.tar.xz/tests/gimarshallingtests.c Changed

_service:tar_scm:gobject-introspection-1.72.0.tar.xz/tests/scanner/meson.build -> _service:tar_scm:gobject-introspection-1.74.0.tar.xz/tests/scanner/meson.build Changed

Changes of Revision 2