Hello community, here is the log from the commit of package meson for openSUSE:Factory checked in at 2017-07-23 12:13:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/meson (Old) and /work/SRC/openSUSE:Factory/.meson.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "meson" Sun Jul 23 12:13:49 2017 rev:21 rq:512065 version:0.41.2 Changes: -------- --- /work/SRC/openSUSE:Factory/meson/meson-testsuite.changes 2017-07-12 19:32:24.174867198 +0200 +++ /work/SRC/openSUSE:Factory/.meson.new/meson-testsuite.changes 2017-07-23 12:14:10.569640734 +0200 @@ -1,0 +2,13 @@ +Sat Jul 22 13:55:52 UTC 2017 - [email protected] + +- Update to version 0.41.2: + + Various gtkdoc fixes + + Fix how rpath directories are handled. + + pkgconfig: avoid appending slash at Cflags + + Fix a missing path issue causing Python traceback. + + Qt4 support + + Skip handling non-available dependencies + + vala: Only add --use-header for unity builds regression + + Tag functions in asm properly. + +------------------------------------------------------------------- meson.changes: same change Old: ---- meson-0.41.1.tar.gz meson-0.41.1.tar.gz.asc New: ---- meson-0.41.2.tar.gz meson-0.41.2.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ meson-testsuite.spec ++++++ --- /var/tmp/diff_new_pack.PV70Ya/_old 2017-07-23 12:14:11.325533959 +0200 +++ /var/tmp/diff_new_pack.PV70Ya/_new 2017-07-23 12:14:11.325533959 +0200 @@ -24,7 +24,7 @@ %endif %define _name mesonbuild Name: meson%{name_ext} -Version: 0.41.1 +Version: 0.41.2 Release: 0 Summary: Python-based build system License: Apache-2.0 ++++++ meson.spec ++++++ --- /var/tmp/diff_new_pack.PV70Ya/_old 2017-07-23 12:14:11.349530569 +0200 +++ /var/tmp/diff_new_pack.PV70Ya/_new 2017-07-23 12:14:11.353530004 +0200 @@ -1,5 +1,5 @@ # -# spec file for package meson +# spec file for package meson-testsuite # # Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # @@ -24,7 +24,7 @@ %endif %define _name mesonbuild Name: meson%{name_ext} -Version: 0.41.1 +Version: 0.41.2 Release: 0 Summary: Python-based build system License: Apache-2.0 ++++++ meson-0.41.1.tar.gz -> meson-0.41.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meson-0.41.1/PKG-INFO new/meson-0.41.2/PKG-INFO --- old/meson-0.41.1/PKG-INFO 2017-06-19 22:47:47.000000000 +0200 +++ new/meson-0.41.2/PKG-INFO 2017-07-19 11:40:00.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: meson -Version: 0.41.1 +Version: 0.41.2 Summary: A high performance build system Home-page: http://mesonbuild.com Author: Jussi Pakkanen diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meson-0.41.1/man/meson.1 new/meson-0.41.2/man/meson.1 --- old/meson-0.41.1/man/meson.1 2017-06-19 22:46:19.000000000 +0200 +++ new/meson-0.41.2/man/meson.1 2017-07-19 11:39:36.000000000 +0200 @@ -1,4 +1,4 @@ -.TH MESON "1" "June 2017" "meson 0.41.1" "User Commands" +.TH MESON "1" "July 2017" "meson 0.41.2" "User Commands" .SH NAME meson - a high productivity build system .SH DESCRIPTION diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meson-0.41.1/man/mesonconf.1 new/meson-0.41.2/man/mesonconf.1 --- old/meson-0.41.1/man/mesonconf.1 2017-06-19 22:46:29.000000000 +0200 +++ new/meson-0.41.2/man/mesonconf.1 2017-07-19 11:39:36.000000000 +0200 @@ -1,4 +1,4 @@ -.TH MESONCONF "1" "June 2017" "mesonconf 0.41.1" "User Commands" +.TH MESONCONF "1" "July 2017" "mesonconf 0.41.2" "User Commands" .SH NAME mesonconf - a tool to configure Meson builds .SH DESCRIPTION diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meson-0.41.1/man/mesonintrospect.1 new/meson-0.41.2/man/mesonintrospect.1 --- old/meson-0.41.1/man/mesonintrospect.1 2017-06-19 22:46:15.000000000 +0200 +++ new/meson-0.41.2/man/mesonintrospect.1 2017-07-19 11:39:36.000000000 +0200 @@ -1,4 +1,4 @@ -.TH MESONCONF "1" "June 2017" "mesonintrospect 0.41.1" "User Commands" +.TH MESONCONF "1" "July 2017" "mesonintrospect 0.41.2" "User Commands" .SH NAME mesonintrospect - a tool to extract information about a Meson build .SH DESCRIPTION diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meson-0.41.1/man/mesontest.1 new/meson-0.41.2/man/mesontest.1 --- old/meson-0.41.1/man/mesontest.1 2017-06-19 22:46:24.000000000 +0200 +++ new/meson-0.41.2/man/mesontest.1 2017-07-19 11:39:36.000000000 +0200 @@ -1,4 +1,4 @@ -.TH MESON "1" "June 2017" "meson 0.41.1" "User Commands" +.TH MESON "1" "July 2017" "meson 0.41.2" "User Commands" .SH NAME mesontest - test tool for the Meson build system .SH DESCRIPTION diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meson-0.41.1/man/wraptool.1 new/meson-0.41.2/man/wraptool.1 --- old/meson-0.41.1/man/wraptool.1 2017-06-19 22:46:10.000000000 +0200 +++ new/meson-0.41.2/man/wraptool.1 2017-07-19 11:39:36.000000000 +0200 @@ -1,4 +1,4 @@ -.TH WRAPTOOL "1" "June 2017" "meson 0.41.1" "User Commands" +.TH WRAPTOOL "1" "July 2017" "meson 0.41.2" "User Commands" .SH NAME wraptool - source dependency downloader .SH DESCRIPTION diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meson-0.41.1/mesonbuild/backend/backends.py new/meson-0.41.2/mesonbuild/backend/backends.py --- old/meson-0.41.1/mesonbuild/backend/backends.py 2017-06-12 20:30:20.000000000 +0200 +++ new/meson-0.41.2/mesonbuild/backend/backends.py 2017-07-19 11:39:22.000000000 +0200 @@ -429,6 +429,9 @@ # NOTE: We must preserve the order in which external deps are # specified, so we reverse the list before iterating over it. for dep in reversed(target.get_external_deps()): + if not dep.found(): + continue + if compiler.language == 'vala': if isinstance(dep, dependencies.PkgConfigDependency): if dep.name == 'glib-2.0' and dep.version_reqs is not None: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meson-0.41.1/mesonbuild/backend/ninjabackend.py new/meson-0.41.2/mesonbuild/backend/ninjabackend.py --- old/meson-0.41.1/mesonbuild/backend/ninjabackend.py 2017-06-19 21:31:31.000000000 +0200 +++ new/meson-0.41.2/mesonbuild/backend/ninjabackend.py 2017-07-19 11:39:22.000000000 +0200 @@ -1100,7 +1100,13 @@ args += ['--library=' + target.name] # Outputted header hname = os.path.join(self.get_target_dir(target), target.vala_header) - args += ['-H', hname, '--use-header'] + args += ['-H', hname] + if self.is_unity(target): + # Without this the declarations will get duplicated in the .c + # files and cause a build failure when all of them are + # #include-d in one .c file. + # https://github.com/mesonbuild/meson/issues/1969 + args += ['--use-header'] valac_outputs.append(hname) # Outputted vapi file vapiname = os.path.join(self.get_target_dir(target), target.vala_vapi) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meson-0.41.1/mesonbuild/compilers.py new/meson-0.41.2/mesonbuild/compilers.py --- old/meson-0.41.1/mesonbuild/compilers.py 2017-06-19 21:31:31.000000000 +0200 +++ new/meson-0.41.2/mesonbuild/compilers.py 2017-07-19 11:39:22.000000000 +0200 @@ -765,7 +765,8 @@ if p == from_dir: relative = '' # relpath errors out in this case else: - relative = os.path.relpath(p, from_dir) + relative = os.path.relpath(os.path.join(build_dir, p), + os.path.join(build_dir, from_dir)) rel_rpaths.append(relative) paths = ':'.join([os.path.join('$ORIGIN', p) for p in rel_rpaths]) if len(paths) < len(install_rpath): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meson-0.41.1/mesonbuild/coredata.py new/meson-0.41.2/mesonbuild/coredata.py --- old/meson-0.41.1/mesonbuild/coredata.py 2017-06-19 22:46:04.000000000 +0200 +++ new/meson-0.41.2/mesonbuild/coredata.py 2017-07-19 11:39:36.000000000 +0200 @@ -19,7 +19,7 @@ from .mesonlib import default_libdir, default_libexecdir, default_prefix import ast -version = '0.41.1' +version = '0.41.2' backendlist = ['ninja', 'vs', 'vs2010', 'vs2015', 'vs2017', 'xcode'] class UserOption: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meson-0.41.1/mesonbuild/dependencies/ui.py new/meson-0.41.2/mesonbuild/dependencies/ui.py --- old/meson-0.41.1/mesonbuild/dependencies/ui.py 2017-06-19 21:31:31.000000000 +0200 +++ new/meson-0.41.2/mesonbuild/dependencies/ui.py 2017-07-19 11:39:22.000000000 +0200 @@ -291,10 +291,16 @@ mincdir = os.path.join(incdir, 'Qt' + module) self.compile_args.append('-I' + mincdir) if for_windows(self.env.is_cross_build(), self.env): - libfile = os.path.join(libdir, self.qtpkgname + module + '.lib') + is_debug = self.env.cmd_line_options.buildtype.startswith('debug') + dbg = 'd' if is_debug else '' + if self.qtver == '4': + base_name = 'Qt' + module + dbg + '4' + else: + base_name = 'Qt5' + module + dbg + libfile = os.path.join(libdir, base_name + '.lib') if not os.path.isfile(libfile): # MinGW can link directly to .dll - libfile = os.path.join(self.bindir, self.qtpkgname + module + '.dll') + libfile = os.path.join(self.bindir, base_name + '.dll') if not os.path.isfile(libfile): self.is_found = False break diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meson-0.41.1/mesonbuild/modules/gnome.py new/meson-0.41.2/mesonbuild/modules/gnome.py --- old/meson-0.41.1/mesonbuild/modules/gnome.py 2017-06-12 20:30:20.000000000 +0200 +++ new/meson-0.41.2/mesonbuild/modules/gnome.py 2017-07-19 11:39:22.000000000 +0200 @@ -288,13 +288,10 @@ def _get_link_args(self, state, lib, depends=None, include_rpath=False, use_gir_args=False): + link_command = [] # Construct link args - if gir_has_extra_lib_arg() and use_gir_args: - link_command = ['--extra-library=' + lib.name] - else: - link_command = ['-l' + lib.name] if isinstance(lib, build.SharedLibrary): - libdir = state.backend.get_target_dir(lib) + libdir = os.path.join(state.environment.get_build_dir(), state.backend.get_target_dir(lib)) link_command.append('-L' + libdir) # Needed for the following binutils bug: # https://github.com/mesonbuild/meson/issues/1911 @@ -303,10 +300,16 @@ for d in state.backend.determine_rpath_dirs(lib): d = os.path.join(state.environment.get_build_dir(), d) link_command.append('-L' + d) + if include_rpath: + link_command.append('-Wl,-rpath,' + d) if include_rpath: link_command.append('-Wl,-rpath,' + libdir) if depends: depends.append(lib) + if gir_has_extra_lib_arg() and use_gir_args: + link_command.append('--extra-library=' + lib.name) + else: + link_command.append('-l' + lib.name) return link_command def _get_dependencies_flags(self, deps, state, depends=None, include_rpath=False, @@ -700,6 +703,8 @@ for inc_dir in src_dir.get_incdirs(): header_dirs.append(os.path.join(state.environment.get_source_dir(), src_dir.get_curdir(), inc_dir)) + header_dirs.append(os.path.join(state.environment.get_build_dir(), + src_dir.get_curdir(), inc_dir)) else: header_dirs.append(src_dir) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meson-0.41.1/mesonbuild/modules/pkgconfig.py new/meson-0.41.2/mesonbuild/modules/pkgconfig.py --- old/meson-0.41.1/mesonbuild/modules/pkgconfig.py 2017-05-10 23:18:30.000000000 +0200 +++ new/meson-0.41.2/mesonbuild/modules/pkgconfig.py 2017-07-19 11:39:22.000000000 +0200 @@ -96,10 +96,11 @@ ofile.write('Libs.private: {}\n'.format(' '.join(generate_libs_flags(priv_libs)))) ofile.write('Cflags:') for h in subdirs: - if h == '.': - h = '' ofile.write(' ') - ofile.write(os.path.join('-I${includedir}', h)) + if h == '.': + ofile.write('-I${includedir}') + else: + ofile.write(os.path.join('-I${includedir}', h)) ofile.write('\n') def process_libs(self, libs): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meson-0.41.1/mesonbuild/scripts/gtkdochelper.py new/meson-0.41.2/mesonbuild/scripts/gtkdochelper.py --- old/meson-0.41.1/mesonbuild/scripts/gtkdochelper.py 2017-06-08 19:28:37.000000000 +0200 +++ new/meson-0.41.2/mesonbuild/scripts/gtkdochelper.py 2017-07-19 00:56:55.000000000 +0200 @@ -218,12 +218,14 @@ options.mode) if 'MESON_INSTALL_PREFIX' in os.environ: - install_dir = options.install_dir if options.install_dir else options.modulename destdir = os.environ.get('DESTDIR', '') - installdir = destdir_join(destdir, os.environ['MESON_INSTALL_PREFIX']) + install_prefix = destdir_join(destdir, os.environ['MESON_INSTALL_PREFIX']) + install_dir = options.install_dir if options.install_dir else options.modulename + if os.path.isabs(install_dir): + install_dir = destdir_join(destdir, install_dir) install_gtkdoc(options.builddir, options.subdir, - installdir, + install_prefix, 'share/gtk-doc/html', install_dir) return 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' "old/meson-0.41.1/test cases/common/127 cpp and asm/retval-arm.S" "new/meson-0.41.2/test cases/common/127 cpp and asm/retval-arm.S" --- "old/meson-0.41.1/test cases/common/127 cpp and asm/retval-arm.S" 2016-12-13 22:40:39.000000000 +0100 +++ "new/meson-0.41.2/test cases/common/127 cpp and asm/retval-arm.S" 2017-06-22 23:45:53.000000000 +0200 @@ -2,7 +2,10 @@ .text .globl SYMBOL_NAME(get_retval) +# ifdef __linux__ +.type get_retval, %function +#endif SYMBOL_NAME(get_retval): - mov r0, #0 - mov pc, lr + mov r0, #0 + mov pc, lr diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' "old/meson-0.41.1/test cases/common/127 cpp and asm/retval-x86.S" "new/meson-0.41.2/test cases/common/127 cpp and asm/retval-x86.S" --- "old/meson-0.41.1/test cases/common/127 cpp and asm/retval-x86.S" 2016-12-13 22:40:39.000000000 +0100 +++ "new/meson-0.41.2/test cases/common/127 cpp and asm/retval-x86.S" 2017-06-22 23:45:53.000000000 +0200 @@ -2,7 +2,10 @@ .text .globl SYMBOL_NAME(get_retval) +# ifdef __linux__ +.type get_retval, %function +#endif SYMBOL_NAME(get_retval): - xorl %eax, %eax - retl + xorl %eax, %eax + retl diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' "old/meson-0.41.1/test cases/common/127 cpp and asm/retval-x86_64.S" "new/meson-0.41.2/test cases/common/127 cpp and asm/retval-x86_64.S" --- "old/meson-0.41.1/test cases/common/127 cpp and asm/retval-x86_64.S" 2016-12-13 22:40:39.000000000 +0100 +++ "new/meson-0.41.2/test cases/common/127 cpp and asm/retval-x86_64.S" 2017-06-22 23:45:53.000000000 +0200 @@ -2,7 +2,10 @@ .text .globl SYMBOL_NAME(get_retval) +# ifdef __linux__ +.type get_retval, %function +#endif SYMBOL_NAME(get_retval): - xorl %eax, %eax - retq + xorl %eax, %eax + retq diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' "old/meson-0.41.1/test cases/common/141 c cpp and asm/retval-arm.S" "new/meson-0.41.2/test cases/common/141 c cpp and asm/retval-arm.S" --- "old/meson-0.41.1/test cases/common/141 c cpp and asm/retval-arm.S" 2017-04-04 18:41:09.000000000 +0200 +++ "new/meson-0.41.2/test cases/common/141 c cpp and asm/retval-arm.S" 2017-06-22 23:45:53.000000000 +0200 @@ -2,7 +2,10 @@ .text .globl SYMBOL_NAME(get_retval) +# ifdef __linux__ +.type get_retval, %function +#endif SYMBOL_NAME(get_retval): - mov r0, #0 - mov pc, lr + mov r0, #0 + mov pc, lr diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' "old/meson-0.41.1/test cases/common/141 c cpp and asm/retval-x86.S" "new/meson-0.41.2/test cases/common/141 c cpp and asm/retval-x86.S" --- "old/meson-0.41.1/test cases/common/141 c cpp and asm/retval-x86.S" 2017-04-04 18:41:09.000000000 +0200 +++ "new/meson-0.41.2/test cases/common/141 c cpp and asm/retval-x86.S" 2017-06-22 23:45:53.000000000 +0200 @@ -2,7 +2,11 @@ .text .globl SYMBOL_NAME(get_retval) +/* Only supported on Linux with GAS */ +# ifdef __linux__ +.type get_retval, %function +#endif SYMBOL_NAME(get_retval): - xorl %eax, %eax - retl + xorl %eax, %eax + retl diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' "old/meson-0.41.1/test cases/common/141 c cpp and asm/retval-x86_64.S" "new/meson-0.41.2/test cases/common/141 c cpp and asm/retval-x86_64.S" --- "old/meson-0.41.1/test cases/common/141 c cpp and asm/retval-x86_64.S" 2017-04-04 18:41:09.000000000 +0200 +++ "new/meson-0.41.2/test cases/common/141 c cpp and asm/retval-x86_64.S" 2017-06-22 23:45:53.000000000 +0200 @@ -2,7 +2,10 @@ .text .globl SYMBOL_NAME(get_retval) +# ifdef __linux__ +.type get_retval, %function +#endif SYMBOL_NAME(get_retval): - xorl %eax, %eax - retq + xorl %eax, %eax + retq diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' "old/meson-0.41.1/test cases/common/154 library at root/lib.c" "new/meson-0.41.2/test cases/common/154 library at root/lib.c" --- "old/meson-0.41.1/test cases/common/154 library at root/lib.c" 1970-01-01 01:00:00.000000000 +0100 +++ "new/meson-0.41.2/test cases/common/154 library at root/lib.c" 2017-06-29 17:13:40.000000000 +0200 @@ -0,0 +1,6 @@ +#if defined _WIN32 || defined __CYGWIN__ +__declspec(dllexport) +#endif +int fn(void) { + return -1; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' "old/meson-0.41.1/test cases/common/154 library at root/main/main.c" "new/meson-0.41.2/test cases/common/154 library at root/main/main.c" --- "old/meson-0.41.1/test cases/common/154 library at root/main/main.c" 1970-01-01 01:00:00.000000000 +0100 +++ "new/meson-0.41.2/test cases/common/154 library at root/main/main.c" 2017-06-29 17:13:40.000000000 +0200 @@ -0,0 +1,5 @@ +extern int fn(void); + +int main() { + return 1 + fn(); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' "old/meson-0.41.1/test cases/common/154 library at root/main/meson.build" "new/meson-0.41.2/test cases/common/154 library at root/main/meson.build" --- "old/meson-0.41.1/test cases/common/154 library at root/main/meson.build" 1970-01-01 01:00:00.000000000 +0100 +++ "new/meson-0.41.2/test cases/common/154 library at root/main/meson.build" 2017-06-29 17:13:40.000000000 +0200 @@ -0,0 +1,2 @@ +exe = executable('main', 'main.c', link_with : lib) +test('stuff works', exe) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' "old/meson-0.41.1/test cases/common/154 library at root/meson.build" "new/meson-0.41.2/test cases/common/154 library at root/meson.build" --- "old/meson-0.41.1/test cases/common/154 library at root/meson.build" 1970-01-01 01:00:00.000000000 +0100 +++ "new/meson-0.41.2/test cases/common/154 library at root/meson.build" 2017-07-17 13:25:25.000000000 +0200 @@ -0,0 +1,3 @@ +project('lib@root', 'c') +lib = shared_library('lib', 'lib.c') +subdir('main') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' "old/meson-0.41.1/test cases/frameworks/10 gtk-doc/doc/foobar-docs.sgml" "new/meson-0.41.2/test cases/frameworks/10 gtk-doc/doc/foobar-docs.sgml" --- "old/meson-0.41.1/test cases/frameworks/10 gtk-doc/doc/foobar-docs.sgml" 2016-01-23 19:52:39.000000000 +0100 +++ "new/meson-0.41.2/test cases/frameworks/10 gtk-doc/doc/foobar-docs.sgml" 2017-06-22 23:45:53.000000000 +0200 @@ -34,6 +34,7 @@ </para> </partintro> <xi:include href="xml/foo.xml"/> + <xi:include href="xml/foo-version.xml"/> </reference> </book> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' "old/meson-0.41.1/test cases/frameworks/10 gtk-doc/include/foo-version.h.in" "new/meson-0.41.2/test cases/frameworks/10 gtk-doc/include/foo-version.h.in" --- "old/meson-0.41.1/test cases/frameworks/10 gtk-doc/include/foo-version.h.in" 1970-01-01 01:00:00.000000000 +0100 +++ "new/meson-0.41.2/test cases/frameworks/10 gtk-doc/include/foo-version.h.in" 2017-06-22 23:45:53.000000000 +0200 @@ -0,0 +1,29 @@ +#pragma once + +/** + * SECTION:version + * @section_id: foo-version + * @short_description: <filename>foo-version.h</filename> + * @title: Foo Versioning + */ + +/** + * FOO_MAJOR_VERSION: + * + * The major version of foo. + */ +#define FOO_MAJOR_VERSION (@FOO_MAJOR_VERSION@) + +/** + * FOO_MINOR_VERSION: + * + * The minor version of foo. + */ +#define FOO_MINOR_VERSION (@FOO_MINOR_VERSION@) + +/** + * FOO_MICRO_VERSION: + * + * The micro version of foo. + */ +#define FOO_MICRO_VERSION (@FOO_MICRO_VERSION@) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' "old/meson-0.41.1/test cases/frameworks/10 gtk-doc/include/meson.build" "new/meson-0.41.2/test cases/frameworks/10 gtk-doc/include/meson.build" --- "old/meson-0.41.1/test cases/frameworks/10 gtk-doc/include/meson.build" 1970-01-01 01:00:00.000000000 +0100 +++ "new/meson-0.41.2/test cases/frameworks/10 gtk-doc/include/meson.build" 2017-06-22 23:45:53.000000000 +0200 @@ -0,0 +1,10 @@ +cdata = configuration_data() +parts = meson.project_version().split('.') +cdata.set('FOO_MAJOR_VERSION', parts[0]) +cdata.set('FOO_MINOR_VERSION', parts[1]) +cdata.set('FOO_MICRO_VERSION', parts[2]) +configure_file(input : 'foo-version.h.in', + output : 'foo-version.h', + configuration : cdata, + install : true, + install_dir : get_option('includedir')) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' "old/meson-0.41.1/test cases/frameworks/10 gtk-doc/meson.build" "new/meson-0.41.2/test cases/frameworks/10 gtk-doc/meson.build" --- "old/meson-0.41.1/test cases/frameworks/10 gtk-doc/meson.build" 2016-11-13 22:03:31.000000000 +0100 +++ "new/meson-0.41.2/test cases/frameworks/10 gtk-doc/meson.build" 2017-06-22 23:45:53.000000000 +0200 @@ -1,4 +1,4 @@ -project('gtkdoctest', 'c') +project('gtkdoctest', 'c', version : '1.0.0') gnome = import('gnome') @@ -6,6 +6,8 @@ inc = include_directories('include') +subdir('include') + # We have to disable this test until this bug fix has landed to # distros https://bugzilla.gnome.org/show_bug.cgi?id=753145 error('MESON_SKIP_TEST can not enable gtk-doc test until upstream fixes have landed.') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' "old/meson-0.41.1/test cases/vala/3 dep/meson.build" "new/meson-0.41.2/test cases/vala/3 dep/meson.build" --- "old/meson-0.41.1/test cases/vala/3 dep/meson.build" 2017-06-12 20:40:59.000000000 +0200 +++ "new/meson-0.41.2/test cases/vala/3 dep/meson.build" 2017-07-17 13:26:18.000000000 +0200 @@ -2,7 +2,10 @@ glib = dependency('glib-2.0') gobject = dependency('gobject-2.0') -gio = dependency('gio-2.0') +gio = [dependency('gio-2.0'), + # https://github.com/mesonbuild/meson/issues/1484 + dependency('gio-unix-2.0', required : false), + dependency('gio-windows-2.0', required : false)] e = executable('gioprog', 'gioprog.vala', dependencies : [glib, gobject, gio]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' "old/meson-0.41.1/test cases/vala/7 shared library/lib/meson.build" "new/meson-0.41.2/test cases/vala/7 shared library/lib/meson.build" --- "old/meson-0.41.1/test cases/vala/7 shared library/lib/meson.build" 2017-04-15 16:27:38.000000000 +0200 +++ "new/meson-0.41.2/test cases/vala/7 shared library/lib/meson.build" 2017-06-22 23:45:53.000000000 +0200 @@ -1,4 +1,12 @@ -l = shared_library('valalib', 'mylib.vala', dependencies : valadeps) +args = [] +# https://github.com/mesonbuild/meson/issues/1969 +if get_option('unity') == 'on' + vala_args = ['-H', 'mylib.h'] +endif + +l = shared_library('valalib', 'mylib.vala', + vala_args : args, + dependencies : valadeps) shared_library('installed_vala_lib', 'mylib.vala', dependencies : valadeps,
