开源软件构建与测试

_service:tar_scm:desktop-file-utils.spec Changed

_service:tar_scm:desktop-file-utils-0.26-support-1.5.patch Deleted

@@ -1,82 +0,0 @@
-From 48586dd1a755a80ec8ce0e8151b3ba236d81502f Mon Sep 17 00:00:00 2001
-From: David King <amigadave@amigadave.com>
-Date: Tue, 15 Feb 2022 10:54:40 +0000
-Subject: PATCH 1/2 Add support for 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 62406ab..ebb03b5 100644
---- a/src/validate.c
-+++ b/src/validate.c
-@@ -326,6 +326,9 @@ static DesktopKeyDefinition registered_desktop_keys = {
-   /* Since 1.4 */
-   { DESKTOP_BOOLEAN_TYPE,           "PrefersNonDefaultGPU", FALSE, FALSE, FALSE, NULL },
- 
-+  /* Since 1.5 */
-+  { DESKTOP_BOOLEAN_TYPE,           "SingleMainWindow", FALSE, FALSE, FALSE, NULL },
-+
-   /* Keys reserved for KDE */
- 
-   /* since 0.9.4 */
--- 
-2.34.1
-
-
-From e3e21bccfe257aa2a34d64a68582dcc2363c2606 Mon Sep 17 00:00:00 2001
-From: David King <amigadave@amigadave.com>
-Date: Tue, 15 Feb 2022 10:56:04 +0000
-Subject: PATCH 2/2 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 ebb03b5..f9eedee 100644
---- a/src/validate.c
-+++ b/src/validate.c
-@@ -961,6 +961,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.34.1

_service Changed

_service:tar_scm:desktop-file-utils-0.26.tar.xz/Makefile.am Deleted

@@ -1,35 +0,0 @@
-SUBDIRS = src man misc
-
-ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
-
-EXTRA_DIST = HACKING
-
-MAINTAINERCLEANFILES = \
-	$(srcdir)/aclocal.m4 \
-	$(srcdir)/config.guess \
-	$(srcdir)/config.h.in \
-	$(srcdir)/config.sub \
-	$(srcdir)/depcomp \
-	$(srcdir)/elisp-comp \
-	$(srcdir)/install-sh \
-	$(srcdir)/ltmain.sh \
-	$(srcdir)/missing \
-	`find "$(srcdir)" -type f -name Makefile.in -print` \
-	$(srcdir)/configure \
-	$(srcdir)/m4/*.m4
-
-CHANGELOG_GIT_RANGE =
-dist-hook:
-	$(AM_V_GEN)if test -d "$(srcdir)/.git"; then \
-	  ( echo '# Generated by Makefile. Do not edit.'; echo; \
-	    GIT_DIR="$(top_srcdir)/.git" ./missing --run \
-	    git log $(CHANGELOG_GIT_RANGE) --no-color -M -C --name-status ) \
-	  > ChangeLog.tmp \
-	  && mv -f ChangeLog.tmp $(distdir)/ChangeLog \
-	  || ( rm -f ChangeLog.tmp ; echo Failed to generate ChangeLog >&2 ); \
-	else \
-	  echo A git checkout is required to generate ChangeLog >&2; \
-	fi
-
-GITIGNOREFILES = $(PACKAGE)-\*.tar.{gz,bz2,xz}
--include $(top_srcdir)/git.mk

_service:tar_scm:desktop-file-utils-0.26.tar.xz/autogen.sh Deleted

@@ -1,64 +0,0 @@
-#!/bin/sh
-# Run this to generate all the initial makefiles, etc.
-
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-ORIGDIR=`pwd`
-cd $srcdir
-
-PROJECT=desktop-file-utils
-TEST_TYPE=-f
-FILE=src/validate.h
-
-DIE=0
-
-(autoconf --version) < /dev/null > /dev/null 2>&1 || {
-	echo
-	echo "You must have autoconf installed to compile $PROJECT."
-	echo "Download the appropriate package for your distribution,"
-	echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
-	DIE=1
-}
-
-AUTOMAKE=automake
-ACLOCAL=aclocal
-
-($AUTOMAKE --version) < /dev/null > /dev/null 2>&1 || {
-	echo
-	echo "You must have automake installed to compile $PROJECT."
-	echo "Download the appropriate package for your distribution,"
-	echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
-	DIE=1
-}
-
-if test "$DIE" -eq 1; then
-	exit 1
-fi
-
-test $TEST_TYPE $FILE || {
-	echo "You must run this script in the top-level $PROJECT directory"
-	exit 1
-}
-
-if test -z "$*"; then
-	echo "I am going to run ./configure with no arguments - if you wish "
-        echo "to pass any to it, please specify them on the $0 command line."
-fi
-
-echo $ACLOCAL $ACLOCAL_FLAGS
-$ACLOCAL $ACLOCAL_FLAGS
-
-# optionally feature autoheader
-(autoheader --version)  < /dev/null > /dev/null 2>&1 && autoheader
-
-$AUTOMAKE -a $am_opt
-autoconf || echo "autoconf failed - version 2.5x is probably required"
-
-cd $ORIGDIR
-
-if test -z "$NOCONFIGURE"; then
-    $srcdir/configure "$@"
-    echo 
-    echo "Now type 'make' to compile $PROJECT."
-fi

_service:tar_scm:desktop-file-utils-0.26.tar.xz/configure.ac Deleted

@@ -1,105 +0,0 @@
-AC_INIT(desktop-file-utils, 0.26,
-        https://bugs.freedesktop.org/enter_bug.cgi?product=desktop-file-utils)
-AC_CONFIG_SRCDIR(src/validate.h)
-
-AM_INIT_AUTOMAKE(1.11 foreign no-dist-gzip dist-xz tar-ustar)
-m4_ifdef(AM_SILENT_RULES, AM_SILENT_RULES(yes))
-AC_CONFIG_MACRO_DIR(m4)
-AM_CONFIG_HEADER(config.h)
-
-AC_PROG_LN_S
-AC_PROG_CC
-
-AC_CHECK_FUNCS(pledge)
-
-if test "x$GCC" = "xyes"; then
-  changequote(,)dnl
-  case " $CFLAGS " in
-  *\ \	-Wall\ \	*) ;;
-  *) CFLAGS="$CFLAGS -Wall" ;;
-  esac
-
-  case " $CFLAGS " in
-  *\ \	-Wchar-subscripts\ \	*) ;;
-  *) CFLAGS="$CFLAGS -Wchar-subscripts" ;;
-  esac
-
-  case " $CFLAGS " in
-  *\ \	-Wmissing-declarations\ \	*) ;;
-  *) CFLAGS="$CFLAGS -Wmissing-declarations" ;;
-  esac
-
-  case " $CFLAGS " in
-  *\ \	-Wmissing-prototypes\ \	*) ;;
-  *) CFLAGS="$CFLAGS -Wmissing-prototypes" ;;
-  esac
-
-  case " $CFLAGS " in
-  *\ \	-Wnested-externs\ \	*) ;;
-  *) CFLAGS="$CFLAGS -Wnested-externs" ;;
-  esac
-
-  case " $CFLAGS " in
-  *\ \	-Wpointer-arith\ \	*) ;;
-  *) CFLAGS="$CFLAGS -Wpointer-arith" ;;
-  esac
-
-  case " $CFLAGS " in
-  *\ \	-Wcast-align\ \	*) ;;
-  *) CFLAGS="$CFLAGS -Wcast-align" ;;
-  esac
-
-  case " $CFLAGS " in
-  *\ \	-Wsign-compare\ \	*) ;;
-  *) CFLAGS="$CFLAGS -Wsign-compare" ;;
-  esac
-
-  if test "x$enable_ansi" = "xyes"; then
-    case " $CFLAGS " in
-    *\ \	-ansi\ \	*) ;;
-    *) CFLAGS="$CFLAGS -ansi" ;;
-    esac
-
-    case " $CFLAGS " in
-    *\ \	-pedantic\ \	*) ;;
-    *) CFLAGS="$CFLAGS -pedantic" ;;
-    esac
-  fi
-  if test x$enable_gcov = xyes; then
-    case " $CFLAGS " in
-    *\ \	-fprofile-arcs\ \	*) ;;
-    *) CFLAGS="$CFLAGS -fprofile-arcs" ;;
-    esac
-    case " $CFLAGS " in
-    *\ \	-ftest-coverage\ \	*) ;;
-    *) CFLAGS="$CFLAGS -ftest-coverage" ;;
-    esac
-
-    ## remove optimization
-    CFLAGS=`echo "$CFLAGS" | sed -e 's/-O0-9*//g'`
-  fi
-  changequote(,)dnl
-else
-  if test x$enable_gcov = xyes; then
-    AC_MSG_ERROR(--enable-gcov can only be used with gcc)
-  fi
-fi
-
-changequote(,)dnl
-# compress spaces in flags
-CFLAGS=`echo "$CFLAGS" | sed -e 's/ +/ /g'`
-CPPFLAGS=`echo "$CPPFLAGS" | sed -e 's/ +/ /g'`
-changequote(,)dnl
-
-PKG_CHECK_MODULES(DESKTOP_FILE_UTILS, glib-2.0 >= 2.8.0)
-
-AM_PATH_LISPDIR
-
-AC_CONFIG_FILES(
-Makefile
-man/Makefile
-misc/Makefile
-src/Makefile
-)
-
-AC_OUTPUT

_service:tar_scm:desktop-file-utils-0.26.tar.xz/git.mk Deleted

@@ -1,206 +0,0 @@
-# git.mk
-#
-# Copyright 2009, Red Hat, Inc.
-# Copyright 2010,2011 Behdad Esfahbod
-# Written by Behdad Esfahbod
-#
-# Copying and distribution of this file, with or without modification,
-# are permitted in any medium without royalty provided the copyright
-# notice and this notice are preserved.
-#
-# The canonical source for this file is https://github.com/behdad/git.mk.
-#
-# To use in your project, import this file in your git repo's toplevel,
-# then do "make -f git.mk".  This modifies all Makefile.am files in
-# your project to -include git.mk.  Remember to add that line to new
-# Makefile.am files you create in your project, or just rerun the
-# "make -f git.mk".
-#
-# This enables automatic .gitignore generation.  If you need to ignore
-# more files, add them to the GITIGNOREFILES variable in your Makefile.am.
-# But think twice before doing that.  If a file has to be in .gitignore,
-# chances are very high that it's a generated file and should be in one
-# of MOSTLYCLEANFILES, CLEANFILES, DISTCLEANFILES, or MAINTAINERCLEANFILES.
-#
-# The only case that you need to manually add a file to GITIGNOREFILES is
-# when remove files in one of mostlyclean-local, clean-local, distclean-local,
-# or maintainer-clean-local make targets.
-#
-# Note that for files like editor backup, etc, there are better places to
-# ignore them.  See "man gitignore".
-#
-# If "make maintainer-clean" removes the files but they are not recognized
-# by this script (that is, if "git status" shows untracked files still), send
-# me the output of "git status" as well as your Makefile.am and Makefile for
-# the directories involved and I'll diagnose.
-#
-# For a list of toplevel files that should be in MAINTAINERCLEANFILES, see
-# Makefile.am.sample in the git.mk git repo.
-#
-# Don't EXTRA_DIST this file.  It is supposed to only live in git clones,
-# not tarballs.  It serves no useful purpose in tarballs and clutters the
-# build dir.
-#
-# This file knows how to handle autoconf, automake, libtool, gtk-doc,
-# gnome-doc-utils, yelp.m4, mallard, intltool, gsettings.
-#
-#
-# KNOWN ISSUES:
-#
-# - Recursive configure doesn't work as $(top_srcdir)/git.mk inside the
-#   submodule doesn't find us.  If you have configure.{in,ac} files in
-#   subdirs, add a proxy git.mk file in those dirs that simply does:
-#   "include $(top_srcdir)/../git.mk".  Add more ..'s to your taste.
-#   And add those files to git.  See vte/gnome-pty-helper/git.mk for
-#   example.
-#
-
-git-all: git-mk-install
-
-git-mk-install:
-	@echo Installing git makefile
-	@any_failed=; \
-		find "`test -z "$(top_srcdir)" && echo . || echo "$(top_srcdir)"`" -name Makefile.am | while read x; do \
-		if grep 'include .*/git.mk' $$x >/dev/null; then \
-			echo $$x already includes git.mk; \
-		else \
-			failed=; \
-			echo "Updating $$x"; \
-			{ cat $$x; \
-			  echo ''; \
-			  echo '-include $$(top_srcdir)/git.mk'; \
-			} > $$x.tmp || failed=1; \
-			if test x$$failed = x; then \
-				mv $$x.tmp $$x || failed=1; \
-			fi; \
-			if test x$$failed = x; then : else \
-				echo Failed updating $$x; >&2 \
-				any_failed=1; \
-			fi; \
-	fi; done; test -z "$$any_failed"
-
-.PHONY: git-all git-mk-install
-
-
-### .gitignore generation
-
-$(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
-	$(AM_V_GEN) \
-	{ \
-		if test "x$(DOC_MODULE)" = x -o "x$(DOC_MAIN_SGML_FILE)" = x; then :; else \
-			for x in \
-				$(DOC_MODULE)-decl-list.txt \
-				$(DOC_MODULE)-decl.txt \
-				tmpl/$(DOC_MODULE)-unused.sgml \
-				"tmpl/*.bak" \
-				xml html \
-			; do echo /$$x; done; \
-		fi; \
-		if test "x$(DOC_MODULE)$(DOC_ID)" = x -o "x$(DOC_LINGUAS)" = x; then :; else \
-			for x in \
-				$(_DOC_C_DOCS) \
-				$(_DOC_LC_DOCS) \
-				$(_DOC_OMF_ALL) \
-				$(_DOC_DSK_ALL) \
-				$(_DOC_HTML_ALL) \
-				$(_DOC_MOFILES) \
-				$(_DOC_POFILES) \
-				$(DOC_H_FILE) \
-				"*/.xml2po.mo" \
-				"*/*.omf.out" \
-			; do echo /$$x; done; \
-		fi; \
-		if test "x$(HELP_ID)" = x -o "x$(HELP_LINGUAS)" = x; then :; else \
-			for x in \
-				$(_HELP_LC_FILES) \
-				$(_HELP_LC_STAMPS) \
-				$(_HELP_MOFILES) \
-			; do echo /$$x; done; \
-		fi; \
-		if test "x$(gsettings_SCHEMAS)" = x; then :; else \
-			for x in \
-				$(gsettings_SCHEMAS:.xml=.valid) \
-				$(gsettings__enum_file) \
-			; do echo /$$x; done; \
-		fi; \
-		if test -f $(srcdir)/po/Makefile.in.in; then \
-			for x in \
-				po/Makefile.in.in \
-				po/Makefile.in \
-				po/Makefile \
-				po/POTFILES \
-				po/stamp-it \
-				po/.intltool-merge-cache \
-				"po/*.gmo" \
-				"po/*.mo" \
-				po/$(GETTEXT_PACKAGE).pot \
-				intltool-extract.in \
-				intltool-merge.in \
-				intltool-update.in \
-			; do echo /$$x; done; \
-		fi; \
-		if test -f $(srcdir)/configure; then \
-			for x in \
-				autom4te.cache \
-				configure \
-				config.h \
-				stamp-h1 \
-				libtool \
-				config.lt \
-			; do echo /$$x; done; \
-		fi; \
-		for x in \
-			.gitignore \
-			$(GITIGNOREFILES) \
-			$(CLEANFILES) \
-			$(PROGRAMS) \
-			$(check_PROGRAMS) \
-			$(EXTRA_PROGRAMS) \
-			$(LTLIBRARIES) \
-			so_locations \
-			.libs _libs \
-			$(MOSTLYCLEANFILES) \
-			"*.$(OBJEXT)" \
-			"*.lo" \
-			$(DISTCLEANFILES) \
-			$(am__CONFIG_DISTCLEAN_FILES) \
-			$(CONFIG_CLEAN_FILES) \
-			TAGS ID GTAGS GRTAGS GSYMS GPATH tags \
-			"*.tab.c" \
-			$(MAINTAINERCLEANFILES) \
-			$(BUILT_SOURCES) \
-			$(DEPDIR) \
-			Makefile \
-			Makefile.in \
-			"*.orig" \
-			"*.rej" \
-			"*.bak" \
-			"*~" \
-			".*.swnop" \
-			".dirstamp" \
-		; do echo /$$x; done; \
-	} | \
-	sed "s@^/`echo "$(srcdir)" | sed 's/$.$/\1/g'`/@/@" | \
-	sed 's@/./@/@g' | \
-	LC_ALL=C sort | uniq > $@.tmp && \
-	mv $@.tmp $@;
-
-all: $(srcdir)/.gitignore gitignore-recurse-maybe
-gitignore-recurse-maybe:
-	@if test "x$(SUBDIRS)" = "x$(DIST_SUBDIRS)"; then :; else \
-		$(MAKE) $(AM_MAKEFLAGS) gitignore-recurse; \
-	fi;
-gitignore-recurse:
-	@for subdir in $(DIST_SUBDIRS); do \
-	  case " $(SUBDIRS) " in \
-	    *" $$subdir "*) :;; \
-	    *) test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) .gitignore gitignore-recurse || echo "Skipping $$subdir");; \
-	  esac; \
-	done

