Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package grilo for openSUSE:Factory checked in at 2023-05-11 12:31:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/grilo (Old) and /work/SRC/openSUSE:Factory/.grilo.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "grilo" Thu May 11 12:31:59 2023 rev:48 rq:1086095 version:0.3.16 Changes: -------- --- /work/SRC/openSUSE:Factory/grilo/grilo.changes 2023-03-24 15:17:59.562128224 +0100 +++ /work/SRC/openSUSE:Factory/.grilo.new.1533/grilo.changes 2023-05-11 12:32:04.438286632 +0200 @@ -1,0 +2,9 @@ +Tue May 9 21:14:08 UTC 2023 - Bjørn Lie <[email protected]> + +- Update to version 0.3.16: + + Fix usage of depcreated GSimpleAsyncResult. + + Build updates. Meson requirement is now 0.62. + + Fix build on Darwin. + + Updated translations. + +------------------------------------------------------------------- Old: ---- grilo-0.3.15.tar.xz New: ---- grilo-0.3.16.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grilo.spec ++++++ --- /var/tmp/diff_new_pack.a9BuF9/_old 2023-05-11 12:32:04.882288814 +0200 +++ /var/tmp/diff_new_pack.a9BuF9/_new 2023-05-11 12:32:04.886288833 +0200 @@ -1,7 +1,7 @@ # # spec file for package grilo # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: grilo -Version: 0.3.15 +Version: 0.3.16 Release: 0 Summary: Framework for browsing and searching media content License: LGPL-2.1-or-later @@ -28,7 +28,7 @@ BuildRequires: fdupes BuildRequires: gtk-doc BuildRequires: intltool -BuildRequires: meson >= 0.46.0 +BuildRequires: meson >= 0.62.0 BuildRequires: pkgconfig BuildRequires: vala BuildRequires: pkgconfig(gio-2.0) >= 2.58 ++++++ grilo-0.3.15.tar.xz -> grilo-0.3.16.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grilo-0.3.15/AUTHORS new/grilo-0.3.16/AUTHORS --- old/grilo-0.3.15/AUTHORS 2022-08-16 11:12:01.000000000 +0200 +++ new/grilo-0.3.16/AUTHORS 2023-05-08 14:31:45.000000000 +0200 @@ -128,6 +128,7 @@ Rosen Penev RÅ«dolfs Mazurs Ryan Lortie +Sabri Ãnal Samir Ribic Sam Thursfield Sebastian Keller @@ -145,6 +146,7 @@ Victor Ibragimov VÃctor Manuel Jáquez Leal Victor Toso +Weijia Wang Wolfgang Stöggl Wylmer Wang Xabier Rodriguez Calvar diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grilo-0.3.15/NEWS new/grilo-0.3.16/NEWS --- old/grilo-0.3.15/NEWS 2022-08-16 11:12:01.000000000 +0200 +++ new/grilo-0.3.16/NEWS 2023-05-08 14:31:45.000000000 +0200 @@ -1,3 +1,20 @@ +NEW in 0.3.16 +============= + * !94 Fix usage of depcreated GSimpleAsyncResult + * !95 Build updates. Meson requirement is now 0.62. + * !96 Fix build on Darwin + + * Updated translations + * Turkish + * Georgian + + * Contributors to this release: + Emmanuele Bassi <[email protected]> + Sabri Ãnal <[email protected]> + Victor Toso <[email protected]> + Weijia Wang <[email protected]> + Zurab Kargareteli <[email protected]> + NEW in 0.3.15 ============= * !88 Increase glib requirement to 2.66 so we can use GUri diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grilo-0.3.15/doc/grilo/meson.build new/grilo-0.3.16/doc/grilo/meson.build --- old/grilo-0.3.15/doc/grilo/meson.build 2022-08-16 11:12:01.000000000 +0200 +++ new/grilo-0.3.16/doc/grilo/meson.build 2023-05-08 14:31:45.000000000 +0200 @@ -5,9 +5,11 @@ # # Copyright (C) 2016 Igalia S.L. All rights reserved. -types = configure_file(input : 'grilo.types', - output : 'grilo.types', - configuration : configuration_data()) +types = configure_file( + input: 'grilo.types', + output: 'grilo.types', + copy: true, +) private_headers = [ 'grl-sync-priv.h', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grilo-0.3.15/libs/net/grl-net-mock.c new/grilo-0.3.16/libs/net/grl-net-mock.c --- old/grilo-0.3.15/libs/net/grl-net-mock.c 2022-08-16 11:12:01.000000000 +0200 +++ new/grilo-0.3.16/libs/net/grl-net-mock.c 2023-05-08 14:31:45.000000000 +0200 @@ -58,6 +58,7 @@ GError *error = NULL; GStatBuf stat_buf; char *new_url; + GTask *task = G_TASK (result); if (ignored_parameters) { g_autoptr(GUri) uri = g_uri_parse (url, G_URI_FLAGS_PARSE_RELAXED, NULL); @@ -85,28 +86,26 @@ } if (!config) { - g_simple_async_result_set_error (G_SIMPLE_ASYNC_RESULT (result), - GRL_NET_WC_ERROR, - GRL_NET_WC_ERROR_NETWORK_ERROR, - "%s", - _("No mock definition found")); + g_task_return_new_error (task, + GRL_NET_WC_ERROR, + GRL_NET_WC_ERROR_NETWORK_ERROR, + "%s", + _("No mock definition found")); g_free (new_url); - g_simple_async_result_complete_in_idle (G_SIMPLE_ASYNC_RESULT (result)); - g_object_unref (result); + g_object_unref (task); return; } data_file = g_key_file_get_value (config, new_url, "data", &error); if (error) { - g_simple_async_result_set_error (G_SIMPLE_ASYNC_RESULT (result), - GRL_NET_WC_ERROR, - GRL_NET_WC_ERROR_NOT_FOUND, - _("Could not find mock content %s"), - error->message); + g_task_return_new_error (task, + GRL_NET_WC_ERROR, + GRL_NET_WC_ERROR_NOT_FOUND, + _("Could not find mock content %s"), + error->message); g_error_free (error); g_free (new_url); - g_simple_async_result_complete_in_idle (G_SIMPLE_ASYNC_RESULT (result)); - g_object_unref (result); + g_object_unref (task); return; } if (data_file[0] != '/') { @@ -116,13 +115,12 @@ } if (g_stat (full_path, &stat_buf) < 0) { - g_simple_async_result_set_error (G_SIMPLE_ASYNC_RESULT (result), - GRL_NET_WC_ERROR, - GRL_NET_WC_ERROR_NOT_FOUND, - _("Could not access mock content: %s"), - data_file); - g_simple_async_result_complete_in_idle (G_SIMPLE_ASYNC_RESULT (result)); - g_object_unref (result); + g_task_return_new_error (task, + GRL_NET_WC_ERROR, + GRL_NET_WC_ERROR_NOT_FOUND, + _("Could not access mock content: %s"), + data_file); + g_object_unref (task); g_free (new_url); g_clear_pointer (&data_file, g_free); g_clear_pointer (&full_path, g_free); @@ -132,11 +130,8 @@ g_clear_pointer (&data_file, g_free); g_clear_pointer (&full_path, g_free); - g_simple_async_result_set_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (result), - new_url, - NULL); - g_simple_async_result_complete_in_idle (G_SIMPLE_ASYNC_RESULT (result)); - g_object_unref (result); + g_task_return_pointer (task, new_url, NULL); + g_object_unref (task); } void diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grilo-0.3.15/libs/net/grl-net-wc.c new/grilo-0.3.16/libs/net/grl-net-wc.c --- old/grilo-0.3.15/libs/net/grl-net-wc.c 2022-08-16 11:12:01.000000000 +0200 +++ new/grilo-0.3.16/libs/net/grl-net-wc.c 2023-05-08 14:31:45.000000000 +0200 @@ -452,7 +452,7 @@ static void parse_error (guint status, const gchar *reason, - GSimpleAsyncResult *result) + GTask *task) { switch (status) { #if ! SOUP_CHECK_VERSION (2, 99, 2) @@ -460,15 +460,15 @@ case SOUP_STATUS_CANT_CONNECT: case SOUP_STATUS_SSL_FAILED: case SOUP_STATUS_IO_ERROR: - g_simple_async_result_set_error (result, GRL_NET_WC_ERROR, - GRL_NET_WC_ERROR_NETWORK_ERROR, - _("Cannot connect to the server")); + g_task_return_new_error (task, GRL_NET_WC_ERROR, + GRL_NET_WC_ERROR_NETWORK_ERROR, + _("Cannot connect to the server")); return; case SOUP_STATUS_CANT_RESOLVE_PROXY: case SOUP_STATUS_CANT_CONNECT_PROXY: - g_simple_async_result_set_error (result, G_IO_ERROR, - G_IO_ERROR_PROXY_FAILED, - _("Cannot connect to the proxy server")); + g_task_return_new_error (task, GRL_NET_WC_ERROR, + G_IO_ERROR_PROXY_FAILED, + _("Cannot connect to the proxy server")); return; #endif case SOUP_STATUS_INTERNAL_SERVER_ERROR: /* 500 */ @@ -476,42 +476,41 @@ case SOUP_STATUS_MALFORMED: #endif case SOUP_STATUS_BAD_REQUEST: /* 400 */ - g_simple_async_result_set_error (result, GRL_NET_WC_ERROR, - GRL_NET_WC_ERROR_PROTOCOL_ERROR, - _("Invalid request URI or header: %s"), - reason); + g_task_return_new_error (task, GRL_NET_WC_ERROR, + GRL_NET_WC_ERROR_PROTOCOL_ERROR, + _("Invalid request URI or header: %s"), + reason); return; case SOUP_STATUS_UNAUTHORIZED: /* 401 */ case SOUP_STATUS_FORBIDDEN: /* 403 */ - g_simple_async_result_set_error (result, GRL_NET_WC_ERROR, - GRL_NET_WC_ERROR_AUTHENTICATION_REQUIRED, - _("Authentication required: %s"), reason); + g_task_return_new_error (task, GRL_NET_WC_ERROR, + GRL_NET_WC_ERROR_AUTHENTICATION_REQUIRED, + _("Authentication required: %s"), reason); return; case SOUP_STATUS_NOT_FOUND: /* 404 */ - g_simple_async_result_set_error (result, GRL_NET_WC_ERROR, - GRL_NET_WC_ERROR_NOT_FOUND, - _("The requested resource was not found: %s"), - reason); + g_task_return_new_error (task, GRL_NET_WC_ERROR, + GRL_NET_WC_ERROR_NOT_FOUND, + _("The requested resource was not found: %s"), + reason); return; case SOUP_STATUS_CONFLICT: /* 409 */ case SOUP_STATUS_PRECONDITION_FAILED: /* 412 */ - g_simple_async_result_set_error (result, GRL_NET_WC_ERROR, - GRL_NET_WC_ERROR_CONFLICT, - _("The entry has been modified since it was downloaded: %s"), - reason); + g_task_return_new_error (task, GRL_NET_WC_ERROR, + GRL_NET_WC_ERROR_CONFLICT, + _("The entry has been modified since it was downloaded: %s"), + reason); return; #if ! SOUP_CHECK_VERSION (2, 99, 2) case SOUP_STATUS_CANCELLED: - g_simple_async_result_set_error (result, G_IO_ERROR, - G_IO_ERROR_CANCELLED, - _("Operation was cancelled")); + g_task_return_new_error (task, GRL_NET_WC_ERROR, + G_IO_ERROR_CANCELLED, + _("Operation was cancelled")); return; #endif default: GRL_DEBUG ("Unhandled status: %s", soup_status_get_phrase (status)); - g_simple_async_result_set_error (result, G_IO_ERROR, - G_IO_ERROR_FAILED, - "%s", soup_status_get_phrase (status)); + g_task_return_new_error (task, G_IO_ERROR, G_IO_ERROR_FAILED, + "%s", soup_status_get_phrase (status)); } } @@ -574,8 +573,8 @@ GAsyncResult *res, gpointer user_data) { - GSimpleAsyncResult *result = G_SIMPLE_ASYNC_RESULT (user_data); - struct request_res *rr = g_simple_async_result_get_op_res_gpointer (result);; + GTask *task = G_TASK (user_data); + struct request_res *rr = g_task_get_task_data (task); GError *error = NULL; gssize s = g_input_stream_read_finish (G_INPUT_STREAM (source), res, &error); @@ -612,19 +611,14 @@ if (error) { if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) { - g_simple_async_result_set_error (result, G_IO_ERROR, - G_IO_ERROR_CANCELLED, - _("Operation was cancelled")); + g_task_return_new_error (task, G_IO_ERROR, G_IO_ERROR_CANCELLED, + _("Operation was cancelled")); } else { - g_simple_async_result_set_error (result, G_IO_ERROR, - G_IO_ERROR_FAILED, - _("Data not available")); + g_task_return_new_error (task, G_IO_ERROR, G_IO_ERROR_FAILED, + _("Data not available")); } - g_error_free (error); - - g_simple_async_result_complete (result); - g_object_unref (result); + g_object_unref (task); return; } @@ -646,12 +640,12 @@ if (status_code != SOUP_STATUS_OK) { parse_error (status_code, reason_phrase, - G_SIMPLE_ASYNC_RESULT (user_data)); + task); + } else { + g_task_return_boolean(task, TRUE); } } - - g_simple_async_result_complete (result); - g_object_unref (result); + g_object_unref (task); } static void @@ -664,8 +658,8 @@ SoupMessage *message = soup_session_get_async_result_message (session, res); SoupMessageHeaders *response_hdrs = soup_message_get_response_headers (message); #endif - GSimpleAsyncResult *result = G_SIMPLE_ASYNC_RESULT (user_data); - struct request_res *rr = g_simple_async_result_get_op_res_gpointer (result); + GTask *task = G_TASK (user_data); + struct request_res *rr = g_task_get_task_data (task); GError *error = NULL; #if SOUP_CHECK_VERSION (2, 99, 2) @@ -676,16 +670,13 @@ if (error) { if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) { - g_simple_async_result_set_from_error (result, error); + g_task_return_error (task, error); } else { - g_simple_async_result_set_error (result, G_IO_ERROR, - G_IO_ERROR_FAILED, - _("Data not available")); + g_task_return_new_error (task, G_IO_ERROR, G_IO_ERROR_FAILED, + _("Data not available")); + g_error_free (error); } - g_error_free (error); - - g_simple_async_result_complete (result); - g_object_unref (result); + g_object_unref (task); return; } @@ -716,10 +707,7 @@ GCancellable *cancellable) { struct request_res *rr = g_slice_new0 (struct request_res); - - g_simple_async_result_set_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (result), - rr, - NULL); + g_task_set_task_data (G_TASK (result), rr, NULL); #if SOUP_CHECK_VERSION (2, 99, 2) { @@ -737,12 +725,11 @@ #else if (!rr->request) { #endif - g_simple_async_result_set_error (G_SIMPLE_ASYNC_RESULT (result), - G_IO_ERROR, - G_IO_ERROR_INVALID_ARGUMENT, - _("Invalid URL %s"), - url); - g_simple_async_result_complete (G_SIMPLE_ASYNC_RESULT (result)); + g_task_return_new_error (G_TASK (result), + G_IO_ERROR, + G_IO_ERROR_INVALID_ARGUMENT, + _("Invalid URL %s"), + url); g_object_unref (result); return; } @@ -998,17 +985,12 @@ GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *result; - #if SOUP_CHECK_VERSION (2, 99, 2) ensure_session (self); #endif - result = g_simple_async_result_new (G_OBJECT (self), - callback, - user_data, - grl_net_wc_request_async); - - get_url (self, uri, headers, G_ASYNC_RESULT (result), cancellable); + GTask *task = g_task_new (G_OBJECT (self), NULL, callback, user_data); + g_task_set_source_tag (task, grl_net_wc_request_async); + get_url (self, uri, headers, G_ASYNC_RESULT (task), cancellable); } @@ -1038,28 +1020,26 @@ gsize *length, GError **error) { - GSimpleAsyncResult *res = G_SIMPLE_ASYNC_RESULT (result); - gboolean ret = TRUE; + GTask *task = G_TASK (result); - g_warn_if_fail (g_simple_async_result_get_source_tag (res) == - grl_net_wc_request_async); + g_warn_if_fail (g_task_get_source_tag (task) == grl_net_wc_request_async); - void *op = g_simple_async_result_get_op_res_gpointer (res); + void *op; + if (is_mocked()) + op = g_task_propagate_pointer (task, error); + else + op = g_task_get_task_data (task); - if (g_simple_async_result_propagate_error (res, error) == TRUE) { - ret = FALSE; - goto end_func; + if (!g_task_had_error (task)) { + get_content(self, op, content, length); } - get_content(self, op, content, length); - -end_func: if (is_mocked ()) free_mock_op_res (op); else free_op_res (op); - return ret; + return !g_task_had_error (task); } /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grilo-0.3.15/libs/net/meson.build new/grilo-0.3.16/libs/net/meson.build --- old/grilo-0.3.15/libs/net/meson.build 2022-08-16 11:12:01.000000000 +0200 +++ new/grilo-0.3.16/libs/net/meson.build 2023-05-08 14:31:45.000000000 +0200 @@ -41,7 +41,8 @@ libgrlnet_dep = declare_dependency(link_with: libgrlnet, include_directories: [libgrl_inc, libgrlnet_inc], - dependencies: [libsoup_dep, libgrl_dep]) + dependencies: [libsoup_dep, libgrl_dep], + variables: {'soupapiversion': soup_api_version}) grlnet_pc = pkgconfig.generate(libgrlnet, filebase: 'grilo-net-@0@'.format(grl_majorminor), @@ -51,9 +52,6 @@ description: 'Grilo networking helpers for plug-ins', version: grlnet_version, variables: [ - 'exec_prefix=${prefix}', - 'datarootdir=' + datadir_for_pc_file, - 'datadir=${datarootdir}', 'girdir=' + girdir_for_pc_file, 'typelibdir=' + typelibdir_for_pc_file, 'soupapiversion=' + soup_api_version, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grilo-0.3.15/libs/pls/meson.build new/grilo-0.3.16/libs/pls/meson.build --- old/grilo-0.3.15/libs/pls/meson.build 2022-08-16 11:12:01.000000000 +0200 +++ new/grilo-0.3.16/libs/pls/meson.build 2023-05-08 14:31:45.000000000 +0200 @@ -42,9 +42,6 @@ description: 'Grilo playlist utility', version: grlpls_version, variables: [ - 'exec_prefix=${prefix}', - 'datarootdir=' + datadir_for_pc_file, - 'datadir=${datarootdir}', 'girdir=' + girdir_for_pc_file, 'typelibdir=' + typelibdir_for_pc_file, ], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grilo-0.3.15/meson.build new/grilo-0.3.16/meson.build --- old/grilo-0.3.15/meson.build 2022-08-16 11:12:01.000000000 +0200 +++ new/grilo-0.3.16/meson.build 2023-05-08 14:31:45.000000000 +0200 @@ -6,14 +6,14 @@ # Copyright (C) 2016 Igalia S.L. All rights reserved. project('grilo', 'c', - version: '0.3.15', + version: '0.3.16', default_options: [ 'buildtype=debugoptimized', 'c_std=gnu99', 'warning_level=1' ], license: 'LGPL-2.1-or-later', - meson_version: '>= 0.47.0') + meson_version: '>= 0.62.0') grilo_version = meson.project_version() grlnet_version = meson.project_version() @@ -88,7 +88,6 @@ localedir = join_paths(prefix, get_option('localedir')) datadir_unprefixed = get_option('datadir') datadir = join_paths(prefix, datadir_unprefixed) -datadir_for_pc_file = join_paths('${prefix}', datadir_unprefixed) girdir = join_paths(datadir, 'gir-1.0') girdir_for_pc_file = join_paths('${datadir}', 'gir-1.0') @@ -96,16 +95,16 @@ typelibdir_for_pc_file = join_paths('${libdir}', 'girepository-1.0') gobject_introspection = dependency('gobject-introspection-1.0', required: false) if gobject_introspection.found() - girdir = gobject_introspection.get_pkgconfig_variable('girdir', define_variable: ['datadir', datadir]) - girdir_for_pc_file = gobject_introspection.get_pkgconfig_variable('girdir', define_variable: ['datadir', '${datadir}']) - typelibdir = gobject_introspection.get_pkgconfig_variable('typelibdir', define_variable: ['libdir', libdir]) - typelibdir_for_pc_file = gobject_introspection.get_pkgconfig_variable('typelibdir', define_variable: ['libdir', '${libdir}']) + girdir = gobject_introspection.get_variable(pkgconfig: 'girdir', pkgconfig_define: ['datadir', datadir]) + girdir_for_pc_file = gobject_introspection.get_variable(pkgconfig: 'girdir', pkgconfig_define: ['datadir', '${datadir}']) + typelibdir = gobject_introspection.get_variable(pkgconfig: 'typelibdir', pkgconfig_define: ['libdir', libdir]) + typelibdir_for_pc_file = gobject_introspection.get_variable(pkgconfig: 'typelibdir', pkgconfig_define: ['libdir', '${libdir}']) endif vapidir = join_paths(datadir, 'vala', 'vapi') vapigen = dependency('vapigen', required: false) if vapigen.found() - vapidir = vapigen.get_pkgconfig_variable('vapidir', define_variable: ['datadir', datadir]) + vapidir = vapigen.get_variable(pkgconfig: 'vapidir', pkgconfig_define: ['datadir', datadir]) endif cdata = configuration_data() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grilo-0.3.15/po/ka.po new/grilo-0.3.16/po/ka.po --- old/grilo-0.3.15/po/ka.po 2022-08-16 11:12:01.000000000 +0200 +++ new/grilo-0.3.16/po/ka.po 2023-05-08 14:31:45.000000000 +0200 @@ -8,7 +8,7 @@ "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/grilo/issues\n"; "POT-Creation-Date: 2022-07-01 16:34+0000\n" -"PO-Revision-Date: 2022-07-03 06:16+0200\n" +"PO-Revision-Date: 2022-09-23 19:27+0200\n" "Last-Translator: Temuri Doghonadze <[email protected]>\n" "Language-Team: \n" "Language: ka\n" @@ -16,21 +16,21 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 3.1\n" +"X-Generator: Poedit 3.1.1\n" #: libs/net/grl-net-mock.c:86 msgid "No mock definition found" -msgstr "" +msgstr "áááááááá¡ áá¦á¬áá á ááá áááááá" #: libs/net/grl-net-mock.c:98 #, c-format msgid "Could not find mock content %s" -msgstr "" +msgstr "ááááá¡ á¨áááªáááááá ááá áááááá: \"%s\"" #: libs/net/grl-net-mock.c:116 #, c-format msgid "Could not access mock content: %s" -msgstr "" +msgstr "ááááá¡ á¨áááªááááááá¡ááá á¬áááááá¡ áá áááááá: %s" #: libs/net/grl-net-wc.c:443 msgid "Cannot connect to the server" @@ -119,7 +119,7 @@ #: src/grl-registry.c:565 #, c-format msgid "Metadata key â%sâ already registered in different format" -msgstr "" +msgstr "ááá¢ááááááªáááá¡ ááá¡áá¦ááá \"%s\" á£ááá ááá áááá¡á¢á áá ááá£ááá á¡á®áá á¤áá ááá¢á¨á" #: src/grl-registry.c:578 #, c-format @@ -159,7 +159,7 @@ #: src/grl-registry.c:1487 #, c-format msgid "All configured plugin paths are invalid" -msgstr "" +msgstr "á§áááá ááá áááá£áá ááááá¢áááá¡ áááááá áá áá¡á¬áá áá" #: src/grl-registry.c:1527 #, c-format @@ -174,7 +174,7 @@ #: src/grl-registry.c:2066 #, c-format msgid "Plugin configuration does not contain âplugin-idâ reference" -msgstr "" +msgstr "ááááá¢áááá¡ áááá¤ááá£á ááªáá \"plugin-id\" áááá¡ áá á¨áááªááá¡" #: src/grl-source.c:2775 #, c-format @@ -189,4 +189,4 @@ #: src/grl-source.c:4191 #, c-format msgid "Media has no âidâ, cannot remove" -msgstr "" +msgstr "áááááá¡ \"id\" áá áááá©ááá. á¬áá¨áá á¨áá£á«ááááááá" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grilo-0.3.15/po/tr.po new/grilo-0.3.16/po/tr.po --- old/grilo-0.3.15/po/tr.po 2022-08-16 11:12:01.000000000 +0200 +++ new/grilo-0.3.16/po/tr.po 2023-05-08 14:31:45.000000000 +0200 @@ -1,6 +1,7 @@ # Turkish translation for grilo. -# Copyright (C) 2014 grilo's COPYRIGHT HOLDER +# Copyright (C) 2014-2022 grilo's COPYRIGHT HOLDER # This file is distributed under the same license as the grilo package. +# # Gökhan GurbetoÄlu <[email protected]>, 2014. # Muhammet Kara <[email protected]>, 2014, 2015. # ÃaÄatay YiÄit Åahin <[email protected]>, 2018. @@ -10,7 +11,7 @@ msgstr "" "Project-Id-Version: grilo master\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/grilo/issues\n"; -"POT-Creation-Date: 2020-07-22 17:10+0000\n" +"POT-Creation-Date: 2022-08-09 14:14+0000\n" "PO-Revision-Date: 2020-08-30 12:23+0300\n" "Last-Translator: Emin Tufan Ãetin <[email protected]>\n" "Language-Team: Türkçe <[email protected]>\n" @@ -21,60 +22,60 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Gtranslator 2.91.7\n" -#: libs/net/grl-net-mock.c:86 +#: libs/net/grl-net-mock.c:92 msgid "No mock definition found" msgstr "Maket tanımı bulunamadı" -#: libs/net/grl-net-mock.c:98 +#: libs/net/grl-net-mock.c:104 #, c-format msgid "Could not find mock content %s" msgstr "%s maket içeriÄi bulunamadı" -#: libs/net/grl-net-mock.c:116 +#: libs/net/grl-net-mock.c:122 #, c-format msgid "Could not access mock content: %s" msgstr "Maket içeriÄine eriÅilemedi: %s" -#: libs/net/grl-net-wc.c:442 +#: libs/net/grl-net-wc.c:461 msgid "Cannot connect to the server" msgstr "Sunucuya baÄlanılamıyor" -#: libs/net/grl-net-wc.c:448 +#: libs/net/grl-net-wc.c:467 msgid "Cannot connect to the proxy server" msgstr "Vekil sunucuya baÄlanılamıyor" -#: libs/net/grl-net-wc.c:455 +#: libs/net/grl-net-wc.c:477 #, c-format msgid "Invalid request URI or header: %s" msgstr "Geçersiz istek URIâsi ya da baÅlık: %s" -#: libs/net/grl-net-wc.c:462 +#: libs/net/grl-net-wc.c:484 #, c-format msgid "Authentication required: %s" msgstr "Kimlik doÄrulama gerekli: %s" -#: libs/net/grl-net-wc.c:467 +#: libs/net/grl-net-wc.c:489 #, c-format msgid "The requested resource was not found: %s" msgstr "Ä°stenen kaynak bulunamadı: %s" -#: libs/net/grl-net-wc.c:474 +#: libs/net/grl-net-wc.c:496 #, c-format msgid "The entry has been modified since it was downloaded: %s" msgstr "Girdi indirildiÄinden beri deÄiÅikliÄe uÄradı: %s" -#: libs/net/grl-net-wc.c:480 libs/net/grl-net-wc.c:592 libs/pls/grl-pls.c:493 +#: libs/net/grl-net-wc.c:503 libs/net/grl-net-wc.c:613 libs/pls/grl-pls.c:493 #: src/grl-source.c:1821 src/grl-source.c:1921 src/grl-source.c:2068 #: src/grl-source.c:2325 src/grl-source.c:2446 #, c-format msgid "Operation was cancelled" msgstr "Ä°Ålem iptal edildi" -#: libs/net/grl-net-wc.c:596 libs/net/grl-net-wc.c:640 +#: libs/net/grl-net-wc.c:617 libs/net/grl-net-wc.c:679 msgid "Data not available" msgstr "Veri yok" -#: libs/net/grl-net-wc.c:691 +#: libs/net/grl-net-wc.c:739 #, c-format msgid "Invalid URL %s" msgstr "%s URLâsi geçersiz" @@ -113,72 +114,72 @@ msgid "Could not resolve media for URI â%sâ" msgstr "â%sâ URIâsi için ortam çözümlenemedi" -#: src/grl-registry.c:495 src/grl-registry.c:1476 +#: src/grl-registry.c:499 src/grl-registry.c:1538 #, c-format msgid "Plugin â%sâ is already loaded" msgstr "â%sâ eklentisi zaten yüklü" -#: src/grl-registry.c:519 +#: src/grl-registry.c:523 #, c-format msgid "Failed to initialize plugin from %s" msgstr "%s konumundan eklenti baÅlatılamadı" -#: src/grl-registry.c:561 +#: src/grl-registry.c:565 #, c-format msgid "Metadata key â%sâ already registered in different format" msgstr "â%sâ üst veri anahtarı zaten baÅka biçimde kaydedilmiÅ" -#: src/grl-registry.c:574 +#: src/grl-registry.c:578 #, c-format msgid "Metadata key â%sâ cannot be registered" msgstr "â%sâ üst veri anahtarı kaydedilemiyor" -#: src/grl-registry.c:1082 +#: src/grl-registry.c:1144 #, c-format msgid "Source with id â%sâ was not found" msgstr "â%sâ kimlikli kaynak bulunamadı" -#: src/grl-registry.c:1156 +#: src/grl-registry.c:1218 #, c-format msgid "Failed to load plugin from %s" msgstr "%s konumundan eklenti yüklenemedi" -#: src/grl-registry.c:1165 +#: src/grl-registry.c:1227 #, c-format msgid "Invalid plugin file %s" msgstr "Geçersiz eklenti dosyası %s" -#: src/grl-registry.c:1176 +#: src/grl-registry.c:1238 #, c-format msgid "â%sâ is not a valid plugin file" msgstr "â%sâ geçerli eklenti dosyası deÄil" -#: src/grl-registry.c:1195 +#: src/grl-registry.c:1257 #, c-format msgid "Plugin â%sâ already exists" msgstr "â%sâ eklentisi var." -#: src/grl-registry.c:1358 +#: src/grl-registry.c:1420 #, c-format msgid "Invalid path %s" msgstr "Geçersiz yol %s" -#: src/grl-registry.c:1425 +#: src/grl-registry.c:1487 #, c-format msgid "All configured plugin paths are invalid" msgstr "Tüm yapılandırılmıŠeklenti yolları geçersiz" -#: src/grl-registry.c:1465 +#: src/grl-registry.c:1527 #, c-format msgid "Plugin â%sâ not available" msgstr "â%sâ eklentisi yok" -#: src/grl-registry.c:1693 +#: src/grl-registry.c:1755 #, c-format msgid "Plugin not found: â%sâ" msgstr "Eklenti bulunamadı: â%sâ" -#: src/grl-registry.c:2004 +#: src/grl-registry.c:2066 #, c-format msgid "Plugin configuration does not contain âplugin-idâ reference" msgstr "Eklenti yapılandırması âplugin-idâ baÅvurusunu içermiyor" @@ -197,9 +198,3 @@ #, c-format msgid "Media has no âidâ, cannot remove" msgstr "Ortamın âidâsi yok, kaldırılamıyor" - -#~ msgid "Unhandled status: %s" -#~ msgstr "Ä°Ålenmeyen durum: %s" - -#~ msgid "Unable to load plugin '%s'" -#~ msgstr "'%s' eklentisi yüklenemiyor" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grilo-0.3.15/src/meson.build new/grilo-0.3.16/src/meson.build --- old/grilo-0.3.15/src/meson.build 2022-08-16 11:12:01.000000000 +0200 +++ new/grilo-0.3.16/src/meson.build 2023-05-08 14:31:45.000000000 +0200 @@ -83,6 +83,8 @@ 'data', ]) +cc = meson.get_compiler('c') + c_args = [ '-DGRILO_COMPILATION', '-DG_LOG_DOMAIN="Grilo"', @@ -100,7 +102,7 @@ version: grilo_lt_version, dependencies: libgrl_deps, c_args: c_args, - link_args: '-Wl,--no-undefined', + link_args: cc.get_supported_link_arguments('-Wl,--no-undefined'), include_directories: libgrl_inc) libgrl_dep = declare_dependency(link_with: libgrl, @@ -115,9 +117,6 @@ description: 'Grilo Framework for multimedia developers', version: grilo_version, variables: [ - 'exec_prefix=${prefix}', - 'datarootdir=' + datadir_for_pc_file, - 'datadir=${datarootdir}', 'girdir=' + girdir_for_pc_file, 'typelibdir=' + typelibdir_for_pc_file, 'plugindir=' + plugins_dir_for_pc_file, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grilo-0.3.15/tools/grilo-inspect/generate_core_keys.py new/grilo-0.3.16/tools/grilo-inspect/generate_core_keys.py --- old/grilo-0.3.15/tools/grilo-inspect/generate_core_keys.py 2022-08-16 11:12:01.000000000 +0200 +++ new/grilo-0.3.16/tools/grilo-inspect/generate_core_keys.py 2023-05-08 14:31:45.000000000 +0200 @@ -11,42 +11,44 @@ import re import sys + +COMMENT_RE = re.compile( + r''' + //.*?$ | /\*.*?\*/ | \'(?:\\. | [^\\\'])*\' | "(?:\\. | [^\\"])*" + ''', + re.DOTALL | re.MULTILINE) + + # From https://stackoverflow.com/a/241506 def comment_remover(text): def replacer(match): s = match.group(0) if s.startswith('/'): - return " " # note: a space and not an empty string + return " " # note: a space and not an empty string else: return s - pattern = re.compile( - r'//.*?$|/\*.*?\*/|\'(?:\\.|[^\\\'])*\'|"(?:\\.|[^\\"])*"', - re.DOTALL | re.MULTILINE - ) - return re.sub(pattern, replacer, text) + return re.sub(COMMENT_RE, replacer, text) + if len(sys.argv) != 3: print("Usage: " + sys.argv[0] + " <input> <output>") exit(1) -finput = open(sys.argv[1], "r") -input_data = finput.read() -input_data = comment_remover(input_data).split('\n') -finput.close() -foutput = open(sys.argv[2], "w") - -foutput.write("gchar *grl_core_keys[] = {\n") - -output_keys = False -for line in input_data: - if re.search("GRL_METADATA_KEY_ALBUM", line): - output_keys = True - if re.search("G_BEGIN_DECLS", line): - output_keys = False - m = re.search("GRL_METADATA_KEY_[^ ]+", line) - if output_keys and m: - foutput.write("\"" + m.group(0) + "\",\n") - -foutput.write("};"); +with open(sys.argv[1], "r") as finput: + input_data = finput.read() + input_data = comment_remover(input_data).split('\n') + +with open(sys.argv[2], "w") as foutput: + foutput.write("gchar *grl_core_keys[] = {\n") + + output_keys = False + for line in input_data: + if re.search("GRL_METADATA_KEY_ALBUM", line): + output_keys = True + if re.search("G_BEGIN_DECLS", line): + output_keys = False + m = re.search("GRL_METADATA_KEY_[^ ]+", line) + if output_keys and m: + foutput.write('"' + m.group(0) + '",\n') -foutput.close() + foutput.write("};") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grilo-0.3.15/tools/grilo-inspect/meson.build new/grilo-0.3.16/tools/grilo-inspect/meson.build --- old/grilo-0.3.15/tools/grilo-inspect/meson.build 2022-08-16 11:12:01.000000000 +0200 +++ new/grilo-0.3.16/tools/grilo-inspect/meson.build 2023-05-08 14:31:45.000000000 +0200 @@ -5,14 +5,9 @@ # # Copyright (C) 2016 Igalia S.L. All rights reserved. -python = find_program('python', required : false) -if not python.found() - python = import('python3').find_python() -endif -if not python.found() - error('Python2 or Python3 is required to compile grilo-inspect') -endif -run_command(python, +python = import('python').find_installation('python3') + +run_command(python.full_path(), '@0@/generate_core_keys.py'.format(meson.current_source_dir()), '@0@/src/grl-metadata-key.h'.format(source_root), '@0@/grl-core-keys.h'.format(meson.current_build_dir()), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grilo-0.3.15/tools/grilo-test-ui/main.c new/grilo-0.3.16/tools/grilo-test-ui/main.c --- old/grilo-0.3.15/tools/grilo-test-ui/main.c 2022-08-16 11:12:01.000000000 +0200 +++ new/grilo-0.3.16/tools/grilo-test-ui/main.c 2023-05-08 14:31:45.000000000 +0200 @@ -2501,12 +2501,13 @@ GtkApplication *app; int status; g_autofree char *app_id = NULL; + GApplicationFlags app_flags = 0; grl_init (&argc, &argv); GRL_LOG_DOMAIN_INIT (test_ui_log_domain, "test-ui"); app_id = get_app_id (); - app = gtk_application_new (app_id, G_APPLICATION_FLAGS_NONE); + app = gtk_application_new (app_id, app_flags); g_signal_connect (app, "activate", G_CALLBACK (activate), NULL); status = g_application_run (G_APPLICATION (app), argc, argv); g_object_unref (app);
