Attachment 203606 Details for Bug 237138 – v3

[patch] v3

meson-0.50.0.v3.diff (text/plain), 3.81 KB, created by Tobias Kortkamp on 2019-04-11 22:11:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tobias Kortkamp

Created: 2019-04-11 22:11:16 UTC

Size: 3.81 KB

patch

obsolete

>Index: devel/meson/Makefile
>===================================================================
>--- devel/meson/Makefile	(revision 498397)
>+++ devel/meson/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	meson
>-PORTVERSION=	0.49.2
>+PORTVERSION=	0.50.0
> CATEGORIES=	devel python
> MASTER_SITES=	https://github.com/mesonbuild/${PORTNAME}/releases/download/${PORTVERSION}/
> 
>Index: devel/meson/distinfo
>===================================================================
>--- devel/meson/distinfo	(revision 498397)
>+++ devel/meson/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1549792845
>-SHA256 (meson-0.49.2.tar.gz) = ef9f14326ec1e30d3ba1a26df0f92826ede5a79255ad723af78a2691c37109fd
>-SIZE (meson-0.49.2.tar.gz) = 1340804
>+TIMESTAMP = 1554794341
>+SHA256 (meson-0.50.0.tar.gz) = 2a1bc42dda58206fb922cda5e1ca95cc03ad126321d26acc47d3493ec4e7021f
>+SIZE (meson-0.50.0.tar.gz) = 1399202
>Index: accessibility/at-spi2-core/files/patch-atspi_meson.build
>===================================================================
>--- accessibility/at-spi2-core/files/patch-atspi_meson.build	(nonexistent)
>+++ accessibility/at-spi2-core/files/patch-atspi_meson.build	(working copy)
>@@ -0,0 +1,27 @@
>+From 44a812ea51223d82f21a098a2d45fcc5c329ce7a Mon Sep 17 00:00:00 2001
>+From: Tobias Stoeckmann <tobias@stoeckmann.org>
>+Date: Tue, 12 Mar 2019 11:46:24 +0100
>+Subject: [PATCH] Fix meson.build for meson 0.50.0.
>+
>+Since meson 0.50.0 it is not possible anymore to specify an
>+absolute directory for subdir. To keep current functionality,
>+use install_dir instead.
>+
>+atspi/meson.build:60:0: ERROR: Subdir keyword must not be an absolute path.
>+
>+Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org>
>+---
>+ atspi/meson.build | 2 +-
>+ 1 file changed, 1 insertion(+), 1 deletion(-)
>+
>+--- atspi/meson.build.orig	2019-04-11 17:26:18 UTC
>++++ atspi/meson.build
>+@@ -57,7 +57,7 @@ atspi_headers = [
>+ 
>+ atspi_includedir = join_paths(get_option('prefix'), get_option('includedir'), 'at-spi-2.0', 'atspi')
>+ 
>+-install_headers(atspi_headers, subdir: atspi_includedir)
>++install_headers(atspi_headers, install_dir: atspi_includedir)
>+ 
>+ atspi_enums = gnome.mkenums('atspi-enum-types',
>+                             sources: [ 'atspi-constants.h', 'atspi-types.h' ],
>
>Property changes on: accessibility/at-spi2-core/files/patch-atspi_meson.build
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: multimedia/totem/files/patch-src_meson.build
>===================================================================
>--- multimedia/totem/files/patch-src_meson.build	(nonexistent)
>+++ multimedia/totem/files/patch-src_meson.build	(working copy)
>@@ -0,0 +1,21 @@
>+From 251de75543d2909ca9389800b41f6c493db5d988 Mon Sep 17 00:00:00 2001
>+From: Bastien Nocera <hadess@hadess.net>
>+Date: Wed, 3 Apr 2019 13:43:03 +0200
>+Subject: [PATCH] build: Fix meson error about subdir keyword
>+
>+src/meson.build:83:0: ERROR: Subdir keyword must not be an absolute path.
>+---
>+ src/meson.build | 2 +-
>+ 1 file changed, 1 insertion(+), 1 deletion(-)
>+
>+--- src/meson.build.orig	2018-07-24 13:29:49 UTC
>++++ src/meson.build
>+@@ -86,7 +86,7 @@ headers = files(
>+ 
>+ install_headers(
>+   headers,
>+-  subdir: join_paths(totem_includedir, totem_api_path)
>++  subdir: totem_api_path
>+ )
>+ 
>+ libtotem_player_sources = files(
>
>Property changes on: multimedia/totem/files/patch-src_meson.build
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Flags:

tobik: maintainer-approval? (gnome)

Actions: View | Diff

Attachments on bug 237138: 203519 | 203600 | 203606