From 5bbd239372229d30da7c415f9d399cb2e0606c52 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Nov 14 2016 19:02:21 +0000 Subject: Update to 0.36.0 Signed-off-by: Igor Gnatenko --- diff --git a/.gitignore b/.gitignore index 0cff5b2..7abc8c6 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ /meson-0.34.0.tar.gz /meson-0.35.0.tar.gz /meson-0.35.1.tar.gz +/meson-0.36.0.tar.gz diff --git a/0001-tools-ac_converter-couple-of-trivial-fixes-867.patch b/0001-tools-ac_converter-couple-of-trivial-fixes-867.patch deleted file mode 100644 index ade2116..0000000 --- a/0001-tools-ac_converter-couple-of-trivial-fixes-867.patch +++ /dev/null @@ -1,63 +0,0 @@ -From f861391a5916aa5fcbdd0390bad6afa908ee6d29 Mon Sep 17 00:00:00 2001 -From: Igor Gnatenko -Date: Fri, 7 Oct 2016 20:04:46 +0200 -Subject: [PATCH 01/10] tools/ac_converter: couple of trivial fixes (#867) - -W: 31, 4: Duplicate key 'HAVE_UNSETENV' in dictionary (duplicate-key) - -Signed-off-by: Igor Gnatenko - -* tools/ac_converter: fix undefined variable 'func' - -E:283,11: Undefined variable 'func' (undefined-variable) - -Signed-off-by: Igor Gnatenko - -* tools/ac_converter: use spaces properly in HAVE_SOCKET - -C: 97, 0: Exactly one space required after comma - 'HAVE_SOCKET' : ('socket',' sys/socket.h'), - ^ (bad-whitespace) - -This also might cause some issue after conversion. - -Signed-off-by: Igor Gnatenko - -(cherry picked from commit 1df8c5c62b7492b89eb4c3d836d33eba215def7f) ---- - tools/ac_converter.py | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/tools/ac_converter.py b/tools/ac_converter.py -index c7c9f44..4f284af 100755 ---- a/tools/ac_converter.py -+++ b/tools/ac_converter.py -@@ -94,7 +94,7 @@ function_data = \ - 'HAVE_READLINK': ('readlink', 'unistd.h'), - 'HAVE_RES_INIT': ('res_init', 'resolv.h'), - 'HAVE_SENDMMSG': ('sendmmsg', 'sys/socket.h'), -- 'HAVE_SOCKET' : ('socket',' sys/socket.h'), -+ 'HAVE_SOCKET' : ('socket', 'sys/socket.h'), - 'HAVE_GETENV': ('getenv', 'stdlib.h'), - 'HAVE_SETENV': ('setenv', 'stdlib.h'), - 'HAVE_PUTENV': ('putenv', 'stdlib.h'), -@@ -115,7 +115,6 @@ function_data = \ - 'HAVE_SYMLINK': ('symlink', 'unistd.h'), - 'HAVE_SYSCTLBYNAME': ('sysctlbyname', 'sys/sysctl.h'), - 'HAVE_TIMEGM': ('timegm', 'time.h'), -- 'HAVE_UNSETENV': ('unsetenv', 'stdlib.h'), - 'HAVE_USELOCALE': ('uselocale', 'xlocale.h'), - 'HAVE_UTIMES': ('utimes', 'sys/time.h'), - 'HAVE_VALLOC': ('valloc', 'stdlib.h'), -@@ -280,7 +279,7 @@ endforeach - - print('check_functions = [') - for token in functions: -- if len(func) == 3: -+ if len(token) == 3: - token, fdata0, fdata1 = token - print(" ['%s', '%s', '#include<%s>']," % (token, fdata0, fdata1)) - else: --- -2.10.1 - diff --git a/0002-Remove-shebangs-on-files-that-are-not-runnable-and-a.patch b/0002-Remove-shebangs-on-files-that-are-not-runnable-and-a.patch deleted file mode 100644 index 8c46633..0000000 --- a/0002-Remove-shebangs-on-files-that-are-not-runnable-and-a.patch +++ /dev/null @@ -1,128 +0,0 @@ -From 7550d108898b30c418d2b95e164988a3aea03471 Mon Sep 17 00:00:00 2001 -From: Jussi Pakkanen -Date: Tue, 4 Oct 2016 00:38:42 +0300 -Subject: [PATCH 02/10] Remove shebangs on files that are not runnable and add - execute bits to those that are. - -(cherry picked from commit 1f4cce86add495fb07ae9ace83907dbd1415dd68) ---- - mesonbuild/mconf.py | 2 -- - mesonbuild/mesonmain.py | 2 -- - mesonbuild/mintro.py | 2 -- - mesonbuild/scripts/commandrunner.py | 0 - mesonbuild/scripts/delwithsuffix.py | 0 - mesonbuild/scripts/depfixer.py | 0 - mesonbuild/scripts/dirchanger.py | 0 - mesonbuild/scripts/gettext.py | 2 -- - mesonbuild/scripts/gtkdochelper.py | 0 - mesonbuild/scripts/meson_benchmark.py | 0 - mesonbuild/scripts/meson_exe.py | 0 - mesonbuild/scripts/meson_install.py | 0 - mesonbuild/scripts/meson_test.py | 0 - mesonbuild/scripts/regen_checker.py | 0 - mesonbuild/scripts/scanbuild.py | 1 - - mesonbuild/scripts/symbolextractor.py | 0 - mesonbuild/scripts/vcstagger.py | 0 - 17 files changed, 9 deletions(-) - mode change 100644 => 100755 mesonbuild/scripts/commandrunner.py - mode change 100644 => 100755 mesonbuild/scripts/delwithsuffix.py - mode change 100644 => 100755 mesonbuild/scripts/depfixer.py - mode change 100644 => 100755 mesonbuild/scripts/dirchanger.py - mode change 100644 => 100755 mesonbuild/scripts/gtkdochelper.py - mode change 100644 => 100755 mesonbuild/scripts/meson_benchmark.py - mode change 100644 => 100755 mesonbuild/scripts/meson_exe.py - mode change 100644 => 100755 mesonbuild/scripts/meson_install.py - mode change 100644 => 100755 mesonbuild/scripts/meson_test.py - mode change 100644 => 100755 mesonbuild/scripts/regen_checker.py - mode change 100644 => 100755 mesonbuild/scripts/symbolextractor.py - mode change 100644 => 100755 mesonbuild/scripts/vcstagger.py - -diff --git a/mesonbuild/mconf.py b/mesonbuild/mconf.py -index afabc62..25f2c6b 100644 ---- a/mesonbuild/mconf.py -+++ b/mesonbuild/mconf.py -@@ -1,5 +1,3 @@ --#!/usr/bin/env python3 -- - # Copyright 2014-2016 The Meson development team - - # Licensed under the Apache License, Version 2.0 (the "License"); -diff --git a/mesonbuild/mesonmain.py b/mesonbuild/mesonmain.py -index f35d821..f7da1e0 100644 ---- a/mesonbuild/mesonmain.py -+++ b/mesonbuild/mesonmain.py -@@ -1,5 +1,3 @@ --#!/usr/bin/env python3 -- - # Copyright 2012-2016 The Meson development team - - # Licensed under the Apache License, Version 2.0 (the "License"); -diff --git a/mesonbuild/mintro.py b/mesonbuild/mintro.py -index 2086c37..a18912e 100644 ---- a/mesonbuild/mintro.py -+++ b/mesonbuild/mintro.py -@@ -1,5 +1,3 @@ --#!/usr/bin/env python3 -- - # Copyright 2014-2016 The Meson development team - - # Licensed under the Apache License, Version 2.0 (the "License"); -diff --git a/mesonbuild/scripts/commandrunner.py b/mesonbuild/scripts/commandrunner.py -old mode 100644 -new mode 100755 -diff --git a/mesonbuild/scripts/delwithsuffix.py b/mesonbuild/scripts/delwithsuffix.py -old mode 100644 -new mode 100755 -diff --git a/mesonbuild/scripts/depfixer.py b/mesonbuild/scripts/depfixer.py -old mode 100644 -new mode 100755 -diff --git a/mesonbuild/scripts/dirchanger.py b/mesonbuild/scripts/dirchanger.py -old mode 100644 -new mode 100755 -diff --git a/mesonbuild/scripts/gettext.py b/mesonbuild/scripts/gettext.py -index 1f0a391..ba6b242 100644 ---- a/mesonbuild/scripts/gettext.py -+++ b/mesonbuild/scripts/gettext.py -@@ -1,5 +1,3 @@ --#!/usr/bin/env python3 -- - # Copyright 2016 The Meson development team - - # Licensed under the Apache License, Version 2.0 (the "License"); -diff --git a/mesonbuild/scripts/gtkdochelper.py b/mesonbuild/scripts/gtkdochelper.py -old mode 100644 -new mode 100755 -diff --git a/mesonbuild/scripts/meson_benchmark.py b/mesonbuild/scripts/meson_benchmark.py -old mode 100644 -new mode 100755 -diff --git a/mesonbuild/scripts/meson_exe.py b/mesonbuild/scripts/meson_exe.py -old mode 100644 -new mode 100755 -diff --git a/mesonbuild/scripts/meson_install.py b/mesonbuild/scripts/meson_install.py -old mode 100644 -new mode 100755 -diff --git a/mesonbuild/scripts/meson_test.py b/mesonbuild/scripts/meson_test.py -old mode 100644 -new mode 100755 -diff --git a/mesonbuild/scripts/regen_checker.py b/mesonbuild/scripts/regen_checker.py -old mode 100644 -new mode 100755 -diff --git a/mesonbuild/scripts/scanbuild.py b/mesonbuild/scripts/scanbuild.py -index f90c3c7..f13a1a4 100644 ---- a/mesonbuild/scripts/scanbuild.py -+++ b/mesonbuild/scripts/scanbuild.py -@@ -1,5 +1,4 @@ - # Copyright 2016 The Meson development team -- - # Licensed under the Apache License, Version 2.0 (the "License"); - # you may not use this file except in compliance with the License. - # You may obtain a copy of the License at -diff --git a/mesonbuild/scripts/symbolextractor.py b/mesonbuild/scripts/symbolextractor.py -old mode 100644 -new mode 100755 -diff --git a/mesonbuild/scripts/vcstagger.py b/mesonbuild/scripts/vcstagger.py -old mode 100644 -new mode 100755 --- -2.10.1 - diff --git a/0003-gnome.generate_gir-Also-include-current-build-dir.patch b/0003-gnome.generate_gir-Also-include-current-build-dir.patch deleted file mode 100644 index 827ad10..0000000 --- a/0003-gnome.generate_gir-Also-include-current-build-dir.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 320fda7867428406771adfd3c4afa91a33fd6845 Mon Sep 17 00:00:00 2001 -From: Patrick Griffis -Date: Mon, 3 Oct 2016 12:51:23 -0400 -Subject: [PATCH 03/10] gnome.generate_gir(): Also include current build dir - -Continuation of 084b854ce057ee6d954c24e58321caa92f542bc5 - -(cherry picked from commit 94b7b59546cfbc311336ec3700393cfff3d4a840) ---- - mesonbuild/modules/gnome.py | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py -index 81cc462..be111ea 100644 ---- a/mesonbuild/modules/gnome.py -+++ b/mesonbuild/modules/gnome.py -@@ -225,7 +225,8 @@ class GnomeModule: - - extra_args = mesonlib.stringlistify(kwargs.pop('extra_args', [])) - scan_command += extra_args -- scan_command += ['-I' + os.path.join(state.environment.get_source_dir(), state.subdir)] -+ scan_command += ['-I' + os.path.join(state.environment.get_source_dir(), state.subdir), -+ '-I' + os.path.join(state.environment.get_build_dir(), state.subdir)] - scan_command += self.get_include_args(state, girtarget.get_include_dirs()) - - if 'link_with' in kwargs: --- -2.10.1 - diff --git a/0004-rpm-couple-of-improvements-and-fixes.patch b/0004-rpm-couple-of-improvements-and-fixes.patch deleted file mode 100644 index 54b422f..0000000 --- a/0004-rpm-couple-of-improvements-and-fixes.patch +++ /dev/null @@ -1,133 +0,0 @@ -From 12501846ca7f5ce3b33bb9f58839d392952e8c78 Mon Sep 17 00:00:00 2001 -From: Igor Gnatenko -Date: Sat, 8 Oct 2016 16:54:03 +0200 -Subject: [PATCH 04/10] rpm: couple of improvements and fixes - -* Don't hardcode /usr/bin, use %{_bindir} -* Implement %meson_build / %meson_install / %meson_test -* Automatic handling of out-of-tree builds - -Signed-off-by: Igor Gnatenko -(cherry picked from commit 0d58ddd739c1d7f8c0e6e49b721dd3df965167c0) ---- - data/macros.meson | 48 +++++++++++++++++++++++++++-------------------- - mesonbuild/modules/rpm.py | 22 +++++++--------------- - 2 files changed, 35 insertions(+), 35 deletions(-) - -diff --git a/data/macros.meson b/data/macros.meson -index c89854b..05ff484 100644 ---- a/data/macros.meson -+++ b/data/macros.meson -@@ -1,21 +1,29 @@ --%__meson /usr/bin/meson -+%__meson %{_bindir}/meson -+%__sourcedir . -+%__builddir %{_target_platform} -+%__meson_ninja_opts -v %{?_smp_mflags} -C %{__builddir} - --%meson() %{expand:\ -- export CFLAGS="%{optflags}" ; \ -- export CXXFLAGS="%{optflags}" ; \ -- export FFLAGS="%{optflags} -I%{_fmoddir}" ; \ -- export FCFLAGS="%{optflags} -I%{_fmoddir}" ; \ -- export LDFLAGS="%{__global_ldflags}" ; \ -- %__meson %{?1} \\\ -- --prefix=%{_prefix} \\\ -- --libdir=%{_libdir} \\\ -- --libexecdir=%{_libexecdir} \\\ -- --bindir=%{_bindir} \\\ -- --includedir=%{_includedir} \\\ -- --datadir=%{_datadir} \\\ -- --mandir=%{_mandir} \\\ -- --localedir=%{_datadir}/locale \\\ -- --sysconfdir=%{_sysconfdir} \\\ -- --buildtype=plain \ -- %{nil} \ --} -+%meson \ -+ export CFLAGS="%{optflags}" \ -+ export CXXFLAGS="%{optflags}" \ -+ export FFLAGS="%{optflags} -I%{_fmoddir}" \ -+ export FCFLAGS="%{optflags} -I%{_fmoddir}" \ -+ export LDFLAGS="%{?__global_ldflags}" \ -+ mkdir -p %{__builddir} \ -+ pushd %{__builddir} \ -+ %{__meson} \\\ -+ --buildtype=plain \\\ -+ --prefix=%{_prefix} \\\ -+ --libdir=%{_libdir} \\\ -+ --libexecdir=%{_libexecdir} \\\ -+ --bindir=%{_bindir} \\\ -+ --includedir=%{_includedir} \\\ -+ --datadir=%{_datadir} \\\ -+ --mandir=%{_mandir} \\\ -+ --localedir=%{_datadir}/locale \\\ -+ --sysconfdir=%{_sysconfdir} \\\ -+ $OLDPWD/%{__sourcedir} \ -+ popd -+%meson_build %ninja_build -C %{__builddir} -+%meson_install %ninja_install -C %{__builddir} -+%meson_test %ninja_test -C %{__builddir} -diff --git a/mesonbuild/modules/rpm.py b/mesonbuild/modules/rpm.py -index 89194e9..13aa20b 100644 ---- a/mesonbuild/modules/rpm.py -+++ b/mesonbuild/modules/rpm.py -@@ -104,7 +104,7 @@ class RPMModule: - mlog.bold('dnf provides %s' % lib.fullpath)) - for prog in state.environment.coredata.ext_progs.values(): - if not prog.found(): -- fn.write('BuildRequires: /usr/bin/%s # FIXME\n' % -+ fn.write('BuildRequires: %{_bindir}/%s # FIXME\n' % - prog.get_name()) - else: - fn.write('BuildRequires: %s\n' % ' '.join(prog.fullpath)) -@@ -115,32 +115,25 @@ class RPMModule: - if devel_subpkg: - fn.write('%package devel\n') - fn.write('Summary: Development files for %{name}\n') -- fn.write('Requires: %{name}%{?_isa} = %{version}-%{release}\n') -+ fn.write('Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}{version}-%{release}\n') - fn.write('\n') - fn.write('%description devel\n') - fn.write('Development files for %{name}.\n') - fn.write('\n') - fn.write('%prep\n') - fn.write('%autosetup\n') -- fn.write('rm -rf rpmbuilddir && mkdir rpmbuilddir\n') - fn.write('\n') - fn.write('%build\n') -- fn.write('pushd rpmbuilddir\n') -- fn.write(' %meson ..\n') -- fn.write(' ninja-build -v\n') -- fn.write('popd\n') -+ fn.write('%meson\n') -+ fn.write('%meson_build\n') - fn.write('\n') - fn.write('%install\n') -- fn.write('pushd rpmbuilddir\n') -- fn.write(' DESTDIR=%{buildroot} ninja-build -v install\n') -- fn.write('popd\n') -+ fn.write('%meson_install\n') - if len(to_delete) > 0: -- fn.write('rm -rf %s\n' % ' '.join(to_delete)) -+ fn.write('rm -vf %s\n' % ' '.join(to_delete)) - fn.write('\n') - fn.write('%check\n') -- fn.write('pushd rpmbuilddir\n') -- fn.write(' ninja-build -v test\n') -- fn.write('popd\n') -+ fn.write('%meson_test\n') - fn.write('\n') - fn.write('%files\n') - for f in files: -@@ -153,7 +146,6 @@ class RPMModule: - fn.write('\n') - if so_installed: - fn.write('%post -p /sbin/ldconfig\n') -- fn.write('\n') - fn.write('%postun -p /sbin/ldconfig\n') - fn.write('\n') - fn.write('%changelog\n') --- -2.10.1 - diff --git a/0005-fixup-rpm-couple-of-improvements-and-fixes.patch b/0005-fixup-rpm-couple-of-improvements-and-fixes.patch deleted file mode 100644 index 533f823..0000000 --- a/0005-fixup-rpm-couple-of-improvements-and-fixes.patch +++ /dev/null @@ -1,25 +0,0 @@ -From b8fa8cafd1dcb77cec9619c23aef99eb2975348d Mon Sep 17 00:00:00 2001 -From: Igor Gnatenko -Date: Sat, 8 Oct 2016 17:13:37 +0200 -Subject: [PATCH 05/10] fixup! rpm: couple of improvements and fixes - -(cherry picked from commit b0fc370e727a9ad46516d13dac442c42801884b1) ---- - data/macros.meson | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/data/macros.meson b/data/macros.meson -index 05ff484..dd0e60c 100644 ---- a/data/macros.meson -+++ b/data/macros.meson -@@ -1,7 +1,6 @@ - %__meson %{_bindir}/meson - %__sourcedir . - %__builddir %{_target_platform} --%__meson_ninja_opts -v %{?_smp_mflags} -C %{__builddir} - - %meson \ - export CFLAGS="%{optflags}" \ --- -2.10.1 - diff --git a/0006-fixup-fixup-rpm-couple-of-improvements-and-fixes.patch b/0006-fixup-fixup-rpm-couple-of-improvements-and-fixes.patch deleted file mode 100644 index 4da4e76..0000000 --- a/0006-fixup-fixup-rpm-couple-of-improvements-and-fixes.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 3e5b7cd80b2666fcb1ad4961e7ab9dfd4b99454f Mon Sep 17 00:00:00 2001 -From: Igor Gnatenko -Date: Sat, 8 Oct 2016 17:15:02 +0200 -Subject: [PATCH 06/10] fixup! fixup! rpm: couple of improvements and fixes - -(cherry picked from commit 1e640955b6f7730e365f50d810e7031511b0473b) ---- - data/macros.meson | 12 +++++++++--- - 1 file changed, 9 insertions(+), 3 deletions(-) - -diff --git a/data/macros.meson b/data/macros.meson -index dd0e60c..4b91c70 100644 ---- a/data/macros.meson -+++ b/data/macros.meson -@@ -23,6 +23,12 @@ - --sysconfdir=%{_sysconfdir} \\\ - $OLDPWD/%{__sourcedir} \ - popd --%meson_build %ninja_build -C %{__builddir} --%meson_install %ninja_install -C %{__builddir} --%meson_test %ninja_test -C %{__builddir} -+ -+%meson_build \ -+ %ninja_build -C %{__builddir} -+ -+%meson_install \ -+ %ninja_install -C %{__builddir} -+ -+%meson_test \ -+ %ninja_test -C %{__builddir} --- -2.10.1 - diff --git a/0007-Show-error-log-options-in-help.patch b/0007-Show-error-log-options-in-help.patch deleted file mode 100644 index 15e53a7..0000000 --- a/0007-Show-error-log-options-in-help.patch +++ /dev/null @@ -1,40 +0,0 @@ -From c66a24034898d0f08b69a02541b22e340fccb80c Mon Sep 17 00:00:00 2001 -From: Jussi Pakkanen -Date: Sat, 8 Oct 2016 11:17:22 -0400 -Subject: [PATCH 07/10] Show error log options in help. - -(cherry picked from commit e2b3752f875754abcc3981754505ae0db9e18155) ---- - mesonbuild/coredata.py | 2 +- - mesonbuild/mesonmain.py | 2 ++ - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/mesonbuild/coredata.py b/mesonbuild/coredata.py -index 587c6b3..2ff3bc8 100644 ---- a/mesonbuild/coredata.py -+++ b/mesonbuild/coredata.py -@@ -224,7 +224,7 @@ builtin_options = { - 'default_library' : [ UserComboOption, 'Default library type.', [ 'shared', 'static' ], 'shared' ], - 'backend' : [ UserComboOption, 'Backend to use.', backendlist, 'ninja' ], - 'stdsplit' : [ UserBooleanOption, 'Split stdout and stderr in test logs.', True ], -- 'errorlogs' : [ UserBooleanOption, "Whether to print the logs from failing tests.", False ], -+ 'errorlogs' : [ UserBooleanOption, "Whether to print the logs from failing tests.", True ], - } - - forbidden_target_names = {'clean': None, -diff --git a/mesonbuild/mesonmain.py b/mesonbuild/mesonmain.py -index f7da1e0..6374c41 100644 ---- a/mesonbuild/mesonmain.py -+++ b/mesonbuild/mesonmain.py -@@ -54,6 +54,8 @@ add_builtin_argument('werror', action='store_true') - add_builtin_argument('layout') - add_builtin_argument('default-library') - add_builtin_argument('warnlevel', dest='warning_level') -+add_builtin_argument('stdsplit', action='store_false') -+add_builtin_argument('errorlogs', action='store_false') - - parser.add_argument('--cross-file', default=None, - help='File describing cross compilation environment.') --- -2.10.1 - diff --git a/0008-setup.py-On-Unix-install-scripts-without-.py-suffix.patch b/0008-setup.py-On-Unix-install-scripts-without-.py-suffix.patch deleted file mode 100644 index 42175ad..0000000 --- a/0008-setup.py-On-Unix-install-scripts-without-.py-suffix.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 9c39bec3c0c3ff08674a4924901c1ce8b566866a Mon Sep 17 00:00:00 2001 -From: Patrick Griffis -Date: Fri, 30 Sep 2016 23:28:40 -0400 -Subject: [PATCH 08/10] setup.py: On Unix install scripts without .py suffix - -(cherry picked from commit 999669e8501501d4618588008e4bf4353a1ace2a) ---- - setup.py | 27 +++++++++++++++++++++++++++ - 1 file changed, 27 insertions(+) - -diff --git a/setup.py b/setup.py -index d5b79ae..42f8d49 100644 ---- a/setup.py -+++ b/setup.py -@@ -14,7 +14,9 @@ - # See the License for the specific language governing permissions and - # limitations under the License. - -+import os - import sys -+from os import path - - if sys.version_info[0] < 3: - print('Tried to install with Python 2, Meson only supports Python 3.') -@@ -25,8 +27,32 @@ if sys.version_info[0] < 3: - # plain distutils when setuptools is not available. - try: - from setuptools import setup -+ from setuptools.command.install_scripts import install_scripts as orig - except ImportError: - from distutils.core import setup -+ from distutils.command.install_scripts import install_scripts as orig -+ -+from distutils.file_util import copy_file -+from distutils.dir_util import mkpath -+from stat import ST_MODE -+ -+class install_scripts(orig): -+ def run(self): -+ if sys.platform == 'win32': -+ super().run() -+ return -+ -+ self.outfiles = [] -+ if not self.dry_run: -+ mkpath(self.install_dir) -+ -+ # We want the files to be installed without a suffix on Unix -+ for infile in self.get_inputs(): -+ in_stripped = infile[:-3] if infile.endswith('.py') else infile -+ outfile = path.join(self.install_dir, in_stripped) -+ # NOTE: Mode is preserved by default -+ copy_file(infile, outfile, dry_run=self.dry_run) -+ self.outfiles.append(outfile) - - from mesonbuild.coredata import version - -@@ -46,6 +72,7 @@ setup(name='meson', - 'mesonconf.py', - 'mesonintrospect.py', - 'wraptool.py'], -+ cmdclass={'install_scripts': install_scripts}, - data_files=[('share/man/man1', ['man/meson.1', - 'man/mesonconf.1', - 'man/mesonintrospect.1', --- -2.10.1 - diff --git a/0009-allow-libdir-includedir-etc.-be-absolute-paths.patch b/0009-allow-libdir-includedir-etc.-be-absolute-paths.patch deleted file mode 100644 index ed33223..0000000 --- a/0009-allow-libdir-includedir-etc.-be-absolute-paths.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 4e8696fefcc2c4ce2c5d49b19ce5b4a8a9b9debb Mon Sep 17 00:00:00 2001 -From: Igor Gnatenko -Date: Fri, 7 Oct 2016 23:15:55 +0200 -Subject: [PATCH 09/10] allow libdir/includedir/etc. be absolute paths - -In Fedora we don't care about prefix, we want to ensure that libdir -is /usr/lib64, localedir is /usr/share/locale, and cetera. - -Additionally, we don't need to ensure that prefix is absolute as we -check it in main. - -Fixes: cc19bf0f45f9 ("Move option validation in objects rather than doing it only in the conf script.") -Closes: https://github.com/mesonbuild/meson/issues/869 -Signed-off-by: Igor Gnatenko -(cherry picked from commit a513bcfde613f2a0403f7b0cd34d4bd62674c1d8) ---- - mesonbuild/coredata.py | 5 ----- - mesonbuild/mesonmain.py | 2 +- - 2 files changed, 1 insertion(+), 6 deletions(-) - -diff --git a/mesonbuild/coredata.py b/mesonbuild/coredata.py -index 2ff3bc8..34bb6f1 100644 ---- a/mesonbuild/coredata.py -+++ b/mesonbuild/coredata.py -@@ -36,11 +36,6 @@ class UserStringOption(UserOption): - def validate(self, value): - if not isinstance(value, str): - raise MesonException('Value "%s" for string option "%s" is not a string.' % (str(value), self.name)) -- if self.name == 'prefix' and not os.path.isabs(value): -- raise MesonException('Prefix option value \'{0}\' must be an absolute path.'.format(value)) -- if self.name in ('libdir', 'bindir', 'includedir', 'datadir', 'mandir', 'localedir') \ -- and os.path.isabs(value): -- raise MesonException('Option %s must not be an absolute path.' % self.name) - - def set_value(self, newvalue): - self.validate(newvalue) -diff --git a/mesonbuild/mesonmain.py b/mesonbuild/mesonmain.py -index 6374c41..43e4eee 100644 ---- a/mesonbuild/mesonmain.py -+++ b/mesonbuild/mesonmain.py -@@ -70,7 +70,7 @@ class MesonApp(): - def __init__(self, dir1, dir2, script_file, handshake, options, original_cmd_line_args): - (self.source_dir, self.build_dir) = self.validate_dirs(dir1, dir2, handshake) - if not os.path.isabs(options.prefix): -- raise RuntimeError('--prefix value \'{0}\' must be an absolute path: '.format(options.prefix)) -+ raise RuntimeError('--prefix value must be an absolute path: {!r}'.format(options.prefix)) - if options.prefix.endswith('/') or options.prefix.endswith('\\'): - # On Windows we need to preserve the trailing slash if the - # string is of type 'C:\' because 'C:' is not an absolute path. --- -2.10.1 - diff --git a/0010-Split-generator-BASENAME-at-the-first-extension.patch b/0010-Split-generator-BASENAME-at-the-first-extension.patch deleted file mode 100644 index 26684b6..0000000 --- a/0010-Split-generator-BASENAME-at-the-first-extension.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 7fdea0243db634c7ea2262826778d4eac3e8eb29 Mon Sep 17 00:00:00 2001 -From: Elliott Sales de Andrade -Date: Wed, 12 Oct 2016 20:58:33 -0400 -Subject: [PATCH 10/10] Split generator @BASENAME@ at the first extension. - -(cherry picked from commit 779788ad82166db028488f68ec90258d4ca63c7d) ---- - mesonbuild/build.py | 4 ++-- - test cases/common/118 allgenerate/meson.build | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/mesonbuild/build.py b/mesonbuild/build.py -index 1ef183b..23a5f4c 100644 ---- a/mesonbuild/build.py -+++ b/mesonbuild/build.py -@@ -733,14 +733,14 @@ class Generator(): - - def get_base_outnames(self, inname): - plainname = os.path.split(inname)[1] -- basename = plainname.split('.')[0] -+ basename = os.path.splitext(plainname)[0] - return [x.replace('@BASENAME@', basename).replace('@PLAINNAME@', plainname) for x in self.outputs] - - def get_dep_outname(self, inname): - if self.depfile is None: - raise InvalidArguments('Tried to get dep name for rule that does not have dependency file defined.') - plainname = os.path.split(inname)[1] -- basename = plainname.split('.')[0] -+ basename = os.path.splitext(plainname)[0] - return self.depfile.replace('@BASENAME@', basename).replace('@PLAINNAME@', plainname) - - def get_arglist(self): -diff --git a/test cases/common/118 allgenerate/meson.build b/test cases/common/118 allgenerate/meson.build -index 1ec93e6..36abbe9 100644 ---- a/test cases/common/118 allgenerate/meson.build -+++ b/test cases/common/118 allgenerate/meson.build -@@ -5,7 +5,7 @@ project('all sources generated', 'c', 'cpp') - comp = find_program('converter.py') - - g = generator(comp, -- output : '@BASENAME@.cpp', -+ output : '@BASENAME@', - arguments : ['@INPUT@', '@OUTPUT@']) - - c = g.process('foobar.cpp.in') -@@ -17,4 +17,4 @@ c2 = custom_target('c2gen', - input : 'foobar.cpp.in', - command : [comp, '@INPUT@', '@OUTPUT@']) - --prog2 = executable('genexe2', c2) -\ No newline at end of file -+prog2 = executable('genexe2', c2) --- -2.10.1 - diff --git a/meson.spec b/meson.spec index aaae644..64b799c 100644 --- a/meson.spec +++ b/meson.spec @@ -1,23 +1,13 @@ %global libname mesonbuild Name: meson -Version: 0.35.1 +Version: 0.36.0 Release: 1%{?dist} Summary: High productivity build system License: ASL 2.0 URL: http://mesonbuild.com/ Source0: https://github.com/mesonbuild/meson/archive/%{version}/%{name}-%{version}.tar.gz -Patch0001: 0001-tools-ac_converter-couple-of-trivial-fixes-867.patch -Patch0002: 0002-Remove-shebangs-on-files-that-are-not-runnable-and-a.patch -Patch0003: 0003-gnome.generate_gir-Also-include-current-build-dir.patch -Patch0004: 0004-rpm-couple-of-improvements-and-fixes.patch -Patch0005: 0005-fixup-rpm-couple-of-improvements-and-fixes.patch -Patch0006: 0006-fixup-fixup-rpm-couple-of-improvements-and-fixes.patch -Patch0007: 0007-Show-error-log-options-in-help.patch -Patch0008: 0008-setup.py-On-Unix-install-scripts-without-.py-suffix.patch -Patch0009: 0009-allow-libdir-includedir-etc.-be-absolute-paths.patch -Patch0010: 0010-Split-generator-BASENAME-at-the-first-extension.patch BuildArch: noarch Obsoletes: %{name}-gui < 0.31.0-3 @@ -48,6 +38,7 @@ BuildRequires: git-core BuildRequires: pkgconfig(protobuf) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gobject-introspection-1.0) python3-gobject-base gtk-doc +BuildRequires: itstool BuildRequires: pkgconfig(zlib) BuildRequires: python3-Cython Requires: ninja-build @@ -88,6 +79,9 @@ install -Dpm0644 data/macros.%{name} %{buildroot}%{rpmmacrodir}/macros.%{name} %{rpmmacrodir}/macros.%{name} %changelog +* Mon Nov 14 2016 Igor Gnatenko - 0.36.0-1 +- Update to 0.36.0 + * Tue Oct 18 2016 Igor Gnatenko - 0.35.1-1 - Update to 0.35.1 (RHBZ #1385986) diff --git a/sources b/sources index 4da72a3..405353f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ee14197c724fe5e999a367b1fb08d016 meson-0.35.1.tar.gz +5aea7b3f6e742ca1c730d5b9b779c7b8 meson-0.36.0.tar.gz