From f4cfd30c1fb093df5a29c1bfd06d0e35f2f4c495 Mon Sep 17 00:00:00 2001 From: "Satadru Pramanik, DO, MPH, MEng" Date: Thu, 11 Jul 2024 18:08:27 -0400 Subject: [PATCH] Update meson, rebuild libpsl (#10132) * meson => 1.5 Signed-off-by: Satadru Pramanik * rebuild libpsl Signed-off-by: Satadru Pramanik * suggested changes Signed-off-by: Satadru Pramanik * suggested changes, use M90 & M91 containwrs for unit tests. Signed-off-by: Satadru Pramanik * use our bash in unit tests Signed-off-by: Satadru Pramanik * adjust done logic Signed-off-by: Satadru Pramanik * do not look at ALL_CHANGED_FILES unless it is not empty Signed-off-by: Satadru Pramanik * adjust bash logic Signed-off-by: Satadru Pramanik * fix case for non-existent variable check Signed-off-by: Satadru Pramanik * use different bash test Signed-off-by: Satadru Pramanik * change bash logic again Signed-off-by: Satadru Pramanik --------- Signed-off-by: Satadru Pramanik --- .github/workflows/Unit-Test.yml | 16 +++++++------- manifest/armv7l/m/mesonbuild.filelist | 30 +++++++++++++++++++-------- manifest/i686/m/mesonbuild.filelist | 30 +++++++++++++++++++-------- manifest/x86_64/m/mesonbuild.filelist | 30 +++++++++++++++++++-------- packages/libpsl.rb | 15 +++++++------- packages/mesonbuild.rb | 13 ++++++------ 6 files changed, 84 insertions(+), 50 deletions(-) diff --git a/.github/workflows/Unit-Test.yml b/.github/workflows/Unit-Test.yml index 090cd3bc5..375d59754 100644 --- a/.github/workflows/Unit-Test.yml +++ b/.github/workflows/Unit-Test.yml @@ -24,7 +24,7 @@ jobs: ALL_CHANGED_FILES: ${{ steps.changed-ruby-files.outputs.all_changed_files }} - name: Unit Tests (x86_64) run: | - sudo docker run --rm -t satmandu/crewbuild:amd64 sudo -i -u chronos /bin/bash -c " + sudo docker run --rm -t satmandu/crewbuild:m90-x86_64 sudo -i -u chronos /bin/bash -c " echo \"CREW_REPO is ${{ github.event.pull_request.head.repo.clone_url }}\" && \ echo \"CREW_BRANCH is ${{ github.head_ref }}\" && \ CREW_REPO=${{ github.event.pull_request.head.repo.clone_url }} CREW_BRANCH=${{ github.head_ref }} crew update && \ @@ -34,10 +34,10 @@ jobs: ruby ../tests/commands/const.rb && \ ruby ../tests/commands/help.rb && \ ruby ../tests/commands/prop.rb && \ - for file in ${ALL_CHANGED_FILES}; do + ( [[ -v ALL_CHANGED_FILES ]] && [[ -n ALL_CHANGED_FILES ]] && ( for file in ${ALL_CHANGED_FILES}; do ruby ../tests/prop_test $file && \ - ruby ../tests/buildsystem_test $file && \ - done && \ + ruby ../tests/buildsystem_test $file ; \ + done ) || true ) && \ cd ~ && \ git clone --depth=1 https://github.com/chromebrew/chromebrew.git build_test && \ cd build_test && \ @@ -47,7 +47,7 @@ jobs: # This is not the best way to do things, a matrix would certainly be better. - name: Unit Tests (armv7l) run: | - sudo docker run --platform linux/arm/v7 --rm -t satmandu/crewbuild:arm32v7 sudo -i -u chronos /bin/bash -c " + sudo docker run --platform linux/arm/v7 --rm -t satmandu/crewbuild:m91-armv7l sudo -i -u chronos /bin/bash -c " echo \"CREW_REPO is ${{ github.event.pull_request.head.repo.clone_url }}\" && \ echo \"CREW_BRANCH is ${{ github.head_ref }}\" && \ CREW_REPO=${{ github.event.pull_request.head.repo.clone_url }} CREW_BRANCH=${{ github.head_ref }} crew update && \ @@ -57,10 +57,10 @@ jobs: ruby ../tests/commands/const.rb && \ ruby ../tests/commands/help.rb && \ ruby ../tests/commands/prop.rb && \ - for file in ${ALL_CHANGED_FILES}; do + ( [[ -v ALL_CHANGED_FILES ]] && [[ -n ALL_CHANGED_FILES ]] && ( for file in ${ALL_CHANGED_FILES}; do ruby ../tests/prop_test $file && \ - ruby ../tests/buildsystem_test $file && \ - done && \ + ruby ../tests/buildsystem_test $file ; \ + done ) || true ) && \ cd ~ && \ git clone --depth=1 https://github.com/chromebrew/chromebrew.git build_test && \ cd build_test && \ diff --git a/manifest/armv7l/m/mesonbuild.filelist b/manifest/armv7l/m/mesonbuild.filelist index 16fb1ed67..9a882b6e1 100644 --- a/manifest/armv7l/m/mesonbuild.filelist +++ b/manifest/armv7l/m/mesonbuild.filelist @@ -1,10 +1,10 @@ /usr/local/bin/meson -/usr/local/lib/python3.12/site-packages/meson-1.4.0-py3.12.egg-info/PKG-INFO -/usr/local/lib/python3.12/site-packages/meson-1.4.0-py3.12.egg-info/SOURCES.txt -/usr/local/lib/python3.12/site-packages/meson-1.4.0-py3.12.egg-info/dependency_links.txt -/usr/local/lib/python3.12/site-packages/meson-1.4.0-py3.12.egg-info/entry_points.txt -/usr/local/lib/python3.12/site-packages/meson-1.4.0-py3.12.egg-info/requires.txt -/usr/local/lib/python3.12/site-packages/meson-1.4.0-py3.12.egg-info/top_level.txt +/usr/local/lib/python3.12/site-packages/meson-1.5.0-py3.12.egg-info/PKG-INFO +/usr/local/lib/python3.12/site-packages/meson-1.5.0-py3.12.egg-info/SOURCES.txt +/usr/local/lib/python3.12/site-packages/meson-1.5.0-py3.12.egg-info/dependency_links.txt +/usr/local/lib/python3.12/site-packages/meson-1.5.0-py3.12.egg-info/entry_points.txt +/usr/local/lib/python3.12/site-packages/meson-1.5.0-py3.12.egg-info/requires.txt +/usr/local/lib/python3.12/site-packages/meson-1.5.0-py3.12.egg-info/top_level.txt /usr/local/lib/python3.12/site-packages/mesonbuild/__init__.py /usr/local/lib/python3.12/site-packages/mesonbuild/__pycache__/__init__.cpython-312.opt-2.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/__pycache__/__init__.cpython-312.pyc @@ -24,6 +24,8 @@ /usr/local/lib/python3.12/site-packages/mesonbuild/__pycache__/envconfig.cpython-312.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/__pycache__/environment.cpython-312.opt-2.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/__pycache__/environment.cpython-312.pyc +/usr/local/lib/python3.12/site-packages/mesonbuild/__pycache__/machinefile.cpython-312.opt-2.pyc +/usr/local/lib/python3.12/site-packages/mesonbuild/__pycache__/machinefile.cpython-312.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/__pycache__/mcompile.cpython-312.opt-2.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/__pycache__/mcompile.cpython-312.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/__pycache__/mconf.cpython-312.opt-2.pyc @@ -38,6 +40,8 @@ /usr/local/lib/python3.12/site-packages/mesonbuild/__pycache__/mesonlib.cpython-312.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/__pycache__/mesonmain.cpython-312.opt-2.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/__pycache__/mesonmain.cpython-312.pyc +/usr/local/lib/python3.12/site-packages/mesonbuild/__pycache__/mformat.cpython-312.opt-2.pyc +/usr/local/lib/python3.12/site-packages/mesonbuild/__pycache__/mformat.cpython-312.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/__pycache__/minit.cpython-312.opt-2.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/__pycache__/minit.cpython-312.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/__pycache__/minstall.cpython-312.opt-2.pyc @@ -58,6 +62,8 @@ /usr/local/lib/python3.12/site-packages/mesonbuild/__pycache__/munstable_coredata.cpython-312.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/__pycache__/optinterpreter.cpython-312.opt-2.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/__pycache__/optinterpreter.cpython-312.pyc +/usr/local/lib/python3.12/site-packages/mesonbuild/__pycache__/options.cpython-312.opt-2.pyc +/usr/local/lib/python3.12/site-packages/mesonbuild/__pycache__/options.cpython-312.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/__pycache__/programs.cpython-312.opt-2.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/__pycache__/programs.cpython-312.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/__pycache__/rewriter.cpython-312.opt-2.pyc @@ -221,6 +227,8 @@ /usr/local/lib/python3.12/site-packages/mesonbuild/compilers/mixins/__init__.py /usr/local/lib/python3.12/site-packages/mesonbuild/compilers/mixins/__pycache__/__init__.cpython-312.opt-2.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/compilers/mixins/__pycache__/__init__.cpython-312.pyc +/usr/local/lib/python3.12/site-packages/mesonbuild/compilers/mixins/__pycache__/apple.cpython-312.opt-2.pyc +/usr/local/lib/python3.12/site-packages/mesonbuild/compilers/mixins/__pycache__/apple.cpython-312.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/compilers/mixins/__pycache__/arm.cpython-312.opt-2.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/compilers/mixins/__pycache__/arm.cpython-312.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/compilers/mixins/__pycache__/ccrx.cpython-312.opt-2.pyc @@ -251,6 +259,7 @@ /usr/local/lib/python3.12/site-packages/mesonbuild/compilers/mixins/__pycache__/visualstudio.cpython-312.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/compilers/mixins/__pycache__/xc16.cpython-312.opt-2.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/compilers/mixins/__pycache__/xc16.cpython-312.pyc +/usr/local/lib/python3.12/site-packages/mesonbuild/compilers/mixins/apple.py /usr/local/lib/python3.12/site-packages/mesonbuild/compilers/mixins/arm.py /usr/local/lib/python3.12/site-packages/mesonbuild/compilers/mixins/ccrx.py /usr/local/lib/python3.12/site-packages/mesonbuild/compilers/mixins/clang.py @@ -428,6 +437,7 @@ /usr/local/lib/python3.12/site-packages/mesonbuild/linkers/base.py /usr/local/lib/python3.12/site-packages/mesonbuild/linkers/detect.py /usr/local/lib/python3.12/site-packages/mesonbuild/linkers/linkers.py +/usr/local/lib/python3.12/site-packages/mesonbuild/machinefile.py /usr/local/lib/python3.12/site-packages/mesonbuild/mcompile.py /usr/local/lib/python3.12/site-packages/mesonbuild/mconf.py /usr/local/lib/python3.12/site-packages/mesonbuild/mdevenv.py @@ -435,6 +445,7 @@ /usr/local/lib/python3.12/site-packages/mesonbuild/mesondata.py /usr/local/lib/python3.12/site-packages/mesonbuild/mesonlib.py /usr/local/lib/python3.12/site-packages/mesonbuild/mesonmain.py +/usr/local/lib/python3.12/site-packages/mesonbuild/mformat.py /usr/local/lib/python3.12/site-packages/mesonbuild/minit.py /usr/local/lib/python3.12/site-packages/mesonbuild/minstall.py /usr/local/lib/python3.12/site-packages/mesonbuild/mintro.py @@ -442,6 +453,8 @@ /usr/local/lib/python3.12/site-packages/mesonbuild/modules/__init__.py /usr/local/lib/python3.12/site-packages/mesonbuild/modules/__pycache__/__init__.cpython-312.opt-2.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/modules/__pycache__/__init__.cpython-312.pyc +/usr/local/lib/python3.12/site-packages/mesonbuild/modules/__pycache__/_qt.cpython-312.opt-2.pyc +/usr/local/lib/python3.12/site-packages/mesonbuild/modules/__pycache__/_qt.cpython-312.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/modules/__pycache__/cmake.cpython-312.opt-2.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/modules/__pycache__/cmake.cpython-312.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/modules/__pycache__/cuda.cpython-312.opt-2.pyc @@ -472,8 +485,6 @@ /usr/local/lib/python3.12/site-packages/mesonbuild/modules/__pycache__/python.cpython-312.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/modules/__pycache__/python3.cpython-312.opt-2.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/modules/__pycache__/python3.cpython-312.pyc -/usr/local/lib/python3.12/site-packages/mesonbuild/modules/__pycache__/qt.cpython-312.opt-2.pyc -/usr/local/lib/python3.12/site-packages/mesonbuild/modules/__pycache__/qt.cpython-312.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/modules/__pycache__/qt4.cpython-312.opt-2.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/modules/__pycache__/qt4.cpython-312.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/modules/__pycache__/qt5.cpython-312.opt-2.pyc @@ -490,6 +501,7 @@ /usr/local/lib/python3.12/site-packages/mesonbuild/modules/__pycache__/wayland.cpython-312.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/modules/__pycache__/windows.cpython-312.opt-2.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/modules/__pycache__/windows.cpython-312.pyc +/usr/local/lib/python3.12/site-packages/mesonbuild/modules/_qt.py /usr/local/lib/python3.12/site-packages/mesonbuild/modules/cmake.py /usr/local/lib/python3.12/site-packages/mesonbuild/modules/cuda.py /usr/local/lib/python3.12/site-packages/mesonbuild/modules/dlang.py @@ -505,7 +517,6 @@ /usr/local/lib/python3.12/site-packages/mesonbuild/modules/pkgconfig.py /usr/local/lib/python3.12/site-packages/mesonbuild/modules/python.py /usr/local/lib/python3.12/site-packages/mesonbuild/modules/python3.py -/usr/local/lib/python3.12/site-packages/mesonbuild/modules/qt.py /usr/local/lib/python3.12/site-packages/mesonbuild/modules/qt4.py /usr/local/lib/python3.12/site-packages/mesonbuild/modules/qt5.py /usr/local/lib/python3.12/site-packages/mesonbuild/modules/qt6.py @@ -520,6 +531,7 @@ /usr/local/lib/python3.12/site-packages/mesonbuild/mtest.py /usr/local/lib/python3.12/site-packages/mesonbuild/munstable_coredata.py /usr/local/lib/python3.12/site-packages/mesonbuild/optinterpreter.py +/usr/local/lib/python3.12/site-packages/mesonbuild/options.py /usr/local/lib/python3.12/site-packages/mesonbuild/programs.py /usr/local/lib/python3.12/site-packages/mesonbuild/rewriter.py /usr/local/lib/python3.12/site-packages/mesonbuild/scripts/__init__.py diff --git a/manifest/i686/m/mesonbuild.filelist b/manifest/i686/m/mesonbuild.filelist index 16fb1ed67..9a882b6e1 100644 --- a/manifest/i686/m/mesonbuild.filelist +++ b/manifest/i686/m/mesonbuild.filelist @@ -1,10 +1,10 @@ /usr/local/bin/meson -/usr/local/lib/python3.12/site-packages/meson-1.4.0-py3.12.egg-info/PKG-INFO -/usr/local/lib/python3.12/site-packages/meson-1.4.0-py3.12.egg-info/SOURCES.txt -/usr/local/lib/python3.12/site-packages/meson-1.4.0-py3.12.egg-info/dependency_links.txt -/usr/local/lib/python3.12/site-packages/meson-1.4.0-py3.12.egg-info/entry_points.txt -/usr/local/lib/python3.12/site-packages/meson-1.4.0-py3.12.egg-info/requires.txt -/usr/local/lib/python3.12/site-packages/meson-1.4.0-py3.12.egg-info/top_level.txt +/usr/local/lib/python3.12/site-packages/meson-1.5.0-py3.12.egg-info/PKG-INFO +/usr/local/lib/python3.12/site-packages/meson-1.5.0-py3.12.egg-info/SOURCES.txt +/usr/local/lib/python3.12/site-packages/meson-1.5.0-py3.12.egg-info/dependency_links.txt +/usr/local/lib/python3.12/site-packages/meson-1.5.0-py3.12.egg-info/entry_points.txt +/usr/local/lib/python3.12/site-packages/meson-1.5.0-py3.12.egg-info/requires.txt +/usr/local/lib/python3.12/site-packages/meson-1.5.0-py3.12.egg-info/top_level.txt /usr/local/lib/python3.12/site-packages/mesonbuild/__init__.py /usr/local/lib/python3.12/site-packages/mesonbuild/__pycache__/__init__.cpython-312.opt-2.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/__pycache__/__init__.cpython-312.pyc @@ -24,6 +24,8 @@ /usr/local/lib/python3.12/site-packages/mesonbuild/__pycache__/envconfig.cpython-312.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/__pycache__/environment.cpython-312.opt-2.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/__pycache__/environment.cpython-312.pyc +/usr/local/lib/python3.12/site-packages/mesonbuild/__pycache__/machinefile.cpython-312.opt-2.pyc +/usr/local/lib/python3.12/site-packages/mesonbuild/__pycache__/machinefile.cpython-312.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/__pycache__/mcompile.cpython-312.opt-2.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/__pycache__/mcompile.cpython-312.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/__pycache__/mconf.cpython-312.opt-2.pyc @@ -38,6 +40,8 @@ /usr/local/lib/python3.12/site-packages/mesonbuild/__pycache__/mesonlib.cpython-312.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/__pycache__/mesonmain.cpython-312.opt-2.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/__pycache__/mesonmain.cpython-312.pyc +/usr/local/lib/python3.12/site-packages/mesonbuild/__pycache__/mformat.cpython-312.opt-2.pyc +/usr/local/lib/python3.12/site-packages/mesonbuild/__pycache__/mformat.cpython-312.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/__pycache__/minit.cpython-312.opt-2.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/__pycache__/minit.cpython-312.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/__pycache__/minstall.cpython-312.opt-2.pyc @@ -58,6 +62,8 @@ /usr/local/lib/python3.12/site-packages/mesonbuild/__pycache__/munstable_coredata.cpython-312.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/__pycache__/optinterpreter.cpython-312.opt-2.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/__pycache__/optinterpreter.cpython-312.pyc +/usr/local/lib/python3.12/site-packages/mesonbuild/__pycache__/options.cpython-312.opt-2.pyc +/usr/local/lib/python3.12/site-packages/mesonbuild/__pycache__/options.cpython-312.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/__pycache__/programs.cpython-312.opt-2.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/__pycache__/programs.cpython-312.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/__pycache__/rewriter.cpython-312.opt-2.pyc @@ -221,6 +227,8 @@ /usr/local/lib/python3.12/site-packages/mesonbuild/compilers/mixins/__init__.py /usr/local/lib/python3.12/site-packages/mesonbuild/compilers/mixins/__pycache__/__init__.cpython-312.opt-2.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/compilers/mixins/__pycache__/__init__.cpython-312.pyc +/usr/local/lib/python3.12/site-packages/mesonbuild/compilers/mixins/__pycache__/apple.cpython-312.opt-2.pyc +/usr/local/lib/python3.12/site-packages/mesonbuild/compilers/mixins/__pycache__/apple.cpython-312.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/compilers/mixins/__pycache__/arm.cpython-312.opt-2.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/compilers/mixins/__pycache__/arm.cpython-312.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/compilers/mixins/__pycache__/ccrx.cpython-312.opt-2.pyc @@ -251,6 +259,7 @@ /usr/local/lib/python3.12/site-packages/mesonbuild/compilers/mixins/__pycache__/visualstudio.cpython-312.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/compilers/mixins/__pycache__/xc16.cpython-312.opt-2.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/compilers/mixins/__pycache__/xc16.cpython-312.pyc +/usr/local/lib/python3.12/site-packages/mesonbuild/compilers/mixins/apple.py /usr/local/lib/python3.12/site-packages/mesonbuild/compilers/mixins/arm.py /usr/local/lib/python3.12/site-packages/mesonbuild/compilers/mixins/ccrx.py /usr/local/lib/python3.12/site-packages/mesonbuild/compilers/mixins/clang.py @@ -428,6 +437,7 @@ /usr/local/lib/python3.12/site-packages/mesonbuild/linkers/base.py /usr/local/lib/python3.12/site-packages/mesonbuild/linkers/detect.py /usr/local/lib/python3.12/site-packages/mesonbuild/linkers/linkers.py +/usr/local/lib/python3.12/site-packages/mesonbuild/machinefile.py /usr/local/lib/python3.12/site-packages/mesonbuild/mcompile.py /usr/local/lib/python3.12/site-packages/mesonbuild/mconf.py /usr/local/lib/python3.12/site-packages/mesonbuild/mdevenv.py @@ -435,6 +445,7 @@ /usr/local/lib/python3.12/site-packages/mesonbuild/mesondata.py /usr/local/lib/python3.12/site-packages/mesonbuild/mesonlib.py /usr/local/lib/python3.12/site-packages/mesonbuild/mesonmain.py +/usr/local/lib/python3.12/site-packages/mesonbuild/mformat.py /usr/local/lib/python3.12/site-packages/mesonbuild/minit.py /usr/local/lib/python3.12/site-packages/mesonbuild/minstall.py /usr/local/lib/python3.12/site-packages/mesonbuild/mintro.py @@ -442,6 +453,8 @@ /usr/local/lib/python3.12/site-packages/mesonbuild/modules/__init__.py /usr/local/lib/python3.12/site-packages/mesonbuild/modules/__pycache__/__init__.cpython-312.opt-2.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/modules/__pycache__/__init__.cpython-312.pyc +/usr/local/lib/python3.12/site-packages/mesonbuild/modules/__pycache__/_qt.cpython-312.opt-2.pyc +/usr/local/lib/python3.12/site-packages/mesonbuild/modules/__pycache__/_qt.cpython-312.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/modules/__pycache__/cmake.cpython-312.opt-2.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/modules/__pycache__/cmake.cpython-312.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/modules/__pycache__/cuda.cpython-312.opt-2.pyc @@ -472,8 +485,6 @@ /usr/local/lib/python3.12/site-packages/mesonbuild/modules/__pycache__/python.cpython-312.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/modules/__pycache__/python3.cpython-312.opt-2.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/modules/__pycache__/python3.cpython-312.pyc -/usr/local/lib/python3.12/site-packages/mesonbuild/modules/__pycache__/qt.cpython-312.opt-2.pyc -/usr/local/lib/python3.12/site-packages/mesonbuild/modules/__pycache__/qt.cpython-312.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/modules/__pycache__/qt4.cpython-312.opt-2.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/modules/__pycache__/qt4.cpython-312.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/modules/__pycache__/qt5.cpython-312.opt-2.pyc @@ -490,6 +501,7 @@ /usr/local/lib/python3.12/site-packages/mesonbuild/modules/__pycache__/wayland.cpython-312.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/modules/__pycache__/windows.cpython-312.opt-2.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/modules/__pycache__/windows.cpython-312.pyc +/usr/local/lib/python3.12/site-packages/mesonbuild/modules/_qt.py /usr/local/lib/python3.12/site-packages/mesonbuild/modules/cmake.py /usr/local/lib/python3.12/site-packages/mesonbuild/modules/cuda.py /usr/local/lib/python3.12/site-packages/mesonbuild/modules/dlang.py @@ -505,7 +517,6 @@ /usr/local/lib/python3.12/site-packages/mesonbuild/modules/pkgconfig.py /usr/local/lib/python3.12/site-packages/mesonbuild/modules/python.py /usr/local/lib/python3.12/site-packages/mesonbuild/modules/python3.py -/usr/local/lib/python3.12/site-packages/mesonbuild/modules/qt.py /usr/local/lib/python3.12/site-packages/mesonbuild/modules/qt4.py /usr/local/lib/python3.12/site-packages/mesonbuild/modules/qt5.py /usr/local/lib/python3.12/site-packages/mesonbuild/modules/qt6.py @@ -520,6 +531,7 @@ /usr/local/lib/python3.12/site-packages/mesonbuild/mtest.py /usr/local/lib/python3.12/site-packages/mesonbuild/munstable_coredata.py /usr/local/lib/python3.12/site-packages/mesonbuild/optinterpreter.py +/usr/local/lib/python3.12/site-packages/mesonbuild/options.py /usr/local/lib/python3.12/site-packages/mesonbuild/programs.py /usr/local/lib/python3.12/site-packages/mesonbuild/rewriter.py /usr/local/lib/python3.12/site-packages/mesonbuild/scripts/__init__.py diff --git a/manifest/x86_64/m/mesonbuild.filelist b/manifest/x86_64/m/mesonbuild.filelist index 16fb1ed67..9a882b6e1 100644 --- a/manifest/x86_64/m/mesonbuild.filelist +++ b/manifest/x86_64/m/mesonbuild.filelist @@ -1,10 +1,10 @@ /usr/local/bin/meson -/usr/local/lib/python3.12/site-packages/meson-1.4.0-py3.12.egg-info/PKG-INFO -/usr/local/lib/python3.12/site-packages/meson-1.4.0-py3.12.egg-info/SOURCES.txt -/usr/local/lib/python3.12/site-packages/meson-1.4.0-py3.12.egg-info/dependency_links.txt -/usr/local/lib/python3.12/site-packages/meson-1.4.0-py3.12.egg-info/entry_points.txt -/usr/local/lib/python3.12/site-packages/meson-1.4.0-py3.12.egg-info/requires.txt -/usr/local/lib/python3.12/site-packages/meson-1.4.0-py3.12.egg-info/top_level.txt +/usr/local/lib/python3.12/site-packages/meson-1.5.0-py3.12.egg-info/PKG-INFO +/usr/local/lib/python3.12/site-packages/meson-1.5.0-py3.12.egg-info/SOURCES.txt +/usr/local/lib/python3.12/site-packages/meson-1.5.0-py3.12.egg-info/dependency_links.txt +/usr/local/lib/python3.12/site-packages/meson-1.5.0-py3.12.egg-info/entry_points.txt +/usr/local/lib/python3.12/site-packages/meson-1.5.0-py3.12.egg-info/requires.txt +/usr/local/lib/python3.12/site-packages/meson-1.5.0-py3.12.egg-info/top_level.txt /usr/local/lib/python3.12/site-packages/mesonbuild/__init__.py /usr/local/lib/python3.12/site-packages/mesonbuild/__pycache__/__init__.cpython-312.opt-2.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/__pycache__/__init__.cpython-312.pyc @@ -24,6 +24,8 @@ /usr/local/lib/python3.12/site-packages/mesonbuild/__pycache__/envconfig.cpython-312.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/__pycache__/environment.cpython-312.opt-2.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/__pycache__/environment.cpython-312.pyc +/usr/local/lib/python3.12/site-packages/mesonbuild/__pycache__/machinefile.cpython-312.opt-2.pyc +/usr/local/lib/python3.12/site-packages/mesonbuild/__pycache__/machinefile.cpython-312.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/__pycache__/mcompile.cpython-312.opt-2.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/__pycache__/mcompile.cpython-312.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/__pycache__/mconf.cpython-312.opt-2.pyc @@ -38,6 +40,8 @@ /usr/local/lib/python3.12/site-packages/mesonbuild/__pycache__/mesonlib.cpython-312.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/__pycache__/mesonmain.cpython-312.opt-2.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/__pycache__/mesonmain.cpython-312.pyc +/usr/local/lib/python3.12/site-packages/mesonbuild/__pycache__/mformat.cpython-312.opt-2.pyc +/usr/local/lib/python3.12/site-packages/mesonbuild/__pycache__/mformat.cpython-312.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/__pycache__/minit.cpython-312.opt-2.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/__pycache__/minit.cpython-312.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/__pycache__/minstall.cpython-312.opt-2.pyc @@ -58,6 +62,8 @@ /usr/local/lib/python3.12/site-packages/mesonbuild/__pycache__/munstable_coredata.cpython-312.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/__pycache__/optinterpreter.cpython-312.opt-2.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/__pycache__/optinterpreter.cpython-312.pyc +/usr/local/lib/python3.12/site-packages/mesonbuild/__pycache__/options.cpython-312.opt-2.pyc +/usr/local/lib/python3.12/site-packages/mesonbuild/__pycache__/options.cpython-312.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/__pycache__/programs.cpython-312.opt-2.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/__pycache__/programs.cpython-312.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/__pycache__/rewriter.cpython-312.opt-2.pyc @@ -221,6 +227,8 @@ /usr/local/lib/python3.12/site-packages/mesonbuild/compilers/mixins/__init__.py /usr/local/lib/python3.12/site-packages/mesonbuild/compilers/mixins/__pycache__/__init__.cpython-312.opt-2.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/compilers/mixins/__pycache__/__init__.cpython-312.pyc +/usr/local/lib/python3.12/site-packages/mesonbuild/compilers/mixins/__pycache__/apple.cpython-312.opt-2.pyc +/usr/local/lib/python3.12/site-packages/mesonbuild/compilers/mixins/__pycache__/apple.cpython-312.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/compilers/mixins/__pycache__/arm.cpython-312.opt-2.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/compilers/mixins/__pycache__/arm.cpython-312.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/compilers/mixins/__pycache__/ccrx.cpython-312.opt-2.pyc @@ -251,6 +259,7 @@ /usr/local/lib/python3.12/site-packages/mesonbuild/compilers/mixins/__pycache__/visualstudio.cpython-312.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/compilers/mixins/__pycache__/xc16.cpython-312.opt-2.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/compilers/mixins/__pycache__/xc16.cpython-312.pyc +/usr/local/lib/python3.12/site-packages/mesonbuild/compilers/mixins/apple.py /usr/local/lib/python3.12/site-packages/mesonbuild/compilers/mixins/arm.py /usr/local/lib/python3.12/site-packages/mesonbuild/compilers/mixins/ccrx.py /usr/local/lib/python3.12/site-packages/mesonbuild/compilers/mixins/clang.py @@ -428,6 +437,7 @@ /usr/local/lib/python3.12/site-packages/mesonbuild/linkers/base.py /usr/local/lib/python3.12/site-packages/mesonbuild/linkers/detect.py /usr/local/lib/python3.12/site-packages/mesonbuild/linkers/linkers.py +/usr/local/lib/python3.12/site-packages/mesonbuild/machinefile.py /usr/local/lib/python3.12/site-packages/mesonbuild/mcompile.py /usr/local/lib/python3.12/site-packages/mesonbuild/mconf.py /usr/local/lib/python3.12/site-packages/mesonbuild/mdevenv.py @@ -435,6 +445,7 @@ /usr/local/lib/python3.12/site-packages/mesonbuild/mesondata.py /usr/local/lib/python3.12/site-packages/mesonbuild/mesonlib.py /usr/local/lib/python3.12/site-packages/mesonbuild/mesonmain.py +/usr/local/lib/python3.12/site-packages/mesonbuild/mformat.py /usr/local/lib/python3.12/site-packages/mesonbuild/minit.py /usr/local/lib/python3.12/site-packages/mesonbuild/minstall.py /usr/local/lib/python3.12/site-packages/mesonbuild/mintro.py @@ -442,6 +453,8 @@ /usr/local/lib/python3.12/site-packages/mesonbuild/modules/__init__.py /usr/local/lib/python3.12/site-packages/mesonbuild/modules/__pycache__/__init__.cpython-312.opt-2.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/modules/__pycache__/__init__.cpython-312.pyc +/usr/local/lib/python3.12/site-packages/mesonbuild/modules/__pycache__/_qt.cpython-312.opt-2.pyc +/usr/local/lib/python3.12/site-packages/mesonbuild/modules/__pycache__/_qt.cpython-312.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/modules/__pycache__/cmake.cpython-312.opt-2.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/modules/__pycache__/cmake.cpython-312.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/modules/__pycache__/cuda.cpython-312.opt-2.pyc @@ -472,8 +485,6 @@ /usr/local/lib/python3.12/site-packages/mesonbuild/modules/__pycache__/python.cpython-312.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/modules/__pycache__/python3.cpython-312.opt-2.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/modules/__pycache__/python3.cpython-312.pyc -/usr/local/lib/python3.12/site-packages/mesonbuild/modules/__pycache__/qt.cpython-312.opt-2.pyc -/usr/local/lib/python3.12/site-packages/mesonbuild/modules/__pycache__/qt.cpython-312.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/modules/__pycache__/qt4.cpython-312.opt-2.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/modules/__pycache__/qt4.cpython-312.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/modules/__pycache__/qt5.cpython-312.opt-2.pyc @@ -490,6 +501,7 @@ /usr/local/lib/python3.12/site-packages/mesonbuild/modules/__pycache__/wayland.cpython-312.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/modules/__pycache__/windows.cpython-312.opt-2.pyc /usr/local/lib/python3.12/site-packages/mesonbuild/modules/__pycache__/windows.cpython-312.pyc +/usr/local/lib/python3.12/site-packages/mesonbuild/modules/_qt.py /usr/local/lib/python3.12/site-packages/mesonbuild/modules/cmake.py /usr/local/lib/python3.12/site-packages/mesonbuild/modules/cuda.py /usr/local/lib/python3.12/site-packages/mesonbuild/modules/dlang.py @@ -505,7 +517,6 @@ /usr/local/lib/python3.12/site-packages/mesonbuild/modules/pkgconfig.py /usr/local/lib/python3.12/site-packages/mesonbuild/modules/python.py /usr/local/lib/python3.12/site-packages/mesonbuild/modules/python3.py -/usr/local/lib/python3.12/site-packages/mesonbuild/modules/qt.py /usr/local/lib/python3.12/site-packages/mesonbuild/modules/qt4.py /usr/local/lib/python3.12/site-packages/mesonbuild/modules/qt5.py /usr/local/lib/python3.12/site-packages/mesonbuild/modules/qt6.py @@ -520,6 +531,7 @@ /usr/local/lib/python3.12/site-packages/mesonbuild/mtest.py /usr/local/lib/python3.12/site-packages/mesonbuild/munstable_coredata.py /usr/local/lib/python3.12/site-packages/mesonbuild/optinterpreter.py +/usr/local/lib/python3.12/site-packages/mesonbuild/options.py /usr/local/lib/python3.12/site-packages/mesonbuild/programs.py /usr/local/lib/python3.12/site-packages/mesonbuild/rewriter.py /usr/local/lib/python3.12/site-packages/mesonbuild/scripts/__init__.py diff --git a/packages/libpsl.rb b/packages/libpsl.rb index e6e0164bc..1a14e0006 100644 --- a/packages/libpsl.rb +++ b/packages/libpsl.rb @@ -3,19 +3,18 @@ require 'buildsystems/meson' class Libpsl < Meson description 'C library for the Public Suffix List' homepage 'https://github.com/rockdaboot/libpsl' - @_ver = '0.21.2' - version @_ver.to_s + version '0.21.5-1' license 'MIT' compatibility 'all' - source_url "https://github.com/rockdaboot/libpsl/releases/download/#{@_ver}/libpsl-#{@_ver}.tar.lz" - source_sha256 'aa3d706c452786d1345e094dae201cd36d81f03cf81d636d5cfc10d365907f17' + source_url 'https://github.com/rockdaboot/libpsl.git' + git_hashtag version.split('-').first binary_compression 'tar.zst' binary_sha256({ - aarch64: '81c52e6dc9a2d935016d0f1d65dde2e2fa122f55e79c3a4a9465698041c5fe63', - armv7l: '81c52e6dc9a2d935016d0f1d65dde2e2fa122f55e79c3a4a9465698041c5fe63', - i686: '3c9c931dc72bf5dac871eef9dda2a866087b42457d6bd7535f2c760f33f27128', - x86_64: '2ee50e70cf121a7f46577e0494cbfe121eb13c23ae8bc308027e5315ec8b4ccb' + aarch64: '56fd7e35ce2706b2b4cf60a74b106ea0b923d14db34ad24e478f72bc070e9160', + armv7l: '56fd7e35ce2706b2b4cf60a74b106ea0b923d14db34ad24e478f72bc070e9160', + i686: '7bdb977732ba2994d809ca9eff9623f5d81c6642e03f7870887de5bc8cea1f38', + x86_64: '56c4274e773e48dccb6c6a0fa5f81f35b90794c63b121b252547daa1c473c797' }) depends_on 'glibc' # R diff --git a/packages/mesonbuild.rb b/packages/mesonbuild.rb index a985237a8..5a9267d49 100644 --- a/packages/mesonbuild.rb +++ b/packages/mesonbuild.rb @@ -3,19 +3,18 @@ require 'buildsystems/python' class Mesonbuild < Python description 'Meson is an open source build system meant to be both extremely fast and user friendly.' homepage 'https://mesonbuild.com/' - @_ver = '1.4.0' - version "#{@_ver}-py3.12" + version '1.5.0-py3.12' license 'Apache-2.0' compatibility 'all' source_url 'https://github.com/mesonbuild/meson.git' - git_hashtag @_ver + git_hashtag version.split('-').first binary_compression 'tar.zst' binary_sha256({ - aarch64: 'c76e5c3dee4da6bb1daa90272dec446c47258b2d316c56cd40512cfc06b4bbb4', - armv7l: 'c76e5c3dee4da6bb1daa90272dec446c47258b2d316c56cd40512cfc06b4bbb4', - i686: '3910fd452f58223b7c6ae1b0b79bdbb1ecc32bbc6b72d17a48b0420837e3bd5f', - x86_64: 'd372339a6b267bc4c93068891559a5ce5d9027480f9fce978846d16da7d6c3b6' + aarch64: '65d1a59275ea46c8346c199e1a297c07f4edf7b273e80cb35f43f1769f1dfd37', + armv7l: '65d1a59275ea46c8346c199e1a297c07f4edf7b273e80cb35f43f1769f1dfd37', + i686: '3d4d691e0d7cb85d3dce1dcef87e1a6aec08922105645ea24d913b9ca1d12be9', + x86_64: 'b343055cbda8e13b9336193326de2f93e2478ca3a7883ba9e50f0bd542b25b03' }) depends_on 'ninja'