From 96db3233c8b7ed01c191ff25c4838c7be27c968b Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Sat, 12 Nov 2022 23:46:54 -0500 Subject: [PATCH] HaikuPorts/x86_64: Synchronize. * Userguide now provided from HaikuPorts. * Python 3.7 -> 3.9. * Lots of other version bumps. --- build/jam/DefaultBuildProfiles | 4 +- build/jam/OptionalPackages | 2 +- build/jam/repositories/HaikuPorts/x86_64 | 157 +++++++++++++---------- 3 files changed, 95 insertions(+), 68 deletions(-) diff --git a/build/jam/DefaultBuildProfiles b/build/jam/DefaultBuildProfiles index da3fe83275..f93ed7875e 100644 --- a/build/jam/DefaultBuildProfiles +++ b/build/jam/DefaultBuildProfiles @@ -94,9 +94,9 @@ rule DefineDefaultBuildProfiles wqy_microhei # Some packages can't be built with gcc2, so we install the gcc8 # secondary architecture package instead in this case - !gcc2 @{ nano p7zip python3 xz_utils }@ + !gcc2 @{ nano p7zip python3.9 xz_utils }@ gcc2 @{ nano_x86@secondary_x86 p7zip_x86@secondary_x86 - python3_x86@secondary_x86 xz_utils_x86@secondary_x86 }@ + python3.9_x86@secondary_x86 xz_utils_x86@secondary_x86 }@ ; AddHaikuImageSourcePackages bepdf diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages index 40884d1e92..61bfeb6cb5 100644 --- a/build/jam/OptionalPackages +++ b/build/jam/OptionalPackages @@ -151,7 +151,7 @@ if [ IsOptionalHaikuImagePackageAdded WebPositive ] { # Welcome if [ IsOptionalHaikuImagePackageAdded Welcome ] { - Echo AddHaikuImageSystemPackages + AddHaikuImageSystemPackages haiku_userguide_ca haiku_userguide_de haiku_userguide_en diff --git a/build/jam/repositories/HaikuPorts/x86_64 b/build/jam/repositories/HaikuPorts/x86_64 index 779a9ae405..d68df7ac53 100644 --- a/build/jam/repositories/HaikuPorts/x86_64 +++ b/build/jam/repositories/HaikuPorts/x86_64 @@ -4,13 +4,37 @@ RemotePackageRepository HaikuPorts : # architecture "any" packages be_book-2008_10_26-4 - ca_root_certificates-2021_07_05-1 + ca_root_certificates-2022_10_11-1 haikuporter-1.2.5-1 + haiku_userguide-2022_11_11-1 + haiku_userguide_ca-2022_11_11-1 + haiku_userguide_de-2022_11_11-1 + haiku_userguide_en-2022_11_11-1 + haiku_userguide_eo-2022_11_11-1 + haiku_userguide_es-2022_11_11-1 + haiku_userguide_fi-2022_11_11-1 + haiku_userguide_fr-2022_11_11-1 + haiku_userguide_fur-2022_11_11-1 + haiku_userguide_hu-2022_11_11-1 + haiku_userguide_id-2022_11_11-1 + haiku_userguide_it-2022_11_11-1 + haiku_userguide_jp-2022_11_11-1 + haiku_userguide_pl-2022_11_11-1 + haiku_userguide_pt_br-2022_11_11-1 + haiku_userguide_pt_pt-2022_11_11-1 + haiku_userguide_ro-2022_11_11-1 + haiku_userguide_ru-2022_11_11-1 + haiku_userguide_sk-2022_11_11-1 + haiku_userguide_sv_se-2022_11_11-1 + haiku_userguide_tr-2022_11_11-1 + haiku_userguide_uk-2022_11_11-1 + haiku_userguide_zh_cn-2022_11_11-1 + haiku_welcome-2022_11_11-1 noto-20200106-1 noto_sans_cjk_jp-1.004-2 timgmsoundfont-fixed-5 wqy_microhei-0.2.0~beta-4 - intel_wifi_firmwares-2022_01_11-2 + intel_wifi_firmwares-2022_01_11-3 realtek_wifi_firmwares-2019_01_02-1 ralink_wifi_firmwares-2015_02_11-2 : @@ -20,39 +44,39 @@ RemotePackageRepository HaikuPorts automake-1.16.5-1 bash-5.1.016-1 bc-1.07.1-2 - bepdf-2.1.4-2 + bepdf-2.1.4-4 binutils-2.31.1-2 bison-3.8.2-1 bzip2-1.0.8-1 bzip2_devel-1.0.8-1 cdrtools-3.02~a09-2 cdrtools_devel-3.02~a09-2 - coreutils-9.0-6 + coreutils-9.1-1 ctags-5.8-5 - curl-7.82.0-1 - curl_devel-7.82.0-1 + curl-7.85.0-1 + curl_devel-7.85.0-1 dav1d-1.0.0-1 dav1d_devel-1.0.0-1 diffutils-3.8-1 enca-1.19-2 enca_devel-1.19-2 - expat-2.4.6-1 - expat_devel-2.4.6-1 + expat-2.5.0-1 + expat_devel-2.5.0-1 fdk_aac-2.0.2-2 - ffmpeg-4.2.2-10 - ffmpeg_devel-4.2.2-10 - file-5.41-1 - file_data-5.41-1 - findutils-4.8.0-1 + ffmpeg-4.2.7-1 + ffmpeg_devel-4.2.7-1 + file-5.43-1 + file_data-5.43-1 + findutils-4.9.0-1 flex-2.6.4-2 fluidlite-1.0.9-1 fluidlite_devel-1.0.9-1 - fontconfig-2.13.92-1 - fontconfig_devel-2.13.92-1 - freetype-2.11.1-2 - freetype_devel-2.11.1-2 - fribidi-1.0.11-1 - fribidi_devel-1.0.11-1 + fontconfig-2.13.96-1 + fontconfig_devel-2.13.96-1 + freetype-2.12.1-3 + freetype_devel-2.12.1-3 + fribidi-1.0.12-1 + fribidi_devel-1.0.12-1 game_music_emu-0.6.3-1 game_music_emu_devel-0.6.3-1 gettext-0.19.8.1-7 @@ -62,28 +86,28 @@ RemotePackageRepository HaikuPorts gcc_syslibs_devel-11.2.0_2021_07_28-8 giflib-5.2.1-1 giflib_devel-5.2.1-1 - git-2.36.1-1 - git_arch-2.36.1-1 - git_cvs-2.36.1-1 - git_daemon-2.36.1-1 - git_email-2.36.1-1 - git_svn-2.36.1-1 + git-2.37.3-1 + git_arch-2.37.3-1 + git_cvs-2.37.3-1 + git_daemon-2.37.3-1 + git_email-2.37.3-1 + git_svn-2.37.3-1 glu-9.0.0-7 glu_devel-9.0.0-7 gmp-6.2.1-2 graphite2-1.3.14-1 graphite2_devel-1.3.14-1 - grep-3.7-1 + grep-3.8-1 groff-1.22.4-1 gutenprint8-5.3.1-2 gutenprint8_devel-5.3.1-2 - gzip-1.11-1 - haikuwebkit-1.8.4-1 - haikuwebkit_devel-1.8.4-1 - harfbuzz-3.4.0-1 - harfbuzz_devel-3.4.0-1 - icu66-66.1-2 - icu66_devel-66.1-2 + gzip-1.12-1 + haikuwebkit-1.8.4-2 + haikuwebkit_devel-1.8.4-2 + harfbuzz-4.0.0-1 + harfbuzz_devel-4.0.0-1 + icu66-66.1-3 + icu66_devel-66.1-3 jam-2.5_2018_11_21-8 jasper-2.0.16-4 jasper_devel-2.0.16-4 @@ -109,12 +133,12 @@ RemotePackageRepository HaikuPorts libffi-3.4.2-1 libgcrypt-1.8.9-1 libgpg_error-1.36-2 - libiconv-1.16-1 + libiconv-1.17-1 libicns-0.8.1-8 libicns_devel-0.8.1-8 libidn2-2.0.5-2 - libjpeg_turbo-2.1.3-1 - libjpeg_turbo_devel-2.1.3-1 + libjpeg_turbo-2.1.4-1 + libjpeg_turbo_devel-2.1.4-1 libmodplug-0.8.9.0-1 libogg-1.3.5-1 libogg_devel-1.3.5-1 @@ -125,10 +149,10 @@ RemotePackageRepository HaikuPorts libpcre2-10.39-1 libpcre-8.45-2 libpcre_devel-8.45-2 - libpng16-1.6.37-2 - libpng16_devel-1.6.37-2 - libpsl-0.21.1-1 - libpsl_devel-0.21.1-1 + libpng16-1.6.38-1 + libpng16_devel-1.6.38-1 + libpsl-0.21.1-2 + libpsl_devel-0.21.1-2 libraw-0.20.2-1 libraw_devel-0.20.2-1 libsolv-0.3.0_haiku_2014_12_22-3 @@ -139,7 +163,7 @@ RemotePackageRepository HaikuPorts libtheora-1.1.1-7 libtheora_devel-1.1.1-7 libtool-2.4.6-2 - libunistring-0.9.10-1 + libunistring-1.0-1 libvorbis-1.3.7-1 libvorbis_devel-1.3.7-1 libvpx-1.11.0-2 @@ -152,20 +176,20 @@ RemotePackageRepository HaikuPorts libxslt-1.1.34-4 live555-2016.06.22-5 live555_devel-2016.06.22-5 - llvm9-9.0.1-2 - llvm9_libs-9.0.1-2 + llvm12-12.0.1-3 + llvm12_libs-12.0.1-3 m4-1.4.19-1 make-4.1-5 mandoc-1.14.3-2 mawk-1.3.4_20171017-1 mercurial-6.0.1-1 - mesa-21.3.7-1 - mesa_devel-21.3.7-1 - mesa_swpipe-21.3.7-1 + mesa-22.0.5-2 + mesa_devel-22.0.5-2 + mesa_swpipe-22.0.5-2 mkdepend-1.7-5 mpc-1.2.1-1 mpfr-4.1.0-1 - nano-6.2-1 + nano-6.4-1 nasm-2.14.02-2 ncurses6-6.3-1 ncurses6_devel-6.3-1 @@ -178,8 +202,8 @@ RemotePackageRepository HaikuPorts openjpeg-2.4.0-1 openjpeg_devel-2.4.0-1 openssh-8.8p1-1 - openssl-1.1.1n-1 - openssl_devel-1.1.1n-1 + openssl-1.1.1s-1 + openssl_devel-1.1.1s-1 opus-1.3.1-1 opus_devel-1.3.1-1 p7zip-17.04-2 @@ -189,7 +213,7 @@ RemotePackageRepository HaikuPorts pe-2.4.5-9 perl-5.32.1-1 pkgconfig-0.29.2-4 - python3-3.7.12-3 + python3.9-3.9.14-1 qrencode_kdl_devel-3.4.4-2 readline-8.1.002-1 sed-4.8-1 @@ -198,9 +222,11 @@ RemotePackageRepository HaikuPorts snappy_devel-1.1.9-1 soxr-0.1.3-1 soxr_devel-0.1.3-1 - speex-1.2.0-4 - speex_devel-1.2.0-4 - sqlite-3.36.0.0-1 + speex-1.2.1-1 + speex_devel-1.2.1-1 + speexdsp-1.2.1-1 + speexdsp_devel-1.2.1-1 + sqlite-3.39.2.0-2 subversion-1.14.1-1 subversion_devel-1.14.1-1 taglib-1.12-1 @@ -208,24 +234,24 @@ RemotePackageRepository HaikuPorts tar-1.34-1 tcpdump-4.99.1-1 texinfo-6.7-3 - tiff4-4.2.0-1 - tiff4_devel-4.2.0-1 + tiff4-4.4.0-1 + tiff4_devel-4.4.0-1 tnftp-20151004-6 unzip-6.10c23-4 vision-0.10.6-2 - wavpack-5.4.0-1 - wavpack_devel-5.4.0-1 + wavpack-5.5.0-1 + wavpack_devel-5.5.0-1 wget-1.21.1-1 which-2.21-6 - wpa_supplicant-2.10.haiku.1-1 + wpa_supplicant-2.10.haiku.2-1 xz_utils-5.2.5-1 xz_utils_devel-5.2.5-1 zip-3.0-4 - zlib-1.2.12-1 - zlib_devel-1.2.12-1 - zstd-1.5.2-1 - zstd_bin-1.5.2-1 - zstd_devel-1.5.2-1 + zlib-1.2.13-1 + zlib_devel-1.2.13-1 + zstd-1.5.2-2 + zstd_bin-1.5.2-2 + zstd_devel-1.5.2-2 : # source packages autoconf @@ -307,7 +333,7 @@ RemotePackageRepository HaikuPorts libxml2 libxslt live555 - llvm9 + llvm12 m4 make mandoc @@ -335,13 +361,14 @@ RemotePackageRepository HaikuPorts pe perl pkgconfig - python3 + python3.9 readline sed sharutils snappy soxr speex + speexdsp sqlite subversion taglib