_service:tar_scm:desktop-file-utils-0.26.tar.xz/man/Makefile.am Deleted

_service:tar_scm:desktop-file-utils-0.26.tar.xz/misc/Makefile.am Deleted

_service:tar_scm:desktop-file-utils-0.26.tar.xz/src/Makefile.am Deleted

@@ -1,48 +0,0 @@
-bin_PROGRAMS =					\
-	desktop-file-validate			\
-	desktop-file-install			\
-	update-desktop-database
-
-AM_CPPFLAGS =					\
-	$(DESKTOP_FILE_UTILS_CFLAGS)		\
-	-DDATADIR="\"$(datadir)\"" 		\
-	-D_FILE_OFFSET_BITS=64			\
-	-D_LARGEFILE64_SOURCE
-
-desktop_file_validate_SOURCES =			\
-	keyfileutils.c				\
-	keyfileutils.h				\
-	mimeutils.c				\
-	mimeutils.h				\
-	validate.c				\
-	validate.h				\
-	validator.c
-
-desktop_file_install_SOURCES =			\
-	keyfileutils.c				\
-	keyfileutils.h				\
-	mimeutils.c				\
-	mimeutils.h				\
-	validate.c				\
-	validate.h				\
-	install.c
-
-update_desktop_database_SOURCES =		\
-	mimeutils.c				\
-	mimeutils.h				\
-	update-desktop-database.c
-
-desktop_file_validate_LDADD = $(DESKTOP_FILE_UTILS_LIBS)
-desktop_file_install_LDADD = $(DESKTOP_FILE_UTILS_LIBS)
-update_desktop_database_LDADD = $(DESKTOP_FILE_UTILS_LIBS)
-
-install-exec-hook: desktop-file-install
-	cd $(DESTDIR)$(bindir) && \
-	rm -f desktop-file-edit && \
-	$(LN_S) -f desktop-file-install desktop-file-edit
-
-uninstall-hook:
-	cd $(DESTDIR)$(bindir) && \
-	rm -f desktop-file-edit
-
--include $(top_srcdir)/git.mk

