From nobody Mon Mar 28 05:00:18 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id C1B841A4B7DD; Mon, 28 Mar 2022 05:00:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KRgVp52g0z3h2Z; Mon, 28 Mar 2022 05:00:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648443618; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Sm5FQM35fRcACEPpI18M3vqMF5vTCzT7R9tiLf54iz0=; b=FcN1lgF6PWmKF7KHuZm1CtucDOOH7nC3U51KG5jiaECp7ux9V9VBgHlxSiiEPhf06Db1Nh zpOHDcYVknLclmPg0SJUuGEfR/jUNpzHfVi6xQjYkRv99P/dT5d731r3hlDbBIrNCfQCnz J1CsKZiPgrqTWHqd6NIN18YXKhgCa7PeR3383JOaqmhcPdtyfDW8cYXv9vTuDjaVMLjDxA aLwCsfx57ykrQ2b9PP4YcZdtuMO3+Sm0nLioIndZLpWmXOq6hYGQD9d71oTDkRS0RXtkoj eytI1s1iUMZewAzXu7gdSPipYJMgz3IdkWplCSmd02Uuc4yoRR/970nVbsZwxA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 82A6D23267; Mon, 28 Mar 2022 05:00:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22S50Inj044243; Mon, 28 Mar 2022 05:00:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22S50IPp044236; Mon, 28 Mar 2022 05:00:18 GMT (envelope-from git) Date: Mon, 28 Mar 2022 05:00:18 GMT Message-Id: <202203280500.22S50IPp044236@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Tobias C. Berner" Subject: git: 875d334e7f95 - main - misc/shared-mime-info: update to 2.2 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tcberner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 875d334e7f9596e2ac598945041b2ce685ee11fb Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648443618; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Sm5FQM35fRcACEPpI18M3vqMF5vTCzT7R9tiLf54iz0=; b=UqsnCP2+YbU36mdWNjEunPXZ+aZ+Y9xCIJhprvhYe7ul+Lk1WhrNiRBxhGZQqT60vthtwZ SrIiUJRAF0AR/IYYbJezWTO8RNcVa3sxAqtRdzuJEo88sHeBSSpQHJ0z0eqVmQuh8xRGtK COScgCJrJcseKwc1pC6Tb/mxui6PZMD1vNnyFjaQh0OJZ6UL90pGqsj2eZNj7J14zY+JWN ErkOVT1Z4OgLQF0IPGmt0TFWlkKPif6qoNAF6cayyUxzl9qU6YmU44xmHFWgxoJ11PuMAS oiYqnAfsZT1QKmKTN/09ud7UWlCzRuEaWEQMpTey4NHVgyLqxHwjvROIbkDD+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648443618; a=rsa-sha256; cv=none; b=f0jZgbCeNJ5FD2YZtFTkLfWOmJMh9I31VW4tW08LmjZQ+zGqlMdCychj8c8w8ntNs+rZy2 vt19QgmeStCaATpkOuw7FioEDIl79Dd6eoCOfjiuSpS69OC+RZw4uhW99fIvkzeSeZzkk/ kdTOlpyP3uF2zoSt7Okd/E3RBtGa8zaWy+QoA4b3EQgxzNDDp6vJMbhzPlzVgywUoDFOlb ksxb0wdwiSTtzHFLinKicPn5B51iEWJkVzf+h/CEybR2qkdnLm+jLYNX8YmtUHrI7XcQRc vcicpAJMJSvT4VXcRtHCyuv+f1FNpl1sXwyDxHyK0eye3uBD4+JSMy1qrO1xNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=875d334e7f9596e2ac598945041b2ce685ee11fb commit 875d334e7f9596e2ac598945041b2ce685ee11fb Author: Tobias C. Berner AuthorDate: 2022-03-28 04:54:40 +0000 Commit: Tobias C. Berner CommitDate: 2022-03-28 04:59:56 +0000 misc/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) Changelog: https://gitlab.freedesktop.org/xdg/shared-mime-info/-/blob/master/NEWS PR: 262842 --- misc/shared-mime-info/Makefile | 21 ++++++++++++++------- misc/shared-mime-info/distinfo | 10 +++++----- .../files/patch-data_freedesktop.org.xml.in | 10 ++++++++++ .../files/patch-data_freedesktop__generate.sh | 10 ---------- misc/shared-mime-info/files/patch-meson.build | 11 +++++++++++ 5 files changed, 40 insertions(+), 22 deletions(-) diff --git a/misc/shared-mime-info/Makefile b/misc/shared-mime-info/Makefile index 27ef57f630de..d11046785b6f 100644 --- a/misc/shared-mime-info/Makefile +++ b/misc/shared-mime-info/Makefile @@ -1,8 +1,7 @@ # Created by: olgeni@FreeBSD.org PORTNAME= shared-mime-info -DISTVERSION= 2.0 -PORTREVISION= 3 +DISTVERSION= 2.2 CATEGORIES= misc gnome MAINTAINER= desktop@FreeBSD.org @@ -12,10 +11,9 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= gmake:devel/gmake \ - itstool:textproc/itstool \ minixmlto:textproc/minixmlto -USES= gettext gnome localbase meson pathfix pkgconfig shebangfix \ +USES= gettext gnome localbase meson pathfix pkgconfig python:build shebangfix \ tar:xz trigger CONFIGURE_ARGS= -Dupdate-mimedb=false \ -Dxdgmime-path=${WRKSRC}/src/xdgmime @@ -24,10 +22,17 @@ USE_GITLAB= YES GL_SITE= https://gitlab.freedesktop.org/ GL_ACCOUNT= xdg GL_PROJECT= shared-mime-info -GL_COMMIT= ef58b2b2f7ad4070171c6e45e3b3764daa3ff2c1 -GL_TUPLE= xdg:xdgmime:6663a2288d11b37bc07f5a01b4b85dcd377787e1:xdgmime/src/xdgmime +GL_COMMIT= 13695c7225c2f525a435e72739c33ac32bbfbbb9 +GL_TUPLE= xdg:xdgmime:de283fc430460b9b3a7e61432a6d273cd64cb102:xdgmime/src/xdgmime bash_CMD= /bin/sh -SHEBANG_FILES= ${WRKSRC}/data/freedesktop_generate.sh +SHEBANG_FILES= ${WRKSRC}/tests/compare_iana.py \ + ${WRKSRC}/tests/mime-detection/pyside.py \ + ${WRKSRC}/tests/mime-detection/pyside.py \ + ${WRKSRC}/tests/mime-detection/test.py \ + ${WRKSRC}/tests/mime-detection/test.py3 \ + ${WRKSRC}/tests/mime-detection/test3.py \ + ${WRKSRC}/tests/test_case.py \ + ${WRKSRC}/tests/test_sub_class_ofs.py MIMESUBDIRS= application audio image inode message model multipart \ packages text video x-epoc x-content font @@ -38,6 +43,8 @@ post-patch: ${REINPLACE_CMD} 's|/usr/local|${LOCALBASE}|g' \ ${WRKSRC}/src/xdgmime/src/xdgmime.c \ ${WRKSRC}/src/update-mime-database.c + ${REINPLACE_CMD} 's|%%PYTHON_CMD%%|${PYTHON_CMD}|g' \ + ${WRKSRC}/data/freedesktop.org.xml.in pre-configure: cd ${WRKSRC}/src/xdgmime/src && ${SETENV} ${MAKE_ENV} ${GMAKE} diff --git a/misc/shared-mime-info/distinfo b/misc/shared-mime-info/distinfo index 95b29c3b9567..b582e8054258 100644 --- a/misc/shared-mime-info/distinfo +++ b/misc/shared-mime-info/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1617891556 -SHA256 (xdg-shared-mime-info-ef58b2b2f7ad4070171c6e45e3b3764daa3ff2c1_GL0.tar.gz) = 8ed0c0877d2f77663336f894899a69804779361fb44787e10392353381667ba7 -SIZE (xdg-shared-mime-info-ef58b2b2f7ad4070171c6e45e3b3764daa3ff2c1_GL0.tar.gz) = 6514756 -SHA256 (xdg-xdgmime-6663a2288d11b37bc07f5a01b4b85dcd377787e1_GL0.tar.gz) = dce208f8bc3fd2964893d209a3d0c78e839d0df9f10d4820bdca0ef5a7116710 -SIZE (xdg-xdgmime-6663a2288d11b37bc07f5a01b4b85dcd377787e1_GL0.tar.gz) = 32289 +TIMESTAMP = 1648442982 +SHA256 (xdg-shared-mime-info-13695c7225c2f525a435e72739c33ac32bbfbbb9_GL0.tar.gz) = 206169d8f3aa428040ae706e7693fa4aa1599e304856fb797f89fe737c93b961 +SIZE (xdg-shared-mime-info-13695c7225c2f525a435e72739c33ac32bbfbbb9_GL0.tar.gz) = 7067213 +SHA256 (xdg-xdgmime-de283fc430460b9b3a7e61432a6d273cd64cb102_GL0.tar.gz) = 9856934132a561c6c669b92839604b631ff92acdfe5876606290f785f86f865d +SIZE (xdg-xdgmime-de283fc430460b9b3a7e61432a6d273cd64cb102_GL0.tar.gz) = 32249 diff --git a/misc/shared-mime-info/files/patch-data_freedesktop.org.xml.in b/misc/shared-mime-info/files/patch-data_freedesktop.org.xml.in new file mode 100644 index 000000000000..ae802ea438e7 --- /dev/null +++ b/misc/shared-mime-info/files/patch-data_freedesktop.org.xml.in @@ -0,0 +1,10 @@ +--- data/freedesktop.org.xml.in.orig 2022-03-27 10:19:00 UTC ++++ data/freedesktop.org.xml.in +@@ -6638,6 +6638,7 @@ --> + Python 3 script + + ++ + + + diff --git a/misc/shared-mime-info/files/patch-data_freedesktop__generate.sh b/misc/shared-mime-info/files/patch-data_freedesktop__generate.sh deleted file mode 100644 index 87d0432ad90e..000000000000 --- a/misc/shared-mime-info/files/patch-data_freedesktop__generate.sh +++ /dev/null @@ -1,10 +0,0 @@ -https://gitlab.freedesktop.org/xdg/shared-mime-info/-/issues/170 - ---- data/freedesktop_generate.sh.orig 2021-10-19 15:24:23 UTC -+++ data/freedesktop_generate.sh -@@ -9,4 +9,4 @@ 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" -+ "${build_root}/po/"*"/LC_MESSAGES/"*".mo" diff --git a/misc/shared-mime-info/files/patch-meson.build b/misc/shared-mime-info/files/patch-meson.build new file mode 100644 index 000000000000..37f611011ac1 --- /dev/null +++ b/misc/shared-mime-info/files/patch-meson.build @@ -0,0 +1,11 @@ +--- meson.build.orig 2022-03-28 04:52:01 UTC ++++ meson.build +@@ -74,7 +74,7 @@ configure_file( + 'prefix': get_option('prefix'), + 'VERSION': meson.project_version() + }, +- install_dir: get_option('datadir') / 'pkgconfig' ++ install_dir: join_paths(get_option('prefix'), 'libdata/pkgconfig') + ) + + if get_option('update-mimedb')