summaryrefslogtreecommitdiff
path: root/source/l/desktop-file-utils
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2018-05-28 19:12:29 +0000
committerEric Hameleers <alien@slackware.com>2018-05-31 23:39:35 +0200
commit646a5c1cbfd95873950a87b5f75d52073a967023 (patch)
treeb8b8d2ab3b0d432ea69ad1a64d1c789649d65020 /source/l/desktop-file-utils
parentd31c50870d0bee042ce660e445c9294a59a3a65b (diff)
downloadcurrent-646a5c1cbfd95873950a87b5f75d52073a967023.tar.gz
Mon May 28 19:12:29 UTC 201820180528191229
a/pkgtools-15.0-noarch-13.txz: Rebuilt. installpkg: default line length for --terselength is the number of columns. removepkg: added --terse mode. upgradepkg: default line length for --terselength is the number of columns. upgradepkg: accept -option in addition to --option. ap/vim-8.1.0026-x86_64-1.txz: Upgraded. d/bison-3.0.5-x86_64-1.txz: Upgraded. e/emacs-26.1-x86_64-1.txz: Upgraded. kde/kopete-4.14.3-x86_64-8.txz: Rebuilt. Recompiled against libidn-1.35. n/conntrack-tools-1.4.5-x86_64-1.txz: Upgraded. n/libnetfilter_conntrack-1.0.7-x86_64-1.txz: Upgraded. n/libnftnl-1.1.0-x86_64-1.txz: Upgraded. n/links-2.16-x86_64-2.txz: Rebuilt. Rebuilt to enable X driver for -g mode. n/lynx-2.8.9dev.19-x86_64-1.txz: Upgraded. n/nftables-0.8.5-x86_64-1.txz: Upgraded. n/p11-kit-0.23.11-x86_64-1.txz: Upgraded. n/ulogd-2.0.7-x86_64-1.txz: Upgraded. n/whois-5.3.1-x86_64-1.txz: Upgraded. xap/network-manager-applet-1.8.12-x86_64-1.txz: Upgraded. xap/vim-gvim-8.1.0026-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/l/desktop-file-utils')
-rwxr-xr-xsource/l/desktop-file-utils/desktop-file-utils.SlackBuild26
-rw-r--r--source/l/desktop-file-utils/gitpatches/0001-desktop-file-validate-Trailing-semicolons-have-been-.patch177
-rw-r--r--source/l/desktop-file-utils/gitpatches/0002-Add-Cinnamon-to-list-of-registered-environments.patch28
-rw-r--r--source/l/desktop-file-utils/gitpatches/0003-Add-EDE-to-the-list-of-desktop-environments.patch26
-rw-r--r--source/l/desktop-file-utils/slack-desc18
5 files changed, 24 insertions, 251 deletions
diff --git a/source/l/desktop-file-utils/desktop-file-utils.SlackBuild b/source/l/desktop-file-utils/desktop-file-utils.SlackBuild
index 12804bb4..f9af84aa 100755
--- a/source/l/desktop-file-utils/desktop-file-utils.SlackBuild
+++ b/source/l/desktop-file-utils/desktop-file-utils.SlackBuild
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/bash
-# Copyright 2006, 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2008, 2009, 2010, 2018 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -20,29 +20,37 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=desktop-file-utils
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
NUMJOBS=${NUMJOBS:-" -j7 "}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) export ARCH=i486 ;;
+ i?86) export ARCH=i586 ;;
arm*) export ARCH=arm ;;
# Unless $ARCH is already set, use uname -m for all other archs:
*) export ARCH=$( uname -m ) ;;
esac
fi
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+ exit 0
+fi
+
TMP=${TMP:-/tmp}
PKG=$TMP/package-${PKGNAM}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
elif [ "$ARCH" = "s390" ]; then
SLKCFLAGS="-O2"
elif [ "$ARCH" = "x86_64" ]; then
@@ -60,10 +68,6 @@ cd ${PKGNAM}-$VERSION || exit 1
zcat $CWD/desktop-file-utils.quiet.warnings.diff.gz | patch -p1 --verbose || exit 1
-patch -p1 < $CWD/gitpatches/0001-desktop-file-validate-Trailing-semicolons-have-been-.patch || exit 1
-patch -p1 < $CWD/gitpatches/0002-Add-Cinnamon-to-list-of-registered-environments.patch || exit 1
-patch -p1 < $CWD/gitpatches/0003-Add-EDE-to-the-list-of-desktop-environments.patch || exit 1
-
# Make sure ownerships and permissions are sane:
chown -R root:root .
find . \
diff --git a/source/l/desktop-file-utils/gitpatches/0001-desktop-file-validate-Trailing-semicolons-have-been-.patch b/source/l/desktop-file-utils/gitpatches/0001-desktop-file-validate-Trailing-semicolons-have-been-.patch
deleted file mode 100644
index e3be90d9..00000000
--- a/source/l/desktop-file-utils/gitpatches/0001-desktop-file-validate-Trailing-semicolons-have-been-.patch
+++ /dev/null
@@ -1,177 +0,0 @@
-From 9e279cc3fac9a7e92bf426867fa83c0c7aec5711 Mon Sep 17 00:00:00 2001
-From: Jerome Leclanche <jerome@leclan.ch>
-Date: Tue, 1 Apr 2014 15:33:16 +0200
-Subject: [PATCH 1/3] desktop-file-validate: Trailing semicolons have been
- downgraded to optional
-
-https://bugs.freedesktop.org/show_bug.cgi?id=76902
-Approved by David Faure and Ryan Lortie
----
- src/validate.c | 105 ---------------------------------------------------------
- 1 file changed, 105 deletions(-)
-
-diff --git a/src/validate.c b/src/validate.c
-index 68fd6f0..77a5fda 100644
---- a/src/validate.c
-+++ b/src/validate.c
-@@ -765,9 +765,6 @@ validate_numeric_key (kf_validator *kf,
- /* + Values of type string may contain all ASCII characters except for control
- * characters.
- * Checked.
-- * + The multiple values should be separated by a semicolon. Those keys which
-- * have several values should have a semicolon as the trailing character.
-- * Checked.
- * + FIXME: how should an empty list be handled?
- */
- static gboolean
-@@ -799,24 +796,6 @@ validate_string_regexp_list_key (kf_validator *kf,
- return FALSE;
- }
-
-- if (i > 0 && value[i - 1] != ';') {
-- print_fatal (kf, "value \"%s\" for %s list key \"%s\" in group \"%s\" "
-- "does not have a semicolon (';') as trailing "
-- "character\n",
-- value, type, key, kf->current_group);
--
-- return FALSE;
-- }
--
-- if (i > 1 && value[i - 1] == ';' && value[i - 2] == '\\' &&
-- (i < 3 || value[i - 3] != '\\')) {
-- print_fatal (kf, "value \"%s\" for %s list key \"%s\" in group \"%s\" "
-- "has an escaped semicolon (';') as trailing character\n",
-- value, type, key, kf->current_group);
--
-- return FALSE;
-- }
--
- return TRUE;
- }
-
-@@ -845,10 +824,6 @@ validate_regexp_list_key (kf_validator *kf,
- * + If a postfixed key occurs, the same key must be also present without the
- * postfix.
- * Checked.
-- * + The multiple values should be separated by a semicolon. Those keys which
-- * have several values should have a semicolon as the trailing character.
-- * FIXME: partly checked. We use checks that work for sure for ascii
-- * characters, but that could possibly fail in some weird UTF-8 strings.
- * + FIXME: how should an empty list be handled?
- */
- static gboolean
-@@ -858,7 +833,6 @@ validate_localestring_list_key (kf_validator *kf,
- const char *value)
- {
- char *locale_key;
-- int len;
-
- if (locale)
- locale_key = g_strdup_printf ("%s[%s]", key, locale);
-@@ -876,27 +850,6 @@ validate_localestring_list_key (kf_validator *kf,
- return FALSE;
- }
-
-- len = strlen (value);
--
-- if (len > 0 && value[len - 1] != ';') {
-- print_fatal (kf, "value \"%s\" for locale string list key \"%s\" in group "
-- "\"%s\" does not have a semicolon (';') as trailing "
-- "character\n",
-- value, locale_key, kf->current_group);
--
-- return FALSE;
-- }
--
-- if (len > 1 && value[len - 1] == ';' && value[len - 2] == '\\' &&
-- (len < 3 || value[len - 3] != '\\')) {
-- print_fatal (kf, "value \"%s\" for locale string list key \"%s\" in group "
-- "\"%s\" has an escaped semicolon (';') as trailing "
-- "character\n",
-- value, locale_key, kf->current_group);
--
-- return FALSE;
-- }
--
- if (!g_hash_table_lookup (kf->current_keys, key)) {
- print_fatal (kf, "key \"%s\" in group \"%s\" is a localized key, but "
- "there is no non-localized key \"%s\"\n",
-@@ -3109,45 +3062,11 @@ desktop_file_validate (const char *filename,
- return (!kf.fatal_error);
- }
-
--static void
--fixup_list (GKeyFile *keyfile,
-- const gchar *filename,
-- const gchar *key)
--{
-- char *value;
-- int len;
--
-- value = g_key_file_get_value (keyfile, GROUP_DESKTOP_ENTRY, key, NULL);
-- if (!value)
-- return;
--
-- len = strlen (value);
--
-- if (len > 0 && (value[len - 1] != ';' ||
-- (len > 1 && value[len - 2] == '\\' &&
-- (len < 3 || value[len - 3] != '\\')))) {
-- char *str;
--
-- g_printerr ("%s: warning: key \"%s\" is a list and does not have a "
-- "semicolon as trailing character, fixing\n",
-- filename, key);
--
-- str = g_strconcat (value, ";", NULL);
-- g_key_file_set_value (keyfile, GROUP_DESKTOP_ENTRY,
-- key, str);
-- g_free (str);
-- }
--}
--
- /* return FALSE if we were unable to fix the file */
- gboolean
- desktop_file_fixup (GKeyFile *keyfile,
- const char *filename)
- {
-- gchar **keys;
-- gsize keys_nb;
-- unsigned int i;
--
- if (g_key_file_has_group (keyfile, GROUP_KDE_DESKTOP_ENTRY)) {
- g_printerr ("%s: warning: renaming deprecated \"%s\" group to \"%s\"\n",
- filename, GROUP_KDE_DESKTOP_ENTRY, GROUP_DESKTOP_ENTRY);
-@@ -3155,29 +3074,5 @@ desktop_file_fixup (GKeyFile *keyfile,
- GROUP_KDE_DESKTOP_ENTRY, GROUP_DESKTOP_ENTRY);
- }
-
-- keys = g_key_file_get_keys (keyfile, GROUP_DESKTOP_ENTRY, &keys_nb, NULL);
--
-- /* Fix lists to have a ';' at the end if they don't */
-- for (i = 0; i < G_N_ELEMENTS (registered_desktop_keys); i++) {
-- if (registered_desktop_keys[i].type == DESKTOP_STRING_LIST_TYPE ||
-- registered_desktop_keys[i].type == DESKTOP_REGEXP_LIST_TYPE)
-- fixup_list (keyfile, filename, registered_desktop_keys[i].name);
--
-- if (registered_desktop_keys[i].type == DESKTOP_LOCALESTRING_LIST_TYPE) {
-- gsize keylen;
-- guint j;
--
-- keylen = strlen (registered_desktop_keys[i].name);
-- for (j = 0; j < keys_nb; j++) {
-- if (g_str_has_prefix (keys[j], registered_desktop_keys[i].name) &&
-- (keys[j][keylen] == '[' || keys[j][keylen] == '\0')) {
-- fixup_list (keyfile, filename, keys[j]);
-- }
-- }
-- }
-- }
--
-- g_strfreev (keys);
--
- return TRUE;
- }
---
-2.2.0
-
diff --git a/source/l/desktop-file-utils/gitpatches/0002-Add-Cinnamon-to-list-of-registered-environments.patch b/source/l/desktop-file-utils/gitpatches/0002-Add-Cinnamon-to-list-of-registered-environments.patch
deleted file mode 100644
index 132d16a4..00000000
--- a/source/l/desktop-file-utils/gitpatches/0002-Add-Cinnamon-to-list-of-registered-environments.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 848c82b2332d0556c22c10a9c64d1f39850271fe Mon Sep 17 00:00:00 2001
-From: Michael Webster <miketwebster@gmail.com>
-Date: Fri, 7 Mar 2014 20:16:52 -0500
-Subject: [PATCH 2/3] Add Cinnamon to list of registered environments.
-
-https://github.com/linuxmint/Cinnamon
-
-https://bugs.freedesktop.org/show_bug.cgi?id=73497
----
- src/validate.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/validate.c b/src/validate.c
-index 77a5fda..6859c1b 100644
---- a/src/validate.c
-+++ b/src/validate.c
-@@ -363,7 +363,7 @@ static DesktopKeyDefinition registered_action_keys[] = {
- };
-
- static const char *show_in_registered[] = {
-- "GNOME", "KDE", "LXDE", "MATE", "Razor", "ROX", "TDE", "Unity", "XFCE", "Old"
-+ "Cinnamon", "GNOME", "KDE", "LXDE", "MATE", "Razor", "ROX", "TDE", "Unity", "XFCE", "Old"
- };
-
- static struct {
---
-2.2.0
-
diff --git a/source/l/desktop-file-utils/gitpatches/0003-Add-EDE-to-the-list-of-desktop-environments.patch b/source/l/desktop-file-utils/gitpatches/0003-Add-EDE-to-the-list-of-desktop-environments.patch
deleted file mode 100644
index 0f1d70ac..00000000
--- a/source/l/desktop-file-utils/gitpatches/0003-Add-EDE-to-the-list-of-desktop-environments.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From be0c630a19aa1788ef731def911770ce497d6ba3 Mon Sep 17 00:00:00 2001
-From: David Faure <faure@kde.org>
-Date: Tue, 1 Apr 2014 22:29:08 +0200
-Subject: [PATCH 3/3] Add EDE to the list of desktop environments
-
-https://bugs.freedesktop.org/show_bug.cgi?id=56353
----
- src/validate.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/validate.c b/src/validate.c
-index 6859c1b..b4b752e 100644
---- a/src/validate.c
-+++ b/src/validate.c
-@@ -363,7 +363,7 @@ static DesktopKeyDefinition registered_action_keys[] = {
- };
-
- static const char *show_in_registered[] = {
-- "Cinnamon", "GNOME", "KDE", "LXDE", "MATE", "Razor", "ROX", "TDE", "Unity", "XFCE", "Old"
-+ "GNOME", "KDE", "LXDE", "MATE", "Razor", "ROX", "TDE", "Unity", "XFCE", "Cinnamon", "EDE", "Old"
- };
-
- static struct {
---
-2.2.0
-
diff --git a/source/l/desktop-file-utils/slack-desc b/source/l/desktop-file-utils/slack-desc
index 5b92e4dc..e70b268e 100644
--- a/source/l/desktop-file-utils/slack-desc
+++ b/source/l/desktop-file-utils/slack-desc
@@ -1,8 +1,8 @@
# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
+# The "handy ruler" below makes it easier to edit a package description. Line
# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
+# on the right side marks the last column you can put a character in. You must
+# make exactly 11 lines for the formatting to be correct. It's also
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
@@ -10,10 +10,10 @@ desktop-file-utils: desktop-file-utils (Utilities for manipulating desktop files
desktop-file-utils:
desktop-file-utils: Some utilities from freedesktop.org for handling .desktop files:
desktop-file-utils:
-desktop-file-utils: desktop-file-validate: validates a desktop file and prints
-desktop-file-utils: warnings/errors about spec violations.
-desktop-file-utils: desktop-file-install: installs a desktop file to the applications
-desktop-file-utils: directory, optionally munging it a bit in transit.
-desktop-file-utils: desktop-menu-tool: loads .vfolder-info and .menu files and does
-desktop-file-utils: operations on them.
+desktop-file-utils: desktop-file-validate: validates a desktop file and prints
+desktop-file-utils: warnings/errors about spec violations.
+desktop-file-utils: desktop-file-install: installs a desktop file to the applications
+desktop-file-utils: directory, optionally munging it a bit in transit.
+desktop-file-utils: desktop-menu-tool: loads .vfolder-info and .menu files and does
+desktop-file-utils: operations on them.
desktop-file-utils: