November 2023 - crux-commits

ports/contrib (3.7): ttf-noto-emoji: 2.041 -> 2.042
by crux＠crux.nu 30 Nov '23

30 Nov '23

commit 552f9cd6508c2089087ae699c9f906275853989c Author: Tim Biermann <tbier(a)posteo.de> Date: Thu Nov 30 10:28:56 2023 +0100 ttf-noto-emoji: 2.041 -> 2.042 diff --git a/ttf-noto-emoji/.signature b/ttf-noto-emoji/.signature index a4c8baa18..b07cfb20e 100644 --- a/ttf-noto-emoji/.signature +++ b/ttf-noto-emoji/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF30ERifbiEnLMIOpR042NbtDfSc1xonDm5rPEOY7rqFqclBtnhl6EiL5/Etdgtu85oes2pkSkTYM8/ZydXvnoMAE= -SHA256 (Pkgfile) = 32c3c5758e272bb29500a8bec74e97235421e9bec5de5dcf3ccfea9cc71f19b9 +RWSagIOpLGJF33YVmbjkrZTQt/wA6WItBzLRnVtPPT5lOrmlFgMLqh7QOnQKKAXQhWRS7Zjt8V6KyJlS7veAB0dMdivKjXR1lwU= +SHA256 (Pkgfile) = 686a5494a4fd62627151a7ac5790c56f6f7668b87b39cc7e77195ba2eb17f1a2 SHA256 (.footprint) = 2646184297c13b9187934617ae7d9f265960ef1cece48e98796ee9a1210261bc -SHA256 (ttf-noto-emoji-2.041.tar.gz) = 8770d6c0e8a0068026865131a30602ebf289068cb4fc6ad32eda8d98a052ef2a +SHA256 (ttf-noto-emoji-2.042.tar.gz) = b56bd2fa4029d0f057b66b742ac59af243dbc91067fed3eb4929dac762440fc9 diff --git a/ttf-noto-emoji/Pkgfile b/ttf-noto-emoji/Pkgfile index 3a98197c4..b08046bc4 100644 --- a/ttf-noto-emoji/Pkgfile +++ b/ttf-noto-emoji/Pkgfile @@ -3,7 +3,7 @@ # Maintainer: Tim Biermann, tbier at posteo dot de name=ttf-noto-emoji -version=2.041 +version=2.042 release=1 source=(https://github.com/googlefonts/noto-emoji/archive/v$version/$name-$…

1 0

ports/contrib (3.7): zellij: 0.39.1 -> 0.39.2
by crux＠crux.nu 30 Nov '23

30 Nov '23

commit b16bdeffbb125eec6d18dbc5f45efebb4341b583 Author: Tim Biermann <tbier(a)posteo.de> Date: Thu Nov 30 10:28:17 2023 +0100 zellij: 0.39.1 -> 0.39.2 diff --git a/zellij/.signature b/zellij/.signature index 382f356a6..a2276fce4 100644 --- a/zellij/.signature +++ b/zellij/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3/JV781gxtEYuUMhxhuKh39YbH36HVR+dz0fFZYuixAJSAs8YOJvjeSs1rbiBN9LQIO495fSSXi6V0u+VmBmVQ4= -SHA256 (Pkgfile) = 07ae2dfd19ea36b8e9659dcbe161f3338965b9046bd7ba76e28fd14311f400fc +RWSagIOpLGJF36S8Y8E7/pSDJIELGzFkhDKUcT73JzRuL+VOFX+7SUuto0z+He62YE7aO8sHANkx/fuwlncuCrGf8CgYWHcs/wA= +SHA256 (Pkgfile) = 8d0e5fcc212951d2f24bff6098dbe117432ebb194159530deb5c604f428f9d39 SHA256 (.footprint) = 537a7725ad8d6bec80c3a23dcfe06ad71a7a7f2ff4a32e05142522fc42a355c0 -SHA256 (zellij-0.39.1.tar.gz) = 4b2f00ea3aec0d36a8e764d33d521b09de936e3c94594536ccd348457e108e14 +SHA256 (zellij-0.39.2.tar.gz) = feef552f06898fe06df00f9a590b862607266c087e804fffb638d2c46d9edad1 diff --git a/zellij/Pkgfile b/zellij/Pkgfile index a30accfee..42ad0c665 100644 --- a/zellij/Pkgfile +++ b/zellij/Pkgfile @@ -4,7 +4,7 @@ # Depends on: rust name=zellij -version=0.39.1 +version=0.39.2 release=1 source=(https://github.com/zellij-org/zellij/archive/v$version/$name-$versi…

1 0

ports/compat-32 (3.7): mesa-32: 23.2.1 -> 23.3.0
by crux＠crux.nu 30 Nov '23

30 Nov '23

commit b9bc94e62559ffc392617aabf7037336c4ec1f5c Author: Tim Biermann <tbier(a)posteo.de> Date: Thu Nov 30 10:18:46 2023 +0100 mesa-32: 23.2.1 -> 23.3.0 diff --git a/mesa-32/.signature b/mesa-32/.signature index bca81f3..f51d12a 100644 --- a/mesa-32/.signature +++ b/mesa-32/.signature @@ -1,7 +1,7 @@ untrusted comment: verify with /etc/ports/compat-32.pub -RWSwxGo/zH7eXQ+leYwc5YhMP12NksvnLxCtNA0j0AURiN6rijThsSXhlcKLDIKsk5LXtAlXDSVDFukJ2Hx0tcHa5Jg4/BANDw8= -SHA256 (Pkgfile) = 79e4c0fcca507b57668c3fc630e988e7f2401e987d685fedd1f41e32f0e98d77 +RWSwxGo/zH7eXVoDcHsjjyeiKkjpYAPsfgBSRL0XibNXLZmbASPlzTac4sOx6r7qHbXojpqXfyZNI4NQFwMcCSRipbP0hHDV+gY= +SHA256 (Pkgfile) = 53dbe86e749209f8426531e93910b609e68535477e99591a6abbf6d075435206 SHA256 (.footprint) = 10f639a17c2a2817d574133e81f436bf2712969b055d6049a0e07f275bbe8363 -SHA256 (mesa-23.2.1.tar.xz) = 64de0616fc2d801f929ab1ac2a4f16b3e2783c4309a724c8a259b20df8bbc1cc +SHA256 (mesa-23.3.0.tar.xz) = 50f729dd60ed6335b989095baad81ef5edf7cfdd4b4b48b9b955917cb07d69c5 SHA256 (x86-linux-gnu) = 448877bbe3efe8bdfe6282c8e730fe8a8b6bf3c07f659e71b7292aceca22d8bd SHA256 (x86-linux-gnu-ccache) = 7b435803071fa5d72668eeae1a15c4e4dfca7847349de6f4ede0282b85faaac8 diff --git a/mesa-32/Pkgfile b/mesa-32/Pkgfile index e8837b1..179e2f1 100644 --- a/mesa-32/Pkgfile +++ b/mesa-32/Pkgfile @@ -5,7 +5,7 @@ # Optional: glslang libva-32 libvdpau-32 wayland-protocols name=mesa-32 -version=23.2.1 +version=23.3.0 release=1 source=(https://archive.mesa3d.org/mesa-$version.tar.xz x86-linux-gnu x86-linux-gnu-ccache)

1 0

ports/xorg (3.7): mesa: 23.2.1 -> 23.3.0
by crux＠crux.nu 30 Nov '23

30 Nov '23

commit 6d66f55f152ce08cec9e8d5e3e08a1906d5e257f Author: Tim Biermann <tbier(a)posteo.de> Date: Thu Nov 30 10:09:04 2023 +0100 mesa: 23.2.1 -> 23.3.0 diff --git a/mesa/.signature b/mesa/.signature index 77db9b59..e9978c5a 100644 --- a/mesa/.signature +++ b/mesa/.signature @@ -1,6 +1,5 @@ untrusted comment: verify with /etc/ports/xorg.pub -RWTSGWF5Q7TndIWGtKtiYToK7kvnqEoAdxVGe8qR4PO8/KdVB3TRwYzppaipj+o6FEDSL6euO+H5n5Frs1T2HJQ8QEX3/PN/kwk= -SHA256 (Pkgfile) = 2b6e94b78b719af0c1c528278fd2aa3838de2f41db53f8b582a0bbae491541f0 +RWTSGWF5Q7TndO8mrMKT8cWoqeLtqjnqD4ZtO6cXNgw70DjPDcldf4of+LzE2X54F0X4mIwnj6SZIQuK0yB9fK4ZZBg2FhgiVgQ= +SHA256 (Pkgfile) = 5aa110996dda4de49f9a434b0c76ac9ac6eadd6ed049a1ddb5a9de74b6f8d78c SHA256 (.footprint) = 6924460d44cdb41ff53cb50c2c805ea5a8d2fa2b38127c474fa859b200f82f1c -SHA256 (mesa-23.2.1.tar.xz) = 64de0616fc2d801f929ab1ac2a4f16b3e2783c4309a724c8a259b20df8bbc1cc -SHA256 (U_clover-llvm-move-to-modern-pass-manager.patch) = 9174cd8a44d3841b2614e0386e212b0dfb56a6e26ea69c7c4415f77918d62f5d +SHA256 (mesa-23.3.0.tar.xz) = 50f729dd60ed6335b989095baad81ef5edf7cfdd4b4b48b9b955917cb07d69c5 diff --git a/mesa/Pkgfile b/mesa/Pkgfile index fe087b77..0c5bb79e 100644 --- a/mesa/Pkgfile +++ b/mesa/Pkgfile @@ -5,10 +5,9 @@ # Optional: directx-headers glslang libclc libunwind libva libvdpau lm_sensors rust-bindgen spirv-llvm-translator vulkan-loader wayland-protocols name=mesa -version=23.2.1 +version=23.3.0 release=1 -source=(https://archive.mesa3d.org/$name-$version.tar.xz - U_clover-llvm-move-to-modern-pass-manager.patch) +source=(https://archive.mesa3d.org/$name-$version.tar.xz) build() { prt-get isinst directx-headers && PKGMK_MESA_GALLIUM+='d3d12,' @@ -25,9 +24,6 @@ build() { #prt-get isinst xorg-libxdamage xorg-libxrandr xorg-libxshmfence xorg-libxvmc xorg-libxxf86vm && PKGMK_MESA_PLATFORMS+=',x11' PKGMK_MESA_PLATFORMS+=',x11' - # https://build.opensuse.org/package/show/openSUSE:Factory/Mesa - patch -Np1 -d $name-$version -i $SRC/U_clover-llvm-move-to-modern-pass-manager.patch - meson setup build $name-$version $PKGMK_MESA \ --prefix=/usr \ --sysconfdir=/etc \ diff --git a/mesa/U_clover-llvm-move-to-modern-pass-manager.patch b/mesa/U_clover-llvm-move-to-modern-pass-manager.patch deleted file mode 100644 index 7f33ad34..00000000 --- a/mesa/U_clover-llvm-move-to-modern-pass-manager.patch +++ /dev/null @@ -1,126 +0,0 @@ -From 2d4fe5f229791fde52846b3f583c12508b5109d6 Mon Sep 17 00:00:00 2001 -From: Dave Airlie <airlied(a)redhat.com> -Date: Fri, 25 Aug 2023 12:43:44 +1000 -Subject: [PATCH] clover/llvm: move to modern pass manager. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This seems like it should work, but I haven't tested it yet. - -Tested-by: Dieter Nützel <Dieter(a)nuetzel-hh.de> -Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24879> ---- - .../frontends/clover/llvm/invocation.cpp | 64 +++++++++++++++---- - 1 file changed, 51 insertions(+), 13 deletions(-) - -diff --git a/src/gallium/frontends/clover/llvm/invocation.cpp b/src/gallium/frontends/clover/llvm/invocation.cpp -index 7a50fea3323..43d26fe1abb 100644 ---- a/src/gallium/frontends/clover/llvm/invocation.cpp -+++ b/src/gallium/frontends/clover/llvm/invocation.cpp -@@ -27,13 +27,17 @@ - #include <llvm/IR/DiagnosticPrinter.h> - #include <llvm/IR/DiagnosticInfo.h> - #include <llvm/IR/LLVMContext.h> -+#include <llvm/IR/Module.h> - #include <llvm/Support/raw_ostream.h> --#include <llvm/Transforms/IPO/PassManagerBuilder.h> -+#include <llvm/Transforms/IPO/Internalize.h> - #include <llvm-c/Target.h> - #ifdef HAVE_CLOVER_SPIRV - #include <LLVMSPIRVLib/LLVMSPIRVLib.h> - #endif - -+#include <llvm-c/TargetMachine.h> -+#include <llvm-c/Transforms/PassBuilder.h> -+#include <llvm/Support/CBindingWrapping.h> - #include <clang/CodeGen/CodeGenAction.h> - #include <clang/Lex/PreprocessorOptions.h> - #include <clang/Frontend/TextDiagnosticBuffer.h> -@@ -439,10 +443,10 @@ clover::llvm::compile_program(const std::string &source, - - namespace { - void -- optimize(Module &mod, unsigned optimization_level, -+ optimize(Module &mod, -+ const std::string& ir_target, -+ unsigned optimization_level, - bool internalize_symbols) { -- ::llvm::legacy::PassManager pm; -- - // By default, the function internalizer pass will look for a function - // called "main" and then mark all other functions as internal. Marking - // functions as internal enables the optimizer to perform optimizations -@@ -458,19 +462,53 @@ namespace { - if (internalize_symbols) { - std::vector<std::string> names = - map(std::mem_fn(&Function::getName), get_kernels(mod)); -- pm.add(::llvm::createInternalizePass( -+ internalizeModule(mod, - [=](const ::llvm::GlobalValue &gv) { - return std::find(names.begin(), names.end(), - gv.getName()) != names.end(); -- })); -+ }); - } - -- ::llvm::PassManagerBuilder pmb; -- pmb.OptLevel = optimization_level; -- pmb.LibraryInfo = new ::llvm::TargetLibraryInfoImpl( -- ::llvm::Triple(mod.getTargetTriple())); -- pmb.populateModulePassManager(pm); -- pm.run(mod); -+ -+ const char *opt_str = NULL; -+ LLVMCodeGenOptLevel level; -+ switch (optimization_level) { -+ case 0: -+ default: -+ opt_str = "default<O0>"; -+ level = LLVMCodeGenLevelNone; -+ break; -+ case 1: -+ opt_str = "default<O1>"; -+ level = LLVMCodeGenLevelLess; -+ break; -+ case 2: -+ opt_str = "default<O2>"; -+ level = LLVMCodeGenLevelDefault; -+ break; -+ case 3: -+ opt_str = "default<O3>"; -+ level = LLVMCodeGenLevelAggressive; -+ break; -+ } -+ -+ const target &target = ir_target; -+ LLVMTargetRef targ; -+ char *err_message; -+ -+ if (LLVMGetTargetFromTriple(target.triple.c_str(), &targ, &err_message)) -+ return; -+ LLVMTargetMachineRef tm = -+ LLVMCreateTargetMachine(targ, target.triple.c_str(), -+ target.cpu.c_str(), "", level, -+ LLVMRelocDefault, LLVMCodeModelDefault); -+ -+ if (!tm) -+ return; -+ LLVMPassBuilderOptionsRef opts = LLVMCreatePassBuilderOptions(); -+ LLVMRunPasses(wrap(&mod), opt_str, tm, opts); -+ -+ LLVMDisposeTargetMachine(tm); - } - - std::unique_ptr<Module> -@@ -500,7 +538,7 @@ clover::llvm::link_program(const std::vector<binary> &binaries, - auto c = create_compiler_instance(dev, dev.ir_target(), options, r_log); - auto mod = link(*ctx, *c, binaries, r_log); - -- optimize(*mod, c->getCodeGenOpts().OptimizationLevel, !create_library); -+ optimize(*mod, dev.ir_target(), c->getCodeGenOpts().OptimizationLevel, !create_library); - - static std::atomic_uint seq(0); - const std::string id = "." + mod->getModuleIdentifier() + "-" + --- -2.42.0

1 0

ports/contrib (3.7): inkscape: updated to 1.3.2
by crux＠crux.nu 29 Nov '23

29 Nov '23

commit 74b440f47a8750181d7b847240f18656c4b80dd8 Author: John McQuah <jmcquah(a)disroot.org> Date: Wed Nov 29 22:57:22 2023 +0000 inkscape: updated to 1.3.2 diff --git a/inkscape/.footprint b/inkscape/.footprint index ef0578044..d2feec1d3 100644 --- a/inkscape/.footprint +++ b/inkscape/.footprint @@ -112,8 +112,8 @@ drwxr-xr-x root/root usr/lib/cmake/2Geom/ -rw-r--r-- root/root usr/lib/cmake/2Geom/2GeomTargets-release.cmake -rw-r--r-- root/root usr/lib/cmake/2Geom/2GeomConfig.cmake -rw-r--r-- root/root usr/lib/cmake/2Geom/2GeomConfigVersion.cmake --rwxr-xr-x root/root usr/lib/inkscape/libinkscape_base.so.1.3.0.0 -lrwxrwxrwx root/root usr/lib/inkscape/libinkscape_base.so -> libinkscape_base.so.1.3.0.0 +-rwxr-xr-x root/root usr/lib/inkscape/libinkscape_base.so.1.3.2.0 +lrwxrwxrwx root/root usr/lib/inkscape/libinkscape_base.so -> libinkscape_base.so.1.3.2.0 drwxr-xr-x root/root usr/share/icons/ drwxr-xr-x root/root usr/share/metainfo/ drwxr-xr-x root/root usr/share/inkscape/ diff --git a/inkscape/.signature b/inkscape/.signature index bc54ca874..79a72c741 100644 --- a/inkscape/.signature +++ b/inkscape/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF34hVXYtmi7CF58pktHPUd6NKClaGx49tJ0cwpVXhbX3b7aUvc8GDYKIzTPtUWDWoHy8O043j8XgePkOjHe0EPwk= -SHA256 (Pkgfile) = bf4ba07138640a6d14e77b029d2d36882defcb7640fbaac6d0fac1cb2f411e9a -SHA256 (.footprint) = d3808fa37ad1a4336f4e9f53ed314b39f4f1fb704f0771967bf9ae6c1891a500 -SHA256 (inkscape-1.3.tar.xz) = bf4f286b025e0169b8948cc14d5199a9b4c204d761c894c4b48496571ec76307 +RWSagIOpLGJF3wyLN15Q8jscNp2fv60QTwpDX5wSFuxm5HL9D9rSbNwh5+kqCCPAuxUt0Gpro1Yw8ldnFRQVCzxZI3z561/T8QY= +SHA256 (Pkgfile) = 1f0d8a52606fda103e21cfcb5e84cc14b0361607148957e81adc15d89b1080c5 +SHA256 (.footprint) = 6d8b8cd774c23c747c001768fabed559e31015c6df311c4b4405c5c4cdc1a453 +SHA256 (inkscape-1.3.2.tar.xz) = dbd1844dc443fe5e10d3e9a887144e5fb7223852fff191cfb5ef7adeab0e086b diff --git a/inkscape/Pkgfile b/inkscape/Pkgfile index ee7d9fb42..4cd302b29 100644 --- a/inkscape/Pkgfile +++ b/inkscape/Pkgfile @@ -4,7 +4,7 @@ # Depends on: boehm-gc boost double-conversion graphicsmagick gsl gtkmm3 libsoup libxslt poppler popt potrace gdl name=inkscape -version=1.3 +version=1.3.2 release=1 source=(https://media.inkscape.org/dl/resources/file/$name-$version.tar.xz) @@ -12,6 +12,10 @@ build() { [ -e /usr/include/poppler/glib/poppler.h ] || { echo "install glib and then rebuild poppler, you need it for ${name}."; exit 1; } export LDFLAGS+=" -Wl,-rpath=/usr/lib/inkscape" + # add missing header file (merge request 6089) + sed -e '/^#include <libxml.uri/a #include <libxml/xmlmemory.h>' \ + -i inkscape-${version}*/src/object/uri.h + cmake -S inkscape-${version}* -B build -G Ninja \ -D CMAKE_INSTALL_PREFIX=/usr \ -D CMAKE_INSTALL_LIBDIR=lib \ @@ -34,7 +38,7 @@ build() { prt-get isinst bash-completion || rm -rf $PKG/usr/share/bash-completion - /usr/bin/python3 -mcompileall $PKG + /usr/bin/python3 -m compileall $PKG /usr/bin/python3 -O -m compileall $PKG /usr/bin/python3 -OO -m compileall $PKG }

1 0

ports/opt (3.7): squid: fix build with libxml2 2.12
by crux＠crux.nu 29 Nov '23

29 Nov '23