_service:tar_scm:desktop-file-utils-0.27.tar.xz/.gitlab-ci.yml Added

_service:tar_scm:desktop-file-utils-0.26.tar.xz/ChangeLog -> _service:tar_scm:desktop-file-utils-0.27.tar.xz/ChangeLog Changed

@@ -1,3 +1,168 @@
+commit 2470d73f93d02b354ecbee7c2f02a83efaae84d8
+Author: Hans Petter Jansson <hpj@hpjansson.org>
+Date:   Thu Oct 5 17:07:13 2023 +0200
+
+    Release: 0.27
+
+M	NEWS
+
+commit dda9978b46b4fbbc1f341ec77bb3a8d3fdcb6356
+Author: Hans Petter Jansson <hpj@hpjansson.org>
+Date:   Thu Oct 5 16:26:47 2023 +0200
+
+    docs: Remove Autotools info from README and update stale links
+
+M	README
+
+commit 115d62a1684deeb69fa1f4816e8c16af1c91286f
+Author: Hans Petter Jansson <hpj@hpjansson.org>
+Date:   Thu Oct 5 16:00:57 2023 +0200
+
+    docs: Bring HACKING notes into the Gitlab era
+
+M	HACKING
+
+commit b226bf5ea18de6ea6c61eb06fec93edfe0cbc85e
+Author: Hans Petter Jansson <hpj@hpjansson.org>
+Date:   Thu Oct 5 15:55:47 2023 +0200
+
+    validate: Properly escape field codes in messages
+    
+    Fixes #71.
+
+M	src/validate.c
+
+commit ec04c7df45d2974103108813549502e322ae7c7c
+Author: Hans Petter Jansson <hpj@hpjansson.org>
+Date:   Thu Oct 5 15:53:01 2023 +0200
+
+    validate: Add G_GNUC_PRINTF() to verify message formatting
+
+M	src/validate.c
+
+commit 48167c9de89477a9898fce237ce3abf382abb1b4
+Author: Hans Petter Jansson <hpj@hpjansson.org>
+Date:   Thu Oct 5 15:20:54 2023 +0200
+
+    Remove Autotools build files - support only Meson from now on
+
+D	Makefile.am
+D	autogen.sh
+D	configure.ac
+D	git.mk
+D	man/Makefile.am
+D	misc/Makefile.am
+D	src/Makefile.am
+
+commit 679cb6f7d46896167ec105e0713401bfaca23516
+Author: Philip Withnall <philip@tecnocode.co.uk>
+Date:   Tue Sep 12 10:30:51 2023 +0100
+
+    validate: Add Endless to the list of valid desktop IDs
+    
+    See https://gitlab.freedesktop.org/xdg/xdg-specs/-/merge_requests/73 and
+    https://github.com/ximion/appstream/pull/522.
+    
+    Signed-off-by: Philip Withnall <philip@tecnocode.co.uk>
+
+M	src/validate.c
+
+commit 8c83300b5f81338696765f1184a82283da25265b
+Author: Wang Zichong <wangzichong@deepin.org>
+Date:   Tue May 23 14:46:09 2023 +0800
+
+    validate: add DDE as a category
+    
+    Related: https://gitlab.freedesktop.org/xdg/xdg-specs/-/merge_requests/68
+
+M	src/validate.c
+
+commit 5c11578cb590cf45b2e3c094d04ca381cb054a19
+Author: Wang Zichong <wangzichong@deepin.org>
+Date:   Tue Mar 21 13:43:31 2023 +0800
+
+    validate: use DDE for deepin desktop
+    
+    Since DDE (and its distro 'deepin') v23 beta, 'DDE' will be used
+    instead of 'Deepin', so we just also update the name here.
+    
+    Related links:
+    
+    - https://gitlab.freedesktop.org/xdg/xdg-specs/-/merge_requests/69
+    - https://www.freelists.org/post/deepin-devel/xdgspec-DDE
+    - https://github.com/linuxdeepin/developer-center/issues/3829
+
+M	src/validate.c
+
+commit e966d55382e34609a6ab6b9a4200eb5a9dcf05fa
+Author: JakobDev <jakobdev@gmx.de>
+Date:   Tue Jan 10 11:41:28 2023 +0000
+
+    Add --version
+
+M	src/install.c
+M	src/update-desktop-database.c
+M	src/validator.c
+
+commit 8818dac847ce50794d8fd03659d3c93d8310adbc
+Author: rezso <rezso@rezso.net>
+Date:   Sat Jun 25 23:01:09 2022 +0000
+
+    Add LXQt to registered categories. LXQt requires it.
+
+M	src/validate.c
+
+commit 56d220dd679c7c3a8f995a41a27a7d6f3df49dea
+Author: David King <amigadave@amigadave.com>
+Date:   Tue Feb 15 10:56:04 2022 +0000
+
+    validate: Support version 1.5
+    
+    Bump CURRENT_SPEC_VERSION to 1.5.
+
+M	man/desktop-file-validate.1
+M	src/validate.c
+M	src/validate.h
+
+commit 425177a28b6215e0745f95100160a08e810fd47c
+Author: David King <amigadave@amigadave.com>
+Date:   Tue Feb 15 10:54:40 2022 +0000
+
+    validate: support SingleMainWindow key from 1.5
+    
+    Fixes https://gitlab.freedesktop.org/xdg/desktop-file-utils/-/issues/59
+
+M	src/validate.c
+
+commit 4d56ab25fd045297912d783280a55a15dcbd95e8
+Author: Peter Oliver <git@mavit.org.uk>
+Date:   Tue May 25 21:35:38 2021 +0100
+
+    desktop-entry-mode.el: highlight action groups when id includes hyphens
+    
+    Hypens are legal characters in identifiers.
+
+M	misc/desktop-entry-mode.el
+
+commit 1926ae7021a2f8e842ad566a49f3a947c02cec92
+Author: Antoine Jacoutot <ajacoutot@gnome.org>
+Date:   Fri Jun 19 10:12:04 2020 +0200
+
+    pledge: add support to remaining utilities
+
+M	src/install.c
+M	src/update-desktop-database.c
+M	src/validator.c
+
+commit 02e13daa5a6a532181b66c8a197930b6f0171909
+Author: Hans Petter Jansson <hpj@cl.no>
+Date:   Fri Jun 19 14:25:04 2020 +0200
+
+    Post-release version bump to 0.27
+
+M	configure.ac
+M	meson.build
+
 commit 54cec012921e52eb66b6ee1a1f40f2e9c9849f7c
 Author: Hans Petter Jansson <hpj@cl.no>
 Date:   Fri Jun 19 14:22:26 2020 +0200

