From nobody Mon Dec 16 10:45:31 2024 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 4YBc6N0F5zz5hGHQ; Mon, 16 Dec 2024 10:45:32 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YBc6M6jrnz4sZc; Mon, 16 Dec 2024 10:45:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734345931; 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=WYK4GcINKh15yFQ2FkJ7YpY4NN3vE3sXHFIVCIrWsZ4=; b=HFqYDbmwAt37bUMPoeakQg4H9OCgh6O3Np7PNNBFJR1RIb+ilk+O75llvjrizQYyfoCyJm 9PMrnmlZboZylXTmSt9kin3XAO72xipKu4h9kwoX2NmolfwCMxXcDxUfYENd8k7rVOVBWz kCRZ9v1H8V/YQFLD0INjDIojH03uhsoga90qu4k3iBxEEZcgdka6CqdXdcxYcjXleMDFGC BmEYq6M6lErfWmL5bD7KgdnnsSapFnxeTL50EpgCvmS5Q10Kgc51BKSFJQ3scwxy8lcJ76 fROHWQo6Uc0PkKQ2384bXlxst1Uych6FiqI2vsMruZ6G72A9ltUK142NC1OhvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734345931; 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=WYK4GcINKh15yFQ2FkJ7YpY4NN3vE3sXHFIVCIrWsZ4=; b=eUYM3J2YBdfTlSSWQ5muIvJgoi9rzYF43ORbEo4XzeS6QfqMF+jJTHaY3NGgIhLHFN6S7o b4DaqcH7kSnv8epdV+gHpFKh4uax4yyIYswNQ7v1zw4FtSwIaucxBmkU10ow2hB4z4733h J/HiYZki5HOrnPYkEKxWm2kvGqTDfzDrKKmqEQ6SvB8QNxLiL2a4/YFnB1qxWK3+MW2APe CbcXwFdt6HZwflBG2GVnhk2HWYOPi8dpEC5Dqglms7DvD2SAydYtFVOXTH1jsNQaev49Bj Pt3cL85PWvp+ySj/r3TUdHNmNCF9iL7yPf9yDzsbPrIDg+ULi+H8EyiJooWz6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734345931; a=rsa-sha256; cv=none; b=FN5H6PWh54j94OE08mHMQRdePBnSW+UmpcgYKnBNlDwHigfmT1wx+SXZATQaoG4auc2onZ bQSiHw4L01NPhlVqxvA/y2k3mblsHgtIjzvclvXJTSc+Z+MRDUkAnL5Vs4w9f0Np5/XK9q yVR+0rbmfoknnsN4bixoln6/ItaOFekJRnLuZVv3bUVwcbQkFe/DsdhWJ+uANJ3fBfNJ74 ua+7vBD0dffv1xNZ6E9XESMBVD+VI9TWvhtWTsaHAXYcohXZwmJNobcwnAqszwscbFsAT5 sitoiUu3tGI3nVLckvADwGzefZBVQYq7+m///ZN7mjCR9d8MO52Yi6h7fL8w0g== 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 4YBc6M6BJ7zqqQ; Mon, 16 Dec 2024 10:45:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BGAjVwp003408; Mon, 16 Dec 2024 10:45:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BGAjVwe003405; Mon, 16 Dec 2024 10:45:31 GMT (envelope-from git) Date: Mon, 16 Dec 2024 10:45:31 GMT Message-Id: <202412161045.4BGAjVwe003405@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: 97be34e0e474 - main - misc/shared-mime-info: update to 2.4 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 97be34e0e474baec75f5d20bc509255628f15719 Auto-Submitted: auto-generated The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=97be34e0e474baec75f5d20bc509255628f15719 commit 97be34e0e474baec75f5d20bc509255628f15719 Author: Жунёва Мария Михайловна AuthorDate: 2024-12-11 16:56:13 +0000 Commit: Gleb Popov CommitDate: 2024-12-16 10:45:17 +0000 misc/shared-mime-info: update to 2.4 Sponsored by: Future Crew, LLC Co-authored-by: Gleb Popov Pull Request: https://github.com/freebsd/freebsd-ports/pull/331 --- misc/shared-mime-info/Makefile | 26 ++++++---------------- misc/shared-mime-info/distinfo | 10 ++++----- .../files/patch-src_xdgmime_src_Makefile | 9 -------- misc/shared-mime-info/pkg-plist | 26 ++++++++++++---------- 4 files changed, 26 insertions(+), 45 deletions(-) diff --git a/misc/shared-mime-info/Makefile b/misc/shared-mime-info/Makefile index 944cfc2e7969..202447d9ece7 100644 --- a/misc/shared-mime-info/Makefile +++ b/misc/shared-mime-info/Makefile @@ -1,6 +1,5 @@ PORTNAME= shared-mime-info -DISTVERSION= 2.2 -PORTREVISION= 4 +DISTVERSION= 2.4 CATEGORIES= misc gnome MAINTAINER= desktop@FreeBSD.org @@ -10,8 +9,6 @@ WWW= https://www.freedesktop.org/wiki/Software/shared-mime-info/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= gmake:devel/gmake - USES= gettext gnome localbase meson pathfix pkgconfig python:build shebangfix \ tar:xz trigger CONFIGURE_ARGS= -Dupdate-mimedb=false \ @@ -21,18 +18,12 @@ USE_GITLAB= YES GL_SITE= https://gitlab.freedesktop.org/ GL_ACCOUNT= xdg GL_PROJECT= shared-mime-info -GL_TAGNAME= 13695c7225c2f525a435e72739c33ac32bbfbbb9 -GL_TUPLE= xdg:xdgmime:de283fc430460b9b3a7e61432a6d273cd64cb102:xdgmime/src/xdgmime +GL_TUPLE= xdg:xdgmime:e861d3eb3d522a9c22c5a870526728e2a3d9fc04:xdgmime/src/xdgmime bash_CMD= /bin/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 -TESTING_UNSAFE= yes # env: bash: No such file or directory +SHEBANG_FILES= ${WRKSRC}/tests/*.py \ + ${WRKSRC}/tests/mime-detection/*.py \ + ${WRKSRC}/tests/*.sh \ + ${WRKSRC}/po/check_translations.sh MIMESUBDIRS= application audio image inode message model multipart \ packages text video x-epoc x-content font @@ -40,13 +31,10 @@ MIMESUBDIRS= application audio image inode message model multipart \ post-patch: ${REINPLACE_CMD} 's|/usr/local|${LOCALBASE}|g' \ ${WRKSRC}/src/xdgmime/src/xdgmime.c \ - ${WRKSRC}/src/update-mime-database.c + ${WRKSRC}/src/update-mime-database.cpp ${REINPLACE_CMD} 's|%%PYTHON_CMD%%|${PYTHON_CMD}|g' \ ${WRKSRC}/data/freedesktop.org.xml.in -pre-configure: - cd ${WRKSRC}/src/xdgmime/src && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${GMAKE} - post-install: for dir in ${MIMESUBDIRS} ; do \ ${MKDIR} ${STAGEDIR}${PREFIX}/share/mime/$${dir} ; \ diff --git a/misc/shared-mime-info/distinfo b/misc/shared-mime-info/distinfo index b582e8054258..832131d46798 100644 --- a/misc/shared-mime-info/distinfo +++ b/misc/shared-mime-info/distinfo @@ -1,5 +1,5 @@ -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 +TIMESTAMP = 1734344715 +SHA256 (shared-mime-info-2.4.tar.bz2) = 32dc32ae39ff1c1bf8434dd3b36770b48538a1772bc0298509d034f057005992 +SIZE (shared-mime-info-2.4.tar.bz2) = 7096347 +SHA256 (xdg-xdgmime-e861d3eb3d522a9c22c5a870526728e2a3d9fc04_GL0.tar.gz) = b896fe190c3c43b5bf0b74473b4dc1eb7c5c210d2e33a073168d7a7ffe4137ad +SIZE (xdg-xdgmime-e861d3eb3d522a9c22c5a870526728e2a3d9fc04_GL0.tar.gz) = 38138 diff --git a/misc/shared-mime-info/files/patch-src_xdgmime_src_Makefile b/misc/shared-mime-info/files/patch-src_xdgmime_src_Makefile deleted file mode 100644 index ce277c611ad0..000000000000 --- a/misc/shared-mime-info/files/patch-src_xdgmime_src_Makefile +++ /dev/null @@ -1,9 +0,0 @@ ---- src/xdgmime/src/Makefile.orig 2020-08-24 07:25:48 UTC -+++ src/xdgmime/src/Makefile -@@ -1,5 +1,5 @@ - --CFLAGS=-Wall -Wmissing-prototypes -Wno-sign-compare -g -DXDG_PREFIX=xdg_test -DHAVE_MMAP -+CFLAGS+=-Wall -Wmissing-prototypes -Wno-sign-compare -g -DXDG_PREFIX=xdg_test -DHAVE_MMAP - - all: test-mime test-mime-data print-mime-data - diff --git a/misc/shared-mime-info/pkg-plist b/misc/shared-mime-info/pkg-plist index 329404867b3b..ef4694862241 100644 --- a/misc/shared-mime-info/pkg-plist +++ b/misc/shared-mime-info/pkg-plist @@ -1,6 +1,5 @@ bin/update-mime-database libdata/pkgconfig/shared-mime-info.pc -share/man/man1/update-mime-database.1.gz share/gettext/its/shared-mime-info.its share/gettext/its/shared-mime-info.loc share/locale/af/LC_MESSAGES/shared-mime-info.mo @@ -38,6 +37,7 @@ share/locale/hr/LC_MESSAGES/shared-mime-info.mo share/locale/hu/LC_MESSAGES/shared-mime-info.mo share/locale/ia/LC_MESSAGES/shared-mime-info.mo share/locale/id/LC_MESSAGES/shared-mime-info.mo +share/locale/is/LC_MESSAGES/shared-mime-info.mo share/locale/it/LC_MESSAGES/shared-mime-info.mo share/locale/ja/LC_MESSAGES/shared-mime-info.mo share/locale/ka/LC_MESSAGES/shared-mime-info.mo @@ -62,6 +62,7 @@ share/locale/pt_BR/LC_MESSAGES/shared-mime-info.mo share/locale/ro/LC_MESSAGES/shared-mime-info.mo share/locale/ru/LC_MESSAGES/shared-mime-info.mo share/locale/rw/LC_MESSAGES/shared-mime-info.mo +share/locale/si/LC_MESSAGES/shared-mime-info.mo share/locale/sk/LC_MESSAGES/shared-mime-info.mo share/locale/sl/LC_MESSAGES/shared-mime-info.mo share/locale/sq/LC_MESSAGES/shared-mime-info.mo @@ -78,16 +79,17 @@ share/locale/wa/LC_MESSAGES/shared-mime-info.mo share/locale/zh_CN/LC_MESSAGES/shared-mime-info.mo share/locale/zh_HK/LC_MESSAGES/shared-mime-info.mo share/locale/zh_TW/LC_MESSAGES/shared-mime-info.mo +share/man/man1/update-mime-database.1.gz share/mime/packages/freedesktop.org.xml -@dir share/mime/x-epoc -@dir share/mime/x-content -@dir share/mime/video -@dir share/mime/text -@dir share/mime/multipart -@dir share/mime/model -@dir share/mime/message -@dir share/mime/inode -@dir share/mime/image -@dir share/mime/font -@dir share/mime/audio @dir share/mime/application +@dir share/mime/audio +@dir share/mime/font +@dir share/mime/image +@dir share/mime/inode +@dir share/mime/message +@dir share/mime/model +@dir share/mime/multipart +@dir share/mime/text +@dir share/mime/video +@dir share/mime/x-content +@dir share/mime/x-epoc