summaryrefslogtreecommitdiffstats
path: root/source/l/shared-mime-info
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2022-02-21 20:21:38 +0000
committer Eric Hameleers <alien@slackware.com>2022-02-22 06:59:43 +0100
commit32fa88b60c4d872b057e9e7651b351d54affa40e (patch)
tree9adf4cc6cac2f4aa1f78e1b45a8d3ce786412423 /source/l/shared-mime-info
parentd5740c2f619f72d61555bb6bef595aa0172ba60f (diff)
downloadcurrent-32fa88b60c4d872b057e9e7651b351d54affa40e.tar.gz
current-32fa88b60c4d872b057e9e7651b351d54affa40e.tar.xz
Mon Feb 21 20:21:38 UTC 202220220221202138
a/aaa_glibc-solibs-2.35-x86_64-1.txz: Upgraded. a/kernel-firmware-20220218_c53073d-noarch-1.txz: Upgraded. ap/flac-1.3.4-x86_64-1.txz: Upgraded. This update fixes overflow issues with encoding and decoding. For more information, see: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-0499 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-0561 (* Security fix *) ap/ksh93-1.0_20220219_bc6c5dbd-x86_64-1.txz: Upgraded. ap/mariadb-10.6.7-x86_64-2.txz: Rebuilt. Removed dangling symlink. ap/vim-8.2.4428-x86_64-1.txz: Upgraded. Patched ctags for glibc-2.35. Thanks to nobodino. d/autoconf-2.71-noarch-1.txz: Upgraded. d/automake-1.16.5-noarch-1.txz: Upgraded. d/binutils-2.38-x86_64-2.txz: Rebuilt. Fixed the SlackBuild to not run autoconf in the libiberty and intl subdirectories. It doesn't work with the latest autoconf, and there doesn't seem to be any need for it anyway. d/cmake-3.22.2-x86_64-1.txz: Upgraded. d/meson-0.61.2-x86_64-1.txz: Upgraded. d/rcs-5.10.0-x86_64-4.txz: Rebuilt. Patched for glibc-2.35. Thanks to nobodino. d/scons-4.3.0-x86_64-1.txz: Upgraded. e/emacs-27.2-x86_64-2.txz: Rebuilt. Patched for glibc-2.35. Thanks to nobodino. kde/digikam-7.5.0-x86_64-2.txz: Rebuilt. Recompiled against jasper-3.0.2. kde/wacomtablet-20220124_dd28b27-x86_64-1.txz: Upgraded. l/LibRaw-0.20.2-x86_64-4.txz: Rebuilt. Recompiled against jasper-3.0.2. l/accountsservice-22.07.5-x86_64-1.txz: Upgraded. l/dconf-editor-3.38.3-x86_64-2.txz: Rebuilt. Fixed build errors with meson. l/expat-2.4.6-x86_64-1.txz: Upgraded. l/fuse-2.9.9-x86_64-4.txz: Rebuilt. Patched for glibc-2.35. Thanks to nobodino. l/gcr-3.40.0-x86_64-2.txz: Rebuilt. Fixed build errors with meson. l/gdk-pixbuf2-2.42.6-x86_64-2.txz: Rebuilt. Fixed meson options. l/gdk-pixbuf2-xlib-2.40.2-x86_64-4.txz: Rebuilt. Fixed meson options. l/gegl-0.4.34-x86_64-3.txz: Rebuilt. Recompiled against jasper-3.0.2. l/glade-3.38.2-x86_64-6.txz: Rebuilt. Fixed build errors with meson. Removed duplicated 'da' from help/LINGUAS. l/glibc-2.35-x86_64-1.txz: Upgraded. l/glibc-i18n-2.35-x86_64-1.txz: Upgraded. l/glibc-profile-2.35-x86_64-1.txz: Upgraded. l/gobject-introspection-1.71.0-x86_64-1.txz: Upgraded. This update was needed to solve failing tests with the new meson. l/gtk+2-2.24.33-x86_64-3.txz: Rebuilt. Changed build/host to $ARCH-slackware-linux-gnu. l/gtk4-4.4.1-x86_64-2.txz: Rebuilt. Fixed meson options. l/gvfs-1.48.1-x86_64-2.txz: Rebuilt. Fixed build errors with meson. l/imagemagick-7.1.0_26-x86_64-1.txz: Upgraded. l/jasper-3.0.2-x86_64-1.txz: Upgraded. Shared library .so-version bump. l/json-glib-1.6.6-x86_64-2.txz: Rebuilt. Fixed meson options. l/libsecret-0.20.5-x86_64-1.txz: Upgraded. l/netpbm-10.97.04-x86_64-1.txz: Upgraded. l/qt5-5.15.3_20211130_014c375b-x86_64-3.txz: Rebuilt. Patched for glibc-2.35. Thanks to nobodino. Recompiled against jasper-3.0.2. l/shared-mime-info-2.1-x86_64-4.txz: Rebuilt. Fixed build errors with meson. n/gpgme-1.17.0-x86_64-1.txz: Upgraded. n/ntp-4.2.8p15-x86_64-9.txz: Rebuilt. Patched for glibc-2.35. Thanks to nobodino. x/libinput-1.19.3-x86_64-2.txz: Rebuilt. Recompiled against libwacom-2.1.0. x/libva-2.14.0-x86_64-1.txz: Upgraded. x/libva-utils-2.14.0-x86_64-1.txz: Upgraded. x/libwacom-2.1.0-x86_64-1.txz: Upgraded. Shared library .so-version bump. x/motif-2.3.8-x86_64-6.txz: Rebuilt. Fixed build with LEXLIB="-lfl". x/vulkan-sdk-1.2.176.1-x86_64-3.txz: Rebuilt. Patched for glibc-2.35. Thanks to nobodino. x/xf86-input-wacom-1.0.0-x86_64-1.txz: Upgraded. xap/network-manager-applet-1.24.0-x86_64-3.txz: Rebuilt. Fixed build errors with meson. xap/vim-gvim-8.2.4428-x86_64-1.txz: Upgraded. isolinux/initrd.img: Rebuilt. usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source/l/shared-mime-info')
-rw-r--r--source/l/shared-mime-info/git_meson_buildfix.patch87
-rwxr-xr-xsource/l/shared-mime-info/shared-mime-info.SlackBuild3
2 files changed, 89 insertions, 1 deletions
diff --git a/source/l/shared-mime-info/git_meson_buildfix.patch b/source/l/shared-mime-info/git_meson_buildfix.patch
new file mode 100644
index 000000000..80fd4dc85
--- /dev/null
+++ b/source/l/shared-mime-info/git_meson_buildfix.patch
@@ -0,0 +1,87 @@
+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 af0365edb..2bfb885ce 100755
--- a/source/l/shared-mime-info/shared-mime-info.SlackBuild
+++ b/source/l/shared-mime-info/shared-mime-info.SlackBuild
@@ -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:-3}
+BUILD=${BUILD:-4}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
@@ -79,6 +79,7 @@ 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"