3 files changed, 10 insertions, 98 deletions
diff --git a/source/l/shared-mime-info/git_meson_buildfix.patch b/source/l/shared-mime-info/git_meson_buildfix.patch
deleted file mode 100644
index 80fd4dc85..000000000
--- a/source/l/shared-mime-info/git_meson_buildfix.patch
+++ /dev/null
@@ -1,87 +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
-
-gettext upstream has supported this for a very long time (since 0.19.7
-via commit b3c2a5a242c36fbbaa0c5b17f975d6c638598a23, released in 2015),
-and itstool is (mostly) a legacy of the time before gettext had proper
-support for these sorts of use cases.
-
-This is similar to the state of intltool, which is described at
-https://wiki.gnome.org/MigratingFromIntltoolToGettext
-
-During the port from autotools to meson, the legacy use of itstool was
-faithfully translated to meson in the only way possible: by jumping
-through hoops to run ninja inside ninja in order to generate the .mo
-files for itstool, because meson's i18n module used a flawed design and
-there was no "real" target to create those files, only a .PHONY
-run_target which other rules cannot depend on.
-
-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 with XML files. So let's take this opportunity to
-drop legacy dependencies and use the modern, builtin tooling, which
-fixes this bug as a side effect.
-
-Fixes #170
-Index: shared-mime-info-2.1/data/freedesktop_generate.sh
-===================================================================
---- shared-mime-info-2.1.orig/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"
-Index: shared-mime-info-2.1/data/meson.build
-===================================================================
---- shared-mime-info-2.1.orig/data/meson.build
-+++ shared-mime-info-2.1/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',
- )
-Index: shared-mime-info-2.1/meson.build
-===================================================================
---- shared-mime-info-2.1.orig/meson.build
-+++ shared-mime-info-2.1/meson.build
-@@ -20,7 +20,6 @@ config.set_quoted('VERSION', meson.proje
- ###############################################################################
- # Find tools
- 
--itstool = find_program('itstool')
- xmllint = find_program('xmllint')
- xmlto   = find_program('xmlto')
- 
diff --git a/source/l/shared-mime-info/shared-mime-info.SlackBuild b/source/l/shared-mime-info/shared-mime-info.SlackBuild
index 2bfb885ce..9b54b78ef 100755
--- a/source/l/shared-mime-info/shared-mime-info.SlackBuild
+++ b/source/l/shared-mime-info/shared-mime-info.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2008, 2009, 2010, 2012, 2016, 2018, 2021  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2012, 2016, 2018, 2021, 2022  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=shared-mime-info
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
@@ -79,7 +79,6 @@ find . \
  -exec chmod 644 {} \+
 
 zcat $CWD/shared-mime-info.skip_tests.diff.gz | patch -p1 --verbose || exit 1
-zcat $CWD/git_meson_buildfix.patch.gz | patch -p1 --verbose || exit 1
 
 # Configure, build, and install:
 export CFLAGS="$SLKCFLAGS"
diff --git a/source/l/shared-mime-info/shared-mime-info.skip_tests.diff b/source/l/shared-mime-info/shared-mime-info.skip_tests.diff
index df07110c0..a05576053 100644
--- a/source/l/shared-mime-info/shared-mime-info.skip_tests.diff
+++ b/source/l/shared-mime-info/shared-mime-info.skip_tests.diff
@@ -1,11 +1,11 @@
---- ./meson.build.orig	2020-05-06 09:01:04.000000000 -0500
-+++ ./meson.build	2020-05-10 13:08:03.154102522 -0500
-@@ -66,7 +66,7 @@
- subdir('po')
- subdir('data')
- subdir('src')
+--- ./meson.build.orig	2022-03-27 05:19:00.000000000 -0500
++++ ./meson.build	2022-03-28 13:48:19.290060450 -0500
+@@ -65,7 +65,7 @@
+     gio = dependency('gio-2.0', required: false)
+     subdir('src')
+ endif
 -subdir('tests')
 +#subdir('tests')
  
- if get_option('update-mimedb')
-     upd_tool = (meson.is_cross_build()
+ configure_file(
+     input: 'shared-mime-info.pc.in',