summary refs log tree commit diff
path: root/gnu/packages/patches
diff options
context:
space:
mode:
authorBruno Victal <mirai@makinata.eu>2023-06-22 20:33:19 +0100
committerLiliana Marie Prikler <liliana.prikler@gmail.com>2023-06-24 23:59:50 +0200
commit0a167432dbccb3ed5b6f27a48b61e570846cf784 (patch)
treed65c4e7da78349dd9d5404cf6f2e7a5a45a0e3f9 /gnu/packages/patches
parent5539ad8c65a943bfc0cec35dea76d016bcb881fc (diff)
downloadguix-0a167432dbccb3ed5b6f27a48b61e570846cf784.tar.gz
gnu: shared-mime-info: Update to 2.2.
* gnu/packages/freedesktop.scm (shared-mime-info): Update to 2.2.
[source]: Use git-fetch.
[build-system]: Use meson-build-system.
[arguments]<#:parallel-build?>: Removed argument.
<#:phases>: Replace ‘patch-source-shebangs’ with a version that skips
mime detection checks.
[native-inputs]: Drop labels.  Add python and xdgmime.  Remove itstool.
* gnu/packages/patches/shared-mime-info-xdgmime-path.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.

Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
Diffstat (limited to 'gnu/packages/patches')
-rw-r--r--gnu/packages/patches/shared-mime-info-xdgmime-path.patch22
1 files changed, 22 insertions, 0 deletions
diff --git a/gnu/packages/patches/shared-mime-info-xdgmime-path.patch b/gnu/packages/patches/shared-mime-info-xdgmime-path.patch
new file mode 100644
index 0000000000..27c578f3fa
--- /dev/null
+++ b/gnu/packages/patches/shared-mime-info-xdgmime-path.patch
@@ -0,0 +1,22 @@
+Adapted from <https://gitlab.freedesktop.org/xdg/shared-mime-info/-/merge_requests/182>.
+
+diff --git a/meson.build b/meson.build
+index 3c75424..7058562 100644
+--- a/meson.build
++++ b/meson.build
+@@ -26,11 +26,11 @@ xmlto   = find_program('xmlto', required: false)
+ ###############################################################################
+ # Find xdgmime
+ 
+-xdgmime = get_option('xdgmime-path') / 'src'
++xdgmime = get_option('xdgmime-path')
+ 
+-xdgmime_print_mime_data = find_program(xdgmime/'print-mime-data', required: false)
+-xdgmime_test_mime_data  = find_program(xdgmime/'test-mime-data', required: false)
+-xdgmime_test_mime       = find_program(xdgmime/'test-mime', required: false)
++xdgmime_print_mime_data = find_program('print-mime-data', xdgmime/'print-mime-data', required: false)
++xdgmime_test_mime_data  = find_program('test-mime-data', xdgmime/'test-mime-data', required: false)
++xdgmime_test_mime       = find_program('test-mime', xdgmime/'test-mime', required: false)
+ xdgmime_found = (
+     xdgmime_print_mime_data.found() and
+     xdgmime_test_mime_data.found()  and