rpms/desktop-file-utils
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Remove old, unapplied patches

Browse Source
This commit is contained in:
Michael Catanzaro 2016-07-01 11:53:44 -05:00
parent 5f882bea27
commit d7239f390d
4 changed files with 0 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
desktop-file-utils-0.14-make-icon-extension-non-fatal.patch
View File

@ -1,12 +0,0 @@
diff -up desktop-file-utils-0.14/src/validate.c.make-icon-extension-non-fatal desktop-file-utils-0.14/src/validate.c
--- desktop-file-utils-0.14/src/validate.c.make-icon-extension-non-fatal 2007-12-06 21:52:11.000000000 -0500
+++ desktop-file-utils-0.14/src/validate.c 2007-12-06 21:52:39.000000000 -0500
@@ -737,7 +737,7 @@ handle_icon_key (kf_validator *kf,
if (g_str_has_suffix (value, ".png") ||
g_str_has_suffix (value, ".xpm") ||
g_str_has_suffix (value, ".svg")) {
- print_fatal (kf, "value \"%s\" for key \"%s\" in group \"%s\" is an icon "
+ print_warning (kf, "value \"%s\" for key \"%s\" in group \"%s\" is an icon "
"name with an extension, but there should be no extension "
"as described in the Icon Theme Specification if the "
"value is not an absolute path\n",

23
desktop-file-utils-0.18-unity.patch
View File

@ -1,23 +0,0 @@
From 47322e554cc5388a3e6325f36b7d07a13f124594 Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@gnome.org>
Date: Thu, 31 Mar 2011 16:28:44 +0000
Subject: Add Unity to list of registered environments
See http://lists.freedesktop.org/archives/xdg/2011-March/011856.html
---
diff --git a/src/validate.c b/src/validate.c
index 04bc8d0..9c399a3 100644
--- a/src/validate.c
+++ b/src/validate.c
@@ -338,7 +338,7 @@ static struct {
};
static const char *show_in_registered[] = {
- "GNOME", "KDE", "LXDE", "ROX", "XFCE", "Old"
+ "GNOME", "KDE", "LXDE", "ROX", "Unity", "XFCE", "Old"
};
static struct {
--
cgit v0.8.3-6-g21f6

99
localelist-fixup.patch
View File

@ -1,99 +0,0 @@
diff -up desktop-file-utils-0.19/src/validate.c.localelist desktop-file-utils-0.19/src/validate.c
--- desktop-file-utils-0.19/src/validate.c.localelist 2011-12-19 09:58:16.000000000 -0500
+++ desktop-file-utils-0.19/src/validate.c 2011-12-23 15:33:00.667543077 -0500
@@ -2722,12 +2722,41 @@ desktop_file_validate (const char *filen
return (!kf.fatal_error);
}
+static void
+fixup_list (GKeyFile *keyfile,
+ const gchar *filename,
+ const gchar *key)
+{
+ char *value;
+
+ value = g_key_file_get_value (keyfile, GROUP_DESKTOP_ENTRY, key, NULL);
+ if (value) {
+ int len;
+
+ 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)
{
- char *value;
unsigned int i;
if (g_key_file_has_group (keyfile, GROUP_KDE_DESKTOP_ENTRY)) {
@@ -2739,33 +2768,28 @@ desktop_file_fixup (GKeyFile *keyfile,
/* 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)
- continue;
-
- value = g_key_file_get_value (keyfile, GROUP_DESKTOP_ENTRY,
- registered_desktop_keys[i].name, NULL);
- if (value) {
- int len;
-
- 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, registered_desktop_keys[i].name);
-
- str = g_strconcat (value, ";", NULL);
- g_key_file_set_value (keyfile, GROUP_DESKTOP_ENTRY,
- registered_desktop_keys[i].name, str);
- g_free (str);
+ 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 len, keylen;
+ guint j;
+ gchar **keys;
+
+ keylen = strlen (registered_desktop_keys[i].name);
+ len = 0;
+ keys = g_key_file_get_keys (keyfile, GROUP_DESKTOP_ENTRY, &len, NULL);
+ for (j = 0; j < len; 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;
}
+

12
scheme-handler.patch
View File

@ -1,12 +0,0 @@
diff -up desktop-file-utils-0.16/src/mimeutils.c.scheme-handler desktop-file-utils-0.16/src/mimeutils.c
--- desktop-file-utils-0.16/src/mimeutils.c.scheme-handler 2010-11-05 13:26:01.315300002 -0400
+++ desktop-file-utils-0.16/src/mimeutils.c 2010-11-05 13:26:15.749299997 -0400
@@ -40,7 +40,7 @@
/* Not registered with IANA, but used on a free desktop */
static const char *known_fdo_media_types[] = {
- "inode", "x-content"
+ "inode", "x-content", "x-scheme-handler"
};
static const char *known_old_fdo_media_types[] = {