_service:tar_scm:desktop-file-utils-0.26.tar.xz/HACKING -> _service:tar_scm:desktop-file-utils-0.27.tar.xz/HACKING Changed

@@ -1,22 +1,19 @@
 Hacking on desktop-file-utils
 =============================
 
- + The development occurs in git:
+ + The development occurs in Gitlab:
 
-     http://cgit.freedesktop.org/desktop-file-utils/
+     https://gitlab.freedesktop.org/xdg/desktop-file-utils/
 
    For information on how to access freedesktop.org git please read:
 
-     http://www.freedesktop.org/wiki/Infrastructure/git
+     https://www.freedesktop.org/wiki/Infrastructure/git
 
- + Please send patches as bug reports in freedesktop.org Bugzilla:
+ + Please submit any changes using merge requests in Gitlab.
 
-     https://bugs.freedesktop.org/ (product desktop-file-utils)
-
-   Your patch should be in unified diff form (the -u option to GNU
-   diff). See also:
-
-     http://live.gnome.org/GnomeLove/SubmittingPatches
+   If you prefer to submit patches, you can do so by creating a new issue
+   and attaching the patch. It should be in unified diff form (the -u option
+   to GNU diff).
 
  + Please try and send a patch against a recent version of this package.
    Patches against git master are most preferable.

_service:tar_scm:desktop-file-utils-0.26.tar.xz/NEWS -> _service:tar_scm:desktop-file-utils-0.27.tar.xz/NEWS Changed

_service:tar_scm:desktop-file-utils-0.26.tar.xz/README -> _service:tar_scm:desktop-file-utils-0.27.tar.xz/README Changed

@@ -1,7 +1,7 @@
 desktop-file-utils
 ==================
 
-http://www.freedesktop.org/wiki/Software/desktop-file-utils
+https://www.freedesktop.org/wiki/Software/desktop-file-utils
 
 desktop-file-utils contains a few command line utilities for working
 with desktop entries.
@@ -18,16 +18,16 @@
 More information about desktop files and the "Desktop Entry
 Specification" is available on:
 
-  http://freedesktop.org/wiki/Specifications/desktop-entry-spec
-  http://specifications.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html
+  https://freedesktop.org/wiki/Specifications/desktop-entry-spec
+  https://specifications.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html
 
 You may download updates to the package from:
 
-   http://www.freedesktop.org/software/desktop-file-utils/releases/
+  https://www.freedesktop.org/software/desktop-file-utils/releases/
 
 To discuss desktop-file-utils, you may use the xdg mailing list:
 
-  http://lists.freedesktop.org/mailman/listinfo/xdg
+  https://lists.freedesktop.org/mailman/listinfo/xdg
 
 
 Installation
