aboutsummaryrefslogtreecommitdiffstats
path: root/testing
diff options
context:
space:
mode:
Diffstat (limited to 'testing')
-rw-r--r--testing/alex/APKBUILD12
-rw-r--r--testing/alex/fix-tests-ghc-9.0.patch22
-rw-r--r--testing/appstream-generator/APKBUILD3
-rw-r--r--testing/archiso/APKBUILD4
-rw-r--r--testing/archlinux-keyring/APKBUILD4
-rw-r--r--testing/asteroid-btsyncd/APKBUILD29
-rw-r--r--testing/asteroid-launcher/0001-use-mce-battery-api-and-fix-deprecation-issues.patch296
-rw-r--r--testing/asteroid-launcher/APKBUILD14
-rw-r--r--testing/asteroid-settings/APKBUILD6
-rw-r--r--testing/atari800/APKBUILD4
-rw-r--r--testing/b3sum/APKBUILD4
-rw-r--r--testing/barman/APKBUILD4
-rw-r--r--testing/barrier/APKBUILD6
-rw-r--r--testing/belcard/APKBUILD4
-rw-r--r--testing/belle-sip/APKBUILD4
-rw-r--r--testing/belr/APKBUILD4
-rw-r--r--testing/bettercap/APKBUILD2
-rw-r--r--testing/blender/0001-musl-fixes.patch18
-rw-r--r--testing/blender/0002-fix-linking-issue.patch10
-rw-r--r--testing/blender/0003-increase-thread-stack-size-for-musl.patch28
-rw-r--r--testing/blender/0004-OpenEXR-3.patch8
-rw-r--r--testing/blender/APKBUILD15
-rw-r--r--testing/blosc/APKBUILD3
-rw-r--r--testing/btcd/APKBUILD30
-rw-r--r--testing/btfs/APKBUILD4
-rw-r--r--testing/buffyboard/APKBUILD45
-rw-r--r--testing/bumprace/APKBUILD4
-rw-r--r--testing/cargo-c/APKBUILD6
-rw-r--r--testing/cargo-edit/APKBUILD42
-rw-r--r--testing/cargo-outdated/APKBUILD40
-rw-r--r--testing/cargo-watch/APKBUILD44
-rw-r--r--testing/castor/APKBUILD10
-rw-r--r--testing/cfssl/APKBUILD2
-rw-r--r--testing/cgal/APKBUILD2
-rw-r--r--testing/chafa/APKBUILD35
-rw-r--r--testing/chez-scheme/APKBUILD9
-rw-r--r--testing/circuslinux/APKBUILD4
-rw-r--r--testing/cjose/APKBUILD14
-rw-r--r--testing/clementine/APKBUILD71
-rw-r--r--testing/clifm/APKBUILD6
-rw-r--r--testing/clipman/APKBUILD6
-rwxr-xr-xtesting/cln/APKBUILD12
-rw-r--r--testing/cloudfoundry-cli/APKBUILD2
-rw-r--r--testing/coin/APKBUILD38
-rw-r--r--testing/coin/TestSuitePatch.patch11
-rw-r--r--testing/comics-downloader/APKBUILD44
-rw-r--r--testing/comics-downloader/fixtests.patch67
-rw-r--r--testing/conntracct/APKBUILD2
-rw-r--r--testing/coreboot-ectool/APKBUILD26
-rw-r--r--testing/coreboot-ectool/fix-makefile.patch22
-rw-r--r--testing/corectrl/APKBUILD4
-rw-r--r--testing/coredns/APKBUILD41
-rw-r--r--testing/coredns/coredns.confd11
-rw-r--r--testing/coredns/coredns.initd31
-rw-r--r--testing/coredns/coredns.logrotated7
-rw-r--r--testing/coredns/ensure-cgo.patch13
-rw-r--r--testing/coredns/fix-netbox-plugin.patch12
-rw-r--r--testing/coredns/plugin.cfg.enabled73
-rw-r--r--testing/curaengine/APKBUILD28
-rw-r--r--testing/cutecom/APKBUILD41
-rw-r--r--testing/cutecom/fix-qpainterpath.patch24
-rw-r--r--testing/cutecom/follow-system-colors.patch35
-rw-r--r--testing/cyclone/APKBUILD4
-rw-r--r--testing/delta/APKBUILD25
-rw-r--r--testing/delve/APKBUILD4
-rw-r--r--testing/dendrite/APKBUILD46
-rw-r--r--testing/dendrite/dendrite.confd7
-rw-r--r--testing/dendrite/dendrite.initd23
-rw-r--r--testing/dendrite/dendrite.pre-install6
-rw-r--r--testing/diskus/APKBUILD4
-rw-r--r--testing/dma/APKBUILD10
-rw-r--r--testing/dnsperf/APKBUILD2
-rw-r--r--testing/doctl/APKBUILD4
-rw-r--r--testing/drone/APKBUILD4
-rw-r--r--testing/dublin-traceroute/APKBUILD2
-rw-r--r--testing/dxvk/APKBUILD4
-rw-r--r--testing/efm-langserver/APKBUILD4
-rw-r--r--testing/eiwd/APKBUILD4
-rw-r--r--testing/electrs/APKBUILD26
-rw-r--r--testing/embree/APKBUILD46
-rw-r--r--testing/enigma/APKBUILD39
-rw-r--r--testing/envconsul/APKBUILD4
-rw-r--r--testing/extremetuxracer/APKBUILD7
-rw-r--r--testing/faultstat/APKBUILD6
-rw-r--r--testing/fceux/APKBUILD4
-rw-r--r--testing/filebeat/APKBUILD2
-rw-r--r--testing/fileshelter/APKBUILD6
-rw-r--r--testing/fileshelter/std-optional.patch11
-rw-r--r--testing/firecracker/10-dependencies-Included-vm-fdt-crate.patch59
-rw-r--r--testing/firecracker/20-vm-fdt-Replace-libfdt-with-vm-fdt.patch822
-rw-r--r--testing/firecracker/30-libfdt-bindings-Deleted-libfdt-bindings-crate.patch157
-rw-r--r--testing/firecracker/APKBUILD72
-rw-r--r--testing/flameshot/APKBUILD4
-rw-r--r--testing/flannel/APKBUILD6
-rw-r--r--testing/flightgear/APKBUILD59
-rw-r--r--testing/flightgear/fix-boost.patch13
-rwxr-xr-xtesting/flightgear/flightgear-data-downloader.sh8
-rwxr-xr-xtesting/flightgear/flightgear.post-install2
-rw-r--r--testing/flightgear/musl-fenv.patch19
-rw-r--r--testing/flightgear/musl-fix_backtrace.patch11
-rw-r--r--testing/flightgear/musl-fix_error_h.patch14
-rw-r--r--testing/flightgear/musl-fix_feenableexcept.patch11
-rw-r--r--testing/flightgear/musl-fix_fpos_t.patch17
-rw-r--r--testing/flightgear/musl-fixes.patch83
-rw-r--r--testing/flightgear/musl-include-fcntl.patch10
-rw-r--r--testing/flightgear/time64.patch13
-rw-r--r--testing/fluent-bit/APKBUILD6
-rw-r--r--testing/fluent-bit/stream_suffix.patch189
-rw-r--r--testing/font-fira/APKBUILD34
-rw-r--r--testing/font-ipa/APKBUILD26
-rw-r--r--testing/font-manager/APKBUILD98
-rw-r--r--testing/font-raleway/APKBUILD6
-rw-r--r--testing/font-uw-ttyp0/APKBUILD27
-rw-r--r--testing/font-uw-ttyp0/style.patch56
-rw-r--r--testing/fpc-stage0/APKBUILD53
-rw-r--r--testing/fpc/APKBUILD83
-rw-r--r--testing/fpc/musl-__libc_csu.patch23
-rw-r--r--testing/freecad/APKBUILD115
-rw-r--r--testing/freecad/backtrace.patch32
-rw-r--r--testing/freecad/opencascade.patch629
-rw-r--r--testing/freecad/resourceDirectory.patch11
-rw-r--r--testing/freecad/tbb.patch38
-rw-r--r--testing/freecad/vtk9.patch830
-rw-r--r--testing/freeipmi/APKBUILD67
-rw-r--r--testing/freeipmi/bmc-watchdog.confd44
-rw-r--r--testing/freeipmi/bmc-watchdog.initd26
-rw-r--r--testing/freeipmi/ipmidetectd.confd5
-rw-r--r--testing/freeipmi/ipmidetectd.initd25
-rw-r--r--testing/freeipmi/ipmiseld.confd5
-rw-r--r--testing/freeipmi/ipmiseld.initd25
-rw-r--r--testing/fuzzel/APKBUILD44
-rw-r--r--testing/gcompris-qt/APKBUILD43
-rw-r--r--testing/genimage/APKBUILD61
-rw-r--r--testing/geodns/APKBUILD22
-rw-r--r--testing/getting-things-gnome/APKBUILD9
-rw-r--r--testing/getting-things-gnome/remove-unused-keyword.patch19
-rw-r--r--testing/git-sizer/APKBUILD35
-rw-r--r--testing/git-sizer/skip-test-exec.patch12
-rw-r--r--testing/glacier-browser/APKBUILD40
-rw-r--r--testing/glossaico/APKBUILD42
-rw-r--r--testing/go-sendxmpp/APKBUILD28
-rw-r--r--testing/gopls/APKBUILD2
-rw-r--r--testing/gops/APKBUILD6
-rw-r--r--testing/gpick/APKBUILD42
-rw-r--r--testing/grafana-image-renderer/APKBUILD4
-rw-r--r--testing/grpc-java/APKBUILD33
-rw-r--r--testing/grpc-java/grandle-version.patch9
-rw-r--r--testing/hamlib/APKBUILD4
-rw-r--r--testing/handbrake/APKBUILD2
-rw-r--r--testing/happy/APKBUILD4
-rw-r--r--testing/harminv/APKBUILD4
-rw-r--r--testing/headlines/APKBUILD2
-rw-r--r--testing/helvum/APKBUILD10
-rw-r--r--testing/hexer/APKBUILD10
-rw-r--r--testing/hfsprogs/APKBUILD61
-rw-r--r--testing/hfsprogs/APSL-2.0.txt366
-rw-r--r--testing/hfsprogs/fix-stdarg.patch122
-rw-r--r--testing/hfsprogs/musl-compat.patch136
-rw-r--r--testing/highway/APKBUILD41
-rw-r--r--testing/highway/fix-riscv64-build.patch21
-rw-r--r--testing/howard-bc/APKBUILD4
-rw-r--r--testing/hydroxide/APKBUILD23
-rw-r--r--testing/i3status-rust/APKBUILD4
-rw-r--r--testing/i3wm-gaps/APKBUILD6
-rw-r--r--testing/icewm/APKBUILD4
-rw-r--r--testing/idris/APKBUILD2
-rw-r--r--testing/idris2/APKBUILD2
-rw-r--r--testing/igt-gpu-tools/APKBUILD15
-rw-r--r--testing/igt-gpu-tools/fix-meson.patch36
-rw-r--r--testing/imath/APKBUILD65
-rwxr-xr-xtesting/inspircd/APKBUILD21
-rwxr-xr-xtesting/ircd-hybrid/APKBUILD4
-rw-r--r--testing/ispc/0001-tinfo.patch25
-rw-r--r--testing/ispc/APKBUILD56
-rw-r--r--testing/jekyll/APKBUILD69
-rw-r--r--testing/jekyll/gemspec.patch19
-rw-r--r--testing/jfrog-cli/APKBUILD2
-rw-r--r--testing/jinja2-cli/APKBUILD2
-rw-r--r--testing/kakoune/APKBUILD4
-rw-r--r--testing/kalendar/APKBUILD57
-rw-r--r--testing/kdiff3/APKBUILD47
-rw-r--r--testing/keyd/APKBUILD38
-rw-r--r--testing/keyd/keyd.initd14
-rw-r--r--testing/keyd/musl-time64.patch28
-rw-r--r--testing/keyd/obey-build-flags.patch20
-rw-r--r--testing/keyd/ungit.patch32
-rw-r--r--testing/kgeotag/APKBUILD47
-rw-r--r--testing/kicad-library/APKBUILD13
-rw-r--r--testing/kicad/APKBUILD14
-rw-r--r--testing/kicad/opencascade76.patch43
-rw-r--r--testing/kompose/APKBUILD8
-rw-r--r--testing/kopano-core/APKBUILD2
-rw-r--r--testing/kopia/APKBUILD44
-rw-r--r--testing/kopia/fix-arch.patch31
-rw-r--r--testing/kopia/skip-docker-tests.patch13
-rw-r--r--testing/kops/APKBUILD4
-rw-r--r--testing/ksmbd-tools/APKBUILD39
-rw-r--r--testing/kubernetes/APKBUILD4
-rw-r--r--testing/leocad/APKBUILD33
-rw-r--r--testing/lgogdownloader/APKBUILD2
-rw-r--r--testing/libaacs/APKBUILD35
-rw-r--r--testing/libaec/APKBUILD4
-rw-r--r--testing/libarcus/APKBUILD38
-rw-r--r--testing/libarcus/protobuf.patch42
-rw-r--r--testing/libcamera/APKBUILD75
-rw-r--r--testing/libdeflate/APKBUILD43
-rw-r--r--testing/libfm-qt/APKBUILD4
-rw-r--r--testing/libgrilio/APKBUILD30
-rw-r--r--testing/libjxl/APKBUILD93
-rw-r--r--testing/libjxl/sys-platform-ppc.patch30
-rw-r--r--testing/libjxl/system-lcms.patch47
-rw-r--r--testing/liblastfm-qt/APKBUILD46
-rw-r--r--testing/liblastfm-qt/remove-deprecated-staging-server.patch98
-rw-r--r--testing/liblastfm-qt/remove-dynamic-exception-specifications.patch57
-rw-r--r--testing/liblxqt/APKBUILD4
-rw-r--r--testing/libmdbx/APKBUILD35
-rw-r--r--testing/libmdbx/fix-example.patch11
-rw-r--r--testing/libmygpo-qt/APKBUILD47
-rw-r--r--testing/libmygpo-qt/fix-tests.patch21
-rw-r--r--testing/libqalculate/APKBUILD10
-rw-r--r--testing/libqalculate/libqalculate.pc.in.patch9
-rw-r--r--testing/libqtxdg/APKBUILD11
-rw-r--r--testing/librem-ec/AKMBUILD8
-rw-r--r--testing/librem-ec/APKBUILD28
-rw-r--r--testing/librespot/APKBUILD4
-rw-r--r--testing/libsixel/APKBUILD34
-rw-r--r--testing/libspng/APKBUILD29
-rw-r--r--testing/libstrophe/APKBUILD6
-rw-r--r--testing/libsysstat/APKBUILD4
-rw-r--r--testing/libtommath/APKBUILD12
-rw-r--r--testing/libtpms/APKBUILD40
-rw-r--r--testing/libzim/APKBUILD9
-rw-r--r--testing/liferea/APKBUILD55
-rw-r--r--testing/linux-elm/APKBUILD27
-rw-r--r--testing/linux-elm/config-elm.aarch64328
-rw-r--r--testing/linux-elm/fix-mmc1-speed.patch13
-rw-r--r--testing/linux-elm/fix-spi-nor-max-frequency.patch11
-rw-r--r--testing/linux-elm/mt8173-fix-mmc1-speed.patch19
-rw-r--r--testing/linux-elm/mt8173-higher-temps.patch18
-rw-r--r--testing/linux-gru/APKBUILD16
-rw-r--r--testing/linux-gru/config-gru.aarch64293
-rw-r--r--testing/lowdown/APKBUILD29
-rw-r--r--testing/lua-schema/APKBUILD33
-rw-r--r--testing/luau/APKBUILD35
-rw-r--r--testing/lxd/10-check-whether-the-kernel-supports-core-sched.patch191
-rw-r--r--testing/lxd/20-support-core-sched-for-vm.patch268
-rw-r--r--testing/lxd/30-reorder-kernel-features.patch51
-rw-r--r--testing/lxd/40-separate-entries-for-pure-core-sched.patch80
-rw-r--r--testing/lxd/50-support-core-sched-for-container.patch236
-rw-r--r--testing/lxd/APKBUILD16
-rw-r--r--testing/lximage-qt/APKBUILD4
-rw-r--r--testing/lxqt-about/APKBUILD4
-rw-r--r--testing/lxqt-admin/APKBUILD4
-rw-r--r--testing/lxqt-archiver/APKBUILD4
-rw-r--r--testing/lxqt-build-tools/APKBUILD4
-rw-r--r--testing/lxqt-config/APKBUILD4
-rw-r--r--testing/lxqt-core/APKBUILD2
-rw-r--r--testing/lxqt-desktop/APKBUILD2
-rw-r--r--testing/lxqt-globalkeys/APKBUILD4
-rw-r--r--testing/lxqt-notificationd/APKBUILD4
-rw-r--r--testing/lxqt-openssh-askpass/APKBUILD4
-rw-r--r--testing/lxqt-panel/APKBUILD4
-rw-r--r--testing/lxqt-policykit/APKBUILD4
-rw-r--r--testing/lxqt-powermanagement/APKBUILD4
-rw-r--r--testing/lxqt-qtplugin/APKBUILD4
-rw-r--r--testing/lxqt-runner/APKBUILD4
-rw-r--r--testing/lxqt-session/APKBUILD4
-rw-r--r--testing/lxqt-sudo/APKBUILD4
-rw-r--r--testing/lxqt-themes/APKBUILD4
-rw-r--r--testing/macchina/APKBUILD29
-rw-r--r--testing/madbomber/APKBUILD4
-rw-r--r--testing/madonctl/APKBUILD25
-rw-r--r--testing/mapnik/APKBUILD19
-rw-r--r--testing/mapnik/boost-1.77.patch48
-rw-r--r--testing/mapserver/APKBUILD16
-rw-r--r--testing/mariadb-connector-odbc/APKBUILD11
-rw-r--r--testing/mariadb-connector-odbc/cmakelists.patch19
-rw-r--r--testing/materia-kde/APKBUILD4
-rw-r--r--testing/matterbridge/APKBUILD41
-rw-r--r--testing/matterbridge/matterbridge.confd1
-rw-r--r--testing/matterbridge/matterbridge.initd15
-rw-r--r--testing/matterbridge/matterbridge.pre-install8
-rw-r--r--testing/mautrix-whatsapp/APKBUILD6
-rw-r--r--testing/mbpfan/01-remove-systemd.patch12
-rw-r--r--testing/mbpfan/APKBUILD30
-rw-r--r--testing/mbpfan/mbpfan.initd9
-rw-r--r--testing/mdbtools/10-Werror.patch6
-rw-r--r--testing/mdbtools/APKBUILD34
-rw-r--r--testing/mdcat/APKBUILD4
-rw-r--r--testing/mdevd/APKBUILD4
-rw-r--r--testing/mdevd/mdevd.initd2
-rw-r--r--testing/mediastreamer2-plugin-x264/APKBUILD2
-rw-r--r--testing/mediastreamer2/APKBUILD4
-rw-r--r--testing/mednafen/APKBUILD29
-rw-r--r--testing/meek/APKBUILD61
-rw-r--r--testing/mepo/APKBUILD31
-rw-r--r--testing/metricbeat/APKBUILD2
-rw-r--r--testing/mingw-w64-libusb/APKBUILD46
-rw-r--r--testing/minikube/APKBUILD4
-rw-r--r--testing/miniserve/APKBUILD4
-rw-r--r--testing/minisign/APKBUILD23
-rw-r--r--testing/mixxx/APKBUILD2
-rw-r--r--testing/modem-manager-gui/APKBUILD33
-rw-r--r--testing/modem-manager-gui/musl-compatibility.patch15
-rw-r--r--testing/monero/APKBUILD50
-rw-r--r--testing/monero/system-miniupnpc.patch16
-rw-r--r--testing/monero/version-string.patch4
-rw-r--r--testing/mpdris2/APKBUILD4
-rw-r--r--testing/mtg/APKBUILD6
-rw-r--r--testing/mugshot/0001-use-gettext-instead-of-locale-gettext.patch80
-rw-r--r--testing/mugshot/APKBUILD28
-rw-r--r--testing/multimc/02-java-version-to-8.patch26
-rw-r--r--testing/multimc/APKBUILD16
-rw-r--r--testing/mycroft-embedded-shell/APKBUILD46
-rw-r--r--testing/navidrome/APKBUILD2
-rw-r--r--testing/neatvi/APKBUILD4
-rw-r--r--testing/nemo-qml-plugin-alarms/APKBUILD10
-rw-r--r--testing/neomutt/APKBUILD4
-rw-r--r--testing/netsurf/APKBUILD46
-rw-r--r--testing/netsurf/non-coreutils-install-compatibility.patch13
-rw-r--r--testing/numberstation/APKBUILD25
-rw-r--r--testing/nushell/APKBUILD7
-rw-r--r--testing/nushell/nushell.post-install3
l---------testing/nushell/nushell.post-upgrade1
-rw-r--r--testing/nushell/nushell.pre-deinstall3
-rw-r--r--testing/nyx/APKBUILD27
-rw-r--r--testing/oil/APKBUILD4
-rw-r--r--testing/onedrive/APKBUILD55
-rw-r--r--testing/onedrive/onedrive.confd3
-rw-r--r--testing/onedrive/onedrive.initd12
-rw-r--r--testing/onefetch/APKBUILD8
-rw-r--r--testing/opencascade/APKBUILD13
-rw-r--r--testing/opencascade/no_backtrace.patch63
-rw-r--r--testing/opencascade/no_mallinfo.patch24
-rw-r--r--testing/openimagedenoise/APKBUILD4
-rw-r--r--testing/openjdk12/APKBUILD309
-rw-r--r--testing/openjdk12/Alpine_Bug_10126.java13
-rw-r--r--testing/openjdk12/HelloWorld.java3
-rw-r--r--testing/openjdk12/JDK-8241296.patch25
-rw-r--r--testing/openjdk12/JDK-8245051.patch72
-rw-r--r--testing/openjdk12/TestCryptoLevel.java72
-rw-r--r--testing/openjdk12/TestECDSA.java49
-rw-r--r--testing/openjdk12/aarch64.patch30
-rw-r--r--testing/openjdk12/build.patch525
-rw-r--r--testing/openjdk12/fix-bootjdk-check.patch19
-rw-r--r--testing/openjdk12/gcc10-compilation-fix.patch108
-rw-r--r--testing/openjdk12/make-4.3.patch20
-rw-r--r--testing/openjdk12/ppc64le.patch211
-rw-r--r--testing/openjdk13/APKBUILD306
-rw-r--r--testing/openjdk13/Alpine_Bug_10126.java13
-rw-r--r--testing/openjdk13/HelloWorld.java3
-rw-r--r--testing/openjdk13/JDK-8245051.patch72
-rw-r--r--testing/openjdk13/TestCryptoLevel.java72
-rw-r--r--testing/openjdk13/TestECDSA.java49
-rw-r--r--testing/openjdk13/aarch64.patch17
-rw-r--r--testing/openjdk13/build.patch514
-rw-r--r--testing/openjdk13/fix-bootjdk-check.patch19
-rw-r--r--testing/openjdk13/gcc10-compilation-fix.patch108
-rw-r--r--testing/openjdk13/ppc64le.patch247
-rw-r--r--testing/openjdk14/APKBUILD302
-rw-r--r--testing/openjdk14/Alpine_Bug_10126.java13
-rw-r--r--testing/openjdk14/HelloWorld.java3
-rw-r--r--testing/openjdk14/JDK-8245051.patch72
-rw-r--r--testing/openjdk14/TestCryptoLevel.java72
-rw-r--r--testing/openjdk14/TestECDSA.java49
-rw-r--r--testing/openjdk14/aarch64.patch17
-rw-r--r--testing/openjdk14/build.patch514
-rw-r--r--testing/openjdk14/fix-bootjdk-check.patch19
-rw-r--r--testing/openjdk14/gcc10-compilation-fix.patch108
-rw-r--r--testing/openjdk14/ppc64le.patch247
-rw-r--r--testing/openjdk15/APKBUILD302
-rw-r--r--testing/openjdk15/Alpine_Bug_10126.java13
-rw-r--r--testing/openjdk15/HelloWorld.java3
-rw-r--r--testing/openjdk15/TestCryptoLevel.java72
-rw-r--r--testing/openjdk15/TestECDSA.java49
-rw-r--r--testing/openjdk15/aarch64.patch17
-rw-r--r--testing/openjdk15/build.patch507
-rw-r--r--testing/openjdk15/ppc64le.patch247
-rw-r--r--testing/openjdk16/APKBUILD297
-rw-r--r--testing/openjdk16/Alpine_Bug_10126.java13
-rw-r--r--testing/openjdk16/HelloWorld.java3
-rw-r--r--testing/openjdk16/TestCryptoLevel.java72
-rw-r--r--testing/openjdk16/TestECDSA.java49
-rw-r--r--testing/openjdk16/ppc64le.patch248
-rw-r--r--testing/openjdk17/APKBUILD291
-rw-r--r--testing/openjdk17/Alpine_Bug_10126.java13
-rw-r--r--testing/openjdk17/HelloWorld.java3
-rw-r--r--testing/openjdk17/JDK-8268894.patch172
-rw-r--r--testing/openjdk17/TestCryptoLevel.java72
-rw-r--r--testing/openjdk17/TestECDSA.java49
-rw-r--r--testing/openjdk17/ppc64le.patch248
-rw-r--r--testing/openresty/APKBUILD14
-rw-r--r--testing/openscad/APKBUILD2
-rw-r--r--testing/openscap/APKBUILD4
-rw-r--r--testing/opensurge/APKBUILD38
-rw-r--r--testing/opensurge/patch-zip.patch21
-rw-r--r--testing/openttd-opensfx/APKBUILD6
-rw-r--r--testing/openttd/APKBUILD8
-rw-r--r--testing/openvdb/APKBUILD44
-rw-r--r--testing/openvino/APKBUILD16
-rw-r--r--testing/openwsman/APKBUILD10
-rw-r--r--testing/otpclient/APKBUILD6
-rw-r--r--testing/oxipng/APKBUILD4
-rw-r--r--testing/pandoc/APKBUILD8
-rw-r--r--testing/pandoc/cabal.project.freeze114
-rw-r--r--testing/partclone/APKBUILD48
-rw-r--r--testing/partclone/musl.patch27
-rw-r--r--testing/pavucontrol-qt/APKBUILD6
-rw-r--r--testing/pcem/APKBUILD37
-rw-r--r--testing/pcmanfm-qt/APKBUILD4
-rw-r--r--testing/pcsc-tools/APKBUILD6
-rw-r--r--testing/pcsxr/APKBUILD4
-rw-r--r--testing/pdfposter/APKBUILD30
-rw-r--r--testing/perl-getopt-long-descriptive/APKBUILD8
-rw-r--r--testing/perl-object-pad/APKBUILD4
-rw-r--r--testing/perl-sys-virt/APKBUILD4
-rw-r--r--testing/perl-xs-parse-sublike/APKBUILD4
-rw-r--r--testing/pgbackrest/APKBUILD35
-rw-r--r--testing/phosh-antispam/APKBUILD31
-rw-r--r--testing/php7-pecl-grpc/APKBUILD4
-rw-r--r--testing/php7-pecl-pcov/APKBUILD4
-rw-r--r--testing/php7-pecl-rdkafka/APKBUILD43
-rw-r--r--testing/php7-pecl-swoole/APKBUILD4
-rw-r--r--testing/php8-pecl-amqp/APKBUILD35
-rw-r--r--testing/php8-pecl-ev/APKBUILD11
-rw-r--r--testing/php8-pecl-grpc/APKBUILD4
-rw-r--r--testing/php8-pecl-pcov/APKBUILD6
-rw-r--r--testing/php8-pecl-rdkafka/APKBUILD34
-rw-r--r--testing/php8-pecl-swoole/APKBUILD4
-rw-r--r--testing/php8-pecl-xmlrpc/APKBUILD6
-rw-r--r--testing/php81-pecl-amqp/APKBUILD36
-rw-r--r--testing/php81-pecl-couchbase/APKBUILD41
-rw-r--r--testing/php81-pecl-couchbase/fix-deprecations-34.patch510
-rw-r--r--testing/php81-pecl-imagick/APKBUILD42
-rw-r--r--testing/php81-pecl-maxminddb/APKBUILD36
-rw-r--r--testing/php81-pecl-mongodb/APKBUILD11
-rw-r--r--testing/php81-pecl-pcov/APKBUILD38
-rw-r--r--testing/php81-pecl-rdkafka/APKBUILD37
-rw-r--r--testing/php81-pecl-redis/APKBUILD11
-rw-r--r--testing/php81-pecl-swoole/APKBUILD4
-rw-r--r--testing/php81-pecl-xdebug/APKBUILD4
-rw-r--r--testing/php81-pecl-xmlrpc/APKBUILD39
-rw-r--r--testing/php81/APKBUILD13
-rw-r--r--testing/picolibc/APKBUILD6
-rw-r--r--testing/pike/APKBUILD4
-rw-r--r--testing/pingus/APKBUILD4
-rw-r--r--testing/piping-server/APKBUILD4
-rw-r--r--testing/plantuml/APKBUILD6
-rw-r--r--testing/poetry/APKBUILD4
-rw-r--r--testing/polyml/APKBUILD4
-rw-r--r--testing/postgresql-citus/APKBUILD5
-rw-r--r--testing/postgresql-citus/postgresql-citus.post-install2
-rw-r--r--testing/postgresql-login_hook/APKBUILD5
-rw-r--r--testing/pps-tools/APKBUILD24
-rw-r--r--testing/pre-commit/APKBUILD6
-rw-r--r--testing/pre-commit/fix-importlib-metadata.patch14
-rw-r--r--testing/procs/APKBUILD47
-rw-r--r--testing/procs/minimize-size.patch9
-rw-r--r--testing/progress/APKBUILD25
-rw-r--r--testing/projectm/APKBUILD101
-rw-r--r--testing/projectm/fix-missing-gl-symbols-on-arm.patch23
-rw-r--r--testing/pspp/APKBUILD47
-rw-r--r--testing/pulumi/APKBUILD2
-rw-r--r--testing/py-spy/APKBUILD23
-rw-r--r--testing/py3-asyncmock/APKBUILD27
-rw-r--r--testing/py3-bleach-allowlist/APKBUILD26
-rw-r--r--testing/py3-caldav/APKBUILD8
-rw-r--r--testing/py3-cchardet/APKBUILD26
-rw-r--r--testing/py3-cheroot/APKBUILD59
-rw-r--r--testing/py3-cheroot/setuptools_scm.patch16
-rw-r--r--testing/py3-cherrypy/APKBUILD47
-rw-r--r--testing/py3-cherrypy/gziptest.patch17
-rw-r--r--testing/py3-cherrypy/setuptools_scm.patch12
-rw-r--r--testing/py3-cherrypy/test_timeout.patch14
-rw-r--r--testing/py3-cherrypy/tests.patch31
-rw-r--r--testing/py3-cmd2/APKBUILD6
-rw-r--r--testing/py3-cssselect/APKBUILD29
-rw-r--r--testing/py3-ddt/APKBUILD6
-rw-r--r--testing/py3-diskcache/APKBUILD8
-rw-r--r--testing/py3-docstring-to-markdown/APKBUILD6
-rw-r--r--testing/py3-ducc0/APKBUILD34
-rw-r--r--testing/py3-eventlet/APKBUILD24
-rw-r--r--testing/py3-fastdiff/APKBUILD34
-rw-r--r--testing/py3-flask-themer/APKBUILD34
-rw-r--r--testing/py3-gnupg/APKBUILD8
-rw-r--r--testing/py3-html2markdown/APKBUILD37
-rw-r--r--testing/py3-html2text/APKBUILD31
-rw-r--r--testing/py3-identify/APKBUILD4
-rw-r--r--testing/py3-imageio/APKBUILD4
-rw-r--r--testing/py3-jaraco.collections/APKBUILD31
-rw-r--r--testing/py3-jaraco.text/APKBUILD30
-rw-r--r--testing/py3-kubernetes/APKBUILD30
-rw-r--r--testing/py3-librelingo-audios/APKBUILD35
-rw-r--r--testing/py3-librelingo-types/APKBUILD31
-rw-r--r--testing/py3-librelingo-utils/APKBUILD35
-rw-r--r--testing/py3-librelingo-yaml-loader/APKBUILD45
-rw-r--r--testing/py3-marshmallow/APKBUILD4
-rw-r--r--testing/py3-pdal/APKBUILD8
-rw-r--r--testing/py3-pivy/APKBUILD42
-rw-r--r--testing/py3-pivy/qt5.patch11
-rw-r--r--testing/py3-pulsectl/APKBUILD31
-rw-r--r--testing/py3-pyatem/APKBUILD74
-rw-r--r--testing/py3-pyatem/openswitcher-proxy.confd10
-rw-r--r--testing/py3-pyatem/openswitcher-proxy.initd21
-rw-r--r--testing/py3-pyatem/openswitcher-proxy.pre-install4
-rw-r--r--testing/py3-pytest-instafail/APKBUILD29
-rw-r--r--testing/py3-repoze-lru/APKBUILD31
-rw-r--r--testing/py3-requests-unixsocket/APKBUILD34
-rw-r--r--testing/py3-resolvelib/APKBUILD26
-rw-r--r--testing/py3-routes/APKBUILD29
-rw-r--r--testing/py3-rss2email/APKBUILD29
-rw-r--r--testing/py3-rst-linker/no_setuptools_scm.patch10
-rw-r--r--testing/py3-rst.linker/APKBUILD (renamed from testing/py3-rst-linker/APKBUILD)9
-rw-r--r--testing/py3-shortuuid/APKBUILD8
-rw-r--r--testing/py3-snapshottest/APKBUILD39
-rw-r--r--testing/py3-stem/APKBUILD28
-rw-r--r--testing/py3-telegram-bot/APKBUILD8
-rw-r--r--testing/py3-telegram/APKBUILD8
-rw-r--r--testing/py3-tg/0001-Change-setup.py-to-accept-new-python-telegram-ver.patch23
-rw-r--r--testing/py3-tg/APKBUILD6
-rw-r--r--testing/py3-tomli-w/APKBUILD4
-rw-r--r--testing/py3-unidiff/APKBUILD36
-rw-r--r--testing/py3-unidiff/fix-test-script.patch8
-rw-r--r--testing/py3-webob/APKBUILD33
-rw-r--r--testing/py3-webob/python-3.9.patch11
-rw-r--r--testing/py3-webtest/APKBUILD28
-rw-r--r--testing/py3-yg.lockfile/APKBUILD4
-rw-r--r--testing/py3-zc.lockfile/APKBUILD29
-rw-r--r--testing/pypy3/0001-time.patch10
-rw-r--r--testing/pypy3/0002-extern-stdio.patch11
-rw-r--r--testing/pypy3/APKBUILD43
-rw-r--r--testing/qalculate-gtk/APKBUILD31
-rw-r--r--testing/qbittorrent-nox/APKBUILD45
-rw-r--r--testing/qbittorrent/APKBUILD83
-rw-r--r--testing/qbittorrent/qbittorrent-nox.confd (renamed from testing/qbittorrent-nox/qbittorrent-nox.confd)0
-rw-r--r--testing/qbittorrent/qbittorrent-nox.initd (renamed from testing/qbittorrent-nox/qbittorrent-nox.initd)0
-rw-r--r--testing/qbittorrent/qbittorrent-nox.pre-install (renamed from testing/qbittorrent-nox/qbittorrent-nox.pre-install)0
-rw-r--r--testing/qml-asteroid/APKBUILD4
-rw-r--r--testing/qownnotes/APKBUILD4
-rw-r--r--testing/qps/APKBUILD4
-rw-r--r--testing/qt-creator/APKBUILD10
-rw-r--r--testing/qt-creator/fix-execinfo.patch22
-rw-r--r--testing/qt-creator/fix-malloc-trim.patch2
-rw-r--r--testing/qt5ct/APKBUILD37
-rw-r--r--testing/qterminal/APKBUILD4
-rw-r--r--testing/qtermwidget/APKBUILD4
-rw-r--r--testing/radeontop/APKBUILD4
-rw-r--r--testing/rav1e/APKBUILD19
-rw-r--r--testing/raylib/APKBUILD4
-rw-r--r--testing/rebuilderd/APKBUILD111
-rw-r--r--testing/rebuilderd/rebuilderd-sync.cron8
-rw-r--r--testing/rebuilderd/rebuilderd.confd6
-rw-r--r--testing/rebuilderd/rebuilderd.initd20
-rw-r--r--testing/rekor/APKBUILD67
-rw-r--r--testing/rekor/fix-completions.patch24
-rw-r--r--testing/renderdoc/APKBUILD39
-rw-r--r--testing/renderdoc/musl-fix.patch73
-rw-r--r--testing/repo-tools/APKBUILD39
-rw-r--r--testing/repo-tools/build-fix-doc.patch11
-rw-r--r--testing/river/APKBUILD51
-rw-r--r--testing/rizin/APKBUILD1
-rw-r--r--testing/rke/APKBUILD8
-rw-r--r--testing/rocksdb/10-support-busybox-install.patch21
-rw-r--r--testing/rocksdb/APKBUILD8
-rw-r--r--testing/rofi-calc/APKBUILD38
-rw-r--r--testing/rtl_433/APKBUILD35
-rw-r--r--testing/ruby-build/APKBUILD6
-rw-r--r--testing/ruby-cap2/APKBUILD48
-rw-r--r--testing/ruby-net-ping/APKBUILD50
-rw-r--r--testing/ruby-net-ping/gemspec.patch34
-rw-r--r--testing/rustscan/APKBUILD32
-rw-r--r--testing/sc-im/APKBUILD4
-rw-r--r--testing/scalingo/APKBUILD4
-rw-r--r--testing/schismtracker/APKBUILD4
-rw-r--r--testing/scrcpy/APKBUILD8
-rw-r--r--testing/screengrab/APKBUILD4
-rw-r--r--testing/screenkey/APKBUILD25
-rw-r--r--testing/sct/APKBUILD4
-rw-r--r--testing/scummvm/0001-FLUIDSYNTH-Simplify-FluidSynth-version-check.patch58
-rw-r--r--testing/scummvm/0002-FLUIDSYNTH-Fix-compilation-with-Fluidsynth-2.2.patch111
-rw-r--r--testing/seaweedfs/APKBUILD6
-rw-r--r--testing/senpai/APKBUILD6
-rw-r--r--testing/sgt-puzzles/0001-change-desktop-variables-according-to-prefix.patch13
-rw-r--r--testing/sgt-puzzles/APKBUILD63
-rw-r--r--testing/shipments/APKBUILD25
-rw-r--r--testing/simgear/APKBUILD31
-rw-r--r--testing/simgear/boost-1.73.0.patch13
-rw-r--r--testing/simgear/musl-fixes.patch59
-rw-r--r--testing/simgear/musl-strerror_r.patch25
-rw-r--r--testing/simgear/musl-u_types.patch94
-rw-r--r--testing/singularity/APKBUILD9
-rw-r--r--testing/sof-bin/APKBUILD4
-rw-r--r--testing/soju/APKBUILD11
-rw-r--r--testing/songrec/APKBUILD43
-rw-r--r--testing/soqt/APKBUILD30
-rw-r--r--testing/spirv-llvm-translator/allow-llvm-11-1-0.patch11
-rw-r--r--testing/spread-sheet-widget/APKBUILD34
-rw-r--r--testing/ssh-tools/APKBUILD6
-rw-r--r--testing/sssd/0001-makefile.patch25
-rw-r--r--testing/sssd/0002-src.patch17
-rw-r--r--testing/sssd/0003-alpine.patch22
-rw-r--r--testing/sssd/APKBUILD27
-rw-r--r--testing/sssd/musl_fixup.patch53
-rw-r--r--testing/ssss/APKBUILD8
-rw-r--r--testing/sturmreader/APKBUILD4
-rw-r--r--testing/sublime-music/APKBUILD4
-rw-r--r--testing/supercronic/APKBUILD33
-rw-r--r--testing/supercronic/python3.patch13
-rw-r--r--testing/surgescript/APKBUILD33
-rw-r--r--testing/swi-prolog/APKBUILD79
-rw-r--r--testing/swtpm/APKBUILD45
-rw-r--r--testing/tabby/APKBUILD25
-rw-r--r--testing/tbftss/0001-remove-debug-flags.patch10
-rw-r--r--testing/tbftss/APKBUILD39
-rw-r--r--testing/telegram-tdlib/APKBUILD10
-rw-r--r--testing/termshark/APKBUILD2
-rw-r--r--testing/terraform-provider-libvirt/APKBUILD2
-rw-r--r--testing/texstudio/APKBUILD8
-rw-r--r--testing/thanos/APKBUILD12
-rw-r--r--testing/thunderbird/APKBUILD80
-rw-r--r--testing/thunderbird/avoid-redefinition.patch15
-rw-r--r--testing/thunderbird/disable-neon-in-aom.patch8
-rw-r--r--testing/thunderbird/fd6847c9416f9eebde636e21d794d25d1be8791d.patch37
-rw-r--r--testing/thunderbird/fix-rust-target.patch42
-rw-r--r--testing/thunderbird/fix-tools.patch19
-rw-r--r--testing/thunderbird/fix-webrtc-glibcisms.patch4
-rw-r--r--testing/thunderbird/remove-faulty-libvpx-check.patch13
-rw-r--r--testing/thunderbird/sandbox-fork.patch4
-rw-r--r--testing/thunderbird/sandbox-largefile.patch17
-rw-r--r--testing/tigervnc/0001-fix-gettext-intl.patch16
-rw-r--r--testing/tigervnc/APKBUILD42
-rw-r--r--testing/tio/APKBUILD26
-rw-r--r--testing/tomcat9/APKBUILD4
-rw-r--r--testing/topgrade/APKBUILD4
-rw-r--r--testing/toppler/APKBUILD4
-rw-r--r--testing/touchegg/APKBUILD6
-rw-r--r--testing/trivy/APKBUILD4
-rw-r--r--testing/tuigreet/APKBUILD4
-rw-r--r--testing/unrealircd/0001.configure-without-running-config.patch9
-rwxr-xr-xtesting/unrealircd/APKBUILD20
-rw-r--r--testing/unudhcpd/APKBUILD28
-rw-r--r--testing/upmpdcli/APKBUILD2
-rw-r--r--testing/v2ray/APKBUILD82
-rw-r--r--testing/v2ray/v2ray.initd36
-rw-r--r--testing/varnish-modules/01-test-fix.patch22
-rw-r--r--testing/varnish-modules/APKBUILD18
-rw-r--r--testing/vcstool/APKBUILD16
-rw-r--r--testing/vera++/APKBUILD44
-rw-r--r--testing/vera++/drop-failing-ruledump-test.patch34
-rw-r--r--testing/vera++/fix-not-declared-in-this-scope.patch11
-rw-r--r--testing/victoria-metrics/APKBUILD4
-rw-r--r--testing/visurf/APKBUILD42
-rw-r--r--testing/vpn-slice/APKBUILD25
-rw-r--r--testing/wayout/APKBUILD25
-rw-r--r--testing/waypipe/APKBUILD34
-rw-r--r--testing/weggli/APKBUILD4
-rw-r--r--testing/winetricks/APKBUILD6
-rw-r--r--testing/wlogout/APKBUILD50
-rw-r--r--testing/wlogout/default-layout.patch47
-rw-r--r--testing/wlogout/use-top-layer.patch26
-rw-r--r--testing/wlogout/wlogout.post-install10
-rw-r--r--testing/wlrctl/APKBUILD30
-rw-r--r--testing/wol/0001-musl-fixes.patch17
-rw-r--r--testing/wol/APKBUILD48
-rw-r--r--testing/wtfutil/APKBUILD4
-rw-r--r--testing/xa/APKBUILD8
-rw-r--r--testing/xastir/APKBUILD12
-rw-r--r--testing/xcape/APKBUILD25
-rw-r--r--testing/xfce4-weather-plugin/APKBUILD38
-rw-r--r--testing/xmrig/APKBUILD4
-rw-r--r--testing/xsct/APKBUILD28
-rw-r--r--testing/zapret/APKBUILD46
-rw-r--r--testing/zapret/zapret.confd113
-rw-r--r--testing/zapret/zapret.initd556
-rw-r--r--testing/zapret/zapret.pre-install5
-rw-r--r--testing/zathura-djvu/APKBUILD24
-rw-r--r--testing/zellij/APKBUILD31
-rw-r--r--testing/zkgroup/APKBUILD6
678 files changed, 11864 insertions, 14353 deletions
diff --git a/testing/alex/APKBUILD b/testing/alex/APKBUILD
index 54a3dbdb10..90afc9fe0d 100644
--- a/testing/alex/APKBUILD
+++ b/testing/alex/APKBUILD
@@ -2,16 +2,17 @@
# Maintainer: River Dillon <oss@outerpassage.net>
pkgname=alex
pkgver=3.2.6
-pkgrel=1
+pkgrel=2
pkgdesc="lexical analyser generator for Haskell"
url="https://www.haskell.org/alex/"
arch="x86_64" # limited by ghc
license="BSD-3-Clause"
-makedepends="ghc"
+makedepends="ghc libffi-dev"
subpackages="$pkgname-doc"
source="
https://hackage.haskell.org/package/alex-$pkgver/alex-$pkgver.tar.gz
https://www.haskell.org/alex/doc/alex-doc-html-3.0.tar.gz
+ fix-tests-ghc-9.0.patch
"
build() {
@@ -34,5 +35,8 @@ package() {
install -Dm644 -t "$pkgdir/$docdir/html/" "$srcdir/$pkgname"/*
}
-sha512sums="05b6e55e9a1c348aea599d1130780a3d2a0a7c5f1db00b2c98bd34737cac9d48842fb1b1f98947a99d99013f94e39a6ffee1af8546f02fb2d32fcf362ff0f83c alex-3.2.6.tar.gz
-c9497e9b6c80d79d29bd5b1d05cf4077c30c2d94b9c6c321145ca104db204deb96db66f8abba0ad2e849556eda8b901aa6181935e8aca81ff9ffc676d19f87dd alex-doc-html-3.0.tar.gz"
+sha512sums="
+05b6e55e9a1c348aea599d1130780a3d2a0a7c5f1db00b2c98bd34737cac9d48842fb1b1f98947a99d99013f94e39a6ffee1af8546f02fb2d32fcf362ff0f83c alex-3.2.6.tar.gz
+c9497e9b6c80d79d29bd5b1d05cf4077c30c2d94b9c6c321145ca104db204deb96db66f8abba0ad2e849556eda8b901aa6181935e8aca81ff9ffc676d19f87dd alex-doc-html-3.0.tar.gz
+9e8236a3e08add1b2c8ed97da636de900d3f562df2a9dc5496bdf5578908d700c1106cf8ee6b86e4244c02e64b66caa1289b298d66bccc441dae9a3b76dda2d9 fix-tests-ghc-9.0.patch
+"
diff --git a/testing/alex/fix-tests-ghc-9.0.patch b/testing/alex/fix-tests-ghc-9.0.patch
new file mode 100644
index 0000000000..7cbf2a64b1
--- /dev/null
+++ b/testing/alex/fix-tests-ghc-9.0.patch
@@ -0,0 +1,22 @@
+From 84b29475e057ef744f32a94bc0d3954b84160760 Mon Sep 17 00:00:00 2001
+From: Vaibhav Sagar <vaibhavsagar@gmail.com>
+Date: Sun, 25 Apr 2021 00:48:56 +1000
+Subject: [PATCH] tests/default_typeclass.x: remove spaces around as-pattern
+
+---
+ tests/default_typeclass.x | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/default_typeclass.x b/tests/default_typeclass.x
+index 5491e28..76ac35a 100644
+--- a/tests/default_typeclass.x
++++ b/tests/default_typeclass.x
+@@ -133,7 +133,7 @@ alexSetInput (pos, c, bs, inp) =
+ alexError :: (MonadState AlexState m, Read s) => String -> m (Token s)
+ alexError message =
+ do
+- s @ AlexState { alex_errs = errs } <- get
++ s@AlexState { alex_errs = errs } <- get
+ put s { alex_errs = message : errs }
+ alexMonadScan
+
diff --git a/testing/appstream-generator/APKBUILD b/testing/appstream-generator/APKBUILD
index e1b204c429..e6382eaa4f 100644
--- a/testing/appstream-generator/APKBUILD
+++ b/testing/appstream-generator/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
pkgname=appstream-generator
pkgver=0.8.5
-pkgrel=0
+pkgrel=1
pkgdesc="fast AppStream metadata generator"
url="https://github.com/ximion/appstream-generator"
arch="x86_64" # ldc
@@ -11,6 +11,7 @@ makedepends="meson ldc ldc-runtime appstream-dev libarchive-dev gir-to-d
cairo-dev gdk-pixbuf-dev librsvg-dev freetype-dev fontconfig-dev
pango-dev yarn lmdb-dev glibd-dev libsoup-dev gobject-introspection-dev
coreutils curl-dev" # needs cp with preserve-ownership
+options="net"
subpackages="$pkgname-doc"
source="https://github.com/ximion/appstream-generator/archive/v$pkgver/appstream-generator-$pkgver.tar.gz"
diff --git a/testing/archiso/APKBUILD b/testing/archiso/APKBUILD
index ef5ed8bc64..9a41f91e0c 100644
--- a/testing/archiso/APKBUILD
+++ b/testing/archiso/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Clayton Craft <clayton@craftyguy.net>
# Maintainer: Clayton Craft <clayton@craftyguy.net>
pkgname=archiso
-pkgver=58
+pkgver=59
pkgrel=0
pkgdesc="tools for creating Arch Linux live and install iso images"
url="https://gitlab.archlinux.org/archlinux/archiso"
@@ -31,5 +31,5 @@ package() {
}
sha512sums="
-b69f745a1e7ddf2d7a170fd38bacffa164aeeeaa550161691c002f0d4043fc71a8ad69b0e7c58a3cf662e365199a816b98e882bd7986ca06f3075618784a414a archiso-v58.tar.gz
+daf69ec778a5c4769cd46a23935dc50366a140667e1a97d097ad9b651a6c86845cde33c50915853849de3ebcb74e79c52ecdf803c99aa02866887c6ec3afc770 archiso-v59.tar.gz
"
diff --git a/testing/archlinux-keyring/APKBUILD b/testing/archlinux-keyring/APKBUILD
index 7a33112fa6..8ac5fd3953 100644
--- a/testing/archlinux-keyring/APKBUILD
+++ b/testing/archlinux-keyring/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Clayton Craft <clayton@craftyguy.net>
# Maintainer: Clayton Craft <clayton@craftyguy.net>
pkgname=archlinux-keyring
-pkgver=20210902
+pkgver=20211028
pkgrel=0
pkgdesc="GuPG keys for Arch Linux"
url="https://archlinux.org"
@@ -15,5 +15,5 @@ package() {
make PREFIX=/usr DESTDIR="$pkgdir" install
}
sha512sums="
-3cdd1560f1fe9590452b2bf5019e6b465d119bcb9fd82587983d91bc6adb4634e51871c7f908156732571c359fe67fd7c175668c8766ea9d9114d799f5fc7d4d archlinux-keyring-20210902.tar.gz
+9f1f6a1cb8d613d2682a38a7fd17e83a66c8aaed79f8b84452092fc32a0af6a957a56520b12081a72c0d5e71bf129ba0f7107a200bb4dee66a04462241c73647 archlinux-keyring-20211028.tar.gz
"
diff --git a/testing/asteroid-btsyncd/APKBUILD b/testing/asteroid-btsyncd/APKBUILD
index f5908b04bd..dc22b44eba 100644
--- a/testing/asteroid-btsyncd/APKBUILD
+++ b/testing/asteroid-btsyncd/APKBUILD
@@ -1,43 +1,48 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=asteroid-btsyncd
-pkgver=0_git20210214
-pkgrel=1
-_commit="2abfb13526a02d5309716ccb54a763684deebac0"
+pkgver=0_git20211128
+pkgrel=0
+_commit="d142416ac0d0442e354c2c5b9fbce0b9db9ea36f"
pkgdesc="Bluetooth Low Energy synchronization daemon for AsteroidOS"
url="https://github.com/AsteroidOS/asteroid-btsyncd"
# armhf blocked by nemo-qml-plugin-systemsettings
arch="all !armhf"
license="GPL-3.0-or-later"
makedepends="
+ extra-cmake-modules
glibmm-dev
nemo-qml-plugin-systemsettings-dev
+ qml-asteroid-dev
qt5-qtbase-dev
qtmpris-dev
timed-dev
"
source="https://github.com/AsteroidOS/asteroid-btsyncd/archive/$_commit/asteroid-btsyncd-$_commit.tar.gz
- 0001-batteryservice-use-systemsettings.patch
asteroid-btsyncd.desktop
"
builddir="$srcdir/$pkgname-$_commit"
build() {
- qmake-qt5 \
- PREFIX=/usr
- make
+ cmake -B build \
+ -DCMAKE_BUILD_TYPE=None \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=lib
+ cmake --build build
}
check() {
- make check
+ cd build
+ CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- INSTALL_ROOT="$pkgdir" make install
+ DESTDIR="$pkgdir" cmake --install build
install -Dm644 "$srcdir"/asteroid-btsyncd.desktop -t "$pkgdir"/etc/xdg/autostart/
}
-sha512sums="7616f24111113ea59242dcd7a3962d8d8cd6c26a06a9ca3be0bead2b8b68a0efcf7c744792552c4a937897d2972b489045be9474d68e28cb4ca3d816de28ded1 asteroid-btsyncd-2abfb13526a02d5309716ccb54a763684deebac0.tar.gz
-ccf4a5ad71847e1d35ba09644bdde8596560dbff58f3d26f5ceec7b5ed777859e3c6ab4e23ee53ea8d5715c6485ad425c6b766ae5672bd378f3262fea9073a50 0001-batteryservice-use-systemsettings.patch
-c6d1f3e1870c9bf0c65dc25961f58c3277149f6f7cc141bf0fd89ead191a1d9d72c3c414485f9b1b6407f066e51949b17be8eeb2473dcafb2e2bc5af1015b903 asteroid-btsyncd.desktop"
+sha512sums="
+c13c3e497c9ce4e9fe4120a56efe23ad89cfd06cc404001a0db6727f2af8f5be43ed27dbca2aecd76f686b5bec5f24b489f2cc534109d27d3cc23da6bf18bcb8 asteroid-btsyncd-d142416ac0d0442e354c2c5b9fbce0b9db9ea36f.tar.gz
+c6d1f3e1870c9bf0c65dc25961f58c3277149f6f7cc141bf0fd89ead191a1d9d72c3c414485f9b1b6407f066e51949b17be8eeb2473dcafb2e2bc5af1015b903 asteroid-btsyncd.desktop
+"
diff --git a/testing/asteroid-launcher/0001-use-mce-battery-api-and-fix-deprecation-issues.patch b/testing/asteroid-launcher/0001-use-mce-battery-api-and-fix-deprecation-issues.patch
index a683f339e9..d9607490fd 100644
--- a/testing/asteroid-launcher/0001-use-mce-battery-api-and-fix-deprecation-issues.patch
+++ b/testing/asteroid-launcher/0001-use-mce-battery-api-and-fix-deprecation-issues.patch
@@ -1,7 +1,7 @@
-From bf64dce48823cc8e11d2833542d659cabc37bfde Mon Sep 17 00:00:00 2001
+From 59e072c0e2f2e3d848f08affed6d046cec801114 Mon Sep 17 00:00:00 2001
From: MagneFire <IDaNLContact@gmail.com>
Date: Sun, 4 Apr 2021 20:51:52 +0200
-Subject: [PATCH 1/2] QuickSettings: Use Mce for battery information.
+Subject: [PATCH] QuickSettings: Use Mce for battery information.
---
qml/quicksettings/QuickSettings.qml | 21 ++++++++-------------
@@ -63,295 +63,3 @@ index ee13e7c..344b72b 100644
anchors.right: parent.right
anchors.verticalCenter: parent.verticalCenter
}
-
-From c9b69fc8a287b07d929a248df7b8c840a8618b61 Mon Sep 17 00:00:00 2001
-From: MagneFire <IDaNLContact@gmail.com>
-Date: Sun, 4 Apr 2021 23:07:39 +0200
-Subject: [PATCH 2/2] Connections: Use Qt 5.15 API for connecting functions. As
- of Qt 5.15 the Connections QML type requires a different way of connecting
- functions.
-
----
- qml/MainScreen.qml | 19 ++++++++++---------
- qml/misc/BluetoothAgent.qml | 2 +-
- qml/notifications/NotificationActions.qml | 2 +-
- qml/notifications/NotificationIndicator.qml | 4 ++--
- qml/notifications/NotificationPreview.qml | 2 +-
- qml/notifications/NotificationView.qml | 2 +-
- watchfaces/000-default-digital.qml | 2 +-
- watchfaces/001-words-worte-palabras-mots.qml | 2 +-
- watchfaces/002-analog-70s-classic.qml | 2 +-
- watchfaces/003-alternative-digital-2.qml | 4 ++--
- watchfaces/004-alternative-scifi.qml | 4 ++--
- watchfaces/005-analog-nordic.qml | 2 +-
- watchfaces/006-analog-50s-americana.qml | 4 ++--
- watchfaces/007-bold-hour-bebas.qml | 2 +-
- watchfaces/009-contemporary-digital-rings.qml | 2 +-
- 15 files changed, 28 insertions(+), 27 deletions(-)
-
-diff --git a/qml/MainScreen.qml b/qml/MainScreen.qml
-index 6a21772..f0199e4 100644
---- a/qml/MainScreen.qml
-+++ b/qml/MainScreen.qml
-@@ -146,22 +146,22 @@ Item {
-
- Connections {
- target: Lipstick.compositor
-- onDisplayAboutToBeOn: {
-+ function onDisplayAboutToBeOn() {
- wallClockAmbientTimeout.stop()
- wallClock.enabled = true
- }
-- onDisplayAboutToBeOff: wallClock.enabled = false
-- onDisplayOn: {
-+ function onDisplayAboutToBeOff() { wallClock.enabled = false }
-+ function onDisplayOn() {
- grid.animateIndicators()
- if (Lipstick.compositor.ambientEnabled) grid.moveTo(0, 0)
- }
-- onDisplayAmbientChanged: wallpaperAnimation.duration = 300
-- onDisplayAmbientEntered: wallpaperDarkener.opacity = 1
-- onDisplayAmbientLeft: {
-+ function onDisplayAmbientChanged() { wallpaperAnimation.duration = 300 }
-+ function onDisplayAmbientEntered() { wallpaperDarkener.opacity = 1 }
-+ function onDisplayAmbientLeft() {
- wallpaperDarkener.opacity = 0
- if (burnInProtectionManager.enabled) leftIndicator.anchors.verticalCenterOffset = 0
- }
-- onDisplayAmbientUpdate: {
-+ function onDisplayAmbientUpdate() {
- // Perform burn in protection
- if (burnInProtectionManager.enabled) {
- grid.contentX = Math.random()*(burnInProtectionManager.leftOffset + burnInProtectionManager.rightOffset)-burnInProtectionManager.leftOffset
-@@ -184,7 +184,7 @@ Item {
-
- Connections {
- target: localeManager
-- onChangesObserverChanged: {
-+ function onChangesObserverChanged() {
- var bkp = watchFaceSource.value
- watchFaceSource.value = ""
- watchFaceSource.value = bkp
-@@ -276,9 +276,10 @@ Item {
- repeat: false
- onTriggered: Desktop.onAboutToClose()
- }
-+
- Connections {
- target: Lipstick.compositor
-- onDisplayOff: lockscreenDelay.start();
-+ function onDisplayOff() { lockscreenDelay.start() }
- }
-
- // Wallpaper
-diff --git a/qml/misc/BluetoothAgent.qml b/qml/misc/BluetoothAgent.qml
-index 153c4f2..0e538d4 100644
---- a/qml/misc/BluetoothAgent.qml
-+++ b/qml/misc/BluetoothAgent.qml
-@@ -136,7 +136,7 @@ Item {
-
- Connections {
- target: agent
-- onStateChanged: {
-+ function onStateChanged() {
- switch(agent.state) {
- case BluetoothAgent.AuthService:
- //% "Authorize:"
-diff --git a/qml/notifications/NotificationActions.qml b/qml/notifications/NotificationActions.qml
-index 825df7c..6182f66 100644
---- a/qml/notifications/NotificationActions.qml
-+++ b/qml/notifications/NotificationActions.qml
-@@ -77,7 +77,7 @@ Item {
-
- Connections {
- target: panelsGrid
-- onCurrentHorizontalPosChanged: {
-+ function onCurrentHorizontalPosChanged() {
- if(forbidBottom)
- layerStack.pop(layerStack.currentLayer)
- updateTimestamp()
-diff --git a/qml/notifications/NotificationIndicator.qml b/qml/notifications/NotificationIndicator.qml
-index 8289a0e..2eb784f 100644
---- a/qml/notifications/NotificationIndicator.qml
-+++ b/qml/notifications/NotificationIndicator.qml
-@@ -135,8 +135,8 @@ Item {
- notifIndic.visible = false
- }
-
-- onCurrentHorizontalPosChanged: makeVisible()
-- onCurrentVerticalPosChanged: makeVisible()
-+ function onCurrentHorizontalPosChanged() { makeVisible() }
-+ function onCurrentVerticalPosChanged() { makeVisible() }
- }
-
- NotificationListModel {
-diff --git a/qml/notifications/NotificationPreview.qml b/qml/notifications/NotificationPreview.qml
-index ddf116f..44b0659 100644
---- a/qml/notifications/NotificationPreview.qml
-+++ b/qml/notifications/NotificationPreview.qml
-@@ -172,7 +172,7 @@ Item {
-
- Connections {
- target: notificationPreviewPresenter;
-- onNotificationChanged: notificationArea.state = (notificationPreviewPresenter.notification != null) ? "show" : "hide"
-+ function onNotificationChanged() { notificationArea.state = (notificationPreviewPresenter.notification != null) ? "show" : "hide" }
- }
- }
- }
-diff --git a/qml/notifications/NotificationView.qml b/qml/notifications/NotificationView.qml
-index d23a7f1..b6799c3 100644
---- a/qml/notifications/NotificationView.qml
-+++ b/qml/notifications/NotificationView.qml
-@@ -105,7 +105,7 @@ MouseArea {
-
- Connections {
- target: panelsGrid
-- onCurrentHorizontalPosChanged: updateTimestamp()
-+ function onCurrentHorizontalPosChanged() { updateTimestamp() }
- }
- }
-
-diff --git a/watchfaces/000-default-digital.qml b/watchfaces/000-default-digital.qml
-index 06c85b5..719855c 100644
---- a/watchfaces/000-default-digital.qml
-+++ b/watchfaces/000-default-digital.qml
-@@ -122,7 +122,7 @@ Item {
-
- Connections {
- target: wallClock
-- onTimeChanged: {
-+ function onTimeChanged() {
- var hour = wallClock.time.getHours()
- var minute = wallClock.time.getMinutes()
- var date = wallClock.time.getDate()
-diff --git a/watchfaces/001-words-worte-palabras-mots.qml b/watchfaces/001-words-worte-palabras-mots.qml
-index 3e4e747..721be14 100644
---- a/watchfaces/001-words-worte-palabras-mots.qml
-+++ b/watchfaces/001-words-worte-palabras-mots.qml
-@@ -179,7 +179,7 @@ Item {
-
- Connections {
- target: localeManager
-- onChangesObserverChanged: {
-+ function onChangesObserverChanged() {
- timeDisplay.text = Qt.binding(function() { return generateTime(wallClock.time) })
- dateDisplay.text = Qt.binding(function() { return wallClock.time.toLocaleString(Qt.locale(), "<b>ddd</b> d MMM") })
- }
-diff --git a/watchfaces/002-analog-70s-classic.qml b/watchfaces/002-analog-70s-classic.qml
-index 6913ecb..27003d7 100644
---- a/watchfaces/002-analog-70s-classic.qml
-+++ b/watchfaces/002-analog-70s-classic.qml
-@@ -323,7 +323,7 @@ Item {
-
- Connections {
- target: wallClock
-- onTimeChanged: {
-+ function onTimeChanged() {
- var hour = wallClock.time.getHours()
- var minute = wallClock.time.getMinutes()
- var second = wallClock.time.getSeconds()
-diff --git a/watchfaces/003-alternative-digital-2.qml b/watchfaces/003-alternative-digital-2.qml
-index 886f890..f51a897 100644
---- a/watchfaces/003-alternative-digital-2.qml
-+++ b/watchfaces/003-alternative-digital-2.qml
-@@ -179,7 +179,7 @@ Item {
-
- Connections {
- target: wallClock
-- onTimeChanged: {
-+ function onTimeChanged() {
- var hour = wallClock.time.getHours()
- var minute = wallClock.time.getMinutes()
- var second = wallClock.time.getSeconds()
-@@ -240,7 +240,7 @@ Item {
-
- Connections {
- target: localeManager
-- onChangesObserverChanged: {
-+ function onChangesObserverChanged() {
- hourCanvas.requestPaint()
- minuteCanvas.requestPaint()
- secondCanvas.requestPaint()
-diff --git a/watchfaces/004-alternative-scifi.qml b/watchfaces/004-alternative-scifi.qml
-index 50543fd..8a8863a 100644
---- a/watchfaces/004-alternative-scifi.qml
-+++ b/watchfaces/004-alternative-scifi.qml
-@@ -198,7 +198,7 @@ Item {
-
- Connections {
- target: wallClock
-- onTimeChanged: {
-+ function onTimeChanged() {
- var hour = wallClock.time.getHours()
- var minute = wallClock.time.getMinutes()
- var date = wallClock.time.getDate()
-@@ -245,7 +245,7 @@ Item {
-
- Connections {
- target: localeManager
-- onChangesObserverChanged: {
-+ function onChangesObserverChanged() {
- hourCanvas.requestPaint()
- minuteCanvas.requestPaint()
- dateCanvas.requestPaint()
-diff --git a/watchfaces/005-analog-nordic.qml b/watchfaces/005-analog-nordic.qml
-index 2f59a1e..4224e3a 100644
---- a/watchfaces/005-analog-nordic.qml
-+++ b/watchfaces/005-analog-nordic.qml
-@@ -300,7 +300,7 @@ Item {
-
- Connections {
- target: wallClock
-- onTimeChanged: {
-+ function onTimeChanged() {
- var hour = wallClock.time.getHours()
- var minute = wallClock.time.getMinutes()
- var second = wallClock.time.getSeconds()
-diff --git a/watchfaces/006-analog-50s-americana.qml b/watchfaces/006-analog-50s-americana.qml
-index b1a5f7d..cf631f9 100644
---- a/watchfaces/006-analog-50s-americana.qml
-+++ b/watchfaces/006-analog-50s-americana.qml
-@@ -261,7 +261,7 @@ Item {
-
- Connections {
- target: compositor
-- onDisplayAmbientChanged: {
-+ function onDisplayAmbientChanged() {
- minuteHand.requestPaint()
- hourHand.requestPaint()
- }
-@@ -269,7 +269,7 @@ Item {
-
- Connections {
- target: wallClock
-- onTimeChanged: {
-+ function onTimeChanged() {
- var hour = wallClock.time.getHours()
- var minute = wallClock.time.getMinutes()
- var second = wallClock.time.getSeconds()
-diff --git a/watchfaces/007-bold-hour-bebas.qml b/watchfaces/007-bold-hour-bebas.qml
-index 6da96f0..e8b72ea 100644
---- a/watchfaces/007-bold-hour-bebas.qml
-+++ b/watchfaces/007-bold-hour-bebas.qml
-@@ -112,7 +112,7 @@ Item {
-
- Connections {
- target: wallClock
-- onTimeChanged: {
-+ function onTimeChanged() {
- var hour = wallClock.time.getHours()
- var minute = wallClock.time.getMinutes()
- if(minuteCircle.minute != minute) {
-diff --git a/watchfaces/009-contemporary-digital-rings.qml b/watchfaces/009-contemporary-digital-rings.qml
-index ab497ff..171344d 100644
---- a/watchfaces/009-contemporary-digital-rings.qml
-+++ b/watchfaces/009-contemporary-digital-rings.qml
-@@ -204,7 +204,7 @@ Item {
-
- Connections {
- target: wallClock
-- onTimeChanged: {
-+ function onTimeChanged() {
- if (displayAmbient) return
- var hour = wallClock.time.getHours()
- var minute = wallClock.time.getMinutes()
diff --git a/testing/asteroid-launcher/APKBUILD b/testing/asteroid-launcher/APKBUILD
index 759391af29..293218c05c 100644
--- a/testing/asteroid-launcher/APKBUILD
+++ b/testing/asteroid-launcher/APKBUILD
@@ -1,9 +1,9 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=asteroid-launcher
-pkgver=0_git20210411
-pkgrel=3
-_commit="074e73da1bd9cc5228d84a054c0238584f6abda3"
+pkgver=0_git20211121
+pkgrel=5
+_commit="d616e47367704143fe29beacb1c4c0134c6262a9"
pkgdesc="AsteroidOS launcher and Wayland compositor based on Qt5, QML and QtWayland via Lipstick"
url="https://github.com/AsteroidOS/asteroid-launcher"
arch="all !armhf" # blocked by nemo-qml-plugin-calendar
@@ -19,6 +19,7 @@ depends="
nemo-qml-plugin-systemsettings
nemo-qml-plugin-time
qml-asteroid
+ qt5-qtgraphicaleffects
"
# Normally we shouldn't hard depend on fonts, but in this case these fonts are
# hardcoded for some supported watchfaces
@@ -32,6 +33,7 @@ makedepends="
lipstick-dev
qt5-qtbase-dev
"
+subpackages="$pkgname-dbg"
source="https://github.com/AsteroidOS/asteroid-launcher/archive/$_commit/asteroid-launcher-$_commit.tar.gz
0001-use-mce-battery-api-and-fix-deprecation-issues.patch
"
@@ -55,5 +57,7 @@ package() {
cp i18n/asteroid-launcher.*.qm "$pkgdir"/usr/share/translations/
}
-sha512sums="1ed1bd36af67de62044dbec9a2ee73fb3ea9d14ef8a6eb0ef194acab67926e6914ef0d4a77c11c1d7d623664525f01295d271a0ded935bf127af0db4fb27bb0f asteroid-launcher-074e73da1bd9cc5228d84a054c0238584f6abda3.tar.gz
-8027642deb6c8ecff972f567245a908f6a2da60d1c638562b4709a5b67ea7981aaf3c37043c59ab81cd31b4b4dc0e62b9a5c868c2e7f390bf9258b0cc1061db7 0001-use-mce-battery-api-and-fix-deprecation-issues.patch"
+sha512sums="
+f39849291f0f36ca131189a4a4c3047d487c2489667a76550d842998354e9d2857b53ef4672e9bb98895c2303f38384297487cfba9e99f1d82cf059b40d199b9 asteroid-launcher-d616e47367704143fe29beacb1c4c0134c6262a9.tar.gz
+3e05448c78c98dfb2ad8085357ccb5a473baae561b03337dda53f2f031fa8b6069c2139ca6fd35ee4c7e69dd0765618ff01421ddc758072d54806723f6320c47 0001-use-mce-battery-api-and-fix-deprecation-issues.patch
+"
diff --git a/testing/asteroid-settings/APKBUILD b/testing/asteroid-settings/APKBUILD
index ec1dcf4a86..cac25b73e0 100644
--- a/testing/asteroid-settings/APKBUILD
+++ b/testing/asteroid-settings/APKBUILD
@@ -1,9 +1,9 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=asteroid-settings
-pkgver=0_git20210517
+pkgver=0_git20211128
pkgrel=0
-_commit="d5e6b2755e8f468609fe3b41fde47d6cbd30ee7d"
+_commit="2e9b722ad2611486694d5172322dcca39447dc9c"
pkgdesc="Default settings app for AsteroidOS"
url="https://github.com/AsteroidOS/asteroid-settings"
# armhf blocked by nemo-qml-plugin-systemsettings
@@ -42,5 +42,5 @@ package() {
}
sha512sums="
-dbaab42e7a602f9dad4cf9d76e3a3c7c4c58158f6602f4d50208b63edecbe826434740e6eb6b9f996f822d7490ecf934a766b31c9ace7eca8e0916d7705107c5 asteroid-settings-d5e6b2755e8f468609fe3b41fde47d6cbd30ee7d.tar.gz
+5a007aa3e8c492ebb7e6dff68f7953d5df69839c068258043768c89f9a1421220b5075bd6463cecfe37bb8e3f8053d544aa98e4d8855104f25aeb4506936ed84 asteroid-settings-2e9b722ad2611486694d5172322dcca39447dc9c.tar.gz
"
diff --git a/testing/atari800/APKBUILD b/testing/atari800/APKBUILD
index 9fe4bf987f..0820eca305 100644
--- a/testing/atari800/APKBUILD
+++ b/testing/atari800/APKBUILD
@@ -1,12 +1,12 @@
# Contributor: Paul Bredbury <brebs@sent.com>
pkgname=atari800
pkgver=4.2.0
-pkgrel=0
+pkgrel=1
pkgdesc="Atari 8-bit computer emulator"
url="https://atari800.github.io/"
arch="x86_64"
license="GPL-2.0-or-later"
-makedepends="autoconf automake sdl-dev mesa-dev unzip"
+makedepends="autoconf automake sdl12-compat-dev mesa-dev unzip"
options="!check" # No test suite
subpackages="$pkgname-doc"
source="https://github.com/atari800/atari800/archive/ATARI800_${pkgver//./_}.tar.gz"
diff --git a/testing/b3sum/APKBUILD b/testing/b3sum/APKBUILD
index 2840a33707..49eb8018a1 100644
--- a/testing/b3sum/APKBUILD
+++ b/testing/b3sum/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Leo <thinkabit.ukim@gmail.com>
# Maintainer:
pkgname=b3sum
-pkgver=1.1.0
+pkgver=1.2.0
pkgrel=0
pkgdesc="Command line implementation of the BLAKE3 hash function"
url="https://blake3.io"
@@ -29,5 +29,5 @@ package() {
}
sha512sums="
-a163230d8f73a531612c5217a2fd82831dc251b67d9b2a7318d286bb4bd9673d5ad03c841a8f4f168b82e9c7d9a655d0a90671910d88ed2ba55bfeba5a8f3007 b3sum-1.1.0.tar.gz
+eb1e0f3557dc439d966892318f6a98af6b840361ef6777c83ac5d8a661d2186b360447fcdffdf890d2fe0c2ad0cfba73215a66fa0cb60135408d2813a80ac46e b3sum-1.2.0.tar.gz
"
diff --git a/testing/barman/APKBUILD b/testing/barman/APKBUILD
index 872e8b1400..8cb6fd893e 100644
--- a/testing/barman/APKBUILD
+++ b/testing/barman/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Francesco Colista <fcolista@alpinelinux.org>
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=barman
-pkgver=2.15
+pkgver=2.17
pkgrel=0
pkgdesc="Backup and recovery manager for PostgreSQL"
url="http://www.pgbarman.org"
@@ -33,5 +33,5 @@ package() {
}
sha512sums="
-700784375e293435e98c7ac7fa387bb8d9e4079210dcfc4550b458a60e213be6792ce66e54e4a75761d1e734a3785f4a5ead46ccc7efb848c60bccecc197d6b3 barman-2.15.tar.gz
+87d91dc75102cf1f61d7db166420fbc3db44d32f16f6f662b1b8118f91dc30ced30d090db927a91bfa9f39a6de36c8716123fc5e39e6d278d99f5f62e269d224 barman-2.17.tar.gz
"
diff --git a/testing/barrier/APKBUILD b/testing/barrier/APKBUILD
index 6ca04cbe36..92dc1dee51 100644
--- a/testing/barrier/APKBUILD
+++ b/testing/barrier/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Sean McAvoy <seanmcavoy@gmail.com>
# Maintainer: Sean McAvoy <seanmcavoy@gmail.com>
pkgname=barrier
-pkgver=2.3.3
-pkgrel=1
+pkgver=2.3.4
+pkgrel=0
pkgdesc="share keyboard and mouse between systems over network"
url="https://github.com/debauchee/barrier"
arch="all !mips !mips64" # Fails to build
@@ -39,7 +39,7 @@ package() {
}
sha512sums="
-1ac945ce090d5bbdae7bab7d4ca802cc2d54c1644a12088203b240e38078d32d3b30ae2f764ba27d66c9d709e430b0eb1b4576314d99dd6177d8b88d19b89777 barrier-2.3.3.tar.gz
+cbf7a52f536d0ac8c6193933217ef0bc551054e6fcf74a2d42c6215c8c1138d11d41ecb839b271481526bf87b2620d5899c6c1bfdf2e0f00a95bb62211b9a197 barrier-2.3.4.tar.gz
a9a37a64677c0708d22c8ed08b71c47b613c404ea4a65eed40833bedc356162516c166e0eb53895ebe6f1bff14c42df1b40cb7dd7b3d2a2e258990d440f4d7e4 1-disable-test-include.patch
5ba7fa70bc5a60faff7f4678d4ef9d958b8c4f987a3533523975b26ec8fd213c38d86380fc38ec44a0195ac2cf29cd23689ff84e2f5c743175679fac8387fa89 fix-riscv64-build.patch
"
diff --git a/testing/belcard/APKBUILD b/testing/belcard/APKBUILD
index aafddf9973..ecabcea510 100644
--- a/testing/belcard/APKBUILD
+++ b/testing/belcard/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Francesco Colista <fcolista@alpinelinux.org>
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=belcard
-pkgver=5.0.23
+pkgver=5.0.55
pkgrel=0
pkgdesc="C++ library to manipulate VCard standard format"
url="https://linphone.org"
@@ -38,5 +38,5 @@ dev() {
sha512sums="
-64acb2c9e7428fda1df18124468e5186c96c22167bac7ae807752f0c684915c3d1f9d91a34f1afad1795cd414dcb7a284bbd6d9deff31fe62f8fef9cfd2cfe65 belcard-5.0.23.tar.gz
+a6f72c43f775bbf8d790378040bbddea72c63648bd260fff329716e4755df993850aa6867be1ee5d7b14ab2586bb04300c50a1cbc7e365583682d25808532962 belcard-5.0.55.tar.gz
"
diff --git a/testing/belle-sip/APKBUILD b/testing/belle-sip/APKBUILD
index dd46de814b..5f8194d8b2 100644
--- a/testing/belle-sip/APKBUILD
+++ b/testing/belle-sip/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Francesco Colista <fcolista@alpinelinux.org>
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=belle-sip
-pkgver=5.0.12
+pkgver=5.0.55
pkgrel=0
pkgdesc="SIP (RFC3261) implementation written in C"
url="https://www.linphone.org"
@@ -33,6 +33,6 @@ package() {
}
sha512sums="
-cd90a3172fd4cc425555082bb51e9d9b0f9dbdab956ef04e1c2afc75340b2eae73dd547514a5b7083fdba07c8b9d3277934796b7a9f926434fd48750ea7f6dfb belle-sip-5.0.12.tar.gz
+83810c4eaeda2b456de977a4f034f37f5c3c1a8a220ae0d0af8c2d33bb1e19a2a6feb2c5a3af86db20301d1c7002faef0935d196ca24a663d54740da691c0e3d belle-sip-5.0.55.tar.gz
04be4dfba3a21f3ab9d9e439a64958bd8e844a9f151b798383bd9e0dd6ebc416783ae7cb1d1dbb27fb7288ab9756b13b8338cdb8ceb41a10949c852ad45ab1f2 antlr.jar
"
diff --git a/testing/belr/APKBUILD b/testing/belr/APKBUILD
index be36944251..8235b9894a 100644
--- a/testing/belr/APKBUILD
+++ b/testing/belr/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Francesco Colista <fcolista@alpinelinux.org>
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=belr
-pkgver=5.0.23
+pkgver=5.0.55
pkgrel=0
pkgdesc="ABNF Parser"
url="https://www.linphone.org"
@@ -30,5 +30,5 @@ package() {
}
sha512sums="
-7e0fb363888a10b3a0845dfe15974765d9013861a052039c7db84330c9de0746372f0637ec176704d34e8257c4bae536a6045030aa6694a9103102077a9e3a4b belr-5.0.23.tar.gz
+ead7b70259291e6f73b70354e028a0030793964736f81e44596355639e3c19dd826d5162c3eefc7571e8c44ae0bc039692ec55e7d3eebbc90d5a3c9a6c15d7a8 belr-5.0.55.tar.gz
"
diff --git a/testing/bettercap/APKBUILD b/testing/bettercap/APKBUILD
index 0d5d316c6f..23aefaed0c 100644
--- a/testing/bettercap/APKBUILD
+++ b/testing/bettercap/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Patrycja Rosa <alpine@ptrcnull.me>
pkgname=bettercap
pkgver=2.32.0
-pkgrel=0
+pkgrel=1
pkgdesc="The Swiss Army knife for 802.11, BLE and Ethernet networks reconnaissance and MITM attacks"
url="https://www.bettercap.org"
arch="all"
diff --git a/testing/blender/0001-musl-fixes.patch b/testing/blender/0001-musl-fixes.patch
index 1a52f3e3d2..06d30a527d 100644
--- a/testing/blender/0001-musl-fixes.patch
+++ b/testing/blender/0001-musl-fixes.patch
@@ -1,7 +1,7 @@
-From d6f5fac8b9f47f59ce50f70f82e6469c4fe3868a Mon Sep 17 00:00:00 2001
+From 9b9f23aed4a7a7c904b1d03ba64516ad0a030424 Mon Sep 17 00:00:00 2001
From: Leon Marz <lmarz@cs.uni-frankfurt.de>
Date: Wed, 25 Nov 2020 10:10:41 +0100
-Subject: [PATCH 1/5] musl fixes
+Subject: [PATCH 1/4] musl fixes
Original patch by Nathanael Copa
---
@@ -13,7 +13,7 @@ Original patch by Nathanael Copa
5 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/intern/guardedalloc/intern/mallocn_intern.h b/intern/guardedalloc/intern/mallocn_intern.h
-index aa95615..f7e347d 100644
+index e4bd3d5..536bf98 100644
--- a/intern/guardedalloc/intern/mallocn_intern.h
+++ b/intern/guardedalloc/intern/mallocn_intern.h
@@ -33,7 +33,7 @@
@@ -44,7 +44,7 @@ index 78e387e..d21c281 100644
-# endif /* __GLIBC_PREREQ */
#endif /* __linux__ */
diff --git a/source/blender/blenlib/intern/system.c b/source/blender/blenlib/intern/system.c
-index f4110c6..f5a32c5 100644
+index 66d0b44..1aaa8f2 100644
--- a/source/blender/blenlib/intern/system.c
+++ b/source/blender/blenlib/intern/system.c
@@ -35,7 +35,9 @@
@@ -67,10 +67,10 @@ index f4110c6..f5a32c5 100644
# define SIZE 100
void *buffer[SIZE];
diff --git a/source/blender/gpu/GPU_vertex_buffer.h b/source/blender/gpu/GPU_vertex_buffer.h
-index aae58de..0a3a627 100644
+index 2c54016..9b967dc 100644
--- a/source/blender/gpu/GPU_vertex_buffer.h
+++ b/source/blender/gpu/GPU_vertex_buffer.h
-@@ -118,7 +118,6 @@ GPU_INLINE void *GPU_vertbuf_raw_step(GPUVertBufRaw *a)
+@@ -127,7 +127,6 @@ GPU_INLINE void *GPU_vertbuf_raw_step(GPUVertBufRaw *a)
{
unsigned char *data = a->data;
a->data += a->stride;
@@ -79,10 +79,10 @@ index aae58de..0a3a627 100644
}
diff --git a/source/creator/creator_signals.c b/source/creator/creator_signals.c
-index 29e12a9..d90da8f 100644
+index b74264f..4bafecf 100644
--- a/source/creator/creator_signals.c
+++ b/source/creator/creator_signals.c
-@@ -269,7 +269,7 @@ void main_signal_setup_fpe(void)
+@@ -271,7 +271,7 @@ void main_signal_setup_fpe(void)
* set breakpoints on sig_handle_fpe */
signal(SIGFPE, sig_handle_fpe);
@@ -92,5 +92,5 @@ index 29e12a9..d90da8f 100644
# endif /* defined(__linux__) && defined(__GNUC__) */
# if defined(OSX_SSE_FPE)
--
-2.33.0
+2.34.1
diff --git a/testing/blender/0002-fix-linking-issue.patch b/testing/blender/0002-fix-linking-issue.patch
index 21cbf63b00..ecd929dd55 100644
--- a/testing/blender/0002-fix-linking-issue.patch
+++ b/testing/blender/0002-fix-linking-issue.patch
@@ -1,17 +1,17 @@
-From eccf3810918be4ef46d64aebde179a0251b2070e Mon Sep 17 00:00:00 2001
+From 14e36d81b163a627faf3353436e17d1a564f2bb1 Mon Sep 17 00:00:00 2001
From: Leon Marz <lmarz@cs.uni-frankfurt.de>
Date: Tue, 1 Sep 2020 09:11:18 +0200
-Subject: [PATCH 2/5] fix linking issue
+Subject: [PATCH 2/4] fix linking issue
---
intern/ghost/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt
-index 1739659..d6b442b 100644
+index 4164231..092bfea 100644
--- a/intern/ghost/CMakeLists.txt
+++ b/intern/ghost/CMakeLists.txt
-@@ -484,5 +484,5 @@ if(WITH_XR_OPENXR)
+@@ -536,5 +536,5 @@ if(WITH_XR_OPENXR)
endif()
add_definitions(${GL_DEFINITIONS})
@@ -19,5 +19,5 @@ index 1739659..d6b442b 100644
+list(APPEND LIB "-lX11" "-lXi" "-lXxf86vm" "-lXfixes" "-lXrender")
blender_add_lib(bf_intern_ghost "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
--
-2.33.0
+2.34.1
diff --git a/testing/blender/0003-increase-thread-stack-size-for-musl.patch b/testing/blender/0003-increase-thread-stack-size-for-musl.patch
index ab1cc1255c..ea3b628061 100644
--- a/testing/blender/0003-increase-thread-stack-size-for-musl.patch
+++ b/testing/blender/0003-increase-thread-stack-size-for-musl.patch
@@ -1,17 +1,17 @@
-From d31525d54b7f462bf0851c88c7c718a2b8954809 Mon Sep 17 00:00:00 2001
+From d701e5d8bad42d509c7258e6ac984a4b933cb42c Mon Sep 17 00:00:00 2001
From: Damian Kurek <starfire24680@gmail.com>
-Date: Sun, 22 Nov 2020 02:03:11 +0100
-Subject: [PATCH 3/5] increase thread stack size for musl
+Date: Fri, 3 Dec 2021 17:55:35 +0000
+Subject: [PATCH 3/4] increase thread stack size for musl
---
- intern/cycles/util/util_thread.cpp | 4 ++--
- intern/cycles/util/util_thread.h | 2 +-
+ intern/cycles/util/thread.cpp | 4 ++--
+ intern/cycles/util/thread.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
-diff --git a/intern/cycles/util/util_thread.cpp b/intern/cycles/util/util_thread.cpp
-index cccde5a..4bf62d5 100644
---- a/intern/cycles/util/util_thread.cpp
-+++ b/intern/cycles/util/util_thread.cpp
+diff --git a/intern/cycles/util/thread.cpp b/intern/cycles/util/thread.cpp
+index 24a0600..e70fc4d 100644
+--- a/intern/cycles/util/thread.cpp
++++ b/intern/cycles/util/thread.cpp
@@ -23,7 +23,7 @@ CCL_NAMESPACE_BEGIN
thread::thread(function<void()> run_cb, int node) : run_cb_(run_cb), joined_(false), node_(node)
@@ -30,10 +30,10 @@ index cccde5a..4bf62d5 100644
return pthread_join(pthread_id, NULL) == 0;
#else
try {
-diff --git a/intern/cycles/util/util_thread.h b/intern/cycles/util/util_thread.h
-index 29f9bec..58a63ce 100644
---- a/intern/cycles/util/util_thread.h
-+++ b/intern/cycles/util/util_thread.h
+diff --git a/intern/cycles/util/thread.h b/intern/cycles/util/thread.h
+index 09686e4..b585fde 100644
+--- a/intern/cycles/util/thread.h
++++ b/intern/cycles/util/thread.h
@@ -56,7 +56,7 @@ class thread {
protected:
@@ -44,5 +44,5 @@ index 29f9bec..58a63ce 100644
#else
std::thread std_thread;
--
-2.33.0
+2.34.1
diff --git a/testing/blender/0004-OpenEXR-3.patch b/testing/blender/0004-OpenEXR-3.patch
index 28220bc842..b21771ef53 100644
--- a/testing/blender/0004-OpenEXR-3.patch
+++ b/testing/blender/0004-OpenEXR-3.patch
@@ -1,7 +1,7 @@
-From b5a872ee9c64d5b882019fd3028ea6a458a08513 Mon Sep 17 00:00:00 2001
+From f0567e2496bc1f564999a980d99230a61f74bff2 Mon Sep 17 00:00:00 2001
From: Leon Marz <main@lmarz.org>
Date: Sat, 7 Aug 2021 16:01:52 +0000
-Subject: [PATCH 4/5] OpenEXR 3
+Subject: [PATCH 4/4] OpenEXR 3
---
build_files/cmake/Modules/FindOpenEXR.cmake | 5 ++---
@@ -33,7 +33,7 @@ index 090f80b..4f5e9d8 100644
MARK_AS_ADVANCED(
diff --git a/source/blender/imbuf/intern/openexr/openexr_api.cpp b/source/blender/imbuf/intern/openexr/openexr_api.cpp
-index 382d86f..3e1ab70 100644
+index adf09f8..57fde8a 100644
--- a/source/blender/imbuf/intern/openexr/openexr_api.cpp
+++ b/source/blender/imbuf/intern/openexr/openexr_api.cpp
@@ -32,6 +32,8 @@
@@ -46,5 +46,5 @@ index 382d86f..3e1ab70 100644
#include <ImathBox.h>
#include <ImfArray.h>
--
-2.33.0
+2.34.1
diff --git a/testing/blender/APKBUILD b/testing/blender/APKBUILD
index 2481049540..8b15c35c25 100644
--- a/testing/blender/APKBUILD
+++ b/testing/blender/APKBUILD
@@ -2,7 +2,7 @@
# Contributor: Leon Marz <main@lmarz.org>
# Maintainer: Leon Marz <main@lmarz.org>
pkgname=blender
-pkgver=2.93.5
+pkgver=3.0.0
_pkgver=${pkgver%.[0-9]}
pkgrel=0
pkgdesc="3D Creation/Animation/Publishing System"
@@ -31,7 +31,7 @@ makedepends="cmake
libx11-dev
libxi-dev
libxrender-dev
- llvm11-dev
+ llvm12-dev
lzo-dev
openal-soft-dev
opencolorio-dev
@@ -41,6 +41,7 @@ makedepends="cmake
openjpeg-dev
opensubdiv-dev
openvdb-dev
+ openvdb-nanovdb
openxr-dev
osl
osl-dev
@@ -142,9 +143,9 @@ python() {
}
sha512sums="
-274e94fa64af0a414815d2809870982dc1093732ddad9e91318f96ce5b72102d9afab16273724127568c0e890dad921bd8f72d7b0e74c9c501b3e86f6b7cfaa0 blender-2.93.5.tar.xz
-c3d783e049e08acf5a2a474e86b7cf6d3d9f0e47984c199ae748b86c82b36a201c1b1f3e6eae932a1b3bcf808456df9bae4ea2bdbbbb00b7d092391478aa094f 0001-musl-fixes.patch
-792b8bd42fb4301a371338c2de6124f6ec4e98a45d10d6e5a03b086d56b8da7396d258d77e517655fd73e2cc8d7ede3bf9240f8b98e207beeea8f4dec7a90e03 0002-fix-linking-issue.patch
-b31f7c9d98477e9ee4929357a8d57bc75b1c66312d63ee6d05f6c865025a16cd4ceb99648fe09941b44581807f817ba578b3c7422f0bee6228b268d51f849d85 0003-increase-thread-stack-size-for-musl.patch
-90cbcb342c948fa954c42e8a48dfd92dd434c29dcd47210383bf00f0bad415e19e59ff8276deffa7f8ef3f270f28c8beef2000ccdbb2879e77dfeea5af0bda4e 0004-OpenEXR-3.patch
+727d722e7b750b77b0fe691605a84de58baf15a3cc01af267be0440bd0879772e14dbdfdb16209023df3c28b94d8009b0c389915097cdb0b49bdf42c8de1ef21 blender-3.0.0.tar.xz
+24ccbdaefedd43d7f934e11bb2eb2e764f7d904e1478cae9fea808e42434d6a89cc05c408853f2282da902970a43fda8aa52d30a8c4318479b1c57fa0b06ea08 0001-musl-fixes.patch
+ebf37b6b7ff519079c7a59cf1fc79dc615742825762edaca4f14ee0bba0fe5515e76c41bc64f5a98d814cbbf0c7e1eec1f84cfea133e8c344b35056efbed0646 0002-fix-linking-issue.patch
+fc745176719a2771df5f6c78172ae270c301cd8d8ce67dadf7ef760ce610135b894a2bcad9362aae961109963b220de7420ccd17aee0b36f67777dc57025db7e 0003-increase-thread-stack-size-for-musl.patch
+057b1973332a2749684596b3b2d934b156193c0e7c3ece57f71760165c08296aca3c9a7cc27306b3350004c9a0a5aad8c9643e0887e4dcb728cde233a2b333b3 0004-OpenEXR-3.patch
"
diff --git a/testing/blosc/APKBUILD b/testing/blosc/APKBUILD
index 18e718258c..5fa19a612d 100644
--- a/testing/blosc/APKBUILD
+++ b/testing/blosc/APKBUILD
@@ -5,8 +5,7 @@ pkgver=1.21.1
pkgrel=0
pkgdesc="A blocking, shuffling and lossless compression library"
url="https://blosc.org"
-# Test #1631: fuzz_compress .......................................Bus error***Exception:
-arch="all !armhf"
+arch="all"
license="BSD-3-Clause"
makedepends="cmake lz4-dev zlib-dev zstd-dev"
subpackages="$pkgname-static $pkgname-dev"
diff --git a/testing/btcd/APKBUILD b/testing/btcd/APKBUILD
new file mode 100644
index 0000000000..2262750a31
--- /dev/null
+++ b/testing/btcd/APKBUILD
@@ -0,0 +1,30 @@
+# Maintainer: Michał Adamski <michal@ert.pl>
+pkgname=btcd
+pkgver=0.22.0_beta
+_pkgver=${pkgver/_/-}
+pkgrel=0
+pkgdesc="Alternative full node bitcoin implementation written in Go"
+url="https://github.com/btcsuite/btcd#btcd"
+arch="all"
+license="ISC"
+makedepends="go"
+source="https://github.com/btcsuite/btcd/archive/v$_pkgver/$pkgname-$_pkgver.tar.gz"
+builddir="$srcdir/$pkgname-$_pkgver"
+
+build() {
+ mkdir bin
+ go build -trimpath -ldflags="-s -w" -v -o bin . ./cmd/...
+}
+
+check() {
+ go test ./...
+}
+
+package() {
+ for bin in bin/*; do
+ install -Dm755 $bin "$pkgdir"/usr/$bin
+ done
+}
+sha512sums="
+cae1bf46900890e4bc01b817f72cbf6654636af5bac887032a85afba91a813162e5b2e1bcb23cd0a013e8b0711d9e7a68d6ff08f8767c6b375a2df7d8d72c291 btcd-0.22.0-beta.tar.gz
+"
diff --git a/testing/btfs/APKBUILD b/testing/btfs/APKBUILD
index ae9457b4f7..51fd6fea2b 100644
--- a/testing/btfs/APKBUILD
+++ b/testing/btfs/APKBUILD
@@ -2,11 +2,11 @@
# Maintainer: dai9ah <dai9ah@protonmail.com>
pkgname=btfs
pkgver=2.24
-pkgrel=2
+pkgrel=3
pkgdesc="Bittorrent filesystem based on FUSE"
options="!check" # No testsuite
url="https://github.com/johang/btfs"
-arch="all !armv7" # limited by libtorrent-rasterbar
+arch="all !armhf" # blocked by libtorrent-rasterbar
license="GPL-3.0-or-later"
depends="python3"
makedepends="autoconf automake curl-dev fuse-dev libtorrent-rasterbar-dev boost-dev"
diff --git a/testing/buffyboard/APKBUILD b/testing/buffyboard/APKBUILD
new file mode 100644
index 0000000000..7552ebc776
--- /dev/null
+++ b/testing/buffyboard/APKBUILD
@@ -0,0 +1,45 @@
+# Maintainer: Caleb Connolly <caleb@connolly.tech>
+pkgname=buffyboard
+pkgver=0.2.0
+pkgrel=0
+_lv_drivers_commit="33983bcb0a9bfd0a4cf44dba67617b9f537e76f3"
+_lvgl_commit="a2b555e096f7d401b5d8e877a6b5e81ff81c747a"
+_squeek2lvgl_commit="e3ce01bc38020b21bc61844fa1fed1a4f41097c5"
+pkgdesc="Touch-enabled framebuffer keyboard (not only) for vampire slayers"
+url="https://gitlab.com/cherrypicker/buffyboard"
+arch="all"
+license="GPL-3.0-only"
+source="https://gitlab.com/cherrypicker/buffyboard/-/archive/$pkgver/buffyboard-$pkgver.tar.gz
+ https://github.com/lvgl/lv_drivers/archive/$_lv_drivers_commit.tar.gz
+ https://github.com/lvgl/lvgl/archive/$_lvgl_commit.tar.gz
+ https://gitlab.com/cherrypicker/squeek2lvgl/-/archive/$_squeek2lvgl_commit/buffyboard-$_squeek2lvgl_commit.tar.gz"
+makedepends="meson libinput-dev libxkbcommon-dev linux-headers eudev-dev"
+
+prepare() {
+ default_prepare
+
+ mkdir -p "$builddir"/lvgl "$builddir"/lv_drivers "$builddir"/squeek2lvgl
+ mv "$srcdir"/lvgl-$_lvgl_commit/* "$builddir"/lvgl
+ mv "$srcdir"/lv_drivers-$_lv_drivers_commit/* "$builddir"/lv_drivers
+ mv "$srcdir"/squeek2lvgl-$_squeek2lvgl_commit/* "$builddir"/squeek2lvgl
+}
+
+build() {
+ abuild-meson . output
+ meson compile ${JOBS:+-j ${JOBS}} -C output
+}
+
+check() {
+ meson test --no-rebuild -C output
+}
+
+package() {
+ DESTDIR="$pkgdir" meson install --no-rebuild -C output
+}
+
+sha512sums="
+6a504ed775ebcc03276b2c10e299e894cdc3ea3c7e40d263e449982dd6ac6a7f37fe2094c84e6d0b92c3f965aefc38e606de66bd74d8d375bb2168acb0c0284e buffyboard-0.2.0.tar.gz
+788ab2ac810580222e85c580a6e7d94783b6e4a29688274d6eb85ec7e9cbe8c146452baf9b2c8ecde135b9e68539218affd4d3bde40667ed1e2da2fa9b9feea4 33983bcb0a9bfd0a4cf44dba67617b9f537e76f3.tar.gz
+6db243760407176d57bc1aafc9145f8f089e6be4b74afff966ca6fbf29605ccd30afbd113412c7259040894eb7506a90a40c07c0e0be1c7bfbaab01c5ea2727c a2b555e096f7d401b5d8e877a6b5e81ff81c747a.tar.gz
+57fb6bb0445e27c5529f96499f744f64038c549f741ff17a2fc83902e7bdbcf1358c4a3eb37848f89e98d1e6011bb46581ab081bf0b0e01350de2f75e58e2f33 buffyboard-e3ce01bc38020b21bc61844fa1fed1a4f41097c5.tar.gz
+"
diff --git a/testing/bumprace/APKBUILD b/testing/bumprace/APKBUILD
index fac4f644b9..9d2ae93d1f 100644
--- a/testing/bumprace/APKBUILD
+++ b/testing/bumprace/APKBUILD
@@ -1,13 +1,13 @@
# Maintainer: Antoni Aloy <aaloytorrens@gmail.com>
pkgname=bumprace
pkgver=1.5.8
-pkgrel=0
+pkgrel=1
pkgdesc="1 or 2 players race through a multi-level maze"
url="http://www.linux-games.com/bumprace/"
arch="all"
license="GPL-2.0-only"
depends="$pkgname-data"
-makedepends="sdl-dev sdl_image-dev sdl_mixer-dev libjpeg-turbo-dev libzip-dev"
+makedepends="sdl12-compat-dev sdl_image-dev sdl_mixer-dev libjpeg-turbo-dev libzip-dev"
subpackages="$pkgname-data::noarch"
source="$pkgname-$pkgver.tar.gz::https://github.com/karlb/bumprace/archive/$pkgver.tar.gz
bumprace.desktop
diff --git a/testing/cargo-c/APKBUILD b/testing/cargo-c/APKBUILD
index 1b6318cd6f..b54685c09d 100644
--- a/testing/cargo-c/APKBUILD
+++ b/testing/cargo-c/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Oleg Titov <oleg.titov@gmail.com>
# Maintainer: Oleg Titov <oleg.titov@gmail.com>
pkgname=cargo-c
-pkgver=0.9.4
+pkgver=0.9.5
pkgrel=0
pkgdesc="cargo subcommand to build and install C-ABI compatibile dynamic and static libraries"
url="https://github.com/lu-zero/cargo-c"
@@ -37,6 +37,6 @@ package() {
}
sha512sums="
-e6bae87e318166d50e061f5af2ba417e739c625a429f74ede6836a49606f20a1a3c45dd2e465547375779b0718c03868863d220a4db9a046d48e9b7529b73093 cargo-c-0.9.4.tar.gz
-f9b71ba5eba486bfd3d598e82fa1967fc535e29bf0a93d22de6b657ecd472860b2fcf5b1a2a84f8c90709cbe0ee43171150b6ca3a1b6338136e45ef59b5ae672 cargo-c-0.9.4-Cargo.lock
+9d793a50fc61391f79d41a8582f8b30b121d05de7b755041df027fb2a223e930a54e6e8386758f08f34750a0df3f2374521d417b50f6d09d194d1cedecc315c8 cargo-c-0.9.5.tar.gz
+5873041df7c59da0a5bbce904467f3b84015d5d1fa2a1a36adfcef700f3f5c4eb718f3f814a9c1c09fa53bdecaae9121ccb627fb900861ecc2a887cff570a84b cargo-c-0.9.5-Cargo.lock
"
diff --git a/testing/cargo-edit/APKBUILD b/testing/cargo-edit/APKBUILD
deleted file mode 100644
index b00a448897..0000000000
--- a/testing/cargo-edit/APKBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# Contributor: kpcyrd <git@rxv.cc>
-# Maintainer: kpcyrd <git@rxv.cc>
-pkgname=cargo-edit
-pkgver=0.8.0
-pkgrel=1
-pkgdesc="Managing cargo dependencies from the command line"
-url="https://github.com/killercup/cargo-edit"
-# mips64, s390x and riscv64 blocked by cargo
-# ppc64le blocked by ring crate
-arch="all !mips64 !s390x !ppc64le !riscv64"
-license="MIT OR Apache-2.0"
-makedepends="cargo libgit2-dev"
-subpackages="$pkgname-doc"
-options="net"
-source="$pkgname-$pkgver.tar.gz::https://github.com/killercup/cargo-edit/archive/v$pkgver.tar.gz"
-
-prepare() {
- default_prepare
-
- cargo fetch --locked
-}
-
-build() {
- cargo build --release --frozen
-}
-
-check() {
- cargo test --frozen
-}
-
-package() {
- cargo install --locked --root "$pkgdir/usr" --path .
-
- install -Dm 644 -t "$pkgdir/usr/share/doc/cargo-edit" README.md
-
- rm "$pkgdir"/usr/.crates.toml
- rm "$pkgdir"/usr/.crates2.json
-}
-
-sha512sums="
-6594869358da51353bbde155a54285f8a64567aeea0381ab1b16adf4ae0cc7f325c35ef2451dd8b452767b7833c251d276d014d5b1932bd36c18139ba1b58e68 cargo-edit-0.8.0.tar.gz
-"
diff --git a/testing/cargo-outdated/APKBUILD b/testing/cargo-outdated/APKBUILD
deleted file mode 100644
index 4743b6bee4..0000000000
--- a/testing/cargo-outdated/APKBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# Contributor: kpcyrd <git@rxv.cc>
-# Maintainer: kpcyrd <git@rxv.cc>
-pkgname=cargo-outdated
-pkgver=0.9.17
-pkgrel=0
-pkgdesc="A cargo subcommand for displaying when Rust dependencies are out of date"
-url="https://github.com/kbknapp/cargo-outdated"
-# mips64, s390x and riscv64 blocked by cargo
-arch="all !mips64 !s390x !riscv64"
-license="MIT"
-makedepends="cargo openssl-dev"
-subpackages="$pkgname-doc"
-source="$pkgname-$pkgver.tar.gz::https://github.com/kbknapp/cargo-outdated/archive/v$pkgver.tar.gz"
-
-prepare() {
- default_prepare
-
- cargo fetch --locked
-}
-
-build() {
- cargo build --release --frozen
-}
-
-check() {
- cargo test --release --frozen
-}
-
-package() {
- cargo install --locked --root "$pkgdir/usr" --path .
-
- install -Dm 644 -t "$pkgdir/usr/share/doc/cargo-outdated" README.md
-
- rm "$pkgdir"/usr/.crates.toml
- rm "$pkgdir"/usr/.crates2.json
-}
-
-sha512sums="
-afd81e3c6111586d74d59b90516653ce845c561485a1c966493970ca44369a559e8809f73a9baa1354953ec71e47237ae5517c774ed718e7b1bac505f497beec cargo-outdated-0.9.17.tar.gz
-"
diff --git a/testing/cargo-watch/APKBUILD b/testing/cargo-watch/APKBUILD
deleted file mode 100644
index 449a221a57..0000000000
--- a/testing/cargo-watch/APKBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# Contributor: kpcyrd <git@rxv.cc>
-# Maintainer: kpcyrd <git@rxv.cc>
-pkgname=cargo-watch
-pkgver=8.1.1
-pkgrel=0
-pkgdesc="Utility for Cargo to compile projects when sources change"
-url="https://github.com/watchexec/cargo-watch"
-# mips64, s390x and riscv64 blocked by cargo
-arch="all !mips64 !s390x !riscv64"
-license="CC0-1.0"
-makedepends="cargo"
-subpackages="$pkgname-doc
- $pkgname-zsh-completion
- "
-source="$pkgname-$pkgver.tar.gz::https://github.com/watchexec/cargo-watch/archive/v$pkgver.tar.gz"
-
-prepare() {
- default_prepare
-
- cargo fetch --locked
-}
-
-build() {
- cargo build --release --frozen
-}
-
-check() {
- PATH="$PWD/target/release:$PATH" cargo test --release --frozen
-}
-
-package() {
- cargo install --locked --root "$pkgdir/usr" --path .
-
- install -Dm 644 -t "$pkgdir/usr/share/doc/cargo-watch" README.md
- install -Dm 644 cargo-watch.1 -t "$pkgdir/usr/share/man/man1"
- install -Dm 644 completions/zsh "$pkgdir/usr/share/zsh/site-functions/_cargo-watch"
-
- rm "$pkgdir"/usr/.crates.toml
- rm "$pkgdir"/usr/.crates2.json
-}
-
-sha512sums="
-570855e468009ba75d54fadfb70a11eeb02294747ceb651bfa32eb067eadeaaeb6107b91d1d1338d474c16105b4626872cac5ef25241dbe6959a3e9a9ea03b40 cargo-watch-8.1.1.tar.gz
-"
diff --git a/testing/castor/APKBUILD b/testing/castor/APKBUILD
index 44e3df151d..286e06b4e5 100644
--- a/testing/castor/APKBUILD
+++ b/testing/castor/APKBUILD
@@ -1,11 +1,11 @@
# Maintainer: Joel Hansen <joelh@disroot.org>
pkgname=castor
-pkgver=0.8.16
-pkgrel=1
-pkgdesc="A graphical browser for Gemini, Gopher and Finger."
+pkgver=0.8.18
+pkgrel=0
+pkgdesc="Graphical browser for Gemini, Gopher and Finger"
url="https://sr.ht/~julienxx/Castor/"
-arch="all !s390x !mips !mips64 !riscv64" # limited by rust/cargo
license="MIT"
+arch="all !s390x !riscv64" # limited by rust/cargo
makedepends="rust cargo gtk+3.0-dev openssl-dev"
source="$pkgname-$pkgver.tar.gz::https://git.sr.ht/~julienxx/castor/archive/$pkgver.tar.gz"
@@ -24,5 +24,5 @@ package() {
}
sha512sums="
-e2a5911003499e0ee9ac2b8687a9bf8a8a46f8f841bbe67d1ad487022f7b0ab5f08c11454053c9ebd0ba4eb0ba253c46f4a312782cc97a2dd8ca941e6ea23f02 castor-0.8.16.tar.gz
+f9a67b0beb37033fb7eabf6142a738c85fb873e1e8857da6e34b19d2722e2a36eb1449e647d8dec1bc9d90213162bacbae19a7626ae6b9053d85294fce8be2fe castor-0.8.18.tar.gz
"
diff --git a/testing/cfssl/APKBUILD b/testing/cfssl/APKBUILD
index 7472afbc76..1b155d8009 100644
--- a/testing/cfssl/APKBUILD
+++ b/testing/cfssl/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Michał Polański <michal@polanski.me>
pkgname=cfssl
pkgver=1.6.1
-pkgrel=2
+pkgrel=3
pkgdesc="Cloudflare PKI and TLS toolkit"
url="https://cfssl.org/"
license="BSD-2-Clause"
diff --git a/testing/cgal/APKBUILD b/testing/cgal/APKBUILD
index 9b659fd15e..90f7d5aafc 100644
--- a/testing/cgal/APKBUILD
+++ b/testing/cgal/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Marian Buschsieweke <marian.buschsieweke@ovgu.de>
pkgname=cgal
pkgver=4.14
-pkgrel=5
+pkgrel=6
pkgdesc="Efficient and reliable geometric algorithms as C++ library"
url="https://www.cgal.org/"
arch="all"
diff --git a/testing/chafa/APKBUILD b/testing/chafa/APKBUILD
deleted file mode 100644
index 7bafcccdde..0000000000
--- a/testing/chafa/APKBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# Contributor: knuxify <knuxify@gmail.com>
-# Maintainer: knuxify <knuxify@gmail.com>
-pkgname=chafa
-pkgver=1.8.0
-pkgrel=0
-pkgdesc="Terminal graphics for the 21st century"
-url="https://hpjansson.org/chafa"
-arch="all"
-license="LGPL-3.0-or-later"
-makedepends="glib-dev imagemagick-dev freetype-dev"
-subpackages="$pkgname-libs $pkgname-dev $pkgname-doc"
-source="https://github.com/hpjansson/chafa/releases/download/$pkgver/chafa-$pkgver.tar.xz"
-# no proper test suite; upstream CI just runs a command to test building
-# against installed pkgconfig files
-options="!check"
-
-build() {
- ./configure \
- --build=$CBUILD \
- --host=$CHOST \
- --prefix=/usr \
- --sysconfdir=/etc \
- --mandir=/usr/share/man \
- --localstatedir=/var \
- --disable-gtk-doc
- make
-}
-
-package() {
- make DESTDIR="$pkgdir" install
-}
-
-sha512sums="
-15ff08a0df82ae8517ac7744b81a39e1ae1eff8c9848128341cc25da94864e89b7101aabcff2d532bf11ea293bfc4c9e48b01f85388dafadbce2d2b2c8b7439d chafa-1.8.0.tar.xz
-"
diff --git a/testing/chez-scheme/APKBUILD b/testing/chez-scheme/APKBUILD
index a1ae9b07dc..146f88cd28 100644
--- a/testing/chez-scheme/APKBUILD
+++ b/testing/chez-scheme/APKBUILD
@@ -1,7 +1,8 @@
# Contributor: Will Sinatra <wpsinatra@gmail.com>
# Maintainer: Will Sinatra <wpsinatra@gmail.com>
pkgname=chez-scheme
-pkgver=9.5.4
+# XXX: Upgrades require rebuilding testing/idris2.
+pkgver=9.5.6
pkgrel=0
pkgdesc="Cisco R6RS Scheme Compiler"
url="https://github.com/cisco/ChezScheme"
@@ -47,6 +48,8 @@ package() {
make install DESTDIR="$pkgdir"
}
-sha512sums="bc377fc5a7355703193849a21fbcd633f35b56f1f898c747fbddedc63ac979c124d966bdd9ed32366bb466881abdf44e03085af16e9795b10975a72c0d0b6123 csv9.5.4.tar.gz
+sha512sums="
+4affd73a5b2ea5cdec01fb200a32499387fc3769b7677ffe7d854f6a5567d50ba114f9f12951f99d8e0fd757c799e82e32c83079fae83e5fc138ee6e1a5f56c0 csv9.5.6.tar.gz
859beb7c4276cefc06b49f685560cc4ef69e1b200d7c52d67c5c24e96e1956ce728b2c72015db92347aef02e803cd2c1e377c836e272619414bd5bf0ce521edb 64bit-ti3le-constant.patch
-1e97c8713ca8d1a18fc4a46b1ccc39f72969c03c9995d0b54c0b2d1710008e5637e6337cc8e809f97bbcbb6c96144f33f9a6cfdd8ebfd2e4dc196e00640a0f08 64bit-ti3le-equates.patch"
+1e97c8713ca8d1a18fc4a46b1ccc39f72969c03c9995d0b54c0b2d1710008e5637e6337cc8e809f97bbcbb6c96144f33f9a6cfdd8ebfd2e4dc196e00640a0f08 64bit-ti3le-equates.patch
+"
diff --git a/testing/circuslinux/APKBUILD b/testing/circuslinux/APKBUILD
index 15bd47ab21..8db9e1dc1f 100644
--- a/testing/circuslinux/APKBUILD
+++ b/testing/circuslinux/APKBUILD
@@ -1,13 +1,13 @@
# Maintainer: Antoni Aloy <aaloytorrens@gmail.com>
pkgname=circuslinux
pkgver=1.0.3
-pkgrel=0
+pkgrel=1
pkgdesc="Clone of the Atari 2600 game Circus Atari"
url="http://www.newbreedsoftware.com/circus-linux/"
arch="all"
license="GPL-2.0-or-later"
depends="$pkgname-data libmikmod"
-makedepends="bash automake autoconf sdl-dev sdl_image-dev sdl_mixer-dev"
+makedepends="bash automake autoconf sdl12-compat-dev sdl_image-dev sdl_mixer-dev"
subpackages="$pkgname-data::noarch $pkgname-doc"
source="https://github.com/antonialoytorrens/nbs/raw/master/unix/x/circus-linux/src/circuslinux-$pkgver.tar.gz
circuslinux.desktop
diff --git a/testing/cjose/APKBUILD b/testing/cjose/APKBUILD
index b431ff49fa..26c410631d 100644
--- a/testing/cjose/APKBUILD
+++ b/testing/cjose/APKBUILD
@@ -2,16 +2,14 @@
# Maintainer: Johan Bergström <bugs@bergstroem.nu>
pkgname=cjose
pkgver=0.6.1
-pkgrel=0
+pkgrel=1
pkgdesc="A C library implementing the Javascript Object Signing and Encryption"
url="https://github.com/cisco/cjose"
arch="all !s390x !mips !mips64" # tests fails on s390x
license="MIT"
-depends="jansson openssl"
makedepends="check-dev coreutils doxygen jansson-dev openssl-dev perl"
subpackages="$pkgname-dev $pkgname-doc"
-source="$pkgname-$pkgver.tar.gz::https://github.com/cisco/$pkgname/archive/$pkgver.tar.gz"
-builddir="$srcdir/$pkgname-$pkgver/"
+source="$pkgname-$pkgver.tar.gz::https://github.com/cisco/cjose/archive/$pkgver.tar.gz"
prepare() {
default_prepare
@@ -21,7 +19,7 @@ prepare() {
}
build() {
- cd "$builddir"
+ CFLAGS="$CFLAGS -Wno-error" \
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -39,13 +37,13 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="7ae67a6d19591b3d19b888270ec0ca17df399bea117e42686fc1de39b3741ed9a8816f96d33d090687c49c3123cdc95430a781835a525a02d22561ebf5aaa653 cjose-0.6.1.tar.gz"
+sha512sums="
+7ae67a6d19591b3d19b888270ec0ca17df399bea117e42686fc1de39b3741ed9a8816f96d33d090687c49c3123cdc95430a781835a525a02d22561ebf5aaa653 cjose-0.6.1.tar.gz
+"
diff --git a/testing/clementine/APKBUILD b/testing/clementine/APKBUILD
new file mode 100644
index 0000000000..03901bd9b6
--- /dev/null
+++ b/testing/clementine/APKBUILD
@@ -0,0 +1,71 @@
+# Contributor: knuxify <knuxify@gmail.com>
+# Maintainer: knuxify <knuxify@gmail.com>
+pkgname=clementine
+pkgver=1.4.0_git20210929
+pkgrel=0
+_tag=1.4.0rc1-737-g69fd49b97
+pkgdesc="A modern music player and library organizer"
+url="https://clementine-player.org"
+# riscv64 fails on builder https://gitlab.alpinelinux.org/alpine/aports/-/issues/13238
+arch="all !riscv64"
+license="GPL-3.0-or-later"
+makedepends="alsa-lib-dev
+ boost-dev
+ chromaprint-dev
+ cmake
+ fftw-dev
+ glib-dev
+ glu-dev
+ gst-plugins-base-dev
+ gstreamer-dev
+ gtest-dev
+ libcdio-dev
+ libgpod-dev
+ liblastfm-qt-dev
+ libmtp-dev
+ libmygpo-qt-dev
+ libx11-dev
+ projectm-dev
+ protobuf-dev
+ pulseaudio-dev
+ qt5-qtbase-dev
+ qt5-qttools-dev
+ qt5-qtx11extras-dev
+ sparsehash
+ taglib-dev
+"
+checkdepends="gmock gtest"
+source="https://github.com/clementine-player/Clementine/releases/download/$_tag/clementine-$_tag.tar.xz"
+builddir="$srcdir/clementine-$_tag"
+
+build() {
+ if [ "$CBUILD" != "$CHOST" ]; then
+ CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
+ fi
+ cmake -B build \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DBUILD_SHARED_LIBS=True \
+ -DCMAKE_BUILD_TYPE=None \
+ -DCMAKE_CXX_FLAGS="$CXXFLAGS -Wno-error=format" \
+ -DBUNDLE_PROJECTM_PRESETS=OFF \
+ -DUSE_SYSTEM_PROJECTM=ON \
+ -DUSE_SYSTEM_TAGLIB=ON \
+ $CMAKE_CROSSOPTS .
+ cmake --build build
+}
+
+check() {
+ cd "$builddir"/build/tests
+ make build_tests
+ for test in *_test; do
+ ./$test
+ done
+}
+
+package() {
+ DESTDIR="$pkgdir" cmake --install build
+}
+
+sha512sums="
+314743c0c213ffed63362c1d94e7584355cb28d54b370925eb007c53f8e6e82a8aaf483690b8acde5a948bbb0c8e9f4dbbfb0fb5c35b4ece7a11ed2a7fa0f19d clementine-1.4.0rc1-737-g69fd49b97.tar.xz
+"
diff --git a/testing/clifm/APKBUILD b/testing/clifm/APKBUILD
index c99a736c26..21369ee132 100644
--- a/testing/clifm/APKBUILD
+++ b/testing/clifm/APKBUILD
@@ -1,9 +1,9 @@
# Contributor: Sodface <sod@sodface.com>
# Maintainer: Sodface <sod@sodface.com>
pkgname=clifm
-pkgver=1.2.2_git20211022
+pkgver=1.2.2_git20211105
pkgrel=0
-_commit="1e8ee24b514e589a3225b2d981a164897f8dab07"
+_commit="faf1d18c5fbe3ff8564db6185e8ef30b56bafe9a"
pkgdesc="CLI file manager"
url="https://github.com/leo-arch/clifm"
arch="all"
@@ -23,5 +23,5 @@ package() {
}
sha512sums="
-7b9a76adf75c9ccd554b3a1c210d428d7b5b6f178dbd1957c75f1380721ce8fe055bcfabe0b74172f579b9b742343e60b64a703369eb64b622c29b8703be0895 clifm-1e8ee24b514e589a3225b2d981a164897f8dab07.tar.gz
+36b31ab85bbb8556a267f5589415fe303115aeeab0f2335419cfdeb31351e748c0fc0fd14fbc20244b0036d04daef8bf707755ae94a11b888be43c612db4a25e clifm-faf1d18c5fbe3ff8564db6185e8ef30b56bafe9a.tar.gz
"
diff --git a/testing/clipman/APKBUILD b/testing/clipman/APKBUILD
index aa6b3567a7..c837dca87e 100644
--- a/testing/clipman/APKBUILD
+++ b/testing/clipman/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Galen Abell <galen@galenabell.com>
# Maintainer: Galen Abell <galen@galenabell.com>
pkgname=clipman
-pkgver=1.6.0
-pkgrel=1
+pkgver=1.6.1
+pkgrel=0
pkgdesc="A simple clipboard manager for Wayland"
url="https://github.com/yory8/clipman"
arch="all"
@@ -22,5 +22,5 @@ package() {
install -Dm644 docs/clipman.1 -t "$pkgdir"/usr/share/man/man1
}
sha512sums="
-07412e290d2b1b71aaea67b81abb3bb93fd648451c40485f775e8c813df839c90e5c62e460596ac5d5e9902cb16cf2f6617cdcc9e5ea8aa023e476854cef844a clipman-1.6.0.tar.gz
+4d02cad58a5637df64a32673406632a9626633fa2bfc6cff28dc6c724048a3f6e40482a3f0eca64ad0af2e0100b426d8779beef29f24e28b5c494878ae1c0ef4 clipman-1.6.1.tar.gz
"
diff --git a/testing/cln/APKBUILD b/testing/cln/APKBUILD
index 63d9cadc3c..23e43c4c6d 100755
--- a/testing/cln/APKBUILD
+++ b/testing/cln/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Alex Yam <alex@alexyam.com>
# Maintainer: Alex Yam <alex@alexyam.com>
pkgname=cln
-pkgver=0_git20210201
-_commit=c4940b353cdffd62979388fbd9e97c841c5a9ecb
+pkgver=0_git20211105
+_gitrev=280cc69e7235f176669202a319dd493b234a5b70
pkgrel=0
pkgdesc="C++ class library for numbers"
url="https://www.ginac.de/CLN/"
@@ -12,8 +12,8 @@ arch="all !armv7 !armhf !mips64"
license="GPL-2.0-or-later"
makedepends="cmake gmp-dev"
subpackages="$pkgname-dev $pkgname-doc"
-source="$pkgname-$_commit.tar.gz::https://www.ginac.de/CLN/cln.git/?p=cln.git;a=snapshot;h=$_commit;sf=tgz"
-builddir="$srcdir/$pkgname-${_commit:0:7}"
+source="$pkgname-$_gitrev.tar.gz::https://www.ginac.de/CLN/cln.git/?p=cln.git;a=snapshot;h=$_gitrev;sf=tgz"
+builddir="$srcdir/$pkgname-${_gitrev:0:7}"
# asm routines have problems on arm, hppa and sparc
case $CARCH in
@@ -46,4 +46,6 @@ package() {
cp -rpv ./* $pkgdir/usr/share/doc/cln/examples
}
-sha512sums="4b919fc2c911ccbeb18e236064a7575a3b85a8654b16366a3822e5e1a8c705875b5bd30d927162c1bb88776701e47390a18a10d811cd1ba258a17675d884bff6 cln-c4940b353cdffd62979388fbd9e97c841c5a9ecb.tar.gz"
+sha512sums="
+368f33746ef06005d30756ecb4b4e775485be624cc6cb3ff83ff8f887f3ad5d9d994319c06083085ce4831e68960bd0d1ff4df0fd38a9d4c28067acc50c80bde cln-280cc69e7235f176669202a319dd493b234a5b70.tar.gz
+"
diff --git a/testing/cloudfoundry-cli/APKBUILD b/testing/cloudfoundry-cli/APKBUILD
index 3fe4bb734d..0551ca179a 100644
--- a/testing/cloudfoundry-cli/APKBUILD
+++ b/testing/cloudfoundry-cli/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Thomas Boerger <thomas@webhippie.de>
pkgname=cloudfoundry-cli
pkgver=7.2.0
-pkgrel=2
+pkgrel=3
pkgdesc="A CLI for Cloud Foundry written in Go"
url="https://github.com/cloudfoundry/cli"
arch="all !s390x !armv7"
diff --git a/testing/coin/APKBUILD b/testing/coin/APKBUILD
new file mode 100644
index 0000000000..ffc0a4a6ab
--- /dev/null
+++ b/testing/coin/APKBUILD
@@ -0,0 +1,38 @@
+# Contributor: Aiden Grossman <agrossman154@yahoo.com>
+# Maintainer: Aiden Grossman <agrossman154@yahoo.com>
+pkgname=coin
+pkgver=4.0.0
+pkgrel=0
+pkgdesc="OpenGL OpenInventor compatible graphics library"
+url="https://github.com/coin3d/coin"
+license="BSD-3-Clause"
+arch="all"
+makedepends="boost-dev cmake glu-dev graphviz"
+subpackages="$pkgname-dev"
+source="https://github.com/coin3d/coin/releases/download/Coin-$pkgver/coin-$pkgver-src.tar.gz
+ TestSuitePatch.patch
+ "
+builddir="$srcdir/coin"
+
+build() {
+ export CXXFLAGS="${CXXFLAGS/-Os/}" # test suite fails with -Os optimizations
+ cmake . \
+ -B ./build \
+ -DCMAKE_BUILD_TYPE=None \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCOIN_BUILD_TESTS=ON
+ cmake --build build
+}
+
+check() {
+ cmake --build build --target test
+}
+
+package() {
+ DESTDIR="$pkgdir" cmake --install build
+}
+
+sha512sums="
+e036276a243bfe252569cee1b67d38b8633fcf35bdf4e366a92ca67e23799d54d91fe272c23b383c451d330cee284809f28f237857493948149e0da1ebd64fae coin-4.0.0-src.tar.gz
+aab464244b13371badf0878e5bfbcce859a42756cf8c7657d1480318aa291d296eac2741219c346bae056f761c5f46857f8fd1ec1c4129f86bc10236d3869deb TestSuitePatch.patch
+"
diff --git a/testing/coin/TestSuitePatch.patch b/testing/coin/TestSuitePatch.patch
new file mode 100644
index 0000000000..ce484e52c4
--- /dev/null
+++ b/testing/coin/TestSuitePatch.patch
@@ -0,0 +1,11 @@
+--- ./testsuite/TestSuiteUtils.cpp
++++ ./testsuite/TestSuiteUtils.cpp
+@@ -39,7 +39,7 @@
+ #elif defined(_WIN32)
+ #define USE_WIN32
+ #else //_WIN32
+-#error Unknown system
++#define USE_POSIX
+ #endif //POSIX
+
+ #include <Inventor/errors/SoDebugError.h>
diff --git a/testing/comics-downloader/APKBUILD b/testing/comics-downloader/APKBUILD
new file mode 100644
index 0000000000..f52da87efd
--- /dev/null
+++ b/testing/comics-downloader/APKBUILD
@@ -0,0 +1,44 @@
+# Contributor: Anjandev Momi <anjan@momi.ca>
+# Maintainer: Anjandev Momi <anjan@momi.ca>
+pkgname=comics-downloader
+pkgver=0.32.1
+pkgrel=0
+pkgdesc="Tool to download comics and manga in pdf/epub/cbr/cbz from a website"
+url="https://github.com/Girbons/comics-downloader"
+license="MIT"
+arch="all"
+options="chmod-clean"
+makedepends="go mesa-dev libxcursor-dev libxrandr-dev libxinerama-dev libxi-dev"
+subpackages="$pkgname-gui:gui"
+source="$pkgver-$pkgname.tar.gz::https://github.com/Girbons/comics-downloader/archive/refs/tags/v$pkgver.tar.gz
+ fixtests.patch"
+
+export GOPATH="$srcdir"
+
+prepare() {
+ default_prepare
+}
+
+build() {
+ go build -o build/comics-downloader ./cmd/downloader
+ go build -o build/comics-downloader-gui ./cmd/gui
+}
+
+check() {
+ go test ./...
+}
+
+package() {
+ install -Dm755 "$builddir"/build/comics-downloader \
+ "$pkgdir"/usr/bin/comics-downloader-linux
+}
+
+gui() {
+ install -Dm755 "$builddir"/build/comics-downloader-gui \
+ "$subpkgdir"/usr/bin/comics-downloader-linux-gui
+}
+
+sha512sums="
+ef936728967437e8ddd3a726e87ddf512ef3913548b826c294aee50310485e7500e75e539ed7f660b063730f723e8b5e00ccf40ff56383406d73c4ba11b3a9d0 0.32.1-comics-downloader.tar.gz
+c0193a4ac319097c51ca61db8d211986544ba5203cd47d2d75e57685fbb979dcc451b9e82befc128bb7eb9c49b4f1aed3bf227d9c13a41ad1835d3bc1b88980a fixtests.patch
+"
diff --git a/testing/comics-downloader/fixtests.patch b/testing/comics-downloader/fixtests.patch
new file mode 100644
index 0000000000..d6d766bc87
--- /dev/null
+++ b/testing/comics-downloader/fixtests.patch
@@ -0,0 +1,67 @@
+Author: Alessandro De Angelis <alessandrodea22@gmail.com>
+URL: https://github.com/Girbons/comics-downloader/commit/f3b19f8e99a4338705fcc601252ba74259684d8f
+Summary: Fix tests
+---
+ pkg/core/core_test.go | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/pkg/core/core_test.go b/pkg/core/core_test.go
+index 8f7ae0c..172243c 100644
+--- a/pkg/core/core_test.go
++++ b/pkg/core/core_test.go
+@@ -9,6 +9,7 @@ import (
+
+ "github.com/Girbons/comics-downloader/internal/logger"
+ "github.com/Girbons/comics-downloader/pkg/config"
++ "github.com/Girbons/comics-downloader/pkg/http"
+ "github.com/stretchr/testify/assert"
+ )
+
+@@ -52,6 +53,7 @@ func TestMakeComicPDF(t *testing.T) {
+ CreateDefaultPath: true,
+ Debug: false,
+ Logger: logger.NewLogger(false, make(chan string)),
++ Client: http.NewComicClient(),
+ }
+ err := comic.MakeComic(opt)
+ assert.Nil(t, err)
+@@ -76,6 +78,7 @@ func TestMakeComicEPUB(t *testing.T) {
+ CreateDefaultPath: true,
+ Debug: false,
+ Logger: logger.NewLogger(false, make(chan string)),
++ Client: http.NewComicClient(),
+ }
+
+ err := comic.MakeComic(opt)
+@@ -99,6 +102,7 @@ func TestDownloadImagesPNGFormat(t *testing.T) {
+ Debug: false,
+ CreateDefaultPath: true,
+ Logger: logger.NewLogger(false, make(chan string)),
++ Client: http.NewComicClient(),
+ }
+ dir, err := comic.DownloadImages(opt)
+ files, _ := ioutil.ReadDir(dir)
+@@ -121,6 +125,7 @@ func TestDownloadImagesJPGFormat(t *testing.T) {
+ CreateDefaultPath: true,
+ Debug: false,
+ Logger: logger.NewLogger(false, make(chan string)),
++ Client: http.NewComicClient(),
+ }
+ dir, err := comic.DownloadImages(opt)
+ files, _ := ioutil.ReadDir(dir)
+@@ -143,6 +148,7 @@ func TestDownloadImagesJPEGFormat(t *testing.T) {
+ CreateDefaultPath: true,
+ Debug: false,
+ Logger: logger.NewLogger(false, make(chan string)),
++ Client: http.NewComicClient(),
+ }
+ dir, err := comic.DownloadImages(opt)
+ files, _ := ioutil.ReadDir(dir)
+@@ -165,6 +171,7 @@ func TestDownloadImagesIMGFormat(t *testing.T) {
+ CreateDefaultPath: true,
+ Debug: false,
+ Logger: logger.NewLogger(false, make(chan string)),
++ Client: http.NewComicClient(),
+ }
+ dir, err := comic.DownloadImages(opt)
+ files, _ := ioutil.ReadDir(dir)
diff --git a/testing/conntracct/APKBUILD b/testing/conntracct/APKBUILD
index 2ed8b33b8c..bd1abdec32 100644
--- a/testing/conntracct/APKBUILD
+++ b/testing/conntracct/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Mark Pashmfouroush <mark@markpash.me>
pkgname=conntracct
pkgver=0.2.7
-pkgrel=3
+pkgrel=4
pkgdesc="Tool for extracting network flow information from Linux hosts"
url="https://github.com/ti-mo/conntracct"
license="Apache-2.0"
diff --git a/testing/coreboot-ectool/APKBUILD b/testing/coreboot-ectool/APKBUILD
new file mode 100644
index 0000000000..f625ccf827
--- /dev/null
+++ b/testing/coreboot-ectool/APKBUILD
@@ -0,0 +1,26 @@
+# Contributor: Nulo <alpine@nulo.in>
+# Mantainer: Nulo <alpine@nulo.in>
+pkgname=coreboot-ectool
+pkgver=4.14
+pkgrel=0
+pkgdesc="Dumps the RAM of a laptop’s Embedded/Environmental Controller (EC)."
+url="https://www.coreboot.org"
+arch="x86 x86_64" # Uses inline assembly.
+license="GPL-2.0-only"
+options="!check" # No test suite.
+source="https://coreboot.org/releases/coreboot-$pkgver.tar.xz
+ fix-makefile.patch"
+builddir="$srcdir/coreboot-$pkgver/util/ectool/"
+
+build() {
+ make
+}
+
+package() {
+ make DESTDIR="$pkgdir" PREFIX=/usr install
+}
+
+sha512sums="
+14c615472dfe00682e4b0b41b6a04ed3b201395427350f7b53497152f2acc8cbef8144bad06517b413c4076422108bccab2e4732491f5e6fcc4703b14d062b19 coreboot-4.14.tar.xz
+44f16ca9824e873d598d87c39216d3390954dc152f85f59d76b58086abfd0481161778cb08eb72f1f3a3d7022319aaabb96a2f07736782713170f2e760b989dd fix-makefile.patch
+"
diff --git a/testing/coreboot-ectool/fix-makefile.patch b/testing/coreboot-ectool/fix-makefile.patch
new file mode 100644
index 0000000000..f0ac8a22f5
--- /dev/null
+++ b/testing/coreboot-ectool/fix-makefile.patch
@@ -0,0 +1,22 @@
+diff --git a/Makefile b/Makefile
+index 1ef74d2..94cf3c0 100644
+--- a/Makefile
++++ b/Makefile
+@@ -4,7 +4,7 @@ CC = gcc
+ WERROR=-Werror
+ CFLAGS = -O2 -Wall -Wextra -Wshadow $(WERROR)
+ PROGRAM = ectool
+-INSTALL = /usr/bin/env install
++INSTALL = /usr/bin/env install -D
+ PREFIX = /usr/local
+ OS_ARCH = $(shell uname)
+
+@@ -22,7 +22,7 @@ $(PROGRAM): ec.o ectool.o
+ $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
+
+ install: $(PROGRAM)
+- $(INSTALL) $(PROGRAM) $(PREFIX)/sbin
++ $(INSTALL) $(PROGRAM) $(DESTDIR)$(PREFIX)/sbin/$(PROGRAM)
+
+ clean:
+ rm -f *.o $(PROGRAM) junit.xml
diff --git a/testing/corectrl/APKBUILD b/testing/corectrl/APKBUILD
index 03948385bd..aefab04df8 100644
--- a/testing/corectrl/APKBUILD
+++ b/testing/corectrl/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Leo <thinkabit.ukim@gmail.com>
# Maintainer:
pkgname=corectrl
-pkgver=1.2.1
+pkgver=1.2.2
pkgrel=0
pkgdesc="Control your hardware with application profiles"
url="https://gitlab.com/corectrl/corectrl"
@@ -39,5 +39,5 @@ package() {
}
sha512sums="
-9523ac684cae6e64dadcacd5d0c1dc5c365b9f37e9e13558bf97e59e70b6860b721f82cfb44889e76e9cf9b44070d9aa91519089fe7d86e16ecebf3eb7400a56 corectrl-v1.2.1.tar.gz
+613bc794caad70e50e1659ac2245b1b77e3fad2f5449bf70a54a85579ba0a13508be221efba0614c2c0813b20e534278362750181637422561991bb6e6ed5d50 corectrl-v1.2.2.tar.gz
"
diff --git a/testing/coredns/APKBUILD b/testing/coredns/APKBUILD
index 0371a960aa..730447fd81 100644
--- a/testing/coredns/APKBUILD
+++ b/testing/coredns/APKBUILD
@@ -1,24 +1,36 @@
# Contributor: Mark Pashmfouroush <mark@markpash.me>
+# Contributor: Francesco Colista <fcolista@alpinelinux.org>
# Maintainer: Mark Pashmfouroush <mark@markpash.me>
pkgname=coredns
pkgver=1.8.6
-pkgrel=0
+pkgrel=6
pkgdesc="fast and flexible DNS server"
url="https://github.com/coredns/coredns"
license="Apache-2.0"
arch="all"
-options="net"
-makedepends="go libcap"
+options="net chmod-clean"
+makedepends="go libcap unbound-libs unbound-dev"
+depends="unbound-libs"
install="$pkgname.pre-install"
subpackages="$pkgname-openrc"
-source="
- $pkgname-$pkgver.tar.gz::https://github.com/coredns/coredns/archive/v$pkgver.tar.gz
+source="$pkgname-$pkgver.tar.gz::https://github.com/coredns/coredns/archive/v$pkgver.tar.gz
coredns.confd
coredns.initd
+ coredns.logrotated
+ plugin.cfg.enabled
+ ensure-cgo.patch
+ fix-netbox-plugin.patch
"
+export GOPATH="$srcdir"
+
+prepare() {
+ default_prepare
+ cp $srcdir/plugin.cfg.enabled $builddir/plugin.cfg
+}
+
build() {
- make
+ CGO_ENABLED=1 make
}
check() {
@@ -34,11 +46,24 @@ package() {
install -Dm755 "$srcdir"/coredns.initd "$pkgdir"/etc/init.d/coredns
install -Dm644 "$srcdir"/coredns.confd "$pkgdir"/etc/conf.d/coredns
+ install -Dm 644 "$srcdir"/coredns.logrotated "$pkgdir"/etc/logrotate.d/coredns
+
install -d "$pkgdir"/etc/coredns
+ install -d "$pkgdir"/var/log/coredns
+}
+
+cleanup_srcdir() {
+ export GOPATH="$srcdir"
+ go clean -modcache
+ default_cleanup_srcdir
}
sha512sums="
589e05aaec71acd242aae69a68dacb2575fe9c436d7a318adbc963a3302a6e343a0c1a0966c9fb7819cec38bd91e3b4036e65b3080b5016514c24f26caad737e coredns-1.8.6.tar.gz
-2ff396033c570f45b5880556a8724b05356276db451cf6e6cfb477f64f4b863801a891940f72c0b1c8268bae176094d02890d27146901f296e4e8d9b703934d2 coredns.confd
-62b6d9c8c980990bec896b2d6e0e626b0ea4a7db80ac925772e0d6f2793a6a511165bbd76b52f38a2e8243ffc68e430b32cf33c32332b483fc528ed57e2b2927 coredns.initd
+90300a3035b00b58f362b2c12dfaeee21b889e10e90600523b5785c907dfbd7e515c3269dd29a9d4c758990e78ede8343edfac0bc022bd3a23652543ba2d42d3 coredns.confd
+06d9fcf227e064f8ea21f4f003d33611aabf2d75b2e6e097dc10af1db42ea823d15c26649e52584da4fb4a85e87b3f27959a44ce873f176c2a082624f6845f38 coredns.initd
+c697c08c3b1153ae224a1eeb3521f9ee594de4852bc6ef78d94dc7f6f680517659a653ab5c13ea03918deb79e6654ef11512ba4c90fe06ea4591fefbab876ece coredns.logrotated
+6746632085004303d8c21628bcc34e98025a523ee0c4a0db589bae9d9c9ea1b403d84ee70dd7217154956be67d25344560319c8c3ac919370f0027c3092687df plugin.cfg.enabled
+ffa6803c1b23796eabc0c884b6a48c6c78f7bf3628743e3e76d4e0248e41b4e10fa34081f0267838bcc52ea8da38dc18ed7dd5b85b3508f6f3dba12a3c26c0df ensure-cgo.patch
+8ece9c8b825de8d5bbcbaecacd0407c540f1fd55e6a22d7ca493e92f47b44caf28bd6d588b07affc26b1872dec0e1d97a4f0fb0462052b83e14a3d59189688eb fix-netbox-plugin.patch
"
diff --git a/testing/coredns/coredns.confd b/testing/coredns/coredns.confd
index 665d1c1c53..4699dc4453 100644
--- a/testing/coredns/coredns.confd
+++ b/testing/coredns/coredns.confd
@@ -1,4 +1,9 @@
-# /etc/conf.d/coredns
+###
+# CoreDNS config
+#
-# Uncomment and fill to specify custom arguments
-# ARGS=""
+COREDNS_CONFIG="/etc/coredns/Corefile"
+COREDNS_EXTRA_ARGS=""
+
+# Uncomment / edit to enable healthchecks
+#COREDNS_HEALTHCHECK_URI="127.0.0.1:8080/health"
diff --git a/testing/coredns/coredns.initd b/testing/coredns/coredns.initd
index 45bbc797d1..b47113327f 100644
--- a/testing/coredns/coredns.initd
+++ b/testing/coredns/coredns.initd
@@ -1,13 +1,30 @@
#!/sbin/openrc-run
+# Copyright 2017-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+description="CoreDNS service"
+pidfile="${pidfile:-"/run/${SVCNAME}.pid"}"
+user="${user:-root}"
+group="${group:-root}"
-name=coredns
-description="CoreDNS is a fast and flexible DNS server"
-command=/usr/bin/coredns
-command_args="$ARGS"
-command_user="coredns:coredns"
supervisor="supervise-daemon"
+command="/usr/bin/coredns"
+command_args="-conf ${COREDNS_CONFIG} ${CORENDS_EXTRA_ARGS}"
+
+start_stop_daemon_args="--user ${user} --group ${group} \
+ --stdout /var/log/${SVCNAME}/${SVCNAME}.log \
+ --stderr /var/log/${SVCNAME}/${SVCNAME}.log"
depend() {
- need net
- provide dns
+ after net
}
+
+if [[ -n "${COREDNS_HEALTHCHECK_URI}" ]]; then
+ healthcheck_delay=20
+ healthcheck_timer=30
+
+ healthcheck() {
+ command -v wget || return 0
+ wget -Oq- "${COREDNS_HEALTHCHECK_URI}"
+ }
+fi
diff --git a/testing/coredns/coredns.logrotated b/testing/coredns/coredns.logrotated
new file mode 100644
index 0000000000..19572fbcad
--- /dev/null
+++ b/testing/coredns/coredns.logrotated
@@ -0,0 +1,7 @@
+/var/log/coredns/*.log {
+ missingok
+ size 5M
+ rotate 3
+ compress
+ copytruncate
+}
diff --git a/testing/coredns/ensure-cgo.patch b/testing/coredns/ensure-cgo.patch
new file mode 100644
index 0000000000..d20fa37bee
--- /dev/null
+++ b/testing/coredns/ensure-cgo.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile b/Makefile
+index 877ae16..bcd283d 100644
+--- a/Makefile
++++ b/Makefile
+@@ -6,7 +6,7 @@ CHECKS:=check
+ BUILDOPTS:=-v
+ GOPATH?=$(HOME)/go
+ MAKEPWD:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
+-CGO_ENABLED:=0
++CGO_ENABLED:=1
+
+ .PHONY: all
+ all: coredns
diff --git a/testing/coredns/fix-netbox-plugin.patch b/testing/coredns/fix-netbox-plugin.patch
new file mode 100644
index 0000000000..49d8d9d989
--- /dev/null
+++ b/testing/coredns/fix-netbox-plugin.patch
@@ -0,0 +1,12 @@
+diff --git a/Makefile b/Makefile
+index 1e7d0bd..6fbd206 100644
+--- a/Makefile
++++ b/Makefile
+@@ -21,6 +21,7 @@ check: core/plugin/zplugin.go core/dnsserver/zdirectives.go
+ core/plugin/zplugin.go core/dnsserver/zdirectives.go: plugin.cfg
++ go get github.com/oz123/coredns-netbox-plugin@970cce3599f16c6651ba23bef7b7de15a17709cb
+ go generate coredns.go
+ go get
+
+ .PHONY: gen
+ gen:
diff --git a/testing/coredns/plugin.cfg.enabled b/testing/coredns/plugin.cfg.enabled
new file mode 100644
index 0000000000..ad298e9d2c
--- /dev/null
+++ b/testing/coredns/plugin.cfg.enabled
@@ -0,0 +1,73 @@
+# Directives are registered in the order they should be executed.
+#
+# Ordering is VERY important. Every plugin will feel the effects of all other
+# plugin below (after) them during a request, but they must not care what plugin
+# above them are doing.
+
+# How to rebuild with updated plugin configurations: Modify the list below and
+# run `go generate && go build`
+
+# The parser takes the input format of:
+#
+# <plugin-name>:<package-name>
+# Or
+# <plugin-name>:<fully-qualified-package-name>
+#
+# External plugin example:
+#
+# log:github.com/coredns/coredns/plugin/log
+# Local plugin example:
+# log:log
+
+metadata:metadata
+geoip:geoip
+cancel:cancel
+tls:tls
+reload:reload
+nsid:nsid
+bufsize:bufsize
+root:root
+bind:bind
+debug:debug
+trace:trace
+ready:ready
+health:health
+pprof:pprof
+prometheus:metrics
+errors:errors
+log:log
+dnstap:dnstap
+local:local
+dns64:dns64
+acl:acl
+any:any
+chaos:chaos
+loadbalance:loadbalance
+cache:cache
+rewrite:rewrite
+header:header
+dnssec:dnssec
+autopath:autopath
+minimal:minimal
+template:template
+transfer:transfer
+hosts:hosts
+route53:route53
+azure:azure
+clouddns:clouddns
+k8s_external:k8s_external
+kubernetes:kubernetes
+file:file
+auto:auto
+secondary:secondary
+etcd:etcd
+loop:loop
+forward:forward
+grpc:grpc
+erratic:erratic
+whoami:whoami
+on:github.com/coredns/caddy/onevent
+git:github.com/miekg/coredns-git
+sign:sign
+unbound:github.com/coredns/unbound
+netbox:github.com/oz123/coredns-netbox-plugin
diff --git a/testing/curaengine/APKBUILD b/testing/curaengine/APKBUILD
deleted file mode 100644
index 54c2cf2d63..0000000000
--- a/testing/curaengine/APKBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# Contributor: Aiden Grossman <agrossman154@yahoo.com>
-# Maintainer: Aiden Grossman <agrossman154@yahoo.com>
-pkgname=curaengine
-_pkgname=CuraEngine
-# If you plan to upgrade curaengine, you also need to upgrade libarcus at the same time
-pkgver=4.11.0
-pkgrel=1
-pkgdesc="3D slicer engine"
-url="https://github.com/Ultimaker/CuraEngine"
-arch="all"
-license="AGPL-3.0-or-later"
-makedepends="protobuf-dev py3-sip-dev python3-dev cmake libarcus-dev"
-options="!check" # no functioning test suite
-source="https://github.com/Ultimaker/CuraEngine/archive/$pkgver/CuraEngine-$pkgver.tar.gz"
-builddir="$srcdir/$_pkgname-$pkgver/"
-
-build() {
- cmake -B ./build -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_TESTS=ON .
- cmake --build build
-}
-
-package() {
- DESTDIR="$pkgdir" cmake --build build --target install
-}
-
-sha512sums="
-3152bd0847d6977e2ee7afd57675cb5000a1824d50bbe442d6e67a0534b8f8b8858f8a71f545a8fabaaf2065b47acbd7de11c35591cf6e891bc6871ea84107c1 CuraEngine-4.11.0.tar.gz
-"
diff --git a/testing/cutecom/APKBUILD b/testing/cutecom/APKBUILD
deleted file mode 100644
index ab5be68cac..0000000000
--- a/testing/cutecom/APKBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# Contributor: knuxify <knuxify@gmail.com>
-# Maintainer: knuxify <knuxify@gmail.com>
-pkgname=cutecom
-pkgver=0.51.0
-pkgrel=0
-pkgdesc="Graphical serial terminal"
-url="https://gitlab.com/cutecom/cutecom"
-arch="all"
-license="GPL-3.0-or-later"
-makedepends="cmake qt5-qtbase-dev qt5-qtserialport-dev"
-subpackages="$pkgname-doc"
-source="https://gitlab.com/cutecom/cutecom/-/archive/v$pkgver/cutecom-v$pkgver.tar.gz
- fix-qpainterpath.patch
- follow-system-colors.patch"
-builddir="$srcdir/$pkgname-v$pkgver"
-options="!check" # no test suite
-
-build() {
- if [ "$CBUILD" != "$CHOST" ]; then
- CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
- fi
- cmake -B build \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DBUILD_SHARED_LIBS=True \
- -DCMAKE_BUILD_TYPE=None \
- $CMAKE_CROSSOPTS .
- cmake --build build
-}
-
-package() {
- DESTDIR="$pkgdir" cmake --install build
- install -Dm644 "$builddir"/cutecom.desktop "$pkgdir"/usr/share/applications/cutecom.desktop
- install -Dm644 "$builddir"/images/cutecom.svg "$pkgdir"/usr/share/icons/hicolor/scalable/apps/cutecom.svg
- install -Dm644 "$builddir"/cutecom.1 "$pkgdir"/usr/share/man/man1/cutecom.1
-}
-
-sha512sums="
-bb5235a6f420edfd3ff49beaf3d61722b1983c57270a54274e3c9ad35c28a5d91dd2cdea6db7de4be6c8a3034348ef08c4004edfcf246f7f4146b86930df50d5 cutecom-v0.51.0.tar.gz
-5cbbb75beb4082be6e1d515b4d37a874d8a507a854e6844b6f0479af02db7575d54020c21e72fc5c2b6670de32b7edad18f7abe4ee69793782acca0ef09e4e05 fix-qpainterpath.patch
-8663b67f9f875ea18aa0cc33e9ab855e2e9bc94a03e1287625e824015431e54ccb2a3482924c35aaf9b4ddec1e3ec8083dcd763ac220a3b9d6045a8bc6f65b0a follow-system-colors.patch
-"
diff --git a/testing/cutecom/fix-qpainterpath.patch b/testing/cutecom/fix-qpainterpath.patch
deleted file mode 100644
index c06ae9a9ee..0000000000
--- a/testing/cutecom/fix-qpainterpath.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 70d0c497acf8f298374052b2956bcf142ed5f6ca Mon Sep 17 00:00:00 2001
-From: Meinhard R <cyc1ingsir@gmail.com>
-Date: Thu, 11 Jun 2020 18:33:10 +0000
-Subject: [PATCH] Fix-build-with-Qt-5.15 (hopefully)
-
----
- ctrlcharacterspopup.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/ctrlcharacterspopup.cpp b/ctrlcharacterspopup.cpp
-index 632ae32..f37a8d4 100644
---- a/ctrlcharacterspopup.cpp
-+++ b/ctrlcharacterspopup.cpp
-@@ -23,6 +23,7 @@
- #include <QApplication>
- #include <QKeyEvent>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QPoint>
- #include <QPushButton>
- #include <QSignalMapper>
---
-GitLab
-
diff --git a/testing/cutecom/follow-system-colors.patch b/testing/cutecom/follow-system-colors.patch
deleted file mode 100644
index 1575367de3..0000000000
--- a/testing/cutecom/follow-system-colors.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 1cab7b5d3e8fa3c64f2b8d58ef7c60127b68dd46 Mon Sep 17 00:00:00 2001
-From: genelocated <genelocated@foxmail.com>
-Date: Thu, 16 Jan 2020 22:25:26 +0800
-Subject: [PATCH] Follow system color settings in DataDisplay
-
----
- datadisplay.cpp | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/datadisplay.cpp b/datadisplay.cpp
-index 2595057..da54e5d 100644
---- a/datadisplay.cpp
-+++ b/datadisplay.cpp
-@@ -373,7 +373,8 @@ void DataDisplay::setupTextFormats()
-
- QTextCursor cursor = m_dataDisplay->textCursor();
- QTextCharFormat format = cursor.charFormat();
-- QColor col = QColor(Qt::black);
-+ QPalette palette = QApplication::palette();
-+ QColor col = palette.color(QPalette::WindowText);
- format.setForeground(col);
- QFont font;
- font.setFamily(font.defaultFamily());
-@@ -386,7 +387,7 @@ void DataDisplay::setupTextFormats()
- format.setForeground(col);
- m_dataDisplay->setTimeFormat(new QTextCharFormat(format));
-
-- col = QColor(Qt::black);
-+ col = palette.color(QPalette::WindowText);
- format.setForeground(col);
- font = QFont("Monospace");
- font.setStyleHint(QFont::Courier);
---
-GitLab
-
diff --git a/testing/cyclone/APKBUILD b/testing/cyclone/APKBUILD
index 3182903f2c..2a95af840f 100644
--- a/testing/cyclone/APKBUILD
+++ b/testing/cyclone/APKBUILD
@@ -5,9 +5,9 @@ pkgver=0.33.0
pkgrel=0
pkgdesc="A compiler for application development with R7RS Scheme"
url="https://justinethier.github.io/cyclone/"
-# mips64: crashes during compilation of first Scheme file with cyclone
# s390x: ck on s390x does not have ck_pr_cas_8 (used by cyclone)
-arch="all !mips64 !s390x"
+# See: https://github.com/concurrencykit/ck/issues/178
+arch="all !s390x"
license="MIT"
makedepends="ck-dev cyclone-bootstrap"
subpackages="$pkgname-dev"
diff --git a/testing/delta/APKBUILD b/testing/delta/APKBUILD
deleted file mode 100644
index 4faa24309b..0000000000
--- a/testing/delta/APKBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# Contributor: Aleks Bunin <alpinelinux@compuix.com>
-# Maintainer: Aleks Bunin <alpinelinux@compuix.com>
-pkgname=delta
-pkgver=0.9.1
-pkgrel=0
-pkgdesc="A viewer for git and diff output"
-url="https://github.com/dandavison/delta"
-arch="all !s390x !mips !mips64 !riscv64" # Limited by cargo
-license="MIT"
-makedepends="cargo"
-source="$pkgname-$pkgver.tar.gz::https://github.com/dandavison/delta/archive/$pkgver.tar.gz"
-
-build() {
- cargo build --release --locked
-}
-
-check() {
- cargo test --release --locked
-}
-
-package() {
- install -Dm755 target/release/"$pkgname" "$pkgdir"/usr/bin/"$pkgname"
-}
-
-sha512sums="e667a08a7d2ea8db8033cb7c9c19b7c0536894557089ee5e9f811cb264154798840085b1151f3410772f7e00b35f0ac2508cb4f82f8d78cf0ed395b0c0beda7a delta-0.9.1.tar.gz"
diff --git a/testing/delve/APKBUILD b/testing/delve/APKBUILD
index 5911d44631..9d78bcddfd 100644
--- a/testing/delve/APKBUILD
+++ b/testing/delve/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer:
pkgname=delve
-pkgver=1.7.2
+pkgver=1.7.3
pkgrel=0
pkgdesc="Debugger for the Go programming language"
url="https://github.com/go-delve/delve"
@@ -33,5 +33,5 @@ package() {
}
sha512sums="
-2d070e51732df10d8f8c05e4cc26ce43ea1ea4085b5c0b7343420838c7de89e8990a2c7320e8dc54c5780b68a9527ebfd5c4ae225e71abb06406b2a7d6f3bc5a delve-1.7.2.tar.gz
+35943db1010ff81ebe7ef12b1ed61ce499f4ab2da25579f41cb10fd24f513a4899f4fbd975f2debd95b65663d703eb8f8b9a57f3b3957d9d8658715207e288d4 delve-1.7.3.tar.gz
"
diff --git a/testing/dendrite/APKBUILD b/testing/dendrite/APKBUILD
deleted file mode 100644
index 35acbcf1d5..0000000000
--- a/testing/dendrite/APKBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# Contributor: Michał Polański <michal@polanski.me>
-# Maintainer: Michał Polański <michal@polanski.me>
-pkgname=dendrite
-pkgver=0.5.0
-pkgrel=1
-pkgdesc="Second-generation Matrix homeserver written in Go"
-url="https://github.com/matrix-org/dendrite"
-license="Apache-2.0"
-# mips64: test failures due to timeouts
-arch="all !mips64"
-options="net" # required to download go modules
-makedepends="go"
-subpackages="$pkgname-openrc"
-pkgusers="$pkgname"
-pkggroups="$pkgname"
-install="$pkgname.pre-install"
-source="https://github.com/matrix-org/dendrite/archive/v$pkgver/dendrite-v$pkgver.tar.gz
- dendrite.initd
- dendrite.confd
- "
-
-build() {
- for cmd in dendrite-monolith-server generate-keys create-account; do
- go build -trimpath -ldflags="-s -w" -v -o bin/$cmd ./cmd/$cmd
- done
-}
-
-check() {
- go test ./...
-}
-
-package() {
- install -Dm755 bin/dendrite-monolith-server "$pkgdir"/usr/bin/dendrite
- install -Dm755 bin/generate-keys "$pkgdir"/usr/bin/dendrite-generate-keys
- install -Dm755 bin/create-account "$pkgdir"/usr/bin/create-account
-
- install -Dm644 "$builddir"/dendrite-config.yaml "$pkgdir"/etc/$pkgname/dendrite.yaml
- install -Dm755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
- install -Dm644 "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
-}
-
-sha512sums="
-19a24d2bf37e7cc93b1977fbf148d9aa79b1964afe979b28d6bd54e99e3c7da8fdb66b98e5f858cc8b08be8d16d371a674ebff1b9ae5b06574d3731112f517f5 dendrite-v0.5.0.tar.gz
-92274e4f52eb0f35822d7f27279efd372b7959d8531ad7a247286727defc375ca4b4939ed7b82fa29061a0b3c923a6c41ac0f27f3cfd8acb9c96af72ffac333c dendrite.initd
-a6a088683a6aebc431d3eb289bd0d4dbaede698d1a5da25d6af2aad79e9cd36db02ce9173ab6904249f23b88bca5d1630258736feef7e8266e6c22220d74fa1f dendrite.confd
-"
diff --git a/testing/dendrite/dendrite.confd b/testing/dendrite/dendrite.confd
deleted file mode 100644
index 616443fdd7..0000000000
--- a/testing/dendrite/dendrite.confd
+++ /dev/null
@@ -1,7 +0,0 @@
-# Configuration for /etc/init.d/dendrite
-
-# Location of the configuration file
-#dendrite_config="/etc/dendrite/dendrite.yaml"
-
-# Additional arguments to be passed when starting dendrite
-#dendrite_opts=""
diff --git a/testing/dendrite/dendrite.initd b/testing/dendrite/dendrite.initd
deleted file mode 100644
index c02dae3e11..0000000000
--- a/testing/dendrite/dendrite.initd
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/sbin/openrc-run
-supervisor=supervise-daemon
-
-name="Dendrite"
-description="Second-generation Matrix homeserver written in Go"
-
-: ${dendrite_config:="/etc/dendrite/dendrite.yaml"}
-
-command="/usr/bin/dendrite"
-command_args="-config $dendrite_config $dendrite_opts"
-command_user="dendrite:dendrite"
-
-# make relative paths in config relative to the state directory
-directory="/var/lib/dendrite"
-
-depend() {
- need net
- after firewall
-}
-
-start_pre() {
- checkpath --directory --owner "$command_user" /var/log/dendrite
-}
diff --git a/testing/dendrite/dendrite.pre-install b/testing/dendrite/dendrite.pre-install
deleted file mode 100644
index b77f6779ee..0000000000
--- a/testing/dendrite/dendrite.pre-install
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-addgroup -S dendrite 2>/dev/null
-adduser -S -D -h /var/lib/dendrite -s /sbin/nologin -G dendrite -g dendrite dendrite 2>/dev/null
-
-exit 0
diff --git a/testing/diskus/APKBUILD b/testing/diskus/APKBUILD
index 388b282c42..2f328219cd 100644
--- a/testing/diskus/APKBUILD
+++ b/testing/diskus/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: guddaff <guddaff@protonmail.com>
# Maintainer: guddaff <guddaff@protonmail.com>
pkgname=diskus
-pkgver=0.6.0
+pkgver=0.7.0
pkgrel=0
pkgdesc="fast alternative for du"
url="https://github.com/sharkdp/diskus"
@@ -21,5 +21,5 @@ package() {
}
sha512sums="
-c0f0462b12f081f185edae7b7b09bade3c48eaf56f4ae7ebea2753282f6eb06bbea153db964ab3ebc5f0286b424705e2359116cb6512ed3fb25b1278d1a25c5f diskus-.tar.gz
+092e3640000fb233d975efa2513cec1020376f93a106b9a2c19a390c27f37298dc3b412a0853cb3c1ab267f5b16cfc7379307c2e6599b9396369e1e1dcc5803a diskus-.tar.gz
"
diff --git a/testing/dma/APKBUILD b/testing/dma/APKBUILD
index ea5d817671..a296c2b53b 100644
--- a/testing/dma/APKBUILD
+++ b/testing/dma/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer:
pkgname=dma
pkgver=0.13
-pkgrel=1
+pkgrel=2
pkgdesc="A small Mail Transport Agent from DragonFly BSD"
url="https://github.com/corecode/dma"
arch="x86_64 x86 ppc64le"
@@ -15,7 +15,7 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/corecode/dma/archive/v$pkgve
musl-fixes.patch"
build() {
- make
+ make PREFIX=/usr
}
package() {
@@ -41,6 +41,8 @@ package() {
"$pkgdir"/usr/share/doc/$pkgname/
}
-sha512sums="12ca04c6e67ffeead4596dcbf6bbc42547461b224a7f70e7185822b5f968c369de4c20ae7de3415a54f6eef7d4acc12d5fca5ff5851d640f3611d89a345b41ac dma-0.13.tar.gz
+sha512sums="
+12ca04c6e67ffeead4596dcbf6bbc42547461b224a7f70e7185822b5f968c369de4c20ae7de3415a54f6eef7d4acc12d5fca5ff5851d640f3611d89a345b41ac dma-0.13.tar.gz
5a79895fd42ffee347b979402225eb8025ea9bb41d0dc24b43d4b1e64106f1c612024456ea98e20aef4258eb8e852b370410e47d6ee34cea630dda29cc54840e dma.cron
-051af3d10711f7565fedd3a06c152454020e903e2e923a37cc77ccbf4346f308edecfe4f3d3c37a3cb2e54d1fb336bb4d9cea2a7d6dc560aec3c2369eb55e6a9 musl-fixes.patch"
+051af3d10711f7565fedd3a06c152454020e903e2e923a37cc77ccbf4346f308edecfe4f3d3c37a3cb2e54d1fb336bb4d9cea2a7d6dc560aec3c2369eb55e6a9 musl-fixes.patch
+"
diff --git a/testing/dnsperf/APKBUILD b/testing/dnsperf/APKBUILD
index aaf367e3f9..da3a209c51 100644
--- a/testing/dnsperf/APKBUILD
+++ b/testing/dnsperf/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Thomas Deutsch <thomas@tuxpeople.org>
pkgname=dnsperf
pkgver=2.4.0
-pkgrel=0
+pkgrel=1
pkgdesc="Dnsperf and resperf gather accurate latency and throughput metrics for DNS"
url="https://www.dns-oarc.net/tools/dnsperf"
arch="all"
diff --git a/testing/doctl/APKBUILD b/testing/doctl/APKBUILD
index cbd5522667..f30c0213b3 100644
--- a/testing/doctl/APKBUILD
+++ b/testing/doctl/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Will Sinatra <wpsinatra@gmail.com>
# Maintainer: Will Sinatra <wpsinatra@gmail.com>
pkgname=doctl
-pkgver=1.65.0
+pkgver=1.67.0
pkgrel=0
pkgdesc="Official command line interface for the DigitalOcean API"
url="https://github.com/digitalocean/doctl"
@@ -56,5 +56,5 @@ package() {
}
sha512sums="
-4ed0b9f234d239bb61e0b122e4253edc2813bcb82c11e1a7a2da262188adbe09af00d3094320ee6c9d6ebbdb6cc17a633787f8fe334eab5b912ef75f56c63106 doctl-1.65.0.tar.gz
+b257ebab4d9ae4ba545aa34a90e7481d761f7efc248afa998de24d5942848a55dfa56c52cb1e59c4e451c9e0e034fa83dfbac7ab3b7bf2855d046a5e03f0a960 doctl-1.67.0.tar.gz
"
diff --git a/testing/drone/APKBUILD b/testing/drone/APKBUILD
index 7efb8cfad1..aef82fe621 100644
--- a/testing/drone/APKBUILD
+++ b/testing/drone/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
# Maintainer:
pkgname=drone
-pkgver=2.4.0
+pkgver=2.6.0
pkgrel=0
pkgdesc="Container-Native, Continuous Delivery Platform"
url="https://drone.io/"
@@ -34,5 +34,5 @@ cleanup_srcdir() {
}
sha512sums="
-91d5bace2bea4aeaa97b49f16153261d6dbd986bff7239367a84a68a7327d4a0d0d0015cf78b2b1e42ccc8fb69516b924c4aff8b0e11d1dac96443cdbe90ae7f drone-2.4.0.tar.gz
+618bf0698ecfeb97760f8c777bcaef200d3d0af252fd01d32bdc8b3b21a38460b883cb828e4784b5d9de2ebd666995aa912254fee1feb4348f83699dd74415ab drone-2.6.0.tar.gz
"
diff --git a/testing/dublin-traceroute/APKBUILD b/testing/dublin-traceroute/APKBUILD
index 08ade9a10c..28d3a0fa7c 100644
--- a/testing/dublin-traceroute/APKBUILD
+++ b/testing/dublin-traceroute/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=dublin-traceroute
pkgver=0.4.2
-pkgrel=0
+pkgrel=1
pkgdesc="A NAT-aware multipath traceroute tool"
url="https://dublin-traceroute.net/"
arch="all"
diff --git a/testing/dxvk/APKBUILD b/testing/dxvk/APKBUILD
index d5e6bd4c84..50a062d813 100644
--- a/testing/dxvk/APKBUILD
+++ b/testing/dxvk/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Leo <thinkabit.ukim@gmail.com>
# Maintainer:
pkgname=dxvk
-pkgver=1.9.1
+pkgver=1.9.2
pkgrel=0
pkgdesc="Vulkan-based compatibility layer for Direct3D 10/11"
options="!check"
@@ -57,5 +57,5 @@ package() {
chmod +x "$pkgdir"/usr/share/dxvk/setup_dxvk.sh
}
sha512sums="
-012c1b2b854585696f438e13bfd2334498419650bb9f0fb9decff690562f79701a42fe93738e2567802fc201916a9b33885c44ca7494d5e12ac877e770ab1e36 dxvk-1.9.1.tar.gz
+0f63ffd65b02263140e5c976de2466baa6e2e440257771c0627b355083072724c8ecc0c6952aefc6786263ebbe30030e7bcdbedc9e775dec0f31d393e4fcf1de dxvk-1.9.2.tar.gz
"
diff --git a/testing/efm-langserver/APKBUILD b/testing/efm-langserver/APKBUILD
index a77fd26308..3a6311e230 100644
--- a/testing/efm-langserver/APKBUILD
+++ b/testing/efm-langserver/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Galen Abell <galen@galenabell.com>
# Maintainer: Galen Abell <galen@galenabell.com>
pkgname=efm-langserver
-pkgver=0.0.37
+pkgver=0.0.38
pkgrel=0
pkgdesc="General purpose language server"
url="https://github.com/mattn/efm-langserver"
@@ -26,5 +26,5 @@ package() {
}
sha512sums="
-957f1bc990a10a1b1de4e72c9b76ba018510ab8965c6b94ead5957f8e3139db6565d0377f52c5d160836b09527c71dfe5a50fec7cd18bb8616b6d9abed693bc7 efm-langserver-0.0.37.tar.gz
+272136533b418434553006369aee8e6962650f5e6fed1efe2d68c195707435793a8e80117468bf5e6b8661be7dd92c86042c03c60ca0a0599432f61808fd7cf3 efm-langserver-0.0.38.tar.gz
"
diff --git a/testing/eiwd/APKBUILD b/testing/eiwd/APKBUILD
index 0688bc3824..1dbab2b612 100644
--- a/testing/eiwd/APKBUILD
+++ b/testing/eiwd/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Milan P. Stanić <mps@arvanta.net>
pkgname=eiwd
_realpkgname=iwd
-pkgver=1.18
+pkgver=1.19
pkgrel=0
pkgdesc="Internet Wireless Daemon without dbus"
url="https://github.com/illiliti/eiwd"
@@ -53,7 +53,7 @@ package() {
}
sha512sums="
-93269dbabb8986e23b860c03c13b0f6ed4b5257cfc662b854d29d7b59154c2ef7e9d9601f32194950dc728692b9085143ebd968c7f8c6e5e038fc5474f35bb6e iwd-1.18.tar.xz
+e99e48777d7ef284a05cb661dad966c4951d949a45f26d2f99144e1da53b664b49e8e3d50212f6197c7af570c8142ed4d7f3d5140810a5ef85c421cfb9ae248c iwd-1.19.tar.xz
1a913fa19a76a18d92b8f44cb5b4b99a64b4e2f7d2b4a486bf1ba2f939aea7dcca772fca91483011ada58aaa3addc29c76ececd708b2187e57f72aa040ac77e6 eiwd.initd
c126da929709ec5a52df0c10d2e428b14b5ce137e3919692920a1e309ac9e12ecd8c75529066c72fee5b7ee2cf26ec2574d0447e122f52a81f3d3ae7077e87e6 main.conf
414cb08e01735a66dfb57eac7f308ce75f8f7adf679c5e38418293a0acb2398f9b4df4dd50a6756e48eb03b86de1546e2f852a28677842f2c453a0db86d49f71 eiwd.post-upgrade
diff --git a/testing/electrs/APKBUILD b/testing/electrs/APKBUILD
new file mode 100644
index 0000000000..d545451add
--- /dev/null
+++ b/testing/electrs/APKBUILD
@@ -0,0 +1,26 @@
+# Maintainer: Michał Adamski <michal@ert.pl>
+pkgname=electrs
+pkgver=0.9.3
+pkgrel=0
+pkgdesc="Efficient re-implementation of Electrum Server in Rust"
+url="https://github.com/romanz/electrs"
+license="MIT"
+arch="x86 x86_64 aarch64" # limited by rust/cargo and rocksdb
+makedepends="cargo rocksdb-dev<6.24 clang-libs"
+source="https://github.com/romanz/electrs/archive/v$pkgver/electrs-$pkgver.tar.gz"
+
+build() {
+ ROCKSDB_INCLUDE_DIR=/usr/include ROCKSDB_LIB_DIR=/usr/lib cargo build --all --features "metrics_process" --release --locked
+}
+
+check() {
+ cargo test --all --release --locked
+}
+
+package() {
+ install -Dm755 target/release/$pkgname -t "$pkgdir"/usr/bin
+}
+
+sha512sums="
+2c52e28274fabca9d95d607253de6d077bd9e695e4f36e0132e2b20e5e1bbc42f0e52205f2be7c8157d79246c84c59edc674b5884d3b30fce71051b792f52ee9 electrs-0.9.3.tar.gz
+"
diff --git a/testing/embree/APKBUILD b/testing/embree/APKBUILD
deleted file mode 100644
index c18eff2700..0000000000
--- a/testing/embree/APKBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# Contributor: Leon Marz <main@lmarz.org>
-# Maintainer: Leon Marz <main@lmarz.org>
-pkgname=embree
-pkgver=3.13.1
-pkgrel=0
-pkgdesc="High Performance Ray Tracing Kernels"
-url="https://www.embree.org/"
-arch="aarch64 x86_64" # embree needs sse2 and 64 bit
-license="Apache-2.0"
-makedepends="cmake libtbb-dev"
-subpackages="$pkgname-static $pkgname-dev $pkgname-doc"
-source="$pkgname-$pkgver.tar.gz::https://github.com/embree/embree/archive/v$pkgver.tar.gz"
-options="!check" # no tests provided
-
-build() {
- # build static library
- cmake -B build-static \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_INSTALL_LIBDIR=lib \
- -DCMAKE_BUILD_TYPE=None \
- -DEMBREE_ISPC_SUPPORT=OFF \
- -DEMBREE_TUTORIALS=OFF \
- -DEMBREE_RAY_MASK=ON \
- -DEMBREE_STATIC_LIB=ON
- cmake --build build-static -j4
-
- # build shared library
- cmake -B build-shared \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_INSTALL_LIBDIR=lib \
- -DBUILD_SHARED_LIBS=True \
- -DCMAKE_BUILD_TYPE=None \
- -DEMBREE_ISPC_SUPPORT=OFF \
- -DEMBREE_TUTORIALS=OFF \
- -DEMBREE_RAY_MASK=ON
- cmake --build build-shared -j4
-}
-
-package() {
- DESTDIR="$pkgdir" cmake --install build-static
- DESTDIR="$pkgdir" cmake --install build-shared
-}
-
-sha512sums="
-a7bd65238254733770ca01cc3b45dc957b8789ed535eb2ef06120c4228cbcca657c9b5bea4f3695cb722ede78d764297e5b5a5599c82403a66d42f500abac8d0 embree-3.13.1.tar.gz
-"
diff --git a/testing/enigma/APKBUILD b/testing/enigma/APKBUILD
new file mode 100644
index 0000000000..550a02c756
--- /dev/null
+++ b/testing/enigma/APKBUILD
@@ -0,0 +1,39 @@
+# Maintainer: Antoni Aloy <aaloytorrens@gmail.com>
+pkgname=enigma
+pkgver=1.30
+pkgrel=0
+pkgdesc="Puzzle game inspired by Oxyd on the Atari ST and Rock'n'Roll on the Amiga"
+url="http://www.nongnu.org/enigma/"
+arch="all"
+license="GPL-2.0-or-later"
+makedepends="
+ imagemagick enet-dev
+ sdl2-dev sdl2_image-dev
+ sdl2_ttf-dev sdl2_mixer-dev
+ gettext-tiny-dev xerces-c-dev
+ curl-dev libpng-dev
+ "
+subpackages="$pkgname-doc"
+source="https://github.com/Enigma-Game/Enigma/releases/download/$pkgver/Enigma-$pkgver-src.tar.gz"
+
+build() {
+ ./configure \
+ --build=$CBUILD \
+ --host=$CHOST \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --with-system-enet
+ make
+}
+
+check() {
+ make check
+}
+
+package() {
+ make DESTDIR="$pkgdir" install
+}
+
+sha512sums="
+57c6d642538b7bce6a748e1e1bce641dcc1dcd627a4e2c4dfe5d1271bf9df624075914c04fc6cddc1b1118585e4f111d79c8c8a54a1a6b93a8bedfb1aa9f2ef6 Enigma-1.30-src.tar.gz
+"
diff --git a/testing/envconsul/APKBUILD b/testing/envconsul/APKBUILD
index cec67d803b..5019751771 100644
--- a/testing/envconsul/APKBUILD
+++ b/testing/envconsul/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Gennady Feldman <gena01@gmail.com>
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=envconsul
-pkgver=0.12.0
+pkgver=0.12.1
pkgrel=0
pkgdesc="Read and set environmental variables for processes from Consul."
url="https://www.consul.io/"
@@ -26,5 +26,5 @@ package() {
}
sha512sums="
-8bf9eb5a04272d634276d3b1f1d29e15b768a074b10af6d31cdd436d071da05f8298935945f8df02204857d8e340df0e43b1cef5ccafe3165ac1fe697391521e envconsul-0.12.0.tar.gz
+01db5c9110a028b0e5ed4584a54da4436754179c1e8e9a3876016e46e94278091c8a477cd66d83bb9185030f2aa6b6d21191397b517bc52d8c1478f7d2c1b882 envconsul-0.12.1.tar.gz
"
diff --git a/testing/extremetuxracer/APKBUILD b/testing/extremetuxracer/APKBUILD
index d78d33f587..3847418b0f 100644
--- a/testing/extremetuxracer/APKBUILD
+++ b/testing/extremetuxracer/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Danct12 <danct12@disroot.org>
# Maintainer: Danct12 <danct12@disroot.org>
pkgname=extremetuxracer
-pkgver=0.8.0
+pkgver=0.8.1
pkgrel=0
pkgdesc="Downhill racing game starring Tux"
url="https://sourceforge.net/projects/extremetuxracer"
@@ -24,4 +24,7 @@ check() {
package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="ff1e4dab4d2e72960eb8dd9643f0150255fe4196c2b25e67dd0d266a89f0b247ce76f818927cda35bbd669972f31f79b1461ccb1b2c7aeeb8d70aa39ed7bfd6d etr-0.8.0.tar.xz"
+
+sha512sums="
+ebb3224d28acf1c7f0dff9d63169ad2b814a6dfb42b3451faeacaeec874a1e8a502e7936150fc5c98c83b8bd10480c8ba479e3455c5b3a4de89cf83c4b9af4f5 etr-0.8.1.tar.xz
+"
diff --git a/testing/faultstat/APKBUILD b/testing/faultstat/APKBUILD
index 50316343a2..ad2b20df5e 100644
--- a/testing/faultstat/APKBUILD
+++ b/testing/faultstat/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Milan P. Stanić <mps@arvanta.net>
# Maintainer: Milan P. Stanić <mps@arvanta.net>
pkgname=faultstat
-pkgver=0.01.06
+pkgver=0.01.07
pkgrel=0
pkgdesc="page fault monitoring tool"
url="https://github.com/ColinIanKing/faultstat"
@@ -22,4 +22,6 @@ package() {
install -Dm644 bash-completion/* -t "$pkgdir"/usr/share/bash-completion/completions
}
-sha512sums="7859d828316f757248ba250ad731a41dedc435cca9a46529b4f674864128ec78826278426b9d4633f9c8986f8733f9706163d425055daa852b664671b71718bf faultstat-0.01.06.tar.gz"
+sha512sums="
+981c0f7c1c3c2978dfffec3bd5dffcea45e2126baefbffb4b7ea4047cfe6492d9c7602d29c7c16ddf3bc43c04cf86b2ebf76395839443081e0840662264e9772 faultstat-0.01.07.tar.gz
+"
diff --git a/testing/fceux/APKBUILD b/testing/fceux/APKBUILD
index df538e93eb..e5852565cf 100644
--- a/testing/fceux/APKBUILD
+++ b/testing/fceux/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Danct12 <danct12@disroot.org>
# Maintainer: Danct12 <danct12@disroot.org>
pkgname=fceux
-pkgver=2.4.0
+pkgver=2.5.0
pkgrel=0
pkgdesc="Fast and ultra-compatible NES/Famicom emulator"
url="http://www.fceux.com"
@@ -29,5 +29,5 @@ package() {
}
sha512sums="
-3f53db1091e28c91bff90a2d6c77bd3c022a7c20a29b07e6cb88e9ae4795ce7f9e68d15ac0f90721472f8c262907a2564e0be7adc8df2eb3ef252215717f30a0 fceux-2.4.0.tar.gz
+bbff55b6f3efda8918b7dab21582d93f8c2a6396bf64a93e33f2f5f6cd345f95bcde7b958f0a663967e47e83110733c4a732dbf538afb7dbecb3147bc3090f01 fceux-2.5.0.tar.gz
"
diff --git a/testing/filebeat/APKBUILD b/testing/filebeat/APKBUILD
index 41531f1a72..a3775d27c9 100644
--- a/testing/filebeat/APKBUILD
+++ b/testing/filebeat/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Ramanathan Sivagurunathan <ramzthecoder@gmail.com>
pkgname=filebeat
pkgver=7.14.0
-pkgrel=2
+pkgrel=3
pkgdesc="Lightweight Shipper for Logs"
pkgusers="root"
url="https://www.elastic.co/products/beats"
diff --git a/testing/fileshelter/APKBUILD b/testing/fileshelter/APKBUILD
index 195fe841e9..d71ad99777 100644
--- a/testing/fileshelter/APKBUILD
+++ b/testing/fileshelter/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Kevin Thomas <me@kevinthomas.dev>
# Maintainer: Kevin Thomas <me@kevinthomas.dev>
pkgname=fileshelter
-pkgver=5.0.0
+pkgver=5.0.1
pkgrel=0
pkgdesc="One-click file sharing web application"
url="https://github.com/epoupon/fileshelter"
@@ -13,6 +13,7 @@ pkgusers="fileshelter"
pkggroups="fileshelter"
install="$pkgname.pre-install"
source="$pkgname-$pkgver.tar.gz::https://github.com/epoupon/fileshelter/archive/v$pkgver.tar.gz
+ std-optional.patch
fileshelter.initd
"
options="!check" # No testsuite
@@ -40,6 +41,7 @@ package() {
}
sha512sums="
-37e58b9f67e7e8720bfded954fb39c3b10a2b7183474ae0e5bda4abc93ee5832f0bc53c2f6e2369a2849049532cb350ef6041c6ef574021f9ae2f9692f40ba08 fileshelter-5.0.0.tar.gz
+11f63043058874c0126b57fcd19ece7489894989526191b329dedad52daa11269925d3593eb9a6bb21495c7d3ca0a5b1fd7e3843dc2c48e2bbcd252350dfc334 fileshelter-5.0.1.tar.gz
+a1ef635d1f7ee82abc4abf5d1d0253515308923e7443e86faa34be14af1056714c204da5d9a2a3162595ad9395e66f2452df87487dce0f1e97d460c794d9dbbc std-optional.patch
56051559c91d5c269f8e945445aab3e48de7f3593b7321e6556aee87c458091cfaf14a220a0a8bbb5aa8f682fe1ebd289cfb8dd21b0f3eeb881268f28d84c115 fileshelter.initd
"
diff --git a/testing/fileshelter/std-optional.patch b/testing/fileshelter/std-optional.patch
new file mode 100644
index 0000000000..83d5dfd06a
--- /dev/null
+++ b/testing/fileshelter/std-optional.patch
@@ -0,0 +1,11 @@
+Fixes 'std::optional' error
+--- fileshelter-5.0.1/src/fileshelter/ui/ShareDownload.hpp
++++ fileshelter-5.0.1/src/fileshelter/ui/ShareDownload.hpp
+@@ -20,6 +20,7 @@
+ #pragma once
+
+ #include <Wt/WContainerWidget.h>
++#include <optional>
+ #include "share/Types.hpp"
+
+ namespace UserInterface
diff --git a/testing/firecracker/10-dependencies-Included-vm-fdt-crate.patch b/testing/firecracker/10-dependencies-Included-vm-fdt-crate.patch
new file mode 100644
index 0000000000..20ab575e4a
--- /dev/null
+++ b/testing/firecracker/10-dependencies-Included-vm-fdt-crate.patch
@@ -0,0 +1,59 @@
+From df22cfffafa2d9526a18c6ebc709b4d764286681 Mon Sep 17 00:00:00 2001
+From: AlexandruCihodaru <cihodar@amazon.com>
+Date: Mon, 6 Sep 2021 11:13:47 +0300
+Subject: [PATCH] [dependencies]: Included vm-fdt crate
+
+Signed-off-by: AlexandruCihodaru <cihodar@amazon.com>
+---
+ Cargo.lock | 7 +++++++
+ src/arch/Cargo.toml | 2 +-
+ 2 files changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/Cargo.lock b/Cargo.lock
+index 29851740..d1262012 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -39,6 +39,7 @@ dependencies = [
+ "utils",
+ "versionize",
+ "versionize_derive",
++ "vm-fdt",
+ "vm-memory 0.1.0",
+ ]
+
+@@ -965,6 +966,12 @@ dependencies = [
+ name = "virtio_gen"
+ version = "0.1.0"
+
++[[package]]
++name = "vm-fdt"
++version = "0.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "bd986f4fdf949ab2181c7b4fedb03fb0e9de6b0aa788fff247b2608701ce3457"
++
+ [[package]]
+ name = "vm-memory"
+ version = "0.1.0"
+diff --git a/src/arch/Cargo.toml b/src/arch/Cargo.toml
+index be5b7b84..73e4dfcc 100644
+--- a/src/arch/Cargo.toml
++++ b/src/arch/Cargo.toml
+@@ -9,6 +9,7 @@ kvm-bindings = { version = ">=0.5.0", features = ["fam-wrappers"] }
+ kvm-ioctls = ">=0.9.0"
+ libc = ">=0.2.39"
+ vm-memory = { path = "../vm-memory" }
++vm-fdt = "0.1.0"
+ versionize = ">=0.1.6"
+ versionize_derive = ">=0.1.3"
+
+@@ -18,6 +19,5 @@ utils = { path = "../utils" }
+
+ [dev-dependencies]
+ device_tree = ">=1.1.0"
+-
+ [target.'cfg(target_arch="aarch64")'.dependencies]
+ libfdt-bindings = { path = "../libfdt-bindings" }
+\ No newline at end of file
+--
+2.31.1
+
diff --git a/testing/firecracker/20-vm-fdt-Replace-libfdt-with-vm-fdt.patch b/testing/firecracker/20-vm-fdt-Replace-libfdt-with-vm-fdt.patch
new file mode 100644
index 0000000000..8f83b142c8
--- /dev/null
+++ b/testing/firecracker/20-vm-fdt-Replace-libfdt-with-vm-fdt.patch
@@ -0,0 +1,822 @@
+From 61f4979803c7957d78a91f327bf2cfa03ba8cd13 Mon Sep 17 00:00:00 2001
+From: AlexandruCihodaru <cihodar@amazon.com>
+Date: Thu, 2 Sep 2021 23:46:45 +0300
+Subject: [PATCH] [vm-fdt]: Replace libfdt with vm-fdt
+
+Deleted helper functions that have equivalent in vm-fdt and used
+vm-fdt to create the FDT.
+
+Signed-off-by: AlexandruCihodaru <cihodar@amazon.com>
+Thanks: Andreea Florescu <fandree@amazon.com>
+---
+ src/arch/src/aarch64/fdt.rs | 530 +++++++++++-------------------------
+ src/arch/src/aarch64/mod.rs | 3 +-
+ src/vmm/src/builder.rs | 2 +-
+ 3 files changed, 166 insertions(+), 369 deletions(-)
+
+diff --git a/src/arch/src/aarch64/fdt.rs b/src/arch/src/aarch64/fdt.rs
+index b1db1873..f06c2dca 100644
+--- a/src/arch/src/aarch64/fdt.rs
++++ b/src/arch/src/aarch64/fdt.rs
+@@ -5,24 +5,19 @@
+ // Use of this source code is governed by a BSD-style license that can be
+ // found in the THIRD-PARTY file.
+
+-use libc::{c_int, c_void};
+ use std::collections::HashMap;
+-use std::ffi::{CStr, CString, NulError};
+ use std::fmt::Debug;
+-use std::ptr::null;
+-use std::{io, result};
+-
+-use libfdt_bindings::*;
++use std::result;
+
+ use super::super::DeviceType;
+ use super::super::InitrdConfig;
+ use super::cache_info::{read_cache_config, CacheEntry};
+ use super::get_fdt_addr;
+ use super::gic::GICDevice;
+-use super::layout::FDT_MAX_SIZE;
+-use crate::aarch64::fdt::Error::CstringFDTTransform;
+ use vm_memory::{Address, Bytes, GuestAddress, GuestMemory, GuestMemoryError, GuestMemoryMmap};
+
++use vm_fdt::{Error as VmFdtError, FdtWriter, FdtWriterNode};
++
+ // This is a value for uniquely identifying the FDT node declaring the interrupt controller.
+ const GIC_PHANDLE: u32 = 1;
+ // This is a value for uniquely identifying the FDT node containing the clock definition.
+@@ -60,251 +55,74 @@ pub trait DeviceInfoForFDT {
+ /// Errors thrown while configuring the Flattened Device Tree for aarch64.
+ #[derive(Debug)]
+ pub enum Error {
+- /// Failed to append node to the FDT.
+- AppendFDTNode(io::Error),
+- /// Failed to append a property to the FDT.
+- AppendFDTProperty(io::Error),
+- /// Syscall for creating FDT failed.
+- CreateFDT(io::Error),
+- /// Failed to obtain a C style string.
+- CstringFDTTransform(NulError),
+- /// Failure in calling syscall for terminating this FDT.
+- FinishFDTReserveMap(io::Error),
+- /// Failure in populating the cache information for the vcpus.
++ CreateFdt(VmFdtError),
+ ReadCacheInfo(String),
+ /// Failure in writing FDT in memory.
+- WriteFDTToMemory(GuestMemoryError),
++ WriteFdtToMemory(GuestMemoryError),
++}
++
++impl From<VmFdtError> for Error {
++ fn from(e: VmFdtError) -> Self {
++ Error::CreateFdt(e)
++ }
+ }
++
+ type Result<T> = result::Result<T, Error>;
+
+ /// Creates the flattened device tree for this aarch64 microVM.
+ pub fn create_fdt<T: DeviceInfoForFDT + Clone + Debug, S: std::hash::BuildHasher>(
+ guest_mem: &GuestMemoryMmap,
+ vcpu_mpidr: Vec<u64>,
+- cmdline: &CStr,
++ cmdline: &str,
+ device_info: &HashMap<(DeviceType, String), T, S>,
+ gic_device: &dyn GICDevice,
+ initrd: &Option<InitrdConfig>,
+ ) -> Result<Vec<u8>> {
+ // Allocate stuff necessary for storing the blob.
+- let mut fdt = vec![0; FDT_MAX_SIZE];
+-
+- allocate_fdt(&mut fdt)?;
++ let mut fdt_writer = FdtWriter::new()?;
+
+ // For an explanation why these nodes were introduced in the blob take a look at
+ // https://github.com/torvalds/linux/blob/master/Documentation/devicetree/booting-without-of.txt#L845
+ // Look for "Required nodes and properties".
+
+ // Header or the root node as per above mentioned documentation.
+- append_begin_node(&mut fdt, "")?;
+- append_property_string(&mut fdt, "compatible", "linux,dummy-virt")?;
++ let root = fdt_writer.begin_node("")?;
++ fdt_writer.property_string("compatible", "linux,dummy-virt")?;
+ // For info on #address-cells and size-cells read "Note about cells and address representation"
+ // from the above mentioned txt file.
+- append_property_u32(&mut fdt, "#address-cells", ADDRESS_CELLS)?;
+- append_property_u32(&mut fdt, "#size-cells", SIZE_CELLS)?;
++ fdt_writer.property_u32("#address-cells", ADDRESS_CELLS)?;
++ fdt_writer.property_u32("#size-cells", SIZE_CELLS)?;
+ // This is not mandatory but we use it to point the root node to the node
+ // containing description of the interrupt controller for this VM.
+- append_property_u32(&mut fdt, "interrupt-parent", GIC_PHANDLE)?;
+- create_cpu_nodes(&mut fdt, &vcpu_mpidr)?;
+- create_memory_node(&mut fdt, guest_mem)?;
+- create_chosen_node(&mut fdt, cmdline, initrd)?;
+- create_gic_node(&mut fdt, gic_device)?;
+- create_timer_node(&mut fdt)?;
+- create_clock_node(&mut fdt)?;
+- create_psci_node(&mut fdt)?;
+- create_devices_node(&mut fdt, &device_info)?;
++ fdt_writer.property_u32("interrupt-parent", GIC_PHANDLE)?;
++ create_cpu_nodes(&mut fdt_writer, &vcpu_mpidr)?;
++ create_memory_node(&mut fdt_writer, guest_mem)?;
++ create_chosen_node(&mut fdt_writer, cmdline, initrd)?;
++ create_gic_node(&mut fdt_writer, gic_device)?;
++ create_timer_node(&mut fdt_writer)?;
++ create_clock_node(&mut fdt_writer)?;
++ create_psci_node(&mut fdt_writer)?;
++ create_devices_node(&mut fdt_writer, &device_info)?;
+
+ // End Header node.
+- append_end_node(&mut fdt)?;
++ fdt_writer.end_node(root)?;
+
+ // Allocate another buffer so we can format and then write fdt to guest.
+- let mut fdt_final = vec![0; FDT_MAX_SIZE];
+- finish_fdt(&mut fdt, &mut fdt_final)?;
++ let fdt_final = fdt_writer.finish()?;
+
+ // Write FDT to memory.
+ let fdt_address = GuestAddress(get_fdt_addr(&guest_mem));
+ guest_mem
+ .write_slice(fdt_final.as_slice(), fdt_address)
+- .map_err(Error::WriteFDTToMemory)?;
++ .map_err(Error::WriteFdtToMemory)?;
+ Ok(fdt_final)
+ }
+
+-// Following are auxiliary functions for allocating and finishing the FDT.
+-fn allocate_fdt(fdt: &mut Vec<u8>) -> Result<()> {
+- // Safe since we allocated this array with FDT_MAX_SIZE.
+- let mut fdt_ret = unsafe { fdt_create(fdt.as_mut_ptr() as *mut c_void, FDT_MAX_SIZE as c_int) };
+-
+- if fdt_ret != 0 {
+- return Err(Error::CreateFDT(io::Error::last_os_error()));
+- }
+-
+- // The flattened device trees created with fdt_create() contains a list of
+- // reserved memory areas. We need to call `fdt_finish_reservemap` so as to make sure that there is a
+- // terminator in the reservemap list and whatever happened to be at the
+- // start of the FDT data section would end up being interpreted as
+- // reservemap entries.
+- // Safe since we previously allocated this array.
+- fdt_ret = unsafe { fdt_finish_reservemap(fdt.as_mut_ptr() as *mut c_void) };
+- if fdt_ret != 0 {
+- return Err(Error::FinishFDTReserveMap(io::Error::last_os_error()));
+- }
+- Ok(())
+-}
+-
+-fn finish_fdt(from_fdt: &mut Vec<u8>, to_fdt: &mut Vec<u8>) -> Result<()> {
+- // Safe since we allocated `fdt_final` and previously passed in its size.
+- let mut fdt_ret = unsafe { fdt_finish(from_fdt.as_mut_ptr() as *mut c_void) };
+- if fdt_ret != 0 {
+- return Err(Error::FinishFDTReserveMap(io::Error::last_os_error()));
+- }
+-
+- // Safe because we allocated both arrays with the correct size.
+- fdt_ret = unsafe {
+- fdt_open_into(
+- from_fdt.as_mut_ptr() as *mut c_void,
+- to_fdt.as_mut_ptr() as *mut c_void,
+- FDT_MAX_SIZE as i32,
+- )
+- };
+- if fdt_ret != 0 {
+- return Err(Error::FinishFDTReserveMap(io::Error::last_os_error()));
+- }
+-
+- // Safe since we allocated `to_fdt`.
+- fdt_ret = unsafe { fdt_pack(to_fdt.as_mut_ptr() as *mut c_void) };
+- if fdt_ret != 0 {
+- return Err(Error::FinishFDTReserveMap(io::Error::last_os_error()));
+- }
+- Ok(())
+-}
+-
+-// Following are auxiliary functions for appending nodes to FDT.
+-fn append_begin_node(fdt: &mut Vec<u8>, name: &str) -> Result<()> {
+- let cstr_name = CString::new(name).map_err(CstringFDTTransform)?;
+-
+- // Safe because we allocated fdt and converted name to a CString
+- let fdt_ret = unsafe { fdt_begin_node(fdt.as_mut_ptr() as *mut c_void, cstr_name.as_ptr()) };
+- if fdt_ret != 0 {
+- return Err(Error::AppendFDTNode(io::Error::last_os_error()));
+- }
+- Ok(())
+-}
+-
+-fn append_end_node(fdt: &mut Vec<u8>) -> Result<()> {
+- // Safe because we allocated fdt.
+- let fdt_ret = unsafe { fdt_end_node(fdt.as_mut_ptr() as *mut c_void) };
+- if fdt_ret != 0 {
+- return Err(Error::AppendFDTNode(io::Error::last_os_error()));
+- }
+- Ok(())
+-}
+-
+-// Following are auxiliary functions for appending property nodes to the nodes of the FDT.
+-fn append_property_u32(fdt: &mut Vec<u8>, name: &str, val: u32) -> Result<()> {
+- append_property(fdt, name, &to_be32(val))
+-}
+-
+-fn append_property_u64(fdt: &mut Vec<u8>, name: &str, val: u64) -> Result<()> {
+- append_property(fdt, name, &to_be64(val))
+-}
+-
+-fn append_property_string(fdt: &mut Vec<u8>, name: &str, value: &str) -> Result<()> {
+- let cstr_value = CString::new(value).map_err(CstringFDTTransform)?;
+- append_property_cstring(fdt, name, &cstr_value)
+-}
+-
+-fn append_property_cstring(fdt: &mut Vec<u8>, name: &str, cstr_value: &CStr) -> Result<()> {
+- let value_bytes = cstr_value.to_bytes_with_nul();
+- let cstr_name = CString::new(name).map_err(CstringFDTTransform)?;
+- // Safe because we allocated fdt, converted name and value to CStrings
+- let fdt_ret = unsafe {
+- fdt_property(
+- fdt.as_mut_ptr() as *mut c_void,
+- cstr_name.as_ptr(),
+- value_bytes.as_ptr() as *mut c_void,
+- value_bytes.len() as i32,
+- )
+- };
+- if fdt_ret != 0 {
+- return Err(Error::AppendFDTProperty(io::Error::last_os_error()));
+- }
+- Ok(())
+-}
+-
+-fn append_property_null(fdt: &mut Vec<u8>, name: &str) -> Result<()> {
+- let cstr_name = CString::new(name).map_err(CstringFDTTransform)?;
+-
+- // Safe because we allocated fdt, converted name to a CString
+- let fdt_ret = unsafe {
+- fdt_property(
+- fdt.as_mut_ptr() as *mut c_void,
+- cstr_name.as_ptr(),
+- null(),
+- 0,
+- )
+- };
+- if fdt_ret != 0 {
+- return Err(Error::AppendFDTProperty(io::Error::last_os_error()));
+- }
+- Ok(())
+-}
+-
+-fn append_property(fdt: &mut Vec<u8>, name: &str, val: &[u8]) -> Result<()> {
+- let cstr_name = CString::new(name).map_err(CstringFDTTransform)?;
+- let val_ptr = val.as_ptr() as *const c_void;
+-
+- // Safe because we allocated fdt and converted name to a CString
+- let fdt_ret = unsafe {
+- fdt_property(
+- fdt.as_mut_ptr() as *mut c_void,
+- cstr_name.as_ptr(),
+- val_ptr,
+- val.len() as i32,
+- )
+- };
+- if fdt_ret != 0 {
+- return Err(Error::AppendFDTProperty(io::Error::last_os_error()));
+- }
+- Ok(())
+-}
+-
+-fn append_cache_property_u32(fdt: &mut Vec<u8>, name: &str, val: Option<u32>) -> Result<()> {
+- if let Some(cache_attr) = val {
+- append_property_u32(fdt, name, cache_attr)?;
+- }
+- Ok(())
+-}
+-
+-// Auxiliary functions for writing u32/u64 numbers in big endian order.
+-fn to_be32(input: u32) -> [u8; 4] {
+- u32::to_be_bytes(input)
+-}
+-
+-fn to_be64(input: u64) -> [u8; 8] {
+- u64::to_be_bytes(input)
+-}
+-
+-// Helper functions for generating a properly formatted byte vector using 32-bit/64-bit cells.
+-fn generate_prop32(cells: &[u32]) -> Vec<u8> {
+- let mut ret: Vec<u8> = Vec::new();
+- for &e in cells {
+- ret.extend(to_be32(e).iter());
+- }
+- ret
+-}
+-
+-fn generate_prop64(cells: &[u64]) -> Vec<u8> {
+- let mut ret: Vec<u8> = Vec::new();
+- for &e in cells {
+- ret.extend(to_be64(e).iter());
+- }
+- ret
+-}
+-
+ // Following are the auxiliary function for creating the different nodes that we append to our FDT.
+-fn create_cpu_nodes(fdt: &mut Vec<u8>, vcpu_mpidr: &[u64]) -> Result<()> {
++fn create_cpu_nodes(fdt: &mut FdtWriter, vcpu_mpidr: &[u64]) -> Result<()> {
+ // Since the L1 caches are not shareable among CPUs and they are direct attributes of the
+ // cpu in the device tree, we process the L1 and non-L1 caches separately.
++ // We use sysfs for extracting the cache information.
+ let mut l1_caches: Vec<CacheEntry> = Vec::new();
+ let mut non_l1_caches: Vec<CacheEntry> = Vec::new();
+ // We use sysfs for extracting the cache information.
+@@ -312,49 +130,42 @@ fn create_cpu_nodes(fdt: &mut Vec<u8>, vcpu_mpidr: &[u64]) -> Result<()> {
+ .map_err(|e| Error::ReadCacheInfo(e.to_string()))?;
+
+ // See https://github.com/torvalds/linux/blob/master/Documentation/devicetree/bindings/arm/cpus.yaml.
+- append_begin_node(fdt, "cpus")?;
++ let cpus = fdt.begin_node("cpus")?;
+ // As per documentation, on ARM v8 64-bit systems value should be set to 2.
+- append_property_u32(fdt, "#address-cells", 0x02)?;
+- append_property_u32(fdt, "#size-cells", 0x0)?;
++ fdt.property_u32("#address-cells", 0x02)?;
++ fdt.property_u32("#size-cells", 0x0)?;
+ let num_cpus = vcpu_mpidr.len();
+ for (cpu_index, mpidr) in vcpu_mpidr.iter().enumerate() {
+- let cpu_name = format!("cpu@{:x}", cpu_index);
+- append_begin_node(fdt, &cpu_name)?;
+- append_property_string(fdt, "device_type", "cpu")?;
+- append_property_string(fdt, "compatible", "arm,arm-v8")?;
++ let cpu = fdt.begin_node(&format!("cpu@{:x}", cpu_index))?;
++ fdt.property_string("device_type", "cpu")?;
++ fdt.property_string("compatible", "arm,arm-v8")?;
+ // The power state coordination interface (PSCI) needs to be enabled for
+ // all vcpus.
+- append_property_string(fdt, "enable-method", "psci")?;
++ fdt.property_string("enable-method", "psci")?;
+ // Set the field to first 24 bits of the MPIDR - Multiprocessor Affinity Register.
+ // See http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.ddi0488c/BABHBJCI.html.
+- append_property_u64(fdt, "reg", mpidr & 0x7F_FFFF)?;
++ fdt.property_u64("reg", mpidr & 0x7FFFFF)?;
+
+ for cache in l1_caches.iter() {
+ // Please check out
+ // https://github.com/devicetree-org/devicetree-specification/releases/download/v0.3/devicetree-specification-v0.3.pdf,
+ // section 3.8.
+- append_cache_property_u32(
+- fdt,
+- cache.type_.of_cache_size(),
+- cache.size_.map(|s| s as u32),
+- )?;
+- append_cache_property_u32(
+- fdt,
+- cache.type_.of_cache_line_size(),
+- cache.line_size.map(|l| l as u32),
+- )?;
+- append_cache_property_u32(
+- fdt,
+- cache.type_.of_cache_sets(),
+- cache.number_of_sets.map(|s| s as u32),
+- )?;
++ if let Some(size) = cache.size_ {
++ fdt.property_u32(cache.type_.of_cache_size(), size as u32)?;
++ }
++ if let Some(line_size) = cache.line_size {
++ fdt.property_u32(cache.type_.of_cache_line_size(), line_size as u32)?;
++ }
++ if let Some(number_of_sets) = cache.number_of_sets {
++ fdt.property_u32(cache.type_.of_cache_sets(), number_of_sets as u32)?;
++ }
+ }
+
+ // Some of the non-l1 caches can be shared amongst CPUs. You can see an example of a shared scenario
+ // in https://github.com/devicetree-org/devicetree-specification/releases/download/v0.3/devicetree-specification-v0.3.pdf,
+ // 3.8.1 Example.
+ let mut prev_level = 1;
+- let mut node = false;
++ let mut cache_node: Option<FdtWriterNode> = None;
+ for cache in non_l1_caches.iter() {
+ // We append the next-level-cache node (the node that specifies the cache hierarchy)
+ // in the next iteration. For example,
+@@ -371,141 +182,127 @@ fn create_cpu_nodes(fdt: &mut Vec<u8>, vcpu_mpidr: &[u64]) -> Result<()> {
+ as u32;
+
+ if prev_level != cache.level {
+- append_property_u32(fdt, "next-level-cache", cache_phandle)?;
+- if prev_level > 1 {
+- append_end_node(fdt)?;
+- node = false;
++ fdt.property_u32("next-level-cache", cache_phandle)?;
++ if prev_level > 1 && cache_node.is_some() {
++ fdt.end_node(cache_node.take().unwrap())?;
+ }
+ }
+
+ if cpu_index % cache.cpus_per_unit as usize == 0 {
+- node = true;
+- append_begin_node(
+- fdt,
+- &format!(
+- "l{}-{}-cache",
+- cache.level,
+- cpu_index / cache.cpus_per_unit as usize
+- ),
+- )?;
+- append_property_u32(fdt, "phandle", cache_phandle)?;
+- append_property_string(fdt, "compatible", "cache")?;
+- append_property_u32(fdt, "cache-level", cache.level as u32)?;
+- append_cache_property_u32(
+- fdt,
+- cache.type_.of_cache_size(),
+- cache.size_.map(|s| s as u32),
+- )?;
+-
+- append_cache_property_u32(
+- fdt,
+- cache.type_.of_cache_line_size(),
+- cache.line_size.map(|l| l as u32),
+- )?;
+- append_cache_property_u32(
+- fdt,
+- cache.type_.of_cache_sets(),
+- cache.number_of_sets.map(|s| s as u32),
+- )?;
++ cache_node = Some(fdt.begin_node(&format!(
++ "l{}-{}-cache",
++ cache.level,
++ cpu_index / cache.cpus_per_unit as usize
++ ))?);
++ fdt.property_u32("phandle", cache_phandle)?;
++ fdt.property_string("compatible", "cache")?;
++ fdt.property_u32("cache-level", cache.level as u32)?;
++ if let Some(size) = cache.size_ {
++ fdt.property_u32(cache.type_.of_cache_size(), size as u32)?;
++ }
++ if let Some(line_size) = cache.line_size {
++ fdt.property_u32(cache.type_.of_cache_line_size(), line_size as u32)?;
++ }
++ if let Some(number_of_sets) = cache.number_of_sets {
++ fdt.property_u32(cache.type_.of_cache_sets(), number_of_sets as u32)?;
++ }
+ if let Some(cache_type) = cache.type_.of_cache_type() {
+- append_property_null(fdt, cache_type)?;
++ fdt.property_null(cache_type)?;
+ }
+ prev_level = cache.level;
+ }
+ }
+- if node {
+- append_end_node(fdt)?;
++ if let Some(node) = cache_node {
++ fdt.end_node(node)?;
+ }
+- append_end_node(fdt)?;
++
++ fdt.end_node(cpu)?;
+ }
+- append_end_node(fdt)?;
++ fdt.end_node(cpus)?;
++
+ Ok(())
+ }
+
+-fn create_memory_node(fdt: &mut Vec<u8>, guest_mem: &GuestMemoryMmap) -> Result<()> {
++fn create_memory_node(fdt: &mut FdtWriter, guest_mem: &GuestMemoryMmap) -> Result<()> {
+ let mem_size = guest_mem.last_addr().raw_value() - super::layout::DRAM_MEM_START + 1;
+ // See https://github.com/torvalds/linux/blob/master/Documentation/devicetree/booting-without-of.txt#L960
+ // for an explanation of this.
+- let mem_reg_prop = generate_prop64(&[super::layout::DRAM_MEM_START as u64, mem_size as u64]);
++ let mem_reg_prop = &[super::layout::DRAM_MEM_START as u64, mem_size as u64];
++
++ let mem = fdt.begin_node("memory")?;
++ fdt.property_string("device_type", "memory")?;
++ fdt.property_array_u64("reg", mem_reg_prop)?;
++ fdt.end_node(mem)?;
+
+- append_begin_node(fdt, "memory")?;
+- append_property_string(fdt, "device_type", "memory")?;
+- append_property(fdt, "reg", &mem_reg_prop)?;
+- append_end_node(fdt)?;
+ Ok(())
+ }
+
+ fn create_chosen_node(
+- fdt: &mut Vec<u8>,
+- cmdline: &CStr,
++ fdt: &mut FdtWriter,
++ cmdline: &str,
+ initrd: &Option<InitrdConfig>,
+ ) -> Result<()> {
+- append_begin_node(fdt, "chosen")?;
+- append_property_cstring(fdt, "bootargs", cmdline)?;
++ let chosen = fdt.begin_node("chosen")?;
++ fdt.property_string("bootargs", cmdline)?;
+
+ if let Some(initrd_config) = initrd {
+- append_property_u64(
+- fdt,
++ fdt.property_u64(
+ "linux,initrd-start",
+ initrd_config.address.raw_value() as u64,
+ )?;
+- append_property_u64(
+- fdt,
++ fdt.property_u64(
+ "linux,initrd-end",
+ initrd_config.address.raw_value() + initrd_config.size as u64,
+ )?;
+ }
+
+- append_end_node(fdt)?;
++ fdt.end_node(chosen)?;
+
+ Ok(())
+ }
+
+-fn create_gic_node(fdt: &mut Vec<u8>, gic_device: &dyn GICDevice) -> Result<()> {
+- let gic_reg_prop = generate_prop64(gic_device.device_properties());
+-
+- append_begin_node(fdt, "intc")?;
+- append_property_string(fdt, "compatible", gic_device.fdt_compatibility())?;
+- append_property_null(fdt, "interrupt-controller")?;
++fn create_gic_node(fdt: &mut FdtWriter, gic_device: &dyn GICDevice) -> Result<()> {
++ let interrupt = fdt.begin_node("intc")?;
++ fdt.property_string("compatible", gic_device.fdt_compatibility())?;
++ fdt.property_null("interrupt-controller")?;
+ // "interrupt-cells" field specifies the number of cells needed to encode an
+ // interrupt source. The type shall be a <u32> and the value shall be 3 if no PPI affinity description
+ // is required.
+- append_property_u32(fdt, "#interrupt-cells", 3)?;
+- append_property(fdt, "reg", &gic_reg_prop)?;
+- append_property_u32(fdt, "phandle", GIC_PHANDLE)?;
+- append_property_u32(fdt, "#address-cells", 2)?;
+- append_property_u32(fdt, "#size-cells", 2)?;
+- append_property_null(fdt, "ranges")?;
++ fdt.property_u32("#interrupt-cells", 3)?;
++ fdt.property_array_u64("reg", &gic_device.device_properties())?;
++ fdt.property_u32("phandle", GIC_PHANDLE)?;
++ fdt.property_u32("#address-cells", 2)?;
++ fdt.property_u32("#size-cells", 2)?;
++ fdt.property_null("ranges")?;
++
+ let gic_intr = [
+ GIC_FDT_IRQ_TYPE_PPI,
+ gic_device.fdt_maint_irq(),
+ IRQ_TYPE_LEVEL_HI,
+ ];
+- let gic_intr_prop = generate_prop32(&gic_intr);
+
+- append_property(fdt, "interrupts", &gic_intr_prop)?;
+- append_end_node(fdt)?;
++ fdt.property_array_u32("interrupts", &gic_intr)?;
++ fdt.end_node(interrupt)?;
+
+ Ok(())
+ }
+
+-fn create_clock_node(fdt: &mut Vec<u8>) -> Result<()> {
++fn create_clock_node(fdt: &mut FdtWriter) -> Result<()> {
+ // The Advanced Peripheral Bus (APB) is part of the Advanced Microcontroller Bus Architecture
+ // (AMBA) protocol family. It defines a low-cost interface that is optimized for minimal power
+ // consumption and reduced interface complexity.
+ // PCLK is the clock source and this node defines exactly the clock for the APB.
+- append_begin_node(fdt, "apb-pclk")?;
+- append_property_string(fdt, "compatible", "fixed-clock")?;
+- append_property_u32(fdt, "#clock-cells", 0x0)?;
+- append_property_u32(fdt, "clock-frequency", 24_000_000)?;
+- append_property_string(fdt, "clock-output-names", "clk24mhz")?;
+- append_property_u32(fdt, "phandle", CLOCK_PHANDLE)?;
+- append_end_node(fdt)?;
+-
++ let clock = fdt.begin_node("apb-pclk")?;
++ fdt.property_string("compatible", "fixed-clock")?;
++ fdt.property_u32("#clock-cells", 0x0)?;
++ fdt.property_u32("clock-frequency", 24_000_000)?;
++ fdt.property_string("clock-output-names", "clk24mhz")?;
++ fdt.property_u32("phandle", CLOCK_PHANDLE)?;
++ fdt.end_node(clock)?;
+ Ok(())
+ }
+
+-fn create_timer_node(fdt: &mut Vec<u8>) -> Result<()> {
++fn create_timer_node(fdt: &mut FdtWriter) -> Result<()> {
+ // See
+ // https://github.com/torvalds/linux/blob/master/Documentation/devicetree/bindings/interrupt-controller/arch_timer.txt
+ // These are fixed interrupt numbers for the timer device.
+@@ -518,85 +315,88 @@ fn create_timer_node(fdt: &mut Vec<u8>) -> Result<()> {
+ timer_reg_cells.push(irq);
+ timer_reg_cells.push(IRQ_TYPE_LEVEL_HI);
+ }
+- let timer_reg_prop = generate_prop32(timer_reg_cells.as_slice());
+-
+- append_begin_node(fdt, "timer")?;
+- append_property_string(fdt, "compatible", compatible)?;
+- append_property_null(fdt, "always-on")?;
+- append_property(fdt, "interrupts", &timer_reg_prop)?;
+- append_end_node(fdt)?;
+
++ let timer = fdt.begin_node("timer")?;
++ fdt.property_string("compatible", compatible)?;
++ fdt.property_null("always-on")?;
++ fdt.property_array_u32("interrupts", &timer_reg_cells)?;
++ fdt.end_node(timer)?;
+ Ok(())
+ }
+
+-fn create_psci_node(fdt: &mut Vec<u8>) -> Result<()> {
++fn create_psci_node(fdt: &mut FdtWriter) -> Result<()> {
+ let compatible = "arm,psci-0.2";
+- append_begin_node(fdt, "psci")?;
+- append_property_string(fdt, "compatible", compatible)?;
++
++ let psci = fdt.begin_node("psci")?;
++ fdt.property_string("compatible", compatible)?;
+ // Two methods available: hvc and smc.
+ // As per documentation, PSCI calls between a guest and hypervisor may use the HVC conduit instead of SMC.
+ // So, since we are using kvm, we need to use hvc.
+- append_property_string(fdt, "method", "hvc")?;
+- append_end_node(fdt)?;
++ fdt.property_string("method", "hvc")?;
++ fdt.end_node(psci)?;
+
+ Ok(())
+ }
+
+ fn create_virtio_node<T: DeviceInfoForFDT + Clone + Debug>(
+- fdt: &mut Vec<u8>,
++ fdt: &mut FdtWriter,
+ dev_info: &T,
+ ) -> Result<()> {
+- let device_reg_prop = generate_prop64(&[dev_info.addr(), dev_info.length()]);
+- let irq = generate_prop32(&[GIC_FDT_IRQ_TYPE_SPI, dev_info.irq(), IRQ_TYPE_EDGE_RISING]);
++ let virtio_mmio = fdt.begin_node(&format!("virtio_mmio@{:x}", dev_info.addr()))?;
+
+- append_begin_node(fdt, &format!("virtio_mmio@{:x}", dev_info.addr()))?;
+- append_property_string(fdt, "compatible", "virtio,mmio")?;
+- append_property(fdt, "reg", &device_reg_prop)?;
+- append_property(fdt, "interrupts", &irq)?;
+- append_property_u32(fdt, "interrupt-parent", GIC_PHANDLE)?;
+- append_end_node(fdt)?;
++ fdt.property_string("compatible", "virtio,mmio")?;
++ fdt.property_array_u64("reg", &[dev_info.addr(), dev_info.length()])?;
++ fdt.property_array_u32(
++ "interrupts",
++ &[GIC_FDT_IRQ_TYPE_SPI, dev_info.irq(), IRQ_TYPE_EDGE_RISING],
++ )?;
++ fdt.property_u32("interrupt-parent", GIC_PHANDLE)?;
++ fdt.end_node(virtio_mmio)?;
+
+ Ok(())
+ }
+
+ fn create_serial_node<T: DeviceInfoForFDT + Clone + Debug>(
+- fdt: &mut Vec<u8>,
++ fdt: &mut FdtWriter,
+ dev_info: &T,
+ ) -> Result<()> {
+- let serial_reg_prop = generate_prop64(&[dev_info.addr(), dev_info.length()]);
+- let irq = generate_prop32(&[GIC_FDT_IRQ_TYPE_SPI, dev_info.irq(), IRQ_TYPE_EDGE_RISING]);
+-
+- append_begin_node(fdt, &format!("uart@{:x}", dev_info.addr()))?;
+- append_property_string(fdt, "compatible", "ns16550a")?;
+- append_property(fdt, "reg", &serial_reg_prop)?;
+- append_property_u32(fdt, "clocks", CLOCK_PHANDLE)?;
+- append_property_string(fdt, "clock-names", "apb_pclk")?;
+- append_property(fdt, "interrupts", &irq)?;
+- append_end_node(fdt)?;
++ let serial = fdt.begin_node(&format!("uart@{:x}", dev_info.addr()))?;
++
++ fdt.property_string("compatible", "ns16550a")?;
++ fdt.property_array_u64("reg", &[dev_info.addr(), dev_info.length()])?;
++ fdt.property_u32("clocks", CLOCK_PHANDLE)?;
++ fdt.property_string("clock-names", "apb_pclk")?;
++ fdt.property_array_u32(
++ "interrupts",
++ &[GIC_FDT_IRQ_TYPE_SPI, dev_info.irq(), IRQ_TYPE_EDGE_RISING],
++ )?;
++ fdt.end_node(serial)?;
+
+ Ok(())
+ }
+
+ fn create_rtc_node<T: DeviceInfoForFDT + Clone + Debug>(
+- fdt: &mut Vec<u8>,
++ fdt: &mut FdtWriter,
+ dev_info: &T,
+ ) -> Result<()> {
+ let compatible = b"arm,pl031\0arm,primecell\0";
+- let rtc_reg_prop = generate_prop64(&[dev_info.addr(), dev_info.length()]);
+- let irq = generate_prop32(&[GIC_FDT_IRQ_TYPE_SPI, dev_info.irq(), IRQ_TYPE_LEVEL_HI]);
+- append_begin_node(fdt, &format!("rtc@{:x}", dev_info.addr()))?;
+- append_property(fdt, "compatible", compatible)?;
+- append_property(fdt, "reg", &rtc_reg_prop)?;
+- append_property(fdt, "interrupts", &irq)?;
+- append_property_u32(fdt, "clocks", CLOCK_PHANDLE)?;
+- append_property_string(fdt, "clock-names", "apb_pclk")?;
+- append_end_node(fdt)?;
++
++ let rtc = fdt.begin_node(&format!("rtc@{:x}", dev_info.addr()))?;
++ fdt.property("compatible", compatible)?;
++ fdt.property_array_u64("reg", &[dev_info.addr(), dev_info.length()])?;
++ fdt.property_array_u32(
++ "interrupts",
++ &[GIC_FDT_IRQ_TYPE_SPI, dev_info.irq(), IRQ_TYPE_LEVEL_HI],
++ )?;
++ fdt.property_u32("clocks", CLOCK_PHANDLE)?;
++ fdt.property_string("clock-names", "apb_pclk")?;
++ fdt.end_node(rtc)?;
+
+ Ok(())
+ }
+
+ fn create_devices_node<T: DeviceInfoForFDT + Clone + Debug, S: std::hash::BuildHasher>(
+- fdt: &mut Vec<u8>,
++ fdt: &mut FdtWriter,
+ dev_info: &HashMap<(DeviceType, String), T, S>,
+ ) -> Result<()> {
+ // Create one temp Vec to store all virtio devices
+@@ -688,7 +488,7 @@ mod tests {
+ assert!(create_fdt(
+ &mem,
+ vec![0],
+- &CString::new("console=tty0").unwrap(),
++ "console=tty0",
+ &dev_info,
+ gic.as_ref(),
+ &None,
+@@ -710,10 +510,10 @@ mod tests {
+ _ => panic!("Unexpected gic version!"),
+ };
+
+- let mut current_dtb_bytes = create_fdt(
++ let current_dtb_bytes = create_fdt(
+ &mem,
+ vec![0],
+- &CString::new("console=tty0").unwrap(),
++ "console=tty0",
+ &HashMap::<(DeviceType, std::string::String), MMIODeviceInfo>::new(),
+ gic.as_ref(),
+ &None,
+@@ -746,7 +546,6 @@ mod tests {
+ buf.extend_from_slice(saved_dtb_bytes);
+
+ set_size(&mut buf, pos, val);
+- set_size(&mut current_dtb_bytes, pos, val);
+ let original_fdt = device_tree::DeviceTree::load(&buf).unwrap();
+ let generated_fdt = device_tree::DeviceTree::load(&current_dtb_bytes).unwrap();
+ assert_eq!(
+@@ -774,10 +573,10 @@ mod tests {
+ size: 0x1000,
+ };
+
+- let mut current_dtb_bytes = create_fdt(
++ let current_dtb_bytes = create_fdt(
+ &mem,
+ vec![0],
+- &CString::new("console=tty0").unwrap(),
++ "console=tty0",
+ &HashMap::<(DeviceType, std::string::String), MMIODeviceInfo>::new(),
+ gic.as_ref(),
+ &Some(initrd),
+@@ -810,7 +609,6 @@ mod tests {
+ buf.extend_from_slice(saved_dtb_bytes);
+
+ set_size(&mut buf, pos, val);
+- set_size(&mut current_dtb_bytes, pos, val);
+ let original_fdt = device_tree::DeviceTree::load(&buf).unwrap();
+ let generated_fdt = device_tree::DeviceTree::load(&current_dtb_bytes).unwrap();
+ assert_eq!(
+diff --git a/src/arch/src/aarch64/mod.rs b/src/arch/src/aarch64/mod.rs
+index 0ddbf776..fb6baf54 100644
+--- a/src/arch/src/aarch64/mod.rs
++++ b/src/arch/src/aarch64/mod.rs
+@@ -12,7 +12,6 @@ pub mod regs;
+
+ use std::cmp::min;
+ use std::collections::HashMap;
+-use std::ffi::CStr;
+ use std::fmt::Debug;
+
+ pub use self::fdt::DeviceInfoForFDT;
+@@ -52,7 +51,7 @@ pub fn arch_memory_regions(size: usize) -> Vec<(GuestAddress, usize)> {
+ /// * `initrd` - Information about an optional initrd.
+ pub fn configure_system<T: DeviceInfoForFDT + Clone + Debug, S: std::hash::BuildHasher>(
+ guest_mem: &GuestMemoryMmap,
+- cmdline_cstring: &CStr,
++ cmdline_cstring: &str,
+ vcpu_mpidr: Vec<u64>,
+ device_info: &HashMap<(DeviceType, String), T, S>,
+ gic_device: &dyn GICDevice,
+diff --git a/src/vmm/src/builder.rs b/src/vmm/src/builder.rs
+index 5f5b7db1..6f38d9c3 100644
+--- a/src/vmm/src/builder.rs
++++ b/src/vmm/src/builder.rs
+@@ -783,7 +783,7 @@ pub fn configure_system_for_boot(
+ .collect();
+ arch::aarch64::configure_system(
+ &vmm.guest_memory,
+- &boot_cmdline.as_cstring().map_err(LoadCommandline)?,
++ &boot_cmdline.as_str(),
+ vcpu_mpidr,
+ vmm.mmio_device_manager.get_device_info(),
+ vmm.vm.get_irqchip(),
+--
+2.31.1
+
diff --git a/testing/firecracker/30-libfdt-bindings-Deleted-libfdt-bindings-crate.patch b/testing/firecracker/30-libfdt-bindings-Deleted-libfdt-bindings-crate.patch
new file mode 100644
index 0000000000..223f424404
--- /dev/null
+++ b/testing/firecracker/30-libfdt-bindings-Deleted-libfdt-bindings-crate.patch
@@ -0,0 +1,157 @@
+From 18c6a6662bfe0c14e3a547d4fc6342528822cd15 Mon Sep 17 00:00:00 2001
+From: AlexandruCihodaru <cihodar@amazon.com>
+Date: Thu, 2 Sep 2021 23:43:41 +0300
+Subject: [PATCH] [libfdt-bindings]: Deleted libfdt-bindings crate
+
+Signed-off-by: AlexandruCihodaru <cihodar@amazon.com>
+---
+ Cargo.lock | 8 ------
+ src/arch/Cargo.toml | 2 --
+ src/libfdt-bindings/Cargo.toml | 9 -------
+ src/libfdt-bindings/build.rs | 47 ----------------------------------
+ src/libfdt-bindings/src/lib.rs | 26 -------------------
+ 5 files changed, 92 deletions(-)
+ delete mode 100644 src/libfdt-bindings/Cargo.toml
+ delete mode 100644 src/libfdt-bindings/build.rs
+ delete mode 100644 src/libfdt-bindings/src/lib.rs
+
+diff --git a/Cargo.lock b/Cargo.lock
+index d1262012..592bd155 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -34,7 +34,6 @@ dependencies = [
+ "kvm-bindings",
+ "kvm-ioctls",
+ "libc",
+- "libfdt-bindings",
+ "logger",
+ "utils",
+ "versionize",
+@@ -439,13 +438,6 @@ version = "0.2.100"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "a1fa8cddc8fbbee11227ef194b5317ed014b8acbf15139bd716a18ad3fe99ec5"
+
+-[[package]]
+-name = "libfdt-bindings"
+-version = "0.1.0"
+-dependencies = [
+- "libc",
+-]
+-
+ [[package]]
+ name = "log"
+ version = "0.4.14"
+diff --git a/src/arch/Cargo.toml b/src/arch/Cargo.toml
+index 73e4dfcc..b2a01dd0 100644
+--- a/src/arch/Cargo.toml
++++ b/src/arch/Cargo.toml
+@@ -19,5 +19,3 @@ utils = { path = "../utils" }
+
+ [dev-dependencies]
+ device_tree = ">=1.1.0"
+-[target.'cfg(target_arch="aarch64")'.dependencies]
+-libfdt-bindings = { path = "../libfdt-bindings" }
+\ No newline at end of file
+diff --git a/src/libfdt-bindings/Cargo.toml b/src/libfdt-bindings/Cargo.toml
+deleted file mode 100644
+index 6c4a3569..00000000
+--- a/src/libfdt-bindings/Cargo.toml
++++ /dev/null
+@@ -1,9 +0,0 @@
+-[package]
+-name = "libfdt-bindings"
+-version = "0.1.0"
+-authors = ["Amazon Firecracker team <firecracker-devel@amazon.com>"]
+-edition = "2018"
+-build = "build.rs"
+-
+-[target.'cfg(target_arch="aarch64")'.dependencies]
+-libc = ">=0.2.39"
+diff --git a/src/libfdt-bindings/build.rs b/src/libfdt-bindings/build.rs
+deleted file mode 100644
+index 03e2be90..00000000
+--- a/src/libfdt-bindings/build.rs
++++ /dev/null
+@@ -1,47 +0,0 @@
+-// Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+-// SPDX-License-Identifier: Apache-2.0
+-
+-use std::process::Command;
+-
+-/// Get the ld linker search paths
+-///
+-/// Cargo overwrites LD_LIBRARY_PATH with rust specific paths. But we need the default system
+-/// paths in order to find libfdt. So we query `ld` in order to get them.
+-fn get_ld_search_dirs() -> Vec<String> {
+- // We need to extract from `ld --verbose` all the search paths.
+- // For example `ld --verbose | grep SEARCH_DIR | tr -s ' ;' '\n'` returns the following:
+- // ```
+- // SEARCH_DIR("=/usr/local/lib/aarch64-linux-gnu")
+- // SEARCH_DIR("=/lib/aarch64-linux-gnu")
+- // SEARCH_DIR("=/usr/lib/aarch64-linux-gnu")
+- // SEARCH_DIR("=/usr/local/lib")
+- // SEARCH_DIR("=/lib")
+- // SEARCH_DIR("=/usr/lib")
+- // SEARCH_DIR("=/usr/aarch64-linux-gnu/lib")
+- // ```
+- let cmd = r#"
+- ld --verbose | grep -oP '(?<=SEARCH_DIR\(\"=)[^"]+(?=\"\);)'
+- "#;
+-
+- Command::new("sh")
+- .arg("-c")
+- .arg(cmd)
+- .output()
+- .ok()
+- .and_then(|output| {
+- if output.status.success() {
+- return Some(output.stdout);
+- }
+- None
+- })
+- .and_then(|stdout_bytes| String::from_utf8(stdout_bytes).ok())
+- .map_or(vec![], |stdout| {
+- stdout.lines().map(|item| item.to_string()).collect()
+- })
+-}
+-
+-fn main() {
+- for ld_search_dir in get_ld_search_dirs() {
+- println!("cargo:rustc-link-search=native={}", ld_search_dir);
+- }
+-}
+diff --git a/src/libfdt-bindings/src/lib.rs b/src/libfdt-bindings/src/lib.rs
+deleted file mode 100644
+index 07f11aaa..00000000
+--- a/src/libfdt-bindings/src/lib.rs
++++ /dev/null
+@@ -1,26 +0,0 @@
+-// Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+-// SPDX-License-Identifier: Apache-2.0
+-
+-#[cfg(target_arch = "aarch64")]
+-use libc::{c_char, c_int, c_void};
+-
+-// This links to libfdt which handles the creation of the binary blob
+-// flattened device tree (fdt) that is passed to the kernel and indicates
+-// the hardware configuration of the machine.
+-#[cfg(target_arch = "aarch64")]
+-#[link(name = "fdt", kind = "static")]
+-extern "C" {
+- pub fn fdt_create(buf: *mut c_void, bufsize: c_int) -> c_int;
+- pub fn fdt_finish_reservemap(fdt: *mut c_void) -> c_int;
+- pub fn fdt_begin_node(fdt: *mut c_void, name: *const c_char) -> c_int;
+- pub fn fdt_property(
+- fdt: *mut c_void,
+- name: *const c_char,
+- val: *const c_void,
+- len: c_int,
+- ) -> c_int;
+- pub fn fdt_end_node(fdt: *mut c_void) -> c_int;
+- pub fn fdt_open_into(fdt: *const c_void, buf: *mut c_void, bufsize: c_int) -> c_int;
+- pub fn fdt_finish(fdt: *const c_void) -> c_int;
+- pub fn fdt_pack(fdt: *mut c_void) -> c_int;
+-}
+--
+2.31.1
+
diff --git a/testing/firecracker/APKBUILD b/testing/firecracker/APKBUILD
new file mode 100644
index 0000000000..dc1081dad1
--- /dev/null
+++ b/testing/firecracker/APKBUILD
@@ -0,0 +1,72 @@
+# Contributor: Dennis Przytarski <dennis@przytarski.com>
+# Maintainer: Dennis Przytarski <dennis@przytarski.com>
+pkgname=firecracker
+pkgver=0.25.1
+pkgrel=0
+pkgdesc="Secure and fast microVMs for serverless computing"
+url="https://github.com/firecracker-microvm/firecracker"
+arch="aarch64 x86_64"
+license="Apache-2.0"
+makedepends="rust cargo"
+subpackages="$pkgname-seccompiler"
+source="$pkgname-$pkgver.tar.gz::https://github.com/firecracker-microvm/firecracker/archive/v$pkgver.tar.gz
+ 10-dependencies-Included-vm-fdt-crate.patch
+ 20-vm-fdt-Replace-libfdt-with-vm-fdt.patch
+ 30-libfdt-bindings-Deleted-libfdt-bindings-crate.patch
+ "
+
+_target="$CTARGET"
+
+export CARGO_HOME="$srcdir"/cargo
+
+build() {
+ # build firecracker
+ cargo build -p firecracker \
+ --target $_target \
+ --release \
+ --verbose
+
+ # build jailer
+ cargo build -p jailer \
+ --target $_target \
+ --release \
+ --verbose
+
+ # build seccompiler
+ cargo build -p seccompiler \
+ --bin seccompiler-bin \
+ --target $_target \
+ --release \
+ --verbose
+}
+
+check() {
+ # test firecracker
+ cargo test -p firecracker \
+ --target $_target \
+ --verbose
+
+ # notest jailer
+
+ # notest seccompiler
+}
+
+package() {
+ install -Dm755 build/cargo_target/"$_target"/release/firecracker \
+ "$pkgdir"/usr/bin/firecracker
+ install -Dm755 build/cargo_target/"$_target"/release/jailer \
+ "$pkgdir"/usr/bin/jailer
+}
+
+seccompiler() {
+ pkgdesc="Seccompiler"
+ install -Dm755 "$builddir"/build/cargo_target/"$_target"/release/seccompiler-bin \
+ "$subpkgdir"/usr/bin/seccompiler-bin
+}
+
+sha512sums="
+b9bf4fc9fd89312234eb13e50d37b942166d273e8ae16e018541dc1afbebcba9793415e14f4397885aa0797408a01676a9899e1f47296c312d06da9ddb30b571 firecracker-0.25.1.tar.gz
+8e13704ac5383f84d80c0aa3b268f6fc3ba578b857d48218d0a38e2fbc8d1a0660223d5d4168f4fcf532f0743b531e48cac9d6c2982e64e7549984ae12857574 10-dependencies-Included-vm-fdt-crate.patch
+3fdc6057db069b865724daaec2c83f549943a0ffb2d4e9d642c9d00df46a6b206f2b900f1c78dfb0162ed10bb096f7059cfb014c2d40466ee1351fcbbb3c8f8a 20-vm-fdt-Replace-libfdt-with-vm-fdt.patch
+b89ea947d2d7f045699a2318565620c52c4f050f22394e2e074c7adabfaef657633449784563d6d042b37842a3637582465170fb2f35242e7940d16e7cc3f2ea 30-libfdt-bindings-Deleted-libfdt-bindings-crate.patch
+"
diff --git a/testing/flameshot/APKBUILD b/testing/flameshot/APKBUILD
index 965f9411cd..aa408c3360 100644
--- a/testing/flameshot/APKBUILD
+++ b/testing/flameshot/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Leo <thinkabit.ukim@gmail.com>
# Maintainer:
pkgname=flameshot
-pkgver=0.10.1
+pkgver=0.10.2
pkgrel=0
pkgdesc="Featureful screenshot app"
options="!check" # No test suite
@@ -39,5 +39,5 @@ package() {
}
sha512sums="
-dca9c48b284d23b67cb71ff78d79b87887506bf5b30600c5d9ee78f5fadebab6d507674abeeae0c5cdf4a149e71df60666299c7db10168613c03467c7aafa7cf flameshot-0.10.1.tar.gz
+b0eb1decd87dab1d4a375708448dd4c6f85c101d33814b76edbb328150d0e9ee7a588be698fddcb24e70e39cd4331f9aa2ff082525ff6975d52303a6d9c1ab12 flameshot-0.10.2.tar.gz
"
diff --git a/testing/flannel/APKBUILD b/testing/flannel/APKBUILD
index 6622845982..0c72e78277 100644
--- a/testing/flannel/APKBUILD
+++ b/testing/flannel/APKBUILD
@@ -2,8 +2,8 @@
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=flannel
_pkgname=flanneld
-pkgver=0.14.0
-pkgrel=1
+pkgver=0.15.1
+pkgrel=0
pkgdesc="An etcd backed network fabric for containers"
url="https://github.com/coreos/flannel"
arch="x86_64"
@@ -66,7 +66,7 @@ cleanup_srcdir() {
}
sha512sums="
-a5d9f45d55f18c744e635b4d697200cf9d5a8c4387cd6d9c57220e652e3688337f2ee50fef193135dd0073b14edb8800fac8d5ca9f9d0d3e9ef70d09a52f259c flannel-0.14.0.tar.gz
+c4ad1323da7f39f28483a3dd3848311f7ef1fa51080c1bb0fc01c274fb3e8856f97f5da94ae578f21bb1d4729890bf908670bfe269367aae197533857923166e flannel-0.15.1.tar.gz
398b7068c46b132b747cade43f7f718703f8b32ef7d59fb54da5105ab3fac97b81e0af69e13207ec7cd6fa42a266be8ec45213bf7853fdbc560fbaee4bb5966d kube-flannel-bin-path.patch
d84258a164adcec0f1cef7fcafcf0cadb3bf3959b393b905c4897274adeff476279ce96ec42e9aa9d574c6bd7d37649d92c7c52563975f85d303cade990a3942 flanneld.logrotated
3f6f33fe90adca1dd17b503ce0cd3a7f3cc0ca7fc10d0ca5b631f4c87ed513c0133dfd7679618cf95540b252b3176f9bbefd6454867ef792258c46cafc039d86 flanneld.initd
diff --git a/testing/flightgear/APKBUILD b/testing/flightgear/APKBUILD
index 59eee7ff09..c50f787f7e 100644
--- a/testing/flightgear/APKBUILD
+++ b/testing/flightgear/APKBUILD
@@ -1,29 +1,43 @@
# Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
-# Maintainer:
+# Maintainer: Thomas Kienlen <kommander@laposte.net>
pkgname=flightgear
-pkgver=2019.1.1
-pkgrel=4
-pkgdesc="Sophisticated flight simulator"
+pkgver=2020.3.11
+_pkgver=${pkgver%.*}
+pkgrel=0
+pkgdesc="Flight Gear Flight Simulator"
url="http://flightgear.org"
-arch="x86_64" # openscenegraph availability
-arch="" # FTBFS, !16887
-license="GPL"
-makedepends="$depends_dev boost-dev cmake curl-dev dbus-dev eudev-dev
- freeglut-dev glew-dev libx11-dev libxi-dev libxmu-dev mesa-dev
- openal-soft-dev openscenegraph-dev plib qt5-qtbase-dev
- qt5-qtdeclarative-dev qt5-qtsvg-dev simgear-dev zlib-dev"
+arch="all !riscv64 !x86 !armhf !armv7" # limited by openscenegraph and build compatibility
+license="GPL-2.0-or-later"
+makedepends="
+ boost-dev cmake curl-dev dbus-dev eudev-dev freeglut-dev glew-dev
+ libexecinfo-dev libx11-dev libxi-dev libxmu-dev mesa-dev openal-soft-dev
+ openscenegraph-dev plib qt5-qtbase-dev qt5-qtdeclarative-dev qt5-qtsvg-dev
+ simgear-dev zlib-dev
+ "
install="$pkgname.post-install"
-subpackages="$pkgname-doc $pkgname-dbg"
+subpackages="
+ $pkgname-dbg
+ $pkgname-doc
+ $pkgname-bash-completion
+ $pkgname-zsh-completion
+ "
options="!check" # FIXME test suite does not get built
-source="https://downloads.sourceforge.net/project/flightgear/release-${pkgver%.[1-9]*}/flightgear-$pkgver.tar.bz2
- musl-fixes.patch
- fix-boost.patch
+source="
+ https://downloads.sourceforge.net/project/flightgear/release-$_pkgver/flightgear-$pkgver.tar.bz2
+ musl-fenv.patch
+ musl-fix_error_h.patch
+ musl-fix_feenableexcept.patch
+ musl-fix_fpos_t.patch
+ musl-include-fcntl.patch
+ musl-fix_backtrace.patch
+ flightgear-data-downloader.sh
"
build() {
cmake \
-D BUILD_TESTING=ON \
-D CMAKE_BUILD_TYPE="Release" \
+ -D CMAKE_EXE_LINKER_FLAGS=-lexecinfo \
-D CMAKE_INSTALL_PREFIX=/usr \
-D CMAKE_INSTALL_SYSCONFDIR=/etc/$pkgname \
-D FG_DATA_DIR=/var/lib/$pkgname \
@@ -38,8 +52,17 @@ check() {
package() {
make DESTDIR="$pkgdir" install
+
+ install -Dm755 "$srcdir"/flightgear-data-downloader.sh "$pkgdir"/usr/bin/flightgear-data-downloader
}
-sha512sums="edcc464af0bde4766e61137211276d77a6bb297567b0168dfaf3b97fdb9a595e5e8a0b84232680fcc975cf195261b9751edb79ae73123333feb31ab3d7215d8c flightgear-2019.1.1.tar.bz2
-3350de9e465dc4f865d2a94d96b2f79b4c98c994fc4713cfa296c20ed12129f310779171b89639f69d1e4f5f0103fca6cc01df5a9e25d77f93a0b4e76f6b973a musl-fixes.patch
-089d02f47595c2ebb97c1ad23691d5393365d738b497c8d4113328215e78505d844cb321e1fd4838c9bc3792a5cad1f83821419f5ad7fbec90769022c3b79854 fix-boost.patch"
+sha512sums="
+9a7c6f262da8daf3d954df7a2a8a96e555f3212c1d949211d0dbddd08a8f7380fa8f4986d60f48e17db563154d250184ee772b79b10277a2c5819fabec3930ee flightgear-2020.3.11.tar.bz2
+81ffb1ecfceae8d4ebb14717fb785118b3c290171245762cb4ab85be769582576147fe1b1b60fe854f4dd8079ebaf913da1585809ba9048d55f8710159c05614 musl-fenv.patch
+b477510a102b0d01859ab39ddf7b5c4bcd3b80aa522320b2128095228b643d5e067dd61f8edbef7df7ed1a35aea647444126ba58eb39a82d294ae8a0f6e808e5 musl-fix_error_h.patch
+29d12098c2581122234188cadd929238c41258bf347de2fcd30dabb46e398d19566e064b2a4267370bf7669c5dcde2c87ef1232b7b1a9ed27ad7885a26378b05 musl-fix_feenableexcept.patch
+3a5d280bcd806fbdeb7b2f92435ffa7b44c420494ae658060624dfa34709a2b36448c1ca8c81bff1e4bb2878fa55200eb69535699062aff5286c7f640fbc3081 musl-fix_fpos_t.patch
+89f871216cac9bf772c6f7a4d12d79ff73a38179547464ffa93ed24394309cb085719c0de5e2a82e2086e994cbf886a8763e4c577fdda476ddbab0e3e3dea4cd musl-include-fcntl.patch
+c9d680759fc163366d352bf7b96850a71303b427b0664a50e6ebc7bb11a2d4910cc18988cbc9c305f8a18307c8c2d739559a9358f7f682b34a5b41a126f35567 musl-fix_backtrace.patch
+8efecffaa9b4445d4915255d18a2b09bf63330c226815d88b070476f7d71c941fa444088f8f641b5c235b509dfd0b4edf8e287aa85830c3306dd5a4a23d64901 flightgear-data-downloader.sh
+"
diff --git a/testing/flightgear/fix-boost.patch b/testing/flightgear/fix-boost.patch
deleted file mode 100644
index c93b226a0c..0000000000
--- a/testing/flightgear/fix-boost.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Taken from Gentoo
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -515,7 +515,7 @@
- set(NOMINMAX 1)
- endif(WIN32)
-
--set (BOOST_CXX_FLAGS "-DBOOST_BIMAP_DISABLE_SERIALIZATION")
-+set (BOOST_CXX_FLAGS "-DBOOST_BIMAP_DISABLE_SERIALIZATION -DBOOST_NO_STDLIB_CONFIG")
-
- # append the SIMD flags if requested
- if (ENABLE_SIMD)
diff --git a/testing/flightgear/flightgear-data-downloader.sh b/testing/flightgear/flightgear-data-downloader.sh
new file mode 100755
index 0000000000..14023b0094
--- /dev/null
+++ b/testing/flightgear/flightgear-data-downloader.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+FGDATA_VERSION=2020.3.11
+RELEASE_BRANCH=${FGDATA_VERSION%.*}
+
+echo "Downloading Flightgear data (version $FGDATA_VERSION) ..."
+curl -L https://sourceforge.net/projects/flightgear/files/release-$RELEASE_BRANCH/FlightGear-$FGDATA_VERSION-data.txz/download | tar -xJ --strip-components=1 -C /var/lib/flightgear -f -
+echo 'Done.'
diff --git a/testing/flightgear/flightgear.post-install b/testing/flightgear/flightgear.post-install
index 595cb797be..7b3fdf69fa 100755
--- a/testing/flightgear/flightgear.post-install
+++ b/testing/flightgear/flightgear.post-install
@@ -8,3 +8,5 @@ echo " and extract it in /var/lib/flightgear"
echo " before running the program or change its location"
echo " by setting the variable FG_ROOT"
echo
+echo " (You may use the script /usr/bin/flightgear-data-downloader)"
+echo
diff --git a/testing/flightgear/musl-fenv.patch b/testing/flightgear/musl-fenv.patch
new file mode 100644
index 0000000000..8a0922f57d
--- /dev/null
+++ b/testing/flightgear/musl-fenv.patch
@@ -0,0 +1,19 @@
+Simply disabling the code which enables floating point exceptions
+is probably wrong, but I don't have a replacement for the
+non-posix functions fegetexcept(3) and feenableexcept(3).
+
+--- a/src/Main/bootstrap.cxx 2015-02-18 21:10:05.000000000 +0100
++++ b/src/Main/bootstrap.cxx 2015-11-01 01:25:56.665212195 +0100
+@@ -96,8 +96,12 @@
+ initFPE (bool fpeAbort)
+ {
++#if defined(__GLIBC__)
+ if (fpeAbort) {
+ int except = fegetexcept();
+ feenableexcept(except | FE_DIVBYZERO | FE_INVALID);
+ } else {
+ signal(SIGFPE, handleFPE);
+ }
++#else
++ signal(SIGFPE, handleFPE);
++#endif
diff --git a/testing/flightgear/musl-fix_backtrace.patch b/testing/flightgear/musl-fix_backtrace.patch
new file mode 100644
index 0000000000..ddf8af58ac
--- /dev/null
+++ b/testing/flightgear/musl-fix_backtrace.patch
@@ -0,0 +1,11 @@
+--- a/src/Main/bootstrap.cxx
++++ b/src/Main/bootstrap.cxx
+@@ -159,7 +159,7 @@ void segfault_handler(int signo) {
+
+ fprintf(stderr, "Error: caught signal %d:\n", signo);
+
+- #ifndef __OpenBSD__
++ #if defined(__GLIBC__)
+ size = backtrace(array, 128);
+ if (size) {
+ char** list = backtrace_symbols(array, size);
diff --git a/testing/flightgear/musl-fix_error_h.patch b/testing/flightgear/musl-fix_error_h.patch
new file mode 100644
index 0000000000..587ee1f530
--- /dev/null
+++ b/testing/flightgear/musl-fix_error_h.patch
@@ -0,0 +1,14 @@
+There is no <error.h> in musl libc, thus enable the
+include only if __GLIB__ is defined.
+
+--- a/3rdparty/iaxclient/lib/libiax2/src/iax.c 2015-02-18 21:10:05.000000000 +0100
++++ b/3rdparty/iaxclient/lib/libiax2/src/iax.c 2015-10-31 17:14:55.477461723 +0100
+@@ -75,7 +75,7 @@
+ // FlightGear: Modified to include FreeBSD
+ #if !defined(MACOSX) && !defined(__OpenBSD__) && !defined(__FreeBSD__)
+ #include <malloc.h>
+-#if !defined(SOLARIS)
++#if !defined(SOLARIS) && defined(__GLIBC__)
+ #include <error.h>
+ #endif
+ #endif
diff --git a/testing/flightgear/musl-fix_feenableexcept.patch b/testing/flightgear/musl-fix_feenableexcept.patch
new file mode 100644
index 0000000000..9d456a2d28
--- /dev/null
+++ b/testing/flightgear/musl-fix_feenableexcept.patch
@@ -0,0 +1,11 @@
+--- a/src/FDM/JSBSim/JSBSim.cpp 2017-03-01 21:06:31.000000000 +0100
++++ b/src/FDM/JSBSim/JSBSim.cpp 2017-03-17 09:49:13.115544107 +0100
+@@ -287,7 +287,7 @@
+ _clearfp();
+ _controlfp(_controlfp(0, 0) & ~(_EM_INVALID | _EM_ZERODIVIDE | _EM_OVERFLOW),
+ _MCW_EM);
+-#elif defined(__GNUC__) && !defined(sgi) && !defined(__APPLE__)
++#elif defined(__GNUC__) && !defined(sgi) && !defined(__APPLE__) && defined(__GLIBC__)
+ feenableexcept(FE_DIVBYZERO | FE_INVALID);
+ #endif
+
diff --git a/testing/flightgear/musl-fix_fpos_t.patch b/testing/flightgear/musl-fix_fpos_t.patch
new file mode 100644
index 0000000000..c3f709b064
--- /dev/null
+++ b/testing/flightgear/musl-fix_fpos_t.patch
@@ -0,0 +1,17 @@
+For musl libc return the file position using
+ftell(3) because fpos_t is opaque.
+
+--- a/3rdparty/hts_engine_API/lib/HTS_misc.c 2015-02-18 21:10:05.000000000 +0100
++++ b/3rdparty/hts_engine_API/lib/HTS_misc.c 2015-10-31 17:33:53.946349145 +0100
+@@ -247,8 +247,10 @@
+ fgetpos((FILE *) fp->pointer, &pos);
+ #if defined(_WIN32) || defined(__CYGWIN__) || defined(__APPLE__) || defined(__ANDROID__) || defined(__FreeBSD__)
+ return (size_t) pos;
+-#else
++#elif defined(__GLIBC__)
+ return (size_t) pos.__pos;
++#else
++ return (size_t) ftell(fp->pointer);
+ #endif /* _WIN32 || __CYGWIN__ || __APPLE__ || __ANDROID__ */
+ }
+ HTS_error(0, "HTS_ftell: Unknown file type.\n");
diff --git a/testing/flightgear/musl-fixes.patch b/testing/flightgear/musl-fixes.patch
deleted file mode 100644
index c72ea90c78..0000000000
--- a/testing/flightgear/musl-fixes.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-Simply disabling the code which enables floating point exceptions
-is probably wrong, but I don't have a replacement for the
-non-posix functions fegetexcept(3) and feenableexcept(3).
-
---- a/src/Main/bootstrap.cxx 2015-02-18 21:10:05.000000000 +0100
-+++ b/src/Main/bootstrap.cxx 2015-11-01 01:25:56.665212195 +0100
-@@ -96,8 +96,12 @@
- initFPE (bool fpeAbort)
- {
-+#if defined(__GLIBC__)
- if (fpeAbort) {
- int except = fegetexcept();
- feenableexcept(except | FE_DIVBYZERO | FE_INVALID);
- } else {
- signal(SIGFPE, handleFPE);
- }
-+#else
-+ signal(SIGFPE, handleFPE);
-+#endif
-There is no <error.h> in musl libc, thus enable the
-include only if __GLIB__ is defined.
-
---- a/3rdparty/iaxclient/lib/libiax2/src/iax.c 2015-02-18 21:10:05.000000000 +0100
-+++ b/3rdparty/iaxclient/lib/libiax2/src/iax.c 2015-10-31 17:14:55.477461723 +0100
-@@ -75,7 +75,7 @@
- // FlightGear: Modified to include FreeBSD
- #if !defined(MACOSX) && !defined(__OpenBSD__) && !defined(__FreeBSD__)
- #include <malloc.h>
--#if !defined(SOLARIS)
-+#if !defined(SOLARIS) && defined(__GLIBC__)
- #include <error.h>
- #endif
- #endif
---- a/src/Main/bootstrap.cxx 2017-03-17 09:52:07.474706542 +0100
-+++ b/src/Main/bootstrap.cxx 2017-03-17 09:53:40.361793507 +0100
-@@ -141,7 +141,7 @@
- }
- #endif
-
--#if defined(__GNUC__)
-+#if defined(__GNUC__) && defined(__GLIBC__)
- #include <execinfo.h>
- #include <cxxabi.h>
- void segfault_handler(int signo) {
-@@ -244,8 +244,10 @@
-
- signal(SIGPIPE, SIG_IGN);
- # ifndef NDEBUG
-+# ifdef __GLIBC__
- signal(SIGSEGV, segfault_handler);
- # endif
-+# endif
- #endif
-
- _bootstrap_OSInit = 0;
---- a/src/FDM/JSBSim/JSBSim.cpp 2017-03-01 21:06:31.000000000 +0100
-+++ b/src/FDM/JSBSim/JSBSim.cpp 2017-03-17 09:49:13.115544107 +0100
-@@ -287,7 +287,7 @@
- _clearfp();
- _controlfp(_controlfp(0, 0) & ~(_EM_INVALID | _EM_ZERODIVIDE | _EM_OVERFLOW),
- _MCW_EM);
--#elif defined(__GNUC__) && !defined(sgi) && !defined(__APPLE__)
-+#elif defined(__GNUC__) && !defined(sgi) && !defined(__APPLE__) && defined(__GLIBC__)
- feenableexcept(FE_DIVBYZERO | FE_INVALID);
- #endif
-
-For musl libc return the file position using
-ftell(3) because fpos_t is opaque.
-
---- a/3rdparty/hts_engine_API/lib/HTS_misc.c 2015-02-18 21:10:05.000000000 +0100
-+++ b/3rdparty/hts_engine_API/lib/HTS_misc.c 2015-10-31 17:33:53.946349145 +0100
-@@ -247,8 +247,10 @@
- fgetpos((FILE *) fp->pointer, &pos);
- #if defined(_WIN32) || defined(__CYGWIN__) || defined(__APPLE__) || defined(__ANDROID__) || defined(__FreeBSD__)
- return (size_t) pos;
--#else
-+#elif defined(__GLIBC__)
- return (size_t) pos.__pos;
-+#else
-+ return (size_t) ftell(fp->pointer);
- #endif /* _WIN32 || __CYGWIN__ || __APPLE__ || __ANDROID__ */
- }
- HTS_error(0, "HTS_ftell: Unknown file type.\n");
diff --git a/testing/flightgear/musl-include-fcntl.patch b/testing/flightgear/musl-include-fcntl.patch
new file mode 100644
index 0000000000..1f3e0f8234
--- /dev/null
+++ b/testing/flightgear/musl-include-fcntl.patch
@@ -0,0 +1,10 @@
+--- a/src/Navaids/NavDataCache.cxx
++++ b/src/Navaids/NavDataCache.cxx
+@@ -31,6 +31,7 @@
+ #include <stdint.h> // for int64_t
+ #include <sstream> // for std::ostringstream
+ #include <mutex>
++#include <fcntl.h>
+
+ #ifdef SYSTEM_SQLITE
+ // the standard sqlite3.h doesn't give a way to set SQLITE_UINT64_TYPE,
diff --git a/testing/flightgear/time64.patch b/testing/flightgear/time64.patch
new file mode 100644
index 0000000000..367f884452
--- /dev/null
+++ b/testing/flightgear/time64.patch
@@ -0,0 +1,13 @@
+--- a/src/Input/FGLinuxEventInput.cxx 2020-06-26 00:08:15.000000000 +0200
++++ b/src/Input/FGLinuxEventInput.cxx 2020-12-07 07:51:45.332825252 +0100
+@@ -415,8 +415,8 @@
+ evt.type=typeCode.type;
+ evt.code = typeCode.code;
+ evt.value = (long)value;
+- evt.time.tv_sec = 0;
+- evt.time.tv_usec = 0;
++ evt.input_event_sec = 0;
++ evt.input_event_usec = 0;
+ size_t bytes_written = write(fd, &evt, sizeof(evt));
+
+ if( bytes_written == sizeof(evt) )
diff --git a/testing/fluent-bit/APKBUILD b/testing/fluent-bit/APKBUILD
index e169df2961..5fbd43bf9b 100644
--- a/testing/fluent-bit/APKBUILD
+++ b/testing/fluent-bit/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: wener <wenermail@gmail.com>
# Maintainer: wener <wenermail@gmail.com>
pkgname=fluent-bit
-pkgver=1.7.9
+pkgver=1.8.9
pkgrel=0
pkgdesc="Fast and Lightweight Log processor and forwarder"
url="https://fluentbit.io/"
@@ -25,6 +25,7 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/fluent/fluent-bit/archive/v$
fluent-bit.initd
chunkio-static-lib-fts.patch
10-def-core-stack-size.patch
+ stream_suffix.patch
"
# enable check when this solved - https://github.com/fluent/fluent-bit/issues/2464#issuecomment-673280055
options="!check"
@@ -64,9 +65,10 @@ package() {
}
sha512sums="
-d25d3acb90c28fa4c337ad17ec8f0580cab59d3904ad71a6f66b9c3d36cc77890234ad9ef0be5275eb90c85b3628d514cd0ae5de98f8a0835a08696cae4c7b69 fluent-bit-1.7.9.tar.gz
+6f831ca65f9c410c1359a10a69fdf272dbcc5711a5071f4473fda8894dd7984f0c8152705e78311239d805dbf01c55b987611a35da0980588a1eb8b805c9537a fluent-bit-1.8.9.tar.gz
f6431397c80a036980b5377b51e38aec25dfceeb8dbe4cd54dce1f6e77d669d9f8daf983fcc96d25332385888f1809ced5e8ab0e8ccfcd93d19494036e3dc949 fluent-bit.confd
8ba6c8e84dee90176f9b4375fb2c6444fa5d32fa601d9bcf3ea7960fec87f1ef664f175caf08bd0b052843e971efdbf08e2a5cd180ad9a8f23ff2c5cb233814f fluent-bit.initd
6bd7d8b4da93a17f29b6ea1e0286ea226d0e376024284741110936779b3229bd8d6cd03ffbdc5d3b4842294e7f32a888de0dd16b0851b65d91b062ca58530ea0 chunkio-static-lib-fts.patch
cecfa26e240491ed059f27e209eec8408514f0a59c2b5287fe837daba01179c15c33e8bc88e3bbe95ff39810f7fef6ef806643efbd84fb6dd86a3a7e188a319d 10-def-core-stack-size.patch
+9dc413422a5c12534d962e47b41387a589023b952eca86270fd58b12ea2d309c00d683f826f089618b4b774bd791e954da6d4f60bed7e42d6626ad44853c1a7d stream_suffix.patch
"
diff --git a/testing/fluent-bit/stream_suffix.patch b/testing/fluent-bit/stream_suffix.patch
new file mode 100644
index 0000000000..ab234d93f1
--- /dev/null
+++ b/testing/fluent-bit/stream_suffix.patch
@@ -0,0 +1,189 @@
+From 26c796fc6fb6b65a1a4ec92acf272e763a756c80 Mon Sep 17 00:00:00 2001
+From: Brian Maher <bmaher@onetrust.com>
+Date: Wed, 25 Aug 2021 06:13:57 -0700
+Subject: [PATCH] aws: Rename struct process stdin,stdout,stderr to fix build
+
+Added _stream suffix to all to avoid issues when these are declared as macros.
+
+Signed-off-by: Brian Maher <bmaher@onetrust.com>
+---
+ src/aws/flb_aws_credentials_process.c | 78 +++++++++++++--------------
+ 1 file changed, 39 insertions(+), 39 deletions(-)
+
+diff --git a/src/aws/flb_aws_credentials_process.c b/src/aws/flb_aws_credentials_process.c
+index d3e775f0dd..44c024ca77 100644
+--- a/src/aws/flb_aws_credentials_process.c
++++ b/src/aws/flb_aws_credentials_process.c
+@@ -414,9 +414,9 @@ static int waitpid_timeout(char* name, pid_t pid, int* wstatus)
+ struct process {
+ int initialized;
+ char** args;
+- int stdin;
+- flb_pipefd_t stdout[2];
+- int stderr;
++ int stdin_stream;
++ flb_pipefd_t stdout_stream[2];
++ int stderr_stream;
+ pid_t pid;
+ };
+
+@@ -433,35 +433,35 @@ static int new_process(struct process* p, char** args)
+ *p = (struct process) {
+ .initialized = FLB_TRUE,
+ .args = args,
+- .stdin = -1,
+- .stdout = {-1, -1},
+- .stderr = -1,
++ .stdin_stream = -1,
++ .stdout_stream = {-1, -1},
++ .stderr_stream = -1,
+ .pid = -1,
+ };
+
+- while ((p->stdin = open(DEV_NULL, O_RDONLY|O_CLOEXEC)) < 0) {
++ while ((p->stdin_stream = open(DEV_NULL, O_RDONLY|O_CLOEXEC)) < 0) {
+ if (errno != EINTR) {
+ flb_errno();
+ return -1;
+ }
+ }
+
+- if (flb_pipe_create(p->stdout) < 0) {;
++ if (flb_pipe_create(p->stdout_stream) < 0) {;
+ flb_errno();
+ return -1;
+ }
+
+- if (fcntl(p->stdout[0], F_SETFL, O_CLOEXEC) < 0) {
++ if (fcntl(p->stdout_stream[0], F_SETFL, O_CLOEXEC) < 0) {
+ flb_errno();
+ return -1;
+ }
+
+- if (fcntl(p->stdout[1], F_SETFL, O_CLOEXEC) < 0) {
++ if (fcntl(p->stdout_stream[1], F_SETFL, O_CLOEXEC) < 0) {
+ flb_errno();
+ return -1;
+ }
+
+- while ((p->stderr = open(DEV_NULL, O_WRONLY|O_CLOEXEC)) < 0) {
++ while ((p->stderr_stream = open(DEV_NULL, O_WRONLY|O_CLOEXEC)) < 0) {
+ if (errno != EINTR) {
+ flb_errno();
+ return -1;
+@@ -479,26 +479,26 @@ static int new_process(struct process* p, char** args)
+ */
+ static void exec_process_child(struct process* p)
+ {
+- while ((dup2(p->stdin, STDIN_FILENO) < 0)) {
++ while ((dup2(p->stdin_stream, STDIN_FILENO) < 0)) {
+ if (errno != EINTR) {
+ return;
+ }
+ }
+- while ((dup2(p->stdout[1], STDOUT_FILENO) < 0)) {
++ while ((dup2(p->stdout_stream[1], STDOUT_FILENO) < 0)) {
+ if (errno != EINTR) {
+ return;
+ }
+ }
+- while ((dup2(p->stderr, STDERR_FILENO) < 0)) {
++ while ((dup2(p->stderr_stream, STDERR_FILENO) < 0)) {
+ if (errno != EINTR) {
+ return;
+ }
+ }
+
+- close(p->stdin);
+- flb_pipe_close(p->stdout[0]);
+- flb_pipe_close(p->stdout[1]);
+- close(p->stderr);
++ close(p->stdin_stream);
++ flb_pipe_close(p->stdout_stream[0]);
++ flb_pipe_close(p->stdout_stream[1]);
++ close(p->stderr_stream);
+
+ execvp(p->args[0], p->args);
+ }
+@@ -525,14 +525,14 @@ static int exec_process(struct process* p)
+ exit(EXIT_FAILURE);
+ }
+
+- close(p->stdin);
+- p->stdin = -1;
++ close(p->stdin_stream);
++ p->stdin_stream = -1;
+
+- flb_pipe_close(p->stdout[1]);
+- p->stdout[1] = -1;
++ flb_pipe_close(p->stdout_stream[1]);
++ p->stdout_stream[1] = -1;
+
+- close(p->stderr);
+- p->stderr = -1;
++ close(p->stderr_stream);
++ p->stderr_stream = -1;
+
+ return 0;
+ }
+@@ -549,7 +549,7 @@ static int read_from_process(struct process* p, struct readbuf* buf)
+ struct flb_time start, timeout, deadline, now, remaining;
+ int remaining_ms;
+
+- if (fcntl(p->stdout[0], F_SETFL, O_NONBLOCK) < 0) {
++ if (fcntl(p->stdout_stream[0], F_SETFL, O_NONBLOCK) < 0) {
+ flb_errno();
+ return -1;
+ }
+@@ -567,7 +567,7 @@ static int read_from_process(struct process* p, struct readbuf* buf)
+
+ while (1) {
+ pfd = (struct pollfd) {
+- .fd = p->stdout[0],
++ .fd = p->stdout_stream[0],
+ .events = POLLIN,
+ };
+
+@@ -617,7 +617,7 @@ static int read_from_process(struct process* p, struct readbuf* buf)
+ }
+
+ if ((pfd.revents & POLLIN) == POLLIN || (pfd.revents & POLLHUP) == POLLHUP) {
+- result = read_until_block(p->args[0], p->stdout[0], buf);
++ result = read_until_block(p->args[0], p->stdout_stream[0], buf);
+ if (result <= 0) {
+ return result;
+ }
+@@ -664,21 +664,21 @@ static int wait_process(struct process* p)
+ static void destroy_process(struct process* p)
+ {
+ if (p->initialized) {
+- if (p->stdin >= 0) {
+- close(p->stdin);
+- p->stdin = -1;
++ if (p->stdin_stream >= 0) {
++ close(p->stdin_stream);
++ p->stdin_stream = -1;
+ }
+- if (p->stdout[0] >= 0) {
+- close(p->stdout[0]);
+- p->stdout[0] = -1;
++ if (p->stdout_stream[0] >= 0) {
++ close(p->stdout_stream[0]);
++ p->stdout_stream[0] = -1;
+ }
+- if (p->stdout[1] >= 0) {
+- close(p->stdout[1]);
+- p->stdout[1] = -1;
++ if (p->stdout_stream[1] >= 0) {
++ close(p->stdout_stream[1]);
++ p->stdout_stream[1] = -1;
+ }
+- if (p->stderr >= 0) {
+- close(p->stderr);
+- p->stderr = -1;
++ if (p->stderr_stream >= 0) {
++ close(p->stderr_stream);
++ p->stderr_stream = -1;
+ }
+
+ if (p->pid > 0) {
diff --git a/testing/font-fira/APKBUILD b/testing/font-fira/APKBUILD
new file mode 100644
index 0000000000..9bb9ba276f
--- /dev/null
+++ b/testing/font-fira/APKBUILD
@@ -0,0 +1,34 @@
+# Contributor: Dmitry Zakharchenko <dmitz@disroot.org>
+# Maintainer: Dmitry Zakharchenko <dmitz@disroot.org>
+pkgname=font-fira
+pkgver=4.202
+pkgrel=0
+pkgdesc="Mozilla's new typeface OTF, used in Firefox OS"
+url="http://mozilla.github.io/Fira/"
+arch="noarch"
+license="OFL-1.1"
+options="!check" # no test suite
+depends="$pkgname-otf"
+subpackages="$pkgname-otf $pkgname-ttf"
+source="$pkgname-$pkgver.tar.gz::https://github.com/mozilla/Fira/archive/$pkgver.tar.gz"
+builddir="$srcdir/Fira-$pkgver"
+
+package() {
+ mkdir -p "$pkgdir"
+}
+
+otf() {
+ depends="fontconfig"
+
+ install -Dm644 $builddir/otf/*.otf -t "$subpkgdir"/usr/share/fonts/OTF
+}
+
+ttf() {
+ pkgdesc="$pkgdesc (TTF version)"
+ depends="fontconfig"
+
+ install -Dm644 $builddir/ttf/*.ttf -t "$subpkgdir"/usr/share/fonts/TTF
+}
+sha512sums="
+fec770fa038f2aa0654f9382f95aa1266a2655970f4c7755b237af9d1c09f47ce719f8daf3afc39812fc69448b9481ee0e2a1414f1d007ad70b4254c92950ebb font-fira-4.202.tar.gz
+"
diff --git a/testing/font-ipa/APKBUILD b/testing/font-ipa/APKBUILD
deleted file mode 100644
index f5e6d7f22a..0000000000
--- a/testing/font-ipa/APKBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# Contributor: Adrian Siekierka <kontakt@asie.pl>
-# Maintainer:
-pkgname=font-ipa
-pkgver=003.03
-pkgrel=1
-pkgdesc="Japanese outline fonts by Information-technology Promotion Agency"
-url="http://ipafont.ipa.go.jp/"
-arch="" # source= is no longer present
-license="IPA"
-depends="encodings font-alias mkfontscale mkfontdir fontconfig"
-makedepends=""
-filever=${pkgver/./}
-source="https://ipafont.ipa.go.jp/IPAfont/IPAfont$filever.zip"
-builddir="$srcdir/IPAfont$filever"
-
-package() {
- cd "$builddir"
-
- install -d "${pkgdir}/usr/share/fonts/TTF"
- install -m644 *.ttf "${pkgdir}/usr/share/fonts/TTF/"
-
- install -d "${pkgdir}/usr/share/licenses/font-ipa"
- install -m644 IPA_Font_License_Agreement_v1.0.txt "${pkgdir}/usr/share/licenses/font-ipa/"
-}
-
-sha512sums="d3e4a1f189356b7a8b0cba9c706987413c8107f9e43ab2ccf52be6d0483efad8c97b68e075a35c5d04603c460dac7f282c4645ddc8318e993368ec47407f894e IPAfont00303.zip"
diff --git a/testing/font-manager/APKBUILD b/testing/font-manager/APKBUILD
deleted file mode 100644
index 9ef6c9f22b..0000000000
--- a/testing/font-manager/APKBUILD
+++ /dev/null
@@ -1,98 +0,0 @@
-# Contributor: knuxify <knuxify@gmail.com>
-# Maintainer: knuxify <knuxify@gmail.com>
-pkgname=font-manager
-_viewer_pkgname=font-viewer
-pkgver=0.8.7
-pkgrel=0
-pkgdesc="Simple font management application for GTK Desktop Environments"
-url="https://fontmanager.github.io/"
-# riscv64: blocked by webkit2gtk-dev
-arch="all !riscv64"
-license="GPL-3.0-or-later"
-makedepends="meson
- freetype-dev
- glib
- gobject-introspection-dev
- gtk+3.0-dev
- json-glib-dev
- libsoup-dev
- libxml2-dev
- webkit2gtk-dev
- yelp-tools itstool
- vala"
-# For file manager extentions
-makedepends="$makedepends thunar-dev"
-subpackages="$pkgname-doc
- $pkgname-lang
- $pkgname-common:common
- $_viewer_pkgname:font_viewer
- $pkgname-thunar:ext_thunar"
-
-case "$CARCH" in
- s390x|mips64|ppc64le)
- _enable_nemo=false
- _enable_nautilus=false
- ;;
- *)
- makedepends="$makedepends nemo-dev nautilus-dev"
- subpackages="$subpackages $pkgname-nautilus:ext_nautilus
- $pkgname-nemo:ext_nemo"
- _enable_nemo=true
- _enable_nautilus=true
- ;;
-esac
-
-source="https://github.com/FontManager/font-manager/releases/download/$pkgver/font-manager-$pkgver.tar.xz"
-options="!check" # no test suite, see https://github.com/FontManager/font-manager/issues/238
-
-build() {
- abuild-meson \
- -Dnautilus=$_enable_nautilus \
- -Dnemo=$_enable_nemo \
- -Dthunar=true \
- . output
- meson compile ${JOBS:+-j ${JOBS}} -C output
-}
-
-check() {
- meson test --no-rebuild -v -C output
-}
-
-package() {
- DESTDIR="$pkgdir" meson install --no-rebuild -C output
-}
-
-common() {
- pkgdesc="Common files/libraries for font-manager and font-viewer"
- amove usr/lib/font-manager
-}
-
-font_viewer() {
- pkgdesc="Full featured font file preview application for GTK+ Desktop Environments"
- amove usr/libexec/font-manager
-}
-
-ext_nautilus() {
- pkgdesc="Nautilus file manager extension for font-manager"
- install_if="font-manager=$pkgver-r$pkgrel nautilus"
-
- amove usr/lib/nautilus/extensions-3.0/nautilus-font-manager.so
-}
-
-ext_nemo() {
- pkgdesc="Nemo file manager extension for font-manager"
- install_if="font-manager=$pkgver-r$pkgrel nemo"
-
- amove usr/lib/nemo/extensions-3.0/nemo-font-manager.so
-}
-
-ext_thunar() {
- pkgdesc="Thunar file manager extension for font-manager"
- install_if="font-manager=$pkgver-r$pkgrel thunar"
-
- amove usr/lib/thunarx-3/thunar-font-manager.so
-}
-
-sha512sums="
-826c9d248d8f3a61459a4c4a1002625d2d951594788dc84a92dfcf115533b4f7179ee29321a9800e66e4de5842e6ce4958725ad168f82daf9ebd5783ad612d4e font-manager-0.8.7.tar.xz
-"
diff --git a/testing/font-raleway/APKBUILD b/testing/font-raleway/APKBUILD
index d5cd1a92bc..965e1d4302 100644
--- a/testing/font-raleway/APKBUILD
+++ b/testing/font-raleway/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=font-raleway
pkgver=4.101
-pkgrel=0
+pkgrel=1
pkgdesc="An elegant sans-serif font family, now 9 weights and italic style"
url="https://www.theleagueofmoveabletype.com/raleway"
arch="noarch"
@@ -21,6 +21,8 @@ package() {
}
otf() {
+ depends=""
+
cd "$builddir"/static/OTF
find . -name "*.otf" -maxdepth 1 | while read -r i; do
install -Dm644 $i -t "$subpkgdir"/usr/share/fonts/OTF/
@@ -28,6 +30,8 @@ otf() {
}
ttf() {
+ depends=""
+
cd "$builddir"/static/TTF
find . -name "*.ttf" -maxdepth 1 | while read -r i; do
install -Dm644 $i -t "$subpkgdir"/usr/share/fonts/TTF/
diff --git a/testing/font-uw-ttyp0/APKBUILD b/testing/font-uw-ttyp0/APKBUILD
deleted file mode 100644
index c632e0cf6a..0000000000
--- a/testing/font-uw-ttyp0/APKBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Contributor: guddaff <guddaff@protonmail.com>
-# Maintainer: guddaff <guddaff@protonmail.com>
-pkgname=font-uw-ttyp0
-pkgver=1.3
-pkgrel=0
-pkgdesc="bitmap monospaced font with unicode support"
-url="https://people.mpi-inf.mpg.de/~uwe/misc/uw-ttyp0/"
-arch="noarch"
-options="!check" ## there are no checks
-license="TTYP0"
-makedepends="perl bdftopcf mkfontscale font-util-dev"
-source="https://people.mpi-inf.mpg.de/~uwe/misc/uw-ttyp0/uw-ttyp0-$pkgver.tar.gz
-style.patch"
-builddir="$srcdir/uw-ttyp0-$pkgver"
-
-build() {
- ./configure \
- --prefix=/usr
- make
-}
-
-package() {
- make DESTDIR="$pkgdir" install
-}
-
-sha512sums="193966b826cafa313384f20e225d4a0b0057364ed23c2beaf27a59095fdb9079281fdc1d292592038512a56ec0387e531a28449344e2960f0ecd3e64c7a6f6e7 uw-ttyp0-1.3.tar.gz
-423b32c57431829c3901b685d7c241cfb6449a9cf1155ac7aa012fdafc25d1d0ad5b84ec66edc9aa3cc558a21738c0db77443f665d7dfc823a8b0251b3195202 style.patch"
diff --git a/testing/font-uw-ttyp0/style.patch b/testing/font-uw-ttyp0/style.patch
deleted file mode 100644
index c214f773be..0000000000
--- a/testing/font-uw-ttyp0/style.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- a/VARIANTS.dat
-+++ b/VARIANTS.dat
-@@ -1,5 +1,5 @@
- # The UW ttyp0 fonts offer stylistic glyph variants for many characters.
--#
-+#
- # Edit this file to specify your preferred glyph variants.
- #
- # *********************************************************************
-@@ -12,8 +12,8 @@
- # | slightly slanted and curly. If you prefer a straight vertical line
- # | for the apostrophe and a slanted non-curly line for the grave
- # | accent, delete the "#" in the following two lines:
--#COPYTO AccStress PApostropheAscii
--#COPYTO PAmComma AccGraveAscii
-+COPYTO AccStress PApostropheAscii
-+COPYTO PAmComma AccGraveAscii
-
- # +--------------------------------------------------------------------
- # | 0030 DIGIT ZERO
-@@ -23,7 +23,7 @@
- # | rectangular). If you prefer a dotted or slashed zero, delete
- # | the "#" in one of the following two lines:
- #COPYTO Digit0Dotted Digit0
--#COPYTO Digit0Slashed Digit0
-+COPYTO Digit0Slashed Digit0
-
- # +--------------------------------------------------------------------
- # | 002A ASTERISK
-@@ -31,7 +31,7 @@
- # | The default glyph for the asterisk is centered (like a mathematical
- # | operator). If you prefer a raised asterisk (like a footnote mark),
- # | delete the "#" in the following line:
--#COPYTO SupAsterisk SAsterisk
-+COPYTO SupAsterisk SAsterisk
-
- # +--------------------------------------------------------------------
- # | 003C LESS-THAN SIGN
-@@ -58,7 +58,7 @@
- # | glyph (i.e., the standard behaviour) or a visible space that
- # | doesn't stick out so much, delete the "#" in one of the following
- # | two lines:
--#COPYTO Space SpaceNoBreak
-+COPYTO Space SpaceNoBreak
- #COPYTO DVisibleSpace SpaceNoBreak
-
- # +--------------------------------------------------------------------
-@@ -68,7 +68,7 @@
- # | (This is non-standard, but it reduces the risk of programming
- # | mistakes.) If you prefer a soft hyphen that looks like a minus
- # | sign, delete the "#" in the following line:
--#COPYTO PHyphenMinus PHyphenSoft
-+COPYTO PHyphenMinus PHyphenSoft
-
- # +--------------------------------------------------------------------
- # | 0192 LATIN SMALL LETTER F WITH HOOK
diff --git a/testing/fpc-stage0/APKBUILD b/testing/fpc-stage0/APKBUILD
new file mode 100644
index 0000000000..04637a4e72
--- /dev/null
+++ b/testing/fpc-stage0/APKBUILD
@@ -0,0 +1,53 @@
+# Contributor: Leo <thinkabit.ukim@gmail.com>
+# Contributor: Maxim Karasev <begs@disroot.org>
+# Maintainer: Maxim Karasev <begs@disroot.org>
+pkgname=fpc-stage0
+pkgver=3.2.2
+pkgrel=0
+pkgdesc="Free Pascal Compiler binary for bootstrapping"
+url="http://freepascal.org"
+arch="x86_64"
+license="GPL-2.0-or-later AND LGPL-2.1-or-later"
+_fpcarchs="x86_64 aarch64 arm powerpc64le i386"
+for _fpcarch in $_fpcarchs; do
+ source="$source
+ https://downloads.sourceforge.net/sourceforge/freepascal/Linux/$pkgver/fpc-$pkgver.$_fpcarch-linux.tar"
+done
+case "$CARCH" in
+ x86_64|aarch64) _fpcarch="$CARCH";;
+ armv7|armhf) _fpcarch=arm;;
+ ppc64le) _fpcarch=powerpc64;;
+ x86) _fpcarch=i386;;
+esac
+options="!check" # no tests
+builddir="$srcdir/fpc-$pkgver.$_fpcarch-linux"
+
+# Provide fpc-bootstrap for testing/cyclone.
+provides="fpc-bootstrap"
+provider_priority=1 # lowest
+
+package() {
+ echo "$CARCH"
+ tar xf binary.$_fpcarch-linux.tar
+
+ # Unpack only files strictly necessary for build
+ tar xf base.$_fpcarch-linux.tar.gz
+ tar xf utils-fpcm.$_fpcarch-linux.tar.gz
+
+ install -Dm755 bin/* -t "$pkgdir"/usr/bin/
+
+ cp -r lib "$pkgdir"/usr
+
+ # Create a symlink needed for fpc to find appropriate binary
+ ln -s /usr/lib/fpc/"$pkgver"/"$(find "$pkgdir"/usr/lib/fpc/"$pkgver"\
+ -maxdepth 1 -executable -name "ppc*" | head -n1 |
+ xargs basename)" "$pkgdir"/usr/bin
+}
+
+sha512sums="
+58b8722e65e2c466bd20d6aeedbd675c733ec144bb91c562f7c2f2bc04ec8696c526bef6804f10e554961b2342562d484e0dbea6440aef0c605593dfac826729 fpc-3.2.2.powerpc64le-linux.tar
+534df830a951824525044479ded23ef1e61b104c0dd65c837ad0d8d9ced9eb7349925a3f759756aa95ae17e567d8b1cd5c7e2092d3c665eaac578845b48aa467 fpc-3.2.2.x86_64-linux.tar
+b4f1a94d1a05901f4ffc2e07519e9b03666850211e571cbce33f0ba16d8a1d88de256c8e111579f46d56f157630dfc722a8ae9ce2b200fc784c588ea4e6bd5df fpc-3.2.2.i386-linux.tar
+8a52c53cd167af39222296db7c91aadf0b5d845272833a961c5db0c7d2d4cb5e61f41f71e0989c193dc2923770440b19d7d3d71de65291d0a3e0a15edc793316 fpc-3.2.2.aarch64-linux.tar
+7dd3435e74d2e5ec45fe5ca9a5d621ababe9ac0e9131c73a184686fb97892f64358157bfa92e5238f5b16eaf9f9198dffbbddd58d5d04b4a2d6a63cfdc16a491 fpc-3.2.2.arm-linux.tar
+"
diff --git a/testing/fpc/APKBUILD b/testing/fpc/APKBUILD
new file mode 100644
index 0000000000..027a29cdeb
--- /dev/null
+++ b/testing/fpc/APKBUILD
@@ -0,0 +1,83 @@
+# Contributor: Leo <thinkabit.ukim@gmail.com>
+# Contributor: Maxim Karasev <begs@disroot.org>
+# Maintainer: Maxim Karasev <begs@disroot.org>
+pkgname=fpc
+pkgver=3.2.2
+pkgrel=0
+pkgdesc="Free Pascal Compiler"
+url="http://freepascal.org"
+arch="x86_64"
+license="GPL-2.0-or-later AND LGPL-2.1-or-later"
+makedepends="fpc-bootstrap"
+subpackages="$pkgname-doc"
+source="https://downloads.sourceforge.net/sourceforge/freepascal/fpcbuild-$pkgver.tar.gz
+ musl-__libc_csu.patch"
+options="!check" # no tests
+builddir="$srcdir/fpcbuild-$pkgver"
+
+# FPC is self-hosting and requires itself to build. We use fpc-stage0 to build
+# fpc initially and then use fpc itself. Therefore we make fpc provide
+# fpc-bootstrap as well and prioritize it over fpc-stage0
+provides="fpc-bootstrap"
+provider_priority=100 # highest
+
+case "$CARCH" in
+ armel) _ld="ld-linux.so.3" ;;
+ armhf | armv7) _ld="ld-linux-armhf.so.3" ;;
+ aarch64) _ld="ld-linux-aarch64.so.1" ;;
+ x86) _ld="ld-linux.so.2" ;;
+ x86_64) _ld="ld-linux-x86-64.so.2" ;;
+ mips*) _ld="ld.so.1" ;;
+ s390x) _ld="ld64.so.1" ;;
+ ppc64le) _ld="ld64.so.2" ;;
+esac
+
+case "$CARCH" in
+ aarch64*) _ldarch="aarch64" ;;
+ arm*) _ldarch="arm" ;;
+ x86) _ldarch="i386" ;;
+ x86_64) _ldarch="x86_64" ;;
+ ppc) _ldarch="powerpc" ;;
+ ppc64*) _ldarch="powerpc64" ;;
+ s390*) _ldarch="s390x" ;;
+ mips64*) _ldarch="mips64" ;;
+ mips*) _ldarch="mips" ;;
+ riscv64) _ldarch="riscv64" ;;
+esac
+
+prepare() {
+ default_prepare
+
+ # Otherwise all built binaries are referencing to glibc linker
+ sed -i "s,/lib64/$_ld,/lib/ld-musl-$_ldarch.so.1," \
+ "$builddir"/fpcsrc/compiler/systems/t_linux.pas
+}
+
+build() {
+ cd fpcsrc/compiler
+ fpcmake -Tall
+ cd ../
+ make build NOGDB=1
+}
+
+package() {
+ make install \
+ NOGDB=1 \
+ PREFIX="$pkgdir"/usr \
+ INSTALL_MANDIR="$pkgdir"/usr/share/man
+
+ # Create a symlink needed for fpc to find ppcx64
+ ln -s /usr/lib/fpc/"$pkgver"/ppcx64 "$pkgdir"/usr/bin
+
+ # Install configuration
+ mkdir -p "$pkgdir"/etc
+ "$pkgdir"/usr/lib/fpc/"$pkgver"/samplecfg \
+ "$pkgdir"/usr/lib/fpc/"$pkgver" "$pkgdir"/etc
+
+ find "$pkgdir"/etc/ -type f -exec sed -i "s|$pkgdir||g" {} \;
+}
+
+sha512sums="
+75889bb54adc70a6e2cbd291476b9b12d61c8f943a05b7d16d2024de3215c935465ff43b1400c412e128e260c7f49a9c66e35c21f86cb866e671b5b60a282d82 fpcbuild-3.2.2.tar.gz
+5ea236d2a3fafbcc0fbdd1d2b14900bae6c00933d75faf5eda42be0bf73f949e4ba3a72777da327544e39561a84666f9cd29f237e0ec7c5a363225df144e6a93 musl-__libc_csu.patch
+"
diff --git a/testing/fpc/musl-__libc_csu.patch b/testing/fpc/musl-__libc_csu.patch
new file mode 100644
index 0000000000..a71a5860d8
--- /dev/null
+++ b/testing/fpc/musl-__libc_csu.patch
@@ -0,0 +1,23 @@
+Source: void-packages
+
+Hack to remove reference to the (glibc only) symbols __libc_csu_init
+and __libc_csu_fini. They are the libc initialize and finish function
+pointers. Not sure if this actually works, or if calling the pointers
+to be stored there before/after the call to PASCALMAIN is required.
+
+--- a/fpcsrc/rtl/linux/x86_64/cprt0.as 2015-12-16 16:28:03.000000000 +0100
++++ b/fpcsrc/rtl/linux/x86_64/cprt0.as 2018-01-02 14:41:08.598952141 +0100
+@@ -63,9 +63,10 @@
+ pushq %rsp
+
+ /* Pass address of our own entry points to .fini and .init. */
+- movq __libc_csu_init@GOTPCREL(%rip), %rcx
+- movq __libc_csu_fini@GOTPCREL(%rip), %r8
+-
++/* not availble in musl libc
++ * movq __libc_csu_init@GOTPCREL(%rip), %rcx
++ * movq __libc_csu_fini@GOTPCREL(%rip), %r8
++ */
+ movq main_stub@GOTPCREL(%rip), %rdi
+
+ /* Call the user's main function, and exit with its value.
diff --git a/testing/freecad/APKBUILD b/testing/freecad/APKBUILD
new file mode 100644
index 0000000000..09243d7dab
--- /dev/null
+++ b/testing/freecad/APKBUILD
@@ -0,0 +1,115 @@
+# Contributor: Aiden Grossman <agrossman154@yahoo.com>
+# Maintainer: Aiden Grossman <agrossman154@yahoo.com>
+pkgname=freecad
+pkgver=0.19.2
+pkgrel=4
+pkgdesc="Free and open source 3D parametric modeler"
+url="https://freecadweb.org/"
+license="LGPL-2.0-or-later"
+arch="x86_64" # dependency OpenCascade is only x86_64
+depends="
+ python3 py3-pyside2 py3-six py3-pivy py3-matplotlib py3-ply py3-yaml
+ py3-numpy graphviz opencascade hdf5
+ "
+makedepends="
+ boost-dev xerces-c-dev cmake doxygen python3-dev opencascade-dev glu-dev
+ vtk-dev libmedc-dev hdf5-dev eigen-dev qt5-qtxmlpatterns-dev qt5-qtsvg-dev
+ qt5-qtwebengine-dev coin-dev freeimage-dev swig
+ "
+checkdepends="xvfb-run mesa mesa-dri-gallium ttf-opensans"
+source="https://github.com/FreeCAD/FreeCAD/archive/$pkgver/freecad-$pkgver.tar.gz
+ vtk9.patch
+ backtrace.patch
+ tbb.patch
+ resourceDirectory.patch
+ https://github.com/FreeCAD/FreeCAD/commit/6f3b00d67ec0bd0072b7b493e2a38d2a2e3af27d.patch
+ https://github.com/FreeCAD/FreeCAD/commit/77b198048a63f1e9ca15eef64c8042d599a14cf3.patch
+ https://github.com/FreeCAD/FreeCAD/commit/9b4db7e06472bf5550d0b7627b28b425bfcc8470.patch
+ opencascade.patch
+ https://github.com/FreeCAD/FreeCAD/commit/c9d17ebde2400f83d1e1e799bdb0a7f85a0da96d.patch
+ https://github.com/FreeCAD/FreeCAD/commit/442c8d52a1989da8f17d60fafea5b81d79cbf0ab.patch
+ https://github.com/FreeCAD/FreeCAD/commit/8e6dab209ee59be61d83a0ff249283a8809fa917.patch
+ https://github.com/FreeCAD/FreeCAD/commit/0f3b5d275070477b7cd2bbfa2dc930135448fb0c.patch
+ https://github.com/FreeCAD/FreeCAD/commit/08d46b5f882420c8d4066427fcc8dab5b1882097.patch
+ https://github.com/FreeCAD/FreeCAD/commit/51e4366085e59a9b511f7160d66493e9b3dfc7d8.patch
+ https://github.com/FreeCAD/FreeCAD/commit/c2c5ae1bf0c571270ecacf257a51e9b064fc609a.patch
+ https://github.com/FreeCAD/FreeCAD/commit/302568d177ddde171c28eaca89e8b4a49466974f.patch
+ https://github.com/FreeCAD/FreeCAD/commit/66d3dd897f63c2e4f8ffd6eced730c6a3372ad51.patch
+ https://github.com/FreeCAD/FreeCAD/commit/03be15cc6b460ab62548142287eb9f677f463a44.patch
+ https://github.com/FreeCAD/FreeCAD/commit/f628050732cc5d1d49fc18282ed508ca3061bb10.patch
+ https://github.com/FreeCAD/FreeCAD/commit/16ff933b09176d83fb0785e74f36038311f0eaeb.patch
+ https://github.com/FreeCAD/FreeCAD/commit/03da9d3501c6b596ad1828b99cb8d923cea56485.patch
+ https://github.com/FreeCAD/FreeCAD/commit/fecf9c2e8492ddab0858b4af23b56da36bff6f6a.patch
+ https://github.com/FreeCAD/FreeCAD/commit/8453d415150f289d36dfe4cbe6b91dfc512e82fe.patch
+ https://github.com/FreeCAD/FreeCAD/commit/3131b97aa88736ac628428a8ceb025d9b7a8a965.patch
+ https://github.com/FreeCAD/FreeCAD/commit/5b4c246944c72459016efff6ae903ac66c090991.patch
+ https://github.com/FreeCAD/FreeCAD/commit/f55c46cc86344a6d7389156c015194f7d0fd2b63.patch
+ "
+builddir="$srcdir/FreeCAD-$pkgver"
+
+build() {
+ cmake . -B ./build \
+ -DCMAKE_BUILD_TYPE=None \
+ -DCMAKE_C_FLAGS="$CFLAGS -fPIC -w" \
+ -DCMAKE_CXX_FLAGS="$CXXFLAGS -fPIC -w" \
+ -DCMAKE_INSTALL_PREFIX=/usr/lib/freecad \
+ -DCMAKE_INSTALL_DATADIR=/usr/share/freecad \
+ -DCMAKE_INSTALL_DATAROOTDIR=/usr/share \
+ -DCMAKE_INSTALL_DOCDIR=/usr/share/freecad/doc \
+ -DBUILD_ENABLE_CXX_STD=C++14 \
+ -DBUILD_QT5=ON \
+ -DFREECAD_USE_EXTERNAL_PIVY=ON \
+ -DFREECAD_USE_OCC_VARIANT="Official Version" \
+ -DFREECAD_USE_QT_FILEDIALOG=ON \
+ -DPYTHON_EXECUTABLE=/usr/bin/python3
+ cmake --build build
+}
+
+check() {
+ DESTDIR="$PWD"/test_install cmake --install build
+ mkdir -p "$PWD"/test_install/usr/bin
+ ln -s "$PWD"/test_install/usr/lib/freecad/bin/FreeCAD "$PWD"/test_install/usr/bin/FreeCAD
+ ln -s "$PWD"/test_install/usr/lib/freecad/bin/FreeCADCmd "$PWD"/test_install/usr/bin/FreeCADCmd
+ LD_LIBRARY_PATH="$PWD"/test_install/usr/lib/freecad/lib \
+ xvfb-run "$PWD"/test_install/usr/bin/FreeCAD --run-test 0
+}
+
+package() {
+ DESTDIR="$pkgdir" cmake --install build
+
+ # FreeCAD does not initialize correctly when binaries
+ # are located under /usr/bin; thus, symlinks are necessary.
+ install -d "$pkgdir"/usr/bin
+ ln -s /usr/lib/freecad/bin/FreeCAD "$pkgdir"/usr/bin/FreeCAD
+ ln -s /usr/lib/freecad/bin/FreeCADCmd "$pkgdir"/usr/bin/FreeCADCmd
+}
+
+sha512sums="
+420f00e696725cbd31c936c47b6ac226d866a17c7b7683ad381b8dd5edaffc7dfb1a3c4238c08e8b4fd34ef0c08d7c244cb7797012e596df1ce0a4f6e3be6b72 freecad-0.19.2.tar.gz
+53f2becfebff2713c07a4a7e78a438502ea4cb401dfab116a2f84cb066f33adfaeaae9b03e9243f0534cb648cd7e3753e66456aa1e5600a0fdb724d7ef7fbf50 vtk9.patch
+04e9a2cb4323aa66445eab0e27648272b84a9459f9b55784454edb74b2f3f9031749777ac4b8d01ebcae63703398d7e0033b62196461378cc9a16d7f372d5e10 backtrace.patch
+46558d5f979836e7ea4571b9806c6d8d95753a0b6ae16aced0ecd63ba5679c319a1ee94a08b058be191fa2835e168a7702ca0005fb110b76fbbc2eb42852d47c tbb.patch
+a12be7920a9ba0076c45c40d4afc43e9b9a4f8370430f8be0b505c30401564c25d9ae651b840332a716d4de2f0b0ebfb61b2f4c7952b9ea6d4d2e08d3a42bfef resourceDirectory.patch
+e79b92f208fb24cdb8a729645db0774b33ce31890d4b99775900fc17070d5569c7072589e7b2c021d320cc6168b5b004f83f8625b724d992a0853b3a108dfa94 6f3b00d67ec0bd0072b7b493e2a38d2a2e3af27d.patch
+5a0897872a7f5f817a1300651e77d7fd9a2b4bca1a752bb02dc722a94cf6ac49e87fd98a22853a3147479acdb936023a110a404f9b1c1027755ae5dc08a4ca9f 77b198048a63f1e9ca15eef64c8042d599a14cf3.patch
+bbb3eb25e903941ce641442c6ad1ede063bd1d47911ea7583f5eb88db97b20e8441ab7db2426d99ead1ddc03a263df29c147c6a56fb7c56a6031edc198e6f539 9b4db7e06472bf5550d0b7627b28b425bfcc8470.patch
+3ea009c5d3654b4e8002f3a446ba84b35afea31b1df973f260aef6499b64edce96b8b50b2b3c0629f1f0814863c5b28f4d91f4648b4869ce477f1adda6c03236 opencascade.patch
+1c91a71e2624b51f5600d56eca7ca0e63341effe5429fd003fb1cbab5f78d3119075f1fe9b49be32377aba80f4b56ebeedf020565fa3d4c9bd610def0ebd5fb8 c9d17ebde2400f83d1e1e799bdb0a7f85a0da96d.patch
+3cd23462ebe8593d7b397a3bcff19dd3a068e917dcd4d75943a6bb3984527150ba71d8d1b16a7def71f9a149e083d7e7138810729528edc34b5445c53cb9b094 442c8d52a1989da8f17d60fafea5b81d79cbf0ab.patch
+6b1e3733e4d191e70a1af6edad13fdf51fa7c21297d5a65cfba8891027675cb82b6e66342a40ef16045a3150ac6b0e63aae8eeeb48378afa1b4f4f10ff6c8ed1 8e6dab209ee59be61d83a0ff249283a8809fa917.patch
+302a7e8eb5544ab7b610a1e3a706d4dd1afde554874e3677288991ecda6928489000c670db0873e34e803c5e5fcdee4fb1c290d6342b7f7450c30997fa00b0fc 0f3b5d275070477b7cd2bbfa2dc930135448fb0c.patch
+e33702c32073539a9135e17feab221cd34bb3aaa2bdb4d864767c7ec19be2bcb3dc7714db534dcb1ebbbca29793ef1c74edcab7d7a06bda59f1211aec37d5672 08d46b5f882420c8d4066427fcc8dab5b1882097.patch
+48c244d6a07f2dfd6d2fcc54afe53020ec3126f613207cee2d3b7125e187b4dcceabb46b9a893b5f276d4e243ca907097bcc8b6a55c9701ce806da18b2870fde 51e4366085e59a9b511f7160d66493e9b3dfc7d8.patch
+b99dfdccf4e79bfc072e5aeace49e8433456dcdab0ee701b3137aa1e177cd3f48ee32f3ba7946e7a4d7e80cf7387c71d1ab2a5f417faa6dc5a235820f2a081cd c2c5ae1bf0c571270ecacf257a51e9b064fc609a.patch
+65a71e1aec106236c3141819b8f03e37d596e0df0271b03b5ee67ae3f2de9da8c0b96613ab7226a849022442e24382473cff4ce7aee48548d66326942ffb1abb 302568d177ddde171c28eaca89e8b4a49466974f.patch
+4d188c8886a810cfa9b7a853315a3fa782fb28e79882ce87be27335b111e263161151990acd0c5351e09876088976570cb2b55f4a358d9a96ddb12b3ea1d42cb 66d3dd897f63c2e4f8ffd6eced730c6a3372ad51.patch
+6d6d5cc1d8f00160b3d06c86ae89976e560df886a83e7279cf29fbdda582e8ccad53d8fb974ccc719104e490ddab24311ea1683b179121211e5306cf55a91946 03be15cc6b460ab62548142287eb9f677f463a44.patch
+6a413f455423569e3fe77f96ea2e4961456054b850e35e2ee3f560655a13776ccac5153f72acb4ce7c0b5671e66a91a145b7e2a0c5606aefc53f7562158c3f90 f628050732cc5d1d49fc18282ed508ca3061bb10.patch
+d530d195f8b96bff3b4083c7ec60fbcb78813f872ab4cadab09340eb98fcbcc95649095c07760b7fe9d66db7f2ce5a475cbb753d4c7b73afa5b13009fccdc805 16ff933b09176d83fb0785e74f36038311f0eaeb.patch
+3a00f3b1d3c60ccfb577afb2414968ad7f1a57948fe8df66054f4e30ca9e80f90a77dfb0ed29267333cd3f8aae34856efbf5071ef07817f03b660db6ca265051 03da9d3501c6b596ad1828b99cb8d923cea56485.patch
+d3633d9ea927015f07599d9962e76f88905a94706c8f98badbdd9cdf4c9df798e452802867080d2c8c28f360762f2b829f892f8172954a88037a38f884961788 fecf9c2e8492ddab0858b4af23b56da36bff6f6a.patch
+a285a62a88fc932e391784aecdb6fb93e40aec2c139075c10737d6083492ea2eb41b334544771c263a9e0da7c53670a0fc5a92a76a922ff2ad8967a300788196 8453d415150f289d36dfe4cbe6b91dfc512e82fe.patch
+574532209917525ac3019aa55ade8b3be42864cd0b80e102bcd9bcdb90e8adfd8c350e7cb94bf2100d099668c7088fe8cab72aedac5dd0ca74cb0287f7f512b7 3131b97aa88736ac628428a8ceb025d9b7a8a965.patch
+b536eea2f3bcbb596e13689d62954914e3634b235f253e4949d7c83715245ebf4d8c23c4bf24d56de1b6893fc3c6c762c03b1117b1966e520838090610e87269 5b4c246944c72459016efff6ae903ac66c090991.patch
+deddc46ce3362bf2855bb74436c8a1f3547cfb777771c9a0420d96ddd92375129287ffe62966f16d204be89f0c6a384b916e428ff4ebd147480de2f7b886865c f55c46cc86344a6d7389156c015194f7d0fd2b63.patch
+"
diff --git a/testing/freecad/backtrace.patch b/testing/freecad/backtrace.patch
new file mode 100644
index 0000000000..ca6e79ab01
--- /dev/null
+++ b/testing/freecad/backtrace.patch
@@ -0,0 +1,32 @@
+Removes the use of backtrace as musl libc does not support it.
+Patch is upstreamed and should not be needed after FreeCAD v0.20.
+--- ./src/App/Application.cpp
++++ ./src/App/Application.cpp
+@@ -1589,6 +1589,7 @@
+ // This function produces a stack backtrace with demangled function & method names.
+ void printBacktrace(size_t skip=0)
+ {
++#if BACKTRACE_PRESENT
+ void *callstack[128];
+ size_t nMaxFrames = sizeof(callstack) / sizeof(callstack[0]);
+ size_t nFrames = backtrace(callstack, nMaxFrames);
+@@ -1619,6 +1620,9 @@
+ }
+
+ free(symbols);
++#else
++ std:cerr << "FreeCAD has not been compiled with backtrace support and thus some debug information is not available" << std::endl;
++#endif
+ }
+ #endif
+
+--- ./cMake/ConfigureChecks.cmake
++++ ./cMake/ConfigureChecks.cmake
+@@ -62,4 +62,6 @@
+ SET(HAVE_QT_KEYPAD_DEFINE 1)
+ SET(HAVE_QWIDGET_SHOWFULLSCREEN 1)
+
+-
++IF(Backtrace_FOUND)
++ ADD_COMPILE_DEFINITIONS(BACKTRACE_PRESENT)
++ENDIF(Backtrace_FOUND)
diff --git a/testing/freecad/opencascade.patch b/testing/freecad/opencascade.patch
new file mode 100644
index 0000000000..9a72b7c5cb
--- /dev/null
+++ b/testing/freecad/opencascade.patch
@@ -0,0 +1,629 @@
+From 74639da997d5f2e53f001d9f256be86ceee901f5 Mon Sep 17 00:00:00 2001
+From: wmayer <wmayer@users.sourceforge.net>
+Date: Sat, 9 Oct 2021 13:49:02 +0200
+Subject: [PATCH] OCCT: port FreeCAD sources to version 7.6 SMESH is not yet
+ ported Although FreeCAD code compiles with OCCT 7.6 it doesn't work at the
+ moment
+
+---
+ src/Mod/Drawing/App/DrawingExport.cpp | 11 ++-
+ src/Mod/Drawing/App/ProjectionAlgos.cpp | 3 -
+ src/Mod/Import/App/ImpExpDxf.cpp | 9 +-
+ .../App/GeomPlate/CurveConstraintPyImp.cpp | 41 +++++++++-
+ src/Mod/Part/App/Geometry.cpp | 7 +-
+ src/Mod/Part/App/PartFeatures.cpp | 22 ++---
+ src/Mod/Part/App/TopoShape.cpp | 82 ++++++-------------
+ src/Mod/Part/App/TopoShapeFacePyImp.cpp | 10 +++
+ src/Mod/Part/App/TopoShapeWirePyImp.cpp | 6 +-
+ src/Mod/Part/Gui/TaskCheckGeometry.cpp | 6 +-
+ src/Mod/Part/Gui/ViewProviderExt.cpp | 17 ++++
+ src/Mod/Path/App/AppPathPy.cpp | 5 +-
+ src/Mod/TechDraw/App/Geometry.cpp | 12 ++-
+ 13 files changed, 138 insertions(+), 93 deletions(-)
+
+diff --git a/src/Mod/Drawing/App/DrawingExport.cpp b/src/Mod/Drawing/App/DrawingExport.cpp
+index b87891ed507..7572be417cf 100644
+--- a/src/Mod/Drawing/App/DrawingExport.cpp
++++ b/src/Mod/Drawing/App/DrawingExport.cpp
+@@ -64,10 +64,7 @@
+ #include <BRep_Tool.hxx>
+
+ #include <BRepAdaptor_CompCurve.hxx>
+-#include <BRepAdaptor_HCompCurve.hxx>
+ #include <Approx_Curve3d.hxx>
+-#include <BRepAdaptor_HCurve.hxx>
+-#include <BRepAdaptor_HCurve.hxx>
+ #include <Geom_BSplineCurve.hxx>
+ #include <Geom_BezierCurve.hxx>
+ #include <GeomConvert_BSplineCurveToBezierCurve.hxx>
+@@ -75,11 +72,19 @@
+ #include <Geom2d_BSplineCurve.hxx>
+ #include <BRepLProp_CLProps.hxx>
+ #include <Standard_Failure.hxx>
++#include <Standard_Version.hxx>
++#if OCC_VERSION_HEX < 0x070600
++#include <BRepAdaptor_HCurve.hxx>
++#endif
+
+ #include "DrawingExport.h"
+ #include <Base/Tools.h>
+ #include <Base/Vector3D.h>
+
++#if OCC_VERSION_HEX >= 0x070600
++using BRepAdaptor_HCurve = BRepAdaptor_Curve;
++#endif
++
+ using namespace Drawing;
+ using namespace std;
+
+diff --git a/src/Mod/Drawing/App/ProjectionAlgos.cpp b/src/Mod/Drawing/App/ProjectionAlgos.cpp
+index 9afae7e9c00..da03d490579 100644
+--- a/src/Mod/Drawing/App/ProjectionAlgos.cpp
++++ b/src/Mod/Drawing/App/ProjectionAlgos.cpp
+@@ -61,10 +61,7 @@
+ #include <BRepMesh_IncrementalMesh.hxx>
+ #include <BRepLib.hxx>
+ #include <BRepAdaptor_CompCurve.hxx>
+-#include <BRepAdaptor_HCompCurve.hxx>
+ #include <Approx_Curve3d.hxx>
+-#include <BRepAdaptor_HCurve.hxx>
+-#include <BRepAdaptor_HCurve.hxx>
+ #include <Geom_BSplineCurve.hxx>
+ #include <Geom_BezierCurve.hxx>
+ #include <GeomConvert_BSplineCurveToBezierCurve.hxx>
+diff --git a/src/Mod/Import/App/ImpExpDxf.cpp b/src/Mod/Import/App/ImpExpDxf.cpp
+index 09827bd9285..dcd88ef1384 100644
+--- a/src/Mod/Import/App/ImpExpDxf.cpp
++++ b/src/Mod/Import/App/ImpExpDxf.cpp
+@@ -29,7 +29,6 @@
+
+ #include <Approx_Curve3d.hxx>
+ #include <BRepAdaptor_Curve.hxx>
+-#include <BRepAdaptor_HCurve.hxx>
+ #include <BRep_Builder.hxx>
+ #include <BRepBuilderAPI_MakeEdge.hxx>
+ #include <BRepBuilderAPI_MakeVertex.hxx>
+@@ -47,6 +46,7 @@
+ #include <gp_Pnt.hxx>
+ #include <gp_Dir.hxx>
+ #include <gp_Vec.hxx>
++#include <Standard_Version.hxx>
+ #include <TopoDS.hxx>
+ #include <TopoDS_Edge.hxx>
+ #include <TopoDS_Vertex.hxx>
+@@ -55,6 +55,9 @@
+ #include <TopExp_Explorer.hxx>
+ #include <TopoDS_Edge.hxx>
+ #include <TColgp_Array1OfPnt.hxx>
++#if OCC_VERSION_HEX < 0x070600
++#include <BRepAdaptor_HCurve.hxx>
++#endif
+
+ #include <Base/Console.h>
+ #include <Base/Parameter.h>
+@@ -68,6 +71,10 @@
+
+ using namespace Import;
+
++#if OCC_VERSION_HEX >= 0x070600
++using BRepAdaptor_HCurve = BRepAdaptor_Curve;
++#endif
++
+
+ //******************************************************************************
+ // reading
+diff --git a/src/Mod/Part/App/GeomPlate/CurveConstraintPyImp.cpp b/src/Mod/Part/App/GeomPlate/CurveConstraintPyImp.cpp
+index 3271f3651a8..b63227d5374 100644
+--- a/src/Mod/Part/App/GeomPlate/CurveConstraintPyImp.cpp
++++ b/src/Mod/Part/App/GeomPlate/CurveConstraintPyImp.cpp
+@@ -24,10 +24,13 @@
+ #include "PreCompiled.h"
+ #ifndef _PreComp_
+ # include <GeomAdaptor_Curve.hxx>
+-# include <GeomAdaptor_HCurve.hxx>
+ # include <Geom2dAdaptor_Curve.hxx>
+-# include <Geom2dAdaptor_HCurve.hxx>
+ # include <Standard_Failure.hxx>
++# include <Standard_Version.hxx>
++# if OCC_VERSION_HEX < 0x070600
++# include <GeomAdaptor_HCurve.hxx>
++# include <Geom2dAdaptor_HCurve.hxx>
++# endif
+ #endif
+
+ #include "GeomPlate/CurveConstraintPy.h"
+@@ -76,6 +79,16 @@ int CurveConstraintPy::PyInit(PyObject* args, PyObject* kwds)
+ return -1;
+ }
+
++#if OCC_VERSION_HEX >= 0x070600
++ Handle(Adaptor3d_Curve) hCurve;
++ if (curve->getTypeId().isDerivedFrom(GeomTrimmedCurve::getClassTypeId())) {
++ GeomTrimmedCurve* trim = static_cast<GeomTrimmedCurve*>(curve);
++ hCurve = new GeomAdaptor_Curve(handle, trim->getFirstParameter(), trim->getLastParameter());
++ }
++ else {
++ hCurve = new GeomAdaptor_Curve(handle);
++ }
++#else
+ Handle(Adaptor3d_HCurve) hCurve;
+ if (curve->getTypeId().isDerivedFrom(GeomTrimmedCurve::getClassTypeId())) {
+ GeomTrimmedCurve* trim = static_cast<GeomTrimmedCurve*>(curve);
+@@ -86,6 +99,7 @@ int CurveConstraintPy::PyInit(PyObject* args, PyObject* kwds)
+ GeomAdaptor_Curve adapt(handle);
+ hCurve = new GeomAdaptor_HCurve(adapt);
+ }
++#endif
+
+ ptr.reset(new GeomPlate_CurveConstraint(hCurve, order, nbPts, tolDist, tolAng, tolCurv));
+ }
+@@ -212,11 +226,15 @@ PyObject* CurveConstraintPy::curve3d(PyObject *args)
+ return nullptr;
+
+ try {
+- Handle(Adaptor3d_HCurve) hAdapt = getGeomPlate_CurveConstraintPtr()->Curve3d();
++ auto hAdapt = getGeomPlate_CurveConstraintPtr()->Curve3d();
+ if (hAdapt.IsNull())
+ Py_Return;
+
++#if OCC_VERSION_HEX >= 0x070600
++ const Adaptor3d_Curve& a3d = *hAdapt;
++#else
+ const Adaptor3d_Curve& a3d = hAdapt->Curve();
++#endif
+ std::unique_ptr<GeomCurve> ptr(Part::makeFromCurveAdaptor(a3d));
+ return ptr->getPyObject();
+ }
+@@ -282,6 +300,16 @@ PyObject* CurveConstraintPy::setProjectedCurve(PyObject *args)
+ return nullptr;
+ }
+
++#if OCC_VERSION_HEX >= 0x070600
++ Handle(Adaptor2d_Curve2d) hCurve;
++ if (handle->IsKind(STANDARD_TYPE(Geom2d_TrimmedCurve))) {
++ Handle(Geom2d_TrimmedCurve) aTC (Handle(Geom2d_TrimmedCurve)::DownCast (handle));
++ hCurve = new Geom2dAdaptor_Curve(handle, aTC->FirstParameter(), aTC->LastParameter());
++ }
++ else {
++ hCurve = new Geom2dAdaptor_Curve(handle);
++ }
++#else
+ Handle(Adaptor2d_HCurve2d) hCurve;
+ if (handle->IsKind(STANDARD_TYPE(Geom2d_TrimmedCurve))) {
+ Handle(Geom2d_TrimmedCurve) aTC (Handle(Geom2d_TrimmedCurve)::DownCast (handle));
+@@ -292,6 +320,7 @@ PyObject* CurveConstraintPy::setProjectedCurve(PyObject *args)
+ Geom2dAdaptor_Curve adapt(handle);
+ hCurve = new Geom2dAdaptor_HCurve(adapt);
+ }
++#endif
+
+ getGeomPlate_CurveConstraintPtr()->SetProjectedCurve(hCurve, tolU, tolV);
+ Py_Return;
+@@ -308,11 +337,15 @@ PyObject* CurveConstraintPy::projectedCurve(PyObject *args)
+ return nullptr;
+
+ try {
+- Handle(Adaptor2d_HCurve2d) hAdapt = getGeomPlate_CurveConstraintPtr()->ProjectedCurve();
++ auto hAdapt = getGeomPlate_CurveConstraintPtr()->ProjectedCurve();
+ if (hAdapt.IsNull())
+ Py_Return;
+
++#if OCC_VERSION_HEX >= 0x070600
++ const Adaptor2d_Curve2d& a2d = *hAdapt;
++#else
+ const Adaptor2d_Curve2d& a2d = hAdapt->Curve2d();
++#endif
+ std::unique_ptr<Geom2dCurve> ptr(Part::makeFromCurveAdaptor2d(a2d));
+ return ptr->getPyObject();
+ }
+diff --git a/src/Mod/Part/App/Geometry.cpp b/src/Mod/Part/App/Geometry.cpp
+index e6d6396ca94..1d1d67d4f01 100644
+--- a/src/Mod/Part/App/Geometry.cpp
++++ b/src/Mod/Part/App/Geometry.cpp
+@@ -51,7 +51,6 @@
+ # include <Geom_RectangularTrimmedSurface.hxx>
+ # include <Geom_SurfaceOfRevolution.hxx>
+ # include <Geom_SurfaceOfLinearExtrusion.hxx>
+-# include <GeomAdaptor_HCurve.hxx>
+ # include <GeomAPI_Interpolate.hxx>
+ # include <GeomConvert.hxx>
+ # include <GeomConvert_CompCurveToBSplineCurve.hxx>
+@@ -101,6 +100,9 @@
+ # include <GeomAPI_ExtremaCurveCurve.hxx>
+ # include <ShapeConstruct_Curve.hxx>
+ # include <LProp_NotDefined.hxx>
++# if OCC_VERSION_HEX < 0x070600
++# include <GeomAdaptor_HCurve.hxx>
++# endif
+
+ # include <ctime>
+ # include <cmath>
+@@ -144,6 +146,9 @@
+
+ #include "Geometry.h"
+
++#if OCC_VERSION_HEX >= 0x070600
++using GeomAdaptor_HCurve = GeomAdaptor_Curve;
++#endif
+
+ using namespace Part;
+
+diff --git a/src/Mod/Part/App/PartFeatures.cpp b/src/Mod/Part/App/PartFeatures.cpp
+index 2dc503bdf21..4d9e1fc0f99 100644
+--- a/src/Mod/Part/App/PartFeatures.cpp
++++ b/src/Mod/Part/App/PartFeatures.cpp
+@@ -25,9 +25,7 @@
+ #ifndef _PreComp_
+ # include <BRepFill.hxx>
+ # include <BRepAdaptor_Curve.hxx>
+-# include <BRepAdaptor_HCurve.hxx>
+ # include <BRepAdaptor_CompCurve.hxx>
+-# include <BRepAdaptor_HCompCurve.hxx>
+ # include <BRepLib_MakeWire.hxx>
+ # include <Geom_BSplineSurface.hxx>
+ # include <TopoDS.hxx>
+@@ -43,7 +41,7 @@
+ # include <TopExp_Explorer.hxx>
+ # include <TopoDS.hxx>
+ # include <Precision.hxx>
+-# include <Adaptor3d_HCurve.hxx>
++# include <memory>
+ #endif
+
+
+@@ -170,22 +168,18 @@ App::DocumentObjectExecReturn *RuledSurface::execute(void)
+
+ if (Orientation.getValue() == 0) {
+ // Automatic
+- Handle(Adaptor3d_HCurve) a1;
+- Handle(Adaptor3d_HCurve) a2;
++ std::unique_ptr<Adaptor3d_Curve> a1;
++ std::unique_ptr<Adaptor3d_Curve> a2;
+ if (!isWire) {
+- BRepAdaptor_Curve adapt1(TopoDS::Edge(S1));
+- BRepAdaptor_Curve adapt2(TopoDS::Edge(S2));
+- a1 = new BRepAdaptor_HCurve(adapt1);
+- a2 = new BRepAdaptor_HCurve(adapt2);
++ a1 = std::make_unique<BRepAdaptor_Curve>(TopoDS::Edge(S1));
++ a2 = std::make_unique<BRepAdaptor_Curve>(TopoDS::Edge(S2));
+ }
+ else {
+- BRepAdaptor_CompCurve adapt1(TopoDS::Wire(S1));
+- BRepAdaptor_CompCurve adapt2(TopoDS::Wire(S2));
+- a1 = new BRepAdaptor_HCompCurve(adapt1);
+- a2 = new BRepAdaptor_HCompCurve(adapt2);
++ a1 = std::make_unique<BRepAdaptor_CompCurve>(TopoDS::Wire(S1));
++ a2 = std::make_unique<BRepAdaptor_CompCurve>(TopoDS::Wire(S2));
+ }
+
+- if (!a1.IsNull() && !a2.IsNull()) {
++ if (a1 && a2) {
+ // get end points of 1st curve
+ Standard_Real first, last;
+ first = a1->FirstParameter();
+diff --git a/src/Mod/Part/App/TopoShape.cpp b/src/Mod/Part/App/TopoShape.cpp
+index 05341de3d66..b7617a3943e 100644
+--- a/src/Mod/Part/App/TopoShape.cpp
++++ b/src/Mod/Part/App/TopoShape.cpp
+@@ -38,8 +38,6 @@
+ # include <BRep_Tool.hxx>
+ # include <BRepAdaptor_Curve.hxx>
+ # include <BRepAdaptor_CompCurve.hxx>
+-# include <BRepAdaptor_HCurve.hxx>
+-# include <BRepAdaptor_HCompCurve.hxx>
+ # include <BRepAdaptor_Surface.hxx>
+ # include <BRepAlgoAPI_Common.hxx>
+ # include <BRepAlgoAPI_Cut.hxx>
+@@ -186,6 +184,12 @@
+ #if OCC_VERSION_HEX >= 0x070300
+ # include <BRepAlgoAPI_Defeaturing.hxx>
+ #endif
++
++#if OCC_VERSION_HEX < 0x070600
++# include <BRepAdaptor_HCurve.hxx>
++# include <BRepAdaptor_HCompCurve.hxx>
++#endif
++
+ #endif // _PreComp_
+
+ #include <boost/algorithm/string/predicate.hpp>
+@@ -2133,12 +2137,20 @@ TopoDS_Shape TopoShape::makeTube(double radius, double tol, int cont, int maxdeg
+ if (this->_Shape.IsNull())
+ Standard_Failure::Raise("Cannot sweep along empty spine");
+
++#if OCC_VERSION_HEX >= 0x070600
++ Handle(Adaptor3d_Curve) myPath;
++ if (this->_Shape.ShapeType() == TopAbs_EDGE) {
++ const TopoDS_Edge& path_edge = TopoDS::Edge(this->_Shape);
++ myPath = new BRepAdaptor_Curve(path_edge);
++ }
++#else
+ Handle(Adaptor3d_HCurve) myPath;
+ if (this->_Shape.ShapeType() == TopAbs_EDGE) {
+ const TopoDS_Edge& path_edge = TopoDS::Edge(this->_Shape);
+ BRepAdaptor_Curve path_adapt(path_edge);
+ myPath = new BRepAdaptor_HCurve(path_adapt);
+ }
++#endif
+ //else if (this->_Shape.ShapeType() == TopAbs_WIRE) {
+ // const TopoDS_Wire& path_wire = TopoDS::Wire(this->_Shape);
+ // BRepAdaptor_CompCurve path_adapt(path_wire);
+@@ -3777,72 +3789,32 @@ void TopoShape::getLinesFromSubElement(const Data::Segment* element,
+ for(TopExp_Explorer exp(shape,TopAbs_EDGE);exp.More();exp.Next()) {
+
+ TopoDS_Edge aEdge = TopoDS::Edge(exp.Current());
+- TopLoc_Location aLoc;
+- Handle(Poly_Polygon3D) aPoly = BRep_Tool::Polygon3D(aEdge, aLoc);
++ std::vector<gp_Pnt> points;
+
+- gp_Trsf myTransf;
+- Standard_Integer nbNodesInFace;
+-
+- auto line_start = vertices.size();
+-
+- // triangulation succeeded?
+- if (!aPoly.IsNull()) {
+- if (!aLoc.IsIdentity()) {
+- myTransf = aLoc.Transformation();
+- }
+- nbNodesInFace = aPoly->NbNodes();
+-
+- const TColgp_Array1OfPnt& Nodes = aPoly->Nodes();
+-
+- gp_Pnt V;
+- for (Standard_Integer i=0;i < nbNodesInFace;i++) {
+- V = Nodes(i+1);
+- V.Transform(myTransf);
+- vertices.emplace_back(V.X(),V.Y(),V.Z());
+- }
+- }
+- else {
++ if (!Tools::getPolygon3D(aEdge, points)) {
+ // the edge has not its own triangulation, but then a face the edge is attached to
+ // must provide this triangulation
+
+ // Look for one face in our map (it doesn't care which one we take)
+ int index = edge2Face.FindIndex(aEdge);
+- if(!index)
++ if (index < 1)
+ continue;
+ const auto &faces = edge2Face.FindFromIndex(index);
+- if(!faces.Extent())
++ if (faces.Extent() == 0)
+ continue;
+ const TopoDS_Face& aFace = TopoDS::Face(faces.First());
+
+- // take the face's triangulation instead
+- Handle(Poly_Triangulation) aPolyTria = BRep_Tool::Triangulation(aFace,aLoc);
+- if (!aLoc.IsIdentity()) {
+- myTransf = aLoc.Transformation();
+- }
+-
+- if (aPolyTria.IsNull()) break;
+-
+- // this holds the indices of the edge's triangulation to the actual points
+- Handle(Poly_PolygonOnTriangulation) aPoly = BRep_Tool::PolygonOnTriangulation(aEdge, aPolyTria, aLoc);
+- if (aPoly.IsNull())
+- continue; // polygon does not exist
+-
+- // getting size and create the array
+- nbNodesInFace = aPoly->NbNodes();
+-
+- const TColStd_Array1OfInteger& indices = aPoly->Nodes();
+- const TColgp_Array1OfPnt& Nodes = aPolyTria->Nodes();
+-
+- gp_Pnt V;
+- // go through the index array
+- for (Standard_Integer i=indices.Lower();i <= indices.Upper();i++) {
+- V = Nodes(indices(i));
+- V.Transform(myTransf);
+- vertices.emplace_back(V.X(),V.Y(),V.Z());
+- }
++ if (!Part::Tools::getPolygonOnTriangulation(aEdge, aFace, points))
++ continue;
+ }
+
+- if(line_start+1 < vertices.size()) {
++ auto line_start = vertices.size();
++ vertices.reserve(vertices.size() + points.size());
++ std::for_each(points.begin(), points.end(), [&vertices](const gp_Pnt& p) {
++ vertices.push_back(Base::convertTo<Base::Vector3d>(p));
++ });
++
++ if (line_start+1 < vertices.size()) {
+ lines.emplace_back();
+ lines.back().I1 = line_start;
+ lines.back().I2 = vertices.size()-1;
+diff --git a/src/Mod/Part/App/TopoShapeFacePyImp.cpp b/src/Mod/Part/App/TopoShapeFacePyImp.cpp
+index ea6cd98bdf4..63e8bead74d 100644
+--- a/src/Mod/Part/App/TopoShapeFacePyImp.cpp
++++ b/src/Mod/Part/App/TopoShapeFacePyImp.cpp
+@@ -493,6 +493,15 @@ PyObject* TopoShapeFacePy::getUVNodes(PyObject *args)
+ return Py::new_reference_to(list);
+ }
+
++#if OCC_VERSION_HEX >= 0x070600
++ for (int i=1; i<=mesh->NbNodes(); i++) {
++ gp_Pnt2d pt2d = mesh->UVNode(i);
++ Py::Tuple uv(2);
++ uv.setItem(0, Py::Float(pt2d.X()));
++ uv.setItem(1, Py::Float(pt2d.Y()));
++ list.append(uv);
++ }
++#else
+ const TColgp_Array1OfPnt2d& aNodesUV = mesh->UVNodes();
+ for (int i=aNodesUV.Lower(); i<=aNodesUV.Upper(); i++) {
+ gp_Pnt2d pt2d = aNodesUV(i);
+@@ -501,6 +510,7 @@ PyObject* TopoShapeFacePy::getUVNodes(PyObject *args)
+ uv.setItem(1, Py::Float(pt2d.Y()));
+ list.append(uv);
+ }
++#endif
+
+ return Py::new_reference_to(list);
+ }
+diff --git a/src/Mod/Part/App/TopoShapeWirePyImp.cpp b/src/Mod/Part/App/TopoShapeWirePyImp.cpp
+index 95c1aff6814..a1f32d6d03c 100644
+--- a/src/Mod/Part/App/TopoShapeWirePyImp.cpp
++++ b/src/Mod/Part/App/TopoShapeWirePyImp.cpp
+@@ -344,9 +344,9 @@ PyObject* TopoShapeWirePy::approximate(PyObject *args, PyObject *kwds)
+ return 0;
+ try {
+ BRepAdaptor_CompCurve adapt(TopoDS::Wire(getTopoShapePtr()->getShape()));
+- Handle(Adaptor3d_HCurve) hcurve = adapt.Trim(adapt.FirstParameter(),
+- adapt.LastParameter(),
+- tol2d);
++ auto hcurve = adapt.Trim(adapt.FirstParameter(),
++ adapt.LastParameter(),
++ tol2d);
+ Approx_Curve3d approx(hcurve, tol3d, GeomAbs_C0, maxseg, maxdeg);
+ if (approx.IsDone()) {
+ return new BSplineCurvePy(new GeomBSplineCurve(approx.Curve()));
+diff --git a/src/Mod/Part/Gui/TaskCheckGeometry.cpp b/src/Mod/Part/Gui/TaskCheckGeometry.cpp
+index 5de7c169205..aaef13d9d07 100644
+--- a/src/Mod/Part/Gui/TaskCheckGeometry.cpp
++++ b/src/Mod/Part/Gui/TaskCheckGeometry.cpp
+@@ -711,8 +711,10 @@ int TaskCheckGeometryResults::goBOPSingleCheck(const TopoDS_Shape& shapeIn, Resu
+ #if OCC_VERSION_HEX >= 0x060900
+ #if OCC_VERSION_HEX < 0x070500
+ BOPCheck.SetProgressIndicator(theProgress);
+-#else
++#elif OCC_VERSION_HEX < 0x070600
+ BOPCheck.SetProgressIndicator(theScope);
++#else
++ Q_UNUSED(theScope)
+ #endif // 0x070500
+ #else
+ Q_UNUSED(theProgress);
+@@ -740,7 +742,7 @@ int TaskCheckGeometryResults::goBOPSingleCheck(const TopoDS_Shape& shapeIn, Resu
+ Base::TimeInfo start_time;
+ #endif
+
+-BOPCheck.Perform();
++ BOPCheck.Perform();
+
+ #ifdef FC_DEBUG
+ float bopAlgoTime = Base::TimeInfo::diffTimeF(start_time,Base::TimeInfo());
+diff --git a/src/Mod/Part/Gui/ViewProviderExt.cpp b/src/Mod/Part/Gui/ViewProviderExt.cpp
+index 77cefbe3e08..8a52f1701ba 100644
+--- a/src/Mod/Part/Gui/ViewProviderExt.cpp
++++ b/src/Mod/Part/Gui/ViewProviderExt.cpp
+@@ -1102,7 +1111,11 @@ void ViewProviderPartExt::updateVisual()
+ }
+
+ // get the 3 points of this triangle
++#if OCC_VERSION_HEX < 0x070600
+ gp_Pnt V1(Nodes(N1)), V2(Nodes(N2)), V3(Nodes(N3));
++#else
++ gp_Pnt V1(mesh->Node(N1)), V2(mesh->Node(N2)), V3(mesh->Node(N3));
++#endif
+
+ // get the 3 normals of this triangle
+ gp_Vec NV1, NV2, NV3;
+@@ -1179,7 +1192,11 @@ void ViewProviderPartExt::updateVisual()
+ // rare cases where some points are only referenced by the polygon
+ // but not by any triangle. Thus, we must apply the coordinates to
+ // make sure that everything is properly set.
++#if OCC_VERSION_HEX < 0x070600
+ gp_Pnt p(Nodes(nodeIndex));
++#else
++ gp_Pnt p(mesh->Node(nodeIndex));
++#endif
+ if (!identity)
+ p.Transform(myTransf);
+ verts[index].setValue((float)(p.X()),(float)(p.Y()),(float)(p.Z()));
+diff --git a/src/Mod/Path/App/AppPathPy.cpp b/src/Mod/Path/App/AppPathPy.cpp
+index 6e0c72d2f53..ce912b44749 100644
+--- a/src/Mod/Path/App/AppPathPy.cpp
++++ b/src/Mod/Path/App/AppPathPy.cpp
+@@ -49,10 +49,7 @@
+ #include <TopExp_Explorer.hxx>
+ #include <gp_Lin.hxx>
+ #include <BRep_Tool.hxx>
+-#include <BRepAdaptor_CompCurve.hxx>
+-#include <BRepAdaptor_HCompCurve.hxx>
+-#include <Approx_Curve3d.hxx>
+-#include <BRepAdaptor_HCurve.hxx>
++#include <BRepAdaptor_Curve.hxx>
+
+ #include "CommandPy.h"
+ #include "PathPy.h"
+diff --git a/src/Mod/TechDraw/App/Geometry.cpp b/src/Mod/TechDraw/App/Geometry.cpp
+index b6c36371377..59a92d7e51b 100644
+--- a/src/Mod/TechDraw/App/Geometry.cpp
++++ b/src/Mod/TechDraw/App/Geometry.cpp
+@@ -28,13 +28,13 @@
+ #include <BRepAdaptor_Curve.hxx>
+ #include <BRep_Tool.hxx>
+ #include <BRepTools.hxx>
+-#include <BRepAdaptor_HCurve.hxx>
+ #include <BRepLib.hxx>
+ #include <BRepBuilderAPI_MakeVertex.hxx>
+ #include <BRepBuilderAPI_MakeEdge.hxx>
+ #include <BRepBuilderAPI_MakeWire.hxx>
+ #include <BRepBuilderAPI_MakeFace.hxx>
+ #include <BRepExtrema_DistShapeShape.hxx>
++#include <BRepLProp_CLProps.hxx>
+ #include <Precision.hxx>
+ #include <GCPnts_AbscissaPoint.hxx>
+ #include <gce_MakeCirc.hxx>
+@@ -58,14 +58,16 @@
+ #include <GeomLProp_CLProps.hxx>
+ #include <GeomAPI_ProjectPointOnCurve.hxx>
+ #include <Poly_Polygon3D.hxx>
++#include <Standard_Version.hxx>
+ #include <TopoDS.hxx>
+ #include <TopoDS_Edge.hxx>
+ #include <TopExp.hxx>
+ #include <TopExp_Explorer.hxx>
+ #include <TColgp_Array1OfPnt2d.hxx>
+ #include <TColgp_Array1OfPnt.hxx>
+-#include <BRepLProp_CLProps.hxx>
+-
++#if OCC_VERSION_HEX < 0x070600
++#include <BRepAdaptor_HCurve.hxx>
++#endif
+ #include <cmath>
+ #endif // #ifndef _PreComp_
+
+@@ -86,6 +88,10 @@
+ using namespace TechDraw;
+ using namespace std;
+
++#if OCC_VERSION_HEX >= 0x070600
++using BRepAdaptor_HCurve = BRepAdaptor_Curve;
++#endif
++
+ #define GEOMETRYEDGE 0
+ #define COSMETICEDGE 1
+ #define CENTERLINE 2
+diff --git a/src/Mod/Part/Gui/ViewProviderExt.cpp b/src/Mod/Part/Gui/ViewProviderExt.cpp
+index 77cefbe3e0..8a52f1701b 100644
+--- a/src/Mod/Part/Gui/ViewProviderExt.cpp
++++ b/src/Mod/Part/Gui/ViewProviderExt.cpp
+@@ -1154,16 +1154,25 @@
+
+
+ // cycling through the poly mesh
++#if OCC_VERSION_HEX < 0x070600
+ const Poly_Array1OfTriangle& Triangles = mesh->Triangles();
+ const TColgp_Array1OfPnt& Nodes = mesh->Nodes();
+ TColgp_Array1OfDir Normals (Nodes.Lower(), Nodes.Upper());
++#else
++ int numNodes = mesh->NbNodes();
++ TColgp_Array1OfDir Normals (1, numNodes);
++#endif
+ if (NormalsFromUV)
+ getNormals(actFace, mesh, Normals);
+
+ for (int g=1;g<=nbTriInFace;g++) {
+ // Get the triangle
+ Standard_Integer N1,N2,N3;
++#if OCC_VERSION_HEX < 0x070600
+ Triangles(g).Get(N1,N2,N3);
++#else
++ mesh->Triangle(g).Get(N1,N2,N3);
++#endif
+
+ // change orientation of the triangle if the face is reversed
+ if ( orient != TopAbs_FORWARD ) {
diff --git a/testing/freecad/resourceDirectory.patch b/testing/freecad/resourceDirectory.patch
new file mode 100644
index 0000000000..65227ae7e8
--- /dev/null
+++ b/testing/freecad/resourceDirectory.patch
@@ -0,0 +1,11 @@
+--- ./cMake/FreeCAD_Helpers/ConfigureCMakeVariables.cmake
++++ ./cMake/FreeCAD_Helpers/ConfigureCMakeVariables.cmake
+@@ -23,7 +23,7 @@
+ "Path to the directory containing PyCXX's cxxextensions.c source file")
+
+ # used as compiler defines
+- set(RESOURCEDIR "${CMAKE_INSTALL_DATADIR}")
++ set(RESOURCEDIR "../../share/freecad")
+ set(DOCDIR "${CMAKE_INSTALL_DOCDIR}")
+
+ message(STATUS "prefix: ${CMAKE_INSTALL_PREFIX}")
diff --git a/testing/freecad/tbb.patch b/testing/freecad/tbb.patch
new file mode 100644
index 0000000000..a371e8a6ec
--- /dev/null
+++ b/testing/freecad/tbb.patch
@@ -0,0 +1,38 @@
+FreeCAD fails to compile when HAVE_TBB (seems to be an OpenCV flag) is set, which occurs when CMAKE_BUILD_TYPE is set to none.
+--- ./src/Mod/Import/App/ImportOCAF.cpp
++++ ./src/Mod/Import/App/ImportOCAF.cpp
+@@ -100,12 +100,6 @@
+ #include <App/DocumentObject.h>
+ #include <App/DocumentObjectGroup.h>
+
+-#ifdef HAVE_TBB
+-#include <tbb/parallel_for.h>
+-#include <tbb/blocked_range.h>
+-#include <tbb/task_group.h>
+-#endif
+-
+ using namespace Import;
+
+ #define OCAF_KEEP_PLACEMENT
+@@ -139,10 +133,6 @@
+ std::vector<App::DocumentObject*>& lValue)
+ {
+ int hash = 0;
+-#ifdef HAVE_TBB
+- using namespace tbb;
+- task_group g;
+-#endif
+ TopoDS_Shape aShape;
+
+ std::vector<App::DocumentObject *> localValue;
+@@ -284,10 +274,6 @@
+ std::vector<App::DocumentObject*>& lValue, bool mergeShape)
+ {
+ const TopoDS_Shape& aShape = aShapeTool->GetShape(label);
+-#ifdef HAVE_TBB
+- using namespace tbb;
+- task_group g;
+-#endif
+
+ if (!aShape.IsNull() && aShape.ShapeType() == TopAbs_COMPOUND) {
+ TopExp_Explorer xp;
diff --git a/testing/freecad/vtk9.patch b/testing/freecad/vtk9.patch
new file mode 100644
index 0000000000..25fda0099d
--- /dev/null
+++ b/testing/freecad/vtk9.patch
@@ -0,0 +1,830 @@
+Originally from Fedora FreeCAD package
+https://src.fedoraproject.org/rpms/freecad/blob/rawhide/f/freecad-vtk9.patch
+Will not be needed once FreeCAD v0.20 comes out as it has native support for vtk9
+From bb9bcbd51df7c3cb76c5823038e4ea0f7e25a9ff Mon Sep 17 00:00:00 2001
+From: wmayer <wmayer@users.sourceforge.net>
+Date: Mon, 12 Oct 2020 17:56:03 +0200
+Subject: [PATCH] Make smesh compile with vtk9
+
+---
+ .../salomesmesh/inc/SMDS_MeshElement.hxx | 9 +++-
+ .../salomesmesh/inc/SMDS_UnstructuredGrid.hxx | 4 ++
+ .../salomesmesh/src/SMDS/SMDS_BallElement.cpp | 9 +++-
+ .../salomesmesh/src/SMDS/SMDS_Downward.cpp | 44 +++++++++----------
+ .../salomesmesh/src/SMDS/SMDS_Mesh.cpp | 6 ++-
+ .../src/SMDS/SMDS_Mesh0DElement.cpp | 12 +++++
+ .../salomesmesh/src/SMDS/SMDS_MeshNode.cpp | 10 ++---
+ .../src/SMDS/SMDS_UnstructuredGrid.cpp | 35 +++++++++++++--
+ .../src/SMDS/SMDS_VtkCellIterator.cpp | 7 +--
+ .../salomesmesh/src/SMDS/SMDS_VtkEdge.cpp | 19 +++++++-
+ .../salomesmesh/src/SMDS/SMDS_VtkFace.cpp | 29 ++++++++++--
+ .../salomesmesh/src/SMDS/SMDS_VtkVolume.cpp | 38 +++++++++++-----
+ .../src/SMESH/SMESH_MeshEditor.cpp | 8 ++--
+ src/Mod/Fem/Gui/ViewProviderFemPostObject.cpp | 7 ++-
+ 14 files changed, 179 insertions(+), 58 deletions(-)
+
+Index: FreeCAD-0.19.2/src/3rdParty/salomesmesh/inc/SMDS_MeshElement.hxx
+===================================================================
+--- FreeCAD-0.19.2.orig/src/3rdParty/salomesmesh/inc/SMDS_MeshElement.hxx
++++ FreeCAD-0.19.2/src/3rdParty/salomesmesh/inc/SMDS_MeshElement.hxx
+@@ -40,11 +40,16 @@
+
+ #include <vtkType.h>
+ #include <vtkCellType.h>
++#include <vtkCellArray.h>
+
+ //typedef unsigned short UShortType;
+ typedef short ShortType;
+ typedef int LongType;
+-
++#ifdef VTK_CELL_ARRAY_V2
++typedef const vtkIdType* vtkIdTypePtr;
++#else
++typedef vtkIdType* vtkIdTypePtr;
++#endif
+ class SMDS_MeshNode;
+ class SMDS_MeshEdge;
+ class SMDS_MeshFace;
+@@ -192,7 +197,7 @@ protected:
+ //! Element index in vector SMDS_Mesh::myNodes or SMDS_Mesh::myCells
+ int myID;
+ //! index in vtkUnstructuredGrid
+- int myVtkID;
++ vtkIdType myVtkID;
+ //! SMDS_Mesh identification in SMESH
+ ShortType myMeshId;
+ //! SubShape and SubMesh identification in SMESHDS
+Index: FreeCAD-0.19.2/src/3rdParty/salomesmesh/inc/SMDS_UnstructuredGrid.hxx
+===================================================================
+--- FreeCAD-0.19.2.orig/src/3rdParty/salomesmesh/inc/SMDS_UnstructuredGrid.hxx
++++ FreeCAD-0.19.2/src/3rdParty/salomesmesh/inc/SMDS_UnstructuredGrid.hxx
+@@ -95,7 +95,11 @@ public:
+ std::map<int, std::map<long,int> >& nodeQuadDomains);
+ vtkCellLinks* GetLinks()
+ {
++#ifdef VTK_CELL_ARRAY_V2
++ return static_cast<vtkCellLinks*>(GetCellLinks());
++#else
+ return Links;
++#endif
+ }
+ SMDS_Downward* getDownArray(unsigned char vtkType)
+ {
+Index: FreeCAD-0.19.2/src/3rdParty/salomesmesh/src/SMDS/SMDS_BallElement.cpp
+===================================================================
+--- FreeCAD-0.19.2.orig/src/3rdParty/salomesmesh/src/SMDS/SMDS_BallElement.cpp
++++ FreeCAD-0.19.2/src/3rdParty/salomesmesh/src/SMDS/SMDS_BallElement.cpp
+@@ -67,10 +67,16 @@ void SMDS_BallElement::SetDiameter(doubl
+ bool SMDS_BallElement::ChangeNode (const SMDS_MeshNode * node)
+ {
+ vtkUnstructuredGrid* grid = SMDS_Mesh::_meshList[myMeshId]->getGrid();
++#ifdef VTK_CELL_ARRAY_V2
++ vtkNew<vtkIdList> cellPoints;
++ grid->GetCellPoints(myVtkID, cellPoints.GetPointer());
++ cellPoints->SetId(0, node->getVtkId());
++#else
+ vtkIdType npts = 0;
+ vtkIdType* pts = 0;
+ grid->GetCellPoints(myVtkID, npts, pts);
+ pts[0] = node->getVtkId();
++#endif
+ SMDS_Mesh::_meshList[myMeshId]->setMyModified();
+ return true;
+ }
+@@ -83,7 +89,8 @@ void SMDS_BallElement::Print (std::ostre
+ const SMDS_MeshNode* SMDS_BallElement::GetNode (const int ind) const
+ {
+ vtkUnstructuredGrid* grid = SMDS_Mesh::_meshList[myMeshId]->getGrid();
+- vtkIdType npts, *pts;
++ vtkIdType npts;
++ vtkIdTypePtr pts;
+ grid->GetCellPoints( myVtkID, npts, pts );
+ return SMDS_Mesh::_meshList[myMeshId]->FindNodeVtk( pts[ 0 ]);
+ }
+Index: FreeCAD-0.19.2/src/3rdParty/salomesmesh/src/SMDS/SMDS_Downward.cpp
+===================================================================
+--- FreeCAD-0.19.2.orig/src/3rdParty/salomesmesh/src/SMDS/SMDS_Downward.cpp
++++ FreeCAD-0.19.2/src/3rdParty/salomesmesh/src/SMDS/SMDS_Downward.cpp
+@@ -303,7 +303,7 @@ int SMDS_Down1D::getNodeSet(int cellId,
+ void SMDS_Down1D::setNodes(int cellId, int vtkId)
+ {
+ vtkIdType npts = 0;
+- vtkIdType *pts; // will refer to the point id's of the face
++ vtkIdTypePtr pts; // will refer to the point id's of the face
+ _grid->GetCellPoints(vtkId, npts, pts);
+ // MESSAGE(vtkId << " " << npts << " " << _nbDownCells);
+ //ASSERT(npts == _nbDownCells);
+@@ -357,7 +357,7 @@ int SMDS_Down1D::computeVtkCells(int *pt
+ {
+ vtkIdType point = pts[i];
+ int numCells = _grid->GetLinks()->GetNcells(point);
+- vtkIdType *cells = _grid->GetLinks()->GetCells(point);
++ vtkIdTypePtr cells = _grid->GetLinks()->GetCells(point);
+ for (int j = 0; j < numCells; j++)
+ {
+ int vtkCellId = cells[j];
+@@ -532,7 +532,7 @@ int SMDS_Down2D::computeVolumeIds(int ce
+ // --- find point id's of the face
+
+ vtkIdType npts = 0;
+- vtkIdType *pts; // will refer to the point id's of the face
++ vtkIdTypePtr pts; // will refer to the point id's of the face
+ _grid->GetCellPoints(cellId, npts, pts);
+ vector<int> nodes;
+ for (int i = 0; i < npts; i++)
+@@ -577,7 +577,7 @@ int SMDS_Down2D::computeVolumeIdsFromNod
+ vtkIdType point = pts[i];
+ int numCells = _grid->GetLinks()->GetNcells(point);
+ //MESSAGE("cells pour " << i << " " << numCells);
+- vtkIdType *cells = _grid->GetLinks()->GetCells(point);
++ vtkIdTypePtr cells = _grid->GetLinks()->GetCells(point);
+ for (int j = 0; j < numCells; j++)
+ {
+ int vtkCellId = cells[j];
+@@ -627,7 +627,7 @@ int SMDS_Down2D::computeVolumeIdsFromNod
+ void SMDS_Down2D::setTempNodes(int cellId, int vtkId)
+ {
+ vtkIdType npts = 0;
+- vtkIdType *pts; // will refer to the point id's of the face
++ vtkIdTypePtr pts; // will refer to the point id's of the face
+ _grid->GetCellPoints(vtkId, npts, pts);
+ // MESSAGE(vtkId << " " << npts << " " << _nbNodes);
+ //ASSERT(npts == _nbNodes);
+@@ -795,7 +795,7 @@ void SMDS_Down3D::getNodeIds(int cellId,
+ {
+ int vtkId = this->_vtkCellIds[cellId];
+ vtkIdType npts = 0;
+- vtkIdType *nodes; // will refer to the point id's of the volume
++ vtkIdTypePtr nodes; // will refer to the point id's of the volume
+ _grid->GetCellPoints(vtkId, npts, nodes);
+ for (int i = 0; i < npts; i++)
+ nodeSet.insert(nodes[i]);
+@@ -1126,7 +1126,7 @@ void SMDS_DownTetra::getOrderedNodesOfFa
+ //MESSAGE("cellId = " << cellId);
+
+ vtkIdType npts = 0;
+- vtkIdType *nodes; // will refer to the point id's of the volume
++ vtkIdTypePtr nodes; // will refer to the point id's of the volume
+ _grid->GetCellPoints(this->_vtkCellIds[cellId], npts, nodes);
+
+ set<int> tofind;
+@@ -1178,7 +1178,7 @@ void SMDS_DownTetra::computeFacesWithNod
+ // --- find point id's of the volume
+
+ vtkIdType npts = 0;
+- vtkIdType *nodes; // will refer to the point id's of the volume
++ vtkIdTypePtr nodes; // will refer to the point id's of the volume
+ _grid->GetCellPoints(cellId, npts, nodes);
+
+ // --- create all the ordered list of node id's for each face
+@@ -1234,7 +1234,7 @@ void SMDS_DownQuadTetra::getOrderedNodes
+ //MESSAGE("cellId = " << cellId);
+
+ vtkIdType npts = 0;
+- vtkIdType *nodes; // will refer to the point id's of the volume
++ vtkIdTypePtr nodes; // will refer to the point id's of the volume
+ _grid->GetCellPoints(this->_vtkCellIds[cellId], npts, nodes);
+
+ set<int> tofind;
+@@ -1288,7 +1288,7 @@ void SMDS_DownQuadTetra::computeFacesWit
+ // --- find point id's of the volume
+
+ vtkIdType npts = 0;
+- vtkIdType *nodes; // will refer to the point id's of the volume
++ vtkIdTypePtr nodes; // will refer to the point id's of the volume
+ _grid->GetCellPoints(cellId, npts, nodes);
+
+ // --- create all the ordered list of node id's for each face
+@@ -1357,7 +1357,7 @@ void SMDS_DownPyramid::getOrderedNodesOf
+ //MESSAGE("cellId = " << cellId);
+
+ vtkIdType npts = 0;
+- vtkIdType *nodes; // will refer to the point id's of the volume
++ vtkIdTypePtr nodes; // will refer to the point id's of the volume
+ _grid->GetCellPoints(this->_vtkCellIds[cellId], npts, nodes);
+
+ set<int> tofind;
+@@ -1435,7 +1435,7 @@ void SMDS_DownPyramid::computeFacesWithN
+ // --- find point id's of the volume
+
+ vtkIdType npts = 0;
+- vtkIdType *nodes; // will refer to the point id's of the volume
++ vtkIdTypePtr nodes; // will refer to the point id's of the volume
+ _grid->GetCellPoints(cellId, npts, nodes);
+
+ // --- create all the ordered list of node id's for each face
+@@ -1500,7 +1500,7 @@ void SMDS_DownQuadPyramid::getOrderedNod
+ //MESSAGE("cellId = " << cellId);
+
+ vtkIdType npts = 0;
+- vtkIdType *nodes; // will refer to the point id's of the volume
++ vtkIdTypePtr nodes; // will refer to the point id's of the volume
+ _grid->GetCellPoints(this->_vtkCellIds[cellId], npts, nodes);
+
+ set<int> tofind;
+@@ -1580,7 +1580,7 @@ void SMDS_DownQuadPyramid::computeFacesW
+ // --- find point id's of the volume
+
+ vtkIdType npts = 0;
+- vtkIdType *nodes; // will refer to the point id's of the volume
++ vtkIdTypePtr nodes; // will refer to the point id's of the volume
+ _grid->GetCellPoints(cellId, npts, nodes);
+
+ // --- create all the ordered list of node id's for each face
+@@ -1660,7 +1660,7 @@ void SMDS_DownPenta::getOrderedNodesOfFa
+ //MESSAGE("cellId = " << cellId);
+
+ vtkIdType npts = 0;
+- vtkIdType *nodes; // will refer to the point id's of the volume
++ vtkIdTypePtr nodes; // will refer to the point id's of the volume
+ _grid->GetCellPoints(this->_vtkCellIds[cellId], npts, nodes);
+
+ set<int> tofind;
+@@ -1744,7 +1744,7 @@ void SMDS_DownPenta::computeFacesWithNod
+ // --- find point id's of the volume
+
+ vtkIdType npts = 0;
+- vtkIdType *nodes; // will refer to the point id's of the volume
++ vtkIdTypePtr nodes; // will refer to the point id's of the volume
+ _grid->GetCellPoints(cellId, npts, nodes);
+
+ // --- create all the ordered list of node id's for each face
+@@ -1810,7 +1810,7 @@ void SMDS_DownQuadPenta::getOrderedNodes
+ //MESSAGE("cellId = " << cellId);
+
+ vtkIdType npts = 0;
+- vtkIdType *nodes; // will refer to the point id's of the volume
++ vtkIdTypePtr nodes; // will refer to the point id's of the volume
+ _grid->GetCellPoints(this->_vtkCellIds[cellId], npts, nodes);
+
+ set<int> tofind;
+@@ -1896,7 +1896,7 @@ void SMDS_DownQuadPenta::computeFacesWit
+ // --- find point id's of the volume
+
+ vtkIdType npts = 0;
+- vtkIdType *nodes; // will refer to the point id's of the volume
++ vtkIdTypePtr nodes; // will refer to the point id's of the volume
+ _grid->GetCellPoints(cellId, npts, nodes);
+
+ // --- create all the ordered list of node id's for each face
+@@ -1981,7 +1981,7 @@ void SMDS_DownHexa::getOrderedNodesOfFac
+ //MESSAGE("cellId = " << cellId);
+
+ vtkIdType npts = 0;
+- vtkIdType *nodes; // will refer to the point id's of the volume
++ vtkIdTypePtr nodes; // will refer to the point id's of the volume
+ _grid->GetCellPoints(this->_vtkCellIds[cellId], npts, nodes);
+
+ set<int> tofind;
+@@ -2036,7 +2036,7 @@ void SMDS_DownHexa::computeFacesWithNode
+ // --- find point id's of the volume
+
+ vtkIdType npts = 0;
+- vtkIdType *nodes; // will refer to the point id's of the volume
++ vtkIdTypePtr nodes; // will refer to the point id's of the volume
+ _grid->GetCellPoints(cellId, npts, nodes);
+
+ // --- create all the ordered list of node id's for each face
+@@ -2112,7 +2112,7 @@ void SMDS_DownQuadHexa::getOrderedNodesO
+ //MESSAGE("cellId = " << cellId);
+
+ vtkIdType npts = 0;
+- vtkIdType *nodes; // will refer to the point id's of the volume
++ vtkIdTypePtr nodes; // will refer to the point id's of the volume
+ _grid->GetCellPoints(this->_vtkCellIds[cellId], npts, nodes);
+
+ set<int> tofind;
+@@ -2167,7 +2167,7 @@ void SMDS_DownQuadHexa::computeFacesWith
+ // --- find point id's of the volume
+
+ vtkIdType npts = 0;
+- vtkIdType *nodes; // will refer to the point id's of the volume
++ vtkIdTypePtr nodes; // will refer to the point id's of the volume
+ _grid->GetCellPoints(cellId, npts, nodes);
+
+ // --- create all the ordered list of node id's for each face
+Index: FreeCAD-0.19.2/src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh.cpp
+===================================================================
+--- FreeCAD-0.19.2.orig/src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh.cpp
++++ FreeCAD-0.19.2/src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh.cpp
+@@ -4768,7 +4768,11 @@ void SMDS_Mesh::dumpGrid(string ficdump)
+ ficcon << endl;
+ }
+ ficcon << "-------------------------------- connectivity " << nbPoints << endl;
+- vtkCellLinks *links = myGrid->GetCellLinks();
++#ifdef VTK_CELL_ARRAY_V2
++ vtkCellLinks *links = static_cast<vtkCellLinks*>(myGrid->GetCellLinks());
++#else
++ vtkCellLinks *links = myGrid->GetCellLinks();
++#endif
+ for (int i=0; i<nbPoints; i++)
+ {
+ int ncells = links->GetNcells(i);
+Index: FreeCAD-0.19.2/src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh0DElement.cpp
+===================================================================
+--- FreeCAD-0.19.2.orig/src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh0DElement.cpp
++++ FreeCAD-0.19.2/src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh0DElement.cpp
+@@ -146,6 +146,17 @@ bool SMDS_Mesh0DElement::ChangeNodes(con
+ if ( nbNodes == 1 )
+ {
+ vtkUnstructuredGrid* grid = SMDS_Mesh::_meshList[myMeshId]->getGrid();
++#ifdef VTK_CELL_ARRAY_V2
++ vtkNew<vtkIdList> cellPoints;
++ grid->GetCellPoints(myVtkID, cellPoints.GetPointer());
++ if (nbNodes != cellPoints->GetNumberOfIds())
++ {
++ MESSAGE("ChangeNodes problem: not the same number of nodes " << cellPoints->GetNumberOfIds() << " -> " << nbNodes);
++ return false;
++ }
++ myNode = nodes[0];
++ cellPoints->SetId(0, myNode->getVtkId());
++#else
+ vtkIdType npts = 0;
+ vtkIdType* pts = 0;
+ grid->GetCellPoints(myVtkID, npts, pts);
+@@ -156,6 +167,7 @@ bool SMDS_Mesh0DElement::ChangeNodes(con
+ }
+ myNode = nodes[0];
+ pts[0] = myNode->getVtkId();
++#endif
+
+ SMDS_Mesh::_meshList[myMeshId]->setMyModified();
+ return true;
+Index: FreeCAD-0.19.2/src/3rdParty/salomesmesh/src/SMDS/SMDS_MeshNode.cpp
+===================================================================
+--- FreeCAD-0.19.2.orig/src/3rdParty/salomesmesh/src/SMDS/SMDS_MeshNode.cpp
++++ FreeCAD-0.19.2/src/3rdParty/salomesmesh/src/SMDS/SMDS_MeshNode.cpp
+@@ -191,7 +191,7 @@ public:
+ SMDS_ElemIteratorPtr SMDS_MeshNode::
+ GetInverseElementIterator(SMDSAbs_ElementType type) const
+ {
+- vtkCellLinks::Link l = SMDS_Mesh::_meshList[myMeshId]->getGrid()->GetCellLinks()->GetLink(myVtkID);
++ vtkCellLinks::Link l = static_cast<vtkCellLinks*>(SMDS_Mesh::_meshList[myMeshId]->getGrid()->GetCellLinks())->GetLink(myVtkID);
+ //MESSAGE("myID " << myID << " ncells " << l.ncells);
+ return SMDS_ElemIteratorPtr(new SMDS_MeshNode_MyInvIterator(SMDS_Mesh::_meshList[myMeshId], l.cells, l.ncells, type));
+ }
+@@ -251,7 +251,7 @@ elementsIterator(SMDSAbs_ElementType typ
+ return SMDS_MeshElement::elementsIterator(SMDSAbs_Node);
+ else
+ {
+- vtkCellLinks::Link l = SMDS_Mesh::_meshList[myMeshId]->getGrid()->GetCellLinks()->GetLink(myVtkID);
++ vtkCellLinks::Link l = static_cast<vtkCellLinks*>(SMDS_Mesh::_meshList[myMeshId]->getGrid()->GetCellLinks())->GetLink(myVtkID);
+ return SMDS_ElemIteratorPtr(new SMDS_MeshNode_MyIterator(SMDS_Mesh::_meshList[myMeshId], l.cells, l.ncells, type));
+ }
+ }
+@@ -350,7 +350,7 @@ void SMDS_MeshNode::AddInverseElement(co
+ const SMDS_MeshCell *cell = dynamic_cast<const SMDS_MeshCell*> (ME);
+ assert(cell);
+ SMDS_UnstructuredGrid* grid = SMDS_Mesh::_meshList[myMeshId]->getGrid();
+- vtkCellLinks *Links = grid->GetCellLinks();
++ vtkCellLinks *Links = static_cast<vtkCellLinks*>(grid->GetCellLinks());
+ Links->ResizeCellList(myVtkID, 1);
+ Links->AddCellReference(cell->getVtkId(), myVtkID);
+ }
+@@ -366,7 +366,7 @@ void SMDS_MeshNode::ClearInverseElements
+
+ bool SMDS_MeshNode::emptyInverseElements()
+ {
+- vtkCellLinks::Link l = SMDS_Mesh::_meshList[myMeshId]->getGrid()->GetCellLinks()->GetLink(myVtkID);
++ vtkCellLinks::Link l = static_cast<vtkCellLinks*>(SMDS_Mesh::_meshList[myMeshId]->getGrid()->GetCellLinks())->GetLink(myVtkID);
+ return (l.ncells == 0);
+ }
+
+@@ -378,7 +378,7 @@ bool SMDS_MeshNode::emptyInverseElements
+
+ int SMDS_MeshNode::NbInverseElements(SMDSAbs_ElementType type) const
+ {
+- vtkCellLinks::Link l = SMDS_Mesh::_meshList[myMeshId]->getGrid()->GetCellLinks()->GetLink(myVtkID);
++ vtkCellLinks::Link l = static_cast<vtkCellLinks*>(SMDS_Mesh::_meshList[myMeshId]->getGrid()->GetCellLinks())->GetLink(myVtkID);
+
+ if ( type == SMDSAbs_All )
+ return l.ncells;
+Index: FreeCAD-0.19.2/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp
+===================================================================
+--- FreeCAD-0.19.2.orig/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp
++++ FreeCAD-0.19.2/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp
+@@ -139,8 +139,8 @@ int SMDS_UnstructuredGrid::InsertNextLin
+ for (; it != setOfNodes.end(); ++it)
+ {
+ //MESSAGE("reverse link for node " << *it << " cell " << cellid);
+- this->Links->ResizeCellList(*it, 1);
+- this->Links->AddCellReference(cellid, *it);
++ this->GetLinks()->ResizeCellList(*it, 1);
++ this->GetLinks()->AddCellReference(cellid, *it);
+ }
+
+ return cellid;
+@@ -332,9 +332,13 @@ void SMDS_UnstructuredGrid::copyBloc(vtk
+ {
+ newTypes->SetValue(alreadyCopied, this->Types->GetValue(j));
+ idCellsOldToNew[j] = alreadyCopied; // old vtkId --> new vtkId
++#ifdef VTK_CELL_ARRAY_V2
++ vtkIdType oldLoc = this->GetCellLocationsArray()->GetValue(j);
++#else
+ vtkIdType oldLoc = this->Locations->GetValue(j);
++#endif
+ vtkIdType nbpts;
+- vtkIdType *oldPtsCell = 0;
++ vtkIdTypePtr oldPtsCell = 0;
+ this->Connectivity->GetCell(oldLoc, nbpts, oldPtsCell);
+ assert(nbpts < NBMAXNODESINCELL);
+ //MESSAGE(j << " " << alreadyCopied << " " << (int)this->Types->GetValue(j) << " " << oldLoc << " " << nbpts );
+@@ -952,6 +956,21 @@ void SMDS_UnstructuredGrid::GetNodeIds(s
+ */
+ void SMDS_UnstructuredGrid::ModifyCellNodes(int vtkVolId, std::map<int, int> localClonedNodeIds)
+ {
++#ifdef VTK_CELL_ARRAY_V2
++ vtkNew<vtkIdList> cellPoints;
++ this->GetCellPoints(vtkVolId, cellPoints.GetPointer());
++ for (vtkIdType i = 0; i < cellPoints->GetNumberOfIds(); i++)
++ {
++ if (localClonedNodeIds.count(cellPoints->GetId(i)))
++ {
++ vtkIdType oldpt = cellPoints->GetId(i);
++ cellPoints->SetId(i, localClonedNodeIds[oldpt]);
++ //MESSAGE(oldpt << " --> " << pts[i]);
++ //this->RemoveReferenceToCell(oldpt, vtkVolId);
++ //this->AddReferenceToCell(pts[i], vtkVolId);
++ }
++ }
++#else
+ vtkIdType npts = 0;
+ vtkIdType *pts; // will refer to the point id's of the face
+ this->GetCellPoints(vtkVolId, npts, pts);
+@@ -966,6 +985,7 @@ void SMDS_UnstructuredGrid::ModifyCellNo
+ //this->AddReferenceToCell(pts[i], vtkVolId);
+ }
+ }
++#endif
+ }
+
+ /*! reorder the nodes of a face
+@@ -995,11 +1015,20 @@ void SMDS_UnstructuredGrid::BuildLinks()
+ this->Links->UnRegister(this);
+ }
+
++#ifdef VTK_CELL_ARRAY_V2
++ this->Links = SMDS_CellLinks::New();
++ GetLinks()->Allocate(this->GetNumberOfPoints());
++ GetLinks()->Register(this);
++//FIXME: vtk9
++ GetLinks()->BuildLinks(this);
++ GetLinks()->Delete();
++#else
+ this->Links = SMDS_CellLinks::New();
+ this->Links->Allocate(this->GetNumberOfPoints());
+ this->Links->Register(this);
+ this->Links->BuildLinks(this, this->Connectivity);
+ this->Links->Delete();
++#endif
+ }
+
+ /*! Create a volume (prism or hexahedron) by duplication of a face.
+Index: FreeCAD-0.19.2/src/3rdParty/salomesmesh/src/SMDS/SMDS_VtkCellIterator.cpp
+===================================================================
+--- FreeCAD-0.19.2.orig/src/3rdParty/salomesmesh/src/SMDS/SMDS_VtkCellIterator.cpp
++++ FreeCAD-0.19.2/src/3rdParty/salomesmesh/src/SMDS/SMDS_VtkCellIterator.cpp
+@@ -33,7 +33,8 @@ SMDS_VtkCellIterator::SMDS_VtkCellIterat
+ }
+ else
+ {
+- vtkIdType npts, *pts;
++ vtkIdType npts;
++ vtkIdTypePtr pts;
+ grid->GetCellPoints( _cellId, npts, pts );
+ _vtkIdList->SetNumberOfIds( _nbNodes = npts );
+ for (int i = 0; i < _nbNodes; i++)
+@@ -67,7 +68,7 @@ SMDS_VtkCellIteratorToUNV::SMDS_VtkCellI
+ //MESSAGE("SMDS_VtkCellInterlacedIterator (UNV)" << _type);
+
+ _vtkIdList = vtkIdList::New();
+- vtkIdType* pts;
++ vtkIdTypePtr pts;
+ vtkIdType npts;
+ vtkUnstructuredGrid* grid = _mesh->getGrid();
+ grid->GetCellPoints((vtkIdType)_cellId, npts, pts);
+@@ -182,7 +183,7 @@ SMDS_VtkCellIteratorPolyH::SMDS_VtkCellI
+ {
+ //MESSAGE("SMDS_VtkCellIterator Polyhedra");
+ vtkIdType nFaces = 0;
+- vtkIdType* ptIds = 0;
++ vtkIdTypePtr ptIds = 0;
+ grid->GetFaceStream(_cellId, nFaces, ptIds);
+ int id = 0;
+ _nbNodesInFaces = 0;
+Index: FreeCAD-0.19.2/src/3rdParty/salomesmesh/src/SMDS/SMDS_VtkEdge.cpp
+===================================================================
+--- FreeCAD-0.19.2.orig/src/3rdParty/salomesmesh/src/SMDS/SMDS_VtkEdge.cpp
++++ FreeCAD-0.19.2/src/3rdParty/salomesmesh/src/SMDS/SMDS_VtkEdge.cpp
+@@ -67,6 +67,19 @@ bool SMDS_VtkEdge::ChangeNodes(const SMD
+ bool SMDS_VtkEdge::ChangeNodes(const SMDS_MeshNode* nodes[], const int nbNodes)
+ {
+ vtkUnstructuredGrid* grid = SMDS_Mesh::_meshList[myMeshId]->getGrid();
++#ifdef VTK_CELL_ARRAY_V2
++ vtkNew<vtkIdList> cellPoints;
++ grid->GetCellPoints(myVtkID, cellPoints.GetPointer());
++ if (nbNodes != cellPoints->GetNumberOfIds())
++ {
++ MESSAGE("ChangeNodes problem: not the same number of nodes " << cellPoints->GetNumberOfIds() << " -> " << nbNodes);
++ return false;
++ }
++ for (int i = 0; i < nbNodes; i++)
++ {
++ cellPoints->SetId(i, nodes[i]->getVtkId());
++ }
++#else
+ vtkIdType npts = 0;
+ vtkIdType* pts = 0;
+ grid->GetCellPoints(myVtkID, npts, pts);
+@@ -79,6 +92,7 @@ bool SMDS_VtkEdge::ChangeNodes(const SMD
+ {
+ pts[i] = nodes[i]->getVtkId();
+ }
++#endif
+ SMDS_Mesh::_meshList[myMeshId]->setMyModified();
+ return true;
+ }
+@@ -87,7 +101,7 @@ bool SMDS_VtkEdge::IsMediumNode(const SM
+ {
+ vtkUnstructuredGrid* grid = SMDS_Mesh::_meshList[myMeshId]->getGrid();
+ vtkIdType npts = 0;
+- vtkIdType* pts = 0;
++ vtkIdTypePtr pts = 0;
+ grid->GetCellPoints(myVtkID, npts, pts);
+ //MESSAGE("IsMediumNode " << npts << " " << (node->getVtkId() == pts[npts-1]));
+ return ((npts == 3) && (node->getVtkId() == pts[2]));
+@@ -137,7 +151,8 @@ const SMDS_MeshNode*
+ SMDS_VtkEdge::GetNode(const int ind) const
+ {
+ vtkUnstructuredGrid* grid = SMDS_Mesh::_meshList[myMeshId]->getGrid();
+- vtkIdType npts, *pts;
++ vtkIdType npts;
++ vtkIdTypePtr pts;
+ grid->GetCellPoints( this->myVtkID, npts, pts );
+ return SMDS_Mesh::_meshList[myMeshId]->FindNodeVtk( pts[ ind ]);
+ }
+Index: FreeCAD-0.19.2/src/3rdParty/salomesmesh/src/SMDS/SMDS_VtkFace.cpp
+===================================================================
+--- FreeCAD-0.19.2.orig/src/3rdParty/salomesmesh/src/SMDS/SMDS_VtkFace.cpp
++++ FreeCAD-0.19.2/src/3rdParty/salomesmesh/src/SMDS/SMDS_VtkFace.cpp
+@@ -101,6 +101,19 @@ void SMDS_VtkFace::initQuadPoly(const st
+ bool SMDS_VtkFace::ChangeNodes(const SMDS_MeshNode* nodes[], const int nbNodes)
+ {
+ vtkUnstructuredGrid* grid = SMDS_Mesh::_meshList[myMeshId]->getGrid();
++#ifdef VTK_CELL_ARRAY_V2
++ vtkNew<vtkIdList> cellPoints;
++ grid->GetCellPoints(myVtkID, cellPoints.GetPointer());
++ if (nbNodes != cellPoints->GetNumberOfIds())
++ {
++ MESSAGE("ChangeNodes problem: not the same number of nodes " << cellPoints->GetNumberOfIds() << " -> " << nbNodes);
++ return false;
++ }
++ for (int i = 0; i < nbNodes; i++)
++ {
++ cellPoints->SetId(i, nodes[i]->getVtkId());
++ }
++#else
+ vtkIdType npts = 0;
+ vtkIdType* pts = 0;
+ grid->GetCellPoints(myVtkID, npts, pts);
+@@ -113,6 +126,7 @@ bool SMDS_VtkFace::ChangeNodes(const SMD
+ {
+ pts[i] = nodes[i]->getVtkId();
+ }
++#endif
+ SMDS_Mesh::_meshList[myMeshId]->setMyModified();
+ return true;
+ }
+@@ -173,7 +187,8 @@ const SMDS_MeshNode*
+ SMDS_VtkFace::GetNode(const int ind) const
+ {
+ vtkUnstructuredGrid* grid = SMDS_Mesh::_meshList[myMeshId]->getGrid();
+- vtkIdType npts, *pts;
++ vtkIdType npts;
++ vtkIdTypePtr pts;
+ grid->GetCellPoints( this->myVtkID, npts, pts );
+ return SMDS_Mesh::_meshList[myMeshId]->FindNodeVtk( pts[ ind ]);
+ }
+@@ -186,7 +201,8 @@ SMDS_VtkFace::GetNode(const int ind) con
+ int SMDS_VtkFace::GetNodeIndex( const SMDS_MeshNode* node ) const
+ {
+ vtkUnstructuredGrid* grid = SMDS_Mesh::_meshList[myMeshId]->getGrid();
+- vtkIdType npts, *pts;
++ vtkIdType npts;
++ vtkIdTypePtr pts;
+ grid->GetCellPoints( this->myVtkID, npts, pts );
+ for ( vtkIdType i = 0; i < npts; ++i )
+ if ( pts[i] == node->getVtkId() )
+@@ -251,7 +267,7 @@ bool SMDS_VtkFace::IsMediumNode(const SM
+ return false;
+ }
+ vtkIdType npts = 0;
+- vtkIdType* pts = 0;
++ vtkIdTypePtr pts = 0;
+ grid->GetCellPoints(myVtkID, npts, pts);
+ vtkIdType nodeId = node->getVtkId();
+ for (int rank = 0; rank < npts; rank++)
+@@ -356,11 +372,18 @@ SMDS_NodeIteratorPtr SMDS_VtkFace::inter
+ void SMDS_VtkFace::ChangeApex(SMDS_MeshNode* node)
+ {
+ vtkUnstructuredGrid* grid = SMDS_Mesh::_meshList[myMeshId]->getGrid();
++#ifdef VTK_CELL_ARRAY_V2
++ vtkNew<vtkIdList> cellPoints;
++ grid->GetCellPoints(myVtkID, cellPoints.GetPointer());
++ grid->RemoveReferenceToCell(cellPoints->GetId(0), myVtkID);
++ cellPoints->SetId(0, node->getVtkId());
++#else
+ vtkIdType npts = 0;
+ vtkIdType* pts = 0;
+ grid->GetCellPoints(myVtkID, npts, pts);
+ grid->RemoveReferenceToCell(pts[0], myVtkID);
+ pts[0] = node->getVtkId();
++#endif
+ node->AddInverseElement(this),
+ SMDS_Mesh::_meshList[myMeshId]->setMyModified();
+ }
+Index: FreeCAD-0.19.2/src/3rdParty/salomesmesh/src/SMDS/SMDS_VtkVolume.cpp
+===================================================================
+--- FreeCAD-0.19.2.orig/src/3rdParty/salomesmesh/src/SMDS/SMDS_VtkVolume.cpp
++++ FreeCAD-0.19.2/src/3rdParty/salomesmesh/src/SMDS/SMDS_VtkVolume.cpp
+@@ -133,6 +133,19 @@ void SMDS_VtkVolume::initPoly(const std:
+ bool SMDS_VtkVolume::ChangeNodes(const SMDS_MeshNode* nodes[], const int nbNodes)
+ {
+ vtkUnstructuredGrid* grid = SMDS_Mesh::_meshList[myMeshId]->getGrid();
++#ifdef VTK_CELL_ARRAY_V2
++ vtkNew<vtkIdList> cellPoints;
++ grid->GetCellPoints(myVtkID, cellPoints.GetPointer());
++ if (nbNodes != cellPoints->GetNumberOfIds())
++ {
++ MESSAGE("ChangeNodes problem: not the same number of nodes " << cellPoints->GetNumberOfIds() << " -> " << nbNodes);
++ return false;
++ }
++ for (int i = 0; i < nbNodes; i++)
++ {
++ cellPoints->SetId(i, nodes[i]->getVtkId());
++ }
++#else
+ vtkIdType npts = 0;
+ vtkIdType* pts = 0;
+ grid->GetCellPoints(myVtkID, npts, pts);
+@@ -145,6 +158,7 @@ bool SMDS_VtkVolume::ChangeNodes(const S
+ {
+ pts[i] = nodes[i]->getVtkId();
+ }
++#endif
+ SMDS_Mesh::_meshList[myMeshId]->setMyModified();
+ return true;
+ }
+@@ -207,7 +221,7 @@ int SMDS_VtkVolume::NbFaces() const
+ case VTK_POLYHEDRON:
+ {
+ vtkIdType nFaces = 0;
+- vtkIdType* ptIds = 0;
++ vtkIdTypePtr ptIds = 0;
+ grid->GetFaceStream(this->myVtkID, nFaces, ptIds);
+ nbFaces = nFaces;
+ break;
+@@ -236,7 +250,7 @@ int SMDS_VtkVolume::NbNodes() const
+ else
+ {
+ vtkIdType nFaces = 0;
+- vtkIdType* ptIds = 0;
++ vtkIdTypePtr ptIds = 0;
+ grid->GetFaceStream(this->myVtkID, nFaces, ptIds);
+ int id = 0;
+ for (int i = 0; i < nFaces; i++)
+@@ -276,7 +290,7 @@ int SMDS_VtkVolume::NbEdges() const
+ case VTK_POLYHEDRON:
+ {
+ vtkIdType nFaces = 0;
+- vtkIdType* ptIds = 0;
++ vtkIdTypePtr ptIds = 0;
+ grid->GetFaceStream(this->myVtkID, nFaces, ptIds);
+ nbEdges = 0;
+ int id = 0;
+@@ -312,7 +326,7 @@ int SMDS_VtkVolume::NbFaceNodes(const in
+ if (aVtkType == VTK_POLYHEDRON)
+ {
+ vtkIdType nFaces = 0;
+- vtkIdType* ptIds = 0;
++ vtkIdTypePtr ptIds = 0;
+ grid->GetFaceStream(this->myVtkID, nFaces, ptIds);
+ int id = 0;
+ for (int i = 0; i < nFaces; i++)
+@@ -342,7 +356,7 @@ const SMDS_MeshNode* SMDS_VtkVolume::Get
+ if (aVtkType == VTK_POLYHEDRON)
+ {
+ vtkIdType nFaces = 0;
+- vtkIdType* ptIds = 0;
++ vtkIdTypePtr ptIds = 0;
+ grid->GetFaceStream(this->myVtkID, nFaces, ptIds);
+ int id = 0;
+ for (int i = 0; i < nFaces; i++)
+@@ -372,7 +386,7 @@ std::vector<int> SMDS_VtkVolume::GetQuan
+ if (aVtkType == VTK_POLYHEDRON)
+ {
+ vtkIdType nFaces = 0;
+- vtkIdType* ptIds = 0;
++ vtkIdTypePtr ptIds = 0;
+ grid->GetFaceStream(this->myVtkID, nFaces, ptIds);
+ int id = 0;
+ for (int i = 0; i < nFaces; i++)
+@@ -430,7 +444,7 @@ const SMDS_MeshNode* SMDS_VtkVolume::Get
+ if ( aVtkType == VTK_POLYHEDRON)
+ {
+ vtkIdType nFaces = 0;
+- vtkIdType* ptIds = 0;
++ vtkIdTypePtr ptIds = 0;
+ grid->GetFaceStream(this->myVtkID, nFaces, ptIds);
+ int id = 0, nbPoints = 0;
+ for (int i = 0; i < nFaces; i++)
+@@ -443,7 +457,8 @@ const SMDS_MeshNode* SMDS_VtkVolume::Get
+ }
+ return 0;
+ }
+- vtkIdType npts, *pts;
++ vtkIdType npts;
++ vtkIdTypePtr pts;
+ grid->GetCellPoints( this->myVtkID, npts, pts );
+ const std::vector<int>& interlace = SMDS_MeshCell::fromVtkOrder( VTKCellType( aVtkType ));
+ return SMDS_Mesh::_meshList[myMeshId]->FindNodeVtk( pts[ interlace.empty() ? ind : interlace[ind]] );
+@@ -460,7 +475,7 @@ int SMDS_VtkVolume::GetNodeIndex( const
+ if ( aVtkType == VTK_POLYHEDRON)
+ {
+ vtkIdType nFaces = 0;
+- vtkIdType* ptIds = 0;
++ vtkIdTypePtr ptIds = 0;
+ grid->GetFaceStream(this->myVtkID, nFaces, ptIds);
+ int id = 0;
+ for (int iF = 0; iF < nFaces; iF++)
+@@ -473,7 +488,8 @@ int SMDS_VtkVolume::GetNodeIndex( const
+ }
+ return -1;
+ }
+- vtkIdType npts, *pts;
++ vtkIdType npts;
++ vtkIdTypePtr pts;
+ grid->GetCellPoints( this->myVtkID, npts, pts );
+ for ( vtkIdType i = 0; i < npts; ++i )
+ if ( pts[i] == node->getVtkId() )
+@@ -534,7 +550,7 @@ bool SMDS_VtkVolume::IsMediumNode(const
+ return false;
+ }
+ vtkIdType npts = 0;
+- vtkIdType* pts = 0;
++ vtkIdTypePtr pts = 0;
+ grid->GetCellPoints(myVtkID, npts, pts);
+ vtkIdType nodeId = node->getVtkId();
+ for (int rank = 0; rank < npts; rank++)
+Index: FreeCAD-0.19.2/src/3rdParty/salomesmesh/src/SMESH/SMESH_MeshEditor.cpp
+===================================================================
+--- FreeCAD-0.19.2.orig/src/3rdParty/salomesmesh/src/SMESH/SMESH_MeshEditor.cpp
++++ FreeCAD-0.19.2/src/3rdParty/salomesmesh/src/SMESH/SMESH_MeshEditor.cpp
+@@ -11348,7 +11348,7 @@ bool SMESH_MeshEditor::DoubleNodesOnGrou
+ {
+ int oldId = *itn;
+ //MESSAGE(" node " << oldId);
+- vtkCellLinks::Link l = grid->GetCellLinks()->GetLink(oldId);
++ vtkCellLinks::Link l = static_cast<vtkCellLinks*>(grid->GetCellLinks())->GetLink(oldId);
+ for (int i=0; i<l.ncells; i++)
+ {
+ int vtkId = l.cells[i];
+@@ -11527,7 +11527,7 @@ bool SMESH_MeshEditor::DoubleNodesOnGrou
+ //MESSAGE(" domain " << idom << " volume " << elem->GetID());
+ double values[3];
+ vtkIdType npts = 0;
+- vtkIdType* pts = 0;
++ vtkIdTypePtr pts = 0;
+ grid->GetCellPoints(vtkVolIds[ivol], npts, pts);
+ SMDS_VtkVolume::gravityCenter(grid, pts, npts, values);
+ if (id ==0)
+@@ -11708,7 +11708,7 @@ bool SMESH_MeshEditor::DoubleNodesOnGrou
+ {
+ int oldId = itnod->first;
+ //MESSAGE(" node " << oldId);
+- vtkCellLinks::Link l = grid->GetCellLinks()->GetLink(oldId);
++ vtkCellLinks::Link l = static_cast<vtkCellLinks*>(grid->GetCellLinks())->GetLink(oldId);
+ for (int i = 0; i < l.ncells; i++)
+ {
+ int vtkId = l.cells[i];
+@@ -12165,7 +12165,7 @@ void SMESH_MeshEditor::CreateHoleSkin(do
+ MESSAGE("volume to check, vtkId " << vtkId << " smdsId " << meshDS->fromVtkToSmds(vtkId));
+ bool volInside = false;
+ vtkIdType npts = 0;
+- vtkIdType* pts = 0;
++ vtkIdTypePtr pts = 0;
+ grid->GetCellPoints(vtkId, npts, pts);
+ for (int i=0; i<npts; i++)
+ {
+Index: FreeCAD-0.19.2/src/Mod/Fem/Gui/ViewProviderFemPostObject.cpp
+===================================================================
+--- FreeCAD-0.19.2.orig/src/Mod/Fem/Gui/ViewProviderFemPostObject.cpp
++++ FreeCAD-0.19.2/src/Mod/Fem/Gui/ViewProviderFemPostObject.cpp
+@@ -20,7 +20,6 @@
+ * *
+ ***************************************************************************/
+
+-
+ #include "PreCompiled.h"
+
+ #ifndef _PreComp_
diff --git a/testing/freeipmi/APKBUILD b/testing/freeipmi/APKBUILD
new file mode 100644
index 0000000000..46b0e31ad6
--- /dev/null
+++ b/testing/freeipmi/APKBUILD
@@ -0,0 +1,67 @@
+# Contributor: Sodface <sod@sodface.com>
+# Maintainer: Sodface <sod@sodface.com>
+pkgname=freeipmi
+pkgver=1.6.8
+pkgrel=0
+pkgdesc="IPMI library and utilities"
+url="https://www.gnu.org/software/freeipmi/"
+arch="all !ppc64le"
+license="GPL-3.0-or-later"
+options="!check" # no test suite
+makedepends="argp-standalone libgcrypt-dev"
+subpackages="$pkgname-doc $pkgname-dev $pkgname-libs $pkgname-openrc"
+source="https://ftp.gnu.org/gnu/freeipmi/freeipmi-$pkgver.tar.gz
+ bmc-watchdog.confd
+ bmc-watchdog.initd
+ ipmidetectd.confd
+ ipmidetectd.initd
+ ipmiseld.confd
+ ipmiseld.initd"
+
+prepare() {
+ default_prepare
+ update_config_sub
+ update_config_guess
+}
+
+build() {
+ # musl stropts.h does not define getmsg or putmsg
+ # checked for by ipmi-sunbmc-driver.c. Disable it.
+ ./configure ac_cv_header_sys_stropts_h=no \
+ --build=$CBUILD \
+ --host=$CHOST \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --mandir=/usr/share/man \
+ --infodir=/usr/share/info \
+ --localstatedir=/var \
+ --disable-static \
+ --disable-init-scripts
+ make
+}
+
+package() {
+ make -j1 DESTDIR="$pkgdir" install
+ install -Dm 644 "$srcdir"/bmc-watchdog.confd \
+ "$pkgdir"/etc/conf.d/bmc-watchdog
+ install -Dm755 "$srcdir"/bmc-watchdog.initd \
+ "$pkgdir"/etc/init.d/bmc-watchdog
+ install -Dm 644 "$srcdir"/ipmidetectd.confd \
+ "$pkgdir"/etc/conf.d/ipmidetectd
+ install -Dm755 "$srcdir"/ipmidetectd.initd \
+ "$pkgdir"/etc/init.d/ipmidetectd
+ install -Dm 644 "$srcdir"/ipmiseld.confd \
+ "$pkgdir"/etc/conf.d/ipmiseld
+ install -Dm755 "$srcdir"/ipmiseld.initd \
+ "$pkgdir"/etc/init.d/ipmiseld
+}
+
+sha512sums="
+66cae2aed95ddb3fd9301146d5a1065b61267232d6ced726b106402bf3840a17364a29d7bf6bbe4db7955b77dcd23510f1258aac85ead5c295c876c6fa4333c3 freeipmi-1.6.8.tar.gz
+11bbd920eb67a64a9d3742e860ae146c1a00398f44d4cead49f8f6070f46a09249c05bb647a1b7bf2c4c6c78e1ae393b2e52395f640bc7e5139aade7c99b45b2 bmc-watchdog.confd
+1e064b0b295fbf76e5deddeaa4edf1b0e5d9b642c2e4be9f3c5cce0700c02ec18778eac4a0cd8196fc5d71ffad9921de8df08a8569812252dd3d604c6f67ad5a bmc-watchdog.initd
+f10e908a451c646b2c61338d79e69663c05216a54093745bd2b659041e0b91adb9be4077c92d63f6f3d62cb5510168b6a57e5e86375533e235fd3abb2b72a49c ipmidetectd.confd
+52e90bb45eb32b447250db3df44d7ba37f821a2d699bc586bdb50706b13e638008cd46ad97cb421fa2d2248f2bb3543d99ed95d27bfdd3b82b560a6fe5da153e ipmidetectd.initd
+0a031f29a4692085054d5fc2dfe6d0ad7fb762f7ee96849ce2d562a90d6e3b0f3ae8328ab852dc22bee6221bc5cd8b588bd02075222038fa0f0e2f64ac185799 ipmiseld.confd
+f95ed699a467689dc1c7c047bd2da8fde04eabc890d02a6517e044a3a5cd05e9ebdeb2b8504fdc053920a8ef281bcf4e2be5a38d3bb4746952bba0e96a47c153 ipmiseld.initd
+"
diff --git a/testing/freeipmi/bmc-watchdog.confd b/testing/freeipmi/bmc-watchdog.confd
new file mode 100644
index 0000000000..4d39cf4d8b
--- /dev/null
+++ b/testing/freeipmi/bmc-watchdog.confd
@@ -0,0 +1,44 @@
+#
+# This configuration file controls the behaviour of the bmc-watchdog daemon
+# from FreeIPMI.
+#
+# -u INT, --timer-use=INT
+# Set timer use. The timer use value can be set to one of the
+# following: 1 = BIOS FRB2, 2 = BIOS POST, 3 = OS_LOAD, 4 = SMS
+# OS, 5 = OEM.
+#
+# -p INT, --pre-timeout-interrupt=INT
+# Set pre-timeout interrupt. The pre timeout interrupt can be set
+# to one of the following: 0 = None, 1 = SMI, 2 = NMI, 3 = Messag-
+# ing Interrupt.
+#
+# -a INT, --timeout-action=INT
+# Set timeout action. The timeout action can be set to one of the
+# following: 0 = No action, 1 = Hard Reset, 2 = Power Down, 3 =
+# Power Cycle.
+#
+# -F, --clear-bios-frb2
+# Clear BIOS FRB2 Timer Use Flag.
+#
+# -P, --clear-bios-post
+# Clear BIOS POST Timer Use Flag.
+#
+# -L, --clear-os-load
+# Clear OS Load Timer Use Flag.
+#
+# -S, --clear-sms-os
+# Clear SMS/OS Timer Use Flag.
+#
+# -O, --clear-oem
+# Clear OEM Timer Use Flag.
+#
+# -i SECS, --initial-countdown=SECS
+# Set initial countdown in seconds.
+#
+# -e, --reset-period
+# Time interval to wait before resetting timer. The default is 60
+# seconds.
+#
+# For the remaining options, consult man bmc-watchdog
+#
+OPTIONS="-d -u 4 -p 0 -a 1 -F -P -L -S -O -i 900 -e 60"
diff --git a/testing/freeipmi/bmc-watchdog.initd b/testing/freeipmi/bmc-watchdog.initd
new file mode 100644
index 0000000000..6beab06597
--- /dev/null
+++ b/testing/freeipmi/bmc-watchdog.initd
@@ -0,0 +1,26 @@
+#!/sbin/openrc-run
+
+description="BMC Watchdog daemon"
+pidfile="/var/run/$RC_SVCNAME.pid"
+command="/usr/sbin/$RC_SVCNAME"
+
+start() {
+ ebegin "Starting $RC_SVCNAME"
+ start-stop-daemon --start \
+ --exec $command \
+ --pidfile $pidfile \
+ --make-pidfile \
+ --quiet \
+ --background \
+ -- \
+ --daemon
+ $OPTIONS
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping $RC_SVCNAME"
+ start-stop-daemon --stop \
+ --pidfile $pidfile
+ eend $?
+}
diff --git a/testing/freeipmi/ipmidetectd.confd b/testing/freeipmi/ipmidetectd.confd
new file mode 100644
index 0000000000..74245f14c0
--- /dev/null
+++ b/testing/freeipmi/ipmidetectd.confd
@@ -0,0 +1,5 @@
+# This configuration file controls the behaviour of the ipmid daemon
+# from FreeIPMI.
+# See `man 8 ipmitdetectd` for further information.
+
+# OPTIONS="-c /etc/freeipmi/ipmidetectd.conf"
diff --git a/testing/freeipmi/ipmidetectd.initd b/testing/freeipmi/ipmidetectd.initd
new file mode 100644
index 0000000000..a791267f85
--- /dev/null
+++ b/testing/freeipmi/ipmidetectd.initd
@@ -0,0 +1,25 @@
+#!/sbin/openrc-run
+
+description="IPMI node detection daemon"
+pidfile="/var/run/$RC_SVCNAME.pid"
+command="/usr/sbin/$RC_SVCNAME"
+
+start() {
+ ebegin "Starting $RC_SVCNAME"
+ start-stop-daemon --start \
+ --exec $command \
+ --pidfile $pidfile \
+ --make-pidfile \
+ --quiet \
+ --background \
+ -- \
+ $OPTIONS
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping $RC_SVCNAME"
+ start-stop-daemon --stop \
+ --pidfile $pidfile
+ eend $?
+}
diff --git a/testing/freeipmi/ipmiseld.confd b/testing/freeipmi/ipmiseld.confd
new file mode 100644
index 0000000000..8e40a5c0c8
--- /dev/null
+++ b/testing/freeipmi/ipmiseld.confd
@@ -0,0 +1,5 @@
+# This configuration file controls the behaviour of the ipmiseld daemon
+# from FreeIPMI.
+# See `man 8 ipmiseld` for further information.
+
+# OPTIONS="--config-file /etc/freeipmi/ipmiseld.conf"
diff --git a/testing/freeipmi/ipmiseld.initd b/testing/freeipmi/ipmiseld.initd
new file mode 100644
index 0000000000..ada5bcdde3
--- /dev/null
+++ b/testing/freeipmi/ipmiseld.initd
@@ -0,0 +1,25 @@
+#!/sbin/openrc-run
+
+description="IPMI system event log daemon"
+pidfile="/var/run/$RC_SVCNAME.pid"
+command="/usr/sbin/$RC_SVCNAME"
+
+start() {
+ ebegin "Starting $RC_SVCNAME"
+ start-stop-daemon --start \
+ --exec $command \
+ --pidfile $pidfile \
+ --make-pidfile \
+ --quiet \
+ --background \
+ -- \
+ $OPTIONS
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping $RC_SVCNAME"
+ start-stop-daemon --stop \
+ --pidfile $pidfile
+ eend $?
+}
diff --git a/testing/fuzzel/APKBUILD b/testing/fuzzel/APKBUILD
deleted file mode 100644
index 702a5c1c49..0000000000
--- a/testing/fuzzel/APKBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# Contributor: Michał Polański <michal@polanski.me>
-# Maintainer: Michał Polański <michal@polanski.me>
-pkgname=fuzzel
-pkgver=1.6.3
-pkgrel=0
-pkgdesc="Application launcher for wlroots-based Wayland compositors"
-url="https://codeberg.org/dnkl/fuzzel"
-license="MIT"
-arch="all"
-options="!check" # no test suite
-makedepends="
- meson
- pixman-dev
- cairo-dev
- libpng-dev
- wayland-protocols
- wayland-dev
- libxkbcommon-dev
- tllist-dev
- fcft-dev
- scdoc
- "
-subpackages="$pkgname-doc $pkgname-zsh-completion"
-source="$pkgname-$pkgver.tar.gz::https://codeberg.org/dnkl/fuzzel/archive/$pkgver.tar.gz"
-builddir="$srcdir/fuzzel"
-
-# enable support for SVG icons where possible
-case "$CARCH" in
- s390x|mips64|riscv64) ;;
- *) makedepends="$makedepends librsvg-dev" ;;
-esac
-
-build() {
- abuild-meson . output
- meson compile -C output
-}
-
-package() {
- DESTDIR="$pkgdir" meson install --no-rebuild -C output
-}
-
-sha512sums="
-75d054448a10563ba171bceb6ee2ab8bcc295e399007046575b3f6c6fd74acb7deb13ff726ae034171941c36a5d112257f93dec9099183e08ed6ab12312060a6 fuzzel-1.6.3.tar.gz
-"
diff --git a/testing/gcompris-qt/APKBUILD b/testing/gcompris-qt/APKBUILD
deleted file mode 100644
index eba6c93480..0000000000
--- a/testing/gcompris-qt/APKBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# Contributor: Thomas Kienlen <kommander@laposte.net>
-# Maintainer: Thomas Kienlen <kommander@laposte.net>
-pkgname=gcompris-qt
-pkgver=1.1
-pkgrel=0
-pkgdesc="Educational software suite comprising of numerous activities for children aged 2 to 10"
-url="https://gcompris.net"
-# armhf blocked by extra-cmake-modules
-arch="all !armhf"
-license="GPL-3.0-or-later"
-depends="
- qt5-qtquickcontrols
- qt5-qtquickcontrols2
- qt5-qtsvg
- "
-makedepends="
- extra-cmake-modules
- kdoctools
- qt5-qtdeclarative-dev
- qt5-qtmultimedia-dev
- qt5-qtquickcontrols2-dev
- qt5-qtsensors-dev
- qt5-qtsvg-dev
- qt5-qttools
- qt5-qttools-dev
- qt5-qtxmlpatterns-dev
- "
-source="https://gcompris.net/download/qt/src/gcompris-qt-$pkgver.tar.xz"
-options="!check" # No test suite
-
-build() {
- cmake -B build \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_BUILD_TYPE=None \
- -DQML_BOX2D_LIBRARY=/usr/lib/qt/qml/Box2D.2.0
- cmake --build build
-}
-
-package() {
- DESTDIR="$pkgdir" cmake --install build
-}
-
-sha512sums="754087dbd8c409136dd82bcc8c308ecb85ec49341e91c99ace727ae6742cb3b9479b2d85fdff99a4d117788d77e253d9d26e3d7fa835193e6644bd7057c26719 gcompris-qt-1.1.tar.xz"
diff --git a/testing/genimage/APKBUILD b/testing/genimage/APKBUILD
new file mode 100644
index 0000000000..aa0af6470a
--- /dev/null
+++ b/testing/genimage/APKBUILD
@@ -0,0 +1,61 @@
+# Contributor: Duncan Bellamy <dunk@denkimushi.com>
+# Maintainer: Duncan Bellamy <dunk@denkimushi.com>
+pkgname=genimage
+pkgver=14
+pkgrel=0
+pkgdesc="tool to generate multiple filesystem and flash images from a tree"
+url="https://github.com/pengutronix/genimage"
+arch="all"
+license="GPL-2.0-only"
+makedepends="autoconf automake confuse-dev linux-headers"
+checkdepends="
+ bash
+ cdrkit
+ coreutils
+ cramfs
+ dosfstools
+ dtc
+ findutils
+ genext2fs
+ mtd-utils-ubi
+ mtools
+ qemu-img
+ squashfs-tools
+ util-linux-misc
+ "
+source="$pkgname-$pkgver.tar.gz::https://github.com/pengutronix/genimage/archive/refs/tags/v$pkgver.tar.gz"
+
+case "$CARCH" in
+ ppc64le) checkdepends="$checkdepends mtd-utils-jffs sfdisk" ;;
+ s390x) : ;;
+ *) checkdepends="$checkdepends android-tools mtd-utils-jffs sfdisk u-boot-tools" ;;
+esac
+
+prepare() {
+ default_prepare
+ autoreconf -vif
+}
+
+build() {
+ ./configure \
+ --build=$CBUILD \
+ --host=$CHOST \
+ --prefix=/usr \
+ --sysconfdir=/etc
+ make
+}
+
+check() {
+ # ext2/3/4 tests fail with incorrect output
+ # android-tools and u-boot-tools missing on ppc64le and s390x
+ # first hdimage test and jfs test fails on s390x
+ make check
+}
+
+package() {
+ make DESTDIR="$pkgdir" install
+}
+
+sha512sums="
+56ca99580a3d67940a42006a7219fb861a8ad621ed5a0cc92da81eee12ec42625d743940d6eabbb11f6798bfa01fe7466dc2f63d1a5820c9f39b0092217497df genimage-14.tar.gz
+"
diff --git a/testing/geodns/APKBUILD b/testing/geodns/APKBUILD
index 565c830757..076310aae3 100644
--- a/testing/geodns/APKBUILD
+++ b/testing/geodns/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Kevin Daudt <kdaudt@alpinelinux.org>
-pkgname="geodns"
-pkgver=3.0.2
-pkgrel=1
+pkgname=geodns
+pkgver=3.2.0
+pkgrel=0
pkgdesc="DNS server with per-client targeted responses"
url="https://github.com/abh/geodns"
arch="all"
@@ -12,21 +12,15 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/abh/geodns/archive/v$pkgver.
$pkgname.initd
$pkgname.confd
"
-builddir="$srcdir/src/github.com/abh/geodns"
-prepare() {
- mkdir -p ${builddir%/*}
- ln -sfT "$srcdir"/$pkgname-$pkgver "$builddir"
- default_prepare
-}
+export GOMODCACHE="$srcdir/go"
+export GOFLAGS="$GOFLAGS -modcacherw"
build() {
- export GOPATH="$srcdir"
- export GO111MODULE=off
- go build -v
+ go build -v -ldflags "-s -w"
cd geodns-logs
- go build -v
+ go build -v -ldflags "-s -w"
}
check() {
@@ -47,7 +41,7 @@ logs() {
}
sha512sums="
-9dc9cc1c4aab957780417bcf564dd93083661b9cfd30bcdd45b06617aca15305775d11cb2a808c4f562745d29c493904d7ecd9dfe60a8c1a8c8a9135efd0d811 geodns-3.0.2.tar.gz
+b04ea8f80494fc7def5cc203341d9e3666530145b5a83a8a89d3ef0c3cdcd96fe1d67cdb5a8885d51e52d4f0a96b93c185cd13a95789d1d40171f0adc22a525a geodns-3.2.0.tar.gz
dc315782eb77627e2cd23a78ebef2f85a0a37a9129f6e16c817d7b9540c8b02987d35fc46882d7752c09caca825c5a77d2d3a27ae19ccccf2bba2e04bc74940c geodns.initd
ce2c7f51151313fa35f132f05cb59458eabb0a74208a79d585d579ce88d0ab168eab389fd59e931b4b19da7fcbca202bf495af345156e47dccb187b746b3ee15 geodns.confd
"
diff --git a/testing/getting-things-gnome/APKBUILD b/testing/getting-things-gnome/APKBUILD
index e392ec2f68..f4b703df46 100644
--- a/testing/getting-things-gnome/APKBUILD
+++ b/testing/getting-things-gnome/APKBUILD
@@ -11,7 +11,9 @@ depends="python3 py3-xdg py3-dbus py3-gobject3 py3-liblarch py3-lxml"
makedepends="py3-setuptools gettext meson"
checkdepends="py3-nose py3-pyflakes py3-mock py3-pycodestyle xvfb-run"
subpackages="$pkgname-doc $pkgname-lang"
-source="$pkgname-$pkgver.tar.gz::https://github.com/getting-things-gnome/gtg/archive/v$pkgver.tar.gz"
+source="$pkgname-$pkgver.tar.gz::https://github.com/getting-things-gnome/gtg/archive/v$pkgver.tar.gz
+ remove-unused-keyword.patch
+ "
builddir="$srcdir/gtg-$pkgver"
build() {
@@ -27,4 +29,7 @@ package() {
DESTDIR="$pkgdir" meson install --no-rebuild -C output
}
-sha512sums="631f5343301d7d72211398152fa081c0fa15154babc7ec900f13a39a2677d0edaf4fea534a83284207e8019926c9108dc1d8f25bdbeae85ef0665dfe1c7b768a getting-things-gnome-0.5.tar.gz"
+sha512sums="
+631f5343301d7d72211398152fa081c0fa15154babc7ec900f13a39a2677d0edaf4fea534a83284207e8019926c9108dc1d8f25bdbeae85ef0665dfe1c7b768a getting-things-gnome-0.5.tar.gz
+21abbb30321e8c178dd0d4118196145c72145150915adfad9b220d149cb52828c3ba1714aeaae79e5b69560ad0d37c31358935e2ec7da8d1a8e65fdc533a821d remove-unused-keyword.patch
+"
diff --git a/testing/getting-things-gnome/remove-unused-keyword.patch b/testing/getting-things-gnome/remove-unused-keyword.patch
new file mode 100644
index 0000000000..de290a22ba
--- /dev/null
+++ b/testing/getting-things-gnome/remove-unused-keyword.patch
@@ -0,0 +1,19 @@
+This is not applicable upstream as this breaks rebuilding translations whenever it changes, and we don't want that since we just building it once for packaging, not actively developing on it.
+
+So keep this here until https://github.com/getting-things-gnome/gtg/issues/720 is solved
+
+diff --git a/GTG/plugins/meson.build b/GTG/plugins/meson.build
+index 7ecb530..f6b2744 100644
+--- a/GTG/plugins/meson.build
++++ b/GTG/plugins/meson.build
+@@ -23,9 +23,7 @@ foreach plugin : gtg_plugins
+ install_dir: plugin_install_dir,
+ type: 'desktop',
+ args: ['--keyword=name', '--keyword=short-description', '--keyword=description'],
+- build_by_default: true,
+- build_always_stale: true
+- # build always because otherwise new translations won't be applied
++ build_by_default: true
+ )
+ subdir(plugin.underscorify())
+ endforeach
diff --git a/testing/git-sizer/APKBUILD b/testing/git-sizer/APKBUILD
deleted file mode 100644
index 435a6a3cac..0000000000
--- a/testing/git-sizer/APKBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# Contributor: Michał Polański <michal@polanski.me>
-# Maintainer: Michał Polański <michal@polanski.me>
-pkgname=git-sizer
-pkgver=1.4.0
-pkgrel=1
-pkgdesc="Compute various size metrics for a Git repository"
-url="https://github.com/github/git-sizer"
-license="MIT"
-arch="all"
-makedepends="go"
-source="https://github.com/github/git-sizer/archive/v$pkgver/git-sizer-$pkgver.tar.gz
- skip-test-exec.patch
- "
-
-export GOPATH="$srcdir"
-export GOFLAGS="$GOFLAGS -trimpath -modcacherw"
-
-build() {
- go build \
- -ldflags="-s -w -X main.BuildVersion=$pkgver-r$pkgrel" \
- -v -o bin/git-sizer
-}
-
-check() {
- go test ./...
-}
-
-package() {
- install -Dm755 bin/git-sizer "$pkgdir"/usr/bin/git-sizer
-}
-
-sha512sums="
-4ef10ab9b01e3228a6899972a4964d9fb0a5ea4b8f1516f3753cb92f12de346a95908046a89b491fa766afd262c1befd15d7f5654701afb31faa1db07b0c96f4 git-sizer-1.4.0.tar.gz
-03a990ea83ccb5d224ae23151285824ed238ece40150f88e0ea0bc841b099ac49b64523c83db10e9ae924b1ff16375a375d79796df9235380c025a61e4ab1581 skip-test-exec.patch
-"
diff --git a/testing/git-sizer/skip-test-exec.patch b/testing/git-sizer/skip-test-exec.patch
deleted file mode 100644
index 5fa86229d6..0000000000
--- a/testing/git-sizer/skip-test-exec.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/git_sizer_test.go b/git_sizer_test.go
-index 6c82a7a..ee62350 100644
---- a/git_sizer_test.go
-+++ b/git_sizer_test.go
-@@ -22,6 +22,7 @@ import (
-
- // Smoke test that the program runs.
- func TestExec(t *testing.T) {
-+ t.Skip("requires a git repository for testing")
- cmd := exec.Command("bin/git-sizer")
- output, err := cmd.CombinedOutput()
- assert.NoErrorf(t, err, "command failed; output: %#v", string(output))
diff --git a/testing/glacier-browser/APKBUILD b/testing/glacier-browser/APKBUILD
new file mode 100644
index 0000000000..25ab53f60b
--- /dev/null
+++ b/testing/glacier-browser/APKBUILD
@@ -0,0 +1,40 @@
+# Contributor: Bart Ribbers <bribbers@disroot.org>
+# Maintainer: Bart Ribbers <bribbers@disroot.org>
+pkgname=glacier-browser
+pkgver=0.1.1
+pkgrel=0
+pkgdesc="The Glacier browser"
+url="https://github.com/nemomobile-ux/glacier-browser"
+# armhf blocked by qt5-qtdeclarative
+# s390x, ppc64le and riscv64 blocked by qt5-qtwebengine-dev
+arch="all !armhf !s390x !ppc64le !riscv64"
+license="GPL-2.0-only"
+depends="
+ qt5-qtbase-sqlite
+ qtquickcontrols-nemo
+ "
+makedepends="
+ cmake
+ libglacierapp-dev
+ qt5-qtbase-dev
+ qt5-qtdeclarative-dev
+ qt5-qttools-dev
+ qt5-qtwebengine-dev
+ "
+source="https://github.com/nemomobile-ux/glacier-browser/archive/$pkgver/glacier-browser-$pkgver.tar.gz"
+
+build() {
+ cmake -B build \
+ -DCMAKE_BUILD_TYPE=None \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=lib
+ cmake --build build
+}
+
+package() {
+ DESTDIR="$pkgdir" cmake --install build
+}
+
+sha512sums="
+d4ee59f7f21cbfb4279bfdef2aa244898d669b476f63ad9e34665a4384347125c8069768f564071ae621995aa1bd8536db79c582203dfa93b7a65aac890f20f5 glacier-browser-0.1.1.tar.gz
+"
diff --git a/testing/glossaico/APKBUILD b/testing/glossaico/APKBUILD
new file mode 100644
index 0000000000..a3b1649bdb
--- /dev/null
+++ b/testing/glossaico/APKBUILD
@@ -0,0 +1,42 @@
+# Contributor: Bart Ribbers <bribbers@disroot.org>
+# Maintainer: Bart Ribbers <bribbers@disroot.org>
+pkgname=glossaico
+pkgver=1.0
+pkgrel=0
+pkgdesc="Language learning application based on LibreLingo"
+url="https://codeberg.org/dimkard/glossaico"
+# armhf and riscv64 blocked by py3-pyside2
+# ppc64le blocked by py3-importlib-metadata
+arch="noarch !armhf !riscv64 !ppc64le"
+license="GPL-3.0-or-later"
+depends="
+ py3-importlib-metadata
+ py3-librelingo-audios
+ py3-librelingo-utils
+ py3-librelingo-yaml-loader
+ py3-pyside2
+ py3-requests
+ py3-slugify
+ py3-yaml
+ python3
+ "
+makedepends="py3-setuptools"
+source="$pkgname-$pkgver.tar.gz::https://codeberg.org/dimkard/glossaico/archive/v$pkgver.tar.gz"
+options="!check" # No tests
+builddir="$srcdir/$pkgname"
+
+build() {
+ python3 setup.py build
+}
+
+check() {
+ pytest
+}
+
+package() {
+ python3 setup.py install --prefix=/usr --root="$pkgdir"
+}
+
+sha512sums="
+42378f47825925171f815b7de7837dc036d06ed98eb169f79128ac54c68c4b270682f9fa97ca3a78f52ae3e0d87446e8c71729a0a8927299dacd302f2e187aa8 glossaico-1.0.tar.gz
+"
diff --git a/testing/go-sendxmpp/APKBUILD b/testing/go-sendxmpp/APKBUILD
new file mode 100644
index 0000000000..dba4755550
--- /dev/null
+++ b/testing/go-sendxmpp/APKBUILD
@@ -0,0 +1,28 @@
+# Contributor: Anjandev Momi <anjan@momi.ca>
+# Maintainer: Anjandev Momi <anjan@momi.ca>
+pkgname=go-sendxmpp
+pkgver=0.1.1
+pkgrel=0
+pkgdesc="Tool to send messages to an XMPP contact or MUC"
+url="https://salsa.debian.org/mdosch/go-sendxmpp"
+arch="all"
+license="BSD-2-Clause"
+makedepends="go"
+source="$pkgname-$pkgver.tar.gz::https://salsa.debian.org/mdosch/go-sendxmpp/-/archive/v0.1.1/go-sendxmpp-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
+
+build() {
+ go build
+}
+
+check() {
+ go test
+}
+
+package() {
+ install -Dm755 go-sendxmpp "$pkgdir"/usr/bin/go-sendxmpp
+}
+
+sha512sums="
+e4d8498d74f2b787c8812ae7c5a57b16b8b3a58aa6028e78374074a35d2a8a3384cc1cd30a1582d7ed70b94dcbcc096215ff9a7c80e39dbe8898029b0a7ed2b1 go-sendxmpp-0.1.1.tar.gz
+"
diff --git a/testing/gopls/APKBUILD b/testing/gopls/APKBUILD
index 5dab5b332f..fe104f15bf 100644
--- a/testing/gopls/APKBUILD
+++ b/testing/gopls/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: David Florness <david@florness.com>
pkgname=gopls
pkgver=0.7.3
-pkgrel=0
+pkgrel=1
pkgdesc="Language server for Go programming language"
url="https://github.com/golang/tools/blob/master/gopls"
license="BSD-3-Clause"
diff --git a/testing/gops/APKBUILD b/testing/gops/APKBUILD
index a5410aeadd..9710fe5c30 100644
--- a/testing/gops/APKBUILD
+++ b/testing/gops/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Michał Polański <michal@polanski.me>
# Maintainer: Michał Polański <michal@polanski.me>
pkgname=gops
-pkgver=0.3.21
-pkgrel=0
+pkgver=0.3.22
+pkgrel=1
pkgdesc="List and diagnose Go processes currently running on your system"
url="https://github.com/google/gops"
license="BSD-3-Clause"
@@ -26,5 +26,5 @@ package() {
}
sha512sums="
-c12fc48560ec12ac365c6d6a9aa80d7858939f1d90a76b6f37910b520c739645cc1b2ec79fe1de7c8931bd953face44fbdafe1ceae3206e182b6e6a6982df78c gops-0.3.21.tar.gz
+8e5e622dad925de1aa0f4afae8de0ff31e0e65042e84fadbcd4b0033a35f839dd8bc04c621307c74c9e5ca2e47403b4daaf694f06aeae958c2e19090d6621c40 gops-0.3.22.tar.gz
"
diff --git a/testing/gpick/APKBUILD b/testing/gpick/APKBUILD
deleted file mode 100644
index d74fe55370..0000000000
--- a/testing/gpick/APKBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# Contributor: knuxify <knuxify@gmail.com>
-# Maintainer: knuxify <knuxify@gmail.com>
-pkgname=gpick
-pkgver=0.2.6
-pkgrel=0
-pkgdesc="Advanced color picker written in C++ using GTK+ toolkit"
-url="http://gpick.org"
-arch="all"
-license="BSD-3-Clause"
-_luaver=5.3
-makedepends="cmake ragel gtk+3.0-dev boost-dev lua$_luaver-dev lua$_luaver-libs
- expat-dev"
-subpackages="$pkgname-doc $pkgname-lang"
-source="https://github.com/thezbyg/gpick/archive/refs/tags/gpick-$pkgver.tar.gz"
-builddir="$srcdir/gpick-gpick-$pkgver"
-
-build() {
- if [ "$CBUILD" != "$CHOST" ]; then
- CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
- fi
- cmake -B build \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_BUILD_TYPE=None \
- -DLua_LIBRARIES="/usr/lib/liblua-$_luaver.so.0" \
- -DLua_INCLUDE_DIRS="$(pkg-config --variable=includedir lua$_luaver )" \
- $CMAKE_CROSSOPTS .
- cmake --build build
-
-}
-
-check() {
- ./build/tests
-}
-
-package() {
- DESTDIR="$pkgdir" cmake --install build
- install -Dm644 installer/License.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-}
-
-sha512sums="
-85f4d0978915e0c0b6e412d619a28af62a43547d39c4b97d8dddc4024f9d8b339f09e91f70d929073ebbad7a6e008e174aa76fdc611008ba269dedb403ed6867 gpick-0.2.6.tar.gz
-"
diff --git a/testing/grafana-image-renderer/APKBUILD b/testing/grafana-image-renderer/APKBUILD
index 831913f4db..2b1e9f1a9f 100644
--- a/testing/grafana-image-renderer/APKBUILD
+++ b/testing/grafana-image-renderer/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Konstantin Kulikov <k.kulikov2@gmail.com>
# Maintainer: Konstantin Kulikov <k.kulikov2@gmail.com>
pkgname=grafana-image-renderer
-pkgver=3.2.1
+pkgver=3.3.0
pkgrel=0
pkgdesc="Grafana Backend Plugin that handles rendering of panels & dashboards to PNGs using headless chrome"
url="https://github.com/grafana/grafana-image-renderer"
@@ -36,7 +36,7 @@ package() {
}
sha512sums="
-aadb3c72afc4866df2dd7f153cb3e3a19ffbe4dd8d62cf2dbcd8ab597e3100e6e385f362090177dd08014156c42cd2f665995f8867660fc18a0156733ea9588b grafana-image-renderer-3.2.1.tar.gz
+28fa21ba1c13fa7b0c6e29fe66a90a24d65d4b6d3421e6aa102aeb05b5c29cba3536a62b00c1577c543af908e28cc17324cd16f44a6849b0ad0713ff6dd58517 grafana-image-renderer-3.3.0.tar.gz
06faad0f5abecf434c014ca91dccf3f07f18d96a8f526c3c1d2384cba8db44db5fe2b2165d8fc12a8fe8d121135077b0c70158ee29ebb1bfba8dd2a3110b349c grafana-image-renderer.initd
88a119ad18fbde490ab9213487ae16b8aeeb65437275a1112f7423fa581a7470e6fb68654c2fd439afa68c0333aeefd0711f3fffd53615fa51d0702c80ed1c1b grafana-image-renderer.confd
2ce48b9ea1da4ce5a16da5acb3fd801480d297ab2c39848020a99dd285640e003eb0d1c26b407f06ef5ad0ff2968b5ae71f56c26870346e6ad86e1f70df4cb78 grafana-image-renderer.json
diff --git a/testing/grpc-java/APKBUILD b/testing/grpc-java/APKBUILD
deleted file mode 100644
index 504e4bbb08..0000000000
--- a/testing/grpc-java/APKBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# Contributor: wener <wenermail@gmail.com>
-# Maintainer: wener <wenermail@gmail.com>
-pkgname=grpc-java
-pkgver=1.38.1
-pkgrel=0
-pkgdesc="The Java gRPC implementation. HTTP/2 based RPC"
-url="https://github.com/grpc/grpc-java"
-# armhf and aarch64 are blocked by build failures
-# mips64 and riscv64 blocked by java
-arch="all !aarch64 !armhf !armv7 !s390x !mips64 !riscv64"
-license="Apache-2.0"
-depends="java-jre-headless"
-makedepends="java-jdk protobuf-dev nss"
-source="$pkgname-$pkgver.tar.gz::https://github.com/grpc/grpc-java/archive/v$pkgver.tar.gz
- grandle-version.patch
- "
-options="!check"
-
-build() {
- export GRADLE_USER_HOME="$srcdir"/.gradle
- cd compiler
- # support Java 16
- ../gradlew --no-daemon --parallel --info java_pluginExecutable -PskipAndroid=true
-}
-
-package() {
- install -D -m 755 compiler/build/exe/java_plugin/protoc-gen-grpc-java "$pkgdir"/usr/bin/protoc-gen-grpc-java
-}
-
-sha512sums="
-ccd64bced9de454622bce23b737abfce51af274825af188d077b2ed5d6333a099f2ab96f34e42b55b739a10b74723b670a8d0980980df4263649b5229e41fd8f grpc-java-1.38.1.tar.gz
-ad1b3916c8dc32f9b4f1a4b30c4675b8413dbc17780e12a4c9a77ea3d75554656a666a3eca36dbe653b5c5aab7373694319e174c682ad0487fe3c453bdfe9d48 grandle-version.patch
-"
diff --git a/testing/grpc-java/grandle-version.patch b/testing/grpc-java/grandle-version.patch
deleted file mode 100644
index a7aa7d080a..0000000000
--- a/testing/grpc-java/grandle-version.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/gradle/wrapper/gradle-wrapper.properties
-+++ b/gradle/wrapper/gradle-wrapper.properties
-@@ -1,5 +1,5 @@
- distributionBase=GRADLE_USER_HOME
- distributionPath=wrapper/dists
--distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
-+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
- zipStoreBase=GRADLE_USER_HOME
- zipStorePath=wrapper/dists
diff --git a/testing/hamlib/APKBUILD b/testing/hamlib/APKBUILD
index efb8f423a5..b12b440c15 100644
--- a/testing/hamlib/APKBUILD
+++ b/testing/hamlib/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Bradford D. Boyle <bradford.d.boyle@gmail.com>
# Maintainer: Bradford D. Boyle <bradford.d.boyle@gmail.com>
pkgname=hamlib
-pkgver=4.3.1
+pkgver=4.4
pkgrel=0
pkgdesc="Library to control radio transceivers and receivers"
url="https://hamlib.github.io/"
@@ -58,5 +58,5 @@ tcl() {
}
sha512sums="
-8dee4676a19de7ac1ef733a4285b76e918f11aad6594d0557d36df295faf04c615e0993edb2f9ed5e7aea718c184603fec831caf28b75026c705f0b2e4b9eca7 hamlib-4.3.1.tar.gz
+37366ba180031de34da447c3d4e0086f156b893f57b5ab9bbc38b8e1f4bf9310fa1a9eb2a6d7884f1f11900dbdb811b4071e023aba571ea0ac5d07ddb122bf7b hamlib-4.4.tar.gz
"
diff --git a/testing/handbrake/APKBUILD b/testing/handbrake/APKBUILD
index 39a6631d61..c3c7d26c54 100644
--- a/testing/handbrake/APKBUILD
+++ b/testing/handbrake/APKBUILD
@@ -2,7 +2,7 @@
pkgname=handbrake
_pkgname=HandBrake
pkgver=1.4.1
-pkgrel=0
+pkgrel=1
pkgdesc="Handbrake video transcoder"
url="https://handbrake.fr"
arch="all !s390x !mips !mips64"
diff --git a/testing/happy/APKBUILD b/testing/happy/APKBUILD
index 968d097c40..7ad98f71a5 100644
--- a/testing/happy/APKBUILD
+++ b/testing/happy/APKBUILD
@@ -2,12 +2,12 @@
# Maintainer: River Dillon <oss@outerpassage.net>
pkgname=happy
pkgver=1.20.0
-pkgrel=1
+pkgrel=2
pkgdesc="parser generator for Haskell"
url="https://www.haskell.org/happy/"
arch="x86_64" # limited by ghc
license="BSD-2-Clause"
-makedepends="ghc"
+makedepends="ghc libffi-dev"
subpackages="$pkgname-doc"
source="
https://hackage.haskell.org/package/happy-$pkgver/happy-$pkgver.tar.gz
diff --git a/testing/harminv/APKBUILD b/testing/harminv/APKBUILD
index cb74665aee..ac3d7b5d5c 100644
--- a/testing/harminv/APKBUILD
+++ b/testing/harminv/APKBUILD
@@ -2,12 +2,12 @@
# Maintainer: Roberto Oliveira <robertoguimaraes8@gmail.com>
pkgname=harminv
pkgver=1.4.1
-pkgrel=4
+pkgrel=5
pkgdesc="Free program to solve the problem of harmonic inversion"
url="https://github.com/stevengj/harminv"
arch="all !mips !mips64"
license="GPL"
-depends_dev="openblas-dev>=0.3.0 lapack-dev"
+depends_dev="openblas-dev>=0.3.0"
makedepends="$depends_dev gfortran"
subpackages="$pkgname-dev $pkgname-doc $pkgname-libs"
source="harminv-$pkgver.tar.gz::https://github.com/stevengj/harminv/releases/download/v$pkgver/harminv-$pkgver.tar.gz"
diff --git a/testing/headlines/APKBUILD b/testing/headlines/APKBUILD
index 3b9ceeedc6..3e1c0d1d51 100644
--- a/testing/headlines/APKBUILD
+++ b/testing/headlines/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Adam Plumb <adamplumb@gmail.com>
pkgname=headlines
pkgver=0.4.0
-pkgrel=0
+pkgrel=1
pkgdesc="GTK4 Reddit client written in C++"
url="https://gitlab.com/caveman250/Headlines"
arch="all !s390x !riscv64"
diff --git a/testing/helvum/APKBUILD b/testing/helvum/APKBUILD
index 9ec10d2b2f..fbdf671b9b 100644
--- a/testing/helvum/APKBUILD
+++ b/testing/helvum/APKBUILD
@@ -1,14 +1,14 @@
# Contributor: Michał Polański <michal@polanski.me>
# Maintainer: Michał Polański <michal@polanski.me>
pkgname=helvum
-pkgver=0.3.1
-pkgrel=1
+pkgver=0.3.2
+pkgrel=0
pkgdesc="GTK patchbay for pipewire"
url="https://gitlab.freedesktop.org/ryuukyu/helvum"
license="GPL-3.0"
-arch="all !s390x !mips64 !riscv64" # blocked by rust/cargo
+arch="all !s390x !riscv64" # blocked by rust/cargo
arch="$arch !x86 !armv7 !armhf" # FTBFS on 32-bit systems
-makedepends="cargo meson clang-dev glib-dev gtk4.0-dev pipewire-dev"
+makedepends="bash cargo meson clang-dev glib-dev gtk4.0-dev pipewire-dev"
source="https://gitlab.freedesktop.org/ryuukyu/helvum/-/archive/$pkgver/helvum-$pkgver.tar.gz"
options="!check" # no test suite
@@ -22,5 +22,5 @@ package() {
}
sha512sums="
-6a8bafb6302d2638e76d22f348bba1ca222857d5dde42f178853151bf50161574e1a534d7194decab4677651d152ac38dcefa3cfde28ea8630ca0360c3b88868 helvum-0.3.1.tar.gz
+a64574699215de1a4435aca6a1b1780677c5c09e83c377ccce1a9393373e2ed7fd993e8f05687fcd775d55ea0c1c8d2406634e3d82c0512666ed3517c9c51f00 helvum-0.3.2.tar.gz
"
diff --git a/testing/hexer/APKBUILD b/testing/hexer/APKBUILD
index 0cfe9eb496..31ab503031 100644
--- a/testing/hexer/APKBUILD
+++ b/testing/hexer/APKBUILD
@@ -2,10 +2,10 @@
# Maintainer: Bradley J Chambers <brad.chambers@gmail.com>
pkgname=hexer
pkgver=1.4.0
-pkgrel=8
+pkgrel=9
pkgdesc="LAS and OGR hexagonal density and boundary surface generation"
url="https://github.com/hobu/hexer"
-arch="all !s390x !x86 !armhf !armv7 !mips !mips64 !riscv64" # gdal availability
+arch="all"
license="LGPL-2.0-or-later"
options="!check"
makedepends="cmake gdal-dev"
@@ -27,6 +27,8 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="4db94af7fe0a2cc3cd26202c4ec88fadd88408c92d14e11ac117af51ee267aa87cd82aa18b29867f318d272f644be60a826e7fb3c72908baba4124499f39579c hexer-1.4.0.tar.gz
+sha512sums="
+4db94af7fe0a2cc3cd26202c4ec88fadd88408c92d14e11ac117af51ee267aa87cd82aa18b29867f318d272f644be60a826e7fb3c72908baba4124499f39579c hexer-1.4.0.tar.gz
971434a5c7b817296ecf7fa44222c0b7db909bef0c8bf130daef6b9db0ee68bab7aa8ef59aae1e6eda1daa801e4fbe2a5a88f22083d4c885de5a1e05310f9a0a 10-missing-includes.patch
-9fd03681856e42ac5747b98a45542d24289bcd687c377035382835692df4ba23773bc9601d1b5b2c4e0a345aa8dac8b0c80a95a19f318b27b82a8bbfc87509cc 20-compile-test-for-execinfo.patch"
+9fd03681856e42ac5747b98a45542d24289bcd687c377035382835692df4ba23773bc9601d1b5b2c4e0a345aa8dac8b0c80a95a19f318b27b82a8bbfc87509cc 20-compile-test-for-execinfo.patch
+"
diff --git a/testing/hfsprogs/APKBUILD b/testing/hfsprogs/APKBUILD
deleted file mode 100644
index ba87fc9761..0000000000
--- a/testing/hfsprogs/APKBUILD
+++ /dev/null
@@ -1,61 +0,0 @@
-# Contributor: Jakub Jirutka <jakub@jirutka.cz>
-# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
-pkgname=hfsprogs
-_pkgname=diskdev_cmds
-pkgver=540.1_p3
-_pkgver=${pkgver/_p/.linux}
-pkgrel=4
-pkgdesc="Tools to create/check Apple HFS+ filesystems"
-# We use modified version provided by Fedora's dev, not directly from Apple.
-url="https://src.fedoraproject.org/rpms/hfsplus-tools"
-arch="all !mips !mips64" # broken on soft-float
-license="APSL-2.0"
-makedepends="clang libbsd-dev openssl-dev linux-headers util-linux-dev"
-provides="$_pkgname=$pkgver-r$pkgrel"
-subpackages="$pkgname-doc"
-_checksum="0435afc389b919027b69616ad1b05709"
-# https://src.fedoraproject.org/rpms/hfsplus-tools/blob/f27/f/hfsplus-tools.spec
-source="https://src.fedoraproject.org/repo/pkgs/hfsplus-tools/diskdev_cmds-$_pkgver.tar.gz/$_checksum/diskdev_cmds-$_pkgver.tar.gz
- APSL-2.0.txt
- fix-stdarg.patch
- musl-compat.patch"
-builddir="$srcdir/$_pkgname-$_pkgver"
-
-prepare() {
- default_prepare
-
- sed -i 's/[F|f]sck_hfs/fsck.hfsplus/g' fsck_hfs.tproj/fsck_hfs.8
- sed -i 's/[N|n]ewfs_hfs/mkfs.hfsplus/g' newfs_hfs.tproj/newfs_hfs.8
-
- # Remove errant execute bits.
- find . -type f -name '*.[ch]' -exec chmod -c -x {} +
-}
-
-build() {
- make
-}
-
-check() {
- ./fsck_hfs.tproj/fsck_hfs 2>&1 | grep 'usage: fsck_hfs'
- ./newfs_hfs.tproj/newfs_hfs 2>&1 | grep 'usage: newfs_hfs'
-}
-
-package() {
- install -D -m 755 fsck_hfs.tproj/fsck_hfs "$pkgdir"/usr/sbin/fsck.hfs
- install -D -m 755 newfs_hfs.tproj/newfs_hfs "$pkgdir"/usr/sbin/mkfs.hfsplus
- ln -s fsck.hfs "$pkgdir"/usr/sbin/fsck.hfsplus
-
- install -D -m 644 fsck_hfs.tproj/fsck_hfs.8 \
- "$pkgdir"/usr/share/man/man8/fsck.hfsplus.8
- install -D -m 644 newfs_hfs.tproj/newfs_hfs.8 \
- "$pkgdir"/usr/share/man/man8/mkfs.hfsplus.8
- ln -s fsck.hfs.8 "$pkgdir"/usr/share/man/man8/fsck.hfs.8
-
- install -D -m 644 "$srcdir"/APSL-2.0.txt \
- "$pkgdir"/usr/share/licenses/$pkgname/APSL-2.0.txt
-}
-
-sha512sums="3d88fcdec4bfd32a75b6dc75899748d8585371b641be86cfdfe54ade738a0612662dd008c1506c7e216325303217d0b5f188a9c4fdccfb48b2ce50333f212d9e diskdev_cmds-540.1.linux3.tar.gz
-76a53cc22e92e12d6255fc6ee0b9b65e03ef0d590e8bdbf06e9861a5f024f25c5344ce8426ca8f81d8544d86004be02f806ad60517165a9f6d9dfd6f31790c21 APSL-2.0.txt
-cff25de690f5ecc418380e5cbda3615d38ef9583ace60be9b7696c50e46bc35a29855b216ddb4daae79ff5b40f66ffbc03f613ab0ae1935ee9df6e69caed2e0b fix-stdarg.patch
-34c73b0b57c8e8fa64abf34a9396b6dc218b1a1f06fec98fd52e77c81421cff249f4a65d5f26e692b1cb5e2424a871ecbf5b35eab5d3509506f6710406ff7577 musl-compat.patch"
diff --git a/testing/hfsprogs/APSL-2.0.txt b/testing/hfsprogs/APSL-2.0.txt
deleted file mode 100644
index 7107e731ca..0000000000
--- a/testing/hfsprogs/APSL-2.0.txt
+++ /dev/null
@@ -1,366 +0,0 @@
-Version 2.0 - August 6, 2003
-
-Please read this License carefully before downloading this software.
-By downloading or using this software, you are agreeing to be bound by
-the terms of this License. If you do not or cannot agree to the terms
-of this License, please do not download or use the software.
-
-1. General; Definitions. This License applies to any program or other
-work which Apple Computer, Inc. ("Apple") makes publicly available and
-which contains a notice placed by Apple identifying such program or
-work as "Original Code" and stating that it is subject to the terms of
-this Apple Public Source License version 2.0 ("License"). As used in
-this License:
-
-1.1 "Applicable Patent Rights" mean: (a) in the case where Apple is
-the grantor of rights, (i) claims of patents that are now or hereafter
-acquired, owned by or assigned to Apple and (ii) that cover subject
-matter contained in the Original Code, but only to the extent
-necessary to use, reproduce and/or distribute the Original Code
-without infringement; and (b) in the case where You are the grantor of
-rights, (i) claims of patents that are now or hereafter acquired,
-owned by or assigned to You and (ii) that cover subject matter in Your
-Modifications, taken alone or in combination with Original Code.
-
-1.2 "Contributor" means any person or entity that creates or
-contributes to the creation of Modifications.
-
-1.3 "Covered Code" means the Original Code, Modifications, the
-combination of Original Code and any Modifications, and/or any
-respective portions thereof.
-
-1.4 "Externally Deploy" means: (a) to sublicense, distribute or
-otherwise make Covered Code available, directly or indirectly, to
-anyone other than You; and/or (b) to use Covered Code, alone or as
-part of a Larger Work, in any way to provide a service, including but
-not limited to delivery of content, through electronic communication
-with a client other than You.
-
-1.5 "Larger Work" means a work which combines Covered Code or portions
-thereof with code not governed by the terms of this License.
-
-1.6 "Modifications" mean any addition to, deletion from, and/or change
-to, the substance and/or structure of the Original Code, any previous
-Modifications, the combination of Original Code and any previous
-Modifications, and/or any respective portions thereof. When code is
-released as a series of files, a Modification is: (a) any addition to
-or deletion from the contents of a file containing Covered Code;
-and/or (b) any new file or other representation of computer program
-statements that contains any part of Covered Code.
-
-1.7 "Original Code" means (a) the Source Code of a program or other
-work as originally made available by Apple under this License,
-including the Source Code of any updates or upgrades to such programs
-or works made available by Apple under this License, and that has been
-expressly identified by Apple as such in the header file(s) of such
-work; and (b) the object code compiled from such Source Code and
-originally made available by Apple under this License.
-
-1.8 "Source Code" means the human readable form of a program or other
-work that is suitable for making modifications to it, including all
-modules it contains, plus any associated interface definition files,
-scripts used to control compilation and installation of an executable
-(object code).
-
-1.9 "You" or "Your" means an individual or a legal entity exercising
-rights under this License. For legal entities, "You" or "Your"
-includes any entity which controls, is controlled by, or is under
-common control with, You, where "control" means (a) the power, direct
-or indirect, to cause the direction or management of such entity,
-whether by contract or otherwise, or (b) ownership of fifty percent
-(50%) or more of the outstanding shares or beneficial ownership of
-such entity.
-
-2. Permitted Uses; Conditions & Restrictions. Subject to the terms
-and conditions of this License, Apple hereby grants You, effective on
-the date You accept this License and download the Original Code, a
-world-wide, royalty-free, non-exclusive license, to the extent of
-Apple's Applicable Patent Rights and copyrights covering the Original
-Code, to do the following:
-
-2.1 Unmodified Code. You may use, reproduce, display, perform,
-internally distribute within Your organization, and Externally Deploy
-verbatim, unmodified copies of the Original Code, for commercial or
-non-commercial purposes, provided that in each instance:
-
-(a) You must retain and reproduce in all copies of Original Code the
-copyright and other proprietary notices and disclaimers of Apple as
-they appear in the Original Code, and keep intact all notices in the
-Original Code that refer to this License; and
-
-(b) You must include a copy of this License with every copy of Source
-Code of Covered Code and documentation You distribute or Externally
-Deploy, and You may not offer or impose any terms on such Source Code
-that alter or restrict this License or the recipients' rights
-hereunder, except as permitted under Section 6.
-
-2.2 Modified Code. You may modify Covered Code and use, reproduce,
-display, perform, internally distribute within Your organization, and
-Externally Deploy Your Modifications and Covered Code, for commercial
-or non-commercial purposes, provided that in each instance You also
-meet all of these conditions:
-
-(a) You must satisfy all the conditions of Section 2.1 with respect to
-the Source Code of the Covered Code;
-
-(b) You must duplicate, to the extent it does not already exist, the
-notice in Exhibit A in each file of the Source Code of all Your
-Modifications, and cause the modified files to carry prominent notices
-stating that You changed the files and the date of any change; and
-
-(c) If You Externally Deploy Your Modifications, You must make
-Source Code of all Your Externally Deployed Modifications either
-available to those to whom You have Externally Deployed Your
-Modifications, or publicly available. Source Code of Your Externally
-Deployed Modifications must be released under the terms set forth in
-this License, including the license grants set forth in Section 3
-below, for as long as you Externally Deploy the Covered Code or twelve
-(12) months from the date of initial External Deployment, whichever is
-longer. You should preferably distribute the Source Code of Your
-Externally Deployed Modifications electronically (e.g. download from a
-web site).
-
-2.3 Distribution of Executable Versions. In addition, if You
-Externally Deploy Covered Code (Original Code and/or Modifications) in
-object code, executable form only, You must include a prominent
-notice, in the code itself as well as in related documentation,
-stating that Source Code of the Covered Code is available under the
-terms of this License with information on how and where to obtain such
-Source Code.
-
-2.4 Third Party Rights. You expressly acknowledge and agree that
-although Apple and each Contributor grants the licenses to their
-respective portions of the Covered Code set forth herein, no
-assurances are provided by Apple or any Contributor that the Covered
-Code does not infringe the patent or other intellectual property
-rights of any other entity. Apple and each Contributor disclaim any
-liability to You for claims brought by any other entity based on
-infringement of intellectual property rights or otherwise. As a
-condition to exercising the rights and licenses granted hereunder, You
-hereby assume sole responsibility to secure any other intellectual
-property rights needed, if any. For example, if a third party patent
-license is required to allow You to distribute the Covered Code, it is
-Your responsibility to acquire that license before distributing the
-Covered Code.
-
-3. Your Grants. In consideration of, and as a condition to, the
-licenses granted to You under this License, You hereby grant to any
-person or entity receiving or distributing Covered Code under this
-License a non-exclusive, royalty-free, perpetual, irrevocable license,
-under Your Applicable Patent Rights and other intellectual property
-rights (other than patent) owned or controlled by You, to use,
-reproduce, display, perform, modify, sublicense, distribute and
-Externally Deploy Your Modifications of the same scope and extent as
-Apple's licenses under Sections 2.1 and 2.2 above.
-
-4. Larger Works. You may create a Larger Work by combining Covered
-Code with other code not governed by the terms of this License and
-distribute the Larger Work as a single product. In each such instance,
-You must make sure the requirements of this License are fulfilled for
-the Covered Code or any portion thereof.
-
-5. Limitations on Patent License. Except as expressly stated in
-Section 2, no other patent rights, express or implied, are granted by
-Apple herein. Modifications and/or Larger Works may require additional
-patent licenses from Apple which Apple may grant in its sole
-discretion.
-
-6. Additional Terms. You may choose to offer, and to charge a fee for,
-warranty, support, indemnity or liability obligations and/or other
-rights consistent with the scope of the license granted herein
-("Additional Terms") to one or more recipients of Covered Code.
-However, You may do so only on Your own behalf and as Your sole
-responsibility, and not on behalf of Apple or any Contributor. You
-must obtain the recipient's agreement that any such Additional Terms
-are offered by You alone, and You hereby agree to indemnify, defend
-and hold Apple and every Contributor harmless for any liability
-incurred by or claims asserted against Apple or such Contributor by
-reason of any such Additional Terms.
-
-7. Versions of the License. Apple may publish revised and/or new
-versions of this License from time to time. Each version will be given
-a distinguishing version number. Once Original Code has been published
-under a particular version of this License, You may continue to use it
-under the terms of that version. You may also choose to use such
-Original Code under the terms of any subsequent version of this
-License published by Apple. No one other than Apple has the right to
-modify the terms applicable to Covered Code created under this
-License.
-
-8. NO WARRANTY OR SUPPORT. The Covered Code may contain in whole or in
-part pre-release, untested, or not fully tested works. The Covered
-Code may contain errors that could cause failures or loss of data, and
-may be incomplete or contain inaccuracies. You expressly acknowledge
-and agree that use of the Covered Code, or any portion thereof, is at
-Your sole and entire risk. THE COVERED CODE IS PROVIDED "AS IS" AND
-WITHOUT WARRANTY, UPGRADES OR SUPPORT OF ANY KIND AND APPLE AND
-APPLE'S LICENSOR(S) (COLLECTIVELY REFERRED TO AS "APPLE" FOR THE
-PURPOSES OF SECTIONS 8 AND 9) AND ALL CONTRIBUTORS EXPRESSLY DISCLAIM
-ALL WARRANTIES AND/OR CONDITIONS, EXPRESS OR IMPLIED, INCLUDING, BUT
-NOT LIMITED TO, THE IMPLIED WARRANTIES AND/OR CONDITIONS OF
-MERCHANTABILITY, OF SATISFACTORY QUALITY, OF FITNESS FOR A PARTICULAR
-PURPOSE, OF ACCURACY, OF QUIET ENJOYMENT, AND NONINFRINGEMENT OF THIRD
-PARTY RIGHTS. APPLE AND EACH CONTRIBUTOR DOES NOT WARRANT AGAINST
-INTERFERENCE WITH YOUR ENJOYMENT OF THE COVERED CODE, THAT THE
-FUNCTIONS CONTAINED IN THE COVERED CODE WILL MEET YOUR REQUIREMENTS,
-THAT THE OPERATION OF THE COVERED CODE WILL BE UNINTERRUPTED OR
-ERROR-FREE, OR THAT DEFECTS IN THE COVERED CODE WILL BE CORRECTED. NO
-ORAL OR WRITTEN INFORMATION OR ADVICE GIVEN BY APPLE, AN APPLE
-AUTHORIZED REPRESENTATIVE OR ANY CONTRIBUTOR SHALL CREATE A WARRANTY.
-You acknowledge that the Covered Code is not intended for use in the
-operation of nuclear facilities, aircraft navigation, communication
-systems, or air traffic control machines in which case the failure of
-the Covered Code could lead to death, personal injury, or severe
-physical or environmental damage.
-
-9. LIMITATION OF LIABILITY. TO THE EXTENT NOT PROHIBITED BY LAW, IN NO
-EVENT SHALL APPLE OR ANY CONTRIBUTOR BE LIABLE FOR ANY INCIDENTAL,
-SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING
-TO THIS LICENSE OR YOUR USE OR INABILITY TO USE THE COVERED CODE, OR
-ANY PORTION THEREOF, WHETHER UNDER A THEORY OF CONTRACT, WARRANTY,
-TORT (INCLUDING NEGLIGENCE), PRODUCTS LIABILITY OR OTHERWISE, EVEN IF
-APPLE OR SUCH CONTRIBUTOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES AND NOTWITHSTANDING THE FAILURE OF ESSENTIAL PURPOSE OF ANY
-REMEDY. SOME JURISDICTIONS DO NOT ALLOW THE LIMITATION OF LIABILITY OF
-INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS LIMITATION MAY NOT APPLY
-TO YOU. In no event shall Apple's total liability to You for all
-damages (other than as may be required by applicable law) under this
-License exceed the amount of fifty dollars ($50.00).
-
-10. Trademarks. This License does not grant any rights to use the
-trademarks or trade names "Apple", "Apple Computer", "Mac", "Mac OS",
-"QuickTime", "QuickTime Streaming Server" or any other trademarks,
-service marks, logos or trade names belonging to Apple (collectively
-"Apple Marks") or to any trademark, service mark, logo or trade name
-belonging to any Contributor. You agree not to use any Apple Marks in
-or as part of the name of products derived from the Original Code or
-to endorse or promote products derived from the Original Code other
-than as expressly permitted by and in strict compliance at all times
-with Apple's third party trademark usage guidelines which are posted
-at http://www.apple.com/legal/guidelinesfor3rdparties.html.
-
-11. Ownership. Subject to the licenses granted under this License,
-each Contributor retains all rights, title and interest in and to any
-Modifications made by such Contributor. Apple retains all rights,
-title and interest in and to the Original Code and any Modifications
-made by or on behalf of Apple ("Apple Modifications"), and such Apple
-Modifications will not be automatically subject to this License. Apple
-may, at its sole discretion, choose to license such Apple
-Modifications under this License, or on different terms from those
-contained in this License or may choose not to license them at all.
-
-12. Termination.
-
-12.1 Termination. This License and the rights granted hereunder will
-terminate:
-
-(a) automatically without notice from Apple if You fail to comply with
-any term(s) of this License and fail to cure such breach within 30
-days of becoming aware of such breach;
-
-(b) immediately in the event of the circumstances described in Section
-13.5(b); or
-
-(c) automatically without notice from Apple if You, at any time during
-the term of this License, commence an action for patent infringement
-against Apple; provided that Apple did not first commence
-an action for patent infringement against You in that instance.
-
-12.2 Effect of Termination. Upon termination, You agree to immediately
-stop any further use, reproduction, modification, sublicensing and
-distribution of the Covered Code. All sublicenses to the Covered Code
-which have been properly granted prior to termination shall survive
-any termination of this License. Provisions which, by their nature,
-should remain in effect beyond the termination of this License shall
-survive, including but not limited to Sections 3, 5, 8, 9, 10, 11,
-12.2 and 13. No party will be liable to any other for compensation,
-indemnity or damages of any sort solely as a result of terminating
-this License in accordance with its terms, and termination of this
-License will be without prejudice to any other right or remedy of
-any party.
-
-13. Miscellaneous.
-
-13.1 Government End Users. The Covered Code is a "commercial item" as
-defined in FAR 2.101. Government software and technical data rights in
-the Covered Code include only those rights customarily provided to the
-public as defined in this License. This customary commercial license
-in technical data and software is provided in accordance with FAR
-12.211 (Technical Data) and 12.212 (Computer Software) and, for
-Department of Defense purchases, DFAR 252.227-7015 (Technical Data --
-Commercial Items) and 227.7202-3 (Rights in Commercial Computer
-Software or Computer Software Documentation). Accordingly, all U.S.
-Government End Users acquire Covered Code with only those rights set
-forth herein.
-
-13.2 Relationship of Parties. This License will not be construed as
-creating an agency, partnership, joint venture or any other form of
-legal association between or among You, Apple or any Contributor, and
-You will not represent to the contrary, whether expressly, by
-implication, appearance or otherwise.
-
-13.3 Independent Development. Nothing in this License will impair
-Apple's right to acquire, license, develop, have others develop for
-it, market and/or distribute technology or products that perform the
-same or similar functions as, or otherwise compete with,
-Modifications, Larger Works, technology or products that You may
-develop, produce, market or distribute.
-
-13.4 Waiver; Construction. Failure by Apple or any Contributor to
-enforce any provision of this License will not be deemed a waiver of
-future enforcement of that or any other provision. Any law or
-regulation which provides that the language of a contract shall be
-construed against the drafter will not apply to this License.
-
-13.5 Severability. (a) If for any reason a court of competent
-jurisdiction finds any provision of this License, or portion thereof,
-to be unenforceable, that provision of the License will be enforced to
-the maximum extent permissible so as to effect the economic benefits
-and intent of the parties, and the remainder of this License will
-continue in full force and effect. (b) Notwithstanding the foregoing,
-if applicable law prohibits or restricts You from fully and/or
-specifically complying with Sections 2 and/or 3 or prevents the
-enforceability of either of those Sections, this License will
-immediately terminate and You must immediately discontinue any use of
-the Covered Code and destroy all copies of it that are in your
-possession or control.
-
-13.6 Dispute Resolution. Any litigation or other dispute resolution
-between You and Apple relating to this License shall take place in the
-Northern District of California, and You and Apple hereby consent to
-the personal jurisdiction of, and venue in, the state and federal
-courts within that District with respect to this License. The
-application of the United Nations Convention on Contracts for the
-International Sale of Goods is expressly excluded.
-
-13.7 Entire Agreement; Governing Law. This License constitutes the
-entire agreement between the parties with respect to the subject
-matter hereof. This License shall be governed by the laws of the
-United States and the State of California, except that body of
-California law concerning conflicts of law.
-
-Where You are located in the province of Quebec, Canada, the following
-clause applies: The parties hereby confirm that they have requested
-that this License and all related documents be drafted in English. Les
-parties ont exige que le present contrat et tous les documents
-connexes soient rediges en anglais.
-
-EXHIBIT A.
-
-"Portions Copyright (c) 1999-2003 Apple Computer, Inc. All Rights
-Reserved.
-
-This file contains Original Code and/or Modifications of Original Code
-as defined in and that are subject to the Apple Public Source License
-Version 2.0 (the 'License'). You may not use this file except in
-compliance with the License. Please obtain a copy of the License at
-http://www.opensource.apple.com/apsl/ and read it before using this
-file.
-
-The Original Code and all software distributed under the License are
-distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
-EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
-INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
-Please see the License for the specific language governing rights and
-limitations under the License."
diff --git a/testing/hfsprogs/fix-stdarg.patch b/testing/hfsprogs/fix-stdarg.patch
deleted file mode 100644
index ecd8fe84a4..0000000000
--- a/testing/hfsprogs/fix-stdarg.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-Patch-Source: https://src.fedoraproject.org/rpms/hfsplus-tools/blob/f27/f/hfsplus-tools-learn-to-stdarg.patch
-
-diff -up diskdev_cmds-540.1.linux3/fsck_hfs.tproj/utilities.c.jx diskdev_cmds-540.1.linux3/fsck_hfs.tproj/utilities.c
---- diskdev_cmds-540.1.linux3/fsck_hfs.tproj/utilities.c.jx 2012-02-01 12:17:19.000000000 -0500
-+++ diskdev_cmds-540.1.linux3/fsck_hfs.tproj/utilities.c 2014-06-18 13:44:45.125620007 -0400
-@@ -296,11 +296,8 @@ static volatile int keep_going = 1;
- #undef printf
-
- // prototype
--void print_to_mem(int type, const char *fmt, const char *str, va_list ap);
--
--#define DO_VPRINT 1 // types for print_to_mem
--#define DO_STR 2
--
-+void vprint_to_mem(const char *fmt, va_list ap);
-+void print_to_mem(const char *fmt, ...);
-
- static void *
- fsck_printing_thread(void *arg)
-@@ -547,8 +544,8 @@ setup_logging(void)
- cur_in_mem = in_mem_log;
-
- t = time(NULL);
-- print_to_mem(DO_STR, "\n%s: ", cdevname ? cdevname : "UNKNOWN-DEV", NULL);
-- print_to_mem(DO_STR, "fsck_hfs run at %s", ctime(&t), NULL);
-+ print_to_mem("\n%s: ", cdevname ? cdevname : "UNKNOWN-DEV");
-+ print_to_mem("fsck_hfs run at %s", ctime(&t));
-
- if (live_fsck && log_file) {
- pthread_cond_init(&mem_buf_cond, NULL);
-@@ -576,26 +573,20 @@ setup_logging(void)
-
-
- void
--print_to_mem(int type, const char *fmt, const char *str, va_list ap)
-+vprint_to_mem(const char *fmt, va_list ap)
- {
- int ret;
- size_t size_remaining;
- va_list ap_copy;
-
-- if (type == DO_VPRINT) {
-- va_copy(ap_copy, ap);
-- }
-+ va_copy(ap_copy, ap);
-
- if (live_fsck) {
- pthread_mutex_lock(&mem_buf_lock);
- }
-
- size_remaining = in_mem_size - (ptrdiff_t)(cur_in_mem - in_mem_log);
-- if (type == DO_VPRINT) {
-- ret = vsnprintf(cur_in_mem, size_remaining, fmt, ap);
-- } else {
-- ret = snprintf(cur_in_mem, size_remaining, fmt, str);
-- }
-+ ret = vsnprintf(cur_in_mem, size_remaining, fmt, ap);
- if (ret > size_remaining) {
- char *new_log;
- size_t amt;
-@@ -619,11 +610,7 @@ print_to_mem(int type, const char *fmt,
- cur_in_mem = new_log + (cur_in_mem - in_mem_log);
- in_mem_log = new_log;
- size_remaining = in_mem_size - (ptrdiff_t)(cur_in_mem - new_log);
-- if (type == DO_VPRINT) {
-- ret = vsnprintf(cur_in_mem, size_remaining, fmt, ap_copy);
-- } else {
-- ret = snprintf(cur_in_mem, size_remaining, fmt, str);
-- }
-+ ret = vsnprintf(cur_in_mem, size_remaining, fmt, ap_copy);
- if (ret <= size_remaining) {
- cur_in_mem += ret;
- }
-@@ -636,11 +623,18 @@ print_to_mem(int type, const char *fmt,
- pthread_mutex_unlock(&mem_buf_lock);
- }
- done:
-- if (type == DO_VPRINT) {
-- va_end(ap_copy);
-- }
-+ va_end(ap_copy);
- }
-
-+void
-+print_to_mem(const char *fmt, ...)
-+{
-+ va_list ap;
-+
-+ va_start(ap, fmt);
-+ vprint_to_mem(fmt, ap);
-+ va_end(ap);
-+}
-
- static int need_prefix=1;
-
-@@ -662,7 +656,7 @@ static int need_prefix=1;
- LOG_PREFIX \
- vfprintf(log_file, fmt, ap); \
- } else { \
-- print_to_mem(DO_VPRINT, fmt, NULL, ap); \
-+ vprint_to_mem(fmt, ap); \
- }
-
- #define FLOG(fmt, str) \
-@@ -670,7 +664,7 @@ static int need_prefix=1;
- LOG_PREFIX; \
- fprintf(log_file, fmt, str); \
- } else { \
-- print_to_mem(DO_STR, fmt, str, NULL); \
-+ print_to_mem(fmt, str); \
- }
-
-
-@@ -800,7 +794,7 @@ vplog(const char *fmt, va_list ap)
- LOG_PREFIX;
- vfprintf(log_file, fmt, ap);
- } else {
-- print_to_mem(DO_VPRINT, fmt, NULL, ap);
-+ vprint_to_mem(fmt, ap);
- }
- }
-
diff --git a/testing/hfsprogs/musl-compat.patch b/testing/hfsprogs/musl-compat.patch
deleted file mode 100644
index 345bd24d69..0000000000
--- a/testing/hfsprogs/musl-compat.patch
+++ /dev/null
@@ -1,136 +0,0 @@
---- diskdev_cmds-540.1.linux3.orig/fsck_hfs.tproj/dfalib/Scavenger.h
-+++ diskdev_cmds-540.1.linux3/fsck_hfs.tproj/dfalib/Scavenger.h
-@@ -48,7 +48,6 @@
- #endif
- #include <sys/errno.h>
- #include <sys/param.h>
--#include <sys/sysctl.h>
- #include <sys/mount.h>
- #include <hfs/hfs_mount.h>
-
---- diskdev_cmds-540.1.linux3.orig/fsck_hfs.tproj/fsck_hfs.c
-+++ diskdev_cmds-540.1.linux3/fsck_hfs.tproj/fsck_hfs.c
-@@ -30,7 +30,6 @@
- #include <sys/ioctl.h>
- #if !LINUX
- #include <sys/disk.h>
--#include <sys/sysctl.h>
- #include <setjmp.h>
- #endif
- #include <hfs/hfs_mount.h>
---- diskdev_cmds-540.1.linux3.orig/newfs_hfs.tproj/makehfs.c
-+++ diskdev_cmds-540.1.linux3/newfs_hfs.tproj/makehfs.c
-@@ -38,7 +38,6 @@
- #endif
- #include <sys/errno.h>
- #include <sys/stat.h>
--#include <sys/sysctl.h>
- #if !LINUX
- #include <sys/vmmeter.h>
- #endif
---- a/fsck_hfs.tproj/utilities.c
-+++ b/fsck_hfs.tproj/utilities.c
-@@ -70,7 +70,6 @@
- #include <string.h>
- #include <unistd.h>
- #include <stdlib.h>
--#include <sys/sysctl.h>
-
- #include "fsck_hfs.h"
-
---- diskdev_cmds-540.1.linux3.orig/fsck_hfs.tproj/dfalib/Scavenger.h
-+++ diskdev_cmds-540.1.linux3/fsck_hfs.tproj/dfalib/Scavenger.h
-@@ -46,7 +46,7 @@
- #include <sys/kauth.h>
- #include <sys/syslimits.h>
- #endif
--#include <sys/errno.h>
-+#include <errno.h>
- #include <sys/param.h>
- #include <sys/mount.h>
- #include <hfs/hfs_mount.h>
---- diskdev_cmds-540.1.linux3.orig/fsck_hfs.tproj/utilities.c
-+++ diskdev_cmds-540.1.linux3/fsck_hfs.tproj/utilities.c
-@@ -55,7 +55,7 @@
- #include <stddef.h>
- #include <sys/types.h>
- #include <sys/stat.h>
--#include <sys/errno.h>
-+#include <errno.h>
- #if LINUX
- #include <limits.h>
- #include <signal.h>
---- diskdev_cmds-540.1.linux3.orig/newfs_hfs.tproj/makehfs.c
-+++ diskdev_cmds-540.1.linux3/newfs_hfs.tproj/makehfs.c
-@@ -36,7 +36,7 @@
- #include <time.h>
- #include "missing.h"
- #endif
--#include <sys/errno.h>
-+#include <errno.h>
- #include <sys/stat.h>
- #if !LINUX
- #include <sys/vmmeter.h>
---- a/fsck_hfs.tproj/cache.h
-+++ b/fsck_hfs.tproj/cache.h
-@@ -29,6 +29,7 @@
- #ifndef _CACHE_H_
- #define _CACHE_H_
- #include <stdint.h>
-+#include <sys/types.h>
-
- /* Different values for initializing cache */
- enum {
---- a/newfs_hfs.tproj/makehfs.c
-+++ b/newfs_hfs.tproj/makehfs.c
-@@ -41,6 +41,7 @@
- #if !LINUX
- #include <sys/vmmeter.h>
- #endif
-+#include <sys/cdefs.h>
-
- #include <err.h>
- #include <errno.h>
---- a/newfs_hfs.tproj/newfs_hfs.c
-+++ b/newfs_hfs.tproj/newfs_hfs.c
-@@ -42,6 +42,7 @@
- #if LINUX
- #include <time.h>
- #endif
-+#include <sys/cdefs.h>
-
- #if !LINUX
- #include <IOKit/storage/IOMediaBSDClient.h>
---- a/fsck_hfs.tproj/fsck_hfs.h
-+++ b/fsck_hfs.tproj/fsck_hfs.h
-@@ -22,6 +22,7 @@
- */
-
- #include "cache.h"
-+#include <sys/cdefs.h>
-
-
- const extern char *cdevname; /* name of device being checked */
---- a/fsck_hfs.tproj/utilities.c
-+++ b/fsck_hfs.tproj/utilities.c
-@@ -785,7 +785,7 @@
-
- if (!live_fsck) {
- /* copy va_list as it will be used again later */
-- __va_copy(ap_stdout, ap);
-+ va_copy(ap_stdout, ap);
- vfprintf(stdout, fmt, ap_stdout);
- }
-
---- a/fsck_hfs.tproj/fsck_messages.c
-+++ b/fsck_hfs.tproj/fsck_messages.c
-@@ -85,7 +85,7 @@
-
- if (c == NULL)
- return;
-- __va_copy(ap2, ap); // Just in case we need it
-+ va_copy(ap2, ap); // Just in case we need it
- length = vsnprintf(buf, BUFSIZ, fmt, ap);
- if (length > BUFSIZ) {
- // We need to allocate space for it
-
diff --git a/testing/highway/APKBUILD b/testing/highway/APKBUILD
new file mode 100644
index 0000000000..2876ad5fc3
--- /dev/null
+++ b/testing/highway/APKBUILD
@@ -0,0 +1,41 @@
+# Maintainer: Alex Xu (Hello71) <alex_y_xu@yahoo.ca>
+pkgname=highway
+pkgver=0.15.0
+pkgrel=0
+pkgdesc="Performance-portable, length-agnostic SIMD with runtime dispatch"
+url="https://github.com/google/highway"
+arch="all"
+license="Apache-2.0"
+makedepends="gtest-dev"
+subpackages="$pkgname-dev"
+source="highway-$pkgver.tar.gz::https://github.com/google/highway/archive/refs/tags/$pkgver.tar.gz
+ fix-riscv64-build.patch"
+
+# https://github.com/google/highway/issues/398
+if [ "$CARCH" = aarch64 ]; then
+ options="!check"
+fi
+
+build() {
+ cmake -B build \
+ -DCMAKE_BUILD_TYPE=None \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DBUILD_TESTING=ON \
+ -DHWY_SYSTEM_GTEST=ON
+ cmake --build build
+}
+
+check() {
+ cd build
+ : ${CTEST_PARALLEL_LEVEL=$JOBS}
+ CTEST_OUTPUT_ON_FAILURE=TRUE ctest
+}
+
+package() {
+ DESTDIR="$pkgdir" cmake --install build
+}
+
+sha512sums="
+ed07e855721f87ea67d762b30e001643a76bd16d70372415023c8e6f1a43c58759a14a638e8eb20566863d8358d994153bf7a660fcf604e808adfea5f938a013 highway-0.15.0.tar.gz
+c039edd9167026f79418d2a4091d3e838d378cdd3b1d6ce742b97064f56b8eac443549f14b8466add355e08e2ed4455d22e404d749191f245dc960ea22f960aa fix-riscv64-build.patch
+"
diff --git a/testing/highway/fix-riscv64-build.patch b/testing/highway/fix-riscv64-build.patch
new file mode 100644
index 0000000000..e6537d4163
--- /dev/null
+++ b/testing/highway/fix-riscv64-build.patch
@@ -0,0 +1,21 @@
+On riscv64, targets.cc may call exit(1) and thus needs stdlib.h due to:
+
+ #if HWY_COMPILER_MSVC
+ abort(); // Compile error without this due to HWY_NORETURN.
+ #elif HWY_ARCH_RVV
+ exit(1); // trap/abort just freeze Spike
+ #else
+ __builtin_trap();
+ #endif
+
+diff -upr highway-0.15.0.orig/hwy/targets.cc highway-0.15.0/hwy/targets.cc
+--- highway-0.15.0.orig/hwy/targets.cc 2021-11-26 19:09:21.848569597 +0100
++++ highway-0.15.0/hwy/targets.cc 2021-11-26 19:09:51.378719391 +0100
+@@ -16,6 +16,7 @@
+
+ #include <stdarg.h>
+ #include <stdint.h>
++#include <stdlib.h>
+ #include <stdio.h>
+
+ #include <atomic>
diff --git a/testing/howard-bc/APKBUILD b/testing/howard-bc/APKBUILD
index b24788566a..428bde0396 100644
--- a/testing/howard-bc/APKBUILD
+++ b/testing/howard-bc/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Gavin D. Howard <yzena.tech@gmail.com>
# Maintainer: Gavin D. Howard <yzena.tech@gmail.com>
pkgname=howard-bc
-pkgver=5.0.2
+pkgver=5.1.1
pkgrel=0
pkgdesc="POSIX bc with GNU extensions"
url="https://github.com/gavinhoward/bc"
@@ -25,5 +25,5 @@ package() {
}
sha512sums="
-8184a86708f3d301252e11c9a5015f69a04fa3f809951963235438d95c9accc81631f6fb8502a18f585672f1e04aa569af34f7662c015d33dd7a6794d116d03f bc-5.0.2.tar.xz
+d8774fb1e654520abdf7d790783d4a3c04fa8f4982fc1cd0d92331e7e4b5889efa022cafb5e1286b6c82a74c9388f47657c7b9d78888b5d8056fa40d3d5e5c69 bc-5.1.1.tar.xz
"
diff --git a/testing/hydroxide/APKBUILD b/testing/hydroxide/APKBUILD
deleted file mode 100644
index 2028f49052..0000000000
--- a/testing/hydroxide/APKBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# Maintainer: Dekedro <dekedro@tankers.xyz>
-pkgname=hydroxide
-pkgver=0.2.20
-pkgrel=1
-pkgdesc="Third-party, open-source ProtonMail CardDAV, IMAP and SMTP bridge"
-url="https://github.com/emersion/hydroxide"
-license="MIT"
-arch="all !mips !mips64 !riscv64" # failure to build github.com/boltdb/bolt
-makedepends="go"
-options="net !check" # no tests
-source="https://github.com/emersion/hydroxide/releases/download/v$pkgver/hydroxide-$pkgver.tar.gz"
-
-build() {
- go build ./cmd/hydroxide
-}
-
-package() {
- install -Dm755 "$builddir"/hydroxide "$pkgdir"/usr/bin/hydroxide
-}
-
-sha512sums="
-2206acf996a6462ac30eb0c9186d9f85bcdf48e732e15f489188bd400972ce9a53da85a55b88c33af644f8b11ecfb1b6ca61b28cf865b1608c84912dcd0bf9d3 hydroxide-0.2.20.tar.gz
-"
diff --git a/testing/i3status-rust/APKBUILD b/testing/i3status-rust/APKBUILD
index d75e6c0b69..356fe28ea1 100644
--- a/testing/i3status-rust/APKBUILD
+++ b/testing/i3status-rust/APKBUILD
@@ -2,7 +2,7 @@
# Contributor: Maxim Karasev <begs@disroot.org>
# Maintainer: Galen Abell <galen@galenabell.com>
pkgname=i3status-rust
-pkgver=0.20.4
+pkgver=0.20.7
pkgrel=0
pkgdesc="i3status replacement in Rust"
url="https://github.com/greshake/i3status-rust"
@@ -28,5 +28,5 @@ package() {
}
sha512sums="
-12d21d083884dbf47fae3229c086555d8276f0df2fcd435162e3a86d0d6cad09007588013a7cbe6b35de524f63378d5f4f89178555707739ef68e0945b6e9ec2 i3status-rust-0.20.4.tar.gz
+7b7f40bb36768d641b3549bd1ec5a837d0db6d020ce798b45ca5c879e81eeba1a54d52541aebaaf80006769488810789651a94a07fb7af0d9d05ba7ac8de3e86 i3status-rust-0.20.7.tar.gz
"
diff --git a/testing/i3wm-gaps/APKBUILD b/testing/i3wm-gaps/APKBUILD
index 52a622f727..7818dfff1b 100644
--- a/testing/i3wm-gaps/APKBUILD
+++ b/testing/i3wm-gaps/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: prspkt <prspkt@protonmail.com>
pkgname=i3wm-gaps
-pkgver=4.19.1
+pkgver=4.20.1
pkgrel=0
pkgdesc="Improved dynamic tiling window manager with additional features"
url="https://github.com/Airblader/i3"
@@ -26,4 +26,6 @@ package() {
DESTDIR="$pkgdir" meson install --no-rebuild -C output
}
-sha512sums="200610a221655beee5c204dca1b2d8fe37c64d9054713605a403ba8973b30460bbc64f9172aa3b262f2f8b477584fca667137147ac076bb06745130f31750a9a i3wm-4.19.1.tar.gz"
+sha512sums="
+0f3cab505f5dcd11d4d9ab63aa84d7d90e63ffebe6a867c9592c7979fe57d37db69869d555ea2127b84caa108778a028e03fa8fab1432d897c02723e3c83e6ba i3wm-4.20.1.tar.gz
+"
diff --git a/testing/icewm/APKBUILD b/testing/icewm/APKBUILD
index fa05830c21..8be125bd16 100644
--- a/testing/icewm/APKBUILD
+++ b/testing/icewm/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Paul Bredbury <brebs@sent.com>
# Maintainer: Paul Bredbury <brebs@sent.com>
pkgname=icewm
-pkgver=2.8.0
+pkgver=2.9.0
pkgrel=0
pkgdesc="Window manager designed for speed, usability and consistency"
url="https://github.com/ice-wm/icewm"
@@ -55,5 +55,5 @@ package() {
}
sha512sums="
-552d1da9ceb96c6c14a0dfd596656a56fb289716a787fb75e54b49ef6df84747a4999ce733a6ffb9ff7a1e4c0243253fc3f2fa7a2251e7f3987ab9f33c0a1b30 icewm-2.8.0.tar.lz
+9db1c5c5a277a55b256cd9be4a964639b24cee49e809c56a772ac2501ab96acbf0c0268609e241c800fbaa566b96585b5b67642908a1c244091683c2f8cda92b icewm-2.9.0.tar.lz
"
diff --git a/testing/idris/APKBUILD b/testing/idris/APKBUILD
index 30380d33b3..40740215ff 100644
--- a/testing/idris/APKBUILD
+++ b/testing/idris/APKBUILD
@@ -11,7 +11,7 @@ url="https://www.idris-lang.org/"
arch="" # failed to build
license="BSD-3-Clause"
depends="gmp-dev gcc"
-makedepends="ghc cabal libffi3.3-compat-dev ncurses-dev zlib-dev"
+makedepends="ghc cabal libffi-dev ncurses-dev zlib-dev"
subpackages="$pkgname-doc"
source="$pkgname-$pkgver.tar.gz::https://github.com/idris-lang/Idris-dev/archive/v$pkgver.tar.gz
cabal.config
diff --git a/testing/idris2/APKBUILD b/testing/idris2/APKBUILD
index 9bad8ec6a8..a741435e22 100644
--- a/testing/idris2/APKBUILD
+++ b/testing/idris2/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer:
pkgname=idris2
pkgver=0.5.1
-pkgrel=0
+pkgrel=1
pkgdesc="Purely functional programming language with first class types"
url="https://www.idris-lang.org"
arch="x86 x86_64" # limited by chez-scheme
diff --git a/testing/igt-gpu-tools/APKBUILD b/testing/igt-gpu-tools/APKBUILD
index b663408ed2..3ba99e177f 100644
--- a/testing/igt-gpu-tools/APKBUILD
+++ b/testing/igt-gpu-tools/APKBUILD
@@ -2,8 +2,8 @@
# Maintainer: Dennis Krupenik <dennis@krupenik.com>
pkgname=igt-gpu-tools
pkgver=1.25
-pkgrel=0
-pkgdesc="IGT GPU Tools is a collection of tools for development and testing of the DRM drivers."
+pkgrel=1
+pkgdesc="collection of tools for development and testing of the DRM drivers"
url="https://gitlab.freedesktop.org/drm/igt-gpu-tools/"
arch="x86_64" # Mostly used for Intel integrated GPUs
license="MIT"
@@ -14,7 +14,9 @@ makedepends="bison flex meson $depends_dev"
subpackages="$pkgname-dev"
source="https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/archive/igt-gpu-tools-$pkgver/igt-gpu-tools-igt-gpu-tools-$pkgver.tar.bz2
bash-sh.patch
- musl.patch"
+ musl.patch
+ fix-meson.patch
+ "
builddir="$srcdir/igt-gpu-tools-igt-gpu-tools-$pkgver"
build() {
@@ -32,6 +34,9 @@ package() {
DESTDIR="$pkgdir" meson install --no-rebuild -C build
}
-sha512sums="47a31c0af733e9481e3e8e718adede0a05cb04064d80dae6a7753a346deb71333fb8310664084f4dddfec957629e93c188bc44f2a6895744a10107e4823a9ee6 igt-gpu-tools-igt-gpu-tools-1.25.tar.bz2
+sha512sums="
+47a31c0af733e9481e3e8e718adede0a05cb04064d80dae6a7753a346deb71333fb8310664084f4dddfec957629e93c188bc44f2a6895744a10107e4823a9ee6 igt-gpu-tools-igt-gpu-tools-1.25.tar.bz2
0e24d93cdc56517c78fbcdc64dac63067c9cf49bed66e3b2b6dec6111d67c7e27a2ad7ddb9f1e373746b4b8e9e3535993f8261800fc3729d1f2cdef37e392fc5 bash-sh.patch
-a79a3d4134a75e450b18188189614ad0b3d4218007c8ce68c74f5a928258ca8838ccce5c1f64f920038c44e188896d8d504a36e3cbdf1f8f16c3904bb3b9955f musl.patch"
+a79a3d4134a75e450b18188189614ad0b3d4218007c8ce68c74f5a928258ca8838ccce5c1f64f920038c44e188896d8d504a36e3cbdf1f8f16c3904bb3b9955f musl.patch
+f843466a5a48229a420ef2df665bf97ad3af120bb50d1de9cab8ad5390f5d2a80df1346f59b90c8e6fc6a211271e56e5dee67c09c42901b1eeb7370d7feff7ca fix-meson.patch
+"
diff --git a/testing/igt-gpu-tools/fix-meson.patch b/testing/igt-gpu-tools/fix-meson.patch
new file mode 100644
index 0000000000..142e2fa44f
--- /dev/null
+++ b/testing/igt-gpu-tools/fix-meson.patch
@@ -0,0 +1,36 @@
+From 963917a3565466832a3b2fc22e9285d34a0bf944 Mon Sep 17 00:00:00 2001
+From: Petri Latvala <petri.latvala@intel.com>
+Date: Thu, 28 Oct 2021 11:05:31 +0300
+Subject: [PATCH] lib/meson.build: Fix underscorify call
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+f.underscorify() is correct, f.underscorify(f) is an error that later
+meson versions don't like at all.
+
+Closes: https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/issues/107
+Fixes: 588555f77909 ("lib/i915: Extract helpers for determining scheduler capabilities")
+Cc: Arkadiusz Hiler <arek@hiler.eu>
+Signed-off-by: Petri Latvala <petri.latvala@intel.com>
+Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
+---
+ lib/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/meson.build b/lib/meson.build
+index c3080fc8..297b0ad2 100644
+--- a/lib/meson.build
++++ b/lib/meson.build
+@@ -155,7 +155,7 @@ lib_version = vcs_tag(input : 'version.h.in', output : 'version.h',
+
+ lib_intermediates = []
+ foreach f: lib_sources
+- name = f.underscorify(f)
++ name = f.underscorify()
+ lib = static_library('igt-' + name,
+ [ f, lib_version ],
+ include_directories: inc,
+--
+GitLab
+
diff --git a/testing/imath/APKBUILD b/testing/imath/APKBUILD
new file mode 100644
index 0000000000..18782cf6cc
--- /dev/null
+++ b/testing/imath/APKBUILD
@@ -0,0 +1,65 @@
+# Contributor: Alex Yam <alex@alexyam.com>
+# Maintainer: Alex Yam <alex@alexyam.com>
+pkgname=imath
+_pkgname=Imath
+pkgver=3.1.3
+_python_ver=3.9
+pkgrel=0
+pkgdesc="C++ and python library of 2D and 3D vector, matrix, and math operations for computer graphics"
+url="https://github.com/AcademySoftwareFoundation/Imath"
+arch="all !x86"
+# x86 failed tests:
+# 1/38 Test #1: PyImath.PyImathTest_Python3 .............***Failed
+# AssertionError
+# 21/38 Test #21: Imath.testFun ..............Subprocess aborted***Exception:
+# Assertion failed: bit_cast<unsigned> (pf) == bit_cast<unsigned> (f)
+# 23/38 Test #23: Imath.testInterval .........Subprocess aborted***Exception:
+# Assertion failed: b.min == min && b.max == max
+# 33/38 Test #33: Imath.testBox ..............Subprocess aborted***Exception:
+# Assertion failed: b.min == min && b.max == max
+# 89% tests passed, 4 tests failed out of 38
+license="BSD-3-Clause"
+makedepends="
+ boost-dev
+ clang-extra-tools
+ cmake
+ doxygen
+ py3-breathe
+ py3-numpy-dev
+ py3-sphinx
+ python3-dev
+ "
+subpackages="$pkgname-dev $pkgname-doc py3-$pkgname:_py"
+source="$pkgname-$pkgver.tar.gz::https://github.com/AcademySoftwareFoundation/Imath/archive/refs/tags/v$pkgver.tar.gz"
+builddir=$srcdir/$_pkgname-$pkgver
+
+build() {
+ cmake -B build \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=lib \
+ -DBUILD_SHARED_LIBS=True \
+ -DCMAKE_BUILD_TYPE=None \
+ -DDOCS=ON \
+ -DPYTHON=ON
+ # builds fail randomly without -j 1
+ # aarch64: fail: 551004, 551661, 551675
+ # armhf: success: 551006, 551679, fail: 551663
+ # s390x: success: 551663, fail: 551679
+ cmake --build build -j 1
+}
+
+check() {
+ cd build && CTEST_OUTPUT_ON_FAILURE=TRUE ctest
+}
+
+package() {
+ DESTDIR="$pkgdir" cmake --install build
+}
+
+_py() {
+ pkgdesc="Imath Python library"
+ depends="python3 imath=$pkgver-r$pkgrel"
+ amove usr/lib/python3*
+}
+
+sha512sums="a11f5e736bc49098d735c7903f186c15b03efbec082a8cf2e6635546368035cec0d36c7ae64bfd01bd8eeffb2dd247b8dab19e440a3e1fe33008edacc1268f75 imath-3.1.3.tar.gz"
diff --git a/testing/inspircd/APKBUILD b/testing/inspircd/APKBUILD
index cad4d3ee6f..33b22aea80 100755
--- a/testing/inspircd/APKBUILD
+++ b/testing/inspircd/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Alex Yam <alex@alexyam.com>
# Maintainer: Alex Yam <alex@alexyam.com>
pkgname=inspircd
-pkgver=3.10.0
-pkgrel=1
+pkgver=3.11.0
+pkgrel=0
pkgdesc="internet relay chat daemon (ircd)"
url="https://www.inspircd.org/"
pkgusers="inspircd"
@@ -10,16 +10,16 @@ pkggroups="inspircd"
arch="all"
license="GPL-2.0-or-later"
makedepends="
- perl
argon2-dev
libmaxminddb-dev
libpq-dev
mariadb-dev
+ openssl1.1-compat-dev
pcre-dev
+ perl
re2-dev
- tre-dev
sqlite-dev
- openssl1.1-compat-dev
+ tre-dev
"
subpackages="$pkgname-doc"
options="!check" # no test suite
@@ -31,15 +31,6 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/inspircd/inspircd/archive/v$
# - CVE-2021-33586
build() {
- # Upstream's modulemanager is incomplete
- # modules: ldap, stdlib, mbedtls are unavailable
- #
- # from 'configure' line 364-367:
- # TODO: finish modulemanager rewrite and replace this code with:
- # system './modulemanager', 'enable', '--auto';
- # my %modules = (
- # # Missing: m_ldap, m_regex_stdlib, m_ssl_mbedtls
- #
# --manual-dir is set to /usr/share/man/man1 for inspircd.1.gz
./configure \
--prefix=/usr \
@@ -63,5 +54,5 @@ package() {
}
sha512sums="
-6cb1c66ce2a4531628264fc4b4836b47b7cba2c8aa6ffef5d72489ae663815254783b09aeb149d8ae9e41cf51be3c703612d443da84995695449a94db86f8944 inspircd-3.10.0.tar.gz
+59a277de041f1b0d44204c36190b6bd728f981997ba377f5bf9b7745fce122271e3df35223ff11d8d31d70f1f378977ea6603963ff2bb1a4fbaac958903b0da3 inspircd-3.11.0.tar.gz
"
diff --git a/testing/ircd-hybrid/APKBUILD b/testing/ircd-hybrid/APKBUILD
index 2f269c07c5..237b7ee804 100755
--- a/testing/ircd-hybrid/APKBUILD
+++ b/testing/ircd-hybrid/APKBUILD
@@ -39,4 +39,6 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="6d7397d5be081e4f38e91cbf0b456a7891e752acf8a7897b725ee31d0bbc93f0b56d2892be9447211b2d5cdc8f2543cf89cedcda919c36bb48c36859ecce7e80 ircd-hybrid-8.2.38.tar.gz"
+sha512sums="
+6d7397d5be081e4f38e91cbf0b456a7891e752acf8a7897b725ee31d0bbc93f0b56d2892be9447211b2d5cdc8f2543cf89cedcda919c36bb48c36859ecce7e80 ircd-hybrid-8.2.38.tar.gz
+"
diff --git a/testing/ispc/0001-tinfo.patch b/testing/ispc/0001-tinfo.patch
deleted file mode 100644
index 49b50a70ea..0000000000
--- a/testing/ispc/0001-tinfo.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 24e932ce16d99d384be19d43626bca03a1f21459 Mon Sep 17 00:00:00 2001
-From: Leon Marz <main@lmarz.org>
-Date: Thu, 1 Jul 2021 15:34:07 +0200
-Subject: [PATCH] tinfo
-
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ef88317..e733978 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -525,7 +525,7 @@ else()
- else()
- find_package(Curses REQUIRED)
- find_package(ZLIB REQUIRED)
-- find_library(NCURSES_TINFO_LIBRARY tinfo)
-+ find_library(NCURSES_TINFO_LIBRARY ncursesw)
- target_link_libraries(${PROJECT_NAME} pthread ${ZLIB_LIBRARIES} ${NCURSES_TINFO_LIBRARY} ${CURSES_LIBRARIES})
- endif()
- endif()
---
-2.32.0
-
diff --git a/testing/ispc/APKBUILD b/testing/ispc/APKBUILD
deleted file mode 100644
index 76c50f7ae0..0000000000
--- a/testing/ispc/APKBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# Contributor: Leon Marz <main@lmarz.org>
-# Maintainer: Leon Marz <main@lmarz.org>
-pkgname=ispc
-pkgver=1.16.1
-pkgrel=1
-pkgdesc="Intel SPMD Program Compiler"
-url="https://ispc.github.io"
-arch="x86_64 armv7 aarch64" # ispc only supports these arches
-license="BSD-3-Clause"
-_llvmver=llvm12
-makedepends="cmake
- bison
- clang-dev
- clang-static
- flex
- $_llvmver-dev
- $_llvmver-static
- $_llvmver-test-utils
- m4
- ncurses-dev
- zlib-dev"
-# subpackages="$pkgname-dev $pkgname-doc"
-source="$pkgname-$pkgver.tar.gz::https://github.com/ispc/ispc/archive/v$pkgver.tar.gz
- 0001-tinfo.patch
- "
-options="!check" # ctest does not find a testsuite
-
-build() {
- _x86_enabled=OFF
- _arm_enabled=OFF
- case "$CARCH" in
- x86_64) _x86_enabled=ON ;;
- armv7|aarch64) _arm_enabled=ON ;;
- esac
-
- cmake -B build \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DBUILD_SHARED_LIBS=True \
- -DCLANG_EXECUTABLE="$(command -v clang)" \
- -DCLANGPP_EXECUTABLE="$(command -v clang++)" \
- -DX86_ENABLED=$_x86_enabled \
- -DARM_ENABLED=$_arm_enabled \
- -DISPC_INCLUDE_EXAMPLES=OFF \
- -DISPC_NO_DUMPS=ON
-
- cmake --build build
-}
-
-package() {
- DESTDIR="$pkgdir" cmake --install build
-}
-
-sha512sums="
-89b844a15a888ae7074c4baa47f46d1d7176501f215c9a8c3b4bf9ad1960dc77d53f1f448d5253ad0c6a91e5088af243c3dfd148e619f9abeb6a16f715e3b463 ispc-1.16.1.tar.gz
-f22261c96b778228ff63db4273ec25e2081f870a01a56765ec64ebc5b72909c5be527bb065503afbdd24821df8776bcf9a9147f6d1bdaec3776339685097614d 0001-tinfo.patch
-"
diff --git a/testing/jekyll/APKBUILD b/testing/jekyll/APKBUILD
deleted file mode 100644
index 1011e48247..0000000000
--- a/testing/jekyll/APKBUILD
+++ /dev/null
@@ -1,69 +0,0 @@
-# Contributor: Jakub Jirutka <jakub@jirutka.cz>
-# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
-pkgname=jekyll
-_gemname=jekyll
-pkgver=4.2.1
-pkgrel=0
-pkgdesc="A blog-aware static site generator in Ruby"
-url="https://jekyllrb.com/"
-arch="noarch"
-license="MIT"
-# Dependencies specified in jekyll.gemspec. Keep in sync!
-_gemspec_depends="$depends
- ruby-addressable~=2
- ruby-colorator~=1
- ruby-em-websocket~=0
- ruby-i18n~=1
- ruby-jekyll-sass-converter~=2
- ruby-jekyll-watch~=2
- ruby-kramdown~=2
- ruby-kramdown-parser-gfm~=1
- ruby-liquid~=4
- ruby-mercenary~=0.4
- ruby-pathutil~=0
- ruby-rouge~=3
- ruby-safe_yaml~=1
- ruby-terminal-table~=2
- "
-depends="ruby-$_gemname=$pkgver-r$pkgrel
- ruby
- ruby-webrick
- ruby-bundler
- $_gemspec_depends
- "
-subpackages="ruby-$_gemname:_ruby"
-source="https://github.com/jekyll/jekyll/archive/v$pkgver/$pkgname-$pkgver.tar.gz
- gemspec.patch
- "
-builddir="$srcdir/$_gemname-$pkgver"
-options="!check" # FIXME: tests require extra dependencies
-
-build() {
- gem build $_gemname.gemspec
-}
-
-package() {
- local gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')"
-
- gem install \
- --local \
- --install-dir "$gemdir" \
- --bindir "$pkgdir/usr/bin" \
- --ignore-dependencies \
- --no-document \
- --verbose \
- $_gemname
-
- # Remove unnecessary files and rubbish...
- cd "$gemdir"
- rm -r cache build_info doc extensions
-}
-
-_ruby() {
- amove usr/lib/ruby
-}
-
-sha512sums="
-a4a5875775ab2b1e4617bbad0b8658c21b67099372d7e2589f46f48022aa9ff3418d7535e39c22dd8e90c205c6a5ef91cf62b00fec258f19151e1a9466335093 jekyll-4.2.1.tar.gz
-5c67bc5e90fbd1283687cff1cc01491de842d4235b277658aefbbdac88b3b7d104e1293de177b5c41eace4a04433ad4ba333efebde4ad85bb0f9b6663b414e4b gemspec.patch
-"
diff --git a/testing/jekyll/gemspec.patch b/testing/jekyll/gemspec.patch
deleted file mode 100644
index 70cb74703d..0000000000
--- a/testing/jekyll/gemspec.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/jekyll.gemspec
-+++ b/jekyll.gemspec
-@@ -13,7 +13,7 @@
- s.summary = "A simple, blog aware, static site generator."
- s.description = "Jekyll is a simple, blog aware, static site generator."
-
-- all_files = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
-+ all_files = Dir['exe/*', 'lib/**/*']
- s.files = all_files.grep(%r!^(exe|lib|rubocop)/|^.rubocop.yml$!)
- s.executables = all_files.grep(%r!^exe/!) { |f| File.basename(f) }
- s.bindir = "exe"
-@@ -27,7 +27,6 @@
- }
-
- s.rdoc_options = ["--charset=UTF-8"]
-- s.extra_rdoc_files = %w(README.markdown LICENSE)
-
- s.required_ruby_version = ">= 2.4.0"
- s.required_rubygems_version = ">= 2.7.0"
diff --git a/testing/jfrog-cli/APKBUILD b/testing/jfrog-cli/APKBUILD
index e7f13a02eb..7224a971df 100644
--- a/testing/jfrog-cli/APKBUILD
+++ b/testing/jfrog-cli/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Gennady Feldman <gena01@gmail.com>
pkgname=jfrog-cli
pkgver=1.48.1
-pkgrel=2
+pkgrel=3
pkgdesc="JFrog cli"
url="https://jfrog.com/getcli/"
arch="all !mips !mips64" # ftbfs
diff --git a/testing/jinja2-cli/APKBUILD b/testing/jinja2-cli/APKBUILD
index 37d95b8f64..5c48ee1bcb 100644
--- a/testing/jinja2-cli/APKBUILD
+++ b/testing/jinja2-cli/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
+# Contributor: Kaarle Ritvanen <kunkku@alpinelinux.org>
# Maintainer:
pkgname=jinja2-cli
pkgver=0.7.0
diff --git a/testing/kakoune/APKBUILD b/testing/kakoune/APKBUILD
index 38eaf7d63b..73aebf23c2 100644
--- a/testing/kakoune/APKBUILD
+++ b/testing/kakoune/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Leo <thinkabit.ukim@gmail.com>
# Maintainer: Jakub Skrzypnik <j.skrzypnik@openmailbox.org>
pkgname=kakoune
-pkgver=2021.08.28
+pkgver=2021.11.08
pkgrel=0
pkgdesc="Code editor heavily inspired by Vim, but with less keystrokes"
url="http://kakoune.org"
@@ -28,6 +28,6 @@ package() {
}
sha512sums="
-1f4f0648959e94e45eb00f2398aa6897595457ef3ee4d1c6e18d494f3e68f8d3a0c4d0dbed88b6588fda61137a060c648ff635972731c0f29faef4cdc03c829f kakoune-2021.08.28.tar.gz
+7ddb5952f07caa0f2861e71805d6bac574f2b90e8eac2358c251c1a99c3b85a914dd313c28da3d7871fd65f9b0c598ae8dc287e847f3ec17ee38b28d2a9fa0ec kakoune-2021.11.08.tar.gz
c5b11dc28adf785b4e83637fe1d5c9db334616d2d3f6c667823745e273f739c57d0d408b9bec8a65210e3c7ccb80a5b488ebbb3c0c5de8bdec13e1b4b4d02b77 alpine-linux.kak
"
diff --git a/testing/kalendar/APKBUILD b/testing/kalendar/APKBUILD
deleted file mode 100644
index 1de61aa37b..0000000000
--- a/testing/kalendar/APKBUILD
+++ /dev/null
@@ -1,57 +0,0 @@
-# Contributor: Bart Ribbers <bribbers@disroot.org>
-# Maintainer: Bart Ribbers <bribbers@disroot.org>
-pkgname=kalendar
-pkgver=0_git20211027
-pkgrel=0
-_commit="83302300a6263278c4cca35e2eaeb0a99ffb1b4b"
-pkgdesc="A calendar application using Akonadi to sync with external services (NextCloud, GMail, ...)"
-# armhf blocked by qt5-qtdeclarative
-# mips64, s390x and riscv64 blocked by polkit -> akonadi
-# ppc64le blocked by kaccounts-integration -> akonadi
-arch="all !armhf !mips64 !s390x !riscv64 !ppc64le"
-url="https://invent.kde.org/pim/kalendar"
-license="GPL-3.0-or-later AND BSD-2-Clause"
-depends="
- kdepim-runtime
- kirigami2
- qt5-qtlocation
- "
-makedepends="
- akonadi-contacts-dev
- akonadi-dev
- eventviews-dev
- extra-cmake-modules
- kcalendarcore-dev
- kconfigwidgets-dev
- kcontacts-dev
- kcoreaddons-dev
- ki18n-dev
- kirigami2-dev
- kitemmodels-dev
- kpackage-dev
- kpeople-dev
- kwindowsystem-dev
- qt5-qtbase-dev
- qt5-qtdeclarative-dev
- qt5-qtlocation-dev
- qt5-qtquickcontrols2-dev
- qt5-qtsvg-dev
- "
-source="https://invent.kde.org/pim/kalendar/-/archive/$_commit/kalendar-$_commit.tar.gz"
-options="!check" # No tests
-builddir="$srcdir/$pkgname-$_commit"
-
-build() {
- cmake -B build \
- -DCMAKE_BUILD_TYPE=None \
- -DCMAKE_INSTALL_PREFIX=/usr
- cmake --build build
-}
-
-package() {
- DESTDIR="$pkgdir" cmake --install build
-}
-
-sha512sums="
-f41599cb613214d1ce3f9bb03d9fef8fe853c5f4163bc8bafa2c4c47177c9a8f01f16cdd0c54f9cbba536f88621a777560b0600a321344d1b0f70212fb61380d kalendar-83302300a6263278c4cca35e2eaeb0a99ffb1b4b.tar.gz
-"
diff --git a/testing/kdiff3/APKBUILD b/testing/kdiff3/APKBUILD
new file mode 100644
index 0000000000..2cda349a4e
--- /dev/null
+++ b/testing/kdiff3/APKBUILD
@@ -0,0 +1,47 @@
+# Contributor: Bart Ribbers <bribbers@disroot.org>
+# Maintainer: Bart Ribbers <bribbers@disroot.org>
+pkgname=kdiff3
+pkgver=1.9.4
+pkgrel=0
+# armhf blocked by extra-cmake-modules
+# s390x, riscv64 blocked by polkit -> kparts
+arch="all !armhf !s390x !riscv64"
+url="https://apps.kde.org/kdiff3/"
+pkgdesc="A file and folder diff and merge tool"
+license="GPL-2.0-or-later "
+makedepends="
+ boost-dev
+ extra-cmake-modules
+ kconfig-dev
+ kcoreaddons-dev
+ kcrash-dev
+ kdoctools-dev
+ ki18n-dev
+ kparts-dev
+ kwidgetsaddons-dev
+ qt5-qtbase-dev
+ "
+checkdepends="xvfb-run"
+source="https://download.kde.org/stable/kdiff3/kdiff3-$pkgver.tar.xz"
+subpackages="$pkgname-doc $pkgname-lang"
+
+build() {
+ cmake -B build \
+ -DCMAKE_BUILD_TYPE=None \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=lib
+ cmake --build build
+}
+
+check() {
+ cd build
+ CTEST_OUTPUT_ON_FAILURE=TRUE xvfb-run ctest
+}
+
+package() {
+ DESTDIR="$pkgdir" cmake --install build
+}
+
+sha512sums="
+76555eb9253c4cb96d32de01126a4547adb3424997034f0d9aed50cc4df87cb15c038a12f8620a491a968b47a3ea5eafcb0f53978aca4300ca319677bb2b9e63 kdiff3-1.9.4.tar.xz
+"
diff --git a/testing/keyd/APKBUILD b/testing/keyd/APKBUILD
deleted file mode 100644
index 8bf8fa1f3e..0000000000
--- a/testing/keyd/APKBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Contributor: Jakub Jirutka <jakub@jirutka.cz>
-# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
-pkgname=keyd
-pkgver=1.1.2
-pkgrel=1
-pkgdesc="A key remapping daemon for Linux"
-url="https://github.com/rvaiya/keyd"
-arch="all"
-license="MIT"
-makedepends="eudev-dev linux-headers"
-subpackages="$pkgname-doc $pkgname-openrc"
-source="https://github.com/rvaiya/keyd/archive/v$pkgver/keyd-$pkgver.tar.gz
- ungit.patch
- obey-build-flags.patch
- musl-time64.patch
- $pkgname.initd
- "
-options="!check" # no tests provided
-
-build() {
- make
-}
-
-package() {
- make install DESTDIR="$pkgdir"
- rm -rf "$pkgdir"/usr/lib/systemd
-
- install -D -m755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
- echo uinput | install -D -m644 /dev/stdin "$pkgdir"/usr/lib/modules-load.d/$pkgname.conf
-}
-
-sha512sums="
-c8a3287e6f6b3b778b8db63fd1c0005ed2e93706f659c8e9c5029791e1b226eea9e73e72602607a21a5121b74776f7dc941327ea00d6f38e7201349c8221052c keyd-1.1.2.tar.gz
-de80226c88e782fd39ea930dc6ac218584c62f3847251c3c506df3c461261ec87e2cfffdcb50a8e854d66ea333a3a1ae7f7c837b048d61798cfc07b65b01ef19 ungit.patch
-3e9fc40aae80db120d90835cc51a21b9830f7587bf97c25bd6d509d0b2e17080a244665ead87d77bd1af49ccb9248c939c2de4bf9df68792405dbbc1193a010c obey-build-flags.patch
-9b68b6f2fdc7a52eb076ea68976ab0ea26ea077f5a412300cc846f79999519d58ebd2dc3884c2947d2870b6462ac44ddda6eb0df6354a45bade31c1c6670922d musl-time64.patch
-9e909d7d5468e717d8ca3c165bb3846f17f03bb7d1f19c424d7cc0e5ac282f1bad156c34c12b019a00100574e53b21d4245c028e13c662cad7048b3a956ede2c keyd.initd
-"
diff --git a/testing/keyd/keyd.initd b/testing/keyd/keyd.initd
deleted file mode 100644
index 5f6ab350b8..0000000000
--- a/testing/keyd/keyd.initd
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/sbin/openrc-run
-
-name="keyd"
-description="A key remapping deamon"
-
-: ${error_logger="logger -t $name -p daemon.warning"}
-
-command="/usr/bin/keyd"
-command_background="yes"
-pidfile="/run/$RC_SVCNAME.pid"
-
-depend() {
- need localmount dev-mount
-}
diff --git a/testing/keyd/musl-time64.patch b/testing/keyd/musl-time64.patch
deleted file mode 100644
index cc1a143b85..0000000000
--- a/testing/keyd/musl-time64.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Fix compatibility with musl's time64 on 32-bit arches.
-
-See https://gitlab.alpinelinux.org/alpine/aports/-/commit/1d4742aaaea19666bffb2a71a4312da0dcc41f72#note_180127
-
---- a/src/main.c
-+++ b/src/main.c
-@@ -220,8 +220,8 @@
- struct input_event ev = {
- .type = EV_KEY,
- .value = 2,
-- .time.tv_sec = 0,
-- .time.tv_usec = 0
-+ .input_event_sec = 0,
-+ .input_event_usec = 0
- };
-
- //Inefficient, but still reasonably fast (<100us)
-@@ -242,8 +242,8 @@
- ev.type = EV_KEY;
- ev.code = code;
- ev.value = is_pressed;
-- ev.time.tv_sec = 0;
-- ev.time.tv_usec = 0;
-+ ev.input_event_sec = 0;
-+ ev.input_event_usec = 0;
-
- write(ufd, &ev, sizeof(ev));
-
diff --git a/testing/keyd/obey-build-flags.patch b/testing/keyd/obey-build-flags.patch
deleted file mode 100644
index ba49a6f5c3..0000000000
--- a/testing/keyd/obey-build-flags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -4,14 +4,14 @@
- PREFIX=/usr
-
- VERSION=1.1.2
--CFLAGS=-DVERSION=\"$(VERSION)\"
-+CFLAGS+=-DVERSION=\"$(VERSION)\"
-
- all:
- mkdir -p bin
-- $(CC) $(CFLAGS) -O3 src/*.c -o bin/keyd -ludev
-+ $(CC) $(CFLAGS) $(LDFLAGS) -Wall -Wextra -pedantic src/*.c -o bin/keyd -ludev
- debug:
- mkdir -p bin
-- $(CC) $(CFLAGS) -Wall -Wextra -pedantic -DDEBUG -g src/*.c -o bin/keyd -ludev
-+ $(CC) $(CFLAGS) $(LDFLAGS) -Wall -Wextra -pedantic -DDEBUG -g src/*.c -o bin/keyd -ludev
- man:
- pandoc -s -t man man.md | gzip > keyd.1.gz
- clean:
diff --git a/testing/keyd/ungit.patch b/testing/keyd/ungit.patch
deleted file mode 100644
index 4566796dd3..0000000000
--- a/testing/keyd/ungit.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -4,8 +4,7 @@
- PREFIX=/usr
-
- VERSION=1.1.2
--GIT_HASH=$(shell git describe --no-match --always --abbrev=40 --dirty)
--CFLAGS=-DVERSION=\"$(VERSION)\" -DGIT_COMMIT_HASH=\"$(GIT_HASH)\"
-+CFLAGS=-DVERSION=\"$(VERSION)\"
-
- all:
- mkdir -p bin
---- a/src/main.c
-+++ b/src/main.c
-@@ -890,7 +890,7 @@
- {
- if(argc > 1) {
- if(!strcmp(argv[1], "-v")) {
-- fprintf(stderr, "keyd version: %s (%s)\n", VERSION, GIT_COMMIT_HASH);
-+ fprintf(stderr, "keyd version: %s\n", VERSION);
- return 0;
- } else if(!strcmp(argv[1], "-m")) {
- return monitor_loop();
-@@ -918,7 +918,7 @@
- if(argc > 1 && !strcmp(argv[1], "-d"))
- daemonize();
-
-- warn("Starting keyd v%s (%s).", VERSION, GIT_COMMIT_HASH);
-+ warn("Starting keyd v%s.", VERSION);
- config_generate();
- ufd = create_uinput_fd();
-
diff --git a/testing/kgeotag/APKBUILD b/testing/kgeotag/APKBUILD
new file mode 100644
index 0000000000..80fdd47ca7
--- /dev/null
+++ b/testing/kgeotag/APKBUILD
@@ -0,0 +1,47 @@
+# Contributor: Bart Ribbers <bribbers@disroot.org>
+# Maintainer: Bart Ribbers <bribbers@disroot.org>
+pkgname=kgeotag
+pkgver=1.2.0
+pkgrel=0
+# armhf blocked by extra-cmake-modules
+# ppc64le blocked by qt5-qtwebengine -> marble
+# s390x, riscv64 blocked by polkit -> kxmlgui
+arch="all !armhf !ppc64le !s390x !riscv64"
+url="https://apps.kde.org/kgeotag/"
+pkgdesc="Photo geotagging program"
+license="GPL-3.0-or-later"
+makedepends="
+ extra-cmake-modules
+ kconfigwidgets-dev
+ kcoreaddons-dev
+ kcrash-dev
+ ki18n-dev
+ kxmlgui-dev
+ libkexiv2-dev
+ marble-dev
+ qt5-qtbase-dev
+ "
+checkdepends="xvfb-run"
+source="https://download.kde.org/stable/kgeotag/$pkgver/kgeotag-$pkgver.tar.xz"
+subpackages="$pkgname-lang"
+
+build() {
+ cmake -B build \
+ -DCMAKE_BUILD_TYPE=None \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=lib
+ cmake --build build
+}
+
+check() {
+ cd build
+ CTEST_OUTPUT_ON_FAILURE=TRUE xvfb-run ctest
+}
+
+package() {
+ DESTDIR="$pkgdir" cmake --install build
+}
+
+sha512sums="
+818a89babe613602b9843109c10632b09dfe0bba5e28d5332eb17c1c3841a30049dbe298a4b3c8123d72751dfa29eb5994d9d4e683a85f9b121161005c4fee65 kgeotag-1.2.0.tar.xz
+"
diff --git a/testing/kicad-library/APKBUILD b/testing/kicad-library/APKBUILD
index 66251786f2..651e815e80 100644
--- a/testing/kicad-library/APKBUILD
+++ b/testing/kicad-library/APKBUILD
@@ -1,11 +1,12 @@
# Maintainer: Marian Buschsieweke <marian.buschsieweke@ovgu.de>
# Contributor: Marian Buschsieweke <marian.buschsieweke@ovgu.de>
pkgname=kicad-library
-pkgver=5.1.10
+pkgver=5.1.12
pkgrel=0
pkgdesc="Kicad component and footprint libraries"
url="https://kicad.github.io/"
-arch="noarch !s390x !mips !mips64 !armv7 !riscv64" # blocked by kicad
+# limited by kicad
+arch="noarch !riscv64 !s390x"
license="GPL-3.0-or-later"
makedepends="cmake"
depends="kicad"
@@ -13,7 +14,7 @@ subpackages="$pkgname-3d:three_d"
source="
https://gitlab.com/kicad/libraries/kicad-symbols/-/archive/$pkgver/kicad-symbols-$pkgver.tar.bz2
https://gitlab.com/kicad/libraries/kicad-footprints/-/archive/$pkgver/kicad-footprints-$pkgver.tar.bz2
- https://gitlab.com/kicad/libraries/kicad-packages3D/-/archive/5.1.10/kicad-packages3D-5.1.10.tar.bz2
+ https://gitlab.com/kicad/libraries/kicad-packages3D/-/archive/$pkgver/kicad-packages3D-$pkgver.tar.bz2
"
options="!check" # package only provides data files, so not tests possible
@@ -51,7 +52,7 @@ three_d() {
}
sha512sums="
-f9dd5a0ee135bb37e1be723c6213f3c2148b1579fab5f56c859d0ca0b55afb81143244cdaedd6d14ab73228176be9770b7dc04a4fe118e9b9f1464c5f79c6b46 kicad-symbols-5.1.10.tar.bz2
-624f5bf4a7e9b30ca1f7f8aa4d8270baf59667c91e65b8beb3c36b546fc4fbabd6221cb408458eb166e0364c7b8c77923b5809d94aea3ec65ae58c65055b6eb7 kicad-footprints-5.1.10.tar.bz2
-95c25fe94f3e198208f073c121d234508aa8e67a621d17bc1737d14fe860c9a8cece6e7b66037f9a9c7f1a06f104b942dc2ff59f318e8b6854bdddb1d238faf4 kicad-packages3D-5.1.10.tar.bz2
+32e73b8a43e54779e4b95fc13505d603c7ef70600467a1e38f2685288aa9223ca29cc44a552d8c02e153cbf3048faa59610bc92e81dbbed7a432c16db0bd05f6 kicad-symbols-5.1.12.tar.bz2
+e717886dc742f37b626226065953a36829b50f9bf203efe1dbeab41d4dbe3a898bd65fbde9fa059ea9374ea92905faeb0ccd19dfb1a62f2d6a445c07f90b89a9 kicad-footprints-5.1.12.tar.bz2
+eb4895e0c46448a74acf10e8c72dee6ea89fee9d53b93c0927d592f4ee944497b642ed575b1b5457ff0db731f654d054d539aff007a17b8d8366c03edb15b6d2 kicad-packages3D-5.1.12.tar.bz2
"
diff --git a/testing/kicad/APKBUILD b/testing/kicad/APKBUILD
index fc71961fc1..34d304a6f2 100644
--- a/testing/kicad/APKBUILD
+++ b/testing/kicad/APKBUILD
@@ -1,12 +1,12 @@
# Maintainer: Marian Buschsieweke <marian.buschsieweke@ovgu.de>
# Contributor: Marian Buschsieweke <marian.buschsieweke@ovgu.de>
pkgname=kicad
-pkgver=5.1.10
-pkgrel=3
+pkgver=5.1.12
+pkgrel=1
pkgdesc="A Cross Platform and Open Source Electronics Design Automation Suite"
url="https://kicad-pcb.org/"
# No support for s390x/riscv64 in libcontext (shipped with kicad) broken on mips
-arch="all !s390x !mips !mips64 !armv7 !riscv64"
+arch="all !riscv64 !s390x"
license="GPL-3.0-or-later"
makedepends="
boost-dev
@@ -29,6 +29,7 @@ subpackages="$pkgname-i18n:i18n:noarch $pkgname-doc"
source="
https://gitlab.com/kicad/code/kicad/-/archive/$pkgver/kicad-$pkgver.tar.gz
https://gitlab.com/kicad/code/kicad-i18n/-/archive/$pkgver/kicad-i18n-$pkgver.tar.gz
+ opencascade76.patch
"
case "$CARCH" in
@@ -80,7 +81,7 @@ build() {
# Now build with opencascade, if possible
case "$CARCH" in
- x86_64)
+ x86_64)
_build_kicad "build-occ" "ON"
;;
*)
@@ -122,6 +123,7 @@ opencascade() {
}
sha512sums="
-41db79cd314528e6d23e7eaaa8f816e16230f02f5892b4729bd200cda01d009cb1c68d3f3e9fc98d04c4d9bc22a165252573666888468d93009b342f4d8b8e97 kicad-5.1.10.tar.gz
-6cdef52d03f6937001f1bb18519975f367915587e4d091574702cd576f099c8014f696cdb7c7b3349e5fc99ca049fae073a4eddbd26ada203fdd80118f1a2a24 kicad-i18n-5.1.10.tar.gz
+2a38ef605c7d3daa908a9fffa569ad7857e4f197bb406a0c19e94ff90f1cd6ed7cafef19b458dfbdfd9a087ef0f92a5263e21fcb1dfd75fa59a1e6848e46d400 kicad-5.1.12.tar.gz
+56fd278e08c3174b99c977043680afb61de3a5522065054c8b496ef675257f17b2703af656accf3487bca2a25d2e4bcf5b87c6f7e8678585dd2bf94aa220ae87 kicad-i18n-5.1.12.tar.gz
+1bd5c2396ab6e8b7137a1cf1a90a2b0ef4f7a0ec0b3d21561bba869640e4d564e29cebc476c173bf658f7fb845072e16b10901854af947de8cdd89936623a9e8 opencascade76.patch
"
diff --git a/testing/kicad/opencascade76.patch b/testing/kicad/opencascade76.patch
new file mode 100644
index 0000000000..b93d1d369d
--- /dev/null
+++ b/testing/kicad/opencascade76.patch
@@ -0,0 +1,43 @@
+patches kicad to work with opencascade v7.6.0
+Patch has already been in upstreamed in the following commits
+and should not be needed once kicad v6 is released:
+https://gitlab.com/kicad/code/kicad/-/commit/12152d433103c85051628927f47f5d2eb4ad5d3a
+https://gitlab.com/kicad/code/kicad/-/commit/8f87638de59fba45451c3d456191fd22a575c0f8
+--- ./plugins/3d/oce/loadmodel.cpp
++++ ./plugins/3d/oce/loadmodel.cpp.new
+@@ -71,6 +71,8 @@
+ #include <TDF_LabelSequence.hxx>
+ #include <TDF_ChildIterator.hxx>
+
++#include <Standard_Version.hxx>
++
+ #include "plugins/3dapi/ifsg_all.h"
+
+ // log mask for wxLogTrace
+@@ -865,9 +867,6 @@
+ else
+ S3D::AddSGNodeRef( vshape.GetRawPtr(), ocolor );
+
+- const TColgp_Array1OfPnt& arrPolyNodes = triangulation->Nodes();
+- const Poly_Array1OfTriangle& arrTriangles = triangulation->Triangles();
+-
+ std::vector< SGPOINT > vertices;
+ std::vector< int > indices;
+ std::vector< int > indices2;
+@@ -875,14 +874,14 @@
+
+ for(int i = 1; i <= triangulation->NbNodes(); i++)
+ {
+- gp_XYZ v( arrPolyNodes(i).Coord() );
++ gp_XYZ v( triangulation->Node(i).Coord() );
+ vertices.push_back( SGPOINT( v.X(), v.Y(), v.Z() ) );
+ }
+
+ for(int i = 1; i <= triangulation->NbTriangles(); i++)
+ {
+ int a, b, c;
+- arrTriangles( i ).Get( a, b, c );
++ triangulation->Triangle(i).Get(a, b, c);
+ a--;
+
+ if( reverse )
diff --git a/testing/kompose/APKBUILD b/testing/kompose/APKBUILD
index edc09a3c1a..d8612eed5f 100644
--- a/testing/kompose/APKBUILD
+++ b/testing/kompose/APKBUILD
@@ -1,12 +1,12 @@
# Contributor: TBK <alpine@jjtc.eu>
# Maintainer: TBK <alpine@jjtc.eu>
pkgname=kompose
-pkgver=1.24.0
-pkgrel=1
+pkgver=1.26.0
+pkgrel=0
pkgdesc="Tool to move from docker-compose to Kubernetes"
url="https://kompose.io/"
license="Apache-2.0"
-arch="all !mips !mips64" # fails to build
+arch="all"
options="chmod-clean !check" # Require access to /tmp + bash, jq, ncurses
makedepends="go"
subpackages="$pkgname-bash-completion $pkgname-zsh-completion"
@@ -34,5 +34,5 @@ package() {
}
sha512sums="
-829730cdaa2699d49ea6a22b75486de4180fe055e5e12174e287826c9689a0ff05051c087baa09633b0ce8cd0323f9bdd60eaed0e82f07982d5ad5f5bc9e7883 kompose-1.24.0.tar.gz
+2d22c54941c1ef90317537ed6ad2ecae199fa35b0d5240a9c83b33bebe63a773d88701822c5489efaa4774ac0f124f891e8693453f30bad68cc6eb2d2481f8fb kompose-1.26.0.tar.gz
"
diff --git a/testing/kopano-core/APKBUILD b/testing/kopano-core/APKBUILD
index 665049f431..2e3513108e 100644
--- a/testing/kopano-core/APKBUILD
+++ b/testing/kopano-core/APKBUILD
@@ -2,7 +2,7 @@
pkgname=kopano-core
subpackages="$pkgname-dbg $pkgname-openrc $pkgname-doc $pkgname-bash-completion"
pkgver=10.1.1
-pkgrel=3
+pkgrel=4
pkgdesc="Open Source Groupware Solution"
# ppc64le, mips64: blocked by py3-libmdbx
arch="all !ppc64le !mips64"
diff --git a/testing/kopia/APKBUILD b/testing/kopia/APKBUILD
new file mode 100644
index 0000000000..51ea2a21e0
--- /dev/null
+++ b/testing/kopia/APKBUILD
@@ -0,0 +1,44 @@
+# Contributor: Michał Polański <michal@polanski.me>
+# Maintainer: Michał Polański <michal@polanski.me>
+pkgname=kopia
+pkgver=0.9.7
+pkgrel=0
+pkgdesc="Fast and secure backup tool"
+url="https://kopia.io/"
+license="Apache-2.0"
+arch="all !armhf !armv7 !x86" # tests fail with out of memory error
+makedepends="go"
+subpackages="$pkgname-bash-completion $pkgname-zsh-completion"
+checkdepends="openssh-keygen"
+source="https://github.com/kopia/kopia/archive/v$pkgver/kopia-$pkgver.tar.gz
+ skip-docker-tests.patch
+ fix-arch.patch
+ "
+
+export GOFLAGS="$GOFLAGS -trimpath -mod=readonly -modcacherw"
+export GOPATH="$srcdir"
+export CGO_ENABLED=0
+
+build() {
+ go build -ldflags "-s -w -X github.com/kopia/kopia/repo.BuildVersion=$pkgver"
+
+ ./kopia --completion-script-bash > $pkgname.bash
+ ./kopia --completion-script-zsh > $pkgname.zsh
+}
+
+check() {
+ go test -tags testing ./...
+}
+
+package() {
+ install -Dm755 kopia "$pkgdir"/usr/bin/kopia
+
+ install -Dm644 $pkgname.bash "$pkgdir"/usr/share/bash-completion/completions/$pkgname
+ install -Dm644 $pkgname.zsh "$pkgdir"/usr/share/zsh/site-functions/_$pkgname
+}
+
+sha512sums="
+3546863eb2e4789f013fa5612c66d2134cafb879bfdcb6b9832fde301e90c8dd11fc4d6f4cde3600da473d505c8c096679b3088be00d4b7cc6e13c6a2fcde544 kopia-0.9.7.tar.gz
+6c1c8ca52d83c940c561f11adc18298147882b709810edd8c6560c8988ff1bd30dae2adba4c18055d283e7c2c655a6c6f10c3951829826d6fe5eea20c8cb821d skip-docker-tests.patch
+b81f062b593371b65206575a681466fd1f54f412fb0c2b78bf2dba0293b35940fad8c4b071592329cb269e0c05814e7619ff21bb775a335f817e8331fdc1fbe7 fix-arch.patch
+"
diff --git a/testing/kopia/fix-arch.patch b/testing/kopia/fix-arch.patch
new file mode 100644
index 0000000000..051f5bcad1
--- /dev/null
+++ b/testing/kopia/fix-arch.patch
@@ -0,0 +1,31 @@
+Waiting for feedback on a similar pull request:
+https://github.com/kopia/kopia/pull/1183
+
+diff --git a/fs/localfs/local_fs_32bit.go b/fs/localfs/local_fs_32bit.go
+index 3c0763d5..f0cd28a4 100644
+--- a/fs/localfs/local_fs_32bit.go
++++ b/fs/localfs/local_fs_32bit.go
+@@ -1,6 +1,6 @@
+-//go:build !windows && ((!amd64 && !arm64 && !arm) || darwin || openbsd)
++//go:build !windows && ((!amd64 && !arm64 && !arm && !ppc64le && !s390x && !386 && !riscv64) || darwin || openbsd)
+ // +build !windows
+-// +build !amd64,!arm64,!arm darwin openbsd
++// +build !amd64,!arm64,!arm,!ppc64le,!s390x,!386,!riscv64 darwin openbsd
+
+ package localfs
+
+diff --git a/fs/localfs/local_fs_64bit.go b/fs/localfs/local_fs_64bit.go
+index b3ca663b..e980d371 100644
+--- a/fs/localfs/local_fs_64bit.go
++++ b/fs/localfs/local_fs_64bit.go
+@@ -1,8 +1,8 @@
+-//go:build !windows && !openbsd && !darwin && (amd64 || arm64 || arm)
++//go:build !windows && !openbsd && !darwin && (amd64 || arm64 || arm || ppc64le || s390x || 386 || riscv64)
+ // +build !windows
+ // +build !openbsd
+ // +build !darwin
+-// +build amd64 arm64 arm
++// +build amd64 arm64 arm ppc64le s390x 386 riscv64
+
+ package localfs
+
diff --git a/testing/kopia/skip-docker-tests.patch b/testing/kopia/skip-docker-tests.patch
new file mode 100644
index 0000000000..3c662a395b
--- /dev/null
+++ b/testing/kopia/skip-docker-tests.patch
@@ -0,0 +1,13 @@
+diff --git a/internal/testutil/dockertestutil.go b/internal/testutil/dockertestutil.go
+index 9f5fa2f6..b5570f85 100644
+--- a/internal/testutil/dockertestutil.go
++++ b/internal/testutil/dockertestutil.go
+@@ -12,6 +12,8 @@
+ // RunDockerAndGetOutputOrSkip runs Docker and returns the output as a string.
+ func RunDockerAndGetOutputOrSkip(tb testing.TB, args ...string) string {
+ tb.Helper()
++ tb.Skip("skipping test that runs docker...")
++
+ tb.Logf("running docker %v", args)
+
+ c := exec.Command("docker", args...)
diff --git a/testing/kops/APKBUILD b/testing/kops/APKBUILD
index af17907634..dd95442f8e 100644
--- a/testing/kops/APKBUILD
+++ b/testing/kops/APKBUILD
@@ -1,8 +1,8 @@
-# Contributor: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
+# Contributor: Kaarle Ritvanen <kunkku@alpinelinux.org>
# Maintainer: Kevin Daudt <kdaudt@alpinelinux.org>
pkgname=kops
pkgver=1.21.1
-pkgrel=2
+pkgrel=3
pkgdesc="Kubernetes Operations"
url="https://github.com/kubernetes/kops"
arch="x86_64"
diff --git a/testing/ksmbd-tools/APKBUILD b/testing/ksmbd-tools/APKBUILD
deleted file mode 100644
index 62abdaeb63..0000000000
--- a/testing/ksmbd-tools/APKBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Contributor: Milan P. Stanić <mps@arvanta.net>
-# Maintainer: Milan P. Stanić <mps@arvanta.net>
-pkgname=ksmbd-tools
-pkgver=3.4.2
-pkgrel=0
-pkgdesc="userspace tools for kernel smb server (ksmbd)"
-url="https://github.com/cifsd-team/ksmbd-tools"
-arch="all"
-license="GPL-2.0-or-later"
-[ "$CARCH" = "riscv64" ] && options="$options textrels"
-makedepends="autoconf automake libtool libnl3-dev glib-dev"
-source="$pkgname-$pkgver.tar.gz::https://github.com/cifsd-team/ksmbd-tools/archive/refs/tags/$pkgver.tar.gz"
-
-prepare() {
- default_prepare
- ./autogen.sh
-}
-
-build() {
- ./configure \
- --build=$CBUILD \
- --host=$CHOST \
- --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var
- make
-}
-
-check() {
- make check
-}
-
-package() {
- make DESTDIR="$pkgdir" install
-}
-
-sha512sums="
-c4460a462bb372295b20909412ecbb782d1e8dec8006406042025cc3a1b1d49e6d21b4ef95757a8d2522a17f87998e99cee4a72c452dc1726bdc157278946460 ksmbd-tools-3.4.2.tar.gz
-"
diff --git a/testing/kubernetes/APKBUILD b/testing/kubernetes/APKBUILD
index 12387eb1ac..0c970fcaf3 100644
--- a/testing/kubernetes/APKBUILD
+++ b/testing/kubernetes/APKBUILD
@@ -4,7 +4,7 @@
# Contributor: Dave <dj.2dixx@gmail.com>
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=kubernetes
-pkgver=1.22.3
+pkgver=1.22.4
pkgrel=0
pkgdesc="Container Cluster Manager"
url="https://kubernetes.io/"
@@ -208,7 +208,7 @@ cleanup_srcdir() {
}
sha512sums="
-d2a4c6f2febbccb395478e88a49297fee627bfc843387a0ae607f655e72ae6b085489ac6cd3982481357c1c745a59d43a282b725e17659e60c178e6ab57c0ca6 kubernetes-1.22.3.tar.gz
+b2b8060d031dac83c65e634ad14b804010036a7d74161dd37349f39974d862b10b48423c2dcb4e9ca9e775c94dbe9595d49e57c98a2e6a8d8335cb235ba342e0 kubernetes-1.22.4.tar.gz
bfe072d2f53543b8d704319755f3cfe5ed2467b54879e22117a25a9d7d6d4d238356e45824deaf4d18b8e9eb6f34d1de43be4840b9906f7909478ffe9e8a65ff ensure-cgo-usage.patch
052a0b06de417704f87361f00195063d1aaba0e12ae80a21342613061df2b37b908265e7375604d5f6283767da45363310ec1d9f9e0c17aa616c040c8ecbb267 make-e2e_node-run-over-distro-bins.patch
56201491d2dfe3a487931cbf5c6e60af898701b9541a936d80e3823948fcfb98508e3d51f4aaa415ce971f7bd20a7b51f74f025c76b83f58d5a8de8ce0ab679b make-test-cmd-run-over-hyperkube-based-kubectl.patch
diff --git a/testing/leocad/APKBUILD b/testing/leocad/APKBUILD
new file mode 100644
index 0000000000..7f94e3958c
--- /dev/null
+++ b/testing/leocad/APKBUILD
@@ -0,0 +1,33 @@
+# Contributor: mio <miyopan@e.email>
+# Maintainer: mio <miyopan@e.email>
+pkgname=leocad
+pkgver=21.06
+_libver=20.03
+pkgrel=0
+pkgdesc="CAD application for creating virtual LEGO models"
+url="https://www.leocad.org/"
+license="GPL-2.0-only"
+arch="all"
+makedepends="qt5-qtbase-dev qt5-qttools-dev zlib-dev"
+subpackages="$pkgname-doc"
+source="https://github.com/leozide/leocad/archive/v$pkgver/leocad-v$pkgver.tar.gz
+ https://github.com/leozide/leocad/releases/download/v$pkgver/Library-$_libver.zip
+ "
+options="!check" # No tests
+
+build() {
+ DISABLE_UPDATE_CHECK=1 LDRAW_LIBRARY_PATH=/usr/share/leocad \
+ qmake-qt5 leocad.pro
+ make
+}
+
+package() {
+ INSTALL_ROOT="$pkgdir" make install
+ # Install parts library
+ mkdir -p "$pkgdir"/usr/share/leocad
+ mv "$srcdir"/library.bin "$pkgdir"/usr/share/leocad/
+}
+sha512sums="
+6cc868d3da15f9fe003a70d3a8ebaf2b4e6562a8728652cb7fc9e3ab5ddd9a90c5e433fd4d37cc9f972dc314399b4edb34fe5d9cd47ad63bf7c5d71e04e3c662 leocad-v21.06.tar.gz
+b339a07cb1e9fc5a35f108bba915a0363361b295ba82980550b7b4f82eaa43be45187cb6084cf123c65b52b2d89038c8abab847d0933f6166cac59404dda671a Library-20.03.zip
+"
diff --git a/testing/lgogdownloader/APKBUILD b/testing/lgogdownloader/APKBUILD
index 04c6ddfa12..259e1e3621 100644
--- a/testing/lgogdownloader/APKBUILD
+++ b/testing/lgogdownloader/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: shum <shum@posteo.net>
pkgname=lgogdownloader
pkgver=3.7
-pkgrel=0
+pkgrel=1
pkgdesc="Open source downloader for GOG.com games"
url="https://github.com/Sude-/lgogdownloader"
arch="all"
diff --git a/testing/libaacs/APKBUILD b/testing/libaacs/APKBUILD
deleted file mode 100644
index cad1a5a427..0000000000
--- a/testing/libaacs/APKBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-
-# Contributor: apangona <apo@apangona.de>
-# Maintainer: apangona <apo@apangona.de>
-pkgname=libaacs
-pkgver=0.11.0
-pkgrel=0
-pkgdesc="libaacs is a research project to implement the Advanced Access Content System specification"
-url="https://www.videolan.org/developers/libaacs.html"
-arch="all"
-license="LGPL-2.1-only"
-makedepends="bison flex libgcrypt-dev"
-subpackages="$pkgname-dev"
-source="https://download.videolan.org/pub/videolan/libaacs/$pkgver/libaacs-$pkgver.tar.bz2"
-options="!check" # no tests provided
-
-build() {
- ./configure \
- --build=$CBUILD \
- --host=$CHOST \
- --prefix=/usr \
- --sysconfdir=/etc \
- --mandir=/usr/share/man \
- --infodir=/usr/share/info \
- --localstatedir=/var \
- --disable-static
- make
-}
-
-package() {
- make DESTDIR="$pkgdir" install
-}
-
-sha512sums="
-167edbb6f26599e41d6084908039bf902f69f57da1f64f1491734157d1568ad0b32c8ea3064e0706e383af8dc6007eef65170b2b47222bf3d363e395e0b60388 libaacs-0.11.0.tar.bz2
-"
diff --git a/testing/libaec/APKBUILD b/testing/libaec/APKBUILD
index 0ec44dc33e..303b1b6466 100644
--- a/testing/libaec/APKBUILD
+++ b/testing/libaec/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Holger Jaekel <holger.jaekel@gmx.de>
# Maintainer: Holger Jaekel <holger.jaekel@gmx.de>
pkgname=libaec
-pkgver=1.0.5
+pkgver=1.0.6
pkgrel=0
pkgdesc="Adaptive Entropy Coding library"
url="https://gitlab.dkrz.de/k202009/libaec"
@@ -45,5 +45,5 @@ package() {
}
sha512sums="
-ededaf5416ba875c91a6c528d2ed4b699e7a31594db5a4635f2c5922d899cb968c83613f052a29a76517f553ed2536fb41f33b030823cf782d05d14da5b6cd9f libaec-1.0.5.tar.gz
+f5d118c48225f97b229ac11425b94adff4d3698733bf18767b427e49047f8e08768464bc9cd9f5e6a66ceb44c8ebd9904c4f6f46566e2e66fcaa1049b2ebfcc1 libaec-1.0.6.tar.gz
"
diff --git a/testing/libarcus/APKBUILD b/testing/libarcus/APKBUILD
deleted file mode 100644
index 89e7947e82..0000000000
--- a/testing/libarcus/APKBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Contributor: Aiden Grossman <agrossman154@yahoo.com>
-# Maintainer: Aiden Grossman <agrossman154@yahoo.com>
-pkgname=libarcus
-_pkgname=libArcus
-# Needs to be upgraded in sync with the curaengine aport
-pkgver=4.11.0
-pkgrel=1
-pkgdesc="Communication library for Cura"
-url="https://github.com/Ultimaker/libArcus"
-arch="all"
-license="LGPL-3.0-or-later"
-makedepends="protobuf-dev py3-sip-dev python3-dev cmake"
-subpackages="$pkgname-dev $pkgname-python:_py"
-options="!check" # no test suite
-source="https://github.com/Ultimaker/libArcus/archive/$pkgver/libArcus-$pkgver.tar.gz
- protobuf.patch
- "
-builddir="$srcdir/$_pkgname-$pkgver"
-
-build() {
- cmake -B ./build -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_BUILD_TYPE=None .
- cmake --build build
-}
-
-package() {
- DESTDIR="$pkgdir" cmake --build build --target install
-}
-
-_py() {
- pkgdesc="Python bindings for libarcus"
- depends="python3"
- amove usr/lib/python3*
-}
-
-sha512sums="
-3a23b63787121b510f35c77f8d184a1773a8e53e7e15a238a7454022c30674a687d9b74414516c24f3330e8689243fad93e82eb50f3d8a64b748020bd2c7b135 libArcus-4.11.0.tar.gz
-b901a751a8d7204cd9eb28d74d48cfb1a63c939fd2fbe6e41cc26426539b5905747cf2f71bc612e792b9a4cf232ed40624182f6c07a862ef6c95c1e08c6c1524 protobuf.patch
-"
diff --git a/testing/libarcus/protobuf.patch b/testing/libarcus/protobuf.patch
deleted file mode 100644
index e138558cf2..0000000000
--- a/testing/libarcus/protobuf.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Migrate away from previously deprecated functions dropped in protobuf>=3.18.0_1.
-
---- a/src/Socket_p.h
-+++ b/src/Socket_p.h
-@@ -128,9 +128,6 @@
-
- static const int keep_alive_rate = 500; //Number of milliseconds between sending keepalive packets
-
-- // This value determines when protobuf should warn about very large messages.
-- static const int message_size_warning = 400 * 1048576;
--
- // This value determines when protobuf should error out because the message is too large.
- // Due to the way Protobuf is implemented, messages large than 512MiB will cause issues.
- static const int message_size_maximum = 500 * 1048576;
-@@ -362,11 +359,15 @@
- return;
- }
-
-- uint32_t message_size = message->ByteSize();
-- if(platform_socket.writeUInt32(message_size) == -1)
-+ auto message_size = message->ByteSizeLong();
-+ if (message_size > UINT32_MAX) {
-+ error(ErrorCode::SendFailedError, "Message size is too large to send");
-+ return;
-+ }
-+
-+ if(platform_socket.writeUInt32(static_cast<uint32_t>(message_size)) == -1)
- {
- error(ErrorCode::SendFailedError, "Could not send message size");
-- return;
- }
-
- uint32_t type_id = message_types.getMessageTypeId(message);
-@@ -548,7 +549,7 @@
-
- google::protobuf::io::ArrayInputStream array(wire_message->data, wire_message->size);
- google::protobuf::io::CodedInputStream stream(&array);
-- stream.SetTotalBytesLimit(message_size_maximum, message_size_warning);
-+ stream.SetTotalBytesLimit(message_size_maximum);
- if(!message->ParseFromCodedStream(&stream))
- {
- error(ErrorCode::ParseFailedError, "Failed to parse message:" + std::string(wire_message->data));
diff --git a/testing/libcamera/APKBUILD b/testing/libcamera/APKBUILD
new file mode 100644
index 0000000000..ae0dc6ab38
--- /dev/null
+++ b/testing/libcamera/APKBUILD
@@ -0,0 +1,75 @@
+# Contributor: Luca Weiss <luca@z3ntu.xyz>
+# Maintainer: Luca Weiss <luca@z3ntu.xyz>
+pkgname=libcamera
+pkgver=0_git20211109
+pkgrel=0
+_commit="f2a1817275db8fb77acb5f2771b7577be8642194"
+pkgdesc="Linux camera framework"
+url="https://libcamera.org/"
+arch="all"
+license="LGPL-2.1-or-later AND GPL-2.0-or-later"
+depends_dev="
+ boost-dev
+ eudev-dev
+ glib-dev
+ gnutls-dev
+ gst-plugins-bad-dev
+ qt5-qtbase-dev
+ "
+makedepends="$depends_dev
+ doxygen
+ graphviz
+ linux-headers
+ meson
+ py3-jinja2
+ py3-ply
+ py3-sphinx
+ py3-yaml
+ qt5-qttools-dev
+ "
+subpackages="
+ $pkgname-dev
+ $pkgname-doc
+ qcam
+ "
+source="https://dev.alpinelinux.org/archive/libcamera/libcamera-$_commit.tar.gz"
+builddir="$srcdir/libcamera"
+options="!check" # Most tests don't run in the chroot
+
+_disturl="dev.alpinelinux.org:/archive/$pkgname/"
+
+snapshot() {
+ clean
+ deps
+ mkdir -p "$srcdir" && cd "$srcdir"
+ git clone https://git.libcamera.org/libcamera/libcamera.git --recursive
+ cd libcamera && git checkout $_commit && cd -
+ tar czvf $SRCDEST/$pkgname-$_commit.tar.gz libcamera
+ rsync --progress -La $SRCDEST/$pkgname-$_commit.tar.gz $_disturl
+}
+
+build() {
+ # tests are disabled due to build failures
+ # ../test/gstreamer/gstreamer_multi_stream_test.cpp:83:71: error: missing sentinel in function call
+ abuild-meson \
+ -Dtest=false \
+ . build
+ meson compile -C build
+}
+
+check() {
+ meson test -C build --print-errorlogs
+}
+
+qcam() {
+ mkdir -p "$subpkgdir"/usr/bin/
+ mv "$pkgdir"/usr/bin/qcam "$subpkgdir"/usr/bin/qcam
+}
+
+package() {
+ DESTDIR="$pkgdir" meson install -C build
+}
+
+sha512sums="
+a3dd355eee982f8baec1a537ed022b8aabba0c6ea3f31053d70b23a1e92fb8327113c794c77c9a318943f12f46045b779fe736e09514f3663b47443c7396a399 libcamera-f2a1817275db8fb77acb5f2771b7577be8642194.tar.gz
+"
diff --git a/testing/libdeflate/APKBUILD b/testing/libdeflate/APKBUILD
deleted file mode 100644
index 36baff0b6a..0000000000
--- a/testing/libdeflate/APKBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# Contributor: Holger Jaekel <holger.jaekel@gmx.de>
-# Maintainer: Holger Jaekel <holger.jaekel@gmx.de>
-pkgname=libdeflate
-pkgver=1.8
-pkgrel=0
-pkgdesc="Library for fast, whole-buffer DEFLATE-based compression and decompression"
-url="https://github.com/ebiggers/libdeflate"
-arch="all"
-license="MIT"
-checkdepends="
- zlib-dev
- "
-subpackages="
- $pkgname-dev
- $pkgname-utils
- "
-source="
- libdeflate-$pkgver.tar.gz::https://github.com/ebiggers/libdeflate/archive/v$pkgver.tar.gz
- "
-
-# Build fails with Os, so we are using O2
-export CFLAGS="$CFLAGS -O2"
-
-build() {
- make PREFIX=/usr USE_SHARED_LIB=1 gunzip
-}
-
-check() {
- make check
-}
-
-package() {
- make DESTDIR="$pkgdir" PREFIX=/usr USE_SHARED_LIB=1 install
- rm "$pkgdir"/usr/lib/libdeflate.a
-}
-
-utils() {
- pkgdesc="Command line utilities for the DEFLATE library"
- amove /usr/bin
-}
-sha512sums="
-b40caecdf783487488a5bd8213304175348b9db9bc1efdf6d5222fb912f61698b5e196522195a3640d7ff61ba953a93c0c8f75e07f548ac8b9d9c5dd5a787544 libdeflate-1.8.tar.gz
-"
diff --git a/testing/libfm-qt/APKBUILD b/testing/libfm-qt/APKBUILD
index a51293d51b..a902b0d625 100644
--- a/testing/libfm-qt/APKBUILD
+++ b/testing/libfm-qt/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Antoni Aloy <aaloytorrens@gmail.com>
pkgname=libfm-qt
-pkgver=0.17.1
+pkgver=1.0.0
pkgrel=0
pkgdesc="Qt port of libfm"
url="https://github.com/lxqt/libfm-qt"
@@ -31,5 +31,5 @@ package() {
DESTDIR="$pkgdir" cmake --build build --target install
}
sha512sums="
-1e1781a01446f381625361a50f77422827e7ac5ab6039b4246369e2281edf78d3ccba866fa472667bcbb6737c44ebc350cb30a0055fc84d1f5d7e1c83e1241c1 libfm-qt-0.17.1.tar.xz
+8609709b00a67273e4cb3ca18ad695df172ff3cac2ed70d48e5f607c20a4d4507598b500957bf197bffa65db4ad5843f3fd477a56868c95507a594542f24b5b4 libfm-qt-1.0.0.tar.xz
"
diff --git a/testing/libgrilio/APKBUILD b/testing/libgrilio/APKBUILD
deleted file mode 100644
index 8c19771507..0000000000
--- a/testing/libgrilio/APKBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# Contributor: Danct12 <danct12@disroot.org>
-# Maintainer: Danct12 <danct12@disroot.org>
-pkgname=libgrilio
-pkgver=1.0.39
-pkgrel=0
-pkgdesc="RIL client library"
-url="https://git.sailfishos.org/mer-core/libgrilio"
-arch="all !mips64" # failing tests
-license="BSD-3-Clause"
-makedepends="libglibutil-dev"
-subpackages="$pkgname-dev $pkgname-doc"
-source="$pkgname-$pkgver.tar.gz::https://git.sailfishos.org/mer-core/libgrilio/-/archive/$pkgver/libgrilio-$pkgver.tar.gz"
-case $CARCH in
- s390x) options="$options !check" # test_io fails
-esac
-
-build() {
- make KEEP_SYMBOLS=1 release pkgconfig
-}
-
-check() {
- make test
-}
-
-package() {
- make install-dev DESTDIR="$pkgdir"
- install -Dm 644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-}
-
-sha512sums="3b1a30cacd6970e168b952a088a544fc1b1a022cea0d056d4b58454f48034443ae40bc8dc3886b289c9431ad53f2ebecc198cf08e876634451e0e58c8784004c libgrilio-1.0.39.tar.gz"
diff --git a/testing/libjxl/APKBUILD b/testing/libjxl/APKBUILD
new file mode 100644
index 0000000000..7239e7e83c
--- /dev/null
+++ b/testing/libjxl/APKBUILD
@@ -0,0 +1,93 @@
+# Maintainer: Alex Xu (Hello71) <alex_y_xu@yahoo.ca>
+pkgname=libjxl
+pkgver=0.6.1
+pkgrel=0
+pkgdesc="JPEG XL image format reference implementation"
+url="https://github.com/libjxl/libjxl"
+arch="all"
+license="Apache-2.0"
+makedepends="
+ asciidoc
+ brotli-dev
+ cmake
+ gdk-pixbuf-dev
+ giflib-dev
+ gtest-dev
+ highway-dev
+ lcms2-dev
+ libjpeg-turbo-dev
+ libpng-dev
+ openexr-dev
+ zlib-dev
+"
+subpackages="$pkgname-doc $pkgname-static $pkgname-tools $pkgname-dev"
+_lodepng_commit=48e5364ef48ec2408f44c727657ac1b6703185f8
+source="libjxl-$pkgver.tar.gz::https://github.com/libjxl/libjxl/archive/refs/tags/v$pkgver.tar.gz
+ lodepng-$_lodepng_commit.tar.gz::https://github.com/lvandeve/lodepng/archive/$_lodepng_commit.tar.gz
+ system-lcms.patch
+ sys-platform-ppc.patch
+ "
+
+# gimp-dev not available
+case "$CARCH" in
+ s390x|mips|mips64|riscv64) ;;
+ *) makedepends="$makedepends gimp-dev"
+esac
+
+# https://github.com/libjxl/libjxl/blob/83b05d7583d37fe93bdaa5e8d306782152f38ca1/.github/workflows/build_test.yml#L339
+if [ "$CARCH" = x86 ]; then
+ options="!check"
+fi
+
+prepare() {
+ default_prepare
+ rmdir third_party/lodepng
+ ln -s ../../lodepng-$_lodepng_commit third_party/lodepng
+}
+
+build() {
+ cmake -B build \
+ -DCMAKE_BUILD_TYPE=None \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DBUILD_TESTING=ON \
+ -DJPEGXL_ENABLE_BENCHMARK=OFF \
+ -DJPEGXL_ENABLE_COVERAGE=OFF \
+ -DJPEGXL_ENABLE_EXAMPLES=OFF \
+ -DJPEGXL_ENABLE_FUZZERS=OFF \
+ -DJPEGXL_ENABLE_SJPEG=OFF \
+ -DJPEGXL_ENABLE_SKCMS=OFF \
+ -DJPEGXL_ENABLE_VIEWERS=OFF \
+ -DJPEGXL_FORCE_SYSTEM_GTEST=ON \
+ -DJPEGXL_FORCE_SYSTEM_BROTLI=ON \
+ -DJPEGXL_FORCE_SYSTEM_HWY=ON \
+ -DJPEGXL_FORCE_SYSTEM_LCMS=ON
+ cmake --build build
+}
+
+check() {
+ cd build
+ local skipped_tests='DecodeTest\.PixelTestWithICCProfileLossy|RobustStatisticsTest\.'
+ if [ "$CARCH" = s390x ]; then
+ skipped_tests="$skipped_tests|DecodeTestParam\.PixelTest/301x33[A-Z]+to[A-Z]+f16"
+ fi
+ : ${CTEST_PARALLEL_LEVEL=$JOBS}
+ # DecodeTest.PixelTestWithICCProfileLossy: https://github.com/libjxl/libjxl/issues/500
+ # RobustStatisticsTest: https://github.com/libjxl/libjxl/issues/698
+ CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E "($skipped_tests)"
+}
+
+package() {
+ DESTDIR="$pkgdir" cmake --install build
+}
+
+tools() {
+ pkgdesc="JPEG XL image format reference implementation tools (cjxl, djxl)"
+ amove usr/bin/*
+}
+
+sha512sums="
+302935d722160b0b288ac63301f9e95caf82eccf6ad76c4f4da6316a0314ee3562115932b1ceacb0d02708de0a07788992d3478cae73af0b90193f5769f9fb52 libjxl-0.6.1.tar.gz
+50a515f1f15122fa017637be30df0db05980d07f8891f16b0b68697ef0df797176bbe005df623e9f2dbb68b750b0a87e69c3cef215c7bf15187d00491c4023c7 lodepng-48e5364ef48ec2408f44c727657ac1b6703185f8.tar.gz
+7323e9ecacd4d7602a724eed34ab3227794cc81d9cfa1f356d6cd02ba55c5c8bd84015b7f90c469d7e9d58a4f758c8ca914b5bae261a434ac24a8a934ee55f6c system-lcms.patch
+f12d0b6ef7e12a3db67be1385e949171ffad037ea853ee91dcb0d711957a5c0908d2890db185c6bf3afaafb4507ae9d2b5c9a79d1fca045a22c2b7af8c91279c sys-platform-ppc.patch
+"
diff --git a/testing/libjxl/sys-platform-ppc.patch b/testing/libjxl/sys-platform-ppc.patch
new file mode 100644
index 0000000000..955003ba2f
--- /dev/null
+++ b/testing/libjxl/sys-platform-ppc.patch
@@ -0,0 +1,30 @@
+From c31dca74e68f6d1550692a2e28780499fa4e7dd5 Mon Sep 17 00:00:00 2001
+From: Alex Deymo <deymo@google.com>
+Date: Fri, 1 Oct 2021 16:27:01 +0200
+Subject: [PATCH] Remove sys/platform/ppc.h include. (#678)
+
+According to the comment this include was used for
+`__ppc_get_timebase_freq` at some point in this file but nowadays that
+function is not there, so we can remove the include. Fixes #677.
+---
+ tools/cpu/cpu.cc | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/tools/cpu/cpu.cc b/tools/cpu/cpu.cc
+index 24cc097..b75af03 100644
+--- a/tools/cpu/cpu.cc
++++ b/tools/cpu/cpu.cc
+@@ -18,10 +18,6 @@
+ #endif
+ #endif
+
+-#if JXL_ARCH_PPC
+-#include <sys/platform/ppc.h> // __ppc_get_timebase_freq
+-#endif
+-
+ #if JXL_ARCH_ARM
+ #include <unistd.h> // sysconf
+ #endif
+--
+2.33.0
+
diff --git a/testing/libjxl/system-lcms.patch b/testing/libjxl/system-lcms.patch
new file mode 100644
index 0000000000..537e02c354
--- /dev/null
+++ b/testing/libjxl/system-lcms.patch
@@ -0,0 +1,47 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 280d4af..c9186df 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -127,6 +127,8 @@ set(JPEGXL_FORCE_SYSTEM_BROTLI false CACHE BOOL
+ "Force using system installed brotli instead of third_party/brotli source.")
+ set(JPEGXL_FORCE_SYSTEM_HWY false CACHE BOOL
+ "Force using system installed highway (libhwy-dev) instead of third_party/highway source.")
++set(JPEGXL_FORCE_SYSTEM_LCMS false CACHE BOOL
++ "Force using system installed lcms instead of third_party/lcms source.")
+
+ # Check minimum compiler versions. Older compilers are not supported and fail
+ # with hard to understand errors.
+diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
+index b5e1899..887d31d 100644
+--- a/third_party/CMakeLists.txt
++++ b/third_party/CMakeLists.txt
+@@ -201,13 +201,23 @@ if (JPEGXL_ENABLE_SKCMS OR JPEGXL_ENABLE_PLUGINS)
+ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/skcms/LICENSE"
+ ${PROJECT_BINARY_DIR}/LICENSE.skcms COPYONLY)
+ endif ()
+-if (JPEGXL_ENABLE_VIEWERS OR NOT JPEGXL_ENABLE_SKCMS)
+- if( NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/lcms/.git" )
+- message(SEND_ERROR "Please run git submodule update --init")
++if ((JPEGXL_ENABLE_VIEWERS OR NOT JPEGXL_ENABLE_SKCMS))
++ if(JPEGXL_FORCE_SYSTEM_LCMS)
++ pkg_check_modules(LCMS REQUIRED IMPORTED_TARGET lcms2)
++ add_library(lcms2 INTERFACE IMPORTED GLOBAL)
++ target_link_libraries(lcms2 INTERFACE PkgConfig::LCMS)
++ else()
++ if(JPEGXL_DEP_LICENSE_DIR)
++ configure_file("${JPEGXL_DEP_LICENSE_DIR}/libhwy-dev/copyright"
++ ${PROJECT_BINARY_DIR}/LICENSE.highway COPYONLY)
++ endif() # JPEGXL_DEP_LICENSE_DIR
++ if( NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/lcms/.git" )
++ message(SEND_ERROR "Please run git submodule update --init")
++ endif()
++ include(lcms2.cmake)
++ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/lcms/COPYING"
++ ${PROJECT_BINARY_DIR}/LICENSE.lcms COPYONLY)
+ endif()
+- include(lcms2.cmake)
+- configure_file("${CMAKE_CURRENT_SOURCE_DIR}/lcms/COPYING"
+- ${PROJECT_BINARY_DIR}/LICENSE.lcms COPYONLY)
+ endif()
+
+ # sjpeg
diff --git a/testing/liblastfm-qt/APKBUILD b/testing/liblastfm-qt/APKBUILD
new file mode 100644
index 0000000000..3132ad849e
--- /dev/null
+++ b/testing/liblastfm-qt/APKBUILD
@@ -0,0 +1,46 @@
+# Contributor: knuxify <knuxify@gmail.com>
+# Maintainer: knuxify <knuxify@gmail.com>
+pkgname=liblastfm-qt
+pkgver=1.1.10_git20190823
+pkgrel=1
+_commit=2ce2bfe1879227af8ffafddb82b218faff813db9
+pkgdesc="A Qt C++ library for the Last.fm webservices "
+url="https://last.fm"
+arch="all"
+license="GPL-3.0-or-later"
+makedepends="cmake qt5-qtbase-dev fftw-dev libsamplerate-dev"
+subpackages="$pkgname-dev"
+source="liblastfm-qt-$pkgver.tar.gz::https://github.com/lastfm/liblastfm/archive/$_commit.tar.gz
+ remove-deprecated-staging-server.patch
+ remove-dynamic-exception-specifications.patch"
+builddir="$srcdir/liblastfm-$_commit"
+options="!check" # broken, redirects don't work
+
+build() {
+ if [ "$CBUILD" != "$CHOST" ]; then
+ CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
+ fi
+ cmake -B build \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=lib \
+ -DBUILD_SHARED_LIBS=True \
+ -DCMAKE_BUILD_TYPE=None \
+ -DBUILD_FINGERPRINT=ON \
+ $CMAKE_CROSSOPTS .
+ cmake --build build
+}
+
+check() {
+ cd build
+ CTEST_OUTPUT_ON_FAILURE=TRUE ctest
+}
+
+package() {
+ DESTDIR="$pkgdir" cmake --install build
+}
+
+sha512sums="
+f225e8ce2a7838182ee1300941182fb97694966469f58b640815fc08c8664c35566bd7d82297c44ca33147caf4074c9d59125c571615ad37ce408d1e6e1e4295 liblastfm-qt-1.1.10_git20190823.tar.gz
+844dd940058224bdc4610a4aad5a934ee398908fc5fea920df9437c71f4a23b40c445d5a052f162780458938b9c0917584dfe19cb904fb936c01a3f4f37d668d remove-deprecated-staging-server.patch
+a466b6a17e2977ed275ee094e0523f1b96590d089bf2fbf1ce345ea93ac57e0c3cb29b91bc0e47db794b8e02e2a098cc90c6a432ee1461d7d7ef28704303892d remove-dynamic-exception-specifications.patch
+"
diff --git a/testing/liblastfm-qt/remove-deprecated-staging-server.patch b/testing/liblastfm-qt/remove-deprecated-staging-server.patch
new file mode 100644
index 0000000000..130130d944
--- /dev/null
+++ b/testing/liblastfm-qt/remove-deprecated-staging-server.patch
@@ -0,0 +1,98 @@
+From 9c5d072b55f2863310e40291677e6397e9cbc3c2 Mon Sep 17 00:00:00 2001
+From: Pedro de Carvalho Gomes <pedro.gomes@ipsoft.com>
+Date: Tue, 10 Mar 2020 16:44:57 +0100
+Subject: [PATCH] Remove deprecated staging server and fix test for QT5 at
+ Ubuntu 19.10
+
+---
+ src/ws.cpp | 17 ++++++++---------
+ src/ws.h | 9 +++++----
+ tests/CMakeLists.txt | 4 ++++
+ 3 files changed, 17 insertions(+), 13 deletions(-)
+
+diff --git a/src/ws.cpp b/src/ws.cpp
+index a7559041..f6ace2d1 100644
+--- a/src/ws.cpp
++++ b/src/ws.cpp
+@@ -32,7 +32,8 @@
+ #include <QMutex>
+ #include <QSslSocket>
+
+-static lastfm::ws::Scheme theScheme = lastfm::ws::Http;
++static lastfm::ws::Scheme theScheme = lastfm::ws::Https;
++static QString theHost = LASTFM_WS_HOSTNAME;
+ static QMap< QThread*, QNetworkAccessManager* > threadNamHash;
+ static QSet< QThread* > ourNamSet;
+ static QMutex namAccessMutex;
+@@ -96,15 +97,13 @@ lastfm::ws::setScheme( lastfm::ws::Scheme scheme )
+ QString
+ lastfm::ws::host()
+ {
+- QStringList const args = QCoreApplication::arguments();
+- if (args.contains( "--debug"))
+- return "ws.staging.audioscrobbler.com";
+-
+- int const n = args.indexOf( "--host" );
+- if (n != -1 && args.count() > n+1)
+- return args[n+1];
++ return theHost;
++}
+
+- return LASTFM_WS_HOSTNAME;
++void
++lastfm::ws::setHost( QString host )
++{
++ theHost = host;
+ }
+
+ static QUrl baseUrl()
+diff --git a/src/ws.h b/src/ws.h
+index 8d2a41e8..e6da343d 100644
+--- a/src/ws.h
++++ b/src/ws.h
+@@ -44,7 +44,7 @@ namespace lastfm
+
+ namespace ws
+ {
+- /** both of these are provided when you register at http://last.fm/api */
++ /** both of these are provided when you register at https://www.last.fm/api/ */
+ LASTFM_DLLEXPORT extern const char* SharedSecret;
+ LASTFM_DLLEXPORT extern const char* ApiKey;
+
+@@ -54,8 +54,8 @@ namespace lastfm
+
+ /** Some webservices require authentication. See the following
+ * documentation:
+- * http://www.last.fm/api/authentication
+- * http://www.last.fm/api/desktopauth
++ * https://www.last.fm/api/authentication
++ * https://www.last.fm/api/desktopauth
+ * You have to authenticate and then assign to SessionKey, liblastfm does
+ * not do that for you. Also we do not store this. You should store this!
+ * You only need to authenticate once, and that key lasts forever!
+@@ -122,9 +122,10 @@ namespace lastfm
+ LASTFM_DLLEXPORT void setScheme( Scheme scheme );
+ LASTFM_DLLEXPORT Scheme scheme();
+
++ LASTFM_DLLEXPORT void setHost( QString host );
+ LASTFM_DLLEXPORT QString host();
+
+- /** the map needs a method entry, as per http://last.fm/api */
++ /** the map needs a method entry, as per https://www.last.fm/api/ */
+ LASTFM_DLLEXPORT QUrl url( QMap<QString, QString>, bool sessionKey = true);
+ LASTFM_DLLEXPORT QNetworkReply* get( QMap<QString, QString> );
+ /** generates api sig, includes api key, and posts, don't add the api
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index f85bf70a..496fd0dd 100644
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -1,5 +1,9 @@
+ include(lastfm_add_test.cmake)
+ include_directories(${CMAKE_CURRENT_BINARY_DIR}/../src)
+
++if(NOT BUILD_WITH_QT4)
++ find_package(Qt5Test REQUIRED)
++endif()
++
+ lastfm_add_test(UrlBuilder)
+ lastfm_add_test(Track)
diff --git a/testing/liblastfm-qt/remove-dynamic-exception-specifications.patch b/testing/liblastfm-qt/remove-dynamic-exception-specifications.patch
new file mode 100644
index 0000000000..df797cbef8
--- /dev/null
+++ b/testing/liblastfm-qt/remove-dynamic-exception-specifications.patch
@@ -0,0 +1,57 @@
+From d51ad3e759331d7d79c6675c5d22541280bf9a70 Mon Sep 17 00:00:00 2001
+From: Xeonacid <h.dwwwwww@gmail.com>
+Date: Tue, 5 Oct 2021 00:04:08 +0800
+Subject: [PATCH] Remove dynamic exception specifications
+
+ISO C++17 does not allow dynamic exception specifications.
+
+(https://github.com/lastfm/liblastfm/pull/41)
+---
+ src/fingerprint/Fingerprint.cpp | 4 ++--
+ src/fingerprint/Fingerprint.h | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/fingerprint/Fingerprint.cpp b/src/fingerprint/Fingerprint.cpp
+index 55f77a45..3817fcee 100644
+--- a/src/fingerprint/Fingerprint.cpp
++++ b/src/fingerprint/Fingerprint.cpp
+@@ -94,7 +94,7 @@ lastfm::Fingerprint::data() const
+
+
+ void
+-lastfm::Fingerprint::generate( FingerprintableSource* ms ) throw( Error )
++lastfm::Fingerprint::generate( FingerprintableSource* ms )
+ {
+ //TODO throw if we can't get required metadata from the track object
+
+@@ -306,7 +306,7 @@ lastfm::Fingerprint::submit() const
+
+
+ void
+-lastfm::Fingerprint::decode( QNetworkReply* reply, bool* complete_fingerprint_requested ) throw( Error )
++lastfm::Fingerprint::decode( QNetworkReply* reply, bool* complete_fingerprint_requested )
+ {
+ // The response data will consist of a number and a string.
+ // The number is the fpid and the string is either FOUND or NEW
+diff --git a/src/fingerprint/Fingerprint.h b/src/fingerprint/Fingerprint.h
+index 537d08c3..9ac0dbd5 100644
+--- a/src/fingerprint/Fingerprint.h
++++ b/src/fingerprint/Fingerprint.h
+@@ -71,7 +71,7 @@ namespace lastfm
+ };
+
+ /** This is CPU intensive, do it in a thread in your GUI application */
+- void generate( FingerprintableSource* ) throw( Error );
++ void generate( FingerprintableSource* );
+
+ /** Submits the fingerprint data to Last.fm in order to get a FingerprintId
+ * back. You need to wait for the QNetworkReply to finish before you can
+@@ -82,7 +82,7 @@ namespace lastfm
+ * will be valid. Otherwise we will throw. You always get a valid id
+ * or a throw.
+ */
+- void decode( QNetworkReply*, bool* lastfm_needs_a_complete_fingerprint = 0 ) throw( Error );
++ void decode( QNetworkReply*, bool* lastfm_needs_a_complete_fingerprint = 0 );
+ };
+
+
diff --git a/testing/liblxqt/APKBUILD b/testing/liblxqt/APKBUILD
index ddade79c67..6ca4a561be 100644
--- a/testing/liblxqt/APKBUILD
+++ b/testing/liblxqt/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Antoni Aloy <aaloytorrens@gmail.com>
pkgname=liblxqt
-pkgver=0.17.0
+pkgver=1.0.0
pkgrel=0
pkgdesc="Common base library for LXQt components"
url="https://github.com/lxqt/liblxqt"
@@ -53,5 +53,5 @@ package() {
}
sha512sums="
-72fd06a1bd8cee422432c3eead9ed8bf15f460848b9a3f7cdb4ee1b31c3896e6af00bc62935fe0fd7d70170010c5f128dcf9c3ecb904366818fbbfc2af3dbbf1 liblxqt-0.17.0.tar.xz
+9b0c081f644285e929f73a2a3aeb051383432ff353f918d4f8cbe57d2f5f330ab7b29329dcc17dd3605fe0904005b1c5009be77ee5ac6e2739b8baaf0fadaa5b liblxqt-1.0.0.tar.xz
"
diff --git a/testing/libmdbx/APKBUILD b/testing/libmdbx/APKBUILD
index e7e5d83a06..092ea3fa8a 100644
--- a/testing/libmdbx/APKBUILD
+++ b/testing/libmdbx/APKBUILD
@@ -1,39 +1,50 @@
# Contributor: Noel Kuntze <noel.kuntze@thermi.consulting>
# Maintainer: Noel Kuntze <noel.kuntze@thermi.consulting>
pkgname=libmdbx
-pkgver=0.10.3
+pkgver=0.11.1
pkgrel=0
pkgdesc="fast, compact, powerful, embedded, transactional key-value database, with permissive license"
url="https://github.com/erthink/libmdbx"
arch="all !mips64"
license="OLDAP-2.8"
-makedepends="linux-headers bash cmake"
+makedepends="linux-headers cmake bash"
subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc"
source="$pkgname-$pkgver.tar.gz::https://github.com/erthink/libmdbx/archive/refs/tags/v$pkgver.tar.gz
- 0001-mdbx-Remove-all-checks-for-amalgated-or-git-source-i.patch"
+ 0001-mdbx-Remove-all-checks-for-amalgated-or-git-source-i.patch
+ fix-example.patch
+ "
build() {
echo "$pkgver.0" > VERSION
+
+ if [ "$CBUILD" != "$CHOST" ]; then
+ CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
+ fi
export CFLAGS="$CFLAGS -fPIC -Wno-int-to-pointer-cast"
- cmake . -DMDBX_ENABLE_TESTS=True
- make -f Makefile all prefix=/
+ cmake -B build \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=lib \
+ -DBUILD_SHARED_LIBS=True \
+ -DCMAKE_BUILD_TYPE=None \
+ -DMDBX_ENABLE_TESTS=True \
+ $CMAKE_CROSSOPTS .
+ cmake --build build
}
check() {
- export CFLAGS="$CFLAGS -fPIC -Wno-int-to-pointer-cast"
- cmake . -DMDBX_ENABLE_TESTS=True
+ cd build
+# export CFLAGS="$CFLAGS -fPIC -Wno-int-to-pointer-cast"
+# cmake . -DMDBX_ENABLE_TESTS=True
make -f Makefile mdbx-test test-singleprocess build-test TEST_DB=/tmp/mdbx-test.db TEST_LOG=/tmp/mdbx-test.log.gz
rm /tmp/mdbx-test.*
}
package() {
- export CFLAGS="$CFLAGS -fPIC -Wno-int-to-pointer-cast"
- cmake . -DMDBX_ENABLE_TESTS=True -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_DO_STRIP=False -DMDBX_MAN_INSTALL_DESTINATION=/usr/share/man/man1 \
- -DMDBX_TOOLS_INSTALL_DESTINATION=/usr/bin -DMDBX_DLL_INSTALL_DESTINATION=/usr/lib
- make -f Makefile install DESTDIR="$pkgdir"
+ DESTDIR="$pkgdir" cmake --build build --target install
}
sha512sums="
-69c0d56311e8876527b19fccd4bb3a60a934917b42514eb3dbfe07bfe5b7511da4b1b1faacc9788992fe297a01e6528951c7f77372e0d4ee55b104941043b848 libmdbx-0.10.3.tar.gz
+f253f94bb6edae955e4400fb69e6db6efcbfff59f8ff2856495904bbc508b835ac78aa650f8c2c4eeaddf688e7432eca3d71b49f372d469cd90004a1aba40831 libmdbx-0.11.1.tar.gz
5e5fef4219279b10f0d4371fcbf3e2d4a7d958eb337f9de92aebb6a7d0d6644faa65eb804f46021678997a638ac601b03d9facbbf1164b45ae9075384d300df2 0001-mdbx-Remove-all-checks-for-amalgated-or-git-source-i.patch
+baeb79efa7bb5d36af474f6dbefece9c597cf0b4d86cee96b9855da9cba4ee43aa46fab97c0c85c74ac76df9c4e3adc39666775ae14d79c394d07344569940ce fix-example.patch
"
diff --git a/testing/libmdbx/fix-example.patch b/testing/libmdbx/fix-example.patch
new file mode 100644
index 0000000000..3c2b86d4ba
--- /dev/null
+++ b/testing/libmdbx/fix-example.patch
@@ -0,0 +1,11 @@
+--- a/example/example-mdbx.c
++++ b/example/example-mdbx.c
+@@ -18,7 +18,7 @@
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+
+-#include "mdbx.h"
++#include "../mdbx.h"
+ #include <limits.h>
+ #include <stdint.h>
+ #include <stdio.h>
diff --git a/testing/libmygpo-qt/APKBUILD b/testing/libmygpo-qt/APKBUILD
new file mode 100644
index 0000000000..4d45afba9a
--- /dev/null
+++ b/testing/libmygpo-qt/APKBUILD
@@ -0,0 +1,47 @@
+# Contributor: knuxify <knuxify@gmail.com>
+# Maintainer: knuxify <knuxify@gmail.com>
+pkgname=libmygpo-qt
+pkgver=1.1.0
+pkgrel=0
+pkgdesc="A C++/Qt client library for gpodder.net"
+url="http://wiki.gpodder.org/wiki/Libmygpo-qt"
+arch="all"
+license="LGPL-2.1-or-later"
+makedepends="cmake doxygen graphviz qt5-qtbase-dev"
+subpackages="$pkgname-dev"
+source="libmygpo-qt-$pkgver.tar.gz::https://github.com/gpodder/libmygpo-qt/archive/refs/tags/$pkgver.tar.gz
+ libmygpo-qt5.11a.patch::https://github.com/gpodder/libmygpo-qt/commit/0d76d960.patch
+ libmygpo-qt5.11b.patch::https://github.com/gpodder/libmygpo-qt/commit/1b53767b.patch
+ fix-tests.patch
+ "
+
+build() {
+ if [ "$CBUILD" != "$CHOST" ]; then
+ CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
+ fi
+ cmake -B build \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DBUILD_SHARED_LIBS=True \
+ -DCMAKE_BUILD_TYPE=None \
+ -DMYGPO_BUILD_TESTS=ON \
+ -DBUILD_WITH_QT4=OFF \
+ $CMAKE_CROSSOPTS .
+
+ cmake --build build
+}
+
+check() {
+ cd build
+ CTEST_OUTPUT_ON_FAILURE=TRUE ctest
+}
+
+package() {
+ DESTDIR="$pkgdir" cmake --install build
+}
+
+sha512sums="
+a24243a98b8e3544127b09e5c678d692e11ad0ad7ee8427e71b0d7cfd9455d068e4445bcd4d8d5ba94d8c0ef1b8f42390b544585ef258b5ec175546ee7bcd86a libmygpo-qt-1.1.0.tar.gz
+babf6aa9d6fbe27e92d5969815e7f39ec974ade234d5ddab407df73e2e9fe0331f9119a0aea2adb462a95a3a44acd675aee1e375b745ce5c6d728d1356ebbb1b libmygpo-qt5.11a.patch
+6306dc12a8eb2baafedad73289cbb545927d0711ca2441fcd0270b1731451e26732c9f3d855962bdb4882e27c41817fc013cf1492b629dbd8a702a143d6e7cbb libmygpo-qt5.11b.patch
+dbbb5d44c2e1744c9e7425348187ff2d57bd1532d64094ed3d17f9d569c1c31a7dc43ff84d49d35ce8c22210412cf8657286396a020ab32723a4574f8d7c68de fix-tests.patch
+"
diff --git a/testing/libmygpo-qt/fix-tests.patch b/testing/libmygpo-qt/fix-tests.patch
new file mode 100644
index 0000000000..edfb5a54ad
--- /dev/null
+++ b/testing/libmygpo-qt/fix-tests.patch
@@ -0,0 +1,21 @@
+Patch tests
+---
+ tests/JsonCreatorTest.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/JsonCreatorTest.cpp b/tests/JsonCreatorTest.cpp
+index feb03d5..9042cac 100644
+--- a/tests/JsonCreatorTest.cpp
++++ b/tests/JsonCreatorTest.cpp
+@@ -100,7 +100,7 @@ void JsonCreatorTest::testSaveSettingsToJSON()
+
+ output = JsonCreator::saveSettingsToJSON(set, remove);
+ QString outString2 = QString::fromLatin1( output ).replace( QLatin1String(" "), QLatin1String("") );
+- QString expected2( QLatin1String( "{\"remove\":[\"setting1\",\"setting2\"],\"set\":{\"setting4\":\"stringvalue\",\"setting5\":\"1998-01-01T00:01:02\",\"setting6\":4}}" ) );
++ QString expected2( QLatin1String( "{\"remove\":[\"setting1\",\"setting2\"],\"set\":{\"setting4\":\"stringvalue\",\"setting5\":\"1998-01-01T00:01:02.000\",\"setting6\":4}}" ) );
+
+ QCOMPARE( outString2, expected2 );
+
+--
+2.32.0
+
diff --git a/testing/libqalculate/APKBUILD b/testing/libqalculate/APKBUILD
index 3a9a386ec0..3477c2949b 100644
--- a/testing/libqalculate/APKBUILD
+++ b/testing/libqalculate/APKBUILD
@@ -1,7 +1,8 @@
# Contributor: Sodface <sod@sodface.com>
# Maintainer: Sodface <sod@sodface.com>
pkgname=libqalculate
-pkgver=3.21.0
+# the pkgver must be kept in sync with: qalculate-gtk
+pkgver=3.22.0
pkgrel=0
pkgdesc="Library implementing a multi-purpose desktop calculator"
url="https://qalculate.github.io/"
@@ -9,7 +10,9 @@ license="GPL-2.0-or-later"
arch="all"
makedepends="curl-dev gettext-dev gmp-dev gnu-libiconv-dev icu-dev intltool libxml2-dev mpfr-dev readline-dev"
subpackages="$pkgname-dev $pkgname-lang qalc qalc-doc"
-source="https://github.com/Qalculate/libqalculate/releases/download/v$pkgver/libqalculate-$pkgver.tar.gz"
+source="https://github.com/Qalculate/libqalculate/releases/download/v$pkgver/libqalculate-$pkgver.tar.gz
+ libqalculate.pc.in.patch
+ "
options="!check" # no test suite
build() {
@@ -36,5 +39,6 @@ doc() {
}
sha512sums="
-7ca876ffe359ab2c6c6ae266007f489f9cd26f6650d6ace4e1d80cc660d16294cce601ed81046baca25cc4ec41668498af0a555fddc47c4118241e72af039614 libqalculate-3.21.0.tar.gz
+2fc7e9e2edda0dfa221865050068eead29f9fecfef8eb8817bacc7493ed03215c60931b40e69165f565fc0574e370131ebebd9b247fedafc5821aae35b71dac9 libqalculate-3.22.0.tar.gz
+a91b8d7cb0cc4b18d3a7abed7b796e49eeed42f5726cd6bb59f12004993959b61988a9b52d9f6a9e6e7a666ca02a0efc94f721e4d5236a782d9f926989102c37 libqalculate.pc.in.patch
"
diff --git a/testing/libqalculate/libqalculate.pc.in.patch b/testing/libqalculate/libqalculate.pc.in.patch
new file mode 100644
index 0000000000..9936eb868e
--- /dev/null
+++ b/testing/libqalculate/libqalculate.pc.in.patch
@@ -0,0 +1,9 @@
+--- a/libqalculate.pc.in 2021-10-09 05:03:47.712401038 +0200
++++ b/libqalculate.pc.in 2021-10-09 05:06:54.039307183 +0200
+@@ -8,5 +8,6 @@
+ Version: @VERSION@
+ Libs.private: @LIBCURL_LIBS@ @ICU_LIBS@ @LTLIBINTL@ @LTLIBICONV@ -lmpfr -lgmp -lpthread
+ Required.private: libxml-2.0 >= 2.3.8
++Requires.private: gmp mpfr
+ Libs: -L${libdir} -lqalculate
+ Cflags: @LIBCURL_CFLAGS@ @ICU_CFLAGS@ -I${includedir}
diff --git a/testing/libqtxdg/APKBUILD b/testing/libqtxdg/APKBUILD
index 853fb3358b..6bc560d185 100644
--- a/testing/libqtxdg/APKBUILD
+++ b/testing/libqtxdg/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Antoni Aloy <aaloytorrens@gmail.com>
pkgname=libqtxdg
-pkgver=3.7.1
+pkgver=3.8.0
pkgrel=0
pkgdesc="Qt implementation of freedesktop.org xdg specifications"
url="https://github.com/lxqt/libqtxdg"
@@ -11,8 +11,8 @@ makedepends="
cmake lxqt-build-tools qt5-qtbase-dev
qt5-qtsvg-dev glib-dev
"
+checkdepends="xvfb-run"
subpackages="$pkgname-dev"
-options="!check" # No testsuite
source="https://github.com/lxqt/libqtxdg/releases/download/$pkgver/libqtxdg-$pkgver.tar.xz"
build() {
@@ -24,11 +24,16 @@ build() {
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
-DBUILD_SHARED_LIBS=True \
+ -DBUILD_TESTS=Yes \
$CMAKE_CROSSOPTS .
cmake --build build
}
+check() {
+ CTEST_OUTPUT_ON_FAILURE=TRUE xvfb-run cmake --build build --target test
+}
+
package() {
DESTDIR="$pkgdir" cmake --build build --target install
@@ -37,5 +42,5 @@ package() {
}
sha512sums="
-764fb953c5c5564a8f5e189f3fa867b82e1da215e0734d2fb995bb29ba163936a38cf68c6c812ff3c183b7ab4fce59d1189c68885b65f103accb5446e71682e7 libqtxdg-3.7.1.tar.xz
+e9e8d163fe1a60a2d03787ec3feef6ff6e89dfea4df7c0c7b3a72784992baf49ffeb352894d3cb8747ec0cd49576562f7dae3abbde932d13374f51bc77f14ea1 libqtxdg-3.8.0.tar.xz
"
diff --git a/testing/librem-ec/AKMBUILD b/testing/librem-ec/AKMBUILD
deleted file mode 100644
index 91cd633eb4..0000000000
--- a/testing/librem-ec/AKMBUILD
+++ /dev/null
@@ -1,8 +0,0 @@
-modname=librem-ec-acpi
-modver=0.91
-built_modules='librem_ec_acpi.ko'
-
-build() {
- touch "$builddir"/Makefile
- make $MAKEFLAGS -C "$kernel_srcdir" M="$builddir" src="$srcdir" modules
-}
diff --git a/testing/librem-ec/APKBUILD b/testing/librem-ec/APKBUILD
deleted file mode 100644
index 08c836c077..0000000000
--- a/testing/librem-ec/APKBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# Contributor: Clayton Craft <clayton@craftyguy.net>
-# Maintainer: Clayton Craft <clayton@craftyguy.net>
-pkgname=librem-ec
-pkgver=0.9.1
-pkgrel=0
-pkgdesc="Librem laptop EC kernel module, with AKMS"
-url="https://source.puri.sm/nicole.faerber/librem-ec-acpi-dkms.git"
-arch="noarch"
-license="GPL-2.0-only"
-depends="akms"
-source="https://source.puri.sm/nicole.faerber/librem-ec-acpi-dkms/-/archive/v$pkgver/librem-ec-acpi-dkms-v$pkgver.tar.gz
- AKMBUILD"
-options="!check" # no tests
-builddir="$srcdir/librem-ec-acpi-dkms-v$pkgver"
-
-package() {
- install -Dm644 "$srcdir/AKMBUILD" "$pkgdir/usr/src/librem-ec/AKMBUILD"
- install -Dm644 "$builddir"/Makefile "$pkgdir/usr/src/librem-ec/Makefile"
- install -Dm644 "$builddir"/*.c "$pkgdir/usr/src/librem-ec/"
-
- install -Dm644 "$builddir"/LICENSE \
- "$pkgdir/usr/share/licenses/librem-ec/LICENSE"
-}
-
-sha512sums="
-93ee26917eddbef9aa9c0eb83007452ebf57c279f41c3061ee52756bb1f748c72935067b19c3417ed7b8a9795990b0f060241c0b7f2348d7f8ec01e9f88dcd3c librem-ec-acpi-dkms-v0.9.1.tar.gz
-ad3a7b3493e72b850092d540e57d541ba1fdf5f72f101fabc22e6790515ddfb95cdb3e7efa81fcdeffb2c0f0ecf412d28f509681ebd260aeeab22ee2b99cf32f AKMBUILD
-"
diff --git a/testing/librespot/APKBUILD b/testing/librespot/APKBUILD
index 3b2e304bed..8987d02042 100644
--- a/testing/librespot/APKBUILD
+++ b/testing/librespot/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Carlo Landmeter <clandmeter@gmail.com>
# Maintainer: Michael Ekstrand <md@ekstrandom.net>
pkgname=librespot
-pkgver=0.3.0
+pkgver=0.3.1
pkgrel=0
pkgdesc="Open Source Spotify client library"
url="https://github.com/librespot-org/librespot"
@@ -32,7 +32,7 @@ package() {
}
sha512sums="
-2a9e810f8a01df17f7cfdc09dd73500f1a961c8b61d00f1b11e26d4b12efbc0f35ba2cd82df1a694fbd85fa0a0940e8d49963e1cbed23528f68a4542f8171e07 librespot-0.3.0.tar.gz
+1c14a096d4c0e6c7a8f0decbb1be125d687b491c981c4a802f68b4d2d4a6293d6bb23605237c0952d7af65dd9490a326921d304b9858cf2efd8cdcb0d5edaea6 librespot-0.3.1.tar.gz
c48ea30e2bd076691a2f1e0e3f6c6329921a8cf25e4f39ca82e07aca5a1c2c519007f081f2b6bbd1566086407a52dce787450b840e8a07e3010227cefda0452a librespot.initd
4286a3d1cc9678af2f43074c30a0ab7a9f686301468a0fd435d37a62773f0d1501b7201851bef4237324a83361ad93531ceb512a42ee0a63d4d14677760f5ec5 librespot.confd
"
diff --git a/testing/libsixel/APKBUILD b/testing/libsixel/APKBUILD
index 0a87772f93..3fe145f211 100644
--- a/testing/libsixel/APKBUILD
+++ b/testing/libsixel/APKBUILD
@@ -1,39 +1,33 @@
-# Maintainer: Dmitry Kruchko <corg@disroot.org>
+# Contributor: Maxim Karasev <begs@disroot.org>
+# Contributor: Dmitry Kruchko <corg@disroot.org>
+# Maintainer: Maxim Karasev <begs@disroot.org>
pkgname=libsixel
-pkgver=1.8.6
-pkgrel=0
+_commit=bc93c8ce570b35b8f3bb429ea5892ac260e4c8b1
+pkgver=1.10.3_git20211017
+pkgrel=1
pkgdesc="SIXEL encoder/decoder implementation"
-url="https://github.com/saitoha/libsixel"
+url="https://github.com/libsixel/libsixel"
arch="all"
license="MIT"
-makedepends="libpng-dev automake autoconf libjpeg-turbo-dev zlib-dev libtool"
+makedepends="meson libpng-dev libjpeg-turbo-dev zlib-dev libtool"
subpackages="
$pkgname-dev
$pkgname-doc
$pkgname-bash-completion
$pkgname-zsh-completion
"
-source="https://github.com/saitoha/libsixel/releases/download/v1.8.6/libsixel-$pkgver.tar.gz"
-builddir="$srcdir/sixel-$pkgver"
-
-
-prepare() {
- default_prepare
- autoreconf -fi
-}
+source="https://github.com/libsixel/libsixel/archive/$_commit.tar.gz"
+builddir="$srcdir/libsixel-$_commit"
build() {
- ./configure \
- --build=$CBUILD \
- --host=$CHOST \
- --prefix=/usr
- make
+ abuild-meson . output
+ meson compile -C output
}
package() {
- make DESTDIR="$pkgdir" install
+ DESTDIR="$pkgdir" meson install --no-rebuild -C output
}
sha512sums="
-e5bbfe920f37a0938077ca45960bee2d0d5650ecd23d166186e1246de9fe0805c687e4742d6a6c11a7d97447e49541da9bd0ed22ab8fe7be57566ae8525f1514 libsixel-1.8.6.tar.gz
+d7ea52073a9e3015922f44f887d7f6f693d9271b2e2c8ab88823adb31b1591282b6e65343d26820fe6d4c049143fde6871a2c818c8aefc6b621616e05ac92826 bc93c8ce570b35b8f3bb429ea5892ac260e4c8b1.tar.gz
"
diff --git a/testing/libspng/APKBUILD b/testing/libspng/APKBUILD
new file mode 100644
index 0000000000..03eaa3be7c
--- /dev/null
+++ b/testing/libspng/APKBUILD
@@ -0,0 +1,29 @@
+# Contributor: Alex Yam <alex@alexyam.com>
+# Maintainer: Alex Yam <alex@alexyam.com>
+pkgname=libspng
+pkgver=0.7.1
+pkgrel=0
+pkgdesc="modern alternative to libpng"
+url="https://github.com/randy408/libspng"
+arch="all"
+license="BSD-2-Clause"
+makedepends="meson zlib-dev"
+subpackages="$pkgname-dev"
+source="$pkgname-$pkgver.tar.gz::https://github.com/randy408/libspng/archive/refs/tags/v$pkgver.tar.gz"
+
+build() {
+ abuild-meson \
+ -Ddefault_library=both \
+ . output
+ meson compile ${JOBS:+-j ${JOBS}} -C output
+}
+
+check() {
+ meson test --no-rebuild -v -C output
+}
+
+package() {
+ DESTDIR="$pkgdir" meson install --no-rebuild -C output
+}
+
+sha512sums="4466919dbe33bbbb22ec8cb54eec920191d7cfd2b699769ff9b62fb8f0daf8b9bad15aacd5cb11ac92221dff3b10171d2ee62acb09868ad99b48f88cca74bc2f libspng-0.7.1.tar.gz"
diff --git a/testing/libstrophe/APKBUILD b/testing/libstrophe/APKBUILD
index 5eb0eb0b7a..54b3fa6a1a 100644
--- a/testing/libstrophe/APKBUILD
+++ b/testing/libstrophe/APKBUILD
@@ -1,11 +1,11 @@
# Maintainer: j.r <j.r@jugendhacker.de>
pkgname=libstrophe
-pkgver=0.10.1
+pkgver=0.11.0
pkgrel=0
pkgdesc="Simple, lightweight C library for writing XMPP clients"
url="https://strophe.im/libstrophe/"
arch="all"
-license="GPL-3.0-or-later MIT"
+license="GPL-3.0-only MIT"
makedepends="expat-dev openssl-dev"
subpackages="$pkgname-dev"
source="https://github.com/strophe/libstrophe/releases/download/$pkgver/libstrophe-$pkgver.tar.gz"
@@ -30,5 +30,5 @@ package() {
}
sha512sums="
-1ee3cb76cdc76711b4928d69fb8add974ab8359b729ec12003d73530c93492f4e8d208cacbd50f8db7509bc01f56a9f945348bc3a6fdd18a7080b751fff8a783 libstrophe-0.10.1.tar.gz
+e4b0d4a80e0ab5ada451ce55e44ec9247d4df5280ebe6453e49450aa7fa371461eb42fc9f39a0df12637146c6ce4202a1f770378686777228790c0213941d9ea libstrophe-0.11.0.tar.gz
"
diff --git a/testing/libsysstat/APKBUILD b/testing/libsysstat/APKBUILD
index 460f34579f..da4b8c5030 100644
--- a/testing/libsysstat/APKBUILD
+++ b/testing/libsysstat/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Antoni Aloy <aaloytorrens@gmail.com>
pkgname=libsysstat
-pkgver=0.4.5
+pkgver=0.4.6
pkgrel=0
pkgdesc="Library used to query system info and statistics"
url="https://github.com/lxqt/libsysstat"
@@ -29,5 +29,5 @@ package() {
}
sha512sums="
-1b9091b783e32aeb258bef0e7ea070456f577a42fc5052ebf215dccb195f51c34ae7c2e6178e4eaf12200c5155c53699c2dbfe2a1f7c0c35d06c04275455ed09 libsysstat-0.4.5.tar.xz
+dd0e6f67509658691082b043e06589c6a89eea016a0e68cdb7d377f25a0bc63aa476b5eb90f230593daab462a9e22f6f636c0723110fb36faeea7c0aa6d0b85b libsysstat-0.4.6.tar.xz
"
diff --git a/testing/libtommath/APKBUILD b/testing/libtommath/APKBUILD
index dd13f8b118..1bf191ae19 100644
--- a/testing/libtommath/APKBUILD
+++ b/testing/libtommath/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Alex Yam <alex@alexyam.com>
# Maintainer: Alex Yam <alex@alexyam.com>
pkgname=libtommath
-pkgver=0_git20210103
-_commit=eda0bd6ae5705ab90b866dfb52c5f15c23687f81
+pkgver=0_git20210921
+_gitrev=8355b88db088e41d6f7e19a8d58d46c9ed0333d3
pkgrel=0
pkgdesc="number theoretic multiple-precision integer library"
url="https://www.libtom.net/LibTomMath/"
@@ -14,8 +14,8 @@ license="Unlicense"
makedepends="libtool"
checkdepends="coreutils" # Using BusyBox's "timeout" resulted in - unrecognized option: foreground
subpackages="$pkgname-dev"
-source="$pkgname-$_commit.tar.gz::https://github.com/libtom/libtommath/archive/$_commit.tar.gz"
-builddir=$srcdir/$pkgname-$_commit
+source="$pkgname-$_gitrev.tar.gz::https://github.com/libtom/libtommath/archive/$_gitrev.tar.gz"
+builddir=$srcdir/$pkgname-$_gitrev
build() {
make -f makefile.shared
@@ -36,4 +36,6 @@ package() {
make DESTDIR="$pkgdir" LIBPATH=/usr/lib INCPATH=/usr/include -f makefile.shared install
}
-sha512sums="f5307463d7b9854c9867a58ca07941eba6108a04e29cb750ef156c7950798bf5cbab199c6d1f549b8d4fd6e8ba95b4581b10883ef7b4a3b00d57819600b521e4 libtommath-eda0bd6ae5705ab90b866dfb52c5f15c23687f81.tar.gz"
+sha512sums="
+5f763bf0d38e8a6bab741dc3100894baece89eccbf5c76f78bc144a2a2499486bde552f5c9817722563717cc12e86e55cd69ef977f8d9f48d72893663f811914 libtommath-8355b88db088e41d6f7e19a8d58d46c9ed0333d3.tar.gz
+"
diff --git a/testing/libtpms/APKBUILD b/testing/libtpms/APKBUILD
new file mode 100644
index 0000000000..3d50ea596d
--- /dev/null
+++ b/testing/libtpms/APKBUILD
@@ -0,0 +1,40 @@
+# Contributor: Jonas <3426-spameier@users.gitlab.alpinelinux.org>
+# Maintainer: Jonas <3426-spameier@users.gitlab.alpinelinux.org>
+pkgname=libtpms
+pkgver=0.9.1
+pkgrel=0
+pkgdesc="library providing software emulation of a Trusted Platform Module (TPM 1.2 and TPM 2.0)"
+url="https://github.com/stefanberger/libtpms"
+arch="aarch64 armhf x86 x86_64"
+license="BSD-3-Clause"
+makedepends="autoconf automake build-base gawk libtool make openssl-dev"
+subpackages="$pkgname-dev $pkgname-doc"
+source="$pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz"
+
+prepare() {
+ default_prepare
+ NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+ ./configure \
+ --build=$CBUILD \
+ --host=$CHOST \
+ --prefix=/usr \
+ --libdir=/usr/lib \
+ --with-tpm2 \
+ --with-openssl
+ make
+}
+
+check() {
+ make check
+}
+
+package() {
+ make DESTDIR="$pkgdir" install
+}
+
+sha512sums="
+15ae14bca4ac24391ba06accae37d7e914e410ac9dc1aeae0743295371c9a0e0851f191c55bffb765cb731e8d397188be6441d2b6c1f5011b56a354428c4dad1 libtpms-0.9.1.tar.gz
+"
diff --git a/testing/libzim/APKBUILD b/testing/libzim/APKBUILD
index 0890fd2fe2..8b5ad2943e 100644
--- a/testing/libzim/APKBUILD
+++ b/testing/libzim/APKBUILD
@@ -1,13 +1,12 @@
# Contributor: Oleg Titov <oleg.titov@gmail.com>
# Maintainer: Oleg Titov <oleg.titov@gmail.com>
pkgname=libzim
-pkgver=7.0.0
-pkgrel=0
+pkgver=6.3.0
+pkgrel=2
pkgdesc="Reference implementation of the ZIM file format"
url="https://openzim.org/"
arch="all !mips !mips64" # tests crash
license="GPL-2.0-or-later"
-options="!check" # requieres external test data files
makedepends="
icu-dev
libexecinfo-dev
@@ -41,6 +40,4 @@ package() {
install -Dm 644 -t "$pkgdir/usr/share/doc/$pkgname/" README.md
}
-sha512sums="
-fc2932e05140c6a89a716bc6cbf285af326d9a3367aa60cd6fc95cbc5e46aacf7a5b90c673728bf01d82b45a5f6011f2fbc9c2d10623f31491c847842593c233 libzim-7.0.0.tar.gz
-"
+sha512sums="822e293bb1dc376256063326951571b705e5735132a137f5966d0f6ed0bb8c8289765680503b449c271ffce7e771da1f304d9ab9455cfc968a2d9943a5955090 libzim-6.3.0.tar.gz"
diff --git a/testing/liferea/APKBUILD b/testing/liferea/APKBUILD
new file mode 100644
index 0000000000..73e591ec83
--- /dev/null
+++ b/testing/liferea/APKBUILD
@@ -0,0 +1,55 @@
+# Contributor: Erwan Rouchet <lucidiot@brainshit.fr>
+# Maintainer: Erwan Rouchet <lucidiot@brainshit.fr>
+pkgname=liferea
+pkgver=1.13.6
+pkgrel=0
+pkgdesc="Desktop news aggregator for online news feeds and weblogs"
+arch="all !riscv64 !mips64" # webkit2gtk, libpeas
+url="https://lzone.de/liferea"
+license="GPL-2.0-or-later"
+depends="py3-gobject3"
+makedepends="
+ glib-dev
+ intltool
+ gobject-introspection-dev
+ libxml2-dev
+ libxslt-dev
+ sqlite-dev
+ gtk+3.0-dev
+ pango-dev
+ webkit2gtk-dev
+ json-glib-dev
+ gsettings-desktop-schemas-dev
+ libpeas-dev
+ "
+source="https://github.com/lwindolf/liferea/releases/download/v$pkgver/liferea-$pkgver.tar.bz2"
+subpackages="$pkgname-doc $pkgname-lang"
+
+build() {
+ ./configure \
+ --build=$CBUILD \
+ --host=$CHOST \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --disable-schemas-compile
+ make
+}
+
+check() {
+ make check
+}
+
+package() {
+ make DESTDIR="$pkgdir" install
+}
+
+doc() {
+ default_doc
+ mkdir -p "$subpkgdir/usr/share/liferea"
+ mv "$pkgdir/usr/share/liferea/doc" "$subpkgdir/usr/share/liferea/"
+}
+
+sha512sums="
+9fb6b3f2c7afe3f41575e2d15e5fc5898f656088b56ff10a6b6d9716cca1ffaf78f0a74c6025a58a5b71b43e1d986c1d40880f9a8ec7497abe1107b03f258a3d liferea-1.13.6.tar.bz2
+"
diff --git a/testing/linux-elm/APKBUILD b/testing/linux-elm/APKBUILD
index f8e2ccc802..864a410641 100644
--- a/testing/linux-elm/APKBUILD
+++ b/testing/linux-elm/APKBUILD
@@ -4,7 +4,7 @@ _flavor=elm
pkgname=linux-${_flavor}
# NOTE: this kernel is intended for testing
# please resist urge to upgrade it blindly
-pkgver=5.13.12
+pkgver=5.15.5
case $pkgver in
*.*.*) _kernver=${pkgver%.*};;
*.*) _kernver=$pkgver;;
@@ -12,15 +12,14 @@ esac
pkgrel=0
pkgdesc="Linux latest stable kernel for elm chromebooks"
url="https://www.kernel.org"
-#depends="mkinitfs linux-firmware-any"
-_depends_dev="perl gmp-dev elfutils-dev bash flex bison"
-makedepends="$_depends_dev sed installkernel bc linux-headers linux-firmware-any openssl-dev
- diffutils findutils vboot-utils u-boot-tools dtc"
-options="!strip"
+_depends_dev="perl gmp-dev bash flex bison"
+makedepends="$_depends_dev sed installkernel bc linux-headers linux-firmware-any
+ openssl1.1-compat-dev diffutils findutils vboot-utils u-boot-tools dtc"
+options="!strip !check"
_config=${config:-config-elm.${CARCH}}
install=
-subpackages="$pkgname-dev:_dev:$CBUILD_ARCH"
+#subpackages="$pkgname-dev:_dev:$CBUILD_ARCH"
source="https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/linux-$_kernver.tar.xz"
case $pkgver in
*.*.0) source="$source";;
@@ -31,9 +30,9 @@ esac
source="$source
config-elm.aarch64
kernel.its.elm
- fix-mmc1-speed.patch
- fix-spi-nor-max-frequency.patch
fix-mmc-order.patch
+ mt8173-fix-mmc1-speed.patch
+ mt8173-higher-temps.patch
"
arch="aarch64"
@@ -234,11 +233,11 @@ _dev() {
}
sha512sums="
-a8edf97e9d38a49f1be2bde1e29ad96274bb2c6f7e8a2bebaa1161dd4df9cabcbaec4ff644c45bee94f86ae47725087d6deed0cd954209cec717621d137db85e linux-5.13.tar.xz
-1d889088c44ee620adebc51fc1606813dc3bee38c8c6a5a94dcba7de3e6276b05081ca85e5d6e91433fa7789c7cd5e0bb1fbf0b7a85e96ff76fe43adecd8bf74 patch-5.13.12.xz
-562145e37d92931165cb6a92fa926dfb5b5a87efb3700c2a9a1f9b23ad55c076d2226716dbac85cfad9ebdc0278fbb3f9d17772aac803b5ba4f574b6dee66284 config-elm.aarch64
+d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a linux-5.15.tar.xz
+995d19fc4a98844ffcc3d6cfaabedc2151efecac2904a7a12befa98a2ff0c6adcfbc3916496cc2a139ddeddcd74bd49995501e53f2b906a8c2c390d4a6e26b80 patch-5.15.5.xz
+f1ded89855fc3487cb29fa259fdf8234281ce3ae68d6df2caeba8d910f258775d550a06a61bf70a2a2deca1ec9a9d3a9cf763454560f8ea8fdfcd0ee8d0981f1 config-elm.aarch64
112af92af4a3f61867ffc20076d057845aa8c9139e58153d0c88f4d7185d9a9628fa79d4edfa8855f095fb70d257bfbd7c4573a7431d4b17706415b411a50775 kernel.its.elm
-65c57a6d9a5bd5b6ec8798d1c46091bb72377ed1349b66e9a0a1a50ffa077f044f2bfdd30eab974c9c9774fc62d8dd5020a38432d108fce7f4fc1ed6648ea703 fix-mmc1-speed.patch
-9e17fb96b81590da0f9b0917ddd2b9d195bab5cde2a4e7feb19991c50a8ac8e4502445715153ced8666e5b6575137c1d49899bb0ae9ab4505ed8f1ff7e569269 fix-spi-nor-max-frequency.patch
00e7afdab1dc89a6e0426829685d85cebb98fb95cb13a253d01326fd22f78ddf792bbe3b5be4c9bc93784f1fa93f87f604a4b6c6710660319db6f2e35dd09835 fix-mmc-order.patch
+da4e235b06173df3f37abd9a4f040befe5273ac21091ba321992d83f1ef3f806cc1e2329b2d3086dd9b78f7b7d622c45f92df37fd9b337aa58dc4d165752a4c3 mt8173-fix-mmc1-speed.patch
+a0adfc599111814e2dfce5aff7c7212af7f68b7339597f553176efc25e6590281cad6bb08cc654e47eb56c84ecb71f7bc5af0ec776d883d46392869ff2cd08d2 mt8173-higher-temps.patch
"
diff --git a/testing/linux-elm/config-elm.aarch64 b/testing/linux-elm/config-elm.aarch64
index 72b1e35ed6..f401482e39 100644
--- a/testing/linux-elm/config-elm.aarch64
+++ b/testing/linux-elm/config-elm.aarch64
@@ -1,20 +1,21 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.13.12 Kernel Configuration
+# Linux/arm64 5.15.5 Kernel Configuration
#
-CONFIG_CC_VERSION_TEXT="gcc (Alpine 10.3.1_git20210625) 10.3.1 20210625"
+CONFIG_CC_VERSION_TEXT="gcc (Alpine 10.3.1_git20211027) 10.3.1 20211027"
CONFIG_CC_IS_GCC=y
CONFIG_GCC_VERSION=100301
CONFIG_CLANG_VERSION=0
CONFIG_AS_IS_GNU=y
-CONFIG_AS_VERSION=23502
+CONFIG_AS_VERSION=23700
CONFIG_LD_IS_BFD=y
-CONFIG_LD_VERSION=23502
+CONFIG_LD_VERSION=23700
CONFIG_LLD_VERSION=0
CONFIG_CC_CAN_LINK=y
CONFIG_CC_CAN_LINK_STATIC=y
CONFIG_CC_HAS_ASM_GOTO=y
CONFIG_CC_HAS_ASM_INLINE=y
+CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
CONFIG_IRQ_WORK=y
CONFIG_BUILDTIME_TABLE_SORT=y
CONFIG_THREAD_INFO_IN_TASK=y
@@ -24,6 +25,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
#
CONFIG_INIT_ENV_ARG_LIMIT=32
# CONFIG_COMPILE_TEST is not set
+# CONFIG_WERROR is not set
CONFIG_LOCALVERSION=""
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_BUILD_SALT=""
@@ -93,6 +95,7 @@ CONFIG_ARCH_WANT_DEFAULT_BPF_JIT=y
CONFIG_PREEMPT=y
CONFIG_PREEMPT_COUNT=y
CONFIG_PREEMPTION=y
+# CONFIG_SCHED_CORE is not set
#
# CPU/Task time and stats accounting
@@ -188,7 +191,6 @@ CONFIG_SYSFS_SYSCALL=y
CONFIG_FHANDLE=y
CONFIG_POSIX_TIMERS=y
CONFIG_PRINTK=y
-CONFIG_PRINTK_NMI=y
CONFIG_BUG=y
CONFIG_ELF_CORE=y
CONFIG_BASE_FULL=y
@@ -247,14 +249,11 @@ CONFIG_NO_IOPORT_MAP=y
CONFIG_STACKTRACE_SUPPORT=y
CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
CONFIG_LOCKDEP_SUPPORT=y
-CONFIG_TRACE_IRQFLAGS_SUPPORT=y
CONFIG_GENERIC_BUG=y
CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
CONFIG_GENERIC_HWEIGHT=y
CONFIG_GENERIC_CSUM=y
CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_ZONE_DMA=y
-CONFIG_ZONE_DMA32=y
CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y
CONFIG_SMP=y
CONFIG_KERNEL_MODE_NEON=y
@@ -364,7 +363,6 @@ CONFIG_SCHED_SMT=y
CONFIG_NR_CPUS=8
CONFIG_HOTPLUG_CPU=y
# CONFIG_NUMA is not set
-CONFIG_HOLES_IN_ZONE=y
# CONFIG_HZ_100 is not set
# CONFIG_HZ_250 is not set
# CONFIG_HZ_300 is not set
@@ -416,6 +414,7 @@ CONFIG_ARM64_CNP=y
# ARMv8.3 architectural features
#
CONFIG_ARM64_PTR_AUTH=y
+CONFIG_ARM64_PTR_AUTH_KERNEL=y
CONFIG_CC_HAS_BRANCH_PROT_PAC_RET=y
CONFIG_CC_HAS_SIGN_RETURN_ADDRESS=y
CONFIG_AS_HAS_PAC=y
@@ -545,55 +544,13 @@ CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
#
# CONFIG_CPUFREQ_DT is not set
CONFIG_ACPI_CPPC_CPUFREQ=m
+CONFIG_ACPI_CPPC_CPUFREQ_FIE=y
CONFIG_ARM_MEDIATEK_CPUFREQ=y
+CONFIG_ARM_MEDIATEK_CPUFREQ_HW=m
CONFIG_ARM_SCMI_CPUFREQ=m
# end of CPU Frequency scaling
# end of CPU Power Management
-#
-# Firmware Drivers
-#
-CONFIG_ARM_SCMI_PROTOCOL=m
-CONFIG_ARM_SCMI_POWER_DOMAIN=m
-CONFIG_ARM_SCPI_PROTOCOL=m
-CONFIG_ARM_SCPI_POWER_DOMAIN=m
-CONFIG_ARM_SDE_INTERFACE=y
-CONFIG_DMIID=y
-CONFIG_DMI_SYSFS=m
-# CONFIG_ISCSI_IBFT is not set
-# CONFIG_GOOGLE_FIRMWARE is not set
-
-#
-# EFI (Extensible Firmware Interface) Support
-#
-CONFIG_EFI_ESRT=y
-CONFIG_EFI_VARS_PSTORE=m
-# CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set
-CONFIG_EFI_PARAMS_FROM_FDT=y
-CONFIG_EFI_RUNTIME_WRAPPERS=y
-CONFIG_EFI_GENERIC_STUB=y
-CONFIG_EFI_ARMSTUB_DTB_LOADER=y
-CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y
-CONFIG_EFI_BOOTLOADER_CONTROL=y
-# CONFIG_EFI_CAPSULE_LOADER is not set
-# CONFIG_EFI_TEST is not set
-# CONFIG_RESET_ATTACK_MITIGATION is not set
-# CONFIG_EFI_DISABLE_PCI_DMA is not set
-# end of EFI (Extensible Firmware Interface) Support
-
-# CONFIG_EFI_CUSTOM_SSDT_OVERLAYS is not set
-CONFIG_ARM_PSCI_FW=y
-# CONFIG_ARM_PSCI_CHECKER is not set
-CONFIG_HAVE_ARM_SMCCC=y
-CONFIG_HAVE_ARM_SMCCC_DISCOVERY=y
-CONFIG_ARM_SMCCC_SOC_ID=y
-
-#
-# Tegra firmware driver
-#
-# end of Tegra firmware driver
-# end of Firmware Drivers
-
CONFIG_ARCH_SUPPORTS_ACPI=y
CONFIG_ACPI=y
CONFIG_ACPI_GENERIC_GSI=y
@@ -626,6 +583,7 @@ CONFIG_ACPI_IORT=y
CONFIG_ACPI_GTDT=y
CONFIG_ACPI_PPTT=y
CONFIG_PMIC_OPREGION=y
+CONFIG_ACPI_VIOT=y
CONFIG_IRQ_BYPASS_MANAGER=y
CONFIG_VIRTUALIZATION=y
CONFIG_KVM=y
@@ -641,6 +599,8 @@ CONFIG_HAVE_KVM_ARCH_TLB_FLUSH_ALL=y
CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y
CONFIG_HAVE_KVM_IRQ_BYPASS=y
CONFIG_HAVE_KVM_VCPU_RUN_PID_CHANGE=y
+CONFIG_KVM_XFER_TO_GUEST_WORK=y
+# CONFIG_NVHE_EL2_DEBUG is not set
CONFIG_ARM64_CRYPTO=y
CONFIG_CRYPTO_SHA256_ARM64=m
CONFIG_CRYPTO_SHA512_ARM64=m
@@ -673,6 +633,7 @@ CONFIG_HAVE_KPROBES=y
CONFIG_HAVE_KRETPROBES=y
CONFIG_HAVE_FUNCTION_ERROR_INJECTION=y
CONFIG_HAVE_NMI=y
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
CONFIG_HAVE_ARCH_TRACEHOOK=y
CONFIG_HAVE_DMA_CONTIGUOUS=y
CONFIG_GENERIC_SMP_IDLE_THREAD=y
@@ -682,6 +643,7 @@ CONFIG_ARCH_HAS_KEEPINITRD=y
CONFIG_ARCH_HAS_SET_MEMORY=y
CONFIG_ARCH_HAS_SET_DIRECT_MAP=y
CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y
+CONFIG_ARCH_WANTS_NO_INSTR=y
CONFIG_HAVE_ASM_MODVERSIONS=y
CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
CONFIG_HAVE_RSEQ=y
@@ -767,7 +729,7 @@ CONFIG_MODULE_UNLOAD=y
# CONFIG_MODULE_SRCVERSION_ALL is not set
CONFIG_MODULE_SIG=y
# CONFIG_MODULE_SIG_FORCE is not set
-CONFIG_MODULE_SIG_ALL=y
+# CONFIG_MODULE_SIG_ALL is not set
CONFIG_MODULE_SIG_SHA1=y
# CONFIG_MODULE_SIG_SHA224 is not set
# CONFIG_MODULE_SIG_SHA256 is not set
@@ -782,18 +744,17 @@ CONFIG_MODULE_COMPRESS_NONE=y
CONFIG_MODPROBE_PATH="/sbin/modprobe"
CONFIG_MODULES_TREE_LOOKUP=y
CONFIG_BLOCK=y
-CONFIG_BLK_SCSI_REQUEST=y
CONFIG_BLK_CGROUP_RWSTAT=y
-CONFIG_BLK_DEV_BSG=y
+CONFIG_BLK_DEV_BSG_COMMON=y
# CONFIG_BLK_DEV_BSGLIB is not set
# CONFIG_BLK_DEV_INTEGRITY is not set
# CONFIG_BLK_DEV_ZONED is not set
# CONFIG_BLK_DEV_THROTTLING is not set
-# CONFIG_BLK_CMDLINE_PARSER is not set
CONFIG_BLK_WBT=y
+CONFIG_BLK_WBT_MQ=y
# CONFIG_BLK_CGROUP_IOLATENCY is not set
# CONFIG_BLK_CGROUP_IOCOST is not set
-CONFIG_BLK_WBT_MQ=y
+# CONFIG_BLK_CGROUP_IOPRIO is not set
# CONFIG_BLK_SED_OPAL is not set
# CONFIG_BLK_INLINE_ENCRYPTION is not set
@@ -826,6 +787,7 @@ CONFIG_EFI_PARTITION=y
CONFIG_BLOCK_COMPAT=y
CONFIG_BLK_MQ_VIRTIO=y
CONFIG_BLK_PM=y
+CONFIG_BLOCK_HOLDER_DEPRECATED=y
#
# IO Schedulers
@@ -924,6 +886,8 @@ CONFIG_GENERIC_EARLY_IOREMAP=y
# CONFIG_IDLE_PAGE_TRACKING is not set
CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
CONFIG_ARCH_HAS_PTE_DEVMAP=y
+CONFIG_ZONE_DMA=y
+CONFIG_ZONE_DMA32=y
CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y
# CONFIG_PERCPU_STATS is not set
@@ -931,6 +895,13 @@ CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y
# GUP_TEST needs to have DEBUG_FS enabled
#
CONFIG_ARCH_HAS_PTE_SPECIAL=y
+CONFIG_SECRETMEM=y
+
+#
+# Data Access Monitoring
+#
+# CONFIG_DAMON is not set
+# end of Data Access Monitoring
# end of Memory Management options
CONFIG_NET=y
@@ -947,6 +918,7 @@ CONFIG_PACKET=y
CONFIG_PACKET_DIAG=m
CONFIG_UNIX=y
CONFIG_UNIX_SCM=y
+CONFIG_AF_UNIX_OOB=y
CONFIG_UNIX_DIAG=m
CONFIG_TLS=m
# CONFIG_TLS_DEVICE is not set
@@ -1050,7 +1022,7 @@ CONFIG_IPV6_SEG6_LWTUNNEL=y
CONFIG_IPV6_SEG6_HMAC=y
CONFIG_IPV6_SEG6_BPF=y
# CONFIG_IPV6_RPL_LWTUNNEL is not set
-# CONFIG_NETLABEL is not set
+# CONFIG_IPV6_IOAM6_LWTUNNEL is not set
CONFIG_MPTCP=y
CONFIG_INET_MPTCP_DIAG=m
CONFIG_MPTCP_IPV6=y
@@ -1067,6 +1039,7 @@ CONFIG_NETFILTER_INGRESS=y
CONFIG_NETFILTER_NETLINK=m
CONFIG_NETFILTER_FAMILY_BRIDGE=y
CONFIG_NETFILTER_FAMILY_ARP=y
+# CONFIG_NETFILTER_NETLINK_HOOK is not set
CONFIG_NETFILTER_NETLINK_ACCT=m
CONFIG_NETFILTER_NETLINK_QUEUE=m
CONFIG_NETFILTER_NETLINK_LOG=m
@@ -1288,7 +1261,6 @@ CONFIG_IP_NF_TARGET_CLUSTERIP=m
CONFIG_IP_NF_TARGET_ECN=m
CONFIG_IP_NF_TARGET_TTL=m
CONFIG_IP_NF_RAW=m
-# CONFIG_IP_NF_SECURITY is not set
CONFIG_IP_NF_ARPTABLES=m
CONFIG_IP_NF_ARPFILTER=m
CONFIG_IP_NF_ARP_MANGLE=m
@@ -1324,7 +1296,6 @@ CONFIG_IP6_NF_TARGET_REJECT=m
CONFIG_IP6_NF_TARGET_SYNPROXY=m
CONFIG_IP6_NF_MANGLE=m
CONFIG_IP6_NF_RAW=m
-# CONFIG_IP6_NF_SECURITY is not set
CONFIG_IP6_NF_NAT=m
CONFIG_IP6_NF_TARGET_MASQUERADE=m
CONFIG_IP6_NF_TARGET_NPT=m
@@ -1589,6 +1560,7 @@ CONFIG_BT_MRVL_SDIO=m
# CONFIG_AF_RXRPC is not set
# CONFIG_AF_KCM is not set
CONFIG_STREAM_PARSER=y
+CONFIG_MCTP=m
CONFIG_FIB_RULES=y
CONFIG_WIRELESS=y
CONFIG_WIRELESS_EXT=y
@@ -1686,12 +1658,70 @@ CONFIG_GENERIC_ARCH_TOPOLOGY=y
#
# CONFIG_BRCMSTB_GISB_ARB is not set
# CONFIG_MOXTET is not set
-CONFIG_SIMPLE_PM_BUS=m
# CONFIG_VEXPRESS_CONFIG is not set
# CONFIG_MHI_BUS is not set
# end of Bus devices
CONFIG_CONNECTOR=m
+
+#
+# Firmware Drivers
+#
+
+#
+# ARM System Control and Management Interface Protocol
+#
+CONFIG_ARM_SCMI_PROTOCOL=m
+CONFIG_ARM_SCMI_HAVE_TRANSPORT=y
+CONFIG_ARM_SCMI_HAVE_SHMEM=y
+CONFIG_ARM_SCMI_TRANSPORT_MAILBOX=y
+CONFIG_ARM_SCMI_TRANSPORT_SMC=y
+# CONFIG_ARM_SCMI_TRANSPORT_VIRTIO is not set
+CONFIG_ARM_SCMI_POWER_DOMAIN=m
+# end of ARM System Control and Management Interface Protocol
+
+CONFIG_ARM_SCPI_PROTOCOL=m
+CONFIG_ARM_SCPI_POWER_DOMAIN=m
+CONFIG_ARM_SDE_INTERFACE=y
+CONFIG_DMIID=y
+CONFIG_DMI_SYSFS=m
+# CONFIG_ISCSI_IBFT is not set
+CONFIG_SYSFB=y
+CONFIG_SYSFB_SIMPLEFB=y
+# CONFIG_ARM_FFA_TRANSPORT is not set
+# CONFIG_GOOGLE_FIRMWARE is not set
+
+#
+# EFI (Extensible Firmware Interface) Support
+#
+CONFIG_EFI_ESRT=y
+CONFIG_EFI_VARS_PSTORE=m
+# CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set
+CONFIG_EFI_PARAMS_FROM_FDT=y
+CONFIG_EFI_RUNTIME_WRAPPERS=y
+CONFIG_EFI_GENERIC_STUB=y
+CONFIG_EFI_ARMSTUB_DTB_LOADER=y
+CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y
+CONFIG_EFI_BOOTLOADER_CONTROL=y
+# CONFIG_EFI_CAPSULE_LOADER is not set
+# CONFIG_EFI_TEST is not set
+# CONFIG_RESET_ATTACK_MITIGATION is not set
+# CONFIG_EFI_DISABLE_PCI_DMA is not set
+# end of EFI (Extensible Firmware Interface) Support
+
+# CONFIG_EFI_CUSTOM_SSDT_OVERLAYS is not set
+CONFIG_ARM_PSCI_FW=y
+# CONFIG_ARM_PSCI_CHECKER is not set
+CONFIG_HAVE_ARM_SMCCC=y
+CONFIG_HAVE_ARM_SMCCC_DISCOVERY=y
+CONFIG_ARM_SMCCC_SOC_ID=y
+
+#
+# Tegra firmware driver
+#
+# end of Tegra firmware driver
+# end of Firmware Drivers
+
# CONFIG_GNSS is not set
# CONFIG_MTD is not set
CONFIG_DTC=y
@@ -1750,6 +1780,7 @@ CONFIG_VIRTIO_BLK=m
# CONFIG_DUMMY_IRQ is not set
# CONFIG_ICS932S401 is not set
# CONFIG_ENCLOSURE_SERVICES is not set
+# CONFIG_HI6421V600_IRQ is not set
# CONFIG_APDS9802ALS is not set
# CONFIG_ISL29003 is not set
# CONFIG_ISL29020 is not set
@@ -1796,6 +1827,7 @@ CONFIG_EEPROM_93CX6=m
#
CONFIG_SCSI_MOD=y
# CONFIG_RAID_ATTRS is not set
+CONFIG_SCSI_COMMON=y
CONFIG_SCSI=y
CONFIG_SCSI_DMA=y
CONFIG_SCSI_PROC_FS=y
@@ -1807,6 +1839,7 @@ CONFIG_BLK_DEV_SD=y
# CONFIG_CHR_DEV_ST is not set
CONFIG_BLK_DEV_SR=m
# CONFIG_CHR_DEV_SG is not set
+CONFIG_BLK_DEV_BSG=y
# CONFIG_CHR_DEV_SCH is not set
# CONFIG_SCSI_CONSTANTS is not set
# CONFIG_SCSI_LOGGING is not set
@@ -1898,7 +1931,7 @@ CONFIG_FIXED_PHY=y
# CONFIG_AMD_PHY is not set
# CONFIG_ADIN_PHY is not set
# CONFIG_AQUANTIA_PHY is not set
-# CONFIG_AX88796B_PHY is not set
+CONFIG_AX88796B_PHY=m
# CONFIG_BROADCOM_PHY is not set
# CONFIG_BCM54140_PHY is not set
# CONFIG_BCM7XXX_PHY is not set
@@ -1914,10 +1947,13 @@ CONFIG_FIXED_PHY=y
# CONFIG_MARVELL_PHY is not set
# CONFIG_MARVELL_10G_PHY is not set
# CONFIG_MARVELL_88X2222_PHY is not set
+# CONFIG_MAXLINEAR_GPHY is not set
+# CONFIG_MEDIATEK_GE_PHY is not set
# CONFIG_MICREL_PHY is not set
CONFIG_MICROCHIP_PHY=m
# CONFIG_MICROCHIP_T1_PHY is not set
# CONFIG_MICROSEMI_PHY is not set
+# CONFIG_MOTORCOMM_PHY is not set
# CONFIG_NATIONAL_PHY is not set
# CONFIG_NXP_C45_TJA11XX_PHY is not set
# CONFIG_NXP_TJA11XX_PHY is not set
@@ -1937,9 +1973,15 @@ CONFIG_STE10XP=m
# CONFIG_VITESSE_PHY is not set
# CONFIG_XILINX_GMII2RGMII is not set
# CONFIG_MICREL_KS8995MA is not set
+
+#
+# MCTP Device Drivers
+#
CONFIG_MDIO_DEVICE=y
CONFIG_MDIO_BUS=y
+CONFIG_FWNODE_MDIO=y
CONFIG_OF_MDIO=y
+CONFIG_ACPI_MDIO=y
CONFIG_MDIO_DEVRES=y
# CONFIG_MDIO_BITBANG is not set
# CONFIG_MDIO_BCM_UNIMAC is not set
@@ -2068,7 +2110,6 @@ CONFIG_VIRT_WIFI=m
# CONFIG_FUJITSU_ES is not set
CONFIG_NET_FAILOVER=m
# CONFIG_ISDN is not set
-# CONFIG_NVM is not set
#
# Input device support
@@ -2165,6 +2206,7 @@ CONFIG_JOYSTICK_XPAD_FF=y
CONFIG_JOYSTICK_XPAD_LEDS=y
# CONFIG_JOYSTICK_PSXPAD_SPI is not set
# CONFIG_JOYSTICK_PXRC is not set
+# CONFIG_JOYSTICK_QWIIC is not set
# CONFIG_JOYSTICK_FSIA6B is not set
# CONFIG_INPUT_TABLET is not set
CONFIG_INPUT_TOUCHSCREEN=y
@@ -2375,15 +2417,14 @@ CONFIG_HW_RANDOM_VIRTIO=m
CONFIG_HW_RANDOM_MTK=m
# CONFIG_HW_RANDOM_CCTRNG is not set
# CONFIG_HW_RANDOM_XIPHERA is not set
+CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=m
CONFIG_DEVMEM=y
-CONFIG_RAW_DRIVER=m
-CONFIG_MAX_RAW_DEVS=256
# CONFIG_TCG_TPM is not set
# CONFIG_XILLYBUS is not set
-# end of Character devices
-
+# CONFIG_XILLYUSB is not set
# CONFIG_RANDOM_TRUST_CPU is not set
# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+# end of Character devices
#
# I2C support
@@ -2453,6 +2494,7 @@ CONFIG_I2C_TINY_USB=m
# Other I2C/SMBus bus drivers
#
CONFIG_I2C_CROS_EC_TUNNEL=y
+CONFIG_I2C_VIRTIO=m
# end of I2C Hardware Bus support
CONFIG_I2C_STUB=m
@@ -2512,6 +2554,7 @@ CONFIG_SPI_SLAVE_TIME=m
CONFIG_SPI_SLAVE_SYSTEM_CONTROL=m
CONFIG_SPI_DYNAMIC=y
CONFIG_SPMI=m
+# CONFIG_SPMI_HISI3670 is not set
# CONFIG_HSI is not set
CONFIG_PPS=m
# CONFIG_PPS_DEBUG is not set
@@ -2531,6 +2574,7 @@ CONFIG_PPS_CLIENT_GPIO=m
# PTP clock support
#
# CONFIG_PTP_1588_CLOCK is not set
+CONFIG_PTP_1588_CLOCK_OPTIONAL=y
#
# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
@@ -2576,6 +2620,7 @@ CONFIG_PINCTRL_MT8173=y
CONFIG_PINCTRL_MT8183=y
CONFIG_PINCTRL_MT8192=y
# CONFIG_PINCTRL_MT8195 is not set
+CONFIG_PINCTRL_MT8365=y
CONFIG_PINCTRL_MT8516=y
CONFIG_PINCTRL_MT6397=y
# end of MediaTek pinctrl drivers
@@ -2653,6 +2698,7 @@ CONFIG_GPIO_PALMAS=y
#
CONFIG_GPIO_AGGREGATOR=m
# CONFIG_GPIO_MOCKUP is not set
+CONFIG_GPIO_VIRTIO=m
# end of Virtual GPIO drivers
# CONFIG_W1 is not set
@@ -2694,6 +2740,7 @@ CONFIG_MANAGER_SBS=m
# CONFIG_CHARGER_LT3651 is not set
# CONFIG_CHARGER_LTC4162L is not set
# CONFIG_CHARGER_DETECTOR_MAX14656 is not set
+# CONFIG_CHARGER_MT6360 is not set
# CONFIG_CHARGER_BQ2415X is not set
# CONFIG_CHARGER_BQ24190 is not set
# CONFIG_CHARGER_BQ24257 is not set
@@ -2709,6 +2756,7 @@ CONFIG_MANAGER_SBS=m
# CONFIG_BATTERY_RT5033 is not set
# CONFIG_CHARGER_RT9455 is not set
CONFIG_CHARGER_CROS_USBPD=m
+CONFIG_CHARGER_CROS_PCHG=m
# CONFIG_CHARGER_UCS1002 is not set
# CONFIG_CHARGER_BD99954 is not set
CONFIG_HWMON=m
@@ -2734,6 +2782,7 @@ CONFIG_HWMON=m
# CONFIG_SENSORS_ADT7470 is not set
# CONFIG_SENSORS_ADT7475 is not set
# CONFIG_SENSORS_AHT10 is not set
+# CONFIG_SENSORS_AQUACOMPUTER_D5NEXT is not set
# CONFIG_SENSORS_AS370 is not set
# CONFIG_SENSORS_ASC7621 is not set
# CONFIG_SENSORS_AXI_FAN_CONTROL is not set
@@ -2820,9 +2869,11 @@ CONFIG_SENSORS_LM90=m
# CONFIG_PMBUS is not set
# CONFIG_SENSORS_PWM_FAN is not set
# CONFIG_SENSORS_SBTSI is not set
+# CONFIG_SENSORS_SBRMI is not set
# CONFIG_SENSORS_SHT15 is not set
# CONFIG_SENSORS_SHT21 is not set
# CONFIG_SENSORS_SHT3x is not set
+# CONFIG_SENSORS_SHT4x is not set
# CONFIG_SENSORS_SHTC1 is not set
# CONFIG_SENSORS_DME1737 is not set
# CONFIG_SENSORS_EMC1403 is not set
@@ -2895,6 +2946,7 @@ CONFIG_WATCHDOG_CORE=m
CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
CONFIG_WATCHDOG_OPEN_TIMEOUT=0
# CONFIG_WATCHDOG_SYSFS is not set
+# CONFIG_WATCHDOG_HRTIMER_PRETIMEOUT is not set
#
# Watchdog Pretimeout Governors
@@ -2959,6 +3011,7 @@ CONFIG_MFD_CROS_EC_DEV=y
# CONFIG_MFD_MC13XXX_I2C is not set
# CONFIG_MFD_MP2629 is not set
# CONFIG_MFD_HI6421_PMIC is not set
+# CONFIG_MFD_HI6421_SPMI is not set
# CONFIG_HTC_PASIC3 is not set
# CONFIG_HTC_I2CPLD is not set
# CONFIG_MFD_IQS62X is not set
@@ -2985,6 +3038,7 @@ CONFIG_MFD_MT6397=y
# CONFIG_MFD_NTXEC is not set
# CONFIG_MFD_RETU is not set
# CONFIG_MFD_PCF50633 is not set
+# CONFIG_MFD_RT4831 is not set
# CONFIG_MFD_RT5033 is not set
# CONFIG_MFD_RC5T583 is not set
# CONFIG_MFD_RK808 is not set
@@ -3035,7 +3089,10 @@ CONFIG_MFD_TPS6586X=y
# CONFIG_MFD_STPMIC1 is not set
# CONFIG_MFD_STMFX is not set
# CONFIG_MFD_ATC260X_I2C is not set
+# CONFIG_MFD_QCOM_PM8008 is not set
# CONFIG_MFD_INTEL_M10_BMC is not set
+# CONFIG_MFD_RSMU_I2C is not set
+# CONFIG_MFD_RSMU_SPI is not set
# end of Multifunction device drivers
CONFIG_REGULATOR=y
@@ -3066,6 +3123,7 @@ CONFIG_REGULATOR_GPIO=y
# CONFIG_REGULATOR_MAX1586 is not set
# CONFIG_REGULATOR_MAX8649 is not set
# CONFIG_REGULATOR_MAX8660 is not set
+# CONFIG_REGULATOR_MAX8893 is not set
# CONFIG_REGULATOR_MAX8952 is not set
CONFIG_REGULATOR_MAX8973=m
# CONFIG_REGULATOR_MAX77826 is not set
@@ -3078,6 +3136,7 @@ CONFIG_REGULATOR_MT6311=y
# CONFIG_REGULATOR_MT6315 is not set
CONFIG_REGULATOR_MT6323=y
CONFIG_REGULATOR_MT6358=y
+CONFIG_REGULATOR_MT6359=m
CONFIG_REGULATOR_MT6360=m
CONFIG_REGULATOR_MT6380=y
CONFIG_REGULATOR_MT6397=y
@@ -3093,7 +3152,11 @@ CONFIG_REGULATOR_PWM=y
# CONFIG_REGULATOR_QCOM_USB_VBUS is not set
# CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY is not set
# CONFIG_REGULATOR_RT4801 is not set
+# CONFIG_REGULATOR_RT6160 is not set
+# CONFIG_REGULATOR_RT6245 is not set
+# CONFIG_REGULATOR_RTQ2134 is not set
# CONFIG_REGULATOR_RTMV20 is not set
+# CONFIG_REGULATOR_RTQ6752 is not set
# CONFIG_REGULATOR_SLG51000 is not set
# CONFIG_REGULATOR_SY8106A is not set
# CONFIG_REGULATOR_SY8824X is not set
@@ -3148,6 +3211,7 @@ CONFIG_VIDEO_TUNER=m
CONFIG_V4L2_MEM2MEM_DEV=m
# CONFIG_V4L2_FLASH_LED_CLASS is not set
CONFIG_V4L2_FWNODE=m
+CONFIG_V4L2_ASYNC=m
# end of Video4Linux options
#
@@ -3228,6 +3292,7 @@ CONFIG_VIDEO_TVP5150=m
# Camera sensor devices
#
# CONFIG_VIDEO_HI556 is not set
+# CONFIG_VIDEO_IMX208 is not set
# CONFIG_VIDEO_IMX214 is not set
# CONFIG_VIDEO_IMX219 is not set
# CONFIG_VIDEO_IMX258 is not set
@@ -3235,7 +3300,9 @@ CONFIG_VIDEO_TVP5150=m
# CONFIG_VIDEO_IMX290 is not set
# CONFIG_VIDEO_IMX319 is not set
# CONFIG_VIDEO_IMX334 is not set
+# CONFIG_VIDEO_IMX335 is not set
# CONFIG_VIDEO_IMX355 is not set
+# CONFIG_VIDEO_IMX412 is not set
# CONFIG_VIDEO_OV02A10 is not set
CONFIG_VIDEO_OV2640=m
# CONFIG_VIDEO_OV2659 is not set
@@ -3257,6 +3324,7 @@ CONFIG_VIDEO_OV2640=m
# CONFIG_VIDEO_OV7740 is not set
# CONFIG_VIDEO_OV8856 is not set
# CONFIG_VIDEO_OV8865 is not set
+# CONFIG_VIDEO_OV9282 is not set
# CONFIG_VIDEO_OV9640 is not set
# CONFIG_VIDEO_OV9650 is not set
# CONFIG_VIDEO_OV9734 is not set
@@ -3336,15 +3404,16 @@ CONFIG_MEDIA_TUNER_MC44S803=m
#
CONFIG_DRM=y
CONFIG_DRM_MIPI_DSI=y
+CONFIG_DRM_DP_AUX_BUS=y
# CONFIG_DRM_DP_AUX_CHARDEV is not set
# CONFIG_DRM_DEBUG_MM is not set
CONFIG_DRM_KMS_HELPER=y
-CONFIG_DRM_KMS_FB_HELPER=y
CONFIG_DRM_FBDEV_EMULATION=y
CONFIG_DRM_FBDEV_OVERALLOC=100
# CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
# CONFIG_DRM_DP_CEC is not set
CONFIG_DRM_GEM_CMA_HELPER=y
+CONFIG_DRM_KMS_CMA_HELPER=y
CONFIG_DRM_GEM_SHMEM_HELPER=y
#
@@ -3387,7 +3456,9 @@ CONFIG_DRM_PANEL_SIMPLE=y
# CONFIG_DRM_PANEL_FEIXIN_K101_IM2BA02 is not set
# CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D is not set
# CONFIG_DRM_PANEL_ILITEK_IL9322 is not set
+# CONFIG_DRM_PANEL_ILITEK_ILI9341 is not set
# CONFIG_DRM_PANEL_ILITEK_ILI9881C is not set
+# CONFIG_DRM_PANEL_INNOLUX_EJ030NA is not set
# CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set
# CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
# CONFIG_DRM_PANEL_KHADAS_TS050 is not set
@@ -3410,6 +3481,8 @@ CONFIG_DRM_PANEL_SIMPLE=y
# CONFIG_DRM_PANEL_RAYDIUM_RM67191 is not set
# CONFIG_DRM_PANEL_RAYDIUM_RM68200 is not set
# CONFIG_DRM_PANEL_RONBO_RB070D30 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_ATNA33XC20 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_DB7430 is not set
# CONFIG_DRM_PANEL_SAMSUNG_S6D16D0 is not set
# CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2 is not set
# CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03 is not set
@@ -3432,6 +3505,7 @@ CONFIG_DRM_PANEL_SIMPLE=y
# CONFIG_DRM_PANEL_TPO_TPG110 is not set
# CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA is not set
# CONFIG_DRM_PANEL_VISIONOX_RM69299 is not set
+# CONFIG_DRM_PANEL_WIDECHIPS_WS2401 is not set
# CONFIG_DRM_PANEL_XINPENG_XPP055C272 is not set
# end of Display Panels
@@ -3444,10 +3518,12 @@ CONFIG_DRM_PANEL_BRIDGE=y
# CONFIG_DRM_CDNS_DSI is not set
# CONFIG_DRM_CHIPONE_ICN6211 is not set
# CONFIG_DRM_CHRONTEL_CH7033 is not set
+CONFIG_DRM_CROS_EC_ANX7688=m
CONFIG_DRM_DISPLAY_CONNECTOR=y
# CONFIG_DRM_LONTIUM_LT8912B is not set
# CONFIG_DRM_LONTIUM_LT9611 is not set
# CONFIG_DRM_LONTIUM_LT9611UXC is not set
+# CONFIG_DRM_ITE_IT66121 is not set
# CONFIG_DRM_LVDS_CODEC is not set
# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
# CONFIG_DRM_NWL_MIPI_DSI is not set
@@ -3465,6 +3541,7 @@ CONFIG_DRM_PARADE_PS8640=y
# CONFIG_DRM_TOSHIBA_TC358768 is not set
# CONFIG_DRM_TOSHIBA_TC358775 is not set
# CONFIG_DRM_TI_TFP410 is not set
+# CONFIG_DRM_TI_SN65DSI83 is not set
# CONFIG_DRM_TI_SN65DSI86 is not set
# CONFIG_DRM_TI_TPD12S015 is not set
# CONFIG_DRM_ANALOGIX_ANX6345 is not set
@@ -3481,6 +3558,7 @@ CONFIG_DRM_MEDIATEK_HDMI=y
# CONFIG_DRM_MXSFB is not set
# CONFIG_DRM_ARCPGU is not set
CONFIG_DRM_GM12U320=m
+CONFIG_DRM_SIMPLEDRM=y
# CONFIG_TINYDRM_HX8357D is not set
# CONFIG_TINYDRM_ILI9225 is not set
# CONFIG_TINYDRM_ILI9341 is not set
@@ -3489,7 +3567,7 @@ CONFIG_DRM_GM12U320=m
# CONFIG_TINYDRM_REPAPER is not set
# CONFIG_TINYDRM_ST7586 is not set
# CONFIG_TINYDRM_ST7735R is not set
-# CONFIG_DRM_PL111 is not set
+CONFIG_DRM_PL111=m
# CONFIG_DRM_LIMA is not set
# CONFIG_DRM_PANFROST is not set
# CONFIG_DRM_TIDSS is not set
@@ -3529,7 +3607,6 @@ CONFIG_FB_UDL=m
# CONFIG_FB_IBM_GXT4500 is not set
# CONFIG_FB_VIRTUAL is not set
# CONFIG_FB_METRONOME is not set
-CONFIG_FB_SIMPLE=y
# CONFIG_FB_SSD1307 is not set
# end of Frame buffer Devices
@@ -3682,6 +3759,7 @@ CONFIG_SND_SOC_MT8183_MT6358_TS3A227E_MAX98357A=m
CONFIG_SND_SOC_MT8183_DA7219_MAX98357A=m
# CONFIG_SND_SOC_MTK_BTCVSD is not set
# CONFIG_SND_SOC_MT8192 is not set
+# CONFIG_SND_SOC_MT8195 is not set
# CONFIG_SND_SOC_SOF_TOPLEVEL is not set
#
@@ -3751,6 +3829,7 @@ CONFIG_SND_SOC_ES8328=m
CONFIG_SND_SOC_ES8328_I2C=m
CONFIG_SND_SOC_ES8328_SPI=m
# CONFIG_SND_SOC_GTM601 is not set
+# CONFIG_SND_SOC_ICS43432 is not set
# CONFIG_SND_SOC_INNO_RK3036 is not set
# CONFIG_SND_SOC_MAX98088 is not set
CONFIG_SND_SOC_MAX98357A=m
@@ -3782,6 +3861,7 @@ CONFIG_SND_SOC_RT1015P=m
CONFIG_SND_SOC_RT5514=m
# CONFIG_SND_SOC_RT5616 is not set
# CONFIG_SND_SOC_RT5631 is not set
+# CONFIG_SND_SOC_RT5640 is not set
CONFIG_SND_SOC_RT5645=m
CONFIG_SND_SOC_RT5659=m
CONFIG_SND_SOC_RT5677=m
@@ -3791,6 +3871,7 @@ CONFIG_SND_SOC_RT5677_SPI=m
# CONFIG_SND_SOC_SIMPLE_MUX is not set
# CONFIG_SND_SOC_SPDIF is not set
# CONFIG_SND_SOC_SSM2305 is not set
+# CONFIG_SND_SOC_SSM2518 is not set
# CONFIG_SND_SOC_SSM2602_SPI is not set
# CONFIG_SND_SOC_SSM2602_I2C is not set
# CONFIG_SND_SOC_SSM4567 is not set
@@ -3807,6 +3888,7 @@ CONFIG_SND_SOC_RT5677_SPI=m
# CONFIG_SND_SOC_TAS6424 is not set
# CONFIG_SND_SOC_TDA7419 is not set
# CONFIG_SND_SOC_TFA9879 is not set
+# CONFIG_SND_SOC_TFA989X is not set
# CONFIG_SND_SOC_TLV320AIC23_I2C is not set
# CONFIG_SND_SOC_TLV320AIC23_SPI is not set
# CONFIG_SND_SOC_TLV320AIC31XX is not set
@@ -3843,7 +3925,6 @@ CONFIG_SND_SOC_TS3A227E=m
# CONFIG_SND_SOC_WM8978 is not set
# CONFIG_SND_SOC_WM8985 is not set
# CONFIG_SND_SOC_ZL38060 is not set
-# CONFIG_SND_SOC_ZX_AUD96P22 is not set
# CONFIG_SND_SOC_MAX9759 is not set
CONFIG_SND_SOC_MT6351=m
CONFIG_SND_SOC_MT6358=m
@@ -4266,9 +4347,7 @@ CONFIG_LEDS_CLASS_MULTICOLOR=m
#
# LED drivers
#
-# CONFIG_LEDS_AAT1290 is not set
# CONFIG_LEDS_AN30259A is not set
-# CONFIG_LEDS_AS3645A is not set
# CONFIG_LEDS_AW2013 is not set
# CONFIG_LEDS_BCM6328 is not set
# CONFIG_LEDS_BCM6358 is not set
@@ -4278,7 +4357,6 @@ CONFIG_LEDS_CLASS_MULTICOLOR=m
# CONFIG_LEDS_LM3532 is not set
# CONFIG_LEDS_LM3642 is not set
# CONFIG_LEDS_LM3692X is not set
-# CONFIG_LEDS_LM3601X is not set
CONFIG_LEDS_MT6323=m
# CONFIG_LEDS_PCA9532 is not set
# CONFIG_LEDS_GPIO is not set
@@ -4297,7 +4375,6 @@ CONFIG_LEDS_MT6323=m
# CONFIG_LEDS_TCA6507 is not set
# CONFIG_LEDS_TLC591XX is not set
# CONFIG_LEDS_LM355x is not set
-# CONFIG_LEDS_KTD2692 is not set
# CONFIG_LEDS_IS31FL319X is not set
# CONFIG_LEDS_IS31FL32XX is not set
@@ -4310,13 +4387,17 @@ CONFIG_LEDS_SYSCON=y
CONFIG_LEDS_USER=m
# CONFIG_LEDS_SPI_BYTE is not set
# CONFIG_LEDS_TI_LMU_COMMON is not set
-# CONFIG_LEDS_SGM3140 is not set
#
# Flash and Torch LED drivers
#
+# CONFIG_LEDS_AAT1290 is not set
+# CONFIG_LEDS_AS3645A is not set
+# CONFIG_LEDS_KTD2692 is not set
+# CONFIG_LEDS_LM3601X is not set
# CONFIG_LEDS_RT4505 is not set
# CONFIG_LEDS_RT8515 is not set
+# CONFIG_LEDS_SGM3140 is not set
#
# LED Triggers
@@ -4510,22 +4591,22 @@ CONFIG_SYNC_FILE=y
# CONFIG_DMABUF_DEBUG is not set
# CONFIG_DMABUF_SELFTESTS is not set
CONFIG_DMABUF_HEAPS=y
+# CONFIG_DMABUF_SYSFS_STATS is not set
CONFIG_DMABUF_HEAPS_SYSTEM=y
CONFIG_DMABUF_HEAPS_CMA=y
# end of DMABUF options
# CONFIG_AUXDISPLAY is not set
# CONFIG_UIO is not set
+CONFIG_VFIO=m
CONFIG_VFIO_IOMMU_TYPE1=m
CONFIG_VFIO_VIRQFD=m
-CONFIG_VFIO=m
CONFIG_VFIO_NOIOMMU=y
CONFIG_VFIO_PLATFORM=m
# CONFIG_VFIO_AMBA is not set
# CONFIG_VFIO_PLATFORM_CALXEDAXGMAC_RESET is not set
# CONFIG_VFIO_PLATFORM_AMDXGBE_RESET is not set
CONFIG_VFIO_MDEV=m
-CONFIG_VFIO_MDEV_DEVICE=m
CONFIG_VIRT_DRIVERS=y
CONFIG_VIRTIO=m
CONFIG_VIRTIO_MENU=y
@@ -4543,6 +4624,7 @@ CONFIG_VHOST_NET=m
#
# Microsoft Hyper-V guest support
#
+# CONFIG_HYPERV is not set
# end of Microsoft Hyper-V guest support
# CONFIG_GREYBUS is not set
@@ -4623,14 +4705,13 @@ CONFIG_88EU_AP_MODE=y
# CONFIG_LTE_GDM724X is not set
# CONFIG_GS_FPGABOOT is not set
# CONFIG_UNISYSSPAR is not set
+# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
# CONFIG_FB_TFT is not set
# CONFIG_KS7010 is not set
# CONFIG_PI433 is not set
# CONFIG_XIL_AXIS_FIFO is not set
# CONFIG_FIELDBUS_DEV is not set
# CONFIG_WFX is not set
-# CONFIG_SPMI_HISI3670 is not set
-# CONFIG_MFD_HI6421_SPMI is not set
# CONFIG_GOLDFISH is not set
CONFIG_CHROME_PLATFORMS=y
CONFIG_CHROMEOS_TBMC=m
@@ -4650,9 +4731,17 @@ CONFIG_CROS_USBPD_NOTIFY=y
# CONFIG_MELLANOX_PLATFORM is not set
# CONFIG_SURFACE_PLATFORMS is not set
CONFIG_HAVE_CLK=y
-CONFIG_CLKDEV_LOOKUP=y
CONFIG_HAVE_CLK_PREPARE=y
CONFIG_COMMON_CLK=y
+
+#
+# Clock driver for ARM Reference designs
+#
+# CONFIG_ICST is not set
+# CONFIG_CLK_SP810 is not set
+# end of Clock driver for ARM Reference designs
+
+# CONFIG_LMK04832 is not set
# CONFIG_COMMON_CLK_MAX9485 is not set
# CONFIG_COMMON_CLK_SCMI is not set
# CONFIG_COMMON_CLK_SCPI is not set
@@ -4727,6 +4816,19 @@ CONFIG_COMMON_CLK_MT8183=y
# CONFIG_COMMON_CLK_MT8183_MMSYS is not set
# CONFIG_COMMON_CLK_MT8183_VDECSYS is not set
# CONFIG_COMMON_CLK_MT8183_VENCSYS is not set
+CONFIG_COMMON_CLK_MT8192=y
+# CONFIG_COMMON_CLK_MT8192_AUDSYS is not set
+# CONFIG_COMMON_CLK_MT8192_CAMSYS is not set
+# CONFIG_COMMON_CLK_MT8192_IMGSYS is not set
+# CONFIG_COMMON_CLK_MT8192_IMP_IIC_WRAP is not set
+# CONFIG_COMMON_CLK_MT8192_IPESYS is not set
+# CONFIG_COMMON_CLK_MT8192_MDPSYS is not set
+# CONFIG_COMMON_CLK_MT8192_MFGCFG is not set
+# CONFIG_COMMON_CLK_MT8192_MMSYS is not set
+# CONFIG_COMMON_CLK_MT8192_MSDC is not set
+# CONFIG_COMMON_CLK_MT8192_SCP_ADSP is not set
+# CONFIG_COMMON_CLK_MT8192_VDECSYS is not set
+# CONFIG_COMMON_CLK_MT8192_VENCSYS is not set
CONFIG_COMMON_CLK_MT8516=y
# CONFIG_COMMON_CLK_MT8516_AUDSYS is not set
# end of Clock driver for MediaTek SoC
@@ -4774,6 +4876,8 @@ CONFIG_IOMMU_IO_PGTABLE_ARMV7S=y
# CONFIG_IOMMU_IO_PGTABLE_ARMV7S_SELFTEST is not set
# end of Generic IOMMU Pagetable Support
+CONFIG_IOMMU_DEFAULT_DMA_STRICT=y