Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 5 Sep 2021 20:31:30 GMT
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 751f060df08b - main - devel/meson: fix patch warning after afb3593eef00
Message-ID:  <202109052031.185KVUmw011616@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=751f060df08bb93132b7869a41190da87cecaeb8

commit 751f060df08bb93132b7869a41190da87cecaeb8
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2021-09-03 01:00:41 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2021-09-05 20:31:18 +0000

    devel/meson: fix patch warning after afb3593eef00
    
    ===>  Patching for meson-0.58.1
    ===>  Applying FreeBSD patches for meson-0.58.1 from /a/ports/devel/meson/files
    No such line 37 in input file, ignoring
    
    PR:             257251
    Approved by:    tcberner
---
 devel/meson/files/patch-setup.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/devel/meson/files/patch-setup.py b/devel/meson/files/patch-setup.py
index 28d9c4c1fe9f..54608af977e8 100644
--- a/devel/meson/files/patch-setup.py
+++ b/devel/meson/files/patch-setup.py
@@ -1,6 +1,6 @@
---- setup.py.orig	2018-09-22 13:22:03 UTC
+--- setup.py.orig	2021-04-27 06:49:45 UTC
 +++ setup.py
-@@ -38,7 +38,7 @@ packages = ['mesonbuild',
+@@ -25,7 +25,7 @@ from setuptools import setup
  data_files = []
  if sys.platform != 'win32':
      # Only useful on UNIX-like systems
@@ -8,4 +8,4 @@
 +    data_files = [('man/man1', ['man/meson.1']),
                    ('share/polkit-1/actions', ['data/com.mesonbuild.install.policy'])]
  
- if __name__ == '__main__':
+ setup(data_files=data_files,)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202109052031.185KVUmw011616>