vmihalko / t2_polkit

Other
0 stars 0 forks source link

docs: fix building with meson 0.61.1 - [merged] #314

Closed vmihalko closed 1 year ago

vmihalko commented 2 years ago

In GitLab by @mikhailnov on Jan 25, 2022, 20:19

Merges fix-meson-0.61 -> master

I got the following errors when trying to build with meson 0.61.1: [1] docs/polkit/meson.build:18:6: ERROR: gnome.gtkdoc keyword argument 'gobject_typesfile' was of type array[File] but should have been array[str] [2] docs/polkit/meson.build:18:6: ERROR: gnome.gtkdoc keyword argument 'html_assets' was of type array[File] but should have been array[str]

Writing polkit-1.types explicitly because there is only one such file. Moved html_images into another file because this variable is used only there.

I had to prefix image paths with "../" because otherwise I got: [3] No such file or directory: '/tmp/abf/rpmbuild/BUILD/polkit-0.119/docs/polkit/polkit-architecture.png'

It is a quick fix that I had to make just to build polkit with a fix of CVE-2021-4034 applied, please fix meson in a better way if needed.

Signed-off-by: Mikhail Novosyolov m.novosyolov@rosalinux.ru

vmihalko commented 2 years ago

In GitLab by @jrybar on Mar 30, 2022, 15:19

Hello Mikhail,

thanks for your work and time! Our CI pipelines seem to not fail on this stage. Can you please provide some info about the environment the build failed on for you? Thanks.

vmihalko commented 2 years ago

In GitLab by @jrybar on May 10, 2022, 10:06

@mikhailnov friendly ping. ^

vmihalko commented 2 years ago

In GitLab by @eschwartz on May 11, 2022, 21:39

I got the following errors when trying to build with meson 0.61.1

This should not be possible. The error you reported was a Meson bug in 0.61.0, which was fixed in the .1 point release you say you are using. The current version of 0.61.x (currently being maintained as an LTS release) is 0.61.4

For context see https://github.com/mesonbuild/meson/pull/9812 which landed on master as mesonbuild/meson@bcfb4d0 and in 0.61.1 as mesonbuild/meson@99ef11b

vmihalko commented 2 years ago

In GitLab by @eschwartz on May 11, 2022, 21:44

Commented on docs/polkit/meson.build line 33

This does two things:

  gobject_typesfile: doc_module + '.types',
vmihalko commented 2 years ago

In GitLab by @eschwartz on May 11, 2022, 21:49

Commented on docs/polkit/meson.build line 33

BTW: the purpose of the files() function is to create special objects that can be assigned to variables, and then reused in other subdirs while remembering the correct location of the files they refer to.

It is often harmless, but always totally useless, to define a files() inline as a function kwarg, because you don't need or get the benefit of the one purpose of the function. You might as well use the string itself, without first converting it via files(), and save yourself 7 bytes plus help avoid overflowing an 80-character recommended line limit.

(Also internally, this just makes the Meson DSL interpreter parse this as a mesonlib.File class instance, but regardless, Meson will convert a string to one anyway, under the hood.)

The other case of files() is actually useful, because it defines them in one file and uses them in another file.

vmihalko commented 2 years ago

In GitLab by @jrybar on Sep 9, 2022, 10:08

resolved all threads

vmihalko commented 2 years ago

In GitLab by @jrybar on Sep 9, 2022, 10:08

Commented on docs/polkit/meson.build line 33

changed this line in version 2 of the diff

vmihalko commented 2 years ago

In GitLab by @jrybar on Sep 9, 2022, 10:08

added 1 commit

Compare with previous version

vmihalko commented 2 years ago

In GitLab by @jrybar on Sep 9, 2022, 15:43

added 32 commits

Compare with previous version

vmihalko commented 2 years ago

In GitLab by @jrybar on Sep 9, 2022, 16:29

Moving .png file list under gtkdoc subproject/subdirectory actually makes sense.
Also, Eli is true that files() brought no actual bonus and replacing it for variable will align it with the rest of the function's call parameters.