CVS commit: pkgsrc/databases/shared-mime-info

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Oct 13 11:08:43 UTC 2022

Modified Files:
        pkgsrc/databases/shared-mime-info: Makefile PLIST distinfo
Added Files:
        pkgsrc/databases/shared-mime-info/patches:
            patch-src_update-mime-database.c
Removed Files:
        pkgsrc/databases/shared-mime-info/patches: patch-Makefile.am
            patch-Makefile.in patch-aa

Log Message:
shared-mime-info: update to 2.2.

shared-mime-info 2.2 (2022-03-27)
* model/3mf: new
* 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
* 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
* application/x-qed-disk: new
* application/x-vdi-disk: new
* application/x-vmdk-disk: new
* application/x-vhd-disk, /x-vhdx-disk: new
* 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

shared-mime-info 2.1 (2020-12-31)
* New maintainers: David Faure and Ville Skyttä
* Adapt to xdgmime behaviour change: in case of multiple glob matches, and the magic match is unrelated to all of them, ignore the magic and pick one of the glob matches. xdgmime was actually 
deviating from the spec on this. (#138)
* Improve text/vnd.trolltech.linguist magic to reduce false positives for MPEG TS files (#10)
* audio/mpeg: add layer 2, 2.5, and 1 protected magics (#46)
* Add many aliases for image/x-tga
* audio/x-mod: improve magic for 669 Composer files (#144)
* Add mime-type image/ktx2 (Khronos image texture format version 2)
* application/oxps: differentiate from /vnd.ms-xpsdocument
* Make image/g3fax the canonical name for image/fax-g3
* Make text/vnd.trolltech.linguist the canonical name for text/vnd.qt.linguist
* Make application/vnd.smaf the canonical name for application/x-smaf
* Make application/vnd.apple.keynote the canonical name for application/x-iwork-keynote-sffkey
* Add mime-type image/astc (Adaptive Scalable Texture Compression files)
* Add mime-type for SageMath script files (*.sage)
* Add mime-type for Kaitai Struct
* Remove application/x-dc-rom
* Add mime-type for MAME compressed hard disk image (application/x-mame-chd)
* Add mime-types application/nintendo-3ds-executable, application/x-nintendo-3ds-rom
* Add mime-types application/x-dreamcast-rom, application/x-gd-rom-cue, application/x-discjuggler-cd-image
* Add mime-type application/x-compressed-iso (*.cso)
* Remove image/avif-sequence
* Fix application/x-sharedlib vs application/x-executable confusion for PIE executables (#11)

shared-mime-info 2.0 (2020-06-05)
* Port build system to meson, and ship test suite with tarball
* Install ITS file to allow gettext to translate mime-type descriptions
* Add BPS and IPS patch formats
* Lower weight for "use strict" and similar in the perl mimetype
* Add new magic for Sega Mega Drive ROMs
* Add Common Lisp mime-type
* Rename text/x-tcl to text/tcl
* Add text/vbscript
* Add PySpread spreadsheet mime-types
* Add Kotlin source mime-type
* Add AVIF image mime-type
* Split versions of the Audible audio mime types
* Add *.spx glob for audio/x-speex+ogg
* Add Apple System Profiler XML mime-type

shared-mime-info 1.15 (2019-10-30)
* Add Kindle 8 eBook format
* Fix some HTML files being detected as XML

shared-mime-info 1.14 (2019-09-20)
* Add mime-type for QCOW images
* Fix matching SVG files in some circumstances (again)

shared-mime-info 1.13.1 (2019-09-11)
* Fix matching SVG files in some circumstances

shared-mime-info 1.13 (2019-09-11)
* Add code of conduct document
* Use itstool and gettext to generate translations
* Add content-tree type for OSTree USB repositories
* Add match for MPEG-4 v1 videos
* Adjust a lot of user readable mime-type descriptions
* Fix WOFF/WOFF2 mime-types
* Prefer text/html to XHTML for *.html files
* Better magic for text/html files
* Fix SVG magic for files embedded in HTML
* Add *.sgd as a glob for Mega Drive ROMs

Specification:
- Mention that sub-class-of can be aliases

Tools:
- Enable Large File Support in update-mime-database

Test suite:
- Make test suite failures fatal
- Add test for duplicate mime-types
- Fix WarpScript test
- Generate the specification in the CI, to avoid it becoming
  syntactically invalid

shared-mime-info 1.12 (2019-01-17)
* Fix build from tarball

shared-mime-info 1.11 (2019-01-17)
* Add mime-type for reStructuredText
* Add mime-type for Groovy scripting language
* Add mime-type for Gradle build tool
* Add mime-type for Maven
* Add mime-type for WarpScript source code
* Add mime-type for zstd and tar.zst archives
* Change the preferred suffix for image/jpeg from .jpeg to .jpg
* Assign *.html to XHTML pages
* Better detection for *.key files (Apple Keynote vs. GPG keys)
* Give weight to one of the appimage patterns

Tools:
- Link to GitLab for contributions and bug reports
- Loads of memory and file descriptor leak fixes

Spec:
- Clarify the availability of C character escape support


To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.75 pkgsrc/databases/shared-mime-info/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/databases/shared-mime-info/PLIST
cvs rdiff -u -r1.38 -r1.39 pkgsrc/databases/shared-mime-info/distinfo
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/databases/shared-mime-info/patches/patch-Makefile.am \
    pkgsrc/databases/shared-mime-info/patches/patch-Makefile.in
cvs rdiff -u -r1.8 -r0 pkgsrc/databases/shared-mime-info/patches/patch-aa
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/databases/shared-mime-info/patches/patch-src_update-mime-database.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/shared-mime-info/Makefile
diff -u pkgsrc/databases/shared-mime-info/Makefile:1.74 pkgsrc/databases/shared-mime-info/Makefile:1.75
--- pkgsrc/databases/shared-mime-info/Makefile:1.74     Mon Apr 18 19:10:45 2022
+++ pkgsrc/databases/shared-mime-info/Makefile  Thu Oct 13 11:08:43 2022
@@ -1,30 +1,28 @@
-# $NetBSD: Makefile,v 1.74 2022/04/18 19:10:45 adam Exp $
+# $NetBSD: Makefile,v 1.75 2022/10/13 11:08:43 wiz Exp $
 
-DISTNAME=      shared-mime-info-1.10
-PKGREVISION=   6
+DISTNAME=      shared-mime-info-2.2
 CATEGORIES=    databases
-MASTER_SITES=  http://people.freedesktop.org/~hadess/
-EXTRACT_SUFX=  .tar.xz
+MASTER_SITES=  https://gitlab.freedesktop.org/xdg/shared-mime-info/-/archive/${PKGVERSION_NOREV}/
+EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://www.freedesktop.org/wiki/Software/shared-mime-info
 COMMENT=       Core database of common types
 LICENSE=       gnu-gpl-v2
 
-GNU_CONFIGURE=         YES
-USE_LANGUAGES+=                c99
-USE_LIBTOOL=           YES
-USE_PKGLOCALEDIR=      YES
-USE_TOOLS+=            gmake intltool msgfmt pkg-config xgettext
-MAKE_JOBS_SAFE=                no
-
-CONFIGURE_ARGS+=       --disable-update-mimedb
+TOOL_DEPENDS+=         gettext-tools>=0.19.8:../../devel/gettext-tools
+TOOL_DEPENDS+=         xmlto>=0:../../textproc/xmlto
 
-# patched in Makefile.in
-CHECK_PORTABILITY_SKIP+=       Makefile.am
+USE_LANGUAGES+=                c99
+USE_TOOLS+=            bash:test intltool msgfmt pkg-config xgettext
 
 .include "../../mk/bsd.prefs.mk"
 
+# msgfmt: unknown option --xml
+.if ${OPSYS} == "NetBSD"
+TOOLS_PLATFORM.msgfmt=
+.endif
+
 CPPFLAGS+=             -DPREFIX="\"${PREFIX}\""
 
 FILES_SUBST+=          MIMEDB_PATH="${PREFIX}/share/mime"
@@ -33,7 +31,10 @@ FILES_SUBST+=                UPDATE_MIMEDB="${PREFIX}/
 PRINT_PLIST_AWK+=      /^share\/mime\/packages/ { print; next; }
 PRINT_PLIST_AWK+=      /^share\/mime/ { next; }
 
+# for tests
+.include "../../lang/python/tool.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
+.include "../../devel/meson/build.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/databases/shared-mime-info/PLIST
diff -u pkgsrc/databases/shared-mime-info/PLIST:1.24 pkgsrc/databases/shared-mime-info/PLIST:1.25
--- pkgsrc/databases/shared-mime-info/PLIST:1.24        Thu Aug 16 12:45:23 2018
+++ pkgsrc/databases/shared-mime-info/PLIST     Thu Oct 13 11:08:43 2022
@@ -1,6 +1,9 @@
-@comment $NetBSD: PLIST,v 1.24 2018/08/16 12:45:23 wiz Exp $
+@comment $NetBSD: PLIST,v 1.25 2022/10/13 11:08:43 wiz Exp $
 bin/update-mime-database
 man/man1/update-mime-database.1
+share/gettext/its/shared-mime-info.its
+share/gettext/its/shared-mime-info.loc
+share/locale/af/LC_MESSAGES/shared-mime-info.mo
 share/locale/ar/LC_MESSAGES/shared-mime-info.mo
 share/locale/as/LC_MESSAGES/shared-mime-info.mo
 share/locale/ast/LC_MESSAGES/shared-mime-info.mo
@@ -41,6 +44,7 @@ share/locale/ka/LC_MESSAGES/shared-mime-
 share/locale/kk/LC_MESSAGES/shared-mime-info.mo
 share/locale/kn/LC_MESSAGES/shared-mime-info.mo
 share/locale/ko/LC_MESSAGES/shared-mime-info.mo
+share/locale/ky/LC_MESSAGES/shared-mime-info.mo
 share/locale/lt/LC_MESSAGES/shared-mime-info.mo
 share/locale/lv/LC_MESSAGES/shared-mime-info.mo
 share/locale/ml/LC_MESSAGES/shared-mime-info.mo

Index: pkgsrc/databases/shared-mime-info/distinfo
diff -u pkgsrc/databases/shared-mime-info/distinfo:1.38 pkgsrc/databases/shared-mime-info/distinfo:1.39
--- pkgsrc/databases/shared-mime-info/distinfo:1.38     Tue Oct 26 10:10:04 2021
+++ pkgsrc/databases/shared-mime-info/distinfo  Thu Oct 13 11:08:43 2022
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.38 2021/10/26 10:10:04 nia Exp $
+$NetBSD: distinfo,v 1.39 2022/10/13 11:08:43 wiz Exp $
 
-BLAKE2s (shared-mime-info-1.10.tar.xz) = ef40f02b9fc7705abdc44220b262474e6c1abd97365eb3f329e18ad1c57332e3
-SHA512 (shared-mime-info-1.10.tar.xz) = efc2b63cae11e6b0332f8607ba57a885dec68a23ac299bbda3eb6e2c7ed071c7c40dba73e9cf23ab675fcaa86ea3777fa931a9f25000a08ec6a748734c88beda
-Size (shared-mime-info-1.10.tar.xz) = 616800 bytes
-SHA1 (patch-Makefile.am) = 73de6b316926b29103dc9152401563d01c152b0a
-SHA1 (patch-Makefile.in) = d7237ae74b408332cbf9e3d50a08118bcbf062b7
-SHA1 (patch-aa) = 2e55e6051412b06b2661f88673cb14154eef2c8a
+BLAKE2s (shared-mime-info-2.2.tar.bz2) = b9c873ddc28ef0760605e5a2a0e088660ed23841df6fa41e84e3d96c701698d4
+SHA512 (shared-mime-info-2.2.tar.bz2) = e32e78435b6bbcdd5abcd1b7708a715d14310f920742e762ce1d4a4f27c1215dbd6493f816d3bf8cf32cf8635a4cee031cf7ea7bad56c4034302273f25da1065
+Size (shared-mime-info-2.2.tar.bz2) = 6428871 bytes
+SHA1 (patch-src_update-mime-database.c) = c4477e3f1e1a71931be67df2556cdcf9357acb95

Added files:

Index: pkgsrc/databases/shared-mime-info/patches/patch-src_update-mime-database.c
diff -u /dev/null pkgsrc/databases/shared-mime-info/patches/patch-src_update-mime-database.c:1.1
--- /dev/null   Thu Oct 13 11:08:43 2022
+++ pkgsrc/databases/shared-mime-info/patches/patch-src_update-mime-database.c  Thu Oct 13 11:08:43 2022
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_update-mime-database.c,v 1.1 2022/10/13 11:08:43 wiz Exp $
+
+Adapt paths for pkgsrc.
+
+--- src/update-mime-database.c.orig    2022-03-27 10:19:00.000000000 +0000
++++ src/update-mime-database.c
+@@ -2174,7 +2174,7 @@ static void check_in_path_xdg_data(const
+ 
+       env = getenv("XDG_DATA_DIRS");
+       if (!env)
+-              env = "/usr/local/share/"PATH_SEPARATOR"/usr/share/";
++              env = PREFIX "/share/"PATH_SEPARATOR"/usr/local/share/"PATH_SEPARATOR"/usr/share/";
+       dirs = g_strsplit(env, PATH_SEPARATOR, 0);
+       g_return_if_fail(dirs != NULL);
+       for (n = 0; dirs[n]; n++)