Attachment 229236 Details for Bug 259080 – v2 (0.60.1)

[patch] v2 (0.60.1)

bug259080.diff (text/plain), 3.26 KB, created by Jan Beich on 2021-11-03 09:03:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2021-11-03 09:03:23 UTC

Size: 3.26 KB

patch

obsolete

>From 7135dee2b3d27e2512d8a53782c6b40069b3ca12 Mon Sep 17 00:00:00 2001
>From: Jan Beich <jbeich@FreeBSD.org>
>Date: Tue, 2 Nov 2021 20:55:25 +0000
>Subject: [PATCH] devel/meson: update to 0.60.1
>
>Changes:	https://mesonbuild.com/Release-notes-for-0-60-0.html
>PR:		259080
>Reported by:	GitHub (watch releases)
>Exp-run by:	antoine
>Approved by:	tcberner
>---
> devel/meson/Makefile                                   |  2 +-
> devel/meson/distinfo                                   |  6 +++---
> ..._unittests.py => patch-unittests_linuxliketests.py} |  6 +++---
> .../files/patch-data_freedesktop__generate.sh          | 10 ++++++++++
> 4 files changed, 17 insertions(+), 7 deletions(-)
> rename devel/meson/files/{patch-run__unittests.py => patch-unittests_linuxliketests.py} (75%)
> create mode 100644 misc/shared-mime-info/files/patch-data_freedesktop__generate.sh
>
>diff --git a/devel/meson/Makefile b/devel/meson/Makefile
>index 8e0095635018..57995f9c2fec 100644
>--- a/devel/meson/Makefile
>+++ b/devel/meson/Makefile
>@@ -1,7 +1,7 @@
> # Created by: Ting-Wei Lan <lantw44@gmail.com>
> 
> PORTNAME=	meson
>-PORTVERSION=	0.59.2
>+PORTVERSION=	0.60.1
> CATEGORIES=	devel python
> MASTER_SITES=	https://github.com/mesonbuild/${PORTNAME}/releases/download/${PORTVERSION}/
> 
>diff --git a/devel/meson/distinfo b/devel/meson/distinfo
>index aa9149397854..4ad11de5ebde 100644
>--- a/devel/meson/distinfo
>+++ b/devel/meson/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1633411186
>-SHA256 (meson-0.59.2.tar.gz) = 13dee549a7ba758b7e33ce7719f28d1d337a98d10d378a4779ccc996f5a2fc49
>-SIZE (meson-0.59.2.tar.gz) = 1952115
>+TIMESTAMP = 1635886525
>+SHA256 (meson-0.60.1.tar.gz) = 5add789c953d984b500858b2851ee3d7add0460cf1a6f852f0a721af17384e13
>+SIZE (meson-0.60.1.tar.gz) = 1995258
>diff --git a/devel/meson/files/patch-run__unittests.py b/devel/meson/files/patch-unittests_linuxliketests.py
>similarity index 75%
>rename from devel/meson/files/patch-run__unittests.py
>rename to devel/meson/files/patch-unittests_linuxliketests.py
>index d1866651dacb..0596fb79efa4 100644
>--- a/devel/meson/files/patch-run__unittests.py
>+++ b/devel/meson/files/patch-unittests_linuxliketests.py
>@@ -1,8 +1,8 @@
> https://github.com/mesonbuild/meson/pull/4324
> 
>---- run_unittests.py.orig	2021-05-02 09:37:39 UTC
>-+++ run_unittests.py
>-@@ -7840,7 +7840,7 @@ class LinuxlikeTests(BasePlatformTests):
>+--- unittests/linuxliketests.py.orig	2021-10-11 16:26:46 UTC
>++++ unittests/linuxliketests.py
>+@@ -1527,7 +1527,7 @@ class LinuxlikeTests(BasePlatformTests):
>          # Test that installed libraries works
>          self.new_builddir()
>          self.prefix = oldprefix
>diff --git a/misc/shared-mime-info/files/patch-data_freedesktop__generate.sh b/misc/shared-mime-info/files/patch-data_freedesktop__generate.sh
>new file mode 100644
>index 000000000000..87d0432ad90e
>--- /dev/null
>+++ b/misc/shared-mime-info/files/patch-data_freedesktop__generate.sh
>@@ -0,0 +1,10 @@
>+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"

Actions: View | Diff

Attachments on bug 259080: 228598 | 228840 | 229000 | 229236