Attachment 190751 Details for Bug 225937 – patch

[patch] patch

meson.diff (text/plain), 2.53 KB, created by Carlos J. Puga Medina on 2018-02-18 17:39:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Carlos J. Puga Medina

Created: 2018-02-18 17:39:44 UTC

Size: 2.53 KB

patch

obsolete

>Index: devel/meson/Makefile
>===================================================================
>--- devel/meson/Makefile	(revision 461958)
>+++ devel/meson/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	meson
> PORTVERSION=	0.44.0
>+PORTREVISION=	1
> CATEGORIES=	devel python
> MASTER_SITES=	https://github.com/mesonbuild/${PORTNAME}/releases/download/${PORTVERSION}/
> 
>Index: devel/meson/files/patch-mesonbuild_modules_gnome.py
>===================================================================
>--- devel/meson/files/patch-mesonbuild_modules_gnome.py	(nonexistent)
>+++ devel/meson/files/patch-mesonbuild_modules_gnome.py	(working copy)
>@@ -0,0 +1,34 @@
>+--- mesonbuild/modules/gnome.py.orig	2018-02-16 02:17:40 UTC
>++++ mesonbuild/modules/gnome.py
>+@@ -19,6 +19,7 @@ from .. import build
>+ import os
>+ import copy
>+ import subprocess
>++from pathlib import PurePath
>+ from . import ModuleReturnValue
>+ from ..mesonlib import MesonException, OrderedSet, Popen_safe, extract_as_list
>+ from ..dependencies import Dependency, PkgConfigDependency, InternalDependency
>+@@ -244,6 +245,15 @@ class GnomeModule(ExtensionModule):
>+         def exists_in_srcdir(f):
>+             return os.path.exists(os.path.join(state.environment.get_source_dir(), f))
>+ 
>++        def strip_subdir(f):
>++            if os.path.isabs(f):
>++                return f
>++            pure_f = str(PurePath(f))
>++            prefix = os.path.commonpath([state.subdir, pure_f])
>++            if pure_f.startswith(prefix):
>++                return pure_f[len(prefix) + 1:]
>++            return f
>++
>+         depends = []
>+         subdirs = []
>+         for resfile in dep_files[:]:
>+@@ -282,6 +292,7 @@ class GnomeModule(ExtensionModule):
>+                         'generated file, pass the target that generates it to '
>+                         'gnome.compile_resources() using the "dependencies" '
>+                         'keyword argument.' % (resfile, input_file))
>++                dep_files[dep_files.index(resfile)] = strip_subdir(resfile)
>+         return dep_files, depends, subdirs
>+ 
>+     def _get_link_args(self, state, lib, depends=None, include_rpath=False,
>
>Property changes on: devel/meson/files/patch-mesonbuild_modules_gnome.py
>___________________________________________________________________
>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:keywords
>## -0,0 +1 ##
>+FreeBSD=%H
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 225937: 190671 | 190751 | 191025