svn commit: r498947 - in head: accessibility/at-spi2-core/files devel/meson multimedia/totem/files

[Tobias Kortkamp]

Author: tobik
Date: Sun Apr 14 18:34:56 2019
New Revision: 498947
URL: https://svnweb.freebsd.org/changeset/ports/498947

Log:
  devel/meson: Update to 0.50.0
  
  - Add build fixes for at-spi2-core and totem
  
  Changes:	https://mesonbuild.com/Release-notes-for-0-50-0.html
  PR:		237138
  Submitted by:	tobik
  Approved by:	portmgr (antoine)
  Exp-run by:	antoine

Added:
  head/accessibility/at-spi2-core/files/
  head/accessibility/at-spi2-core/files/patch-atspi_meson.build   (contents, props changed)
  head/multimedia/totem/files/
  head/multimedia/totem/files/patch-src_meson.build   (contents, props changed)
Modified:
  head/devel/meson/Makefile
  head/devel/meson/distinfo

Added: head/accessibility/at-spi2-core/files/patch-atspi_meson.build
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/accessibility/at-spi2-core/files/patch-atspi_meson.build	Sun Apr 14 18:34:56 2019	(r498947)
@@ -0,0 +1,27 @@
+From 44a812ea51223d82f21a098a2d45fcc5c329ce7a Mon Sep 17 00:00:00 2001
+From: Tobias Stoeckmann <tobias at 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 at 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' ],

Modified: head/devel/meson/Makefile
==============================================================================
--- head/devel/meson/Makefile	Sun Apr 14 18:26:06 2019	(r498946)
+++ head/devel/meson/Makefile	Sun Apr 14 18:34:56 2019	(r498947)
@@ -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}/
 

Modified: head/devel/meson/distinfo
==============================================================================
--- head/devel/meson/distinfo	Sun Apr 14 18:26:06 2019	(r498946)
+++ head/devel/meson/distinfo	Sun Apr 14 18:34:56 2019	(r498947)
@@ -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

Added: head/multimedia/totem/files/patch-src_meson.build
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/totem/files/patch-src_meson.build	Sun Apr 14 18:34:56 2019	(r498947)
@@ -0,0 +1,21 @@
+From 251de75543d2909ca9389800b41f6c493db5d988 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess at 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(