From 50ab0fa48d751aa2198a3555ea795f57f5dd01e2 Mon Sep 17 00:00:00 2001 From: SupervisedThinking Date: Thu, 15 Dec 2022 01:06:06 +0100 Subject: [PATCH] shared-mime-info: update to 2.2 - dropped patches - updated license matching SPDX identifier --- packages/devel/shared-mime-info/package.mk | 6 +- ...n-msgfmt-for-creating-translated-XML.patch | 71 ------------------- ...-info-999.01-disable-spec-generation.patch | 58 --------------- 3 files changed, 3 insertions(+), 132 deletions(-) delete mode 100644 packages/devel/shared-mime-info/patches/migrate-from-custom-itstool-to-builtin-msgfmt-for-creating-translated-XML.patch delete mode 100644 packages/devel/shared-mime-info/patches/shared-mime-info-999.01-disable-spec-generation.patch diff --git a/packages/devel/shared-mime-info/package.mk b/packages/devel/shared-mime-info/package.mk index fe39b8a1d1..91f3d2449f 100644 --- a/packages/devel/shared-mime-info/package.mk +++ b/packages/devel/shared-mime-info/package.mk @@ -2,9 +2,9 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="shared-mime-info" -PKG_VERSION="2.1" -PKG_SHA256="37df6475da31a8b5fc63a54ba0770a3eefa0a708b778cb6366dccee96393cb60" -PKG_LICENSE="GPL2" +PKG_VERSION="2.2" +PKG_SHA256="418c480019d9865f67f922dfb88de00e9f38bf971205d55cdffab50432919e61" +PKG_LICENSE="GPL-2.0-only" PKG_SITE="https://freedesktop.org/wiki/Software/shared-mime-info/" PKG_URL="https://gitlab.freedesktop.org/xdg/${PKG_NAME}/-/archive/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_HOST="toolchain:host glib:host libxml2:host gettext:host itstool:host" diff --git a/packages/devel/shared-mime-info/patches/migrate-from-custom-itstool-to-builtin-msgfmt-for-creating-translated-XML.patch b/packages/devel/shared-mime-info/patches/migrate-from-custom-itstool-to-builtin-msgfmt-for-creating-translated-XML.patch deleted file mode 100644 index 28e647ede7..0000000000 --- a/packages/devel/shared-mime-info/patches/migrate-from-custom-itstool-to-builtin-msgfmt-for-creating-translated-XML.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 0944c4d73819fd93a7857d56a967c638beb01141 Mon Sep 17 00:00:00 2001 -From: Eli Schwartz -Date: Mon, 8 Nov 2021 18:22:47 -0500 -Subject: [PATCH] migrate from custom itstool to builtin msgfmt for creating - translated XML - -gettext upstream has supported this for a very long time, and using it -means we don't need to jump through hoops to run ninja inside ninja in -order to generate the .mo files for itstool. - -Although meson 0.60.0 added support for real targets for the built .mo -files, this changed the rules for output filenames, breaking the script. -But msgfmt does not care, and anyways comes with builtin meson functions -for convenient use. - -Fixes #170 ---- - data/freedesktop_generate.sh | 12 ------------ - data/meson.build | 16 +++++----------- - 2 files changed, 5 insertions(+), 23 deletions(-) - delete mode 100755 data/freedesktop_generate.sh - -diff --git a/data/freedesktop_generate.sh b/data/freedesktop_generate.sh -deleted file mode 100755 -index 62ccffa..0000000 ---- a/data/freedesktop_generate.sh -+++ /dev/null -@@ -1,12 +0,0 @@ --#!/bin/sh -e -- --src_root="$1" --build_root="$2" -- --ninja -C "${build_root}" shared-mime-info-gmo -- --itstool \ -- --its "${src_root}/data/its/shared-mime-info.its" \ -- --join "${src_root}/data/freedesktop.org.xml.in" \ -- -o "${build_root}/data/freedesktop.org.xml" \ -- "${build_root}/po/"*".gmo" -diff --git a/data/meson.build b/data/meson.build -index 24361c9..09ed7a9 100644 ---- a/data/meson.build -+++ b/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', - ) --- -GitLab - diff --git a/packages/devel/shared-mime-info/patches/shared-mime-info-999.01-disable-spec-generation.patch b/packages/devel/shared-mime-info/patches/shared-mime-info-999.01-disable-spec-generation.patch deleted file mode 100644 index 3d43d7e4bf..0000000000 --- a/packages/devel/shared-mime-info/patches/shared-mime-info-999.01-disable-spec-generation.patch +++ /dev/null @@ -1,58 +0,0 @@ -From baeb49e36bc162bcbd243e733d2a9f1eb9abfefb Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ville=20Skytt=C3=A4?= -Date: Sun, 24 Jan 2021 11:45:52 +0200 -Subject: [PATCH] meson: make xmlto optional, build spec only if found - -Refs https://gitlab.freedesktop.org/xdg/shared-mime-info/-/issues/150 ---- - data/meson.build | 22 ++++++++++++---------- - meson.build | 2 +- - 2 files changed, 13 insertions(+), 11 deletions(-) - -diff --git a/data/meson.build b/data/meson.build -index 263567d..24361c9 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -22,14 +22,16 @@ install_data( - install_dir : get_option('datadir') / 'gettext/its' - ) - --custom_target('shared-mime-info-spec-html', -- input : 'shared-mime-info-spec.xml', -- output: 'shared-mime-info-spec-html', -- command: [ -- xmlto, -- '-o', '@OUTPUT@', -- 'html-nochunks', -- '@INPUT@', -- ], -- build_by_default: true, -+if xmlto.found() -+ custom_target('shared-mime-info-spec-html', -+ input : 'shared-mime-info-spec.xml', -+ output: 'shared-mime-info-spec-html', -+ command: [ -+ xmlto, -+ '-o', '@OUTPUT@', -+ 'html-nochunks', -+ '@INPUT@', -+ ], -+ build_by_default: true, - ) -+endif -diff --git a/meson.build b/meson.build -index 9a28573..0d08c8a 100644 ---- a/meson.build -+++ b/meson.build -@@ -22,7 +22,7 @@ config.set_quoted('VERSION', meson.project_version()) - - itstool = find_program('itstool') - xmllint = find_program('xmllint') --xmlto = find_program('xmlto') -+xmlto = find_program('xmlto', required: false) - - ############################################################################### - # Find xdgmime --- -GitLab -