@@ -39,25 +39,15 @@
   ninja -C _build
   sudo ninja -C _build install
 
-Using Autotools (deprecated):
-
-  ./autogen.sh
-  make
-  sudo make install
-
 
 How to report bugs
 ==================
 
 Bugs should be reported to the freedesktop.org bug tracking system:
 
-   https://bugs.freedesktop.org/ (product desktop-file-utils)
+   https://gitlab.freedesktop.org/xdg/desktop-file-utils/-/issues/new
 
 You will need to create an account for yourself.
 
-Please read the following page on how to prepare a useful bug report:
-
-   https://bugs.freedesktop.org/page.cgi?id=bug-writing.html
-
 Please read the HACKING file for information on where to send changes or
 bugfixes for this package.

_service:tar_scm:desktop-file-utils-0.26.tar.xz/man/desktop-file-validate.1 -> _service:tar_scm:desktop-file-utils-0.27.tar.xz/man/desktop-file-validate.1 Changed

_service:tar_scm:desktop-file-utils-0.26.tar.xz/meson.build -> _service:tar_scm:desktop-file-utils-0.27.tar.xz/meson.build Changed

_service:tar_scm:desktop-file-utils-0.26.tar.xz/misc/desktop-entry-mode.el -> _service:tar_scm:desktop-file-utils-0.27.tar.xz/misc/desktop-entry-mode.el Changed

_service:tar_scm:desktop-file-utils-0.26.tar.xz/src/install.c -> _service:tar_scm:desktop-file-utils-0.27.tar.xz/src/install.c Changed

@@ -43,6 +43,7 @@
 static const char** args = NULL;
 static gboolean delete_original = FALSE;
 static gboolean rebuild_mime_info_cache = FALSE;