commit da77c3c551625a7cef49ab174ff837ccc38db535 Author: Juergen Daubert <jue(a)jue.li> Date: Wed Nov 29 12:24:04 2023 +0100 squid: fix build with libxml2 2.12 diff --git a/squid/.signature b/squid/.signature index 8463002ab..ba8bc9649 100644 --- a/squid/.signature +++ b/squid/.signature @@ -1,6 +1,7 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/eFZ8LNUUnpW5UA6d3Rij5C3RnIcJZ7k049Ykb/Ye6tDCUGvq5sNTnYXw4ddVXrzAiXKZBHR8xz1Rr1yHEvqswE= -SHA256 (Pkgfile) = 0b4b16fd885edb4dc5716311a1e2982254b56d8da41e58f1943ca5cdbc1e1d7e +RWSE3ohX2g5d/aMK7uyq07EPS+6pEw8mkvJlrtANSZUB+vrEZEWToCZDvzbPPOWDKaMdegOt44HUihV3O/WFvYczi/B/6bBKAgg= +SHA256 (Pkgfile) = d8d29c9d13bf76d52fb0e2b270a9814531fd04917dd3998a41fca160f55cbb08 SHA256 (.footprint) = 86ef6433e602fb7ce136697b81c5c3b04185d777ab56d06011fc72e4aa9dd653 SHA256 (squid-6.5.tar.xz) = 5070f8a3ae6666870c8fc716326befb0a1abe8b5ff3a6f3932cbc5543d7c8549 SHA256 (squid) = c807a9373705537b648c38ed456ab016cc2fd7d40e6d47c20611931437588d96 +SHA256 (libxml2-2.12.patch) = 079e42e69f08ff7848db02bd259512c03a130729c50c4e14fda68c75c777cbc5 diff --git a/squid/Pkgfile b/squid/Pkgfile index 826e8385c..bb9c6c8fb 100644 --- a/squid/Pkgfile +++ b/squid/Pkgfile @@ -6,13 +6,15 @@ name=squid version=6.5 -release=1 +release=2 source=(http://www.squid-cache.org/Versions/v6/$name-$version.tar.xz - squid) + squid libxml2-2.12.patch) build() { cd $name-$version + patch -p1 -i $SRC/libxml2-2.12.patch + sed '/DEFAULT_STATEDIR/s/$(localstatedir)//' -i src/ipc/Makefile.in ./configure \ diff --git a/squid/libxml2-2.12.patch b/squid/libxml2-2.12.patch new file mode 100644 index 000000000..fcc8451e1 --- /dev/null +++ b/squid/libxml2-2.12.patch @@ -0,0 +1,26 @@ +From c9b3edc1396925aa7eca3d3cc6c798806286a974 Mon Sep 17 00:00:00 2001 +From: bkuhls <bkuhls(a)users.noreply.github.com> +Date: Sun, 26 Nov 2023 15:09:21 +0000 +Subject: [PATCH] Bug 5328: Fix ESI build with libxml2 v2.12.0 (#1600) + + Libxml2Parser.cc:147:40: error: invalid conversion from + 'const xmlError*' to 'xmlErrorPtr' {aka 'xmlError*'} [-fpermissive] + +libxml2 recently made xmlGetLastError() return a constant object. +--- + src/esi/Libxml2Parser.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/esi/Libxml2Parser.cc b/src/esi/Libxml2Parser.cc +index f0375288511..236a37433cd 100644 +--- a/src/esi/Libxml2Parser.cc ++++ b/src/esi/Libxml2Parser.cc +@@ -144,7 +144,7 @@ ESILibxml2Parser::lineNumber() const + char const * + ESILibxml2Parser::errorString() const + { +- xmlErrorPtr error = xmlGetLastError(); ++ const auto error = xmlGetLastError(); + + if (error == nullptr) + return nullptr;

1 0

ports/opt (3.7): apapche: fix build with libxml2 2.12
by crux＠crux.nu 29 Nov '23

29 Nov '23

commit f8ea3358796f611668972fdc271c4544fb543f27 Author: Juergen Daubert <jue(a)jue.li> Date: Wed Nov 29 11:51:29 2023 +0100 apapche: fix build with libxml2 2.12 diff --git a/apache/.signature b/apache/.signature index 150a10004..f1efaeae6 100644 --- a/apache/.signature +++ b/apache/.signature @@ -1,7 +1,8 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/S3Rpl+KIrXOhPw2y9z+21IABVV4xM8W4Jqa4oLKNMmxky7UOVj/qnPh5hoEpkp1F8XmFk3HdTif2nAwJkMqvgw= -SHA256 (Pkgfile) = d9d7a314c36edba74b503e1f1bcb11a37fa65daf39d44aff19252cdb6b2b4d8a +RWSE3ohX2g5d/T6NweX7MSQvO3i4wKwgpxv2mAD1DxRd3thRo6MDJCFIecuEOmTKgRcv1mr97QDgFlEaycqi9MrDZ4qMbCAzegQ= +SHA256 (Pkgfile) = 0723f93ce6f8da34cccadd3d796c6b241c031f054ab2c65a32b07fbd39f10cfc SHA256 (.footprint) = c74d5e2fd28b7400bca7988e0b21f4e2b12748a0a85f1d21a819069f0f9f6c9f SHA256 (httpd-2.4.58.tar.bz2) = fa16d72a078210a54c47dd5bef2f8b9b8a01d94909a51453956b3ec6442ea4c5 SHA256 (crux.layout) = a72a0d72c47aa72df4378f4bf1ff291eb9cdfd29f6c827b9970b8775f38f4dd6 SHA256 (apache) = 12d9aff5a78428589aba0b43988f383af434a546ae5daadc5f5ce7b9804e56a4 +SHA256 (libxml2-2.12.patch) = e994c2aae15a5bcb344b5009323b7d23c7edf4f2d8c0fb3f34197f4f46f26e7f diff --git a/apache/Pkgfile b/apache/Pkgfile index 0415d6c53..1877840a9 100644 --- a/apache/Pkgfile +++ b/apache/Pkgfile @@ -5,13 +5,15 @@ name=apache version=2.4.58 -release=1 +release=2 source=(https://www.apache.org/dist/httpd/httpd-$version.tar.bz2 \ - crux.layout apache) + crux.layout apache libxml2-2.12.patch) build(){ cd httpd-$version + patch -p1 -i $SRC/libxml2-2.12.patch + cat $SRC/crux.layout >> config.layout sed -ri '/^(User|Group)/s/daemon/www/' docs/conf/httpd.conf.in diff --git a/apache/libxml2-2.12.patch b/apache/libxml2-2.12.patch new file mode 100644 index 000000000..473971ac0 --- /dev/null +++ b/apache/libxml2-2.12.patch @@ -0,0 +1,44 @@ +From 27a68e54b7c6d2ae80dca396fd2727852897dab1 Mon Sep 17 00:00:00 2001 +From: Eric Covener <covener(a)apache.org> +Date: Tue, 21 Nov 2023 12:58:47 +0000 +Subject: [PATCH] mod_xml2enc: remove dependency on xmlstring header + +Submitted by: ttachi <tachihara(a)hotmail.com> + +Github: closes #393 + + +git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1914013 13f79535-47bb-0310-9956-ffa450edef68 +--- + changes-entries/xmlchar.txt | 2 ++ + modules/filters/mod_xml2enc.c | 6 +++--- + 2 files changed, 5 insertions(+), 3 deletions(-) + create mode 100644 changes-entries/xmlchar.txt + +diff --git a/changes-entries/xmlchar.txt b/changes-entries/xmlchar.txt +new file mode 100644 +index 00000000000..d0e06300411 +--- /dev/null ++++ b/changes-entries/xmlchar.txt +@@ -0,0 +1,2 @@ ++ *) mod_xml2enc: Tolerate libxml2 2.12.0 and later. ++ [ttachi <tachihara AT hotmail.com>] +diff --git a/modules/filters/mod_xml2enc.c b/modules/filters/mod_xml2enc.c +index 34f8e8ee090..e8ee2647955 100644 +--- a/modules/filters/mod_xml2enc.c ++++ b/modules/filters/mod_xml2enc.c +@@ -206,11 +206,11 @@ static void sniff_encoding(request_rec* r, xml2ctx* ctx) + } + } + } +- ++ + /* to sniff, first we look for BOM */ + if (ctx->xml2enc == XML_CHAR_ENCODING_NONE) { +- ctx->xml2enc = xmlDetectCharEncoding((const xmlChar*)ctx->buf, +- ctx->bytes); ++ ctx->xml2enc = xmlDetectCharEncoding((const unsigned char*)ctx->buf, ++ ctx->bytes); + if (HAVE_ENCODING(ctx->xml2enc)) { + ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, APLOGNO(01432) + "Got charset from XML rules.") ;

1 0

ports/contrib (3.7): firefox: add patch for icu 74
by crux＠crux.nu 28 Nov '23

28 Nov '23

commit cabe7cfb062b79b27f7f6efc34289c44a6eb406f Author: John McQuah <jmcquah(a)disroot.org> Date: Tue Nov 28 21:57:48 2023 +0000 firefox: add patch for icu 74 diff --git a/firefox/.signature b/firefox/.signature index ea60f6e35..8216104cd 100644 --- a/firefox/.signature +++ b/firefox/.signature @@ -1,7 +1,8 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF35akxwnccEeDC/Gr8pR/N+TWE/woukGUnv/rZtsVBf33n5sld0ifalJs/knD0A73yqrxrQYTWnSbIYsTtUN/HQk= -SHA256 (Pkgfile) = faed53d12174bced5404a7134a225637e05560b9f2d39cfa1cddc804a7175f2f +RWSagIOpLGJF36ig2T0UFyB9osG9/UaqKPahjbNymT57stokY0W5xlLJvhvjIFz2MTPqS3oZPTQmDY4EwHQF1fNYNm0zOGDMHg0= +SHA256 (Pkgfile) = 88e6b17c63be36831750a4503106e56040f8de37b07fba089a252687c11e9d49 SHA256 (.footprint) = c6149f123c43d45e03a0d84332c26a699352ffb2a6fc005dd4d69efd6a056cf8 SHA256 (firefox-120.0.source.tar.xz) = e710058701074eda53ca9f5fd52c57254858a027984f735bdcd58d6906f6b574 SHA256 (firefox.desktop) = 05bd1a4e283bc68f525f87cabf35ad0a59e5e63e107ce3901a4ac73e3d16ef33 +SHA256 (icu-linebreak-classes.patch) = bdfd2a93be5eed5c723ae67b308c4c2d9ed91d3173839fe560a7ca47946c7813 SHA256 (node-stdout-nonblocking-wrapper) = bb8c503015e49ed1b152225bdc56cf502cd831f35962d113dcbb9121967f3523 diff --git a/firefox/Pkgfile b/firefox/Pkgfile index d0fe88a4b..5b36f6317 100644 --- a/firefox/Pkgfile +++ b/firefox/Pkgfile @@ -6,17 +6,18 @@ name=firefox version=120.0 -release=1 -source=(https://ftp.mozilla.org/pub/firefox/releases/${version}/source/$name-${version}.source.tar.xz +release=2 +source=(https://ftp.mozilla.org/pub/$name/releases/$version/source/$name-$version.source.tar.xz firefox.desktop + icu-linebreak-classes.patch node-stdout-nonblocking-wrapper) build() { cd $name-$version - #for p in $SRC/*.patch; do - # patch -p1 -i $p - #done + for p in $SRC/*.patch; do + patch -p1 -i $p + done if [ "$(/usr/bin/python3 -c "import sys; print(sys.stdout.encoding)")" != 'utf-8' ]; then printf "\e[031mError: set an UTF-8 locale to compile this!\033[0m\n" @@ -33,9 +34,6 @@ cat <<- EOF > .mozconfig unset MOZ_TELEMETRY_REPORTING ac_add_options --prefix=/usr ac_add_options --enable-application=browser - #ac_add_options --with-system-harfbuzz - #ac_add_options --with-system-graphite2 - #ac_add_options --with-system-av1 ac_add_options --with-system-jpeg ac_add_options --with-system-zlib ac_add_options --with-system-png @@ -70,6 +68,9 @@ EOF [ -e /usr/lib/libsndio.so ] && PKGMK_FFAUDIO+=",sndio" echo "ac_add_options --enable-audio-backends=${PKGMK_FFAUDIO}" >> .mozconfig + # unicode internationalization + prt-get isinst icu 2>/dev/null && echo 'ac_add_options --with-system-icu' >> .mozconfig + if prt-get isinst wayland xorg-server 2>/dev/null ; then echo 'ac_add_options --enable-default-toolkit=cairo-gtk3-x11-wayland' >> .mozconfig elif prt-get isinst wayland 2>/dev/null ; then diff --git a/firefox/icu-linebreak-classes.patch b/firefox/icu-linebreak-classes.patch new file mode 100644 index 000000000..24f1a4dd7 --- /dev/null +++ b/firefox/icu-linebreak-classes.patch @@ -0,0 +1,22 @@ +--- a/intl/lwbrk/LineBreaker.cpp 2023-11-16 17:42:54.000000000 +0000 ++++ b/intl/lwbrk/LineBreaker.cpp 2023-11-28 18:39:40.735654246 +0000 +@@ -448,12 +448,18 @@ static int8_t GetClass(uint32_t u, LineB + /* REGIONAL_INDICATOR = 39, [RI] */ CLASS_CHARACTER, + /* E_BASE = 40, [EB] */ CLASS_BREAKABLE, + /* E_MODIFIER = 41, [EM] */ CLASS_CHARACTER, +- /* ZWJ = 42, [ZWJ]*/ CLASS_CHARACTER}; +- +- static_assert(U_LB_COUNT == mozilla::ArrayLength(sUnicodeLineBreakToClass), ++ /* ZWJ = 42, [ZWJ]*/ CLASS_CHARACTER, ++ /* AKSARA = 43, [AK] */ CLASS_CHARACTER, ++ /* AKSARA_PREBASE = 44, [AP] */ CLASS_CHARACTER, ++ /* AKSARA_START = 45, [AS] */ CLASS_CHARACTER, ++ /* VIRAMA_FINAL = 46, [VF] */ CLASS_CHARACTER, ++ /* VIRAMA = 47, [VI] */ CLASS_CHARACTER, ++ }; ++ ++ static_assert(U_LB_COUNT <= mozilla::ArrayLength(sUnicodeLineBreakToClass), + "Gecko vs ICU LineBreak class mismatch"); + + auto cls = GetLineBreakClass(u); + MOZ_ASSERT(cls < mozilla::ArrayLength(sUnicodeLineBreakToClass));

1 0

ports/contrib (3.7): ripgrep: 14.0.2 -> 14.0.3
by crux＠crux.nu 28 Nov '23

28 Nov '23

commit cdf14310183595c8f1dbd1a443a343bdf0e9d00c Author: Tim Biermann <tbier(a)posteo.de> Date: Tue Nov 28 22:27:10 2023 +0100 ripgrep: 14.0.2 -> 14.0.3 diff --git a/ripgrep/.signature b/ripgrep/.signature index 7c0edc01f..83eee522c 100644 --- a/ripgrep/.signature +++ b/ripgrep/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF31r//N1X6WVowGOEPN8+UjW/jBkQVWn43OutaTsDZSm56zUb8EApzFscXFsPKsX/rULRxFVdtiUqvQanaOd5xA4= -SHA256 (Pkgfile) = 408b4df9b370806b6c1c1779b8313aacbb1163f9ba3306deb357cbc7effff54d +RWSagIOpLGJF39y980rEyri4pgkUeNdpr/KJIK4J93R/Zf6JiGivViamNy2EKiNWtjRanPN+l3rxR+5cdD5Q9/an1bJ1uDVfiAA= +SHA256 (Pkgfile) = a85e37c5446cea1a61314f2c4d5abf9f807cfb47be07562caaf7f9565f59bbe5 SHA256 (.footprint) = 6a71c827871eda3ec353640f848c1f3ef7abfc7351fefad74143848d35854563 -SHA256 (ripgrep-14.0.2.tar.gz) = 2b9bd8a582d1fea70eb932e389e0895922b9a0147f65f9ad4b601b3f3a82a195 +SHA256 (ripgrep-14.0.3.tar.gz) = f5794364ddfda1e0411ab6cad6dd63abe3a6b421d658d9fee017540ea4c31a0e diff --git a/ripgrep/Pkgfile b/ripgrep/Pkgfile index b6624c1a2..22abecc90 100644 --- a/ripgrep/Pkgfile +++ b/ripgrep/Pkgfile @@ -4,7 +4,7 @@ # Depends on: rust name=ripgrep -version=14.0.2 +version=14.0.3 release=1 source=(https://github.com/BurntSushi/ripgrep/archive/$version/$name-$versi…

1 0

ports/compat-32 (3.7): icu-32: 73.2 -> 74.1
by crux＠crux.nu 28 Nov '23

28 Nov '23

commit 21932973626d025fb121791b01bd6c973068c080 Author: Tim Biermann <tbier(a)posteo.de> Date: Tue Nov 28 22:19:37 2023 +0100 icu-32: 73.2 -> 74.1 diff --git a/icu-32/.footprint b/icu-32/.footprint index 9558ea8..17468e1 100644 --- a/icu-32/.footprint +++ b/icu-32/.footprint @@ -2,30 +2,30 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/include/ drwxr-xr-x root/root usr/lib32/ drwxr-xr-x root/root usr/lib32/icu/ -drwxr-xr-x root/root usr/lib32/icu/73.2/ --rw-r--r-- root/root usr/lib32/icu/73.2/Makefile.inc --rw-r--r-- root/root usr/lib32/icu/73.2/pkgdata.inc +drwxr-xr-x root/root usr/lib32/icu/74.1/ +-rw-r--r-- root/root usr/lib32/icu/74.1/Makefile.inc +-rw-r--r-- root/root usr/lib32/icu/74.1/pkgdata.inc lrwxrwxrwx root/root usr/lib32/icu/Makefile.inc -> current/Makefile.inc -lrwxrwxrwx root/root usr/lib32/icu/current -> 73.2 +lrwxrwxrwx root/root usr/lib32/icu/current -> 74.1 lrwxrwxrwx root/root usr/lib32/icu/pkgdata.inc -> current/pkgdata.inc -lrwxrwxrwx root/root usr/lib32/libicudata.so -> libicudata.so.73.2 -lrwxrwxrwx root/root usr/lib32/libicudata.so.73 -> libicudata.so.73.2 --rwxr-xr-x root/root usr/lib32/libicudata.so.73.2 -lrwxrwxrwx root/root usr/lib32/libicui18n.so -> libicui18n.so.73.2 -lrwxrwxrwx root/root usr/lib32/libicui18n.so.73 -> libicui18n.so.73.2 --rwxr-xr-x root/root usr/lib32/libicui18n.so.73.2 -lrwxrwxrwx root/root usr/lib32/libicuio.so -> libicuio.so.73.2 -lrwxrwxrwx root/root usr/lib32/libicuio.so.73 -> libicuio.so.73.2 --rwxr-xr-x root/root usr/lib32/libicuio.so.73.2 -lrwxrwxrwx root/root usr/lib32/libicutest.so -> libicutest.so.73.2 -lrwxrwxrwx root/root usr/lib32/libicutest.so.73 -> libicutest.so.73.2 --rwxr-xr-x root/root usr/lib32/libicutest.so.73.2 -lrwxrwxrwx root/root usr/lib32/libicutu.so -> libicutu.so.73.2 -lrwxrwxrwx root/root usr/lib32/libicutu.so.73 -> libicutu.so.73.2 --rwxr-xr-x root/root usr/lib32/libicutu.so.73.2 -lrwxrwxrwx root/root usr/lib32/libicuuc.so -> libicuuc.so.73.2 -lrwxrwxrwx root/root usr/lib32/libicuuc.so.73 -> libicuuc.so.73.2 --rwxr-xr-x root/root usr/lib32/libicuuc.so.73.2 +lrwxrwxrwx root/root usr/lib32/libicudata.so -> libicudata.so.74.1 +lrwxrwxrwx root/root usr/lib32/libicudata.so.74 -> libicudata.so.74.1 +-rwxr-xr-x root/root usr/lib32/libicudata.so.74.1 +lrwxrwxrwx root/root usr/lib32/libicui18n.so -> libicui18n.so.74.1 +lrwxrwxrwx root/root usr/lib32/libicui18n.so.74 -> libicui18n.so.74.1 +-rwxr-xr-x root/root usr/lib32/libicui18n.so.74.1 +lrwxrwxrwx root/root usr/lib32/libicuio.so -> libicuio.so.74.1 +lrwxrwxrwx root/root usr/lib32/libicuio.so.74 -> libicuio.so.74.1 +-rwxr-xr-x root/root usr/lib32/libicuio.so.74.1 +lrwxrwxrwx root/root usr/lib32/libicutest.so -> libicutest.so.74.1 +lrwxrwxrwx root/root usr/lib32/libicutest.so.74 -> libicutest.so.74.1 +-rwxr-xr-x root/root usr/lib32/libicutest.so.74.1 +lrwxrwxrwx root/root usr/lib32/libicutu.so -> libicutu.so.74.1 +lrwxrwxrwx root/root usr/lib32/libicutu.so.74 -> libicutu.so.74.1 +-rwxr-xr-x root/root usr/lib32/libicutu.so.74.1 +lrwxrwxrwx root/root usr/lib32/libicuuc.so -> libicuuc.so.74.1 +lrwxrwxrwx root/root usr/lib32/libicuuc.so.74 -> libicuuc.so.74.1 +-rwxr-xr-x root/root usr/lib32/libicuuc.so.74.1 drwxr-xr-x root/root usr/lib32/pkgconfig/ -rw-r--r-- root/root usr/lib32/pkgconfig/icu-i18n.pc -rw-r--r-- root/root usr/lib32/pkgconfig/icu-io.pc diff --git a/icu-32/.signature b/icu-32/.signature index 936ec1e..19be7c3 100644 --- a/icu-32/.signature +++ b/icu-32/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/compat-32.pub -RWSwxGo/zH7eXYXiTYErUDFeW1CKTw/avxDawoUM2baHeZSzlPh3qI6Hd47kgrN/1YSl1hQpmez+WngBzrZqglHA7nSIwiUqQgg= -SHA256 (Pkgfile) = 1f8f7779a6f0bc647a3455ccab86b76fe2b7b8efb6b44c239a44d6849304cb67 -SHA256 (.footprint) = ff711075a2adcda6bffe5f4db1e7b34a7102afe5902b66a02b8aa3f8898cf6cd -SHA256 (icu4c-73_2-src.tgz) = 818a80712ed3caacd9b652305e01afc7fa167e6f2e94996da44b90c2ab604ce1 +RWSwxGo/zH7eXV0hshlnV3BoGRhIlX+pMvA0cnyDOsdsCXL0QdCnx9t/ss2KHk6h9oQyZDke23BARjEk5bN4KKFe5amFBnsGLAs= +SHA256 (Pkgfile) = f9109974e648c4df524e522657d0ab5ca9ff906a81900884c3b88b4697482614 +SHA256 (.footprint) = 19b7fbfeb04238f289da9609a9b460fc2551b340ae0434ca2073a8633cce9a7c +SHA256 (icu4c-74_1-src.tgz) = 86ce8e60681972e60e4dcb2490c697463fcec60dd400a5f9bffba26d0b52b8d0 diff --git a/icu-32/Pkgfile b/icu-32/Pkgfile index f016cec..ee614e1 100644 --- a/icu-32/Pkgfile +++ b/icu-32/Pkgfile @@ -4,7 +4,7 @@ # Depends on: icu name=icu-32 -version=73.2 +version=74.1 release=1 source=(https://github.com/unicode-org/icu/releases/download/release-${vers…

1 0