cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Add font as valid media type

Browse Source 
- Fix missing ; when appending to a list not ending with one
from upstream
This commit is contained in:
ajacoutot 2018-04-24 19:34:45 +00:00
parent f1ae0bb014
commit 3f98f73322
3 changed files with 53 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
devel/desktop-file-utils/Makefile
View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.42 2017/11/03 10:32:52 jasper Exp $
# $OpenBSD: Makefile,v 1.43 2018/04/24 19:34:45 ajacoutot Exp $
COMMENT= utilities for dot.desktop entries
DISTNAME= desktop-file-utils-0.23
REVISION = 0
REVISION = 1
EXTRACT_SUFX= .tar.xz
CATEGORIES= devel

28
devel/desktop-file-utils/patches/patch-src_keyfileutils_c Normal file
View File

@ -0,0 +1,28 @@
$OpenBSD: patch-src_keyfileutils_c,v 1.1 2018/04/24 19:34:45 ajacoutot Exp $
From d281ed4b9db22ff9e4c7e56b5cce58a72d11fc54 Mon Sep 17 00:00:00 2001
From: Pascal Terjan <pterjan@google.com>
Date: Wed, 17 Aug 2016 21:52:48 -0400
Subject: Fix missing ; when appending to a list not ending with one
Index: src/keyfileutils.c
--- src/keyfileutils.c.orig
+++ src/keyfileutils.c
@@ -187,9 +187,14 @@ dfu_key_file_merge_list (GKeyFile *keyfile,
value = g_key_file_get_value (keyfile, group, key, NULL);
- if (value)
- str = g_strconcat (value, to_merge, ";", NULL);
- else
+ if (value) {
+ size_t len = strlen (value);
+ if (len > 0 && value[len - 1] != ';') {
+ str = g_strconcat (value, ";", to_merge, ";", NULL);
+ } else {
+ str = g_strconcat (value, to_merge, ";", NULL);
+ }
+ } else
str = g_strconcat (to_merge, ";", NULL);
g_key_file_set_value (keyfile, group, key, str);

22
devel/desktop-file-utils/patches/patch-src_mimeutils_c Normal file
View File

@ -0,0 +1,22 @@
$OpenBSD: patch-src_mimeutils_c,v 1.5 2018/04/24 19:34:45 ajacoutot Exp $
From 92af4108750ceaf4191fd54e255885c7d8a78b70 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 9 Apr 2018 17:06:37 -0400
Subject: Add font as valid media type
Index: src/mimeutils.c
--- src/mimeutils.c.orig
+++ src/mimeutils.c
@@ -52,9 +52,9 @@ static const char *known_old_fdo_media_types[] = {
"x-directory"
};
-/* Defined in RFC 2045/2046 and RFC 2077 */
+/* Defined in RFC 2045/2046, RFC 2077 and RFC 8081 */
static const char *registered_discrete_media_types[] = {
- "application", "audio", "image", "model", "text", "video"
+ "application", "audio", "font", "image", "model", "text", "video"
};
/* Defined in RFC 2045/2046 */