+static gboolean print_version = FALSE;
 static char *vendor_name = NULL;
 static char *target_dir = NULL;
 static GSList *edit_actions = NULL;
@@ -319,6 +320,15 @@
     NULL
   },
   {
+    "version",
+    '\0',
+    '\0',
+    G_OPTION_ARG_NONE,
+    &print_version,
+    N_("Show the program version"),
+    NULL
+  },
+  {
     "edit-mode",
     '\0',
     G_OPTION_FLAG_HIDDEN, /* just for development purpose */
@@ -837,6 +847,13 @@
   mode_t dir_permissions;
   char *basename;
 
+#ifdef HAVE_PLEDGE
+  if (pledge ("stdio rpath wpath cpath fattr", NULL) == -1) {
+    g_printerr ("pledge\n");
+    return 1;
+  }
+#endif
+
   setlocale (LC_ALL, "");
 
   basename = g_path_get_basename (argv0);
@@ -854,6 +871,16 @@
       g_option_group_add_entries (group, install_options);
       g_option_context_add_group (context, group);
     }
+#ifdef HAVE_PLEDGE
+  else
+    {
+      /* In edit mode we can drop the fattr pledge. */
+      if (pledge ("stdio rpath wpath cpath", NULL) == -1) {
+        g_printerr ("pledge in edit_mode\n");
+        return 1;
+      }
+    }
+#endif
 
   group = g_option_group_new ("edit", _("Edition options for desktop file"), _("Show desktop file edition options"), NULL, NULL);
   g_option_group_add_entries (group, edit_options);
@@ -870,6 +897,11 @@
     return 1;
   }
 
+  if (print_version) {
+    g_print("desktop-file-install %s\n", VERSION);
+    return 0;
+  }
+
   if (!edit_mode)
     {
       if (vendor_name == NULL && g_getenv ("DESKTOP_FILE_VENDOR"))

_service:tar_scm:desktop-file-utils-0.26.tar.xz/src/update-desktop-database.c -> _service:tar_scm:desktop-file-utils-0.27.tar.xz/src/update-desktop-database.c Changed

@@ -65,7 +65,7 @@
 static void print_desktop_dirs (const char **dirs);
 
 static GHashTable *mime_types_map = NULL;
-static gboolean verbose = FALSE, quiet = FALSE;
+static gboolean verbose = FALSE, quiet = FALSE, print_version = FALSE;
 
 static void
 list_free_deep (gpointer key, GList *l, gpointer data)
@@ -446,13 +446,17 @@
        N_("Display more information about processing and updating progress"),
        NULL},
 
+     { "version", 0, 0, G_OPTION_ARG_NONE, &print_version,
+       N_("Show the program version"),
+       NULL},
+
      { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &desktop_dirs,
        NULL, N_("DIRECTORY...") },
      { NULL }
    };
 
-#if HAVE_PLEDGE
-  if (pledge("stdio rpath wpath cpath fattr", NULL) == -1) {
+#ifdef HAVE_PLEDGE
+  if (pledge ("stdio rpath wpath cpath fattr", NULL) == -1) {
     g_printerr ("pledge\n");
     return 1;
   }
@@ -473,6 +477,11 @@
     return 1;
   }
 
+  if (print_version) {
+    g_print("update-desktop-database %s\n", VERSION);
+    return 0;
+  }
+
   if (desktop_dirs == NULL || desktop_dirs0 == NULL)
     desktop_dirs = get_default_search_path ();

_service:tar_scm:desktop-file-utils-0.26.tar.xz/src/validate.c -> _service:tar_scm:desktop-file-utils-0.27.tar.xz/src/validate.c Changed

@@ -326,6 +326,9 @@
   /* Since 1.4 */
   { DESKTOP_BOOLEAN_TYPE,           "PrefersNonDefaultGPU", FALSE, FALSE, FALSE, NULL },
 
+  /* Since 1.5 */
+  { DESKTOP_BOOLEAN_TYPE,           "SingleMainWindow", FALSE, FALSE, FALSE, NULL },
+
   /* Keys reserved for KDE */
 
   /* since 0.9.4 */
@@ -377,7 +380,7 @@
 
 /* This should be the same list as in xdg-specs/menu/menu-spec.xml */
 static const char *show_in_registered = {
-    "GNOME", "GNOME-Classic", "GNOME-Flashback", "KDE", "LXDE", "LXQt", "MATE", "Razor", "ROX", "TDE", "Unity", "XFCE", "EDE", "Cinnamon", "Pantheon", "Budgie", "Enlightenment", "Deepin", "Old"
+    "GNOME", "GNOME-Classic", "GNOME-Flashback", "KDE", "LXDE", "LXQt", "MATE", "Razor", "ROX", "TDE", "Unity", "XFCE", "EDE", "Cinnamon", "Pantheon", "Budgie", "Enlightenment", "DDE", "Endless", "Old"
 };
 
 static struct {
@@ -534,6 +537,8 @@
   { "KDE",                    FALSE, FALSE, FALSE, { NULL }, { "Qt", NULL } },
   { "GNOME",                  FALSE, FALSE, FALSE, { NULL }, { "GTK", NULL } },
   { "XFCE",                   FALSE, FALSE, FALSE, { NULL }, { "GTK", NULL } },
+  { "DDE",                    FALSE, FALSE, FALSE, { NULL }, { "Qt", NULL } },
+  { "LXQt",                   FALSE, FALSE, FALSE, { NULL }, { "Qt", NULL } },
   { "GTK",                    FALSE, FALSE, FALSE, { NULL }, { NULL } },
   { "Qt",                     FALSE, FALSE, FALSE, { NULL }, { NULL } },
   { "Motif",                  FALSE, FALSE, FALSE, { NULL }, { NULL } },
@@ -561,7 +566,7 @@
 #define WARNING_COLOR      (kf->use_colors ? MAGENTA : "")
 #define HINT_COLOR         (kf->use_colors ? YELLOW : "")
 
-static void
+G_GNUC_PRINTF (2, 3) static void
 print_fatal (kf_validator *kf, const char *format, ...)
 {
   va_list args;
@@ -582,7 +587,7 @@
   g_free (str);
 }
 
-static void
+G_GNUC_PRINTF (2, 3) static void
 print_future_fatal (kf_validator *kf, const char *format, ...)
 {
   va_list args;
@@ -601,7 +606,7 @@
   g_free (str);
 }
 
-static void
+G_GNUC_PRINTF (2, 3) static void
 print_warning (kf_validator *kf, const char *format, ...)
 {
   va_list args;
@@ -620,7 +625,7 @@
   g_free (str);
 }
 
-static void
+G_GNUC_PRINTF (2, 3) static void
 print_hint (kf_validator *kf, const char *format, ...)
 {
   va_list args;
@@ -958,6 +963,9 @@
                     const char   *locale_key,
                     const char   *value)
 {
+  if (!strcmp (value, "1.5"))
+    return TRUE;
+
   if (!strcmp (value, "1.4"))
     return TRUE;
 
@@ -1325,8 +1333,8 @@
         if (flag) {
           if (file_uri) {
             print_fatal (kf, "value \"%s\" for key \"%s\" in group \"%s\" "
-                             "may contain at most one \"%f\", \"%u\", "
-                             "\"%F\" or \"%U\" field code\n",
+                             "may contain at most one \"%%f\", \"%%u\", "
+                             "\"%%F\" or \"%%U\" field code\n",
                              value, locale_key, kf->current_group);
             retval = FALSE;
           }
@@ -1340,8 +1348,8 @@
         if (flag) {
           if (file_uri) {
             print_fatal (kf, "value \"%s\" for key \"%s\" in group \"%s\" "
-                             "may contain at most one \"%f\", \"%u\", "
-                             "\"%F\" or \"%U\" field code\n",
+                             "may contain at most one \"%%f\", \"%%u\", "
+                             "\"%%F\" or \"%%U\" field code\n",
                              value, locale_key, kf->current_group);
             retval = FALSE;
           }

_service:tar_scm:desktop-file-utils-0.26.tar.xz/src/validate.h -> _service:tar_scm:desktop-file-utils-0.27.tar.xz/src/validate.h Changed

_service:tar_scm:desktop-file-utils-0.26.tar.xz/src/validator.c -> _service:tar_scm:desktop-file-utils-0.27.tar.xz/src/validator.c Changed

@@ -26,19 +26,26 @@
  * USA.
  */
 
+#include <config.h>
 #include <locale.h>
 
+#ifdef HAVE_PLEDGE
+#include <unistd.h>
+#endif
+
 #include "validate.h"
 
 static gboolean   warn_kde = FALSE;
 static gboolean   no_hints = FALSE;
 static gboolean   no_warn_deprecated = FALSE;
+static gboolean   print_version = FALSE;
 static char     **filename = NULL;
 
 static GOptionEntry option_entries = {
   { "no-hints", 0, 0, G_OPTION_ARG_NONE, &no_hints, "Do not output hints to improve desktop file", NULL },
   { "no-warn-deprecated", 0, 0, G_OPTION_ARG_NONE, &no_warn_deprecated, "Do not warn about usage of deprecated items", NULL },
   { "warn-kde", 0, 0, G_OPTION_ARG_NONE, &warn_kde, "Warn if KDE extensions to the specification are used", NULL },
+  { "version", 0, 0, G_OPTION_ARG_NONE, &print_version, "Show the program version", NULL },
   { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &filename, NULL, "<desktop-file>..." },
   { NULL }
 };
@@ -51,6 +58,13 @@
   int i;
   gboolean all_valid;
 
+#ifdef HAVE_PLEDGE
+  if (pledge ("stdio rpath", NULL) == -1) {
+    g_printerr ("pledge\n");
+    return 1;
+  }
+#endif
+
   setlocale (LC_ALL, "");
 
   context = g_option_context_new (NULL);
@@ -72,6 +86,11 @@
 
   g_option_context_free (context);
 
+  if (print_version) {
+    g_print("desktop-file-validate %s\n", VERSION);
+    return 0;
+  }
+
   if (filename == NULL || filename0 == NULL) {
     g_printerr ("See \"%s --help\" for correct usage.\n", g_get_prgname ());
     return 1;

Changes of Revision 3