Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package desktop-file-utils for openSUSE:Factory checked in at 2022-06-29 16:00:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/desktop-file-utils (Old) and /work/SRC/openSUSE:Factory/.desktop-file-utils.new.1548 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "desktop-file-utils" Wed Jun 29 16:00:49 2022 rev:69 rq:985513 version:0.26 Changes: -------- --- /work/SRC/openSUSE:Factory/desktop-file-utils/desktop-file-utils.changes 2022-03-28 17:01:15.265025881 +0200 +++ /work/SRC/openSUSE:Factory/.desktop-file-utils.new.1548/desktop-file-utils.changes 2022-06-29 16:01:38.968645961 +0200 @@ -1,0 +2,7 @@ +Fri Jun 24 07:32:30 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr> + +- Add patches to avoid bogus errors in post-build checks: + * 0001-validate-support-SingleMainWindow-key-from-1.5.patch + * 0002-validate-Support-version-1.5.patch + +------------------------------------------------------------------- New: ---- 0001-validate-support-SingleMainWindow-key-from-1.5.patch 0002-validate-Support-version-1.5.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ desktop-file-utils.spec ++++++ --- /var/tmp/diff_new_pack.suy9a9/_old 2022-06-29 16:01:39.456646611 +0200 +++ /var/tmp/diff_new_pack.suy9a9/_new 2022-06-29 16:01:39.460646617 +0200 @@ -31,6 +31,9 @@ Patch0: desktop-file-utils-suse-keys.patch # PATCH-FIX-OPENSUSE install_man_desktop-file-edit_as_symlink.patch -- With Source3 makes manual page "desktop-file-edit.1" a symlink instead of a copy. Patch1: install_man_desktop-file-edit_as_symlink.patch +# PATCH-FIX-UPSTREAM -- SingleMainWindow is present in xdg-specs 1.5 and can be used by both GNOME and KDE +Patch2: 0001-validate-support-SingleMainWindow-key-from-1.5.patch +Patch3: 0002-validate-Support-version-1.5.patch BuildRequires: glib2-devel BuildRequires: meson >= 0.49.0 BuildRequires: pkgconfig ++++++ 0001-validate-support-SingleMainWindow-key-from-1.5.patch ++++++ From 47ab968995ae864d3681833040e17b8f1af4cb38 Mon Sep 17 00:00:00 2001 From: David King <amigadave@amigadave.com> Date: Tue, 15 Feb 2022 10:54:40 +0000 Subject: [PATCH] validate: support SingleMainWindow key from 1.5 Fixes https://gitlab.freedesktop.org/xdg/desktop-file-utils/-/issues/59 --- src/validate.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/validate.c b/src/validate.c index 821be7d..10d1872 100644 --- a/src/validate.c +++ b/src/validate.c @@ -329,6 +329,9 @@ static DesktopKeyDefinition registered_desktop_keys[] = { /* SuSE specific */ { DESKTOP_BOOLEAN_TYPE, "X-SuSE-translate", FALSE, FALSE, FALSE, NULL }, + /* Since 1.5 */ + { DESKTOP_BOOLEAN_TYPE, "SingleMainWindow", FALSE, FALSE, FALSE, NULL }, + /* Keys reserved for KDE */ /* since 0.9.4 */ -- 2.36.1 ++++++ 0002-validate-Support-version-1.5.patch ++++++ From e1f28bc5673f6cb281f3f4bdd8d8264d8ced6253 Mon Sep 17 00:00:00 2001 From: David King <amigadave@amigadave.com> Date: Tue, 15 Feb 2022 10:56:04 +0000 Subject: [PATCH] validate: Support version 1.5 Bump CURRENT_SPEC_VERSION to 1.5. --- man/desktop-file-validate.1 | 2 +- src/validate.c | 3 +++ src/validate.h | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/man/desktop-file-validate.1 b/man/desktop-file-validate.1 index 8e17411..ce87c47 100644 --- a/man/desktop-file-validate.1 +++ b/man/desktop-file-validate.1 @@ -9,7 +9,7 @@ desktop-file-validate \- Validate desktop entry files .B desktop-file-validate [\-\-no-hints] [\-\-no-warn-deprecated] [\-\-warn-kde] FILE... .SH DESCRIPTION The \fIdesktop-file-validate\fP program is a tool to validate desktop -entry files according to the Desktop Entry specification 1.4. +entry files according to the Desktop Entry specification 1.5. .PP The specification describes a file format to provide information such as name, icon and description for an application. Such a file can then be diff --git a/src/validate.c b/src/validate.c index 10d1872..87f196e 100644 --- a/src/validate.c +++ b/src/validate.c @@ -964,6 +964,9 @@ handle_version_key (kf_validator *kf, const char *locale_key, const char *value) { + if (!strcmp (value, "1.5")) + return TRUE; + if (!strcmp (value, "1.4")) return TRUE; diff --git a/src/validate.h b/src/validate.h index e6efd93..a7952cd 100644 --- a/src/validate.h +++ b/src/validate.h @@ -30,7 +30,7 @@ #include <glib.h> -#define CURRENT_SPEC_VERSION "1.4" +#define CURRENT_SPEC_VERSION "1.5" #define GROUP_KDE_DESKTOP_ENTRY "KDE Desktop Entry" #define GROUP_DESKTOP_ACTION "Desktop Action " -- 2.36.1