Update to shared-mime-info-2.2.

This commit is contained in:
ajacoutot 2022-03-28 09:02:41 +00:00
parent 17a23db273
commit 159d7a65b4
5 changed files with 20 additions and 55 deletions

View File

@ -1,7 +1,7 @@
COMMENT= shared mime database for desktops
DISTNAME= shared-mime-info-2.1
REVISION= 1
V= 2.2
DISTNAME= shared-mime-info-${V}
CATEGORIES= misc
@ -15,11 +15,12 @@ PERMIT_PACKAGE= Yes
# uses pledge()
WANTLIB += c glib-2.0 xml2
MASTER_SITES= https://gitlab.freedesktop.org/xdg/shared-mime-info/uploads/0ee50652091363ab0d17e335e5e74fbe/
MASTER_SITES= https://gitlab.freedesktop.org/xdg/shared-mime-info/-/archive/${V}/
EXTRACT_SUFX= .tar.xz
MODULES= devel/meson \
lang/python
MODULES= devel/meson
MODPY_RUNDEP= No
BUILD_DEPENDS= devel/gettext,-tools \
textproc/xmlto
@ -32,5 +33,6 @@ CONFIGURE_ARGS += -Dxdgmime-path=${WRKSRC}/xdgmime
pre-configure:
sed -i 's|/usr/local|${PREFIX}|g' ${WRKSRC}/src/update-mime-database.c
${SUBST_CMD} ${WRKSRC}/data/freedesktop.org.xml.in
.include <bsd.port.mk>

View File

@ -1,2 +1,2 @@
SHA256 (shared-mime-info-2.1.tar.xz) = stQM/N2E6DXQ8skQez8+d+nPkS+FgXH+d5lG2mNOhWM=
SIZE (shared-mime-info-2.1.tar.xz) = 5202496
SHA256 (shared-mime-info-2.2.tar.gz) = vPXVUjGBNs97OuJZl19BT7zcnrzgAMh88fCQH/FOYZ8=
SIZE (shared-mime-info-2.2.tar.gz) = 7064139

View File

@ -0,0 +1,11 @@
Index: data/freedesktop.org.xml.in
--- data/freedesktop.org.xml.in.orig
+++ data/freedesktop.org.xml.in
@@ -6638,6 +6638,7 @@ command to generate the output files.
<comment>Python 3 script</comment>
<sub-class-of type='text/x-python'/>
<magic priority="60"><!-- higher priority than text/x-python -->
+ <match type="string" value="#!${MODPY_BIN}" offset="0"/>
<match type="string" value="#!/bin/python3" offset="0"/>
<match type="string" value="#! /bin/python3" offset="0"/>
<match type="string" value='eval \"exec /bin/python3' offset="0"/>

View File

@ -1,32 +0,0 @@
From 5a406b06792e26a83c7346b3c2443c0bd8d4cdb2 Mon Sep 17 00:00:00 2001
From: Eli Schwartz <eschwartz@archlinux.org>
Date: Mon, 8 Nov 2021 18:22:47 -0500
Subject: [PATCH] migrate from custom itstool to builtin msgfmt for creating translated XML
Index: data/meson.build
--- data/meson.build.orig
+++ data/meson.build
@@ -1,18 +1,12 @@
install_man('update-mime-database.1')
-freedesktop_org_xml = custom_target('freedesktop.org.xml',
- input : files(
- 'freedesktop.org.xml.in',
- 'its/shared-mime-info.its',
- 'its/shared-mime-info.loc',
- ),
+freedesktop_org_xml = i18n.merge_file(
+ input: 'freedesktop.org.xml.in',
output: 'freedesktop.org.xml',
- command: [
- find_program('freedesktop_generate.sh'),
- meson.source_root(),
- meson.build_root()
- ],
+ data_dirs: '.',
+ po_dir: '../po',
+ type: 'xml',
install: true,
install_dir: get_option('datadir') / 'mime' / 'packages',
)

View File

@ -1,16 +0,0 @@
From 5a406b06792e26a83c7346b3c2443c0bd8d4cdb2 Mon Sep 17 00:00:00 2001
From: Eli Schwartz <eschwartz@archlinux.org>
Date: Mon, 8 Nov 2021 18:22:47 -0500
Subject: [PATCH] migrate from custom itstool to builtin msgfmt for creating translated XML
Index: meson.build
--- meson.build.orig
+++ meson.build
@@ -20,7 +20,6 @@ config.set_quoted('VERSION', meson.project_version())
###############################################################################
# Find tools
-itstool = find_program('itstool')
xmllint = find_program('xmllint')
xmlto = find_program('xmlto')