Accepting request 966771 from GNOME:Factory
OBS-URL: https://build.opensuse.org/request/show/966771 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/shared-mime-info?expand=0&rev=69
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
960d73676f
@ -1,10 +0,0 @@
|
||||
--- orig-shared-mime-info-2.1/meson.build 2020-12-31 20:12:16.000000000 +0100
|
||||
+++ shared-mime-info-2.1/meson.build 2021-11-18 21:11:08.493268746 +0100
|
||||
@@ -20,7 +20,6 @@
|
||||
###############################################################################
|
||||
# Find tools
|
||||
|
||||
-itstool = find_program('itstool')
|
||||
xmllint = find_program('xmllint')
|
||||
xmlto = find_program('xmlto')
|
||||
|
||||
@ -1,86 +0,0 @@
|
||||
From 981a16ad9f786cc8dbba8f057d9c1fe7358a7404 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
|
||||
---
|
||||
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
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b2d40cfcdd84e835d0f2c9107b3f3e77e9cf912f858171fe779946da634e8563
|
||||
size 5202496
|
||||
BIN
shared-mime-info-2.2.tar.bz2
(Stored with Git LFS)
Normal file
BIN
shared-mime-info-2.2.tar.bz2
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -1,3 +1,94 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 28 08:35:54 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>
|
||||
|
||||
- Update to 2.2:
|
||||
* model/3mf: new type
|
||||
* Match shared libraries with version suffix
|
||||
* model/obj: add mtllib and Blender comment based magic
|
||||
* model/mtl: add Blender comment magic, increase newmtl range
|
||||
* model/obj, model/mtl: new types
|
||||
* Add Electron Archive Format type application/x-asar
|
||||
* text/x-qml: Lower match priority to avoid conflicts with Python
|
||||
* Move '*.blend' to top of Blender glob list
|
||||
* Adding SPARQL media types
|
||||
* application/zip: Add `*.zipx` glob and test fixture
|
||||
* Added DSD mime type
|
||||
* Differentiate comic book archives
|
||||
* FITS: Add missing `application/fits` and legacy globs
|
||||
* Add Godot engine files
|
||||
* Add FlashForge "xgcode" mime-type
|
||||
* text/x-objc++src: new type
|
||||
* image/heif: test .hif extension too
|
||||
* image/hif: add *.hif glob
|
||||
* image/heif: add another test case
|
||||
* image/heif: add magics
|
||||
* Add a build-tools option to allow installing only the mime data
|
||||
* Add compressed SVG glob pattern `*.svg.gz`
|
||||
* Add Apple Wallet pass type application/vnd.apple.pkpass
|
||||
* migrate from custom itstool to builtin msgfmt for creating
|
||||
translated XML
|
||||
* Make the remaining plain text types subclasses of text/plain
|
||||
* audio/mobile-xmf: separate from audio/x-xmf
|
||||
* Adding ZIM file
|
||||
* Make text/x-mrml a subclass of application/xml
|
||||
* image/avif: move acronym and expansion to separate fields from
|
||||
comment
|
||||
* freedesktop_generate.sh: Don't hardcode ninja
|
||||
* Add text/x-mpl2
|
||||
* application/x-apple-systemprofiler+xml: require
|
||||
_SPCommandLineArguments in plist
|
||||
* image/jpeg: add test case with embedded property list XML
|
||||
* audio/vnd.dts.hd: include parent type magic in magic match
|
||||
* model/gltf+json: new type
|
||||
* model/gltf-binary: new type
|
||||
* application/x-object: add *.mod and a test case
|
||||
* application/x-mod: add some ProTracker magics and a test case
|
||||
* image/jxl: include test files in test list
|
||||
* tests: add trailing linefeed to mime-detection list
|
||||
* Make application/x-mswinurl a subclass of text/plain
|
||||
* Change description for *.desktop files to "desktop entry"
|
||||
* application/x-x509-ca-cert: add magics and test cases
|
||||
* application/pkix-cert: add BEGIN/END X509 CERTIFICATE magic
|
||||
* application/pkix-crl: add magic and test case
|
||||
* application/pkix-cert: add magic and test case
|
||||
* image/jxl: new type
|
||||
* Added .sc filename extension for Scala source code, as it is
|
||||
occasionally used
|
||||
* application/schema+json: new type
|
||||
* Add text/x-crystal
|
||||
* application/x-krita: remove stray period from comment
|
||||
* adding org-mode
|
||||
* Add Elixir source code mime type
|
||||
* Add two new offsets for .kra and .krz
|
||||
* text/x-python3: add *.pyi glob (Python stub files)
|
||||
* image/x-canon-cr3: new type
|
||||
* image/x-xpixmap: make XPM3 magic more specific
|
||||
* image/x-xpixmap: add XPM2 magic
|
||||
* application/x-troff-man: add *.[1-9] glob
|
||||
* application/toml: new type
|
||||
* Lower priority of "BEGIN {" for perl, awk uses that too
|
||||
* Add Smacker video type video/vnd.radgamettools.smacker
|
||||
* Clarify database license
|
||||
* meson: make xmlto optional, build spec only if found
|
||||
* application/x-7z-compressed: add *.7z.001 glob
|
||||
* Add Bink video type video/vnd.radgamettools.bink
|
||||
* image/x-nikon-nrw: add test case
|
||||
* image/x-nikon-nrw: new type
|
||||
* application/x-vhdx-disk: improve acronym and its expansion
|
||||
* application/ovf: new type
|
||||
* application/x-qed-disk: new type
|
||||
* application/x-vdi-disk: new type
|
||||
* application/x-vmdk-disk: new type
|
||||
* application/x-vhd-disk, /x-vhdx-disk: new types
|
||||
* application/vnd.apple.numbers, .pages: add older magics and
|
||||
test cases
|
||||
* Add text/x-dart
|
||||
* application/vnd.apple.numbers, /vnd.apple.pages: new types
|
||||
* xdgmime: configure as submodule
|
||||
- Drop obsolete patches:
|
||||
* fix-build-meson-0_60.patch
|
||||
* drop-itstool-dep.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 18 19:55:47 UTC 2021 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package shared-mime-info
|
||||
#
|
||||
# Copyright (c) 2021 SUSE LLC
|
||||
# Copyright (c) 2022 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -16,22 +16,15 @@
|
||||
#
|
||||
|
||||
|
||||
%define commitid 0ee50652091363ab0d17e335e5e74fbe
|
||||
|
||||
Name: shared-mime-info
|
||||
Version: 2.1
|
||||
Version: 2.2
|
||||
Release: 0
|
||||
Summary: Shared MIME Database
|
||||
License: GPL-2.0-or-later
|
||||
Group: System/X11/Utilities
|
||||
URL: https://gitlab.freedesktop.org/xdg/shared-mime-info
|
||||
Source0: %{url}/uploads/%{commitid}/%{name}-%{version}.tar.xz
|
||||
Source0: https://gitlab.freedesktop.org/xdg/shared-mime-info/-/archive/%{version}/%{name}-%{version}.tar.bz2
|
||||
Source1: macros.shared-mime-info
|
||||
# PATCH-FIX-UPSTREAM fix-build-meson-0_60.patch -- Fix build with meson 0.60 and newer
|
||||
Patch0: fix-build-meson-0_60.patch
|
||||
# PATCH-FIX-UPSTREAM drop-itstool-dep.patch -- Drop itstool as it is no longer needed
|
||||
Patch1: drop-itstool-dep.patch
|
||||
|
||||
BuildRequires: glib2-devel
|
||||
BuildRequires: libxml2-devel
|
||||
# needed for xmllint
|
||||
|
||||
Loading…
Reference in New Issue
Block a user