From 3fcb03eb633c60b997e24d8e2e6b7ae2f3617cc5 Mon Sep 17 00:00:00 2001 From: nishu-codes Date: Sat, 5 Oct 2024 16:26:57 +0530 Subject: [PATCH 01/33] reformat codebase --- .gitignore | 14 +- .gitmodules | 9 - .idea/.gitignore | 8 + .idea/codeStyles/Project.xml | 10 + .idea/codeStyles/codeStyleConfig.xml | 5 + .idea/editor.xml | 484 + .idea/misc.xml | 14 + .idea/modules.xml | 8 + .idea/rlxos.iml | 2 + .idea/vcs.xml | 4 + CMakeLists.txt | 8 +- Makefile | 32 +- apps/welcome/assets/welcome.desktop | 8 - apps/welcome/config/config.go | 22 - apps/welcome/locale/hi.yaml | 22 - apps/welcome/locale/locale.go | 17 - apps/welcome/main.go | 36 - apps/welcome/window/page.go | 12 - apps/welcome/window/pages/apps/apps.go | 71 - apps/welcome/window/pages/finish/finish.go | 43 - apps/welcome/window/pages/looks/looks.go | 112 - apps/welcome/window/pages/support/support.go | 70 - apps/welcome/window/pages/welcome/welcome.go | 43 - apps/welcome/window/style/global.css | 9 - apps/welcome/window/style/style.go | 22 - apps/welcome/window/window.go | 93 - {files => assets}/2in1/2in1.c | 0 {files => assets}/AppImage.svg | 0 .../backgrounds/default-blur.jpg | Bin {files => assets}/backgrounds/default.jpg | Bin {files => assets}/bash/bashrc | 0 {files => assets}/bash/user_bash_profile | 0 {files => assets}/bash/user_bashrc | 0 {files => assets}/bios | Bin .../branding/rlxos-logo-dark.svg | 0 .../branding/rlxos-logo-simple-white.svg | 0 .../branding/rlxos-logo-simple.svg | 0 .../branding/rlxos-logo-white.svg | 0 {files => assets}/branding/rlxos-logo.svg | 0 .../ca-certificates/blacklist.txt | 0 .../ca-certificates/certdata2pem.c | 0 .../ca-certificates/update-ca-certificates | 0 .../docbook-xsl-nons-1.79.2-stack_fix-1.patch | 0 .../core/systemd-repart-config/10-efi.conf | 0 .../core/systemd-repart-config/20-usr-A.conf | 0 .../21-usr-verity-A.conf | 0 .../core/systemd-repart-config/30-usr-B.conf | 0 .../31-usr-verity-B.conf | 0 .../core/systemd-repart-config/50-root.conf | 0 .../rlxos-kernel.conf | 0 .../rlxos-usr-verity.conf | 0 .../systemd-sysupdate-config/rlxos-usr.conf | 0 {files => assets}/dialogrc | 0 {files => assets}/dracut.conf | 0 {files => assets}/filesystem/env-generator | 0 {files => assets}/filesystem/fstab | 0 {files => assets}/filesystem/group | 0 {files => assets}/filesystem/gshadow | 0 {files => assets}/filesystem/host.conf | 0 {files => assets}/filesystem/hosts | 0 {files => assets}/filesystem/inputrc | 0 {files => assets}/filesystem/issue | 0 {files => assets}/filesystem/lsb-release | 0 {files => assets}/filesystem/nsswitch.conf | 0 {files => assets}/filesystem/os-release | 0 {files => assets}/filesystem/passwd | 0 {files => assets}/filesystem/profile | 0 {files => assets}/filesystem/resolv.conf | 0 {files => assets}/filesystem/securetty | 0 {files => assets}/filesystem/shadow | 0 {files => assets}/filesystem/shells | 0 {files => assets}/filesystem/sysusers | 0 {files => assets}/filesystem/tmpfiles | 0 {files => assets}/firefox/firefox.desktop | 0 {files => assets}/foot/foot.ini | 0 {files => assets}/greetd/config.toml | 0 {files => assets}/greetd/sway-config | 0 {files => assets}/greetd/wlgreet.toml | 0 ...S-CONFIG-PATCH-TO-SUPPORT-OVERLAY-FS.patch | 0 {files => assets}/grub/grub.default | 0 {files => assets}/grub/unicode.pf2 | Bin {files => assets}/grub/unifont-13.0.06.bdf | 0 {files => assets}/grub/update-grub.sh | 0 {files => assets}/i3blocks/audio.sh | 0 {files => assets}/i3blocks/battery.sh | 0 {files => assets}/i3blocks/i3blocks.conf | 0 {files => assets}/i3blocks/network.sh | 0 {files => assets}/initial-setup/first-boot.sh | 0 {files => assets}/initial-setup/installer.sh | 0 {files => assets}/initramfs/init.in | 0 {files => assets}/initramfs/mkinitramfs.sh.in | 0 .../interface/client/buttons.lua | 0 {files => assets}/interface/client/init.lua | 0 {files => assets}/interface/client/keys.lua | 0 {files => assets}/interface/client/rules.lua | 0 .../interface/client/titlebar.lua | 0 {files => assets}/interface/config.lua | 0 .../interface/internal/error-handling.lua | 0 .../interface/internal/global-buttons.lua | 0 .../interface/internal/global-keys.lua | 0 .../interface/internal/global-menu.lua | 0 .../interface/internal/layouts.lua | 0 .../interface/internal/startup-apps.lua | 0 .../interface/internal/wallpaper.lua | 0 {files => assets}/interface/panel/clock.lua | 0 {files => assets}/interface/panel/init.lua | 0 {files => assets}/interface/panel/prompt.lua | 0 .../interface/panel/start-launcher.lua | 0 {files => assets}/interface/panel/taglist.lua | 0 .../interface/panel/tasklist.lua | 0 {files => assets}/interface/picom.conf | 0 {files => assets}/interface/rc.lua | 0 .../interface/theme/background.jpeg | Bin .../interface/theme/layouts/cornerne.png | Bin .../interface/theme/layouts/cornernew.png | Bin .../interface/theme/layouts/cornernw.png | Bin .../interface/theme/layouts/cornernww.png | Bin .../interface/theme/layouts/cornerse.png | Bin .../interface/theme/layouts/cornersew.png | Bin .../interface/theme/layouts/cornersw.png | Bin .../interface/theme/layouts/cornersww.png | Bin .../interface/theme/layouts/dwindle.png | Bin .../interface/theme/layouts/dwindlew.png | Bin .../interface/theme/layouts/fairh.png | Bin .../interface/theme/layouts/fairhw.png | Bin .../interface/theme/layouts/fairv.png | Bin .../interface/theme/layouts/fairvw.png | Bin .../interface/theme/layouts/floating.png | Bin .../interface/theme/layouts/floatingw.png | Bin .../interface/theme/layouts/fullscreen.png | Bin .../interface/theme/layouts/fullscreenw.png | Bin .../interface/theme/layouts/magnifier.png | Bin .../interface/theme/layouts/magnifierw.png | Bin .../interface/theme/layouts/max.png | Bin .../interface/theme/layouts/maxw.png | Bin .../interface/theme/layouts/spiral.png | Bin .../interface/theme/layouts/spiralw.png | Bin .../interface/theme/layouts/tile.png | Bin .../interface/theme/layouts/tilebottom.png | Bin .../interface/theme/layouts/tilebottomw.png | Bin .../interface/theme/layouts/tileleft.png | Bin .../interface/theme/layouts/tileleftw.png | Bin .../interface/theme/layouts/tiletop.png | Bin .../interface/theme/layouts/tiletopw.png | Bin .../interface/theme/layouts/tilew.png | Bin {files => assets}/interface/theme/submenu.png | Bin .../interface/theme/taglist/squarefw.png | Bin .../interface/theme/taglist/squarew.png | Bin {files => assets}/interface/theme/theme.lua | 0 .../interface/theme/titlebar/close-active.png | Bin .../theme/titlebar/close-inactive.png | Bin .../layouts/rlxos-1.0-silaghana.tar.bz2 | Bin {files => assets}/layouts/rlxos-1.5.tar.bz2 | Bin {files => assets}/multimedia-player.svg | 0 {files => assets}/pam/chage | 0 {files => assets}/pam/chfn | 0 {files => assets}/pam/chgpasswd | 0 {files => assets}/pam/chpasswd | 0 {files => assets}/pam/chsh | 0 {files => assets}/pam/groupadd | 0 {files => assets}/pam/groupdel | 0 {files => assets}/pam/groupmems | 0 {files => assets}/pam/groupmod | 0 {files => assets}/pam/login | 0 {files => assets}/pam/other | 0 {files => assets}/pam/passwd | 0 {files => assets}/pam/su | 0 {files => assets}/pam/system-account | 0 {files => assets}/pam/system-auth | 0 {files => assets}/pam/system-password | 0 {files => assets}/pam/system-session | 0 {files => assets}/pam/systemd-user | 0 {files => assets}/pam/useradd | 0 {files => assets}/pam/userdel | 0 {files => assets}/pam/usermod | 0 {files => assets}/rlxos.gpg | 0 {files => assets}/rofi/colors/default.rasi | 0 .../rofi/themes/ApplicationLauncher.rasi | 0 {files => assets}/rofi/themes/Powermenu.rasi | 0 .../rofi/themes/QuickLauncher.rasi | 0 {files => assets}/scripts/Powermenu | 0 {files => assets}/scripts/TabletMode | 0 {files => assets}/sdt-config.h | 0 {files => assets}/sdt.h | 0 {files => assets}/seatd/seatd.preset | 0 {files => assets}/seatd/sysuser.conf | 0 {files => assets}/sway/config | 0 {files => assets}/sway/config-locked | 0 .../sway/config.d/autostart.conf | 0 .../sway/config.d/background.conf | 0 {files => assets}/sway/config.d/bindings.conf | 0 .../sway/config.d/color-scheme.conf | 0 {files => assets}/sway/config.d/defaults.conf | 0 {files => assets}/sway/config.d/devices.conf | 0 {files => assets}/sway/config.d/fonts.conf | 0 .../sway/config.d/statusbar.conf | 0 {files => assets}/swaylock/config | 0 {files => assets}/wob/wob.ini | 0 {files => assets}/zsh/profile | 0 channel.yml | 2 + cmake/FindOSTree.cmake | 6 - cmake/GLibUtils.cmake | 45 - config-aarch64.yml | 8 +- config-x86_64.yml | 19 +- elements/components/glade.yml | 2 - {elements => external}/apps/alacritty.yml | 2 +- {elements => external}/apps/blender.yml | 2 +- {elements => external}/apps/gigolo.yml | 2 +- {elements => external}/apps/glade.yml | 4 +- {elements => external}/apps/peek.yml | 2 +- {elements => external}/apps/pinta.yml | 2 +- {elements => external}/bootstrap.yml | 0 {elements => external}/components/2in1.yml | 0 .../components/abseil-cpp.yml | 0 .../components/accountsservice.yml | 0 {elements => external}/components/acl.yml | 0 {elements => external}/components/acpid.yml | 0 .../components/alsa-lib.yml | 0 {elements => external}/components/amtk.yml | 0 .../components/android-tools.yml | 0 .../components/android-udev.yml | 0 .../components/apache-ant.yml | 0 {elements => external}/components/apache.yml | 0 .../components/apparmor.yml | 0 .../components/appcenter.yml | 0 .../components/appimaged.yml | 0 .../components/appimagetool.yml | 0 .../components/appstream-glib.yml | 0 .../components/appstream.yml | 0 .../components/apr-util.yml | 0 {elements => external}/components/apr.yml | 0 {elements => external}/components/aspell.yml | 0 .../components/at-spi2-core.yml | 0 {elements => external}/components/atkmm.yml | 0 .../components/atkmm2.28.yml | 0 {elements => external}/components/attica.yml | 2 +- {elements => external}/components/attr.yml | 0 {elements => external}/components/audit.yml | 0 .../components/autoconf-archive.yml | 0 .../components/autoconf.yml | 0 .../components/automake.yml | 0 {elements => external}/components/avahi.yml | 0 {elements => external}/components/awesome.yml | 0 {elements => external}/components/babl.yml | 0 .../components/baloo-widgets.yml | 0 {elements => external}/components/baloo.yml | 0 {elements => external}/components/bash.yml | 6 +- {elements => external}/components/bc.yml | 0 {elements => external}/components/bemenu.yml | 0 .../components/benchmark.yml | 0 .../components/binutils.yml | 2 +- {elements => external}/components/bison.yml | 0 {elements => external}/components/blueman.yml | 0 .../components/bluez-qt.yml | 2 +- {elements => external}/components/bluez.yml | 0 .../components/bogofilter.yml | 0 {elements => external}/components/boost.yml | 0 .../components/bootstrap.yml | 0 .../components/bootstrap/binutils-stage1.yml | 2 +- .../components/bootstrap/binutils-stage2.yml | 2 +- .../components/bootstrap/gcc-stage1.yml | 2 +- .../components/bootstrap/gcc-stage2.yml | 2 +- .../components/bootstrap/glibc-stage1.yml | 2 +- .../components/bootstrap/glibc-stage2.yml | 2 +- .../components/branding.yml | 0 .../components/bridge-utils.yml | 0 .../components/brightnessctl.yml | 0 {elements => external}/components/brotli.yml | 0 {elements => external}/components/bsdiff.yml | 0 {elements => external}/components/bspwm.yml | 0 .../components/btrfs-progs.yml | 0 .../components/bubblewrap.yml | 0 {elements => external}/components/busybox.yml | 0 {elements => external}/components/bzip2.yml | 0 .../components/ca-certificates-java.yml | 0 .../components/ca-certificates.yml | 6 +- .../components/cabextract.yml | 0 {elements => external}/components/cage.yml | 0 {elements => external}/components/cairo.yml | 0 {elements => external}/components/cairomm.yml | 0 .../components/cairomm1.14.yml | 0 {elements => external}/components/capsule.yml | 2 +- .../components/cbindgen.yml | 0 {elements => external}/components/ccache.yml | 0 .../components/cdparanoia.yml | 0 .../components/cdrtools.yml | 0 .../components/cgroupfs-mount.yml | 0 {elements => external}/components/check.yml | 0 .../components/chromaprint.yml | 0 .../components/cifs-utils.yml | 0 {elements => external}/components/clucene.yml | 0 .../components/clutter-gst.yml | 0 .../components/clutter-gtk.yml | 0 {elements => external}/components/clutter.yml | 0 {elements => external}/components/cmake.yml | 0 {elements => external}/components/cog.yml | 0 {elements => external}/components/cogl.yml | 0 .../components/colord-gtk.yml | 0 {elements => external}/components/colord.yml | 0 {elements => external}/components/compiz.yml | 0 .../components/conky-manager.yml | 0 {elements => external}/components/conky.yml | 0 {elements => external}/components/connman.yml | 0 .../components/containerd.yml | 0 {elements => external}/components/core.yml | 2 +- .../components/coreutils.yml | 0 {elements => external}/components/cpio.yml | 0 {elements => external}/components/cppgir.yml | 0 {elements => external}/components/cppunit.yml | 0 .../components/cracklib.yml | 0 .../components/cryptsetup.yml | 0 {elements => external}/components/cups.yml | 0 {elements => external}/components/curl.yml | 0 {elements => external}/components/cxxopts.yml | 0 .../components/cyrus-sasl.yml | 0 .../components/dbus-c++.yml | 0 .../components/dbus-cxx.yml | 0 .../components/dbus-glib.yml | 0 .../components/dbus-nosystemd.yml | 0 {elements => external}/components/dbus.yml | 0 .../components/dconf-editor.yml | 0 {elements => external}/components/dconf.yml | 0 .../components/debian-archive-keyring.yml | 0 .../components/debootstrap.yml | 0 .../components/debugedit.yml | 0 .../components/desktop-file-utils.yml | 0 {elements => external}/components/devel.yml | 0 {elements => external}/components/dialog.yml | 0 .../components/diffutils.yml | 0 .../components/directx-headers.yml | 0 .../components/distrobox.yml | 0 {elements => external}/components/dkms.yml | 0 {elements => external}/components/dmenu.yml | 0 .../components/dmidecode.yml | 0 {elements => external}/components/dnsmasq.yml | 0 .../components/docbook-xml.yml | 0 .../components/docbook-xsl.yml | 2 +- {elements => external}/components/docker.yml | 0 .../components/dosfstools.yml | 0 .../components/dotnet-runtime.yml | 0 {elements => external}/components/dotnet.yml | 0 .../components/double-conversion.yml | 0 {elements => external}/components/dpkg.yml | 0 {elements => external}/components/dpp.yml | 0 {elements => external}/components/dqlite.yml | 0 {elements => external}/components/dracut.yml | 0 {elements => external}/components/dtc.yml | 0 {elements => external}/components/duktape.yml | 0 .../components/e2fsprogs.yml | 0 {elements => external}/components/ed.yml | 0 .../components/efibootmgr.yml | 0 {elements => external}/components/efivar.yml | 0 .../components/egl-wayland.yml | 0 .../components/eglexternalplatform.yml | 0 .../components/elementary-xfce-icons.yml | 0 {elements => external}/components/enchant.yml | 0 {elements => external}/components/enet.yml | 0 .../components/enlightenment/efl.yml | 0 .../enlightenment/enlightenment.yml | 0 .../components/enlightenment/terminology.yml | 0 .../components/epdfview.yml | 0 .../components/espeak-ng.yml | 0 .../components/evolution-data-server.yml | 0 {elements => external}/components/evtest.yml | 0 {elements => external}/components/exempi.yml | 0 {elements => external}/components/exiv2.yml | 0 {elements => external}/components/expat.yml | 0 .../components/extra-cmake-modules.yml | 2 +- .../components/fakeroot.yml | 0 {elements => external}/components/fcft.yml | 0 {elements => external}/components/fcron.yml | 0 {elements => external}/components/fdk-aac.yml | 0 {elements => external}/components/ffmpeg.yml | 0 {elements => external}/components/fftw.yml | 0 .../components/file-roller.yml | 0 {elements => external}/components/file.yml | 0 .../components/filesystem.yml | 0 .../components/findutils.yml | 0 .../components/firefox-src.yml | 2 +- {elements => external}/components/firefox.yml | 0 .../components/firmware.yml | 0 {elements => external}/components/flac.yml | 0 {elements => external}/components/flatpak.yml | 0 {elements => external}/components/flex.yml | 0 {elements => external}/components/fmt.yml | 0 {elements => external}/components/folks.yml | 0 .../components/fontconfig.yml | 0 .../fonts/adobe-source-code-pro-fonts.yml | 0 .../components/fonts/cantarell.yml | 0 .../components/fonts/dejavu-fonts.yml | 0 .../components/fonts/fira-code.yml | 0 .../components/fonts/gofont.yml | 0 .../components/fonts/gsfonts.yml | 0 .../components/fonts/ibm-plex-nerd-fonts.yml | 0 .../components/fonts/ibm-plex.yml | 0 .../components/fonts/inconsolata.yml | 0 .../components/fonts/liberation-fonts.yml | 0 .../components/fonts/noto-cjk.yml | 0 .../components/fonts/noto-emoji.yml | 0 .../components/fonts/noto.yml | 0 .../components/fonts/opensans.yml | 0 {elements => external}/components/foot.yml | 0 {elements => external}/components/fprintd.yml | 0 .../components/frameworkintegration.yml | 0 .../components/freeglut.yml | 0 {elements => external}/components/freerdp.yml | 0 .../components/freetype.yml | 0 {elements => external}/components/fribidi.yml | 0 {elements => external}/components/fuse.yml | 0 {elements => external}/components/fuse2.yml | 0 {elements => external}/components/gawk.yml | 0 {elements => external}/components/gc.yml | 0 {elements => external}/components/gcc.yml | 2 +- {elements => external}/components/gconf.yml | 0 {elements => external}/components/gcr-4.yml | 0 {elements => external}/components/gcr.yml | 0 {elements => external}/components/gd.yml | 0 {elements => external}/components/gdb.yml | 0 {elements => external}/components/gdbm.yml | 0 .../components/gdk-pixbuf.yml | 0 {elements => external}/components/gdl.yml | 0 {elements => external}/components/gegl.yml | 0 .../components/genimage.yml | 0 {elements => external}/components/geoclue.yml | 0 .../components/geocode-glib.yml | 0 .../components/geoip-database.yml | 0 {elements => external}/components/geoip.yml | 0 {elements => external}/components/gettext.yml | 0 {elements => external}/components/gexiv2.yml | 0 .../components/gfbgraph.yml | 0 .../components/ghostscript.yml | 0 {elements => external}/components/giflib.yml | 0 {elements => external}/components/gimp.yml | 0 {elements => external}/components/git.yml | 0 {elements => external}/components/gjs.yml | 0 external/components/glade.yml | 2 + {elements => external}/components/glew.yml | 0 {elements => external}/components/glfw.yml | 0 .../components/glib-networking.yml | 0 {elements => external}/components/glib.yml | 0 .../components/glibc-dbg.yml | 0 {elements => external}/components/glibc.yml | 2 +- {elements => external}/components/glibmm.yml | 0 .../components/glibmm2.66.yml | 0 {elements => external}/components/glm.yml | 0 {elements => external}/components/gloox.yml | 0 {elements => external}/components/glslang.yml | 0 {elements => external}/components/glu.yml | 0 {elements => external}/components/gmime.yml | 0 {elements => external}/components/gmp.yml | 0 .../components/gnome-control-center.yml | 0 .../components/gnome-keyring.yml | 0 .../components/gnome/evince.yml | 0 .../components/gnome/gdm.yml | 0 .../components/gnome/gnome-autoar.yml | 0 .../components/gnome/gnome-backgrounds.yml | 0 .../components/gnome/gnome-bluetooth.yml | 0 .../components/gnome/gnome-control-center.yml | 0 .../components/gnome/gnome-desktop.yml | 0 .../gnome/gnome-epub-thumbnailer.yml | 0 .../components/gnome/gnome-initial-setup.yml | 0 .../components/gnome/gnome-menus.yml | 0 .../gnome/gnome-online-accounts.yml | 0 .../components/gnome/gnome-power-manager.yml | 0 .../components/gnome/gnome-session.yml | 0 .../gnome/gnome-settings-daemon.yml | 0 .../gnome/gnome-shell-extension-arc-menu.yml | 0 .../gnome/gnome-shell-extension-blur-me.yml | 0 .../gnome-shell-extension-dash-to-panel.yml | 0 ...gnome-shell-extension-desktop-icons-ng.yml | 0 .../gnome/gnome-shell-extension-nightmode.yml | 0 .../gnome-shell-extension-x11gestures.yml | 0 .../gnome/gnome-shell-extensions.yml | 0 .../components/gnome/gnome-shell.yml | 0 .../components/gnome/gnome-software.yml | 0 .../components/gnome/gnome-terminal.yml | 0 .../components/gnome/gnome-video-effects.yml | 0 .../components/gnome/nautilus.yml | 0 {elements => external}/components/gnu-efi.yml | 0 {elements => external}/components/gnupg.yml | 0 {elements => external}/components/gnutls.yml | 0 {elements => external}/components/go.yml | 0 .../components/go/gotk4.yml | 2 +- .../components/gobject-introspection.yml | 0 {elements => external}/components/gom.yml | 0 {elements => external}/components/gparted.yml | 0 {elements => external}/components/gperf.yml | 0 {elements => external}/components/gpgme.yml | 0 .../components/gptfdisk.yml | 0 {elements => external}/components/grafana.yml | 0 {elements => external}/components/granite.yml | 0 .../components/graphene.yml | 0 .../components/graphite2.yml | 0 .../components/graphviz.yml | 0 {elements => external}/components/greetd.yml | 0 {elements => external}/components/grep.yml | 0 .../components/grilo-plugins.yml | 0 {elements => external}/components/grilo.yml | 0 {elements => external}/components/grim.yml | 0 .../components/grimshot.yml | 0 {elements => external}/components/groff.yml | 0 .../components/grub-i386.yml | 0 {elements => external}/components/grub.yml | 6 +- .../components/gsettings-desktop-schemas.yml | 0 {elements => external}/components/gsl.yml | 0 {elements => external}/components/gsound.yml | 0 {elements => external}/components/gspell.yml | 0 .../components/gstreamer.yml | 0 {elements => external}/components/gtest.yml | 0 {elements => external}/components/gtk-doc.yml | 0 .../components/gtk-layer-shell.yml | 0 {elements => external}/components/gtk-vnc.yml | 0 {elements => external}/components/gtk.yml | 0 {elements => external}/components/gtk4.yml | 0 .../components/gtkgreet.yml | 0 {elements => external}/components/gtkmm.yml | 0 {elements => external}/components/gtkmm4.yml | 0 .../components/gtksourceview4.yml | 0 .../components/gtksourceview5.yml | 0 {elements => external}/components/gufw.yml | 0 {elements => external}/components/guile.yml | 0 {elements => external}/components/gvfs.yml | 0 {elements => external}/components/gzip.yml | 0 .../components/harfbuzz.yml | 0 .../components/help2man.yml | 0 .../components/hicolor-icon-theme.yml | 0 .../components/highlight.yml | 0 {elements => external}/components/htop.yml | 0 .../components/http-parser.yml | 0 .../components/hunspell.yml | 0 {elements => external}/components/hwdata.yml | 0 {elements => external}/components/hwloc.yml | 0 {elements => external}/components/i3.yml | 0 .../components/i3blocks.yml | 0 {elements => external}/components/i3lock.yml | 0 .../components/i3status.yml | 0 .../components/iana-etc.yml | 0 {elements => external}/components/ibus.yml | 0 {elements => external}/components/icmake.yml | 0 .../components/icon-naming-utils.yml | 0 {elements => external}/components/icu.yml | 0 .../components/iio-sensor-proxy.yml | 0 .../components/iio-sway.yml | 0 .../components/imagemagick.yml | 0 {elements => external}/components/imlib2.yml | 0 .../components/inetutils.yml | 0 {elements => external}/components/inih.yml | 0 .../components/initial-setup.yml | 2 +- .../components/initramfs.yml | 0 .../components/intel-ucode.yml | 0 .../components/intltool.yml | 0 {elements => external}/components/inxi.yml | 0 .../components/iproute2.yml | 0 .../components/iptables.yml | 0 .../components/iso-codes.yml | 0 {elements => external}/components/itstool.yml | 0 .../components/iucode-tool.yml | 0 {elements => external}/components/jack.yml | 0 {elements => external}/components/jansson.yml | 0 {elements => external}/components/jasper.yml | 0 {elements => external}/components/jetring.yml | 0 .../components/jfsutils.yml | 0 {elements => external}/components/jq.yml | 0 {elements => external}/components/json-c.yml | 0 .../components/json-glib.yml | 0 .../components/jsonrpc-glib.yml | 0 .../components/kactivities-stats.yml | 2 +- .../components/kactivities.yml | 2 +- {elements => external}/components/kapidox.yml | 2 +- .../components/karchive.yml | 2 +- {elements => external}/components/kauth.yml | 2 +- {elements => external}/components/kbd.yml | 0 .../components/kbookmarks.yml | 2 +- .../components/kcalendarcore.yml | 2 +- .../components/kcmutils.yml | 2 +- {elements => external}/components/kcodecs.yml | 2 +- .../components/kcolorscheme.yml | 2 +- .../components/kcompletion.yml | 2 +- {elements => external}/components/kconfig.yml | 2 +- .../components/kconfigwidgets.yml | 2 +- .../components/kcontacts.yml | 2 +- .../components/kcoreaddons.yml | 2 +- {elements => external}/components/kcrash.yml | 2 +- {elements => external}/components/kdav.yml | 2 +- .../components/kdbusaddons.yml | 2 +- .../components/kdeclarative.yml | 2 +- {elements => external}/components/kded.yml | 2 +- .../components/kdelibs4support.yml | 2 +- .../components/kdesignerplugin.yml | 2 +- {elements => external}/components/kdesu.yml | 2 +- .../components/kdewebkit.yml | 2 +- {elements => external}/components/kdnssd.yml | 2 +- .../components/kdoctools.yml | 2 +- {elements => external}/components/kdsoap.yml | 0 .../components/kemoticons.yml | 2 +- .../components/kernel-headers.yml | 2 +- .../components/keybinder.yml | 0 .../components/keyutils.yml | 0 .../components/kfilemetadata.yml | 2 +- .../components/kglobalaccel.yml | 2 +- .../components/kguiaddons.yml | 2 +- .../components/khelpcenter.yml | 0 .../components/kholidays.yml | 2 +- {elements => external}/components/khtml.yml | 2 +- {elements => external}/components/ki18n.yml | 2 +- .../components/kiconthemes.yml | 2 +- .../components/kidletime.yml | 2 +- .../components/kimageformats.yml | 2 +- .../components/kinfocenter.yml | 0 {elements => external}/components/kinit.yml | 2 +- .../components/kio-extras.yml | 0 {elements => external}/components/kio.yml | 2 +- .../components/kirigami2.yml | 2 +- .../components/kitemmodels.yml | 2 +- .../components/kitemviews.yml | 2 +- .../components/kjobwidgets.yml | 2 +- {elements => external}/components/kjs.yml | 2 +- .../components/kjsembed.yml | 2 +- .../components/kmediaplayer.yml | 2 +- {elements => external}/components/kmix.yml | 0 {elements => external}/components/kmod.yml | 0 .../components/knewstuff.yml | 2 +- .../components/knotifications.yml | 2 +- .../components/knotifyconfig.yml | 2 +- .../components/kpackage.yml | 2 +- {elements => external}/components/kparts.yml | 2 +- {elements => external}/components/kpeople.yml | 2 +- .../components/kplotting.yml | 2 +- {elements => external}/components/kpmcore.yml | 0 {elements => external}/components/kpty.yml | 2 +- .../components/kquickcharts.yml | 2 +- {elements => external}/components/krb5.yml | 0 {elements => external}/components/kross.yml | 2 +- {elements => external}/components/krunner.yml | 2 +- .../components/kservice.yml | 2 +- .../components/ktexteditor.yml | 2 +- .../components/ktextwidgets.yml | 2 +- .../components/kunitconversion.yml | 2 +- .../components/kuserfeedback.yml | 0 {elements => external}/components/kwallet.yml | 2 +- .../components/kwayland.yml | 2 +- .../components/kwidgetsaddons.yml | 2 +- .../components/kwindowsystem.yml | 2 +- {elements => external}/components/kxmlgui.yml | 2 +- .../components/kxmlrpcclient.yml | 2 +- {elements => external}/components/l-smash.yml | 0 {elements => external}/components/labwc.yml | 0 {elements => external}/components/lame.yml | 0 .../components/lavalauncher.yml | 0 {elements => external}/components/lcms.yml | 0 {elements => external}/components/less.yml | 0 {elements => external}/components/lftp.yml | 0 .../components/libadwaita.yml | 0 {elements => external}/components/libaio.yml | 0 {elements => external}/components/libaom.yml | 0 .../components/libappimage.yml | 0 .../components/libarchive.yml | 0 {elements => external}/components/libass.yml | 0 .../components/libassuan.yml | 0 .../components/libatasmart.yml | 0 .../components/libatomic_ops.yml | 0 .../components/libavc1394.yml | 0 {elements => external}/components/libavif.yml | 0 .../components/libblockdev.yml | 0 .../components/libboost.yml | 0 {elements => external}/components/libbsd.yml | 0 {elements => external}/components/libburn.yml | 0 .../components/libbytesize.yml | 0 .../components/libcacard.yml | 0 .../components/libcanberra.yml | 0 .../components/libcap-ng.yml | 0 {elements => external}/components/libcap.yml | 0 .../components/libcdio-paranoia.yml | 0 {elements => external}/components/libcdio.yml | 0 .../components/libchamplain.yml | 0 {elements => external}/components/libclc.yml | 0 .../components/libcloudproviders.yml | 0 .../components/libconfig.yml | 0 .../components/libconfuse.yml | 0 .../components/libdaemon.yml | 0 .../components/libdatrie.yml | 0 .../components/libdazzle.yml | 0 .../components/libdbusmenu-qt.yml | 0 .../components/libdisplay-info.yml | 0 .../components/libdmapsharing.yml | 0 {elements => external}/components/libdrm.yml | 0 .../components/libdvdread.yml | 0 {elements => external}/components/libelf.yml | 0 .../components/libepoxy.yml | 0 {elements => external}/components/libev.yml | 0 .../components/libevdev.yml | 0 .../components/libevent.yml | 0 {elements => external}/components/libexif.yml | 0 .../components/libexplain.yml | 0 {elements => external}/components/libffi.yml | 0 .../components/libfprint.yml | 0 {elements => external}/components/libgcc.yml | 2 +- .../components/libgcrypt.yml | 0 .../components/libgdata.yml | 0 .../components/libgdiplus.yml | 0 {elements => external}/components/libgee.yml | 0 .../components/libgepub.yml | 0 {elements => external}/components/libgit2.yml | 0 .../components/libglvnd.yml | 0 {elements => external}/components/libgmp.yml | 0 .../components/libgnomekbd.yml | 0 .../components/libgpg-error.yml | 0 {elements => external}/components/libgrss.yml | 0 {elements => external}/components/libgsf.yml | 0 .../components/libgssglue.yml | 0 {elements => external}/components/libgtop.yml | 0 .../components/libgudev.yml | 0 {elements => external}/components/libgusb.yml | 0 .../components/libgweather.yml | 0 {elements => external}/components/libgxps.yml | 0 .../components/libhandy.yml | 0 {elements => external}/components/libical.yml | 0 {elements => external}/components/libidn2.yml | 0 .../components/libiec61883.yml | 0 .../components/libinput.yml | 0 .../components/libinstpatch.yml | 0 .../components/libisoburn.yml | 0 .../components/libisofs.yml | 0 {elements => external}/components/libjit.yml | 0 .../components/libjpeg-turbo.yml | 0 .../components/libkcddb.yml | 0 .../components/libkdcraw.yml | 0 .../components/libkexiv2.yml | 0 {elements => external}/components/libksba.yml | 0 {elements => external}/components/libldap.yml | 0 {elements => external}/components/libllvm.yml | 0 {elements => external}/components/libmd.yml | 0 .../components/libmediaart.yml | 0 {elements => external}/components/libmng.yml | 0 {elements => external}/components/libmnl.yml | 0 {elements => external}/components/libmpc.yml | 0 {elements => external}/components/libmpd.yml | 0 {elements => external}/components/libmpfr.yml | 0 {elements => external}/components/libmtp.yml | 0 .../components/libmypaint.yml | 0 {elements => external}/components/libndp.yml | 0 .../components/libnetfilter_conntrack.yml | 0 .../components/libnfnetlink.yml | 0 {elements => external}/components/libnih.yml | 0 {elements => external}/components/libnl.yml | 0 {elements => external}/components/libnma.yml | 0 .../components/libnotify.yml | 0 {elements => external}/components/libnvme.yml | 0 {elements => external}/components/libogg.yml | 0 .../components/libosinfo.yml | 0 {elements => external}/components/libpeas.yml | 0 .../components/libpipeline.yml | 0 {elements => external}/components/libpng.yml | 0 .../components/libportal.yml | 0 {elements => external}/components/libpsl.yml | 0 .../components/libpwquality.yml | 0 .../components/libqalculate.yml | 0 {elements => external}/components/libraw.yml | 0 .../components/libraw1394.yml | 0 .../components/libreoffice.yml | 0 {elements => external}/components/librsvg.yml | 0 .../components/libsamplerate.yml | 0 {elements => external}/components/libsass.yml | 0 .../components/libseccomp.yml | 0 .../components/libsecret.yml | 0 .../components/libsigc++.yml | 0 .../components/libsigc++2.12.yml | 0 .../components/libslirp.yml | 0 .../components/libsmbios.yml | 0 .../components/libsndfile.yml | 0 .../components/libsodium.yml | 0 {elements => external}/components/libsoup.yml | 0 .../components/libsoup3.yml | 0 .../components/libspectre.yml | 0 .../components/libsquash.yml | 0 {elements => external}/components/libssh.yml | 0 .../components/libtasn1.yml | 0 {elements => external}/components/libthai.yml | 0 .../components/libtheora.yml | 0 {elements => external}/components/libtiff.yml | 0 .../components/libtirpc.yml | 0 {elements => external}/components/libtool.yml | 0 .../components/libtorrent-rasterbar.yml | 0 .../components/libunistring.yml | 0 .../components/libunwind.yml | 0 {elements => external}/components/libusb.yml | 0 .../components/libutf8proc.yml | 0 {elements => external}/components/libuv.yml | 0 .../components/libva-nomesa.yml | 0 .../components/libva-utils.yml | 0 {elements => external}/components/libva.yml | 0 .../components/libvdpau.yml | 0 .../components/libvirt-glib.yml | 0 {elements => external}/components/libvirt.yml | 0 .../components/libvncserver.yml | 0 .../components/libvorbis.yml | 0 {elements => external}/components/libvpx.yml | 0 .../components/libwacom.yml | 0 {elements => external}/components/libwebp.yml | 0 {elements => external}/components/libwnck.yml | 0 {elements => external}/components/libwpe.yml | 0 .../components/libxcrypt.yml | 0 .../components/libxdg-basedir.yml | 0 {elements => external}/components/libxml2.yml | 0 {elements => external}/components/libxmlb.yml | 0 {elements => external}/components/libxslt.yml | 0 .../components/libyaml-cpp.yml | 0 {elements => external}/components/libyaml.yml | 0 .../lightdm-gtk-greeter-settings.yml | 0 {elements => external}/components/lightdm.yml | 0 {elements => external}/components/lld.yml | 0 {elements => external}/components/llvm.yml | 0 .../components/lm-sensors.yml | 0 {elements => external}/components/lmdb.yml | 0 {elements => external}/components/locales.yml | 0 .../components/lsb-release.yml | 0 {elements => external}/components/lsof.yml | 0 {elements => external}/components/lua.yml | 0 {elements => external}/components/lua/lgi.yml | 0 .../components/lua/lgi53.yml | 0 {elements => external}/components/lua52.yml | 0 {elements => external}/components/lua53.yml | 0 {elements => external}/components/lvm2.yml | 0 .../components/lxappearance.yml | 0 {elements => external}/components/lxc.yml | 0 {elements => external}/components/lxcfs.yml | 0 {elements => external}/components/lxd.yml | 0 {elements => external}/components/lynis.yml | 0 {elements => external}/components/lynx.yml | 0 {elements => external}/components/lz4.yml | 0 {elements => external}/components/lzip.yml | 0 {elements => external}/components/lzo.yml | 0 {elements => external}/components/m4.yml | 0 {elements => external}/components/mailcap.yml | 0 {elements => external}/components/make.yml | 0 {elements => external}/components/mako.yml | 0 {elements => external}/components/man-db.yml | 0 .../components/man-pages.yml | 0 {elements => external}/components/mandoc.yml | 0 .../components/mariadb-runtime.yml | 0 {elements => external}/components/mariadb.yml | 0 .../components/mercurial.yml | 0 {elements => external}/components/mesa.yml | 0 {elements => external}/components/meson.yml | 0 .../components/meta-enlightenment.yml | 2 +- .../components/meta-gnome.yml | 2 +- .../components/meta-kf5.yml | 0 .../components/meta-plasma.yml | 2 +- .../components/meta-x11.yml | 2 +- .../components/meta-xfce4.yml | 2 +- .../components/metacity.yml | 0 .../components/miniupnpc.yml | 0 .../components/mkinitramfs.yml | 0 .../components/mod_wsgi.yml | 0 .../components/modemmanager.yml | 0 {elements => external}/components/mono.yml | 0 {elements => external}/components/mpg123.yml | 0 {elements => external}/components/mtdev.yml | 0 {elements => external}/components/mtools.yml | 0 {elements => external}/components/mutter.yml | 0 .../components/mypaint-brushes.yml | 0 {elements => external}/components/nano.yml | 0 {elements => external}/components/nasm.yml | 0 .../components/ncompress.yml | 0 {elements => external}/components/ncurses.yml | 0 .../components/neofetch.yml | 0 {elements => external}/components/nettle.yml | 0 .../components/network-manager-applet.yml | 0 .../components/networkmanager-openvpn.yml | 0 .../components/networkmanager-qt.yml | 2 +- .../components/networkmanager.yml | 0 {elements => external}/components/newt.yml | 0 {elements => external}/components/nghttp2.yml | 0 {elements => external}/components/nginx.yml | 0 {elements => external}/components/ninja.yml | 0 {elements => external}/components/nodejs.yml | 0 {elements => external}/components/npth.yml | 0 {elements => external}/components/nspr.yml | 0 {elements => external}/components/nss.yml | 0 {elements => external}/components/ntfs-3g.yml | 0 {elements => external}/components/numactl.yml | 0 .../components/nvidia-settings.yml | 2 +- {elements => external}/components/nvidia.yml | 6 +- {elements => external}/components/odbc.yml | 0 {elements => external}/components/ohmyzsh.yml | 0 {elements => external}/components/onboard.yml | 0 .../components/oniguruma.yml | 0 {elements => external}/components/openal.yml | 0 .../components/openblas-lapack.yml | 0 {elements => external}/components/opencv.yml | 0 {elements => external}/components/opencv3.yml | 0 {elements => external}/components/openfst.yml | 0 .../components/openjdk-bin.yml | 2 +- .../components/openjdk-jre.yml | 2 +- {elements => external}/components/openjdk.yml | 2 +- .../components/openjpeg.yml | 0 .../components/openldap.yml | 0 {elements => external}/components/openmpi.yml | 0 .../components/openpmix.yml | 0 {elements => external}/components/openssh.yml | 0 {elements => external}/components/openssl.yml | 0 {elements => external}/components/openvpn.yml | 0 {elements => external}/components/optipng.yml | 0 {elements => external}/components/opus.yml | 0 .../components/os-prober.yml | 0 .../components/osinfo-db-tools.yml | 0 .../components/osinfo-db.yml | 0 {elements => external}/components/ostree.yml | 0 {elements => external}/components/p11-kit.yml | 0 {elements => external}/components/p7zip.yml | 0 .../components/pam-config.yml | 0 {elements => external}/components/pam.yml | 0 .../components/pam_wrapper.yml | 0 {elements => external}/components/pamixer.yml | 0 {elements => external}/components/pango.yml | 0 {elements => external}/components/pangomm.yml | 0 .../components/pangomm2.46.yml | 0 {elements => external}/components/parted.yml | 0 {elements => external}/components/patch.yml | 0 .../components/pavucontrol.yml | 0 .../components/pcaudiolib.yml | 0 .../components/pciutils.yml | 0 {elements => external}/components/pcre.yml | 0 {elements => external}/components/pcre2.yml | 0 .../components/pcsclite.yml | 0 {elements => external}/components/perl.yml | 0 .../components/perl/perl-io-string.yml | 0 .../components/perl/perl-json.yml | 0 .../components/perl/perl-locale-gettext.yml | 0 .../components/perl/perl-mime-charset.yml | 0 .../components/perl/perl-module-build.yml | 0 .../components/perl/perl-parse-yapp.yml | 0 .../components/perl/perl-pod-parser.yml | 0 .../components/perl/perl-sgmls.yml | 0 .../components/perl/perl-term-readkey.yml | 0 .../components/perl/perl-text-charwidth.yml | 0 .../components/perl/perl-text-wrapi18n.yml | 0 .../components/perl/perl-timedate.yml | 0 .../perl/perl-unicode-linebreak.yml | 0 .../components/perl/perl-uri.yml | 0 .../components/perl/perl-xml-parser.yml | 0 .../components/perl/perl-xml-simple.yml | 0 .../components/perl/perl-yaml-tiny.yml | 0 {elements => external}/components/phodav.yml | 0 .../components/phonon-backend-gstreamer.yml | 0 {elements => external}/components/phonon.yml | 0 {elements => external}/components/physfs.yml | 0 {elements => external}/components/picom.yml | 0 {elements => external}/components/picotts.yml | 0 .../components/pinentry.yml | 0 .../components/pipewire.yml | 0 {elements => external}/components/pixman.yml | 0 .../components/pkg-config.yml | 0 .../components/plasma/ark.yml | 0 .../components/plasma/bluedevil.yml | 2 +- .../components/plasma/breeze-grub.yml | 2 +- .../components/plasma/breeze-gtk.yml | 2 +- .../components/plasma/breeze-icons.yml | 2 +- .../components/plasma/breeze.yml | 2 +- .../components/plasma/discover.yml | 2 +- .../components/plasma/drkonqi.yml | 0 .../components/plasma/kactivitymanagerd.yml | 2 +- .../components/plasma/kde-cli-tools.yml | 0 .../components/plasma/kde-gtk-config.yml | 0 .../components/plasma/kdecoration.yml | 2 +- .../components/plasma/kdeplasma-addons.yml | 0 .../components/plasma/kgamma5.yml | 0 .../components/plasma/khotkeys.yml | 0 .../components/plasma/kmenuedit.yml | 0 .../components/plasma/kpipewire.yml | 2 +- .../components/plasma/kscreen.yml | 2 +- .../components/plasma/kscreenlocker.yml | 2 +- .../components/plasma/ksshaskpass.yml | 2 +- .../components/plasma/ksystemstats.yml | 2 +- .../components/plasma/kwallet-pam.yml | 2 +- .../plasma/kwayland-integration.yml | 2 +- .../components/plasma/kwin.yml | 2 +- .../components/plasma/kwrited.yml | 2 +- .../components/plasma/layer-shell-qt.yml | 2 +- .../components/plasma/libkscreen.yml | 2 +- .../components/plasma/libksysguard.yml | 2 +- .../components/plasma/milou.yml | 2 +- .../components/plasma/oxygen-icons5.yml | 2 +- .../components/plasma/oxygen.yml | 2 +- .../plasma/plasma-browser-integration.yml | 2 +- .../components/plasma/plasma-desktop.yml | 2 +- .../components/plasma/plasma-disks.yml | 2 +- .../components/plasma/plasma-firewall.yml | 2 +- .../components/plasma/plasma-framework.yml | 2 +- .../components/plasma/plasma-integration.yml | 2 +- .../components/plasma/plasma-nm.yml | 2 +- .../components/plasma/plasma-pa.yml | 2 +- .../components/plasma/plasma-pam.yml | 2 +- .../components/plasma/plasma-sdk.yml | 2 +- .../plasma/plasma-systemmonitor.yml | 2 +- .../components/plasma/plasma-thunderbolt.yml | 2 +- .../components/plasma/plasma-vault.yml | 2 +- .../plasma/plasma-wayland-protocols.yml | 0 .../plasma/plasma-workspace-wallpapers.yml | 2 +- .../components/plasma/plasma-workspace.yml | 2 +- .../components/plasma/polkit-kde-agent-1.yml | 2 +- .../components/plasma/powerdevil.yml | 2 +- .../components/plasma/qqc2-breeze-style.yml | 2 +- .../components/plasma/sddm-kcm.yml | 2 +- .../components/plasma/systemsettings.yml | 2 +- .../plasma/xdg-desktop-portal-kde.yml | 2 +- .../components/playerctl.yml | 0 .../components/plymouth.yml | 0 {elements => external}/components/po4a.yml | 0 .../components/pocketsphinx.yml | 0 .../components/polkit-gnome.yml | 0 .../components/polkit-qt.yml | 0 {elements => external}/components/polkit.yml | 0 .../components/poppler-data.yml | 0 {elements => external}/components/poppler.yml | 0 {elements => external}/components/popt.yml | 0 {elements => external}/components/postfix.yml | 0 .../components/postgresql-runtime.yml | 0 .../components/postgresql.yml | 0 {elements => external}/components/potrace.yml | 0 .../components/power-profiles-daemon.yml | 0 {elements => external}/components/prison.yml | 2 +- .../components/procps-ng.yml | 0 {elements => external}/components/proot.yml | 0 .../components/protobuf.yml | 0 {elements => external}/components/psmisc.yml | 0 {elements => external}/components/pugixml.yml | 0 .../components/pulseaudio.yml | 0 {elements => external}/components/purpose.yml | 2 +- .../components/py/py-cairo.yml | 0 .../components/py/py-chardet.yml | 0 .../components/py/py-cups.yml | 0 .../components/py/py-curl.yml | 0 .../components/py/py-cython.yml | 0 .../components/py/py-dbus.yml | 0 .../components/py/py-dbusmock.yml | 0 .../components/py/py-distutils-extra.yml | 0 .../components/py/py-gobject.yml | 0 .../components/py/py-idna.yml | 0 .../components/py/py-jinja2.yml | 0 .../components/py/py-libvirt.yml | 0 .../components/py/py-mako.yml | 0 .../components/py/py-markdown.yml | 0 .../components/py/py-markupsafe.yml | 0 .../components/py/py-notify2.yml | 0 .../components/py/py-packaging.yml | 0 .../components/py/py-parsing.yml | 0 .../components/py/py-pip.yml | 0 .../components/py/py-psutil.yml | 0 .../components/py/py-pygments.yml | 0 .../components/py/py-requests.yml | 0 .../components/py/py-setuptools.yml | 0 .../components/py/py-six.yml | 0 .../components/py/py-socks.yml | 0 .../components/py/py-urllib3.yml | 0 .../components/py/py-xdg.yml | 0 .../components/py/py-yaml.yml | 0 {elements => external}/components/python.yml | 0 {elements => external}/components/python2.yml | 0 {elements => external}/components/qbe.yml | 0 {elements => external}/components/qca.yml | 0 {elements => external}/components/qemu.yml | 0 .../components/qqc2-desktop-style.yml | 2 +- .../components/qrencode.yml | 0 {elements => external}/components/qt.yml | 0 {elements => external}/components/quickjs.yml | 0 {elements => external}/components/quilt.yml | 0 .../components/qwlroots.yml | 0 {elements => external}/components/raft.yml | 0 {elements => external}/components/raptor.yml | 0 {elements => external}/components/rasqal.yml | 0 {elements => external}/components/rdfind.yml | 0 .../components/readline.yml | 0 {elements => external}/components/redflat.yml | 0 {elements => external}/components/redland.yml | 0 .../components/release-info.yml | 0 {elements => external}/components/rest.yml | 0 {elements => external}/components/rofi.yml | 0 .../components/rpcsvc-proto.yml | 0 {elements => external}/components/rrdtool.yml | 0 {elements => external}/components/rsync.yml | 0 {elements => external}/components/rtkit.yml | 0 {elements => external}/components/ruby.yml | 0 {elements => external}/components/runc.yml | 0 .../components/rust-bindgen.yml | 0 .../components/rust-stage1.yml | 2 +- {elements => external}/components/rustc.yml | 2 +- {elements => external}/components/samba.yml | 0 {elements => external}/components/sassc.yml | 0 {elements => external}/components/sbc.yml | 0 .../components/sbsigntools.yml | 0 {elements => external}/components/scdoc.yml | 0 {elements => external}/components/scenefx.yml | 0 {elements => external}/components/schroot.yml | 0 {elements => external}/components/scim.yml | 0 .../components/screenrotator.yml | 0 {elements => external}/components/scrot.yml | 0 {elements => external}/components/sddm.yml | 0 {elements => external}/components/sdl.yml | 0 {elements => external}/components/sdl2.yml | 0 .../components/sdl2_image.yml | 0 {elements => external}/components/seatd.yml | 0 {elements => external}/components/sed.yml | 0 .../components/selftest.yml | 0 {elements => external}/components/setconf.yml | 0 {elements => external}/components/sfwbar.yml | 0 .../components/sgml-common.yml | 0 {elements => external}/components/shaderc.yml | 0 {elements => external}/components/shadow.yml | 0 .../components/shared-mime-info.yml | 0 {elements => external}/components/shim.yml | 0 {elements => external}/components/slang.yml | 0 {elements => external}/components/slurp.yml | 0 .../components/snowball.yml | 0 .../components/sof-firmware.yml | 0 {elements => external}/components/solid.yml | 2 +- {elements => external}/components/sonnet.yml | 2 +- .../components/sound-theme-freedesktop.yml | 0 .../components/sphinxbase.yml | 0 .../components/spice-gtk.yml | 0 .../components/spice-protocol.yml | 0 .../components/spice-vdagent.yml | 0 {elements => external}/components/spice.yml | 0 .../components/spidermonkey.yml | 0 .../components/spirv-headers.yml | 0 .../components/spirv-llvm-translator.yml | 0 .../components/spirv-tools.yml | 0 {elements => external}/components/sqlite.yml | 0 .../components/squashfs-tools.yml | 0 .../components/squashfuse.yml | 0 {elements => external}/components/sshfs.yml | 0 .../components/startup-notification.yml | 0 {elements => external}/components/strace.yml | 0 {elements => external}/components/sudo.yml | 0 {elements => external}/components/sway.yml | 0 {elements => external}/components/swaybg.yml | 0 {elements => external}/components/swayfx.yml | 0 .../components/swayidle.yml | 0 .../components/swaylock.yml | 0 {elements => external}/components/swig.yml | 0 .../components/syndication.yml | 2 +- .../components/syntax-highlighting.yml | 2 +- .../components/syslinux.yml | 0 {elements => external}/components/sysprof.yml | 0 {elements => external}/components/sysroot.yml | 2 +- .../components/system-config-printer.yml | 0 {elements => external}/components/systemd.yml | 0 {elements => external}/components/taglib.yml | 0 {elements => external}/components/talloc.yml | 0 {elements => external}/components/tar.yml | 0 {elements => external}/components/tcc.yml | 0 {elements => external}/components/tcl.yml | 0 .../components/template-glib.yml | 0 {elements => external}/components/tepl.yml | 0 {elements => external}/components/texinfo.yml | 0 .../components/themes/adwaita-icon-theme.yml | 0 .../components/themes/dracula-gtk-theme.yml | 0 .../themes/elementary-xfce-icon.yml | 2 +- .../components/themes/elementary-xfce.yml | 2 +- .../components/themes/fluent-gtk-theme.yml | 0 .../components/themes/fluent-icon-theme.yml | 2 +- .../components/themes/fluent-wallpaper.yml | 0 .../themes/gnome-icon-theme-extras.yml | 0 .../themes/gnome-icon-theme-symbolic.yml | 0 .../components/themes/gnome-icon-theme.yml | 0 .../components/themes/grey-bird-gtk-theme.yml | 0 .../components/themes/orchis-gtk-theme.yml | 2 +- .../components/themes/qogir-gtk-theme.yml | 2 +- .../components/themes/qogir-icon-theme.yml | 2 +- .../components/themes/tela-icon-theme.yml | 0 .../components/thermald.yml | 0 .../components/threadweaver.yml | 2 +- {elements => external}/components/tint2.yml | 0 {elements => external}/components/tllist.yml | 0 {elements => external}/components/tlp.yml | 0 .../components/totem-pl-parser.yml | 0 .../components/touchegg.yml | 0 .../components/traceroute.yml | 0 .../components/tracker-miners.yml | 0 {elements => external}/components/tracker.yml | 0 .../components/triehash.yml | 0 .../components/typescript.yml | 0 {elements => external}/components/tzdata.yml | 0 .../components/uchardet.yml | 0 {elements => external}/components/udisks.yml | 0 {elements => external}/components/ufw.yml | 0 .../components/uncrustify.yml | 0 {elements => external}/components/unidef.yml | 0 {elements => external}/components/unrar.yml | 0 {elements => external}/components/unzip.yml | 0 {elements => external}/components/upower.yml | 0 .../components/usbredir.yml | 0 .../components/usbutils.yml | 0 {elements => external}/components/utf8cpp.yml | 0 {elements => external}/components/uthash.yml | 0 .../components/util-linux.yml | 0 .../components/v4l-utils.yml | 0 .../components/vaapi-driver.yml | 0 .../components/vala-language-server.yml | 0 {elements => external}/components/vala.yml | 0 .../components/valgrind.yml | 0 {elements => external}/components/vim.yml | 0 .../components/virt-manager.yml | 0 .../components/volume_key.yml | 0 {elements => external}/components/vte.yml | 0 .../components/vulkan-headers.yml | 0 .../components/vulkan-loader.yml | 0 {elements => external}/components/waf.yml | 0 .../components/wayland-protocols.yml | 0 {elements => external}/components/wayland.yml | 0 .../components/webkitgtk-6.0.yml | 0 .../components/webkitgtk.yml | 0 .../components/webp-pixbuf-loader.yml | 0 {elements => external}/components/welcome.yml | 2 +- {elements => external}/components/weston.yml | 0 {elements => external}/components/wget.yml | 0 {elements => external}/components/which.yml | 0 {elements => external}/components/wimlib.yml | 0 {elements => external}/components/wine.yml | 0 .../components/wireplumber.yml | 0 .../components/wl-clipboard.yml | 0 {elements => external}/components/wlgreet.yml | 0 {elements => external}/components/wlroots.yml | 0 .../components/wlroots0.16.yml | 0 {elements => external}/components/wmenu.yml | 0 {elements => external}/components/wob.yml | 0 {elements => external}/components/woff2.yml | 0 .../components/wpa_supplicant.yml | 0 .../components/wpebackend-fdo.yml | 0 .../components/wpewebkit.yml | 0 {elements => external}/components/wvkbd.yml | 0 {elements => external}/components/wxgtk.yml | 0 .../components/x11/font-util.yml | 0 .../components/x11/fonts-encodings.yml | 0 .../components/x11/iceauth.yml | 0 .../components/x11/libfontenc.yml | 0 .../components/x11/libice.yml | 0 .../components/x11/libpciaccess.yml | 0 .../components/x11/libsm.yml | 0 .../components/x11/libx11.yml | 0 .../components/x11/libxau.yml | 0 .../components/x11/libxaw.yml | 0 .../components/x11/libxcb.yml | 0 .../components/x11/libxcomposite.yml | 0 .../components/x11/libxcursor.yml | 0 .../components/x11/libxcvt.yml | 0 .../components/x11/libxdamage.yml | 0 .../components/x11/libxdmcp.yml | 0 .../components/x11/libxext.yml | 0 .../components/x11/libxfixes.yml | 0 .../components/x11/libxfont2.yml | 0 .../components/x11/libxft.yml | 0 .../components/x11/libxi.yml | 0 .../components/x11/libxinerama.yml | 0 .../components/x11/libxkbcommon.yml | 0 .../components/x11/libxkbfile.yml | 0 .../components/x11/libxklavier.yml | 0 .../components/x11/libxmu.yml | 0 .../components/x11/libxpm.yml | 0 .../components/x11/libxpresent.yml | 0 .../components/x11/libxrandr.yml | 0 .../components/x11/libxrender.yml | 0 .../components/x11/libxres.yml | 0 .../components/x11/libxscrnsaver.yml | 0 .../components/x11/libxshmfence.yml | 0 .../components/x11/libxt.yml | 0 .../components/x11/libxtst.yml | 0 .../components/x11/libxv.yml | 0 .../components/x11/libxvmc.yml | 0 .../components/x11/libxxf86vm.yml | 0 .../components/x11/mkfontscale.yml | 0 .../components/x11/sessreg.yml | 0 .../components/x11/setxkbmap.yml | 0 .../components/x11/smproxy.yml | 0 .../components/x11/util-macros.yml | 0 .../components/x11/xauth.yml | 0 .../components/x11/xbacklight.yml | 0 .../components/x11/xbitmaps.yml | 0 .../components/x11/xcb-proto.yml | 0 .../components/x11/xcb-util-cursor.yml | 0 .../components/x11/xcb-util-errors.yml | 0 .../components/x11/xcb-util-image.yml | 0 .../components/x11/xcb-util-keysyms.yml | 0 .../components/x11/xcb-util-renderutil.yml | 0 .../components/x11/xcb-util-wm.yml | 0 .../components/x11/xcb-util-xrm.yml | 0 .../components/x11/xcb-util.yml | 0 .../components/x11/xcmsdb.yml | 0 .../components/x11/xdpyinfo.yml | 0 {elements => external}/components/x11/xev.yml | 0 .../components/x11/xf86-input-evdev.yml | 0 .../components/x11/xf86-input-libinput.yml | 0 .../components/x11/xf86-input-synaptics.yml | 0 .../components/x11/xf86-input-wacom.yml | 0 .../components/x11/xf86-video-amdgpu.yml | 0 .../components/x11/xf86-video-ati.yml | 0 .../components/x11/xf86-video-fbdev.yml | 0 .../components/x11/xf86-video-intel.yml | 0 .../components/x11/xf86-video-nouveau.yml | 0 .../components/x11/xf86-video-qxl.yml | 0 .../components/x11/xf86-video-vmware.yml | 0 .../components/x11/xgamma.yml | 0 .../components/x11/xhost.yml | 0 .../components/x11/xinit.yml | 0 .../components/x11/xinput.yml | 0 .../components/x11/xkbcomp.yml | 0 .../components/x11/xkeyboard-config.yml | 0 .../components/x11/xmessage.yml | 0 .../components/x11/xmodmap.yml | 0 .../components/x11/xorgproto.yml | 0 .../components/x11/xprop.yml | 0 .../components/x11/xrandr.yml | 0 .../components/x11/xrdb.yml | 0 .../components/x11/xserver.yml | 0 .../components/x11/xsetroot.yml | 0 .../components/x11/xtrans.yml | 0 .../components/x11/xwayland.yml | 0 {elements => external}/components/x264.yml | 0 {elements => external}/components/x265.yml | 0 {elements => external}/components/xapp.yml | 0 .../components/xarchiver.yml | 0 {elements => external}/components/xdelta3.yml | 0 .../components/xdg-dbus-proxy.yml | 0 .../components/xdg-desktop-portal-gnome.yml | 0 .../components/xdg-desktop-portal-gtk.yml | 0 .../components/xdg-desktop-portal-wlr.yml | 0 .../components/xdg-desktop-portal-xapp.yml | 0 .../components/xdg-desktop-portal.yml | 0 .../components/xdg-user-dirs-gtk.yml | 0 .../components/xdg-user-dirs.yml | 0 .../components/xdg-utils.yml | 0 .../components/xfce4/exo.yml | 0 .../components/xfce4/garcon.yml | 0 .../components/xfce4/libxfce4ui.yml | 0 .../components/xfce4/libxfce4util.yml | 0 .../components/xfce4/mousepad.yml | 0 .../panel-plugins/xfce4-clipman-plugin.yml | 2 +- .../panel-plugins/xfce4-cpufreq-plugin.yml | 2 +- .../panel-plugins/xfce4-cpugraph-plugin.yml | 2 +- .../panel-plugins/xfce4-diskperf-plugin.yml | 2 +- .../panel-plugins/xfce4-docklike-plugin.yml | 0 .../xfce4/panel-plugins/xfce4-eyes-plugin.yml | 2 +- .../panel-plugins/xfce4-fsguard-plugin.yml | 2 +- .../panel-plugins/xfce4-genmon-plugin.yml | 2 +- .../panel-plugins/xfce4-mailwatch-plugin.yml | 2 +- .../panel-plugins/xfce4-mount-plugin.yml | 2 +- .../xfce4/panel-plugins/xfce4-mpc-plugin.yml | 2 +- .../panel-plugins/xfce4-netload-plugin.yml | 2 +- .../panel-plugins/xfce4-notes-plugin.yml | 2 +- .../panel-plugins/xfce4-pulseaudio-plugin.yml | 0 .../panel-plugins/xfce4-sensors-plugin.yml | 2 +- .../xfce4-smartbookmark-plugin.yml | 2 +- .../panel-plugins/xfce4-systemload-plugin.yml | 2 +- .../panel-plugins/xfce4-time-out-plugin.yml | 2 +- .../panel-plugins/xfce4-timer-plugin.yml | 2 +- .../panel-plugins/xfce4-verve-plugin.yml | 2 +- .../panel-plugins/xfce4-wavelan-plugin.yml | 2 +- .../panel-plugins/xfce4-weather-plugin.yml | 2 +- .../xfce4-whiskermenu-plugin.yml | 0 .../xfce4/panel-plugins/xfce4-xkb-plugin.yml | 0 .../components/xfce4/parole.yml | 0 .../components/xfce4/ristretto.yml | 0 .../components/xfce4/thunar-volman.yml | 0 .../components/xfce4/thunar.yml | 0 .../components/xfce4/tumbler.yml | 0 .../components/xfce4/xfce4-appfinder.yml | 0 .../components/xfce4/xfce4-dev-tools.yml | 0 .../components/xfce4/xfce4-notifyd.yml | 0 .../components/xfce4/xfce4-panel-profiles.yml | 0 .../components/xfce4/xfce4-panel.yml | 0 .../components/xfce4/xfce4-power-manager.yml | 0 .../components/xfce4/xfce4-screensaver.yml | 0 .../components/xfce4/xfce4-screenshooter.yml | 0 .../components/xfce4/xfce4-session.yml | 0 .../components/xfce4/xfce4-settings.yml | 0 .../components/xfce4/xfce4-taskmanager.yml | 0 .../components/xfce4/xfce4-terminal.yml | 0 .../components/xfce4/xfconf.yml | 0 .../components/xfce4/xfdesktop.yml | 0 .../components/xfce4/xfwm4.yml | 0 {elements => external}/components/xiccd.yml | 0 .../components/xine-lib.yml | 0 {elements => external}/components/xmlto.yml | 0 {elements => external}/components/xxhash.yml | 0 {elements => external}/components/xz.yml | 0 {elements => external}/components/yajl.yml | 0 {elements => external}/components/yarn.yml | 0 {elements => external}/components/yasm.yml | 0 .../components/yelp-xsl.yml | 0 {elements => external}/components/yodl.yml | 0 {elements => external}/components/zenity.yml | 0 {elements => external}/components/zip.yml | 0 {elements => external}/components/zlib.yml | 0 .../components/zram-generator.yml | 0 .../components/zsh-autosuggestions.yml | 0 {elements => external}/components/zsh.yml | 0 {elements => external}/components/zstd.yml | 0 {elements => external}/components/zsync.yml | 0 {elements => external}/container/image.yml | 2 +- {elements => external}/extensions/awesome.yml | 2 +- {elements => external}/extensions/bspwm.yml | 2 +- {elements => external}/extensions/dotnet.yml | 2 +- .../extensions/enlightenment.yml | 2 +- {elements => external}/extensions/i3.yml | 2 +- {elements => external}/extensions/nvidia.yml | 2 +- {elements => external}/extensions/openjdk.yml | 2 +- {elements => external}/extensions/qemu.yml | 2 +- {elements => external}/extensions/qt.yml | 2 +- {elements => external}/extensions/sdk.yml | 2 +- {elements => external}/extensions/sway.yml | 2 +- {elements => external}/extensions/wine.yml | 2 +- .../extensions/wm-kit-x11.yml | 2 +- {elements => external}/extensions/wm-kit.yml | 2 +- .../image-builder/debian.yml | 0 {elements => external}/include/app.inc | 0 {elements => external}/include/appimage.inc | 0 {elements => external}/include/binutils.inc | 0 {elements => external}/include/container.inc | 0 {elements => external}/include/extension.inc | 2 +- {elements => external}/include/gcc.inc | 0 {elements => external}/include/glade.inc | 0 {elements => external}/include/glibc.inc | 4 +- {elements => external}/include/go-pkg.inc | 0 {elements => external}/include/gtk-theme.inc | 0 {elements => external}/include/installer.inc | 0 .../include/integrate-apps.inc | 0 {elements => external}/include/java.inc | 0 {elements => external}/include/kf5.inc | 0 {elements => external}/include/linux.inc | 0 {elements => external}/include/liveconfig.inc | 0 {elements => external}/include/meta.inc | 0 {elements => external}/include/nvidia.inc | 0 {elements => external}/include/ostree.inc | 0 {elements => external}/include/plasma.inc | 0 {elements => external}/include/rlxos.inc | 0 {elements => external}/include/rust.inc | 0 {elements => external}/include/theme.inc | 0 .../include/thunar-plugin.inc | 0 .../include/update-icon-cache.inc | 0 {elements => external}/include/usr.inc | 0 .../include/xfce4-panel-plugin.inc | 0 {elements => external}/installer/image.yml | 2 +- .../integrity/build-tools-skip-autogen.yml | 0 .../integrity/container-requirements.yml | 0 .../integrity/golang-source-pkg.yml | 0 {elements => external}/integrity/ostree.yml | 0 {elements => external}/integrity/strip.yml | 0 {elements => external}/kernel/linux.yml | 6 +- {elements => external}/platform.yml | 2 +- .../system/default-background.yml | 2 +- .../system/etc-default-useradd.yml | 0 {elements => external}/system/etc-shells.yml | 0 {elements => external}/system/etc-skel.yml | 0 {elements => external}/system/etc-sysctl.yml | 0 .../system/ostree-config.yml | 0 {elements => external}/system/repo.yml | 2 +- .../system/systemd-preset.yml | 0 {elements => external}/system/x11-config.yml | 0 include/environ.yml | 10 - ostree-branch.yml | 2 + pkg/localize/localization.go | 85 - src/CMakeLists.txt | 6 - src/capsule | 1 - src/common/Application.h | 131 - src/common/Colors.h | 26 - src/common/Config.h | 151 - src/external/Curl.h | 80 - src/external/json.h | 24765 ---------------- src/initial-setup | 1 - src/pkgupd | 1 - src/sysroot/CMakeLists.txt | 22 - src/sysroot/Deployment.cpp | 100 - src/sysroot/Deployment.h | 26 - src/sysroot/Error.h | 27 - src/sysroot/Sysroot.cpp | 526 - src/sysroot/Sysroot.h | 76 - src/sysroot/main.cpp | 217 - toolchain/CMakeLists.txt | 1 + {include => toolchain}/compiler.yml | 0 toolchain/environ.yml | 6 + toolchain/ignite/CMakeLists.txt | 10 + toolchain/ignite/Configuration.cpp | 73 + toolchain/ignite/Configuration.h | 40 + toolchain/ignite/Container.cpp | 42 + toolchain/ignite/Container.h | 39 + toolchain/ignite/Executor.cpp | 113 + toolchain/ignite/Executor.h | 76 + toolchain/ignite/Ignite.cpp | 862 + toolchain/ignite/Ignite.h | 98 + toolchain/ignite/Recipe.cpp | 165 + toolchain/ignite/Recipe.h | 102 + toolchain/ignite/main.cpp | 112 + {src/external => toolchain/ignite}/picosha2.h | 0 {include => toolchain}/strip.yml | 0 {include => toolchain}/variables.yml | 3 +- tools/genlocale/main.go | 72 - version.yml | 3 + 1497 files changed, 2544 insertions(+), 27232 deletions(-) create mode 100644 .idea/.gitignore create mode 100644 .idea/codeStyles/Project.xml create mode 100644 .idea/codeStyles/codeStyleConfig.xml create mode 100644 .idea/editor.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/rlxos.iml create mode 100644 .idea/vcs.xml delete mode 100644 apps/welcome/assets/welcome.desktop delete mode 100644 apps/welcome/config/config.go delete mode 100644 apps/welcome/locale/hi.yaml delete mode 100644 apps/welcome/locale/locale.go delete mode 100644 apps/welcome/main.go delete mode 100644 apps/welcome/window/page.go delete mode 100644 apps/welcome/window/pages/apps/apps.go delete mode 100644 apps/welcome/window/pages/finish/finish.go delete mode 100644 apps/welcome/window/pages/looks/looks.go delete mode 100644 apps/welcome/window/pages/support/support.go delete mode 100644 apps/welcome/window/pages/welcome/welcome.go delete mode 100644 apps/welcome/window/style/global.css delete mode 100644 apps/welcome/window/style/style.go delete mode 100644 apps/welcome/window/window.go rename {files => assets}/2in1/2in1.c (100%) rename {files => assets}/AppImage.svg (100%) rename {files => assets}/backgrounds/default-blur.jpg (100%) rename {files => assets}/backgrounds/default.jpg (100%) rename {files => assets}/bash/bashrc (100%) rename {files => assets}/bash/user_bash_profile (100%) rename {files => assets}/bash/user_bashrc (100%) rename {files => assets}/bios (100%) rename {files => assets}/branding/rlxos-logo-dark.svg (100%) rename {files => assets}/branding/rlxos-logo-simple-white.svg (100%) rename {files => assets}/branding/rlxos-logo-simple.svg (100%) rename {files => assets}/branding/rlxos-logo-white.svg (100%) rename {files => assets}/branding/rlxos-logo.svg (100%) rename {files => assets}/ca-certificates/blacklist.txt (100%) rename {files => assets}/ca-certificates/certdata2pem.c (100%) rename {files => assets}/ca-certificates/update-ca-certificates (100%) rename {files => assets}/core/docbook-xsl-nons/docbook-xsl-nons-1.79.2-stack_fix-1.patch (100%) rename {files => assets}/core/systemd-repart-config/10-efi.conf (100%) rename {files => assets}/core/systemd-repart-config/20-usr-A.conf (100%) rename {files => assets}/core/systemd-repart-config/21-usr-verity-A.conf (100%) rename {files => assets}/core/systemd-repart-config/30-usr-B.conf (100%) rename {files => assets}/core/systemd-repart-config/31-usr-verity-B.conf (100%) rename {files => assets}/core/systemd-repart-config/50-root.conf (100%) rename {files => assets}/core/systemd-sysupdate-config/rlxos-kernel.conf (100%) rename {files => assets}/core/systemd-sysupdate-config/rlxos-usr-verity.conf (100%) rename {files => assets}/core/systemd-sysupdate-config/rlxos-usr.conf (100%) rename {files => assets}/dialogrc (100%) rename {files => assets}/dracut.conf (100%) rename {files => assets}/filesystem/env-generator (100%) rename {files => assets}/filesystem/fstab (100%) rename {files => assets}/filesystem/group (100%) rename {files => assets}/filesystem/gshadow (100%) rename {files => assets}/filesystem/host.conf (100%) rename {files => assets}/filesystem/hosts (100%) rename {files => assets}/filesystem/inputrc (100%) rename {files => assets}/filesystem/issue (100%) rename {files => assets}/filesystem/lsb-release (100%) rename {files => assets}/filesystem/nsswitch.conf (100%) rename {files => assets}/filesystem/os-release (100%) rename {files => assets}/filesystem/passwd (100%) rename {files => assets}/filesystem/profile (100%) rename {files => assets}/filesystem/resolv.conf (100%) rename {files => assets}/filesystem/securetty (100%) rename {files => assets}/filesystem/shadow (100%) rename {files => assets}/filesystem/shells (100%) rename {files => assets}/filesystem/sysusers (100%) rename {files => assets}/filesystem/tmpfiles (100%) rename {files => assets}/firefox/firefox.desktop (100%) rename {files => assets}/foot/foot.ini (100%) rename {files => assets}/greetd/config.toml (100%) rename {files => assets}/greetd/sway-config (100%) rename {files => assets}/greetd/wlgreet.toml (100%) rename {files => assets}/grub/0001-RLXOS-CONFIG-PATCH-TO-SUPPORT-OVERLAY-FS.patch (100%) rename {files => assets}/grub/grub.default (100%) rename {files => assets}/grub/unicode.pf2 (100%) rename {files => assets}/grub/unifont-13.0.06.bdf (100%) rename {files => assets}/grub/update-grub.sh (100%) rename {files => assets}/i3blocks/audio.sh (100%) rename {files => assets}/i3blocks/battery.sh (100%) rename {files => assets}/i3blocks/i3blocks.conf (100%) rename {files => assets}/i3blocks/network.sh (100%) rename {files => assets}/initial-setup/first-boot.sh (100%) rename {files => assets}/initial-setup/installer.sh (100%) rename {files => assets}/initramfs/init.in (100%) rename {files => assets}/initramfs/mkinitramfs.sh.in (100%) rename {files => assets}/interface/client/buttons.lua (100%) rename {files => assets}/interface/client/init.lua (100%) rename {files => assets}/interface/client/keys.lua (100%) rename {files => assets}/interface/client/rules.lua (100%) rename {files => assets}/interface/client/titlebar.lua (100%) rename {files => assets}/interface/config.lua (100%) rename {files => assets}/interface/internal/error-handling.lua (100%) rename {files => assets}/interface/internal/global-buttons.lua (100%) rename {files => assets}/interface/internal/global-keys.lua (100%) rename {files => assets}/interface/internal/global-menu.lua (100%) rename {files => assets}/interface/internal/layouts.lua (100%) rename {files => assets}/interface/internal/startup-apps.lua (100%) rename {files => assets}/interface/internal/wallpaper.lua (100%) rename {files => assets}/interface/panel/clock.lua (100%) rename {files => assets}/interface/panel/init.lua (100%) rename {files => assets}/interface/panel/prompt.lua (100%) rename {files => assets}/interface/panel/start-launcher.lua (100%) rename {files => assets}/interface/panel/taglist.lua (100%) rename {files => assets}/interface/panel/tasklist.lua (100%) rename {files => assets}/interface/picom.conf (100%) rename {files => assets}/interface/rc.lua (100%) rename {files => assets}/interface/theme/background.jpeg (100%) rename {files => assets}/interface/theme/layouts/cornerne.png (100%) rename {files => assets}/interface/theme/layouts/cornernew.png (100%) rename {files => assets}/interface/theme/layouts/cornernw.png (100%) rename {files => assets}/interface/theme/layouts/cornernww.png (100%) rename {files => assets}/interface/theme/layouts/cornerse.png (100%) rename {files => assets}/interface/theme/layouts/cornersew.png (100%) rename {files => assets}/interface/theme/layouts/cornersw.png (100%) rename {files => assets}/interface/theme/layouts/cornersww.png (100%) rename {files => assets}/interface/theme/layouts/dwindle.png (100%) rename {files => assets}/interface/theme/layouts/dwindlew.png (100%) rename {files => assets}/interface/theme/layouts/fairh.png (100%) rename {files => assets}/interface/theme/layouts/fairhw.png (100%) rename {files => assets}/interface/theme/layouts/fairv.png (100%) rename {files => assets}/interface/theme/layouts/fairvw.png (100%) rename {files => assets}/interface/theme/layouts/floating.png (100%) rename {files => assets}/interface/theme/layouts/floatingw.png (100%) rename {files => assets}/interface/theme/layouts/fullscreen.png (100%) rename {files => assets}/interface/theme/layouts/fullscreenw.png (100%) rename {files => assets}/interface/theme/layouts/magnifier.png (100%) rename {files => assets}/interface/theme/layouts/magnifierw.png (100%) rename {files => assets}/interface/theme/layouts/max.png (100%) rename {files => assets}/interface/theme/layouts/maxw.png (100%) rename {files => assets}/interface/theme/layouts/spiral.png (100%) rename {files => assets}/interface/theme/layouts/spiralw.png (100%) rename {files => assets}/interface/theme/layouts/tile.png (100%) rename {files => assets}/interface/theme/layouts/tilebottom.png (100%) rename {files => assets}/interface/theme/layouts/tilebottomw.png (100%) rename {files => assets}/interface/theme/layouts/tileleft.png (100%) rename {files => assets}/interface/theme/layouts/tileleftw.png (100%) rename {files => assets}/interface/theme/layouts/tiletop.png (100%) rename {files => assets}/interface/theme/layouts/tiletopw.png (100%) rename {files => assets}/interface/theme/layouts/tilew.png (100%) rename {files => assets}/interface/theme/submenu.png (100%) rename {files => assets}/interface/theme/taglist/squarefw.png (100%) rename {files => assets}/interface/theme/taglist/squarew.png (100%) rename {files => assets}/interface/theme/theme.lua (100%) rename {files => assets}/interface/theme/titlebar/close-active.png (100%) rename {files => assets}/interface/theme/titlebar/close-inactive.png (100%) rename {files => assets}/layouts/rlxos-1.0-silaghana.tar.bz2 (100%) rename {files => assets}/layouts/rlxos-1.5.tar.bz2 (100%) rename {files => assets}/multimedia-player.svg (100%) rename {files => assets}/pam/chage (100%) rename {files => assets}/pam/chfn (100%) rename {files => assets}/pam/chgpasswd (100%) rename {files => assets}/pam/chpasswd (100%) rename {files => assets}/pam/chsh (100%) rename {files => assets}/pam/groupadd (100%) rename {files => assets}/pam/groupdel (100%) rename {files => assets}/pam/groupmems (100%) rename {files => assets}/pam/groupmod (100%) rename {files => assets}/pam/login (100%) rename {files => assets}/pam/other (100%) rename {files => assets}/pam/passwd (100%) rename {files => assets}/pam/su (100%) rename {files => assets}/pam/system-account (100%) rename {files => assets}/pam/system-auth (100%) rename {files => assets}/pam/system-password (100%) rename {files => assets}/pam/system-session (100%) rename {files => assets}/pam/systemd-user (100%) rename {files => assets}/pam/useradd (100%) rename {files => assets}/pam/userdel (100%) rename {files => assets}/pam/usermod (100%) rename {files => assets}/rlxos.gpg (100%) rename {files => assets}/rofi/colors/default.rasi (100%) rename {files => assets}/rofi/themes/ApplicationLauncher.rasi (100%) rename {files => assets}/rofi/themes/Powermenu.rasi (100%) rename {files => assets}/rofi/themes/QuickLauncher.rasi (100%) rename {files => assets}/scripts/Powermenu (100%) rename {files => assets}/scripts/TabletMode (100%) rename {files => assets}/sdt-config.h (100%) rename {files => assets}/sdt.h (100%) rename {files => assets}/seatd/seatd.preset (100%) rename {files => assets}/seatd/sysuser.conf (100%) rename {files => assets}/sway/config (100%) rename {files => assets}/sway/config-locked (100%) rename {files => assets}/sway/config.d/autostart.conf (100%) rename {files => assets}/sway/config.d/background.conf (100%) rename {files => assets}/sway/config.d/bindings.conf (100%) rename {files => assets}/sway/config.d/color-scheme.conf (100%) rename {files => assets}/sway/config.d/defaults.conf (100%) rename {files => assets}/sway/config.d/devices.conf (100%) rename {files => assets}/sway/config.d/fonts.conf (100%) rename {files => assets}/sway/config.d/statusbar.conf (100%) rename {files => assets}/swaylock/config (100%) rename {files => assets}/wob/wob.ini (100%) rename {files => assets}/zsh/profile (100%) create mode 100644 channel.yml delete mode 100644 cmake/FindOSTree.cmake delete mode 100644 cmake/GLibUtils.cmake delete mode 100644 elements/components/glade.yml rename {elements => external}/apps/alacritty.yml (95%) rename {elements => external}/apps/blender.yml (92%) rename {elements => external}/apps/gigolo.yml (91%) rename {elements => external}/apps/glade.yml (87%) rename {elements => external}/apps/peek.yml (90%) rename {elements => external}/apps/pinta.yml (95%) rename {elements => external}/bootstrap.yml (100%) rename {elements => external}/components/2in1.yml (100%) rename {elements => external}/components/abseil-cpp.yml (100%) rename {elements => external}/components/accountsservice.yml (100%) rename {elements => external}/components/acl.yml (100%) rename {elements => external}/components/acpid.yml (100%) rename {elements => external}/components/alsa-lib.yml (100%) rename {elements => external}/components/amtk.yml (100%) rename {elements => external}/components/android-tools.yml (100%) rename {elements => external}/components/android-udev.yml (100%) rename {elements => external}/components/apache-ant.yml (100%) rename {elements => external}/components/apache.yml (100%) rename {elements => external}/components/apparmor.yml (100%) rename {elements => external}/components/appcenter.yml (100%) rename {elements => external}/components/appimaged.yml (100%) rename {elements => external}/components/appimagetool.yml (100%) rename {elements => external}/components/appstream-glib.yml (100%) rename {elements => external}/components/appstream.yml (100%) rename {elements => external}/components/apr-util.yml (100%) rename {elements => external}/components/apr.yml (100%) rename {elements => external}/components/aspell.yml (100%) rename {elements => external}/components/at-spi2-core.yml (100%) rename {elements => external}/components/atkmm.yml (100%) rename {elements => external}/components/atkmm2.28.yml (100%) rename {elements => external}/components/attica.yml (77%) rename {elements => external}/components/attr.yml (100%) rename {elements => external}/components/audit.yml (100%) rename {elements => external}/components/autoconf-archive.yml (100%) rename {elements => external}/components/autoconf.yml (100%) rename {elements => external}/components/automake.yml (100%) rename {elements => external}/components/avahi.yml (100%) rename {elements => external}/components/awesome.yml (100%) rename {elements => external}/components/babl.yml (100%) rename {elements => external}/components/baloo-widgets.yml (100%) rename {elements => external}/components/baloo.yml (100%) rename {elements => external}/components/bash.yml (85%) rename {elements => external}/components/bc.yml (100%) rename {elements => external}/components/bemenu.yml (100%) rename {elements => external}/components/benchmark.yml (100%) rename {elements => external}/components/binutils.yml (75%) rename {elements => external}/components/bison.yml (100%) rename {elements => external}/components/blueman.yml (100%) rename {elements => external}/components/bluez-qt.yml (80%) rename {elements => external}/components/bluez.yml (100%) rename {elements => external}/components/bogofilter.yml (100%) rename {elements => external}/components/boost.yml (100%) rename {elements => external}/components/bootstrap.yml (100%) rename {elements => external}/components/bootstrap/binutils-stage1.yml (71%) rename {elements => external}/components/bootstrap/binutils-stage2.yml (71%) rename {elements => external}/components/bootstrap/gcc-stage1.yml (73%) rename {elements => external}/components/bootstrap/gcc-stage2.yml (73%) rename {elements => external}/components/bootstrap/glibc-stage1.yml (70%) rename {elements => external}/components/bootstrap/glibc-stage2.yml (71%) rename {elements => external}/components/branding.yml (100%) rename {elements => external}/components/bridge-utils.yml (100%) rename {elements => external}/components/brightnessctl.yml (100%) rename {elements => external}/components/brotli.yml (100%) rename {elements => external}/components/bsdiff.yml (100%) rename {elements => external}/components/bspwm.yml (100%) rename {elements => external}/components/btrfs-progs.yml (100%) rename {elements => external}/components/bubblewrap.yml (100%) rename {elements => external}/components/busybox.yml (100%) rename {elements => external}/components/bzip2.yml (100%) rename {elements => external}/components/ca-certificates-java.yml (100%) rename {elements => external}/components/ca-certificates.yml (88%) rename {elements => external}/components/cabextract.yml (100%) rename {elements => external}/components/cage.yml (100%) rename {elements => external}/components/cairo.yml (100%) rename {elements => external}/components/cairomm.yml (100%) rename {elements => external}/components/cairomm1.14.yml (100%) rename {elements => external}/components/capsule.yml (85%) rename {elements => external}/components/cbindgen.yml (100%) rename {elements => external}/components/ccache.yml (100%) rename {elements => external}/components/cdparanoia.yml (100%) rename {elements => external}/components/cdrtools.yml (100%) rename {elements => external}/components/cgroupfs-mount.yml (100%) rename {elements => external}/components/check.yml (100%) rename {elements => external}/components/chromaprint.yml (100%) rename {elements => external}/components/cifs-utils.yml (100%) rename {elements => external}/components/clucene.yml (100%) rename {elements => external}/components/clutter-gst.yml (100%) rename {elements => external}/components/clutter-gtk.yml (100%) rename {elements => external}/components/clutter.yml (100%) rename {elements => external}/components/cmake.yml (100%) rename {elements => external}/components/cog.yml (100%) rename {elements => external}/components/cogl.yml (100%) rename {elements => external}/components/colord-gtk.yml (100%) rename {elements => external}/components/colord.yml (100%) rename {elements => external}/components/compiz.yml (100%) rename {elements => external}/components/conky-manager.yml (100%) rename {elements => external}/components/conky.yml (100%) rename {elements => external}/components/connman.yml (100%) rename {elements => external}/components/containerd.yml (100%) rename {elements => external}/components/core.yml (95%) rename {elements => external}/components/coreutils.yml (100%) rename {elements => external}/components/cpio.yml (100%) rename {elements => external}/components/cppgir.yml (100%) rename {elements => external}/components/cppunit.yml (100%) rename {elements => external}/components/cracklib.yml (100%) rename {elements => external}/components/cryptsetup.yml (100%) rename {elements => external}/components/cups.yml (100%) rename {elements => external}/components/curl.yml (100%) rename {elements => external}/components/cxxopts.yml (100%) rename {elements => external}/components/cyrus-sasl.yml (100%) rename {elements => external}/components/dbus-c++.yml (100%) rename {elements => external}/components/dbus-cxx.yml (100%) rename {elements => external}/components/dbus-glib.yml (100%) rename {elements => external}/components/dbus-nosystemd.yml (100%) rename {elements => external}/components/dbus.yml (100%) rename {elements => external}/components/dconf-editor.yml (100%) rename {elements => external}/components/dconf.yml (100%) rename {elements => external}/components/debian-archive-keyring.yml (100%) rename {elements => external}/components/debootstrap.yml (100%) rename {elements => external}/components/debugedit.yml (100%) rename {elements => external}/components/desktop-file-utils.yml (100%) rename {elements => external}/components/devel.yml (100%) rename {elements => external}/components/dialog.yml (100%) rename {elements => external}/components/diffutils.yml (100%) rename {elements => external}/components/directx-headers.yml (100%) rename {elements => external}/components/distrobox.yml (100%) rename {elements => external}/components/dkms.yml (100%) rename {elements => external}/components/dmenu.yml (100%) rename {elements => external}/components/dmidecode.yml (100%) rename {elements => external}/components/dnsmasq.yml (100%) rename {elements => external}/components/docbook-xml.yml (100%) rename {elements => external}/components/docbook-xsl.yml (95%) rename {elements => external}/components/docker.yml (100%) rename {elements => external}/components/dosfstools.yml (100%) rename {elements => external}/components/dotnet-runtime.yml (100%) rename {elements => external}/components/dotnet.yml (100%) rename {elements => external}/components/double-conversion.yml (100%) rename {elements => external}/components/dpkg.yml (100%) rename {elements => external}/components/dpp.yml (100%) rename {elements => external}/components/dqlite.yml (100%) rename {elements => external}/components/dracut.yml (100%) rename {elements => external}/components/dtc.yml (100%) rename {elements => external}/components/duktape.yml (100%) rename {elements => external}/components/e2fsprogs.yml (100%) rename {elements => external}/components/ed.yml (100%) rename {elements => external}/components/efibootmgr.yml (100%) rename {elements => external}/components/efivar.yml (100%) rename {elements => external}/components/egl-wayland.yml (100%) rename {elements => external}/components/eglexternalplatform.yml (100%) rename {elements => external}/components/elementary-xfce-icons.yml (100%) rename {elements => external}/components/enchant.yml (100%) rename {elements => external}/components/enet.yml (100%) rename {elements => external}/components/enlightenment/efl.yml (100%) rename {elements => external}/components/enlightenment/enlightenment.yml (100%) rename {elements => external}/components/enlightenment/terminology.yml (100%) rename {elements => external}/components/epdfview.yml (100%) rename {elements => external}/components/espeak-ng.yml (100%) rename {elements => external}/components/evolution-data-server.yml (100%) rename {elements => external}/components/evtest.yml (100%) rename {elements => external}/components/exempi.yml (100%) rename {elements => external}/components/exiv2.yml (100%) rename {elements => external}/components/expat.yml (100%) rename {elements => external}/components/extra-cmake-modules.yml (81%) rename {elements => external}/components/fakeroot.yml (100%) rename {elements => external}/components/fcft.yml (100%) rename {elements => external}/components/fcron.yml (100%) rename {elements => external}/components/fdk-aac.yml (100%) rename {elements => external}/components/ffmpeg.yml (100%) rename {elements => external}/components/fftw.yml (100%) rename {elements => external}/components/file-roller.yml (100%) rename {elements => external}/components/file.yml (100%) rename {elements => external}/components/filesystem.yml (100%) rename {elements => external}/components/findutils.yml (100%) rename {elements => external}/components/firefox-src.yml (99%) rename {elements => external}/components/firefox.yml (100%) rename {elements => external}/components/firmware.yml (100%) rename {elements => external}/components/flac.yml (100%) rename {elements => external}/components/flatpak.yml (100%) rename {elements => external}/components/flex.yml (100%) rename {elements => external}/components/fmt.yml (100%) rename {elements => external}/components/folks.yml (100%) rename {elements => external}/components/fontconfig.yml (100%) rename {elements => external}/components/fonts/adobe-source-code-pro-fonts.yml (100%) rename {elements => external}/components/fonts/cantarell.yml (100%) rename {elements => external}/components/fonts/dejavu-fonts.yml (100%) rename {elements => external}/components/fonts/fira-code.yml (100%) rename {elements => external}/components/fonts/gofont.yml (100%) rename {elements => external}/components/fonts/gsfonts.yml (100%) rename {elements => external}/components/fonts/ibm-plex-nerd-fonts.yml (100%) rename {elements => external}/components/fonts/ibm-plex.yml (100%) rename {elements => external}/components/fonts/inconsolata.yml (100%) rename {elements => external}/components/fonts/liberation-fonts.yml (100%) rename {elements => external}/components/fonts/noto-cjk.yml (100%) rename {elements => external}/components/fonts/noto-emoji.yml (100%) rename {elements => external}/components/fonts/noto.yml (100%) rename {elements => external}/components/fonts/opensans.yml (100%) rename {elements => external}/components/foot.yml (100%) rename {elements => external}/components/fprintd.yml (100%) rename {elements => external}/components/frameworkintegration.yml (100%) rename {elements => external}/components/freeglut.yml (100%) rename {elements => external}/components/freerdp.yml (100%) rename {elements => external}/components/freetype.yml (100%) rename {elements => external}/components/fribidi.yml (100%) rename {elements => external}/components/fuse.yml (100%) rename {elements => external}/components/fuse2.yml (100%) rename {elements => external}/components/gawk.yml (100%) rename {elements => external}/components/gc.yml (100%) rename {elements => external}/components/gcc.yml (85%) rename {elements => external}/components/gconf.yml (100%) rename {elements => external}/components/gcr-4.yml (100%) rename {elements => external}/components/gcr.yml (100%) rename {elements => external}/components/gd.yml (100%) rename {elements => external}/components/gdb.yml (100%) rename {elements => external}/components/gdbm.yml (100%) rename {elements => external}/components/gdk-pixbuf.yml (100%) rename {elements => external}/components/gdl.yml (100%) rename {elements => external}/components/gegl.yml (100%) rename {elements => external}/components/genimage.yml (100%) rename {elements => external}/components/geoclue.yml (100%) rename {elements => external}/components/geocode-glib.yml (100%) rename {elements => external}/components/geoip-database.yml (100%) rename {elements => external}/components/geoip.yml (100%) rename {elements => external}/components/gettext.yml (100%) rename {elements => external}/components/gexiv2.yml (100%) rename {elements => external}/components/gfbgraph.yml (100%) rename {elements => external}/components/ghostscript.yml (100%) rename {elements => external}/components/giflib.yml (100%) rename {elements => external}/components/gimp.yml (100%) rename {elements => external}/components/git.yml (100%) rename {elements => external}/components/gjs.yml (100%) create mode 100644 external/components/glade.yml rename {elements => external}/components/glew.yml (100%) rename {elements => external}/components/glfw.yml (100%) rename {elements => external}/components/glib-networking.yml (100%) rename {elements => external}/components/glib.yml (100%) rename {elements => external}/components/glibc-dbg.yml (100%) rename {elements => external}/components/glibc.yml (81%) rename {elements => external}/components/glibmm.yml (100%) rename {elements => external}/components/glibmm2.66.yml (100%) rename {elements => external}/components/glm.yml (100%) rename {elements => external}/components/gloox.yml (100%) rename {elements => external}/components/glslang.yml (100%) rename {elements => external}/components/glu.yml (100%) rename {elements => external}/components/gmime.yml (100%) rename {elements => external}/components/gmp.yml (100%) rename {elements => external}/components/gnome-control-center.yml (100%) rename {elements => external}/components/gnome-keyring.yml (100%) rename {elements => external}/components/gnome/evince.yml (100%) rename {elements => external}/components/gnome/gdm.yml (100%) rename {elements => external}/components/gnome/gnome-autoar.yml (100%) rename {elements => external}/components/gnome/gnome-backgrounds.yml (100%) rename {elements => external}/components/gnome/gnome-bluetooth.yml (100%) rename {elements => external}/components/gnome/gnome-control-center.yml (100%) rename {elements => external}/components/gnome/gnome-desktop.yml (100%) rename {elements => external}/components/gnome/gnome-epub-thumbnailer.yml (100%) rename {elements => external}/components/gnome/gnome-initial-setup.yml (100%) rename {elements => external}/components/gnome/gnome-menus.yml (100%) rename {elements => external}/components/gnome/gnome-online-accounts.yml (100%) rename {elements => external}/components/gnome/gnome-power-manager.yml (100%) rename {elements => external}/components/gnome/gnome-session.yml (100%) rename {elements => external}/components/gnome/gnome-settings-daemon.yml (100%) rename {elements => external}/components/gnome/gnome-shell-extension-arc-menu.yml (100%) rename {elements => external}/components/gnome/gnome-shell-extension-blur-me.yml (100%) rename {elements => external}/components/gnome/gnome-shell-extension-dash-to-panel.yml (100%) rename {elements => external}/components/gnome/gnome-shell-extension-desktop-icons-ng.yml (100%) rename {elements => external}/components/gnome/gnome-shell-extension-nightmode.yml (100%) rename {elements => external}/components/gnome/gnome-shell-extension-x11gestures.yml (100%) rename {elements => external}/components/gnome/gnome-shell-extensions.yml (100%) rename {elements => external}/components/gnome/gnome-shell.yml (100%) rename {elements => external}/components/gnome/gnome-software.yml (100%) rename {elements => external}/components/gnome/gnome-terminal.yml (100%) rename {elements => external}/components/gnome/gnome-video-effects.yml (100%) rename {elements => external}/components/gnome/nautilus.yml (100%) rename {elements => external}/components/gnu-efi.yml (100%) rename {elements => external}/components/gnupg.yml (100%) rename {elements => external}/components/gnutls.yml (100%) rename {elements => external}/components/go.yml (100%) rename {elements => external}/components/go/gotk4.yml (75%) rename {elements => external}/components/gobject-introspection.yml (100%) rename {elements => external}/components/gom.yml (100%) rename {elements => external}/components/gparted.yml (100%) rename {elements => external}/components/gperf.yml (100%) rename {elements => external}/components/gpgme.yml (100%) rename {elements => external}/components/gptfdisk.yml (100%) rename {elements => external}/components/grafana.yml (100%) rename {elements => external}/components/granite.yml (100%) rename {elements => external}/components/graphene.yml (100%) rename {elements => external}/components/graphite2.yml (100%) rename {elements => external}/components/graphviz.yml (100%) rename {elements => external}/components/greetd.yml (100%) rename {elements => external}/components/grep.yml (100%) rename {elements => external}/components/grilo-plugins.yml (100%) rename {elements => external}/components/grilo.yml (100%) rename {elements => external}/components/grim.yml (100%) rename {elements => external}/components/grimshot.yml (100%) rename {elements => external}/components/groff.yml (100%) rename {elements => external}/components/grub-i386.yml (100%) rename {elements => external}/components/grub.yml (93%) rename {elements => external}/components/gsettings-desktop-schemas.yml (100%) rename {elements => external}/components/gsl.yml (100%) rename {elements => external}/components/gsound.yml (100%) rename {elements => external}/components/gspell.yml (100%) rename {elements => external}/components/gstreamer.yml (100%) rename {elements => external}/components/gtest.yml (100%) rename {elements => external}/components/gtk-doc.yml (100%) rename {elements => external}/components/gtk-layer-shell.yml (100%) rename {elements => external}/components/gtk-vnc.yml (100%) rename {elements => external}/components/gtk.yml (100%) rename {elements => external}/components/gtk4.yml (100%) rename {elements => external}/components/gtkgreet.yml (100%) rename {elements => external}/components/gtkmm.yml (100%) rename {elements => external}/components/gtkmm4.yml (100%) rename {elements => external}/components/gtksourceview4.yml (100%) rename {elements => external}/components/gtksourceview5.yml (100%) rename {elements => external}/components/gufw.yml (100%) rename {elements => external}/components/guile.yml (100%) rename {elements => external}/components/gvfs.yml (100%) rename {elements => external}/components/gzip.yml (100%) rename {elements => external}/components/harfbuzz.yml (100%) rename {elements => external}/components/help2man.yml (100%) rename {elements => external}/components/hicolor-icon-theme.yml (100%) rename {elements => external}/components/highlight.yml (100%) rename {elements => external}/components/htop.yml (100%) rename {elements => external}/components/http-parser.yml (100%) rename {elements => external}/components/hunspell.yml (100%) rename {elements => external}/components/hwdata.yml (100%) rename {elements => external}/components/hwloc.yml (100%) rename {elements => external}/components/i3.yml (100%) rename {elements => external}/components/i3blocks.yml (100%) rename {elements => external}/components/i3lock.yml (100%) rename {elements => external}/components/i3status.yml (100%) rename {elements => external}/components/iana-etc.yml (100%) rename {elements => external}/components/ibus.yml (100%) rename {elements => external}/components/icmake.yml (100%) rename {elements => external}/components/icon-naming-utils.yml (100%) rename {elements => external}/components/icu.yml (100%) rename {elements => external}/components/iio-sensor-proxy.yml (100%) rename {elements => external}/components/iio-sway.yml (100%) rename {elements => external}/components/imagemagick.yml (100%) rename {elements => external}/components/imlib2.yml (100%) rename {elements => external}/components/inetutils.yml (100%) rename {elements => external}/components/inih.yml (100%) rename {elements => external}/components/initial-setup.yml (99%) rename {elements => external}/components/initramfs.yml (100%) rename {elements => external}/components/intel-ucode.yml (100%) rename {elements => external}/components/intltool.yml (100%) rename {elements => external}/components/inxi.yml (100%) rename {elements => external}/components/iproute2.yml (100%) rename {elements => external}/components/iptables.yml (100%) rename {elements => external}/components/iso-codes.yml (100%) rename {elements => external}/components/itstool.yml (100%) rename {elements => external}/components/iucode-tool.yml (100%) rename {elements => external}/components/jack.yml (100%) rename {elements => external}/components/jansson.yml (100%) rename {elements => external}/components/jasper.yml (100%) rename {elements => external}/components/jetring.yml (100%) rename {elements => external}/components/jfsutils.yml (100%) rename {elements => external}/components/jq.yml (100%) rename {elements => external}/components/json-c.yml (100%) rename {elements => external}/components/json-glib.yml (100%) rename {elements => external}/components/jsonrpc-glib.yml (100%) rename {elements => external}/components/kactivities-stats.yml (81%) rename {elements => external}/components/kactivities.yml (86%) rename {elements => external}/components/kapidox.yml (90%) rename {elements => external}/components/karchive.yml (77%) rename {elements => external}/components/kauth.yml (85%) rename {elements => external}/components/kbd.yml (100%) rename {elements => external}/components/kbookmarks.yml (79%) rename {elements => external}/components/kcalendarcore.yml (82%) rename {elements => external}/components/kcmutils.yml (79%) rename {elements => external}/components/kcodecs.yml (78%) rename {elements => external}/components/kcolorscheme.yml (87%) rename {elements => external}/components/kcompletion.yml (86%) rename {elements => external}/components/kconfig.yml (77%) rename {elements => external}/components/kconfigwidgets.yml (92%) rename {elements => external}/components/kcontacts.yml (85%) rename {elements => external}/components/kcoreaddons.yml (78%) rename {elements => external}/components/kcrash.yml (83%) rename {elements => external}/components/kdav.yml (76%) rename {elements => external}/components/kdbusaddons.yml (78%) rename {elements => external}/components/kdeclarative.yml (84%) rename {elements => external}/components/kded.yml (83%) rename {elements => external}/components/kdelibs4support.yml (93%) rename {elements => external}/components/kdesignerplugin.yml (89%) rename {elements => external}/components/kdesu.yml (80%) rename {elements => external}/components/kdewebkit.yml (88%) rename {elements => external}/components/kdnssd.yml (77%) rename {elements => external}/components/kdoctools.yml (87%) rename {elements => external}/components/kdsoap.yml (100%) rename {elements => external}/components/kemoticons.yml (82%) rename {elements => external}/components/kernel-headers.yml (91%) rename {elements => external}/components/keybinder.yml (100%) rename {elements => external}/components/keyutils.yml (100%) rename {elements => external}/components/kfilemetadata.yml (88%) rename {elements => external}/components/kglobalaccel.yml (84%) rename {elements => external}/components/kguiaddons.yml (83%) rename {elements => external}/components/khelpcenter.yml (100%) rename {elements => external}/components/kholidays.yml (78%) rename {elements => external}/components/khtml.yml (90%) rename {elements => external}/components/ki18n.yml (80%) rename {elements => external}/components/kiconthemes.yml (85%) rename {elements => external}/components/kidletime.yml (81%) rename {elements => external}/components/kimageformats.yml (82%) rename {elements => external}/components/kinfocenter.yml (100%) rename {elements => external}/components/kinit.yml (80%) rename {elements => external}/components/kio-extras.yml (100%) rename {elements => external}/components/kio.yml (90%) rename {elements => external}/components/kirigami2.yml (81%) rename {elements => external}/components/kitemmodels.yml (78%) rename {elements => external}/components/kitemviews.yml (78%) rename {elements => external}/components/kjobwidgets.yml (85%) rename {elements => external}/components/kjs.yml (88%) rename {elements => external}/components/kjsembed.yml (89%) rename {elements => external}/components/kmediaplayer.yml (87%) rename {elements => external}/components/kmix.yml (100%) rename {elements => external}/components/kmod.yml (100%) rename {elements => external}/components/knewstuff.yml (87%) rename {elements => external}/components/knotifications.yml (88%) rename {elements => external}/components/knotifyconfig.yml (79%) rename {elements => external}/components/kpackage.yml (86%) rename {elements => external}/components/kparts.yml (77%) rename {elements => external}/components/kpeople.yml (86%) rename {elements => external}/components/kplotting.yml (78%) rename {elements => external}/components/kpmcore.yml (100%) rename {elements => external}/components/kpty.yml (83%) rename {elements => external}/components/kquickcharts.yml (78%) rename {elements => external}/components/krb5.yml (100%) rename {elements => external}/components/kross.yml (88%) rename {elements => external}/components/krunner.yml (85%) rename {elements => external}/components/kservice.yml (87%) rename {elements => external}/components/ktexteditor.yml (83%) rename {elements => external}/components/ktextwidgets.yml (85%) rename {elements => external}/components/kunitconversion.yml (82%) rename {elements => external}/components/kuserfeedback.yml (100%) rename {elements => external}/components/kwallet.yml (90%) rename {elements => external}/components/kwayland.yml (85%) rename {elements => external}/components/kwidgetsaddons.yml (79%) rename {elements => external}/components/kwindowsystem.yml (83%) rename {elements => external}/components/kxmlgui.yml (82%) rename {elements => external}/components/kxmlrpcclient.yml (87%) rename {elements => external}/components/l-smash.yml (100%) rename {elements => external}/components/labwc.yml (100%) rename {elements => external}/components/lame.yml (100%) rename {elements => external}/components/lavalauncher.yml (100%) rename {elements => external}/components/lcms.yml (100%) rename {elements => external}/components/less.yml (100%) rename {elements => external}/components/lftp.yml (100%) rename {elements => external}/components/libadwaita.yml (100%) rename {elements => external}/components/libaio.yml (100%) rename {elements => external}/components/libaom.yml (100%) rename {elements => external}/components/libappimage.yml (100%) rename {elements => external}/components/libarchive.yml (100%) rename {elements => external}/components/libass.yml (100%) rename {elements => external}/components/libassuan.yml (100%) rename {elements => external}/components/libatasmart.yml (100%) rename {elements => external}/components/libatomic_ops.yml (100%) rename {elements => external}/components/libavc1394.yml (100%) rename {elements => external}/components/libavif.yml (100%) rename {elements => external}/components/libblockdev.yml (100%) rename {elements => external}/components/libboost.yml (100%) rename {elements => external}/components/libbsd.yml (100%) rename {elements => external}/components/libburn.yml (100%) rename {elements => external}/components/libbytesize.yml (100%) rename {elements => external}/components/libcacard.yml (100%) rename {elements => external}/components/libcanberra.yml (100%) rename {elements => external}/components/libcap-ng.yml (100%) rename {elements => external}/components/libcap.yml (100%) rename {elements => external}/components/libcdio-paranoia.yml (100%) rename {elements => external}/components/libcdio.yml (100%) rename {elements => external}/components/libchamplain.yml (100%) rename {elements => external}/components/libclc.yml (100%) rename {elements => external}/components/libcloudproviders.yml (100%) rename {elements => external}/components/libconfig.yml (100%) rename {elements => external}/components/libconfuse.yml (100%) rename {elements => external}/components/libdaemon.yml (100%) rename {elements => external}/components/libdatrie.yml (100%) rename {elements => external}/components/libdazzle.yml (100%) rename {elements => external}/components/libdbusmenu-qt.yml (100%) rename {elements => external}/components/libdisplay-info.yml (100%) rename {elements => external}/components/libdmapsharing.yml (100%) rename {elements => external}/components/libdrm.yml (100%) rename {elements => external}/components/libdvdread.yml (100%) rename {elements => external}/components/libelf.yml (100%) rename {elements => external}/components/libepoxy.yml (100%) rename {elements => external}/components/libev.yml (100%) rename {elements => external}/components/libevdev.yml (100%) rename {elements => external}/components/libevent.yml (100%) rename {elements => external}/components/libexif.yml (100%) rename {elements => external}/components/libexplain.yml (100%) rename {elements => external}/components/libffi.yml (100%) rename {elements => external}/components/libfprint.yml (100%) rename {elements => external}/components/libgcc.yml (96%) rename {elements => external}/components/libgcrypt.yml (100%) rename {elements => external}/components/libgdata.yml (100%) rename {elements => external}/components/libgdiplus.yml (100%) rename {elements => external}/components/libgee.yml (100%) rename {elements => external}/components/libgepub.yml (100%) rename {elements => external}/components/libgit2.yml (100%) rename {elements => external}/components/libglvnd.yml (100%) rename {elements => external}/components/libgmp.yml (100%) rename {elements => external}/components/libgnomekbd.yml (100%) rename {elements => external}/components/libgpg-error.yml (100%) rename {elements => external}/components/libgrss.yml (100%) rename {elements => external}/components/libgsf.yml (100%) rename {elements => external}/components/libgssglue.yml (100%) rename {elements => external}/components/libgtop.yml (100%) rename {elements => external}/components/libgudev.yml (100%) rename {elements => external}/components/libgusb.yml (100%) rename {elements => external}/components/libgweather.yml (100%) rename {elements => external}/components/libgxps.yml (100%) rename {elements => external}/components/libhandy.yml (100%) rename {elements => external}/components/libical.yml (100%) rename {elements => external}/components/libidn2.yml (100%) rename {elements => external}/components/libiec61883.yml (100%) rename {elements => external}/components/libinput.yml (100%) rename {elements => external}/components/libinstpatch.yml (100%) rename {elements => external}/components/libisoburn.yml (100%) rename {elements => external}/components/libisofs.yml (100%) rename {elements => external}/components/libjit.yml (100%) rename {elements => external}/components/libjpeg-turbo.yml (100%) rename {elements => external}/components/libkcddb.yml (100%) rename {elements => external}/components/libkdcraw.yml (100%) rename {elements => external}/components/libkexiv2.yml (100%) rename {elements => external}/components/libksba.yml (100%) rename {elements => external}/components/libldap.yml (100%) rename {elements => external}/components/libllvm.yml (100%) rename {elements => external}/components/libmd.yml (100%) rename {elements => external}/components/libmediaart.yml (100%) rename {elements => external}/components/libmng.yml (100%) rename {elements => external}/components/libmnl.yml (100%) rename {elements => external}/components/libmpc.yml (100%) rename {elements => external}/components/libmpd.yml (100%) rename {elements => external}/components/libmpfr.yml (100%) rename {elements => external}/components/libmtp.yml (100%) rename {elements => external}/components/libmypaint.yml (100%) rename {elements => external}/components/libndp.yml (100%) rename {elements => external}/components/libnetfilter_conntrack.yml (100%) rename {elements => external}/components/libnfnetlink.yml (100%) rename {elements => external}/components/libnih.yml (100%) rename {elements => external}/components/libnl.yml (100%) rename {elements => external}/components/libnma.yml (100%) rename {elements => external}/components/libnotify.yml (100%) rename {elements => external}/components/libnvme.yml (100%) rename {elements => external}/components/libogg.yml (100%) rename {elements => external}/components/libosinfo.yml (100%) rename {elements => external}/components/libpeas.yml (100%) rename {elements => external}/components/libpipeline.yml (100%) rename {elements => external}/components/libpng.yml (100%) rename {elements => external}/components/libportal.yml (100%) rename {elements => external}/components/libpsl.yml (100%) rename {elements => external}/components/libpwquality.yml (100%) rename {elements => external}/components/libqalculate.yml (100%) rename {elements => external}/components/libraw.yml (100%) rename {elements => external}/components/libraw1394.yml (100%) rename {elements => external}/components/libreoffice.yml (100%) rename {elements => external}/components/librsvg.yml (100%) rename {elements => external}/components/libsamplerate.yml (100%) rename {elements => external}/components/libsass.yml (100%) rename {elements => external}/components/libseccomp.yml (100%) rename {elements => external}/components/libsecret.yml (100%) rename {elements => external}/components/libsigc++.yml (100%) rename {elements => external}/components/libsigc++2.12.yml (100%) rename {elements => external}/components/libslirp.yml (100%) rename {elements => external}/components/libsmbios.yml (100%) rename {elements => external}/components/libsndfile.yml (100%) rename {elements => external}/components/libsodium.yml (100%) rename {elements => external}/components/libsoup.yml (100%) rename {elements => external}/components/libsoup3.yml (100%) rename {elements => external}/components/libspectre.yml (100%) rename {elements => external}/components/libsquash.yml (100%) rename {elements => external}/components/libssh.yml (100%) rename {elements => external}/components/libtasn1.yml (100%) rename {elements => external}/components/libthai.yml (100%) rename {elements => external}/components/libtheora.yml (100%) rename {elements => external}/components/libtiff.yml (100%) rename {elements => external}/components/libtirpc.yml (100%) rename {elements => external}/components/libtool.yml (100%) rename {elements => external}/components/libtorrent-rasterbar.yml (100%) rename {elements => external}/components/libunistring.yml (100%) rename {elements => external}/components/libunwind.yml (100%) rename {elements => external}/components/libusb.yml (100%) rename {elements => external}/components/libutf8proc.yml (100%) rename {elements => external}/components/libuv.yml (100%) rename {elements => external}/components/libva-nomesa.yml (100%) rename {elements => external}/components/libva-utils.yml (100%) rename {elements => external}/components/libva.yml (100%) rename {elements => external}/components/libvdpau.yml (100%) rename {elements => external}/components/libvirt-glib.yml (100%) rename {elements => external}/components/libvirt.yml (100%) rename {elements => external}/components/libvncserver.yml (100%) rename {elements => external}/components/libvorbis.yml (100%) rename {elements => external}/components/libvpx.yml (100%) rename {elements => external}/components/libwacom.yml (100%) rename {elements => external}/components/libwebp.yml (100%) rename {elements => external}/components/libwnck.yml (100%) rename {elements => external}/components/libwpe.yml (100%) rename {elements => external}/components/libxcrypt.yml (100%) rename {elements => external}/components/libxdg-basedir.yml (100%) rename {elements => external}/components/libxml2.yml (100%) rename {elements => external}/components/libxmlb.yml (100%) rename {elements => external}/components/libxslt.yml (100%) rename {elements => external}/components/libyaml-cpp.yml (100%) rename {elements => external}/components/libyaml.yml (100%) rename {elements => external}/components/lightdm-gtk-greeter-settings.yml (100%) rename {elements => external}/components/lightdm.yml (100%) rename {elements => external}/components/lld.yml (100%) rename {elements => external}/components/llvm.yml (100%) rename {elements => external}/components/lm-sensors.yml (100%) rename {elements => external}/components/lmdb.yml (100%) rename {elements => external}/components/locales.yml (100%) rename {elements => external}/components/lsb-release.yml (100%) rename {elements => external}/components/lsof.yml (100%) rename {elements => external}/components/lua.yml (100%) rename {elements => external}/components/lua/lgi.yml (100%) rename {elements => external}/components/lua/lgi53.yml (100%) rename {elements => external}/components/lua52.yml (100%) rename {elements => external}/components/lua53.yml (100%) rename {elements => external}/components/lvm2.yml (100%) rename {elements => external}/components/lxappearance.yml (100%) rename {elements => external}/components/lxc.yml (100%) rename {elements => external}/components/lxcfs.yml (100%) rename {elements => external}/components/lxd.yml (100%) rename {elements => external}/components/lynis.yml (100%) rename {elements => external}/components/lynx.yml (100%) rename {elements => external}/components/lz4.yml (100%) rename {elements => external}/components/lzip.yml (100%) rename {elements => external}/components/lzo.yml (100%) rename {elements => external}/components/m4.yml (100%) rename {elements => external}/components/mailcap.yml (100%) rename {elements => external}/components/make.yml (100%) rename {elements => external}/components/mako.yml (100%) rename {elements => external}/components/man-db.yml (100%) rename {elements => external}/components/man-pages.yml (100%) rename {elements => external}/components/mandoc.yml (100%) rename {elements => external}/components/mariadb-runtime.yml (100%) rename {elements => external}/components/mariadb.yml (100%) rename {elements => external}/components/mercurial.yml (100%) rename {elements => external}/components/mesa.yml (100%) rename {elements => external}/components/meson.yml (100%) rename {elements => external}/components/meta-enlightenment.yml (82%) rename {elements => external}/components/meta-gnome.yml (96%) rename {elements => external}/components/meta-kf5.yml (100%) rename {elements => external}/components/meta-plasma.yml (97%) rename {elements => external}/components/meta-x11.yml (98%) rename {elements => external}/components/meta-xfce4.yml (98%) rename {elements => external}/components/metacity.yml (100%) rename {elements => external}/components/miniupnpc.yml (100%) rename {elements => external}/components/mkinitramfs.yml (100%) rename {elements => external}/components/mod_wsgi.yml (100%) rename {elements => external}/components/modemmanager.yml (100%) rename {elements => external}/components/mono.yml (100%) rename {elements => external}/components/mpg123.yml (100%) rename {elements => external}/components/mtdev.yml (100%) rename {elements => external}/components/mtools.yml (100%) rename {elements => external}/components/mutter.yml (100%) rename {elements => external}/components/mypaint-brushes.yml (100%) rename {elements => external}/components/nano.yml (100%) rename {elements => external}/components/nasm.yml (100%) rename {elements => external}/components/ncompress.yml (100%) rename {elements => external}/components/ncurses.yml (100%) rename {elements => external}/components/neofetch.yml (100%) rename {elements => external}/components/nettle.yml (100%) rename {elements => external}/components/network-manager-applet.yml (100%) rename {elements => external}/components/networkmanager-openvpn.yml (100%) rename {elements => external}/components/networkmanager-qt.yml (83%) rename {elements => external}/components/networkmanager.yml (100%) rename {elements => external}/components/newt.yml (100%) rename {elements => external}/components/nghttp2.yml (100%) rename {elements => external}/components/nginx.yml (100%) rename {elements => external}/components/ninja.yml (100%) rename {elements => external}/components/nodejs.yml (100%) rename {elements => external}/components/npth.yml (100%) rename {elements => external}/components/nspr.yml (100%) rename {elements => external}/components/nss.yml (100%) rename {elements => external}/components/ntfs-3g.yml (100%) rename {elements => external}/components/numactl.yml (100%) rename {elements => external}/components/nvidia-settings.yml (97%) rename {elements => external}/components/nvidia.yml (98%) rename {elements => external}/components/odbc.yml (100%) rename {elements => external}/components/ohmyzsh.yml (100%) rename {elements => external}/components/onboard.yml (100%) rename {elements => external}/components/oniguruma.yml (100%) rename {elements => external}/components/openal.yml (100%) rename {elements => external}/components/openblas-lapack.yml (100%) rename {elements => external}/components/opencv.yml (100%) rename {elements => external}/components/opencv3.yml (100%) rename {elements => external}/components/openfst.yml (100%) rename {elements => external}/components/openjdk-bin.yml (94%) rename {elements => external}/components/openjdk-jre.yml (97%) rename {elements => external}/components/openjdk.yml (98%) rename {elements => external}/components/openjpeg.yml (100%) rename {elements => external}/components/openldap.yml (100%) rename {elements => external}/components/openmpi.yml (100%) rename {elements => external}/components/openpmix.yml (100%) rename {elements => external}/components/openssh.yml (100%) rename {elements => external}/components/openssl.yml (100%) rename {elements => external}/components/openvpn.yml (100%) rename {elements => external}/components/optipng.yml (100%) rename {elements => external}/components/opus.yml (100%) rename {elements => external}/components/os-prober.yml (100%) rename {elements => external}/components/osinfo-db-tools.yml (100%) rename {elements => external}/components/osinfo-db.yml (100%) rename {elements => external}/components/ostree.yml (100%) rename {elements => external}/components/p11-kit.yml (100%) rename {elements => external}/components/p7zip.yml (100%) rename {elements => external}/components/pam-config.yml (100%) rename {elements => external}/components/pam.yml (100%) rename {elements => external}/components/pam_wrapper.yml (100%) rename {elements => external}/components/pamixer.yml (100%) rename {elements => external}/components/pango.yml (100%) rename {elements => external}/components/pangomm.yml (100%) rename {elements => external}/components/pangomm2.46.yml (100%) rename {elements => external}/components/parted.yml (100%) rename {elements => external}/components/patch.yml (100%) rename {elements => external}/components/pavucontrol.yml (100%) rename {elements => external}/components/pcaudiolib.yml (100%) rename {elements => external}/components/pciutils.yml (100%) rename {elements => external}/components/pcre.yml (100%) rename {elements => external}/components/pcre2.yml (100%) rename {elements => external}/components/pcsclite.yml (100%) rename {elements => external}/components/perl.yml (100%) rename {elements => external}/components/perl/perl-io-string.yml (100%) rename {elements => external}/components/perl/perl-json.yml (100%) rename {elements => external}/components/perl/perl-locale-gettext.yml (100%) rename {elements => external}/components/perl/perl-mime-charset.yml (100%) rename {elements => external}/components/perl/perl-module-build.yml (100%) rename {elements => external}/components/perl/perl-parse-yapp.yml (100%) rename {elements => external}/components/perl/perl-pod-parser.yml (100%) rename {elements => external}/components/perl/perl-sgmls.yml (100%) rename {elements => external}/components/perl/perl-term-readkey.yml (100%) rename {elements => external}/components/perl/perl-text-charwidth.yml (100%) rename {elements => external}/components/perl/perl-text-wrapi18n.yml (100%) rename {elements => external}/components/perl/perl-timedate.yml (100%) rename {elements => external}/components/perl/perl-unicode-linebreak.yml (100%) rename {elements => external}/components/perl/perl-uri.yml (100%) rename {elements => external}/components/perl/perl-xml-parser.yml (100%) rename {elements => external}/components/perl/perl-xml-simple.yml (100%) rename {elements => external}/components/perl/perl-yaml-tiny.yml (100%) rename {elements => external}/components/phodav.yml (100%) rename {elements => external}/components/phonon-backend-gstreamer.yml (100%) rename {elements => external}/components/phonon.yml (100%) rename {elements => external}/components/physfs.yml (100%) rename {elements => external}/components/picom.yml (100%) rename {elements => external}/components/picotts.yml (100%) rename {elements => external}/components/pinentry.yml (100%) rename {elements => external}/components/pipewire.yml (100%) rename {elements => external}/components/pixman.yml (100%) rename {elements => external}/components/pkg-config.yml (100%) rename {elements => external}/components/plasma/ark.yml (100%) rename {elements => external}/components/plasma/bluedevil.yml (86%) rename {elements => external}/components/plasma/breeze-grub.yml (67%) rename {elements => external}/components/plasma/breeze-gtk.yml (84%) rename {elements => external}/components/plasma/breeze-icons.yml (77%) rename {elements => external}/components/plasma/breeze.yml (87%) rename {elements => external}/components/plasma/discover.yml (90%) rename {elements => external}/components/plasma/drkonqi.yml (100%) rename {elements => external}/components/plasma/kactivitymanagerd.yml (82%) rename {elements => external}/components/plasma/kde-cli-tools.yml (100%) rename {elements => external}/components/plasma/kde-gtk-config.yml (100%) rename {elements => external}/components/plasma/kdecoration.yml (81%) rename {elements => external}/components/plasma/kdeplasma-addons.yml (100%) rename {elements => external}/components/plasma/kgamma5.yml (100%) rename {elements => external}/components/plasma/khotkeys.yml (100%) rename {elements => external}/components/plasma/kmenuedit.yml (100%) rename {elements => external}/components/plasma/kpipewire.yml (90%) rename {elements => external}/components/plasma/kscreen.yml (84%) rename {elements => external}/components/plasma/kscreenlocker.yml (91%) rename {elements => external}/components/plasma/ksshaskpass.yml (81%) rename {elements => external}/components/plasma/ksystemstats.yml (83%) rename {elements => external}/components/plasma/kwallet-pam.yml (78%) rename {elements => external}/components/plasma/kwayland-integration.yml (88%) rename {elements => external}/components/plasma/kwin.yml (92%) rename {elements => external}/components/plasma/kwrited.yml (85%) rename {elements => external}/components/plasma/layer-shell-qt.yml (87%) rename {elements => external}/components/plasma/libkscreen.yml (88%) rename {elements => external}/components/plasma/libksysguard.yml (88%) rename {elements => external}/components/plasma/milou.yml (82%) rename {elements => external}/components/plasma/oxygen-icons5.yml (77%) rename {elements => external}/components/plasma/oxygen.yml (87%) rename {elements => external}/components/plasma/plasma-browser-integration.yml (86%) rename {elements => external}/components/plasma/plasma-desktop.yml (94%) rename {elements => external}/components/plasma/plasma-disks.yml (92%) rename {elements => external}/components/plasma/plasma-firewall.yml (80%) rename {elements => external}/components/plasma/plasma-framework.yml (87%) rename {elements => external}/components/plasma/plasma-integration.yml (88%) rename {elements => external}/components/plasma/plasma-nm.yml (84%) rename {elements => external}/components/plasma/plasma-pa.yml (86%) rename {elements => external}/components/plasma/plasma-pam.yml (85%) rename {elements => external}/components/plasma/plasma-sdk.yml (86%) rename {elements => external}/components/plasma/plasma-systemmonitor.yml (92%) rename {elements => external}/components/plasma/plasma-thunderbolt.yml (81%) rename {elements => external}/components/plasma/plasma-vault.yml (83%) rename {elements => external}/components/plasma/plasma-wayland-protocols.yml (100%) rename {elements => external}/components/plasma/plasma-workspace-wallpapers.yml (81%) rename {elements => external}/components/plasma/plasma-workspace.yml (96%) rename {elements => external}/components/plasma/polkit-kde-agent-1.yml (86%) rename {elements => external}/components/plasma/powerdevil.yml (87%) rename {elements => external}/components/plasma/qqc2-breeze-style.yml (84%) rename {elements => external}/components/plasma/sddm-kcm.yml (85%) rename {elements => external}/components/plasma/systemsettings.yml (83%) rename {elements => external}/components/plasma/xdg-desktop-portal-kde.yml (89%) rename {elements => external}/components/playerctl.yml (100%) rename {elements => external}/components/plymouth.yml (100%) rename {elements => external}/components/po4a.yml (100%) rename {elements => external}/components/pocketsphinx.yml (100%) rename {elements => external}/components/polkit-gnome.yml (100%) rename {elements => external}/components/polkit-qt.yml (100%) rename {elements => external}/components/polkit.yml (100%) rename {elements => external}/components/poppler-data.yml (100%) rename {elements => external}/components/poppler.yml (100%) rename {elements => external}/components/popt.yml (100%) rename {elements => external}/components/postfix.yml (100%) rename {elements => external}/components/postgresql-runtime.yml (100%) rename {elements => external}/components/postgresql.yml (100%) rename {elements => external}/components/potrace.yml (100%) rename {elements => external}/components/power-profiles-daemon.yml (100%) rename {elements => external}/components/prison.yml (80%) rename {elements => external}/components/procps-ng.yml (100%) rename {elements => external}/components/proot.yml (100%) rename {elements => external}/components/protobuf.yml (100%) rename {elements => external}/components/psmisc.yml (100%) rename {elements => external}/components/pugixml.yml (100%) rename {elements => external}/components/pulseaudio.yml (100%) rename {elements => external}/components/purpose.yml (88%) rename {elements => external}/components/py/py-cairo.yml (100%) rename {elements => external}/components/py/py-chardet.yml (100%) rename {elements => external}/components/py/py-cups.yml (100%) rename {elements => external}/components/py/py-curl.yml (100%) rename {elements => external}/components/py/py-cython.yml (100%) rename {elements => external}/components/py/py-dbus.yml (100%) rename {elements => external}/components/py/py-dbusmock.yml (100%) rename {elements => external}/components/py/py-distutils-extra.yml (100%) rename {elements => external}/components/py/py-gobject.yml (100%) rename {elements => external}/components/py/py-idna.yml (100%) rename {elements => external}/components/py/py-jinja2.yml (100%) rename {elements => external}/components/py/py-libvirt.yml (100%) rename {elements => external}/components/py/py-mako.yml (100%) rename {elements => external}/components/py/py-markdown.yml (100%) rename {elements => external}/components/py/py-markupsafe.yml (100%) rename {elements => external}/components/py/py-notify2.yml (100%) rename {elements => external}/components/py/py-packaging.yml (100%) rename {elements => external}/components/py/py-parsing.yml (100%) rename {elements => external}/components/py/py-pip.yml (100%) rename {elements => external}/components/py/py-psutil.yml (100%) rename {elements => external}/components/py/py-pygments.yml (100%) rename {elements => external}/components/py/py-requests.yml (100%) rename {elements => external}/components/py/py-setuptools.yml (100%) rename {elements => external}/components/py/py-six.yml (100%) rename {elements => external}/components/py/py-socks.yml (100%) rename {elements => external}/components/py/py-urllib3.yml (100%) rename {elements => external}/components/py/py-xdg.yml (100%) rename {elements => external}/components/py/py-yaml.yml (100%) rename {elements => external}/components/python.yml (100%) rename {elements => external}/components/python2.yml (100%) rename {elements => external}/components/qbe.yml (100%) rename {elements => external}/components/qca.yml (100%) rename {elements => external}/components/qemu.yml (100%) rename {elements => external}/components/qqc2-desktop-style.yml (85%) rename {elements => external}/components/qrencode.yml (100%) rename {elements => external}/components/qt.yml (100%) rename {elements => external}/components/quickjs.yml (100%) rename {elements => external}/components/quilt.yml (100%) rename {elements => external}/components/qwlroots.yml (100%) rename {elements => external}/components/raft.yml (100%) rename {elements => external}/components/raptor.yml (100%) rename {elements => external}/components/rasqal.yml (100%) rename {elements => external}/components/rdfind.yml (100%) rename {elements => external}/components/readline.yml (100%) rename {elements => external}/components/redflat.yml (100%) rename {elements => external}/components/redland.yml (100%) rename {elements => external}/components/release-info.yml (100%) rename {elements => external}/components/rest.yml (100%) rename {elements => external}/components/rofi.yml (100%) rename {elements => external}/components/rpcsvc-proto.yml (100%) rename {elements => external}/components/rrdtool.yml (100%) rename {elements => external}/components/rsync.yml (100%) rename {elements => external}/components/rtkit.yml (100%) rename {elements => external}/components/ruby.yml (100%) rename {elements => external}/components/runc.yml (100%) rename {elements => external}/components/rust-bindgen.yml (100%) rename {elements => external}/components/rust-stage1.yml (89%) rename {elements => external}/components/rustc.yml (97%) rename {elements => external}/components/samba.yml (100%) rename {elements => external}/components/sassc.yml (100%) rename {elements => external}/components/sbc.yml (100%) rename {elements => external}/components/sbsigntools.yml (100%) rename {elements => external}/components/scdoc.yml (100%) rename {elements => external}/components/scenefx.yml (100%) rename {elements => external}/components/schroot.yml (100%) rename {elements => external}/components/scim.yml (100%) rename {elements => external}/components/screenrotator.yml (100%) rename {elements => external}/components/scrot.yml (100%) rename {elements => external}/components/sddm.yml (100%) rename {elements => external}/components/sdl.yml (100%) rename {elements => external}/components/sdl2.yml (100%) rename {elements => external}/components/sdl2_image.yml (100%) rename {elements => external}/components/seatd.yml (100%) rename {elements => external}/components/sed.yml (100%) rename {elements => external}/components/selftest.yml (100%) rename {elements => external}/components/setconf.yml (100%) rename {elements => external}/components/sfwbar.yml (100%) rename {elements => external}/components/sgml-common.yml (100%) rename {elements => external}/components/shaderc.yml (100%) rename {elements => external}/components/shadow.yml (100%) rename {elements => external}/components/shared-mime-info.yml (100%) rename {elements => external}/components/shim.yml (100%) rename {elements => external}/components/slang.yml (100%) rename {elements => external}/components/slurp.yml (100%) rename {elements => external}/components/snowball.yml (100%) rename {elements => external}/components/sof-firmware.yml (100%) rename {elements => external}/components/solid.yml (82%) rename {elements => external}/components/sonnet.yml (80%) rename {elements => external}/components/sound-theme-freedesktop.yml (100%) rename {elements => external}/components/sphinxbase.yml (100%) rename {elements => external}/components/spice-gtk.yml (100%) rename {elements => external}/components/spice-protocol.yml (100%) rename {elements => external}/components/spice-vdagent.yml (100%) rename {elements => external}/components/spice.yml (100%) rename {elements => external}/components/spidermonkey.yml (100%) rename {elements => external}/components/spirv-headers.yml (100%) rename {elements => external}/components/spirv-llvm-translator.yml (100%) rename {elements => external}/components/spirv-tools.yml (100%) rename {elements => external}/components/sqlite.yml (100%) rename {elements => external}/components/squashfs-tools.yml (100%) rename {elements => external}/components/squashfuse.yml (100%) rename {elements => external}/components/sshfs.yml (100%) rename {elements => external}/components/startup-notification.yml (100%) rename {elements => external}/components/strace.yml (100%) rename {elements => external}/components/sudo.yml (100%) rename {elements => external}/components/sway.yml (100%) rename {elements => external}/components/swaybg.yml (100%) rename {elements => external}/components/swayfx.yml (100%) rename {elements => external}/components/swayidle.yml (100%) rename {elements => external}/components/swaylock.yml (100%) rename {elements => external}/components/swig.yml (100%) rename {elements => external}/components/syndication.yml (79%) rename {elements => external}/components/syntax-highlighting.yml (80%) rename {elements => external}/components/syslinux.yml (100%) rename {elements => external}/components/sysprof.yml (100%) rename {elements => external}/components/sysroot.yml (85%) rename {elements => external}/components/system-config-printer.yml (100%) rename {elements => external}/components/systemd.yml (100%) rename {elements => external}/components/taglib.yml (100%) rename {elements => external}/components/talloc.yml (100%) rename {elements => external}/components/tar.yml (100%) rename {elements => external}/components/tcc.yml (100%) rename {elements => external}/components/tcl.yml (100%) rename {elements => external}/components/template-glib.yml (100%) rename {elements => external}/components/tepl.yml (100%) rename {elements => external}/components/texinfo.yml (100%) rename {elements => external}/components/themes/adwaita-icon-theme.yml (100%) rename {elements => external}/components/themes/dracula-gtk-theme.yml (100%) rename {elements => external}/components/themes/elementary-xfce-icon.yml (92%) rename {elements => external}/components/themes/elementary-xfce.yml (96%) rename {elements => external}/components/themes/fluent-gtk-theme.yml (100%) rename {elements => external}/components/themes/fluent-icon-theme.yml (89%) rename {elements => external}/components/themes/fluent-wallpaper.yml (100%) rename {elements => external}/components/themes/gnome-icon-theme-extras.yml (100%) rename {elements => external}/components/themes/gnome-icon-theme-symbolic.yml (100%) rename {elements => external}/components/themes/gnome-icon-theme.yml (100%) rename {elements => external}/components/themes/grey-bird-gtk-theme.yml (100%) rename {elements => external}/components/themes/orchis-gtk-theme.yml (93%) rename {elements => external}/components/themes/qogir-gtk-theme.yml (99%) rename {elements => external}/components/themes/qogir-icon-theme.yml (91%) rename {elements => external}/components/themes/tela-icon-theme.yml (100%) rename {elements => external}/components/thermald.yml (100%) rename {elements => external}/components/threadweaver.yml (78%) rename {elements => external}/components/tint2.yml (100%) rename {elements => external}/components/tllist.yml (100%) rename {elements => external}/components/tlp.yml (100%) rename {elements => external}/components/totem-pl-parser.yml (100%) rename {elements => external}/components/touchegg.yml (100%) rename {elements => external}/components/traceroute.yml (100%) rename {elements => external}/components/tracker-miners.yml (100%) rename {elements => external}/components/tracker.yml (100%) rename {elements => external}/components/triehash.yml (100%) rename {elements => external}/components/typescript.yml (100%) rename {elements => external}/components/tzdata.yml (100%) rename {elements => external}/components/uchardet.yml (100%) rename {elements => external}/components/udisks.yml (100%) rename {elements => external}/components/ufw.yml (100%) rename {elements => external}/components/uncrustify.yml (100%) rename {elements => external}/components/unidef.yml (100%) rename {elements => external}/components/unrar.yml (100%) rename {elements => external}/components/unzip.yml (100%) rename {elements => external}/components/upower.yml (100%) rename {elements => external}/components/usbredir.yml (100%) rename {elements => external}/components/usbutils.yml (100%) rename {elements => external}/components/utf8cpp.yml (100%) rename {elements => external}/components/uthash.yml (100%) rename {elements => external}/components/util-linux.yml (100%) rename {elements => external}/components/v4l-utils.yml (100%) rename {elements => external}/components/vaapi-driver.yml (100%) rename {elements => external}/components/vala-language-server.yml (100%) rename {elements => external}/components/vala.yml (100%) rename {elements => external}/components/valgrind.yml (100%) rename {elements => external}/components/vim.yml (100%) rename {elements => external}/components/virt-manager.yml (100%) rename {elements => external}/components/volume_key.yml (100%) rename {elements => external}/components/vte.yml (100%) rename {elements => external}/components/vulkan-headers.yml (100%) rename {elements => external}/components/vulkan-loader.yml (100%) rename {elements => external}/components/waf.yml (100%) rename {elements => external}/components/wayland-protocols.yml (100%) rename {elements => external}/components/wayland.yml (100%) rename {elements => external}/components/webkitgtk-6.0.yml (100%) rename {elements => external}/components/webkitgtk.yml (100%) rename {elements => external}/components/webp-pixbuf-loader.yml (100%) rename {elements => external}/components/welcome.yml (83%) rename {elements => external}/components/weston.yml (100%) rename {elements => external}/components/wget.yml (100%) rename {elements => external}/components/which.yml (100%) rename {elements => external}/components/wimlib.yml (100%) rename {elements => external}/components/wine.yml (100%) rename {elements => external}/components/wireplumber.yml (100%) rename {elements => external}/components/wl-clipboard.yml (100%) rename {elements => external}/components/wlgreet.yml (100%) rename {elements => external}/components/wlroots.yml (100%) rename {elements => external}/components/wlroots0.16.yml (100%) rename {elements => external}/components/wmenu.yml (100%) rename {elements => external}/components/wob.yml (100%) rename {elements => external}/components/woff2.yml (100%) rename {elements => external}/components/wpa_supplicant.yml (100%) rename {elements => external}/components/wpebackend-fdo.yml (100%) rename {elements => external}/components/wpewebkit.yml (100%) rename {elements => external}/components/wvkbd.yml (100%) rename {elements => external}/components/wxgtk.yml (100%) rename {elements => external}/components/x11/font-util.yml (100%) rename {elements => external}/components/x11/fonts-encodings.yml (100%) rename {elements => external}/components/x11/iceauth.yml (100%) rename {elements => external}/components/x11/libfontenc.yml (100%) rename {elements => external}/components/x11/libice.yml (100%) rename {elements => external}/components/x11/libpciaccess.yml (100%) rename {elements => external}/components/x11/libsm.yml (100%) rename {elements => external}/components/x11/libx11.yml (100%) rename {elements => external}/components/x11/libxau.yml (100%) rename {elements => external}/components/x11/libxaw.yml (100%) rename {elements => external}/components/x11/libxcb.yml (100%) rename {elements => external}/components/x11/libxcomposite.yml (100%) rename {elements => external}/components/x11/libxcursor.yml (100%) rename {elements => external}/components/x11/libxcvt.yml (100%) rename {elements => external}/components/x11/libxdamage.yml (100%) rename {elements => external}/components/x11/libxdmcp.yml (100%) rename {elements => external}/components/x11/libxext.yml (100%) rename {elements => external}/components/x11/libxfixes.yml (100%) rename {elements => external}/components/x11/libxfont2.yml (100%) rename {elements => external}/components/x11/libxft.yml (100%) rename {elements => external}/components/x11/libxi.yml (100%) rename {elements => external}/components/x11/libxinerama.yml (100%) rename {elements => external}/components/x11/libxkbcommon.yml (100%) rename {elements => external}/components/x11/libxkbfile.yml (100%) rename {elements => external}/components/x11/libxklavier.yml (100%) rename {elements => external}/components/x11/libxmu.yml (100%) rename {elements => external}/components/x11/libxpm.yml (100%) rename {elements => external}/components/x11/libxpresent.yml (100%) rename {elements => external}/components/x11/libxrandr.yml (100%) rename {elements => external}/components/x11/libxrender.yml (100%) rename {elements => external}/components/x11/libxres.yml (100%) rename {elements => external}/components/x11/libxscrnsaver.yml (100%) rename {elements => external}/components/x11/libxshmfence.yml (100%) rename {elements => external}/components/x11/libxt.yml (100%) rename {elements => external}/components/x11/libxtst.yml (100%) rename {elements => external}/components/x11/libxv.yml (100%) rename {elements => external}/components/x11/libxvmc.yml (100%) rename {elements => external}/components/x11/libxxf86vm.yml (100%) rename {elements => external}/components/x11/mkfontscale.yml (100%) rename {elements => external}/components/x11/sessreg.yml (100%) rename {elements => external}/components/x11/setxkbmap.yml (100%) rename {elements => external}/components/x11/smproxy.yml (100%) rename {elements => external}/components/x11/util-macros.yml (100%) rename {elements => external}/components/x11/xauth.yml (100%) rename {elements => external}/components/x11/xbacklight.yml (100%) rename {elements => external}/components/x11/xbitmaps.yml (100%) rename {elements => external}/components/x11/xcb-proto.yml (100%) rename {elements => external}/components/x11/xcb-util-cursor.yml (100%) rename {elements => external}/components/x11/xcb-util-errors.yml (100%) rename {elements => external}/components/x11/xcb-util-image.yml (100%) rename {elements => external}/components/x11/xcb-util-keysyms.yml (100%) rename {elements => external}/components/x11/xcb-util-renderutil.yml (100%) rename {elements => external}/components/x11/xcb-util-wm.yml (100%) rename {elements => external}/components/x11/xcb-util-xrm.yml (100%) rename {elements => external}/components/x11/xcb-util.yml (100%) rename {elements => external}/components/x11/xcmsdb.yml (100%) rename {elements => external}/components/x11/xdpyinfo.yml (100%) rename {elements => external}/components/x11/xev.yml (100%) rename {elements => external}/components/x11/xf86-input-evdev.yml (100%) rename {elements => external}/components/x11/xf86-input-libinput.yml (100%) rename {elements => external}/components/x11/xf86-input-synaptics.yml (100%) rename {elements => external}/components/x11/xf86-input-wacom.yml (100%) rename {elements => external}/components/x11/xf86-video-amdgpu.yml (100%) rename {elements => external}/components/x11/xf86-video-ati.yml (100%) rename {elements => external}/components/x11/xf86-video-fbdev.yml (100%) rename {elements => external}/components/x11/xf86-video-intel.yml (100%) rename {elements => external}/components/x11/xf86-video-nouveau.yml (100%) rename {elements => external}/components/x11/xf86-video-qxl.yml (100%) rename {elements => external}/components/x11/xf86-video-vmware.yml (100%) rename {elements => external}/components/x11/xgamma.yml (100%) rename {elements => external}/components/x11/xhost.yml (100%) rename {elements => external}/components/x11/xinit.yml (100%) rename {elements => external}/components/x11/xinput.yml (100%) rename {elements => external}/components/x11/xkbcomp.yml (100%) rename {elements => external}/components/x11/xkeyboard-config.yml (100%) rename {elements => external}/components/x11/xmessage.yml (100%) rename {elements => external}/components/x11/xmodmap.yml (100%) rename {elements => external}/components/x11/xorgproto.yml (100%) rename {elements => external}/components/x11/xprop.yml (100%) rename {elements => external}/components/x11/xrandr.yml (100%) rename {elements => external}/components/x11/xrdb.yml (100%) rename {elements => external}/components/x11/xserver.yml (100%) rename {elements => external}/components/x11/xsetroot.yml (100%) rename {elements => external}/components/x11/xtrans.yml (100%) rename {elements => external}/components/x11/xwayland.yml (100%) rename {elements => external}/components/x264.yml (100%) rename {elements => external}/components/x265.yml (100%) rename {elements => external}/components/xapp.yml (100%) rename {elements => external}/components/xarchiver.yml (100%) rename {elements => external}/components/xdelta3.yml (100%) rename {elements => external}/components/xdg-dbus-proxy.yml (100%) rename {elements => external}/components/xdg-desktop-portal-gnome.yml (100%) rename {elements => external}/components/xdg-desktop-portal-gtk.yml (100%) rename {elements => external}/components/xdg-desktop-portal-wlr.yml (100%) rename {elements => external}/components/xdg-desktop-portal-xapp.yml (100%) rename {elements => external}/components/xdg-desktop-portal.yml (100%) rename {elements => external}/components/xdg-user-dirs-gtk.yml (100%) rename {elements => external}/components/xdg-user-dirs.yml (100%) rename {elements => external}/components/xdg-utils.yml (100%) rename {elements => external}/components/xfce4/exo.yml (100%) rename {elements => external}/components/xfce4/garcon.yml (100%) rename {elements => external}/components/xfce4/libxfce4ui.yml (100%) rename {elements => external}/components/xfce4/libxfce4util.yml (100%) rename {elements => external}/components/xfce4/mousepad.yml (100%) rename {elements => external}/components/xfce4/panel-plugins/xfce4-clipman-plugin.yml (76%) rename {elements => external}/components/xfce4/panel-plugins/xfce4-cpufreq-plugin.yml (67%) rename {elements => external}/components/xfce4/panel-plugins/xfce4-cpugraph-plugin.yml (64%) rename {elements => external}/components/xfce4/panel-plugins/xfce4-diskperf-plugin.yml (69%) rename {elements => external}/components/xfce4/panel-plugins/xfce4-docklike-plugin.yml (100%) rename {elements => external}/components/xfce4/panel-plugins/xfce4-eyes-plugin.yml (69%) rename {elements => external}/components/xfce4/panel-plugins/xfce4-fsguard-plugin.yml (67%) rename {elements => external}/components/xfce4/panel-plugins/xfce4-genmon-plugin.yml (70%) rename {elements => external}/components/xfce4/panel-plugins/xfce4-mailwatch-plugin.yml (75%) rename {elements => external}/components/xfce4/panel-plugins/xfce4-mount-plugin.yml (63%) rename {elements => external}/components/xfce4/panel-plugins/xfce4-mpc-plugin.yml (73%) rename {elements => external}/components/xfce4/panel-plugins/xfce4-netload-plugin.yml (63%) rename {elements => external}/components/xfce4/panel-plugins/xfce4-notes-plugin.yml (76%) rename {elements => external}/components/xfce4/panel-plugins/xfce4-pulseaudio-plugin.yml (100%) rename {elements => external}/components/xfce4/panel-plugins/xfce4-sensors-plugin.yml (75%) rename {elements => external}/components/xfce4/panel-plugins/xfce4-smartbookmark-plugin.yml (78%) rename {elements => external}/components/xfce4/panel-plugins/xfce4-systemload-plugin.yml (72%) rename {elements => external}/components/xfce4/panel-plugins/xfce4-time-out-plugin.yml (68%) rename {elements => external}/components/xfce4/panel-plugins/xfce4-timer-plugin.yml (63%) rename {elements => external}/components/xfce4/panel-plugins/xfce4-verve-plugin.yml (63%) rename {elements => external}/components/xfce4/panel-plugins/xfce4-wavelan-plugin.yml (67%) rename {elements => external}/components/xfce4/panel-plugins/xfce4-weather-plugin.yml (75%) rename {elements => external}/components/xfce4/panel-plugins/xfce4-whiskermenu-plugin.yml (100%) rename {elements => external}/components/xfce4/panel-plugins/xfce4-xkb-plugin.yml (100%) rename {elements => external}/components/xfce4/parole.yml (100%) rename {elements => external}/components/xfce4/ristretto.yml (100%) rename {elements => external}/components/xfce4/thunar-volman.yml (100%) rename {elements => external}/components/xfce4/thunar.yml (100%) rename {elements => external}/components/xfce4/tumbler.yml (100%) rename {elements => external}/components/xfce4/xfce4-appfinder.yml (100%) rename {elements => external}/components/xfce4/xfce4-dev-tools.yml (100%) rename {elements => external}/components/xfce4/xfce4-notifyd.yml (100%) rename {elements => external}/components/xfce4/xfce4-panel-profiles.yml (100%) rename {elements => external}/components/xfce4/xfce4-panel.yml (100%) rename {elements => external}/components/xfce4/xfce4-power-manager.yml (100%) rename {elements => external}/components/xfce4/xfce4-screensaver.yml (100%) rename {elements => external}/components/xfce4/xfce4-screenshooter.yml (100%) rename {elements => external}/components/xfce4/xfce4-session.yml (100%) rename {elements => external}/components/xfce4/xfce4-settings.yml (100%) rename {elements => external}/components/xfce4/xfce4-taskmanager.yml (100%) rename {elements => external}/components/xfce4/xfce4-terminal.yml (100%) rename {elements => external}/components/xfce4/xfconf.yml (100%) rename {elements => external}/components/xfce4/xfdesktop.yml (100%) rename {elements => external}/components/xfce4/xfwm4.yml (100%) rename {elements => external}/components/xiccd.yml (100%) rename {elements => external}/components/xine-lib.yml (100%) rename {elements => external}/components/xmlto.yml (100%) rename {elements => external}/components/xxhash.yml (100%) rename {elements => external}/components/xz.yml (100%) rename {elements => external}/components/yajl.yml (100%) rename {elements => external}/components/yarn.yml (100%) rename {elements => external}/components/yasm.yml (100%) rename {elements => external}/components/yelp-xsl.yml (100%) rename {elements => external}/components/yodl.yml (100%) rename {elements => external}/components/zenity.yml (100%) rename {elements => external}/components/zip.yml (100%) rename {elements => external}/components/zlib.yml (100%) rename {elements => external}/components/zram-generator.yml (100%) rename {elements => external}/components/zsh-autosuggestions.yml (100%) rename {elements => external}/components/zsh.yml (100%) rename {elements => external}/components/zstd.yml (100%) rename {elements => external}/components/zsync.yml (100%) rename {elements => external}/container/image.yml (94%) rename {elements => external}/extensions/awesome.yml (69%) rename {elements => external}/extensions/bspwm.yml (68%) rename {elements => external}/extensions/dotnet.yml (70%) rename {elements => external}/extensions/enlightenment.yml (75%) rename {elements => external}/extensions/i3.yml (76%) rename {elements => external}/extensions/nvidia.yml (72%) rename {elements => external}/extensions/openjdk.yml (67%) rename {elements => external}/extensions/qemu.yml (82%) rename {elements => external}/extensions/qt.yml (72%) rename {elements => external}/extensions/sdk.yml (96%) rename {elements => external}/extensions/sway.yml (81%) rename {elements => external}/extensions/wine.yml (72%) rename {elements => external}/extensions/wm-kit-x11.yml (83%) rename {elements => external}/extensions/wm-kit.yml (85%) rename {elements => external}/image-builder/debian.yml (100%) rename {elements => external}/include/app.inc (100%) rename {elements => external}/include/appimage.inc (100%) rename {elements => external}/include/binutils.inc (100%) rename {elements => external}/include/container.inc (100%) rename {elements => external}/include/extension.inc (86%) rename {elements => external}/include/gcc.inc (100%) rename {elements => external}/include/glade.inc (100%) rename {elements => external}/include/glibc.inc (97%) rename {elements => external}/include/go-pkg.inc (100%) rename {elements => external}/include/gtk-theme.inc (100%) rename {elements => external}/include/installer.inc (100%) rename {elements => external}/include/integrate-apps.inc (100%) rename {elements => external}/include/java.inc (100%) rename {elements => external}/include/kf5.inc (100%) rename {elements => external}/include/linux.inc (100%) rename {elements => external}/include/liveconfig.inc (100%) rename {elements => external}/include/meta.inc (100%) rename {elements => external}/include/nvidia.inc (100%) rename {elements => external}/include/ostree.inc (100%) rename {elements => external}/include/plasma.inc (100%) rename {elements => external}/include/rlxos.inc (100%) rename {elements => external}/include/rust.inc (100%) rename {elements => external}/include/theme.inc (100%) rename {elements => external}/include/thunar-plugin.inc (100%) rename {elements => external}/include/update-icon-cache.inc (100%) rename {elements => external}/include/usr.inc (100%) rename {elements => external}/include/xfce4-panel-plugin.inc (100%) rename {elements => external}/installer/image.yml (95%) rename {elements => external}/integrity/build-tools-skip-autogen.yml (100%) rename {elements => external}/integrity/container-requirements.yml (100%) rename {elements => external}/integrity/golang-source-pkg.yml (100%) rename {elements => external}/integrity/ostree.yml (100%) rename {elements => external}/integrity/strip.yml (100%) rename {elements => external}/kernel/linux.yml (99%) rename {elements => external}/platform.yml (98%) rename {elements => external}/system/default-background.yml (77%) rename {elements => external}/system/etc-default-useradd.yml (100%) rename {elements => external}/system/etc-shells.yml (100%) rename {elements => external}/system/etc-skel.yml (100%) rename {elements => external}/system/etc-sysctl.yml (100%) rename {elements => external}/system/ostree-config.yml (100%) rename {elements => external}/system/repo.yml (95%) rename {elements => external}/system/systemd-preset.yml (100%) rename {elements => external}/system/x11-config.yml (100%) delete mode 100644 include/environ.yml create mode 100644 ostree-branch.yml delete mode 100644 pkg/localize/localization.go delete mode 100644 src/CMakeLists.txt delete mode 160000 src/capsule delete mode 100644 src/common/Application.h delete mode 100644 src/common/Colors.h delete mode 100644 src/common/Config.h delete mode 100644 src/external/Curl.h delete mode 100644 src/external/json.h delete mode 160000 src/initial-setup delete mode 160000 src/pkgupd delete mode 100644 src/sysroot/CMakeLists.txt delete mode 100644 src/sysroot/Deployment.cpp delete mode 100644 src/sysroot/Deployment.h delete mode 100644 src/sysroot/Error.h delete mode 100644 src/sysroot/Sysroot.cpp delete mode 100644 src/sysroot/Sysroot.h delete mode 100644 src/sysroot/main.cpp create mode 100644 toolchain/CMakeLists.txt rename {include => toolchain}/compiler.yml (100%) create mode 100644 toolchain/environ.yml create mode 100644 toolchain/ignite/CMakeLists.txt create mode 100644 toolchain/ignite/Configuration.cpp create mode 100644 toolchain/ignite/Configuration.h create mode 100644 toolchain/ignite/Container.cpp create mode 100644 toolchain/ignite/Container.h create mode 100644 toolchain/ignite/Executor.cpp create mode 100644 toolchain/ignite/Executor.h create mode 100644 toolchain/ignite/Ignite.cpp create mode 100644 toolchain/ignite/Ignite.h create mode 100644 toolchain/ignite/Recipe.cpp create mode 100644 toolchain/ignite/Recipe.h create mode 100644 toolchain/ignite/main.cpp rename {src/external => toolchain/ignite}/picosha2.h (100%) rename {include => toolchain}/strip.yml (100%) rename {include => toolchain}/variables.yml (87%) delete mode 100644 tools/genlocale/main.go create mode 100644 version.yml diff --git a/.gitignore b/.gitignore index d8f51417e..e8ce8bc0b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,14 +1,6 @@ /build -/.idea -/vendor -/ignite -/build -/cache -/version.yml -/config.mk -/ostree-branch.yml /.cache -*.ui~ -/files/sign-keys +/ostree-branch.yml +/version.yml /channel.yml -**__pycache__** \ No newline at end of file +/.vscode \ No newline at end of file diff --git a/.gitmodules b/.gitmodules index 3e1254002..e69de29bb 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +0,0 @@ -[submodule "src/initial-setup"] - path = src/initial-setup - url = git@github.com:itsmanjeet/initial-setup -[submodule "src/pkgupd"] - path = src/pkgupd - url = git@github.com:itsmanjeet/pkgupd -[submodule "src/capsule"] - path = src/capsule - url = git@github.com:itsmanjeet/capsule diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 000000000..13566b81b --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 000000000..35c56fc87 --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,10 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 000000000..79ee123c2 --- /dev/null +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/editor.xml b/.idea/editor.xml new file mode 100644 index 000000000..e33944917 --- /dev/null +++ b/.idea/editor.xml @@ -0,0 +1,484 @@ + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 000000000..5cd357eb0 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,14 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 000000000..6da1fb113 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/rlxos.iml b/.idea/rlxos.iml new file mode 100644 index 000000000..f08604bb6 --- /dev/null +++ b/.idea/rlxos.iml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 000000000..d843f340d --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index 4ab6749d3..883bd69f2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.28) project(rlxos VERSION "2.0" DESCRIPTION "Immutable OpenSource OS" @@ -7,8 +7,4 @@ project(rlxos set(CMAKE_CXX_STANDARD 23) set(CMAKE_CXX_STANDARD_REQUIRED ON) -list(PREPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) - -include_directories(src) - -add_subdirectory(src) +add_subdirectory(toolchain) \ No newline at end of file diff --git a/Makefile b/Makefile index 5e4b9a32d..55cd110f7 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ OSTREE_BRANCH ?= $(shell uname -m)/os/$(CHANNEL) OSTREE_REPO ?= ostree-repo OSTREE_GPG ?= ostree-gpg VERSION ?= 2.0 -PKGUPD ?= build/src/pkgupd/bin/pkgupd +IGNITE ?= build/toolchain/ignite/ignite CACHE_PATH ?= build/ DESTDIR ?= checkout/ APPMARKET_PATH ?= appmarket/ @@ -28,35 +28,35 @@ endef export OSTREE_GPG_CONFIG -export PKGUPD +export IGNITE export CACHE_PATH .PHONY: clean all docs version.yml channel.yml ostree-branch.yml apps TODO.ELEMENTS -all: $(PKGUPD) version.yml ostree-branch.yml channel.yml +all: $(IGNITE) version.yml ostree-branch.yml channel.yml ifdef ELEMENT - $(PKGUPD) ignite build ignite.cache=$(CACHE_PATH) $(ELEMENT) + $(IGNITE) build -cache-path $(CACHE_PATH) $(ELEMENT) endif -status: $(PKGUPD) version.yml ostree-branch.yml channel.yml +status: $(IGNITE) version.yml ostree-branch.yml channel.yml ifdef ELEMENT - $(PKGUPD) ignite status ignite.cache=$(CACHE_PATH) $(ELEMENT) + $(IGNITE) status -cache-path $(CACHE_PATH) $(ELEMENT) else @echo "no ELEMENT specified" exit 1 endif -filepath: $(PKGUPD) version.yml ostree-branch.yml channel.yml +filepath: $(IGNITE) version.yml ostree-branch.yml channel.yml ifdef ELEMENT - @PKGUPD_NO_MESSAGE=1 $(PKGUPD) ignite filepath ignite.cache=$(CACHE_PATH) $(ELEMENT) + @IGNITE_NO_MESSAGE=1 $(IGNITE) filepath -cache-path $(CACHE_PATH) $(ELEMENT) else @echo "no ELEMENT specified" exit 1 endif -checkout: $(PKGUPD) version.yml ostree-branch.yml channel.yml +checkout: $(IGNITE) version.yml ostree-branch.yml channel.yml ifdef ELEMENT - $(PKGUPD) ignite checkout ignite.cache=$(CACHE_PATH) $(ELEMENT) $(DESTDIR) + $(IGNITE) checkout -cache-path $(CACHE_PATH) $(ELEMENT) $(DESTDIR) else @echo "no ELEMENT specified" exit 1 @@ -64,10 +64,10 @@ endif build/build.ninja: CMakeLists.txt - cmake -B build + cmake -B build -G Ninja -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -$(PKGUPD): build/build.ninja src/pkgupd/CMakeLists.txt - @cmake --build build --target pkgupd +$(IGNITE): build/build.ninja + @cmake --build build --target ignite clean: rm -rf $(DOCS_DIR) @@ -87,11 +87,11 @@ $(OSTREE_GPG)/key-config: files/rlxos.gpg: $(OSTREE_GPG)/key-config gpg --homedir=$(OSTREE_GPG) --export --armor >"$@" -update-app-market: $(PKGUPD) version.yml ostree-branch.yml channel.yml - $(PKGUPD) ignite meta ignite.cache=$(CACHE_PATH) $(APPMARKET_PATH)/$(CHANNEL) +update-app-market: $(IGNITE) version.yml ostree-branch.yml channel.yml + $(IGNITE) meta -cache-path $(CACHE_PATH) $(APPMARKET_PATH)/$(CHANNEL) ./scripts/extract-icons.sh $(APPMARKET_PATH)/$(CHANNEL)/apps/ $(APPMARKET_PATH)/$(CHANNEL)/icons/ -update-ostree: $(PKGUPD) version.yml ostree-branch.yml channel.yml files/rlxos.gpg +update-ostree: $(IGNITE) version.yml ostree-branch.yml channel.yml files/rlxos.gpg ifndef ELEMENT @echo "no ELEMENT specified" @exit 1 diff --git a/apps/welcome/assets/welcome.desktop b/apps/welcome/assets/welcome.desktop deleted file mode 100644 index f7cc365d0..000000000 --- a/apps/welcome/assets/welcome.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Version=1.0 -Name=Welcome Tour -Comment=Guided tutorial for new users -GenericName=Welcome Tour -Exec=welcome -Terminal=false -StartupNotify=true \ No newline at end of file diff --git a/apps/welcome/config/config.go b/apps/welcome/config/config.go deleted file mode 100644 index cfa5be74e..000000000 --- a/apps/welcome/config/config.go +++ /dev/null @@ -1,22 +0,0 @@ -package config - -import ( - "os" - "path" -) - -const ( - GtkDarkTheme = "Orchis-Dark" - GtkLightTheme = "Orchis-Light" - - IconDarkTheme = "Tela-dark" - IconLightTheme = "Tela-light" - - SoftwareCenter = "gnome-software" - - SupportUrl = "https://github.com/itsManjeet/rlxos/discussions" -) - -var ( - DoneFile = path.Join(os.Getenv("HOME"), ".welcome-done") -) diff --git a/apps/welcome/locale/hi.yaml b/apps/welcome/locale/hi.yaml deleted file mode 100644 index 8c3a04823..000000000 --- a/apps/welcome/locale/hi.yaml +++ /dev/null @@ -1,22 +0,0 @@ -- string: Welcome - translation: Welcome -- string: Welcome to RLXOS - translation: Welcome to RLXOS -- string: Back - translation: Back -- string: Looks and feel - translation: Looks and feel -- string: Applications - translation: Applications -- string: Finalize - translation: Finalize -- string: Help and Support - translation: Help and Support -- string: Finish - translation: Finish -- string: Next - translation: Next -- string: Follow to step-by-step guide to know more about rlxos - translation: Follow to step-by-step guide to know more about rlxos -- string: Get your favorite apps here - translation: Get your favorite apps here diff --git a/apps/welcome/locale/locale.go b/apps/welcome/locale/locale.go deleted file mode 100644 index 733eddbbd..000000000 --- a/apps/welcome/locale/locale.go +++ /dev/null @@ -1,17 +0,0 @@ -package locale - -import ( - _ "embed" - "rlxos/pkg/localize" -) - -//go:embed hi.yaml -var hi []byte - -func init() { - localize.Add("hi", hi) -} - -func T(s string) string { - return localize.Translate(s) -} diff --git a/apps/welcome/main.go b/apps/welcome/main.go deleted file mode 100644 index e5266c5fb..000000000 --- a/apps/welcome/main.go +++ /dev/null @@ -1,36 +0,0 @@ -package main - -import ( - "github.com/diamondburned/gotk4/pkg/gdk/v4" - "github.com/diamondburned/gotk4/pkg/gio/v2" - "github.com/diamondburned/gotk4/pkg/gtk/v4" - "os" - "rlxos/apps/welcome/config" - "rlxos/apps/welcome/window" - "rlxos/apps/welcome/window/style" -) - -func main() { - app := gtk.NewApplication("dev.rlxos.Welcome", gio.ApplicationFlagsNone) - - if _, err := os.Stat(config.DoneFile); err == nil && os.Getenv("WELCOME_TOUR_AS_APP") == "" { - os.Exit(0) - } - - app.ConnectStartup(func() { - gtk.StyleContextAddProviderForDisplay( - gdk.DisplayGetDefault(), style.Provider(), - gtk.STYLE_PROVIDER_PRIORITY_APPLICATION) - }) - - app.ConnectActivate(func() { - win := app.ActiveWindow() - if win == nil { - win = &window.NewWindow().Window - app.AddWindow(win) - } - win.Present() - }) - - os.Exit(app.Run(os.Args)) -} diff --git a/apps/welcome/window/page.go b/apps/welcome/window/page.go deleted file mode 100644 index a898713fa..000000000 --- a/apps/welcome/window/page.go +++ /dev/null @@ -1,12 +0,0 @@ -package window - -import "github.com/diamondburned/gotk4/pkg/gtk/v4" - -type IPage interface { - gtk.Widgetter - - CanGoBack() bool - CanGoForward() bool - - Title() string -} diff --git a/apps/welcome/window/pages/apps/apps.go b/apps/welcome/window/pages/apps/apps.go deleted file mode 100644 index 5d28a15dd..000000000 --- a/apps/welcome/window/pages/apps/apps.go +++ /dev/null @@ -1,71 +0,0 @@ -package apps - -import ( - _ "embed" - "github.com/diamondburned/gotk4/pkg/glib/v2" - "github.com/diamondburned/gotk4/pkg/gtk/v4" - "log" - "os/exec" - "rlxos/apps/welcome/config" - . "rlxos/apps/welcome/locale" -) - -type Page struct { - gtk.Box -} - -func NewAppsPage() *Page { - p := &Page{Box: *gtk.NewBox(gtk.OrientationVertical, 0)} - p.setupUI() - return p -} - -func (p *Page) setupUI() { - p.SetVAlign(gtk.AlignCenter) - p.SetHAlign(gtk.AlignCenter) - - icon := gtk.NewImageFromIconName("applications-all-symbolic") - icon.SetPixelSize(64) - icon.SetMarginBottom(12) - p.Append(icon) - - heading := gtk.NewLabel(T("Get your favorite apps here")) - heading.AddCSSClass("heading") - p.Append(heading) - - subheading := gtk.NewLabel(T("Browse and install your favorite apps effortlessly.\nExplore new tools, utilities, and games—all available directly in the Software Center.")) - subheading.SetJustify(gtk.JustifyCenter) - subheading.SetMarginBottom(24) - p.Append(subheading) - - button := gtk.NewButtonWithLabel(T("Browse apps")) - button.ConnectClicked(func() { - button.SetSensitive(false) - button.SetLabel(T("Starting...")) - - cmd := exec.Command(config.SoftwareCenter) - if err := cmd.Start(); err != nil { - log.Println("failed to start software center", err) - } else { - go func() { - if err := cmd.Wait(); err != nil { - log.Println("failed to wait for software center", err) - } - glib.IdleAdd(func() bool { - button.SetSensitive(true) - button.SetLabel(T("Browse apps")) - return true - }) - }() - } - }) - button.SetHAlign(gtk.AlignCenter) - button.SetVAlign(gtk.AlignCenter) - p.Append(button) -} - -func (p *Page) CanGoBack() bool { return true } - -func (p *Page) CanGoForward() bool { return true } - -func (p *Page) Title() string { return T("Applications") } diff --git a/apps/welcome/window/pages/finish/finish.go b/apps/welcome/window/pages/finish/finish.go deleted file mode 100644 index e71024865..000000000 --- a/apps/welcome/window/pages/finish/finish.go +++ /dev/null @@ -1,43 +0,0 @@ -package finish - -import ( - "github.com/diamondburned/gotk4/pkg/gtk/v4" - . "rlxos/apps/welcome/locale" -) - -type Page struct { - gtk.Box -} - -func NewFinishPage() *Page { - p := &Page{Box: *gtk.NewBox(gtk.OrientationVertical, 0)} - p.setupUI() - return p -} - -func (p *Page) setupUI() { - p.SetHAlign(gtk.AlignCenter) - p.SetVAlign(gtk.AlignCenter) - p.SetMarginBottom(36) - - icon := gtk.NewImageFromIconName("ticktick-tray") - icon.SetPixelSize(64) - icon.SetMarginBottom(12) - p.Append(icon) - - heading := gtk.NewLabel(T("You're All Set!")) - heading.AddCSSClass("heading") - p.Append(heading) - - subheading := gtk.NewLabel(T("Your system is ready. Dive in\nand start exploring or fine-tune your settings further.")) - subheading.SetMarginBottom(24) - subheading.SetJustify(gtk.JustifyCenter) - p.Append(subheading) - -} - -func (p *Page) CanGoBack() bool { return true } - -func (p *Page) CanGoForward() bool { return true } - -func (p *Page) Title() string { return T("Finalize") } diff --git a/apps/welcome/window/pages/looks/looks.go b/apps/welcome/window/pages/looks/looks.go deleted file mode 100644 index 41ef59458..000000000 --- a/apps/welcome/window/pages/looks/looks.go +++ /dev/null @@ -1,112 +0,0 @@ -package looks - -import ( - "fmt" - "log" - "os/exec" - "rlxos/apps/welcome/config" - . "rlxos/apps/welcome/locale" - - "github.com/diamondburned/gotk4/pkg/gtk/v4" -) - -type Page struct { - gtk.Box - - slider *gtk.Scale -} - -func NewLooksPage() *Page { - p := &Page{Box: *gtk.NewBox(gtk.OrientationVertical, 0)} - p.setupUI() - return p -} - -func (p *Page) setupUI() { - p.SetVAlign(gtk.AlignCenter) - p.SetMarginBottom(128) - - themeLabel := gtk.NewLabel(T("Choose Your Theme")) - themeLabel.AddCSSClass("subheading") - themeLabel.SetMarginBottom(12) - p.Append(themeLabel) - - btnBox := gtk.NewBox(gtk.OrientationHorizontal, 24) - btnBox.SetHAlign(gtk.AlignCenter) - p.Append(btnBox) - - darkThemeImage := gtk.NewImageFromIconName("dark-mode-symbolic") - darkThemeImage.SetPixelSize(64) - - darkThemeBtn := gtk.NewButton() - darkThemeBtn.SetChild(darkThemeImage) - darkThemeBtn.ConnectClicked(func() { p.SwitchToDarkTheme() }) - darkThemeBtn.AddCSSClass("circular") - btnBox.Append(darkThemeBtn) - - lightThemeImage := gtk.NewImageFromIconName("brightness-display-symbolic") - lightThemeImage.SetPixelSize(64) - - lightThemeBtn := gtk.NewButton() - lightThemeBtn.SetChild(lightThemeImage) - lightThemeBtn.ConnectClicked(func() { p.SwitchToLightTheme() }) - lightThemeBtn.AddCSSClass("circular") - btnBox.Append(lightThemeBtn) - - dpiLabel := gtk.NewLabel(T("Adjust Display Scale")) - dpiLabel.AddCSSClass("subheading") - dpiLabel.SetMarginBottom(12) - dpiLabel.SetMarginTop(54) - p.Append(dpiLabel) - - p.slider = gtk.NewScaleWithRange(gtk.OrientationHorizontal, 0, 100, 10) - for i := 0; i <= 100; i += 10 { - p.slider.AddMark(float64(i), gtk.PosTop, "") - } - p.slider.ConnectValueChanged(func() { - p.UpdateScaling() - }) - p.slider.SetMarginStart(40) - p.slider.SetMarginEnd(40) - p.slider.SetValue(20) - p.Append(p.slider) -} - -func (p *Page) UpdateScaling() { - scale := p.slider.Value() - p.setConfig("xsettings", "/Xft/DPI", fmt.Sprintf("%d", int(scale+90))) -} - -func (p *Page) SwitchToDarkTheme() { - p.setGsettings("org.gnome.desktop.interface", "gtk-theme", config.GtkDarkTheme) - p.setConfig("xsettings", "/Net/ThemeName", config.GtkDarkTheme) - - p.setGsettings("org.gnome.desktop.interface", "icon-theme", config.IconDarkTheme) - p.setConfig("xsettings", "/Net/IconThemeName", config.IconDarkTheme) -} - -func (p *Page) SwitchToLightTheme() { - p.setGsettings("org.gnome.desktop.interface", "gtk-theme", config.GtkLightTheme) - p.setConfig("xsettings", "/Net/ThemeName", config.GtkLightTheme) - - p.setGsettings("org.gnome.desktop.interface", "icon-theme", config.IconLightTheme) - p.setConfig("xsettings", "/Net/IconThemeName", config.IconLightTheme) -} - -func (p *Page) setConfig(channel, property, value string) { - if output, err := exec.Command("xfconf-query", "-c", channel, "-p", property, "-s", value).CombinedOutput(); err != nil { - log.Printf("Failed to set config %s: %s %s", property, string(output), err) - } -} - -func (p *Page) setGsettings(channel, property, value string) { - if output, err := exec.Command("gsettings", "set", channel, property, value).CombinedOutput(); err != nil { - log.Printf("Failed to set config %s: %s %s", property, string(output), err) - } -} - -func (p *Page) CanGoBack() bool { return true } - -func (p *Page) CanGoForward() bool { return true } - -func (p *Page) Title() string { return T("Customize Your Look") } diff --git a/apps/welcome/window/pages/support/support.go b/apps/welcome/window/pages/support/support.go deleted file mode 100644 index bb3c2d469..000000000 --- a/apps/welcome/window/pages/support/support.go +++ /dev/null @@ -1,70 +0,0 @@ -package support - -import ( - "github.com/diamondburned/gotk4/pkg/glib/v2" - "github.com/diamondburned/gotk4/pkg/gtk/v4" - "log" - "os/exec" - "rlxos/apps/welcome/config" - . "rlxos/apps/welcome/locale" -) - -type Page struct { - gtk.Box -} - -func NewSupportPage() *Page { - p := &Page{Box: *gtk.NewBox(gtk.OrientationVertical, 0)} - p.setupUI() - return p -} - -func (p *Page) setupUI() { - p.SetVAlign(gtk.AlignCenter) - p.SetHAlign(gtk.AlignCenter) - - icon := gtk.NewImageFromIconName("help-symbolic") - icon.SetPixelSize(64) - icon.SetMarginBottom(12) - p.Append(icon) - - heading := gtk.NewLabel(T("Help & Support")) - heading.AddCSSClass("heading") - p.Append(heading) - - subheading := gtk.NewLabel(T("Need assistance? Explore our documentation\nor connect with the community for answers to your questions.")) - subheading.SetMarginBottom(24) - subheading.SetJustify(gtk.JustifyCenter) - p.Append(subheading) - - button := gtk.NewButtonWithLabel(T("Open Support")) - button.ConnectClicked(func() { - button.SetLabel(T("Starting...")) - button.SetSensitive(false) - cmd := exec.Command("exo-open", config.SupportUrl) - if err := cmd.Start(); err != nil { - log.Println("failed to load support url", err) - } else { - go func() { - if err := cmd.Wait(); err != nil { - log.Println("failed to load support url", err) - } - - glib.IdleAdd(func() bool { - button.SetSensitive(true) - button.SetLabel(T("Open Support")) - return true - }) - }() - } - }) - button.SetHAlign(gtk.AlignCenter) - button.SetVAlign(gtk.AlignCenter) - p.Append(button) -} - -func (p *Page) CanGoBack() bool { return true } - -func (p *Page) CanGoForward() bool { return true } - -func (p *Page) Title() string { return T("Help and Support") } diff --git a/apps/welcome/window/pages/welcome/welcome.go b/apps/welcome/window/pages/welcome/welcome.go deleted file mode 100644 index 937d8ec6c..000000000 --- a/apps/welcome/window/pages/welcome/welcome.go +++ /dev/null @@ -1,43 +0,0 @@ -package welcome - -import ( - . "rlxos/apps/welcome/locale" - - "github.com/diamondburned/gotk4/pkg/gtk/v4" -) - -type Page struct { - gtk.Box -} - -func NewWelcomePage() *Page { - p := &Page{Box: *gtk.NewBox(gtk.OrientationVertical, 0)} - - p.setupUI() - - return p -} - -func (p *Page) setupUI() { - icon := gtk.NewImageFromIconName("start-here-symbolic") - icon.SetPixelSize(128) - p.Append(icon) - - p.SetVAlign(gtk.AlignCenter) - p.SetHAlign(gtk.AlignCenter) - p.SetMarginBottom(120) - - title := gtk.NewLabel(T("Welcome to RLXOS")) - title.AddCSSClass("heading") - p.Append(title) - - subtitle := gtk.NewLabel(T("Take the tour to learn your way around and discover essentials features")) - p.Append(subtitle) - -} - -func (p *Page) CanGoBack() bool { return true } - -func (p *Page) CanGoForward() bool { return true } - -func (p *Page) Title() string { return T("Welcome") } diff --git a/apps/welcome/window/style/global.css b/apps/welcome/window/style/global.css deleted file mode 100644 index 685dadd8e..000000000 --- a/apps/welcome/window/style/global.css +++ /dev/null @@ -1,9 +0,0 @@ -.heading { - font-weight: bold; - font-size: x-large; -} - -.subheading { - font-size: large; - font-weight: bold; -} \ No newline at end of file diff --git a/apps/welcome/window/style/style.go b/apps/welcome/window/style/style.go deleted file mode 100644 index deae90fb7..000000000 --- a/apps/welcome/window/style/style.go +++ /dev/null @@ -1,22 +0,0 @@ -package style - -import ( - _ "embed" - "github.com/diamondburned/gotk4/pkg/gtk/v4" - "log" - "strings" -) - -//go:embed global.css -var global string - -func Provider() *gtk.CSSProvider { - provider := gtk.NewCSSProvider() - provider.ConnectParsingError(func(section *gtk.CSSSection, err error) { - loc := section.StartLocation() - lines := strings.Split(global, "\n") - log.Printf("CSS Error (%v) at line: %q", err, lines[loc.Lines()]) - }) - provider.LoadFromString(global) - return provider -} diff --git a/apps/welcome/window/window.go b/apps/welcome/window/window.go deleted file mode 100644 index d4ccdfdd8..000000000 --- a/apps/welcome/window/window.go +++ /dev/null @@ -1,93 +0,0 @@ -package window - -import ( - "github.com/diamondburned/gotk4/pkg/gtk/v4" - "os" - "rlxos/apps/welcome/config" - . "rlxos/apps/welcome/locale" - "rlxos/apps/welcome/window/pages/apps" - "rlxos/apps/welcome/window/pages/finish" - "rlxos/apps/welcome/window/pages/looks" - "rlxos/apps/welcome/window/pages/support" - "rlxos/apps/welcome/window/pages/welcome" -) - -type Window struct { - gtk.Window - stack *gtk.Stack - backBtn *gtk.Button - nextBtn *gtk.Button - - pages []IPage - idx int -} - -func NewWindow() *Window { - win := &Window{Window: *gtk.NewWindow()} - - win.setupUI() - win.setupPages() - win.updatePage() - - return win -} - -func (win *Window) setupPages() { - win.pages = append(win.pages, - welcome.NewWelcomePage(), - looks.NewLooksPage(), - apps.NewAppsPage(), - support.NewSupportPage(), - finish.NewFinishPage(), - ) - for _, page := range win.pages { - win.stack.AddChild(page) - } - - win.SetChild(win.stack) -} - -func (win *Window) setupUI() { - win.SetDefaultSize(800, 600) - - headerBar := gtk.NewHeaderBar() - headerBar.SetShowTitleButtons(false) - win.SetTitlebar(headerBar) - - win.backBtn = gtk.NewButtonWithLabel(T("Back")) - win.backBtn.ConnectClicked(func() { - win.idx-- - win.updatePage() - }) - headerBar.PackStart(win.backBtn) - - win.nextBtn = gtk.NewButtonWithLabel(T("Next")) - win.nextBtn.AddCSSClass("suggested-action") - win.nextBtn.ConnectClicked(func() { - if win.idx == len(win.pages)-1 { - _ = os.WriteFile(config.DoneFile, []byte(""), 0644) - win.Application().Quit() - return - } - win.idx++ - win.updatePage() - }) - headerBar.PackEnd(win.nextBtn) - - win.stack = gtk.NewStack() - win.stack.SetTransitionDuration(200) - win.stack.SetTransitionType(gtk.StackTransitionTypeSlideLeftRight) -} - -func (win *Window) updatePage() { - win.stack.SetVisibleChild(win.pages[win.idx]) - win.backBtn.SetSensitive(win.idx > 0 && win.pages[win.idx].CanGoBack()) - win.nextBtn.SetSensitive(win.idx < len(win.pages) && win.pages[win.idx].CanGoForward()) - if win.idx == len(win.pages)-1 { - win.nextBtn.SetLabel(T("Finish")) - } else { - win.nextBtn.SetLabel(T("Next")) - } - - win.SetTitle(win.pages[win.idx].Title()) -} diff --git a/files/2in1/2in1.c b/assets/2in1/2in1.c similarity index 100% rename from files/2in1/2in1.c rename to assets/2in1/2in1.c diff --git a/files/AppImage.svg b/assets/AppImage.svg similarity index 100% rename from files/AppImage.svg rename to assets/AppImage.svg diff --git a/files/backgrounds/default-blur.jpg b/assets/backgrounds/default-blur.jpg similarity index 100% rename from files/backgrounds/default-blur.jpg rename to assets/backgrounds/default-blur.jpg diff --git a/files/backgrounds/default.jpg b/assets/backgrounds/default.jpg similarity index 100% rename from files/backgrounds/default.jpg rename to assets/backgrounds/default.jpg diff --git a/files/bash/bashrc b/assets/bash/bashrc similarity index 100% rename from files/bash/bashrc rename to assets/bash/bashrc diff --git a/files/bash/user_bash_profile b/assets/bash/user_bash_profile similarity index 100% rename from files/bash/user_bash_profile rename to assets/bash/user_bash_profile diff --git a/files/bash/user_bashrc b/assets/bash/user_bashrc similarity index 100% rename from files/bash/user_bashrc rename to assets/bash/user_bashrc diff --git a/files/bios b/assets/bios similarity index 100% rename from files/bios rename to assets/bios diff --git a/files/branding/rlxos-logo-dark.svg b/assets/branding/rlxos-logo-dark.svg similarity index 100% rename from files/branding/rlxos-logo-dark.svg rename to assets/branding/rlxos-logo-dark.svg diff --git a/files/branding/rlxos-logo-simple-white.svg b/assets/branding/rlxos-logo-simple-white.svg similarity index 100% rename from files/branding/rlxos-logo-simple-white.svg rename to assets/branding/rlxos-logo-simple-white.svg diff --git a/files/branding/rlxos-logo-simple.svg b/assets/branding/rlxos-logo-simple.svg similarity index 100% rename from files/branding/rlxos-logo-simple.svg rename to assets/branding/rlxos-logo-simple.svg diff --git a/files/branding/rlxos-logo-white.svg b/assets/branding/rlxos-logo-white.svg similarity index 100% rename from files/branding/rlxos-logo-white.svg rename to assets/branding/rlxos-logo-white.svg diff --git a/files/branding/rlxos-logo.svg b/assets/branding/rlxos-logo.svg similarity index 100% rename from files/branding/rlxos-logo.svg rename to assets/branding/rlxos-logo.svg diff --git a/files/ca-certificates/blacklist.txt b/assets/ca-certificates/blacklist.txt similarity index 100% rename from files/ca-certificates/blacklist.txt rename to assets/ca-certificates/blacklist.txt diff --git a/files/ca-certificates/certdata2pem.c b/assets/ca-certificates/certdata2pem.c similarity index 100% rename from files/ca-certificates/certdata2pem.c rename to assets/ca-certificates/certdata2pem.c diff --git a/files/ca-certificates/update-ca-certificates b/assets/ca-certificates/update-ca-certificates similarity index 100% rename from files/ca-certificates/update-ca-certificates rename to assets/ca-certificates/update-ca-certificates diff --git a/files/core/docbook-xsl-nons/docbook-xsl-nons-1.79.2-stack_fix-1.patch b/assets/core/docbook-xsl-nons/docbook-xsl-nons-1.79.2-stack_fix-1.patch similarity index 100% rename from files/core/docbook-xsl-nons/docbook-xsl-nons-1.79.2-stack_fix-1.patch rename to assets/core/docbook-xsl-nons/docbook-xsl-nons-1.79.2-stack_fix-1.patch diff --git a/files/core/systemd-repart-config/10-efi.conf b/assets/core/systemd-repart-config/10-efi.conf similarity index 100% rename from files/core/systemd-repart-config/10-efi.conf rename to assets/core/systemd-repart-config/10-efi.conf diff --git a/files/core/systemd-repart-config/20-usr-A.conf b/assets/core/systemd-repart-config/20-usr-A.conf similarity index 100% rename from files/core/systemd-repart-config/20-usr-A.conf rename to assets/core/systemd-repart-config/20-usr-A.conf diff --git a/files/core/systemd-repart-config/21-usr-verity-A.conf b/assets/core/systemd-repart-config/21-usr-verity-A.conf similarity index 100% rename from files/core/systemd-repart-config/21-usr-verity-A.conf rename to assets/core/systemd-repart-config/21-usr-verity-A.conf diff --git a/files/core/systemd-repart-config/30-usr-B.conf b/assets/core/systemd-repart-config/30-usr-B.conf similarity index 100% rename from files/core/systemd-repart-config/30-usr-B.conf rename to assets/core/systemd-repart-config/30-usr-B.conf diff --git a/files/core/systemd-repart-config/31-usr-verity-B.conf b/assets/core/systemd-repart-config/31-usr-verity-B.conf similarity index 100% rename from files/core/systemd-repart-config/31-usr-verity-B.conf rename to assets/core/systemd-repart-config/31-usr-verity-B.conf diff --git a/files/core/systemd-repart-config/50-root.conf b/assets/core/systemd-repart-config/50-root.conf similarity index 100% rename from files/core/systemd-repart-config/50-root.conf rename to assets/core/systemd-repart-config/50-root.conf diff --git a/files/core/systemd-sysupdate-config/rlxos-kernel.conf b/assets/core/systemd-sysupdate-config/rlxos-kernel.conf similarity index 100% rename from files/core/systemd-sysupdate-config/rlxos-kernel.conf rename to assets/core/systemd-sysupdate-config/rlxos-kernel.conf diff --git a/files/core/systemd-sysupdate-config/rlxos-usr-verity.conf b/assets/core/systemd-sysupdate-config/rlxos-usr-verity.conf similarity index 100% rename from files/core/systemd-sysupdate-config/rlxos-usr-verity.conf rename to assets/core/systemd-sysupdate-config/rlxos-usr-verity.conf diff --git a/files/core/systemd-sysupdate-config/rlxos-usr.conf b/assets/core/systemd-sysupdate-config/rlxos-usr.conf similarity index 100% rename from files/core/systemd-sysupdate-config/rlxos-usr.conf rename to assets/core/systemd-sysupdate-config/rlxos-usr.conf diff --git a/files/dialogrc b/assets/dialogrc similarity index 100% rename from files/dialogrc rename to assets/dialogrc diff --git a/files/dracut.conf b/assets/dracut.conf similarity index 100% rename from files/dracut.conf rename to assets/dracut.conf diff --git a/files/filesystem/env-generator b/assets/filesystem/env-generator similarity index 100% rename from files/filesystem/env-generator rename to assets/filesystem/env-generator diff --git a/files/filesystem/fstab b/assets/filesystem/fstab similarity index 100% rename from files/filesystem/fstab rename to assets/filesystem/fstab diff --git a/files/filesystem/group b/assets/filesystem/group similarity index 100% rename from files/filesystem/group rename to assets/filesystem/group diff --git a/files/filesystem/gshadow b/assets/filesystem/gshadow similarity index 100% rename from files/filesystem/gshadow rename to assets/filesystem/gshadow diff --git a/files/filesystem/host.conf b/assets/filesystem/host.conf similarity index 100% rename from files/filesystem/host.conf rename to assets/filesystem/host.conf diff --git a/files/filesystem/hosts b/assets/filesystem/hosts similarity index 100% rename from files/filesystem/hosts rename to assets/filesystem/hosts diff --git a/files/filesystem/inputrc b/assets/filesystem/inputrc similarity index 100% rename from files/filesystem/inputrc rename to assets/filesystem/inputrc diff --git a/files/filesystem/issue b/assets/filesystem/issue similarity index 100% rename from files/filesystem/issue rename to assets/filesystem/issue diff --git a/files/filesystem/lsb-release b/assets/filesystem/lsb-release similarity index 100% rename from files/filesystem/lsb-release rename to assets/filesystem/lsb-release diff --git a/files/filesystem/nsswitch.conf b/assets/filesystem/nsswitch.conf similarity index 100% rename from files/filesystem/nsswitch.conf rename to assets/filesystem/nsswitch.conf diff --git a/files/filesystem/os-release b/assets/filesystem/os-release similarity index 100% rename from files/filesystem/os-release rename to assets/filesystem/os-release diff --git a/files/filesystem/passwd b/assets/filesystem/passwd similarity index 100% rename from files/filesystem/passwd rename to assets/filesystem/passwd diff --git a/files/filesystem/profile b/assets/filesystem/profile similarity index 100% rename from files/filesystem/profile rename to assets/filesystem/profile diff --git a/files/filesystem/resolv.conf b/assets/filesystem/resolv.conf similarity index 100% rename from files/filesystem/resolv.conf rename to assets/filesystem/resolv.conf diff --git a/files/filesystem/securetty b/assets/filesystem/securetty similarity index 100% rename from files/filesystem/securetty rename to assets/filesystem/securetty diff --git a/files/filesystem/shadow b/assets/filesystem/shadow similarity index 100% rename from files/filesystem/shadow rename to assets/filesystem/shadow diff --git a/files/filesystem/shells b/assets/filesystem/shells similarity index 100% rename from files/filesystem/shells rename to assets/filesystem/shells diff --git a/files/filesystem/sysusers b/assets/filesystem/sysusers similarity index 100% rename from files/filesystem/sysusers rename to assets/filesystem/sysusers diff --git a/files/filesystem/tmpfiles b/assets/filesystem/tmpfiles similarity index 100% rename from files/filesystem/tmpfiles rename to assets/filesystem/tmpfiles diff --git a/files/firefox/firefox.desktop b/assets/firefox/firefox.desktop similarity index 100% rename from files/firefox/firefox.desktop rename to assets/firefox/firefox.desktop diff --git a/files/foot/foot.ini b/assets/foot/foot.ini similarity index 100% rename from files/foot/foot.ini rename to assets/foot/foot.ini diff --git a/files/greetd/config.toml b/assets/greetd/config.toml similarity index 100% rename from files/greetd/config.toml rename to assets/greetd/config.toml diff --git a/files/greetd/sway-config b/assets/greetd/sway-config similarity index 100% rename from files/greetd/sway-config rename to assets/greetd/sway-config diff --git a/files/greetd/wlgreet.toml b/assets/greetd/wlgreet.toml similarity index 100% rename from files/greetd/wlgreet.toml rename to assets/greetd/wlgreet.toml diff --git a/files/grub/0001-RLXOS-CONFIG-PATCH-TO-SUPPORT-OVERLAY-FS.patch b/assets/grub/0001-RLXOS-CONFIG-PATCH-TO-SUPPORT-OVERLAY-FS.patch similarity index 100% rename from files/grub/0001-RLXOS-CONFIG-PATCH-TO-SUPPORT-OVERLAY-FS.patch rename to assets/grub/0001-RLXOS-CONFIG-PATCH-TO-SUPPORT-OVERLAY-FS.patch diff --git a/files/grub/grub.default b/assets/grub/grub.default similarity index 100% rename from files/grub/grub.default rename to assets/grub/grub.default diff --git a/files/grub/unicode.pf2 b/assets/grub/unicode.pf2 similarity index 100% rename from files/grub/unicode.pf2 rename to assets/grub/unicode.pf2 diff --git a/files/grub/unifont-13.0.06.bdf b/assets/grub/unifont-13.0.06.bdf similarity index 100% rename from files/grub/unifont-13.0.06.bdf rename to assets/grub/unifont-13.0.06.bdf diff --git a/files/grub/update-grub.sh b/assets/grub/update-grub.sh similarity index 100% rename from files/grub/update-grub.sh rename to assets/grub/update-grub.sh diff --git a/files/i3blocks/audio.sh b/assets/i3blocks/audio.sh similarity index 100% rename from files/i3blocks/audio.sh rename to assets/i3blocks/audio.sh diff --git a/files/i3blocks/battery.sh b/assets/i3blocks/battery.sh similarity index 100% rename from files/i3blocks/battery.sh rename to assets/i3blocks/battery.sh diff --git a/files/i3blocks/i3blocks.conf b/assets/i3blocks/i3blocks.conf similarity index 100% rename from files/i3blocks/i3blocks.conf rename to assets/i3blocks/i3blocks.conf diff --git a/files/i3blocks/network.sh b/assets/i3blocks/network.sh similarity index 100% rename from files/i3blocks/network.sh rename to assets/i3blocks/network.sh diff --git a/files/initial-setup/first-boot.sh b/assets/initial-setup/first-boot.sh similarity index 100% rename from files/initial-setup/first-boot.sh rename to assets/initial-setup/first-boot.sh diff --git a/files/initial-setup/installer.sh b/assets/initial-setup/installer.sh similarity index 100% rename from files/initial-setup/installer.sh rename to assets/initial-setup/installer.sh diff --git a/files/initramfs/init.in b/assets/initramfs/init.in similarity index 100% rename from files/initramfs/init.in rename to assets/initramfs/init.in diff --git a/files/initramfs/mkinitramfs.sh.in b/assets/initramfs/mkinitramfs.sh.in similarity index 100% rename from files/initramfs/mkinitramfs.sh.in rename to assets/initramfs/mkinitramfs.sh.in diff --git a/files/interface/client/buttons.lua b/assets/interface/client/buttons.lua similarity index 100% rename from files/interface/client/buttons.lua rename to assets/interface/client/buttons.lua diff --git a/files/interface/client/init.lua b/assets/interface/client/init.lua similarity index 100% rename from files/interface/client/init.lua rename to assets/interface/client/init.lua diff --git a/files/interface/client/keys.lua b/assets/interface/client/keys.lua similarity index 100% rename from files/interface/client/keys.lua rename to assets/interface/client/keys.lua diff --git a/files/interface/client/rules.lua b/assets/interface/client/rules.lua similarity index 100% rename from files/interface/client/rules.lua rename to assets/interface/client/rules.lua diff --git a/files/interface/client/titlebar.lua b/assets/interface/client/titlebar.lua similarity index 100% rename from files/interface/client/titlebar.lua rename to assets/interface/client/titlebar.lua diff --git a/files/interface/config.lua b/assets/interface/config.lua similarity index 100% rename from files/interface/config.lua rename to assets/interface/config.lua diff --git a/files/interface/internal/error-handling.lua b/assets/interface/internal/error-handling.lua similarity index 100% rename from files/interface/internal/error-handling.lua rename to assets/interface/internal/error-handling.lua diff --git a/files/interface/internal/global-buttons.lua b/assets/interface/internal/global-buttons.lua similarity index 100% rename from files/interface/internal/global-buttons.lua rename to assets/interface/internal/global-buttons.lua diff --git a/files/interface/internal/global-keys.lua b/assets/interface/internal/global-keys.lua similarity index 100% rename from files/interface/internal/global-keys.lua rename to assets/interface/internal/global-keys.lua diff --git a/files/interface/internal/global-menu.lua b/assets/interface/internal/global-menu.lua similarity index 100% rename from files/interface/internal/global-menu.lua rename to assets/interface/internal/global-menu.lua diff --git a/files/interface/internal/layouts.lua b/assets/interface/internal/layouts.lua similarity index 100% rename from files/interface/internal/layouts.lua rename to assets/interface/internal/layouts.lua diff --git a/files/interface/internal/startup-apps.lua b/assets/interface/internal/startup-apps.lua similarity index 100% rename from files/interface/internal/startup-apps.lua rename to assets/interface/internal/startup-apps.lua diff --git a/files/interface/internal/wallpaper.lua b/assets/interface/internal/wallpaper.lua similarity index 100% rename from files/interface/internal/wallpaper.lua rename to assets/interface/internal/wallpaper.lua diff --git a/files/interface/panel/clock.lua b/assets/interface/panel/clock.lua similarity index 100% rename from files/interface/panel/clock.lua rename to assets/interface/panel/clock.lua diff --git a/files/interface/panel/init.lua b/assets/interface/panel/init.lua similarity index 100% rename from files/interface/panel/init.lua rename to assets/interface/panel/init.lua diff --git a/files/interface/panel/prompt.lua b/assets/interface/panel/prompt.lua similarity index 100% rename from files/interface/panel/prompt.lua rename to assets/interface/panel/prompt.lua diff --git a/files/interface/panel/start-launcher.lua b/assets/interface/panel/start-launcher.lua similarity index 100% rename from files/interface/panel/start-launcher.lua rename to assets/interface/panel/start-launcher.lua diff --git a/files/interface/panel/taglist.lua b/assets/interface/panel/taglist.lua similarity index 100% rename from files/interface/panel/taglist.lua rename to assets/interface/panel/taglist.lua diff --git a/files/interface/panel/tasklist.lua b/assets/interface/panel/tasklist.lua similarity index 100% rename from files/interface/panel/tasklist.lua rename to assets/interface/panel/tasklist.lua diff --git a/files/interface/picom.conf b/assets/interface/picom.conf similarity index 100% rename from files/interface/picom.conf rename to assets/interface/picom.conf diff --git a/files/interface/rc.lua b/assets/interface/rc.lua similarity index 100% rename from files/interface/rc.lua rename to assets/interface/rc.lua diff --git a/files/interface/theme/background.jpeg b/assets/interface/theme/background.jpeg similarity index 100% rename from files/interface/theme/background.jpeg rename to assets/interface/theme/background.jpeg diff --git a/files/interface/theme/layouts/cornerne.png b/assets/interface/theme/layouts/cornerne.png similarity index 100% rename from files/interface/theme/layouts/cornerne.png rename to assets/interface/theme/layouts/cornerne.png diff --git a/files/interface/theme/layouts/cornernew.png b/assets/interface/theme/layouts/cornernew.png similarity index 100% rename from files/interface/theme/layouts/cornernew.png rename to assets/interface/theme/layouts/cornernew.png diff --git a/files/interface/theme/layouts/cornernw.png b/assets/interface/theme/layouts/cornernw.png similarity index 100% rename from files/interface/theme/layouts/cornernw.png rename to assets/interface/theme/layouts/cornernw.png diff --git a/files/interface/theme/layouts/cornernww.png b/assets/interface/theme/layouts/cornernww.png similarity index 100% rename from files/interface/theme/layouts/cornernww.png rename to assets/interface/theme/layouts/cornernww.png diff --git a/files/interface/theme/layouts/cornerse.png b/assets/interface/theme/layouts/cornerse.png similarity index 100% rename from files/interface/theme/layouts/cornerse.png rename to assets/interface/theme/layouts/cornerse.png diff --git a/files/interface/theme/layouts/cornersew.png b/assets/interface/theme/layouts/cornersew.png similarity index 100% rename from files/interface/theme/layouts/cornersew.png rename to assets/interface/theme/layouts/cornersew.png diff --git a/files/interface/theme/layouts/cornersw.png b/assets/interface/theme/layouts/cornersw.png similarity index 100% rename from files/interface/theme/layouts/cornersw.png rename to assets/interface/theme/layouts/cornersw.png diff --git a/files/interface/theme/layouts/cornersww.png b/assets/interface/theme/layouts/cornersww.png similarity index 100% rename from files/interface/theme/layouts/cornersww.png rename to assets/interface/theme/layouts/cornersww.png diff --git a/files/interface/theme/layouts/dwindle.png b/assets/interface/theme/layouts/dwindle.png similarity index 100% rename from files/interface/theme/layouts/dwindle.png rename to assets/interface/theme/layouts/dwindle.png diff --git a/files/interface/theme/layouts/dwindlew.png b/assets/interface/theme/layouts/dwindlew.png similarity index 100% rename from files/interface/theme/layouts/dwindlew.png rename to assets/interface/theme/layouts/dwindlew.png diff --git a/files/interface/theme/layouts/fairh.png b/assets/interface/theme/layouts/fairh.png similarity index 100% rename from files/interface/theme/layouts/fairh.png rename to assets/interface/theme/layouts/fairh.png diff --git a/files/interface/theme/layouts/fairhw.png b/assets/interface/theme/layouts/fairhw.png similarity index 100% rename from files/interface/theme/layouts/fairhw.png rename to assets/interface/theme/layouts/fairhw.png diff --git a/files/interface/theme/layouts/fairv.png b/assets/interface/theme/layouts/fairv.png similarity index 100% rename from files/interface/theme/layouts/fairv.png rename to assets/interface/theme/layouts/fairv.png diff --git a/files/interface/theme/layouts/fairvw.png b/assets/interface/theme/layouts/fairvw.png similarity index 100% rename from files/interface/theme/layouts/fairvw.png rename to assets/interface/theme/layouts/fairvw.png diff --git a/files/interface/theme/layouts/floating.png b/assets/interface/theme/layouts/floating.png similarity index 100% rename from files/interface/theme/layouts/floating.png rename to assets/interface/theme/layouts/floating.png diff --git a/files/interface/theme/layouts/floatingw.png b/assets/interface/theme/layouts/floatingw.png similarity index 100% rename from files/interface/theme/layouts/floatingw.png rename to assets/interface/theme/layouts/floatingw.png diff --git a/files/interface/theme/layouts/fullscreen.png b/assets/interface/theme/layouts/fullscreen.png similarity index 100% rename from files/interface/theme/layouts/fullscreen.png rename to assets/interface/theme/layouts/fullscreen.png diff --git a/files/interface/theme/layouts/fullscreenw.png b/assets/interface/theme/layouts/fullscreenw.png similarity index 100% rename from files/interface/theme/layouts/fullscreenw.png rename to assets/interface/theme/layouts/fullscreenw.png diff --git a/files/interface/theme/layouts/magnifier.png b/assets/interface/theme/layouts/magnifier.png similarity index 100% rename from files/interface/theme/layouts/magnifier.png rename to assets/interface/theme/layouts/magnifier.png diff --git a/files/interface/theme/layouts/magnifierw.png b/assets/interface/theme/layouts/magnifierw.png similarity index 100% rename from files/interface/theme/layouts/magnifierw.png rename to assets/interface/theme/layouts/magnifierw.png diff --git a/files/interface/theme/layouts/max.png b/assets/interface/theme/layouts/max.png similarity index 100% rename from files/interface/theme/layouts/max.png rename to assets/interface/theme/layouts/max.png diff --git a/files/interface/theme/layouts/maxw.png b/assets/interface/theme/layouts/maxw.png similarity index 100% rename from files/interface/theme/layouts/maxw.png rename to assets/interface/theme/layouts/maxw.png diff --git a/files/interface/theme/layouts/spiral.png b/assets/interface/theme/layouts/spiral.png similarity index 100% rename from files/interface/theme/layouts/spiral.png rename to assets/interface/theme/layouts/spiral.png diff --git a/files/interface/theme/layouts/spiralw.png b/assets/interface/theme/layouts/spiralw.png similarity index 100% rename from files/interface/theme/layouts/spiralw.png rename to assets/interface/theme/layouts/spiralw.png diff --git a/files/interface/theme/layouts/tile.png b/assets/interface/theme/layouts/tile.png similarity index 100% rename from files/interface/theme/layouts/tile.png rename to assets/interface/theme/layouts/tile.png diff --git a/files/interface/theme/layouts/tilebottom.png b/assets/interface/theme/layouts/tilebottom.png similarity index 100% rename from files/interface/theme/layouts/tilebottom.png rename to assets/interface/theme/layouts/tilebottom.png diff --git a/files/interface/theme/layouts/tilebottomw.png b/assets/interface/theme/layouts/tilebottomw.png similarity index 100% rename from files/interface/theme/layouts/tilebottomw.png rename to assets/interface/theme/layouts/tilebottomw.png diff --git a/files/interface/theme/layouts/tileleft.png b/assets/interface/theme/layouts/tileleft.png similarity index 100% rename from files/interface/theme/layouts/tileleft.png rename to assets/interface/theme/layouts/tileleft.png diff --git a/files/interface/theme/layouts/tileleftw.png b/assets/interface/theme/layouts/tileleftw.png similarity index 100% rename from files/interface/theme/layouts/tileleftw.png rename to assets/interface/theme/layouts/tileleftw.png diff --git a/files/interface/theme/layouts/tiletop.png b/assets/interface/theme/layouts/tiletop.png similarity index 100% rename from files/interface/theme/layouts/tiletop.png rename to assets/interface/theme/layouts/tiletop.png diff --git a/files/interface/theme/layouts/tiletopw.png b/assets/interface/theme/layouts/tiletopw.png similarity index 100% rename from files/interface/theme/layouts/tiletopw.png rename to assets/interface/theme/layouts/tiletopw.png diff --git a/files/interface/theme/layouts/tilew.png b/assets/interface/theme/layouts/tilew.png similarity index 100% rename from files/interface/theme/layouts/tilew.png rename to assets/interface/theme/layouts/tilew.png diff --git a/files/interface/theme/submenu.png b/assets/interface/theme/submenu.png similarity index 100% rename from files/interface/theme/submenu.png rename to assets/interface/theme/submenu.png diff --git a/files/interface/theme/taglist/squarefw.png b/assets/interface/theme/taglist/squarefw.png similarity index 100% rename from files/interface/theme/taglist/squarefw.png rename to assets/interface/theme/taglist/squarefw.png diff --git a/files/interface/theme/taglist/squarew.png b/assets/interface/theme/taglist/squarew.png similarity index 100% rename from files/interface/theme/taglist/squarew.png rename to assets/interface/theme/taglist/squarew.png diff --git a/files/interface/theme/theme.lua b/assets/interface/theme/theme.lua similarity index 100% rename from files/interface/theme/theme.lua rename to assets/interface/theme/theme.lua diff --git a/files/interface/theme/titlebar/close-active.png b/assets/interface/theme/titlebar/close-active.png similarity index 100% rename from files/interface/theme/titlebar/close-active.png rename to assets/interface/theme/titlebar/close-active.png diff --git a/files/interface/theme/titlebar/close-inactive.png b/assets/interface/theme/titlebar/close-inactive.png similarity index 100% rename from files/interface/theme/titlebar/close-inactive.png rename to assets/interface/theme/titlebar/close-inactive.png diff --git a/files/layouts/rlxos-1.0-silaghana.tar.bz2 b/assets/layouts/rlxos-1.0-silaghana.tar.bz2 similarity index 100% rename from files/layouts/rlxos-1.0-silaghana.tar.bz2 rename to assets/layouts/rlxos-1.0-silaghana.tar.bz2 diff --git a/files/layouts/rlxos-1.5.tar.bz2 b/assets/layouts/rlxos-1.5.tar.bz2 similarity index 100% rename from files/layouts/rlxos-1.5.tar.bz2 rename to assets/layouts/rlxos-1.5.tar.bz2 diff --git a/files/multimedia-player.svg b/assets/multimedia-player.svg similarity index 100% rename from files/multimedia-player.svg rename to assets/multimedia-player.svg diff --git a/files/pam/chage b/assets/pam/chage similarity index 100% rename from files/pam/chage rename to assets/pam/chage diff --git a/files/pam/chfn b/assets/pam/chfn similarity index 100% rename from files/pam/chfn rename to assets/pam/chfn diff --git a/files/pam/chgpasswd b/assets/pam/chgpasswd similarity index 100% rename from files/pam/chgpasswd rename to assets/pam/chgpasswd diff --git a/files/pam/chpasswd b/assets/pam/chpasswd similarity index 100% rename from files/pam/chpasswd rename to assets/pam/chpasswd diff --git a/files/pam/chsh b/assets/pam/chsh similarity index 100% rename from files/pam/chsh rename to assets/pam/chsh diff --git a/files/pam/groupadd b/assets/pam/groupadd similarity index 100% rename from files/pam/groupadd rename to assets/pam/groupadd diff --git a/files/pam/groupdel b/assets/pam/groupdel similarity index 100% rename from files/pam/groupdel rename to assets/pam/groupdel diff --git a/files/pam/groupmems b/assets/pam/groupmems similarity index 100% rename from files/pam/groupmems rename to assets/pam/groupmems diff --git a/files/pam/groupmod b/assets/pam/groupmod similarity index 100% rename from files/pam/groupmod rename to assets/pam/groupmod diff --git a/files/pam/login b/assets/pam/login similarity index 100% rename from files/pam/login rename to assets/pam/login diff --git a/files/pam/other b/assets/pam/other similarity index 100% rename from files/pam/other rename to assets/pam/other diff --git a/files/pam/passwd b/assets/pam/passwd similarity index 100% rename from files/pam/passwd rename to assets/pam/passwd diff --git a/files/pam/su b/assets/pam/su similarity index 100% rename from files/pam/su rename to assets/pam/su diff --git a/files/pam/system-account b/assets/pam/system-account similarity index 100% rename from files/pam/system-account rename to assets/pam/system-account diff --git a/files/pam/system-auth b/assets/pam/system-auth similarity index 100% rename from files/pam/system-auth rename to assets/pam/system-auth diff --git a/files/pam/system-password b/assets/pam/system-password similarity index 100% rename from files/pam/system-password rename to assets/pam/system-password diff --git a/files/pam/system-session b/assets/pam/system-session similarity index 100% rename from files/pam/system-session rename to assets/pam/system-session diff --git a/files/pam/systemd-user b/assets/pam/systemd-user similarity index 100% rename from files/pam/systemd-user rename to assets/pam/systemd-user diff --git a/files/pam/useradd b/assets/pam/useradd similarity index 100% rename from files/pam/useradd rename to assets/pam/useradd diff --git a/files/pam/userdel b/assets/pam/userdel similarity index 100% rename from files/pam/userdel rename to assets/pam/userdel diff --git a/files/pam/usermod b/assets/pam/usermod similarity index 100% rename from files/pam/usermod rename to assets/pam/usermod diff --git a/files/rlxos.gpg b/assets/rlxos.gpg similarity index 100% rename from files/rlxos.gpg rename to assets/rlxos.gpg diff --git a/files/rofi/colors/default.rasi b/assets/rofi/colors/default.rasi similarity index 100% rename from files/rofi/colors/default.rasi rename to assets/rofi/colors/default.rasi diff --git a/files/rofi/themes/ApplicationLauncher.rasi b/assets/rofi/themes/ApplicationLauncher.rasi similarity index 100% rename from files/rofi/themes/ApplicationLauncher.rasi rename to assets/rofi/themes/ApplicationLauncher.rasi diff --git a/files/rofi/themes/Powermenu.rasi b/assets/rofi/themes/Powermenu.rasi similarity index 100% rename from files/rofi/themes/Powermenu.rasi rename to assets/rofi/themes/Powermenu.rasi diff --git a/files/rofi/themes/QuickLauncher.rasi b/assets/rofi/themes/QuickLauncher.rasi similarity index 100% rename from files/rofi/themes/QuickLauncher.rasi rename to assets/rofi/themes/QuickLauncher.rasi diff --git a/files/scripts/Powermenu b/assets/scripts/Powermenu similarity index 100% rename from files/scripts/Powermenu rename to assets/scripts/Powermenu diff --git a/files/scripts/TabletMode b/assets/scripts/TabletMode similarity index 100% rename from files/scripts/TabletMode rename to assets/scripts/TabletMode diff --git a/files/sdt-config.h b/assets/sdt-config.h similarity index 100% rename from files/sdt-config.h rename to assets/sdt-config.h diff --git a/files/sdt.h b/assets/sdt.h similarity index 100% rename from files/sdt.h rename to assets/sdt.h diff --git a/files/seatd/seatd.preset b/assets/seatd/seatd.preset similarity index 100% rename from files/seatd/seatd.preset rename to assets/seatd/seatd.preset diff --git a/files/seatd/sysuser.conf b/assets/seatd/sysuser.conf similarity index 100% rename from files/seatd/sysuser.conf rename to assets/seatd/sysuser.conf diff --git a/files/sway/config b/assets/sway/config similarity index 100% rename from files/sway/config rename to assets/sway/config diff --git a/files/sway/config-locked b/assets/sway/config-locked similarity index 100% rename from files/sway/config-locked rename to assets/sway/config-locked diff --git a/files/sway/config.d/autostart.conf b/assets/sway/config.d/autostart.conf similarity index 100% rename from files/sway/config.d/autostart.conf rename to assets/sway/config.d/autostart.conf diff --git a/files/sway/config.d/background.conf b/assets/sway/config.d/background.conf similarity index 100% rename from files/sway/config.d/background.conf rename to assets/sway/config.d/background.conf diff --git a/files/sway/config.d/bindings.conf b/assets/sway/config.d/bindings.conf similarity index 100% rename from files/sway/config.d/bindings.conf rename to assets/sway/config.d/bindings.conf diff --git a/files/sway/config.d/color-scheme.conf b/assets/sway/config.d/color-scheme.conf similarity index 100% rename from files/sway/config.d/color-scheme.conf rename to assets/sway/config.d/color-scheme.conf diff --git a/files/sway/config.d/defaults.conf b/assets/sway/config.d/defaults.conf similarity index 100% rename from files/sway/config.d/defaults.conf rename to assets/sway/config.d/defaults.conf diff --git a/files/sway/config.d/devices.conf b/assets/sway/config.d/devices.conf similarity index 100% rename from files/sway/config.d/devices.conf rename to assets/sway/config.d/devices.conf diff --git a/files/sway/config.d/fonts.conf b/assets/sway/config.d/fonts.conf similarity index 100% rename from files/sway/config.d/fonts.conf rename to assets/sway/config.d/fonts.conf diff --git a/files/sway/config.d/statusbar.conf b/assets/sway/config.d/statusbar.conf similarity index 100% rename from files/sway/config.d/statusbar.conf rename to assets/sway/config.d/statusbar.conf diff --git a/files/swaylock/config b/assets/swaylock/config similarity index 100% rename from files/swaylock/config rename to assets/swaylock/config diff --git a/files/wob/wob.ini b/assets/wob/wob.ini similarity index 100% rename from files/wob/wob.ini rename to assets/wob/wob.ini diff --git a/files/zsh/profile b/assets/zsh/profile similarity index 100% rename from files/zsh/profile rename to assets/zsh/profile diff --git a/channel.yml b/channel.yml new file mode 100644 index 000000000..566b891e9 --- /dev/null +++ b/channel.yml @@ -0,0 +1,2 @@ +variables: + channel: unstable diff --git a/cmake/FindOSTree.cmake b/cmake/FindOSTree.cmake deleted file mode 100644 index 6ed6d2547..000000000 --- a/cmake/FindOSTree.cmake +++ /dev/null @@ -1,6 +0,0 @@ -find_package(PkgConfig REQUIRED) -pkg_check_modules(OSTree REQUIRED ostree-1) -add_library(OSTree INTERFACE IMPORTED) -set_property(TARGET OSTree PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${OSTree_INCLUDE_DIRS}) -set_property(TARGET OSTree PROPERTY INTERFACE_LINK_LIBRARIES ${OSTree_LIBRARIES}) -set_property(TARGET OSTree PROPERTY INTERFACE_COMPILE_OPTIONS ${OSTree_CFLAGS_OTHER}) \ No newline at end of file diff --git a/cmake/GLibUtils.cmake b/cmake/GLibUtils.cmake deleted file mode 100644 index 806e86854..000000000 --- a/cmake/GLibUtils.cmake +++ /dev/null @@ -1,45 +0,0 @@ -macro(compile_resources GRESOURCE_FILE OUTPUT) - find_program(GLIB_RESOURCE_COMPILER NAMES glib-compile-resources REQUIRED) - get_filename_component(WORK_DIR ${GRESOURCE_FILE} DIRECTORY) - - if (${ARGC} GREATER 1) - foreach (arg IN ITEMS ${ARGN}) - string(CONCAT RESOURCE ${WORK_DIR}/ ${arg}) - list(APPEND RESOURCES ${RESOURCE}) - endforeach () - endif () - - add_custom_command( - OUTPUT ${OUTPUT} - WORKING_DIRECTORY ${WORK_DIR} - COMMAND ${GLIB_RESOURCE_COMPILER} --target=${OUTPUT} --generate-source ${GRESOURCE_FILE} - DEPENDS ${GRESOURCE_FILE} ${RESOURCES} - COMMENT "Generating ${OUTPUT}..." - ) -endmacro() - -macro(compile_schemas GSCHEMA_XML) - find_program(GLIB_SCHEMA_COMPILER NAMES glib-compile-schemas REQUIRED) - - set(WORK_DIR ${PROJECT_SOURCE_DIR}/data) - - if (${ARGC} GREATER 1) - foreach (arg IN ITEMS ${ARGN}) - string(CONCAT SCHEMA ${WORK_DIR} ${arg}) - list(APPEND SCHEMAS ${SCHEMA}) - endforeach () - endif () - - set(OUTPUT_DIR ${PROJECT_BINARY_DIR}/generated/data) - set(OUTPUT ${OUTPUT_DIR}/gschemas.compiled) - add_custom_command( - OUTPUT ${OUTPUT} - WORKING_DIRECTORY ${WORK_DIR} - COMMAND mkdir -p ${OUTPUT_DIR} - COMMAND ${GLIB_SCHEMA_COMPILER} --strict --dry-run --schema-file=${GSCHEMA_XML} - COMMAND ${GLIB_SCHEMA_COMPILER} --schema-file=${GSCHEMA_XML} --targetdir=${OUTPUT_DIR} - DEPENDS ${GSCHEMA_XML} ${SCHEMAS} - COMMENT "Generating ${OUTPUT}..." - ) - add_custom_target(gschemas.compiled ALL DEPENDS ${OUTPUT}) -endmacro() \ No newline at end of file diff --git a/config-aarch64.yml b/config-aarch64.yml index 234042e7c..a31bc23f1 100644 --- a/config-aarch64.yml +++ b/config-aarch64.yml @@ -9,7 +9,7 @@ variables: triplet: aarch64-linux-gnu merge: - - include/compiler.yml - - include/environ.yml - - include/strip.yml - - include/variables.yml + - toolchain/compiler.yml + - toolchain/environ.yml + - toolchain/strip.yml + - toolchain/variables.yml diff --git a/config-x86_64.yml b/config-x86_64.yml index 7e5b3c6e7..1e47ae436 100644 --- a/config-x86_64.yml +++ b/config-x86_64.yml @@ -1,8 +1,15 @@ -project-name: rlxos -project-version: 2400 +environ: + - CFLAGS=-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong -D_FORTIFY_SOURCE=2 --param=ssp-buffer-size=4 + - CXXFLAGS=-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong -D_FORTIFY_SOURCE=2 --param=ssp-buffer-size=4 + - LDFLAGS=-Wl,-O1,--sort-common,--as-needed,-z,relro,--hash-style=gnu + - ARCH=x86_64 + +variables: + arch: x86_64 + triplet: x86_64-linux-gnu merge: - - include/compiler.yml - - include/environ.yml - - include/variables.yml - - include/strip.yml + - toolchain/compiler.yml + - toolchain/environ.yml + - toolchain/strip.yml + - toolchain/variables.yml diff --git a/elements/components/glade.yml b/elements/components/glade.yml deleted file mode 100644 index 53caba525..000000000 --- a/elements/components/glade.yml +++ /dev/null @@ -1,2 +0,0 @@ -merge: -- elements/include/glade.inc \ No newline at end of file diff --git a/elements/apps/alacritty.yml b/external/apps/alacritty.yml similarity index 95% rename from elements/apps/alacritty.yml rename to external/apps/alacritty.yml index b98e07d52..b999211b0 100644 --- a/elements/apps/alacritty.yml +++ b/external/apps/alacritty.yml @@ -24,4 +24,4 @@ build-depends: - components/x11/libxkbcommon.yml - components/x11/libxrandr.yml -merge: [elements/include/appimage.inc] +merge: [external/include/appimage.inc] diff --git a/elements/apps/blender.yml b/external/apps/blender.yml similarity index 92% rename from elements/apps/blender.yml rename to external/apps/blender.yml index 2490daf8c..5b113d15f 100644 --- a/elements/apps/blender.yml +++ b/external/apps/blender.yml @@ -11,4 +11,4 @@ script: |- ln -sv ../../blender %{install-root}%{bindir}/blender -merge: [elements/include/appimage.inc] \ No newline at end of file +merge: [external/include/appimage.inc] \ No newline at end of file diff --git a/elements/apps/gigolo.yml b/external/apps/gigolo.yml similarity index 91% rename from elements/apps/gigolo.yml rename to external/apps/gigolo.yml index d31b71d36..cfa601ebd 100644 --- a/elements/apps/gigolo.yml +++ b/external/apps/gigolo.yml @@ -1,7 +1,7 @@ id: gigolo version: 0.5.2 about: Frontend to manage connections to remote filesystems using GIO/GVFS -merge: [elements/include/appimage.inc] +merge: [external/include/appimage.inc] run-autogen: false seperate-build-dir: false diff --git a/elements/apps/glade.yml b/external/apps/glade.yml similarity index 87% rename from elements/apps/glade.yml rename to external/apps/glade.yml index a901950a7..1401f15ac 100644 --- a/elements/apps/glade.yml +++ b/external/apps/glade.yml @@ -9,5 +9,5 @@ prepare-appimage: |- EOF merge: -- elements/include/glade.inc -- elements/include/appimage.inc \ No newline at end of file +- external/include/glade.inc +- external/include/appimage.inc \ No newline at end of file diff --git a/elements/apps/peek.yml b/external/apps/peek.yml similarity index 90% rename from elements/apps/peek.yml rename to external/apps/peek.yml index 3afadf71f..2aa9351a2 100644 --- a/elements/apps/peek.yml +++ b/external/apps/peek.yml @@ -1,7 +1,7 @@ id: peek version: 1.5.1 about: Simple screen recoder with an easy to use interface -merge: [elements/include/appimage.inc] +merge: [external/include/appimage.inc] build-depends: - components/ffmpeg.yml - components/gtk.yml diff --git a/elements/apps/pinta.yml b/external/apps/pinta.yml similarity index 95% rename from elements/apps/pinta.yml rename to external/apps/pinta.yml index e4a7f0f77..21ae19eba 100644 --- a/elements/apps/pinta.yml +++ b/external/apps/pinta.yml @@ -1,7 +1,7 @@ id: pinta version: 2.1.1 about: Drawing/editing program modeled after Paint.NET. It's goal is to provide a simplified alternative to GIMP for casual users -merge: [elements/include/appimage.inc] +merge: [external/include/appimage.inc] run-autogen: false seperate-build-dir: false diff --git a/elements/bootstrap.yml b/external/bootstrap.yml similarity index 100% rename from elements/bootstrap.yml rename to external/bootstrap.yml diff --git a/elements/components/2in1.yml b/external/components/2in1.yml similarity index 100% rename from elements/components/2in1.yml rename to external/components/2in1.yml diff --git a/elements/components/abseil-cpp.yml b/external/components/abseil-cpp.yml similarity index 100% rename from elements/components/abseil-cpp.yml rename to external/components/abseil-cpp.yml diff --git a/elements/components/accountsservice.yml b/external/components/accountsservice.yml similarity index 100% rename from elements/components/accountsservice.yml rename to external/components/accountsservice.yml diff --git a/elements/components/acl.yml b/external/components/acl.yml similarity index 100% rename from elements/components/acl.yml rename to external/components/acl.yml diff --git a/elements/components/acpid.yml b/external/components/acpid.yml similarity index 100% rename from elements/components/acpid.yml rename to external/components/acpid.yml diff --git a/elements/components/alsa-lib.yml b/external/components/alsa-lib.yml similarity index 100% rename from elements/components/alsa-lib.yml rename to external/components/alsa-lib.yml diff --git a/elements/components/amtk.yml b/external/components/amtk.yml similarity index 100% rename from elements/components/amtk.yml rename to external/components/amtk.yml diff --git a/elements/components/android-tools.yml b/external/components/android-tools.yml similarity index 100% rename from elements/components/android-tools.yml rename to external/components/android-tools.yml diff --git a/elements/components/android-udev.yml b/external/components/android-udev.yml similarity index 100% rename from elements/components/android-udev.yml rename to external/components/android-udev.yml diff --git a/elements/components/apache-ant.yml b/external/components/apache-ant.yml similarity index 100% rename from elements/components/apache-ant.yml rename to external/components/apache-ant.yml diff --git a/elements/components/apache.yml b/external/components/apache.yml similarity index 100% rename from elements/components/apache.yml rename to external/components/apache.yml diff --git a/elements/components/apparmor.yml b/external/components/apparmor.yml similarity index 100% rename from elements/components/apparmor.yml rename to external/components/apparmor.yml diff --git a/elements/components/appcenter.yml b/external/components/appcenter.yml similarity index 100% rename from elements/components/appcenter.yml rename to external/components/appcenter.yml diff --git a/elements/components/appimaged.yml b/external/components/appimaged.yml similarity index 100% rename from elements/components/appimaged.yml rename to external/components/appimaged.yml diff --git a/elements/components/appimagetool.yml b/external/components/appimagetool.yml similarity index 100% rename from elements/components/appimagetool.yml rename to external/components/appimagetool.yml diff --git a/elements/components/appstream-glib.yml b/external/components/appstream-glib.yml similarity index 100% rename from elements/components/appstream-glib.yml rename to external/components/appstream-glib.yml diff --git a/elements/components/appstream.yml b/external/components/appstream.yml similarity index 100% rename from elements/components/appstream.yml rename to external/components/appstream.yml diff --git a/elements/components/apr-util.yml b/external/components/apr-util.yml similarity index 100% rename from elements/components/apr-util.yml rename to external/components/apr-util.yml diff --git a/elements/components/apr.yml b/external/components/apr.yml similarity index 100% rename from elements/components/apr.yml rename to external/components/apr.yml diff --git a/elements/components/aspell.yml b/external/components/aspell.yml similarity index 100% rename from elements/components/aspell.yml rename to external/components/aspell.yml diff --git a/elements/components/at-spi2-core.yml b/external/components/at-spi2-core.yml similarity index 100% rename from elements/components/at-spi2-core.yml rename to external/components/at-spi2-core.yml diff --git a/elements/components/atkmm.yml b/external/components/atkmm.yml similarity index 100% rename from elements/components/atkmm.yml rename to external/components/atkmm.yml diff --git a/elements/components/atkmm2.28.yml b/external/components/atkmm2.28.yml similarity index 100% rename from elements/components/atkmm2.28.yml rename to external/components/atkmm2.28.yml diff --git a/elements/components/attica.yml b/external/components/attica.yml similarity index 77% rename from elements/components/attica.yml rename to external/components/attica.yml index f644e570b..bdaddc50b 100644 --- a/elements/components/attica.yml +++ b/external/components/attica.yml @@ -6,4 +6,4 @@ depends: build-depends: - components/extra-cmake-modules.yml -merge: [elements/include/kf5.inc] \ No newline at end of file +merge: [external/include/kf5.inc] \ No newline at end of file diff --git a/elements/components/attr.yml b/external/components/attr.yml similarity index 100% rename from elements/components/attr.yml rename to external/components/attr.yml diff --git a/elements/components/audit.yml b/external/components/audit.yml similarity index 100% rename from elements/components/audit.yml rename to external/components/audit.yml diff --git a/elements/components/autoconf-archive.yml b/external/components/autoconf-archive.yml similarity index 100% rename from elements/components/autoconf-archive.yml rename to external/components/autoconf-archive.yml diff --git a/elements/components/autoconf.yml b/external/components/autoconf.yml similarity index 100% rename from elements/components/autoconf.yml rename to external/components/autoconf.yml diff --git a/elements/components/automake.yml b/external/components/automake.yml similarity index 100% rename from elements/components/automake.yml rename to external/components/automake.yml diff --git a/elements/components/avahi.yml b/external/components/avahi.yml similarity index 100% rename from elements/components/avahi.yml rename to external/components/avahi.yml diff --git a/elements/components/awesome.yml b/external/components/awesome.yml similarity index 100% rename from elements/components/awesome.yml rename to external/components/awesome.yml diff --git a/elements/components/babl.yml b/external/components/babl.yml similarity index 100% rename from elements/components/babl.yml rename to external/components/babl.yml diff --git a/elements/components/baloo-widgets.yml b/external/components/baloo-widgets.yml similarity index 100% rename from elements/components/baloo-widgets.yml rename to external/components/baloo-widgets.yml diff --git a/elements/components/baloo.yml b/external/components/baloo.yml similarity index 100% rename from elements/components/baloo.yml rename to external/components/baloo.yml diff --git a/elements/components/bash.yml b/external/components/bash.yml similarity index 85% rename from elements/components/bash.yml rename to external/components/bash.yml index ad63597fe..fd2ba4633 100644 --- a/elements/components/bash.yml +++ b/external/components/bash.yml @@ -18,6 +18,6 @@ depends: sources: - https://ftp.gnu.org/gnu/bash/bash-%{version}.tar.gz - - files/bash/bashrc - - files/bash/user_bashrc - - files/bash/user_bash_profile + - assets/bash/bashrc + - assets/bash/user_bashrc + - assets/bash/user_bash_profile diff --git a/elements/components/bc.yml b/external/components/bc.yml similarity index 100% rename from elements/components/bc.yml rename to external/components/bc.yml diff --git a/elements/components/bemenu.yml b/external/components/bemenu.yml similarity index 100% rename from elements/components/bemenu.yml rename to external/components/bemenu.yml diff --git a/elements/components/benchmark.yml b/external/components/benchmark.yml similarity index 100% rename from elements/components/benchmark.yml rename to external/components/benchmark.yml diff --git a/elements/components/binutils.yml b/external/components/binutils.yml similarity index 75% rename from elements/components/binutils.yml rename to external/components/binutils.yml index 68850b970..d8becab48 100644 --- a/elements/components/binutils.yml +++ b/external/components/binutils.yml @@ -1,6 +1,6 @@ id: binutils merge: - - elements/include/binutils.inc + - external/include/binutils.inc depends: - components/zlib.yml diff --git a/elements/components/bison.yml b/external/components/bison.yml similarity index 100% rename from elements/components/bison.yml rename to external/components/bison.yml diff --git a/elements/components/blueman.yml b/external/components/blueman.yml similarity index 100% rename from elements/components/blueman.yml rename to external/components/blueman.yml diff --git a/elements/components/bluez-qt.yml b/external/components/bluez-qt.yml similarity index 80% rename from elements/components/bluez-qt.yml rename to external/components/bluez-qt.yml index 49d00de70..3412cb64d 100644 --- a/elements/components/bluez-qt.yml +++ b/external/components/bluez-qt.yml @@ -1,5 +1,5 @@ id: bluez-qt -merge: [elements/include/kf5.inc] +merge: [external/include/kf5.inc] about: KF5 bluez-qt depends: diff --git a/elements/components/bluez.yml b/external/components/bluez.yml similarity index 100% rename from elements/components/bluez.yml rename to external/components/bluez.yml diff --git a/elements/components/bogofilter.yml b/external/components/bogofilter.yml similarity index 100% rename from elements/components/bogofilter.yml rename to external/components/bogofilter.yml diff --git a/elements/components/boost.yml b/external/components/boost.yml similarity index 100% rename from elements/components/boost.yml rename to external/components/boost.yml diff --git a/elements/components/bootstrap.yml b/external/components/bootstrap.yml similarity index 100% rename from elements/components/bootstrap.yml rename to external/components/bootstrap.yml diff --git a/elements/components/bootstrap/binutils-stage1.yml b/external/components/bootstrap/binutils-stage1.yml similarity index 71% rename from elements/components/bootstrap/binutils-stage1.yml rename to external/components/bootstrap/binutils-stage1.yml index bec1432d7..97dff9670 100644 --- a/elements/components/bootstrap/binutils-stage1.yml +++ b/external/components/bootstrap/binutils-stage1.yml @@ -1,6 +1,6 @@ id: binutils-stage1 merge: - - elements/include/binutils.inc + - external/include/binutils.inc build-depends: - components/bootstrap/glibc-stage1.yml \ No newline at end of file diff --git a/elements/components/bootstrap/binutils-stage2.yml b/external/components/bootstrap/binutils-stage2.yml similarity index 71% rename from elements/components/bootstrap/binutils-stage2.yml rename to external/components/bootstrap/binutils-stage2.yml index c62a9581e..3a668dff7 100644 --- a/elements/components/bootstrap/binutils-stage2.yml +++ b/external/components/bootstrap/binutils-stage2.yml @@ -1,6 +1,6 @@ id: binutils-stage2 merge: - - elements/include/binutils.inc + - external/include/binutils.inc build-depends: - components/bootstrap/glibc-stage2.yml \ No newline at end of file diff --git a/elements/components/bootstrap/gcc-stage1.yml b/external/components/bootstrap/gcc-stage1.yml similarity index 73% rename from elements/components/bootstrap/gcc-stage1.yml rename to external/components/bootstrap/gcc-stage1.yml index d2d83bf57..c0c07baa2 100644 --- a/elements/components/bootstrap/gcc-stage1.yml +++ b/external/components/bootstrap/gcc-stage1.yml @@ -1,6 +1,6 @@ id: gcc-stage1 merge: - - elements/include/gcc.inc + - external/include/gcc.inc build-depends: - components/bootstrap/binutils-stage1.yml \ No newline at end of file diff --git a/elements/components/bootstrap/gcc-stage2.yml b/external/components/bootstrap/gcc-stage2.yml similarity index 73% rename from elements/components/bootstrap/gcc-stage2.yml rename to external/components/bootstrap/gcc-stage2.yml index ef1cf5496..630307c6f 100644 --- a/elements/components/bootstrap/gcc-stage2.yml +++ b/external/components/bootstrap/gcc-stage2.yml @@ -1,6 +1,6 @@ id: gcc-stage2 merge: - - elements/include/gcc.inc + - external/include/gcc.inc build-depends: - components/bootstrap/binutils-stage2.yml \ No newline at end of file diff --git a/elements/components/bootstrap/glibc-stage1.yml b/external/components/bootstrap/glibc-stage1.yml similarity index 70% rename from elements/components/bootstrap/glibc-stage1.yml rename to external/components/bootstrap/glibc-stage1.yml index c1dc29340..5e804b539 100644 --- a/elements/components/bootstrap/glibc-stage1.yml +++ b/external/components/bootstrap/glibc-stage1.yml @@ -1,5 +1,5 @@ id: glibc-stage1 merge: - - elements/include/glibc.inc + - external/include/glibc.inc build-depends: - components/kernel-headers.yml diff --git a/elements/components/bootstrap/glibc-stage2.yml b/external/components/bootstrap/glibc-stage2.yml similarity index 71% rename from elements/components/bootstrap/glibc-stage2.yml rename to external/components/bootstrap/glibc-stage2.yml index 0080f35bb..96f3a72d6 100644 --- a/elements/components/bootstrap/glibc-stage2.yml +++ b/external/components/bootstrap/glibc-stage2.yml @@ -1,6 +1,6 @@ id: glibc-stage2 merge: - - elements/include/glibc.inc + - external/include/glibc.inc build-depends: - components/bootstrap/gcc-stage1.yml \ No newline at end of file diff --git a/elements/components/branding.yml b/external/components/branding.yml similarity index 100% rename from elements/components/branding.yml rename to external/components/branding.yml diff --git a/elements/components/bridge-utils.yml b/external/components/bridge-utils.yml similarity index 100% rename from elements/components/bridge-utils.yml rename to external/components/bridge-utils.yml diff --git a/elements/components/brightnessctl.yml b/external/components/brightnessctl.yml similarity index 100% rename from elements/components/brightnessctl.yml rename to external/components/brightnessctl.yml diff --git a/elements/components/brotli.yml b/external/components/brotli.yml similarity index 100% rename from elements/components/brotli.yml rename to external/components/brotli.yml diff --git a/elements/components/bsdiff.yml b/external/components/bsdiff.yml similarity index 100% rename from elements/components/bsdiff.yml rename to external/components/bsdiff.yml diff --git a/elements/components/bspwm.yml b/external/components/bspwm.yml similarity index 100% rename from elements/components/bspwm.yml rename to external/components/bspwm.yml diff --git a/elements/components/btrfs-progs.yml b/external/components/btrfs-progs.yml similarity index 100% rename from elements/components/btrfs-progs.yml rename to external/components/btrfs-progs.yml diff --git a/elements/components/bubblewrap.yml b/external/components/bubblewrap.yml similarity index 100% rename from elements/components/bubblewrap.yml rename to external/components/bubblewrap.yml diff --git a/elements/components/busybox.yml b/external/components/busybox.yml similarity index 100% rename from elements/components/busybox.yml rename to external/components/busybox.yml diff --git a/elements/components/bzip2.yml b/external/components/bzip2.yml similarity index 100% rename from elements/components/bzip2.yml rename to external/components/bzip2.yml diff --git a/elements/components/ca-certificates-java.yml b/external/components/ca-certificates-java.yml similarity index 100% rename from elements/components/ca-certificates-java.yml rename to external/components/ca-certificates-java.yml diff --git a/elements/components/ca-certificates.yml b/external/components/ca-certificates.yml similarity index 88% rename from elements/components/ca-certificates.yml rename to external/components/ca-certificates.yml index d8967df94..93e7d9982 100644 --- a/elements/components/ca-certificates.yml +++ b/external/components/ca-certificates.yml @@ -25,9 +25,9 @@ build-depends: sources: - https://hg.mozilla.org/releases/mozilla-release/raw-file/default/security/nss/lib/ckfw/builtins/certdata.txt - https://hg.mozilla.org/releases/mozilla-release/raw-file/default/security/nss/lib/ckfw/builtins/nssckbi.h - - files/ca-certificates/certdata2pem.c - - files/ca-certificates/update-ca-certificates - - files/ca-certificates/blacklist.txt + - assets/ca-certificates/certdata2pem.c + - assets/ca-certificates/update-ca-certificates + - assets/ca-certificates/blacklist.txt integration: |- # TODO: better work around diff --git a/elements/components/cabextract.yml b/external/components/cabextract.yml similarity index 100% rename from elements/components/cabextract.yml rename to external/components/cabextract.yml diff --git a/elements/components/cage.yml b/external/components/cage.yml similarity index 100% rename from elements/components/cage.yml rename to external/components/cage.yml diff --git a/elements/components/cairo.yml b/external/components/cairo.yml similarity index 100% rename from elements/components/cairo.yml rename to external/components/cairo.yml diff --git a/elements/components/cairomm.yml b/external/components/cairomm.yml similarity index 100% rename from elements/components/cairomm.yml rename to external/components/cairomm.yml diff --git a/elements/components/cairomm1.14.yml b/external/components/cairomm1.14.yml similarity index 100% rename from elements/components/cairomm1.14.yml rename to external/components/cairomm1.14.yml diff --git a/elements/components/capsule.yml b/external/components/capsule.yml similarity index 85% rename from elements/components/capsule.yml rename to external/components/capsule.yml index ddd0221b1..91df2d7dc 100644 --- a/elements/components/capsule.yml +++ b/external/components/capsule.yml @@ -1,7 +1,7 @@ id: capsule version: 2.0.1 about: An Easy to learn programming Language -merge: [ elements/include/rlxos.inc ] +merge: [ external/include/rlxos.inc ] depends: - components/glibc.yml diff --git a/elements/components/cbindgen.yml b/external/components/cbindgen.yml similarity index 100% rename from elements/components/cbindgen.yml rename to external/components/cbindgen.yml diff --git a/elements/components/ccache.yml b/external/components/ccache.yml similarity index 100% rename from elements/components/ccache.yml rename to external/components/ccache.yml diff --git a/elements/components/cdparanoia.yml b/external/components/cdparanoia.yml similarity index 100% rename from elements/components/cdparanoia.yml rename to external/components/cdparanoia.yml diff --git a/elements/components/cdrtools.yml b/external/components/cdrtools.yml similarity index 100% rename from elements/components/cdrtools.yml rename to external/components/cdrtools.yml diff --git a/elements/components/cgroupfs-mount.yml b/external/components/cgroupfs-mount.yml similarity index 100% rename from elements/components/cgroupfs-mount.yml rename to external/components/cgroupfs-mount.yml diff --git a/elements/components/check.yml b/external/components/check.yml similarity index 100% rename from elements/components/check.yml rename to external/components/check.yml diff --git a/elements/components/chromaprint.yml b/external/components/chromaprint.yml similarity index 100% rename from elements/components/chromaprint.yml rename to external/components/chromaprint.yml diff --git a/elements/components/cifs-utils.yml b/external/components/cifs-utils.yml similarity index 100% rename from elements/components/cifs-utils.yml rename to external/components/cifs-utils.yml diff --git a/elements/components/clucene.yml b/external/components/clucene.yml similarity index 100% rename from elements/components/clucene.yml rename to external/components/clucene.yml diff --git a/elements/components/clutter-gst.yml b/external/components/clutter-gst.yml similarity index 100% rename from elements/components/clutter-gst.yml rename to external/components/clutter-gst.yml diff --git a/elements/components/clutter-gtk.yml b/external/components/clutter-gtk.yml similarity index 100% rename from elements/components/clutter-gtk.yml rename to external/components/clutter-gtk.yml diff --git a/elements/components/clutter.yml b/external/components/clutter.yml similarity index 100% rename from elements/components/clutter.yml rename to external/components/clutter.yml diff --git a/elements/components/cmake.yml b/external/components/cmake.yml similarity index 100% rename from elements/components/cmake.yml rename to external/components/cmake.yml diff --git a/elements/components/cog.yml b/external/components/cog.yml similarity index 100% rename from elements/components/cog.yml rename to external/components/cog.yml diff --git a/elements/components/cogl.yml b/external/components/cogl.yml similarity index 100% rename from elements/components/cogl.yml rename to external/components/cogl.yml diff --git a/elements/components/colord-gtk.yml b/external/components/colord-gtk.yml similarity index 100% rename from elements/components/colord-gtk.yml rename to external/components/colord-gtk.yml diff --git a/elements/components/colord.yml b/external/components/colord.yml similarity index 100% rename from elements/components/colord.yml rename to external/components/colord.yml diff --git a/elements/components/compiz.yml b/external/components/compiz.yml similarity index 100% rename from elements/components/compiz.yml rename to external/components/compiz.yml diff --git a/elements/components/conky-manager.yml b/external/components/conky-manager.yml similarity index 100% rename from elements/components/conky-manager.yml rename to external/components/conky-manager.yml diff --git a/elements/components/conky.yml b/external/components/conky.yml similarity index 100% rename from elements/components/conky.yml rename to external/components/conky.yml diff --git a/elements/components/connman.yml b/external/components/connman.yml similarity index 100% rename from elements/components/connman.yml rename to external/components/connman.yml diff --git a/elements/components/containerd.yml b/external/components/containerd.yml similarity index 100% rename from elements/components/containerd.yml rename to external/components/containerd.yml diff --git a/elements/components/core.yml b/external/components/core.yml similarity index 95% rename from elements/components/core.yml rename to external/components/core.yml index 9c773e343..58b87aae2 100644 --- a/elements/components/core.yml +++ b/external/components/core.yml @@ -1,6 +1,6 @@ id: core version: 2.0 -merge: [elements/include/meta.inc] +merge: [external/include/meta.inc] about: rlxos core components depends: diff --git a/elements/components/coreutils.yml b/external/components/coreutils.yml similarity index 100% rename from elements/components/coreutils.yml rename to external/components/coreutils.yml diff --git a/elements/components/cpio.yml b/external/components/cpio.yml similarity index 100% rename from elements/components/cpio.yml rename to external/components/cpio.yml diff --git a/elements/components/cppgir.yml b/external/components/cppgir.yml similarity index 100% rename from elements/components/cppgir.yml rename to external/components/cppgir.yml diff --git a/elements/components/cppunit.yml b/external/components/cppunit.yml similarity index 100% rename from elements/components/cppunit.yml rename to external/components/cppunit.yml diff --git a/elements/components/cracklib.yml b/external/components/cracklib.yml similarity index 100% rename from elements/components/cracklib.yml rename to external/components/cracklib.yml diff --git a/elements/components/cryptsetup.yml b/external/components/cryptsetup.yml similarity index 100% rename from elements/components/cryptsetup.yml rename to external/components/cryptsetup.yml diff --git a/elements/components/cups.yml b/external/components/cups.yml similarity index 100% rename from elements/components/cups.yml rename to external/components/cups.yml diff --git a/elements/components/curl.yml b/external/components/curl.yml similarity index 100% rename from elements/components/curl.yml rename to external/components/curl.yml diff --git a/elements/components/cxxopts.yml b/external/components/cxxopts.yml similarity index 100% rename from elements/components/cxxopts.yml rename to external/components/cxxopts.yml diff --git a/elements/components/cyrus-sasl.yml b/external/components/cyrus-sasl.yml similarity index 100% rename from elements/components/cyrus-sasl.yml rename to external/components/cyrus-sasl.yml diff --git a/elements/components/dbus-c++.yml b/external/components/dbus-c++.yml similarity index 100% rename from elements/components/dbus-c++.yml rename to external/components/dbus-c++.yml diff --git a/elements/components/dbus-cxx.yml b/external/components/dbus-cxx.yml similarity index 100% rename from elements/components/dbus-cxx.yml rename to external/components/dbus-cxx.yml diff --git a/elements/components/dbus-glib.yml b/external/components/dbus-glib.yml similarity index 100% rename from elements/components/dbus-glib.yml rename to external/components/dbus-glib.yml diff --git a/elements/components/dbus-nosystemd.yml b/external/components/dbus-nosystemd.yml similarity index 100% rename from elements/components/dbus-nosystemd.yml rename to external/components/dbus-nosystemd.yml diff --git a/elements/components/dbus.yml b/external/components/dbus.yml similarity index 100% rename from elements/components/dbus.yml rename to external/components/dbus.yml diff --git a/elements/components/dconf-editor.yml b/external/components/dconf-editor.yml similarity index 100% rename from elements/components/dconf-editor.yml rename to external/components/dconf-editor.yml diff --git a/elements/components/dconf.yml b/external/components/dconf.yml similarity index 100% rename from elements/components/dconf.yml rename to external/components/dconf.yml diff --git a/elements/components/debian-archive-keyring.yml b/external/components/debian-archive-keyring.yml similarity index 100% rename from elements/components/debian-archive-keyring.yml rename to external/components/debian-archive-keyring.yml diff --git a/elements/components/debootstrap.yml b/external/components/debootstrap.yml similarity index 100% rename from elements/components/debootstrap.yml rename to external/components/debootstrap.yml diff --git a/elements/components/debugedit.yml b/external/components/debugedit.yml similarity index 100% rename from elements/components/debugedit.yml rename to external/components/debugedit.yml diff --git a/elements/components/desktop-file-utils.yml b/external/components/desktop-file-utils.yml similarity index 100% rename from elements/components/desktop-file-utils.yml rename to external/components/desktop-file-utils.yml diff --git a/elements/components/devel.yml b/external/components/devel.yml similarity index 100% rename from elements/components/devel.yml rename to external/components/devel.yml diff --git a/elements/components/dialog.yml b/external/components/dialog.yml similarity index 100% rename from elements/components/dialog.yml rename to external/components/dialog.yml diff --git a/elements/components/diffutils.yml b/external/components/diffutils.yml similarity index 100% rename from elements/components/diffutils.yml rename to external/components/diffutils.yml diff --git a/elements/components/directx-headers.yml b/external/components/directx-headers.yml similarity index 100% rename from elements/components/directx-headers.yml rename to external/components/directx-headers.yml diff --git a/elements/components/distrobox.yml b/external/components/distrobox.yml similarity index 100% rename from elements/components/distrobox.yml rename to external/components/distrobox.yml diff --git a/elements/components/dkms.yml b/external/components/dkms.yml similarity index 100% rename from elements/components/dkms.yml rename to external/components/dkms.yml diff --git a/elements/components/dmenu.yml b/external/components/dmenu.yml similarity index 100% rename from elements/components/dmenu.yml rename to external/components/dmenu.yml diff --git a/elements/components/dmidecode.yml b/external/components/dmidecode.yml similarity index 100% rename from elements/components/dmidecode.yml rename to external/components/dmidecode.yml diff --git a/elements/components/dnsmasq.yml b/external/components/dnsmasq.yml similarity index 100% rename from elements/components/dnsmasq.yml rename to external/components/dnsmasq.yml diff --git a/elements/components/docbook-xml.yml b/external/components/docbook-xml.yml similarity index 100% rename from elements/components/docbook-xml.yml rename to external/components/docbook-xml.yml diff --git a/elements/components/docbook-xsl.yml b/external/components/docbook-xsl.yml similarity index 95% rename from elements/components/docbook-xsl.yml rename to external/components/docbook-xsl.yml index 589e21f41..659bf5316 100644 --- a/elements/components/docbook-xsl.yml +++ b/external/components/docbook-xsl.yml @@ -10,7 +10,7 @@ depends: sources: - https://github.com/docbook/xslt10-stylesheets/releases/download/release/%{version}/docbook-xsl-nons-%{version}.tar.bz2 - - files/core/docbook-xsl-nons/docbook-xsl-nons-%{version}-stack_fix-1.patch + - assets/core/docbook-xsl-nons/docbook-xsl-nons-%{version}-stack_fix-1.patch pre-script: | diff --git a/elements/components/docker.yml b/external/components/docker.yml similarity index 100% rename from elements/components/docker.yml rename to external/components/docker.yml diff --git a/elements/components/dosfstools.yml b/external/components/dosfstools.yml similarity index 100% rename from elements/components/dosfstools.yml rename to external/components/dosfstools.yml diff --git a/elements/components/dotnet-runtime.yml b/external/components/dotnet-runtime.yml similarity index 100% rename from elements/components/dotnet-runtime.yml rename to external/components/dotnet-runtime.yml diff --git a/elements/components/dotnet.yml b/external/components/dotnet.yml similarity index 100% rename from elements/components/dotnet.yml rename to external/components/dotnet.yml diff --git a/elements/components/double-conversion.yml b/external/components/double-conversion.yml similarity index 100% rename from elements/components/double-conversion.yml rename to external/components/double-conversion.yml diff --git a/elements/components/dpkg.yml b/external/components/dpkg.yml similarity index 100% rename from elements/components/dpkg.yml rename to external/components/dpkg.yml diff --git a/elements/components/dpp.yml b/external/components/dpp.yml similarity index 100% rename from elements/components/dpp.yml rename to external/components/dpp.yml diff --git a/elements/components/dqlite.yml b/external/components/dqlite.yml similarity index 100% rename from elements/components/dqlite.yml rename to external/components/dqlite.yml diff --git a/elements/components/dracut.yml b/external/components/dracut.yml similarity index 100% rename from elements/components/dracut.yml rename to external/components/dracut.yml diff --git a/elements/components/dtc.yml b/external/components/dtc.yml similarity index 100% rename from elements/components/dtc.yml rename to external/components/dtc.yml diff --git a/elements/components/duktape.yml b/external/components/duktape.yml similarity index 100% rename from elements/components/duktape.yml rename to external/components/duktape.yml diff --git a/elements/components/e2fsprogs.yml b/external/components/e2fsprogs.yml similarity index 100% rename from elements/components/e2fsprogs.yml rename to external/components/e2fsprogs.yml diff --git a/elements/components/ed.yml b/external/components/ed.yml similarity index 100% rename from elements/components/ed.yml rename to external/components/ed.yml diff --git a/elements/components/efibootmgr.yml b/external/components/efibootmgr.yml similarity index 100% rename from elements/components/efibootmgr.yml rename to external/components/efibootmgr.yml diff --git a/elements/components/efivar.yml b/external/components/efivar.yml similarity index 100% rename from elements/components/efivar.yml rename to external/components/efivar.yml diff --git a/elements/components/egl-wayland.yml b/external/components/egl-wayland.yml similarity index 100% rename from elements/components/egl-wayland.yml rename to external/components/egl-wayland.yml diff --git a/elements/components/eglexternalplatform.yml b/external/components/eglexternalplatform.yml similarity index 100% rename from elements/components/eglexternalplatform.yml rename to external/components/eglexternalplatform.yml diff --git a/elements/components/elementary-xfce-icons.yml b/external/components/elementary-xfce-icons.yml similarity index 100% rename from elements/components/elementary-xfce-icons.yml rename to external/components/elementary-xfce-icons.yml diff --git a/elements/components/enchant.yml b/external/components/enchant.yml similarity index 100% rename from elements/components/enchant.yml rename to external/components/enchant.yml diff --git a/elements/components/enet.yml b/external/components/enet.yml similarity index 100% rename from elements/components/enet.yml rename to external/components/enet.yml diff --git a/elements/components/enlightenment/efl.yml b/external/components/enlightenment/efl.yml similarity index 100% rename from elements/components/enlightenment/efl.yml rename to external/components/enlightenment/efl.yml diff --git a/elements/components/enlightenment/enlightenment.yml b/external/components/enlightenment/enlightenment.yml similarity index 100% rename from elements/components/enlightenment/enlightenment.yml rename to external/components/enlightenment/enlightenment.yml diff --git a/elements/components/enlightenment/terminology.yml b/external/components/enlightenment/terminology.yml similarity index 100% rename from elements/components/enlightenment/terminology.yml rename to external/components/enlightenment/terminology.yml diff --git a/elements/components/epdfview.yml b/external/components/epdfview.yml similarity index 100% rename from elements/components/epdfview.yml rename to external/components/epdfview.yml diff --git a/elements/components/espeak-ng.yml b/external/components/espeak-ng.yml similarity index 100% rename from elements/components/espeak-ng.yml rename to external/components/espeak-ng.yml diff --git a/elements/components/evolution-data-server.yml b/external/components/evolution-data-server.yml similarity index 100% rename from elements/components/evolution-data-server.yml rename to external/components/evolution-data-server.yml diff --git a/elements/components/evtest.yml b/external/components/evtest.yml similarity index 100% rename from elements/components/evtest.yml rename to external/components/evtest.yml diff --git a/elements/components/exempi.yml b/external/components/exempi.yml similarity index 100% rename from elements/components/exempi.yml rename to external/components/exempi.yml diff --git a/elements/components/exiv2.yml b/external/components/exiv2.yml similarity index 100% rename from elements/components/exiv2.yml rename to external/components/exiv2.yml diff --git a/elements/components/expat.yml b/external/components/expat.yml similarity index 100% rename from elements/components/expat.yml rename to external/components/expat.yml diff --git a/elements/components/extra-cmake-modules.yml b/external/components/extra-cmake-modules.yml similarity index 81% rename from elements/components/extra-cmake-modules.yml rename to external/components/extra-cmake-modules.yml index 8a2557908..624805a80 100644 --- a/elements/components/extra-cmake-modules.yml +++ b/external/components/extra-cmake-modules.yml @@ -1,5 +1,5 @@ id: extra-cmake-modules -merge: [elements/include/kf5.inc] +merge: [external/include/kf5.inc] about: | Extra Cmake Modules package contains extra CMake modules used by KDE Frameworks 5 diff --git a/elements/components/fakeroot.yml b/external/components/fakeroot.yml similarity index 100% rename from elements/components/fakeroot.yml rename to external/components/fakeroot.yml diff --git a/elements/components/fcft.yml b/external/components/fcft.yml similarity index 100% rename from elements/components/fcft.yml rename to external/components/fcft.yml diff --git a/elements/components/fcron.yml b/external/components/fcron.yml similarity index 100% rename from elements/components/fcron.yml rename to external/components/fcron.yml diff --git a/elements/components/fdk-aac.yml b/external/components/fdk-aac.yml similarity index 100% rename from elements/components/fdk-aac.yml rename to external/components/fdk-aac.yml diff --git a/elements/components/ffmpeg.yml b/external/components/ffmpeg.yml similarity index 100% rename from elements/components/ffmpeg.yml rename to external/components/ffmpeg.yml diff --git a/elements/components/fftw.yml b/external/components/fftw.yml similarity index 100% rename from elements/components/fftw.yml rename to external/components/fftw.yml diff --git a/elements/components/file-roller.yml b/external/components/file-roller.yml similarity index 100% rename from elements/components/file-roller.yml rename to external/components/file-roller.yml diff --git a/elements/components/file.yml b/external/components/file.yml similarity index 100% rename from elements/components/file.yml rename to external/components/file.yml diff --git a/elements/components/filesystem.yml b/external/components/filesystem.yml similarity index 100% rename from elements/components/filesystem.yml rename to external/components/filesystem.yml diff --git a/elements/components/findutils.yml b/external/components/findutils.yml similarity index 100% rename from elements/components/findutils.yml rename to external/components/findutils.yml diff --git a/elements/components/firefox-src.yml b/external/components/firefox-src.yml similarity index 99% rename from elements/components/firefox-src.yml rename to external/components/firefox-src.yml index ec679fa37..7579c17ab 100644 --- a/elements/components/firefox-src.yml +++ b/external/components/firefox-src.yml @@ -123,7 +123,7 @@ build-depends: sources: - https://archive.mozilla.org/pub/firefox/releases/%{version}/source/firefox-%{version}.source.tar.xz - - files/firefox/firefox.desktop + - assets/firefox/firefox.desktop # TODO: libpng doesn't have APNG support # TODO: update rustc compiler diff --git a/elements/components/firefox.yml b/external/components/firefox.yml similarity index 100% rename from elements/components/firefox.yml rename to external/components/firefox.yml diff --git a/elements/components/firmware.yml b/external/components/firmware.yml similarity index 100% rename from elements/components/firmware.yml rename to external/components/firmware.yml diff --git a/elements/components/flac.yml b/external/components/flac.yml similarity index 100% rename from elements/components/flac.yml rename to external/components/flac.yml diff --git a/elements/components/flatpak.yml b/external/components/flatpak.yml similarity index 100% rename from elements/components/flatpak.yml rename to external/components/flatpak.yml diff --git a/elements/components/flex.yml b/external/components/flex.yml similarity index 100% rename from elements/components/flex.yml rename to external/components/flex.yml diff --git a/elements/components/fmt.yml b/external/components/fmt.yml similarity index 100% rename from elements/components/fmt.yml rename to external/components/fmt.yml diff --git a/elements/components/folks.yml b/external/components/folks.yml similarity index 100% rename from elements/components/folks.yml rename to external/components/folks.yml diff --git a/elements/components/fontconfig.yml b/external/components/fontconfig.yml similarity index 100% rename from elements/components/fontconfig.yml rename to external/components/fontconfig.yml diff --git a/elements/components/fonts/adobe-source-code-pro-fonts.yml b/external/components/fonts/adobe-source-code-pro-fonts.yml similarity index 100% rename from elements/components/fonts/adobe-source-code-pro-fonts.yml rename to external/components/fonts/adobe-source-code-pro-fonts.yml diff --git a/elements/components/fonts/cantarell.yml b/external/components/fonts/cantarell.yml similarity index 100% rename from elements/components/fonts/cantarell.yml rename to external/components/fonts/cantarell.yml diff --git a/elements/components/fonts/dejavu-fonts.yml b/external/components/fonts/dejavu-fonts.yml similarity index 100% rename from elements/components/fonts/dejavu-fonts.yml rename to external/components/fonts/dejavu-fonts.yml diff --git a/elements/components/fonts/fira-code.yml b/external/components/fonts/fira-code.yml similarity index 100% rename from elements/components/fonts/fira-code.yml rename to external/components/fonts/fira-code.yml diff --git a/elements/components/fonts/gofont.yml b/external/components/fonts/gofont.yml similarity index 100% rename from elements/components/fonts/gofont.yml rename to external/components/fonts/gofont.yml diff --git a/elements/components/fonts/gsfonts.yml b/external/components/fonts/gsfonts.yml similarity index 100% rename from elements/components/fonts/gsfonts.yml rename to external/components/fonts/gsfonts.yml diff --git a/elements/components/fonts/ibm-plex-nerd-fonts.yml b/external/components/fonts/ibm-plex-nerd-fonts.yml similarity index 100% rename from elements/components/fonts/ibm-plex-nerd-fonts.yml rename to external/components/fonts/ibm-plex-nerd-fonts.yml diff --git a/elements/components/fonts/ibm-plex.yml b/external/components/fonts/ibm-plex.yml similarity index 100% rename from elements/components/fonts/ibm-plex.yml rename to external/components/fonts/ibm-plex.yml diff --git a/elements/components/fonts/inconsolata.yml b/external/components/fonts/inconsolata.yml similarity index 100% rename from elements/components/fonts/inconsolata.yml rename to external/components/fonts/inconsolata.yml diff --git a/elements/components/fonts/liberation-fonts.yml b/external/components/fonts/liberation-fonts.yml similarity index 100% rename from elements/components/fonts/liberation-fonts.yml rename to external/components/fonts/liberation-fonts.yml diff --git a/elements/components/fonts/noto-cjk.yml b/external/components/fonts/noto-cjk.yml similarity index 100% rename from elements/components/fonts/noto-cjk.yml rename to external/components/fonts/noto-cjk.yml diff --git a/elements/components/fonts/noto-emoji.yml b/external/components/fonts/noto-emoji.yml similarity index 100% rename from elements/components/fonts/noto-emoji.yml rename to external/components/fonts/noto-emoji.yml diff --git a/elements/components/fonts/noto.yml b/external/components/fonts/noto.yml similarity index 100% rename from elements/components/fonts/noto.yml rename to external/components/fonts/noto.yml diff --git a/elements/components/fonts/opensans.yml b/external/components/fonts/opensans.yml similarity index 100% rename from elements/components/fonts/opensans.yml rename to external/components/fonts/opensans.yml diff --git a/elements/components/foot.yml b/external/components/foot.yml similarity index 100% rename from elements/components/foot.yml rename to external/components/foot.yml diff --git a/elements/components/fprintd.yml b/external/components/fprintd.yml similarity index 100% rename from elements/components/fprintd.yml rename to external/components/fprintd.yml diff --git a/elements/components/frameworkintegration.yml b/external/components/frameworkintegration.yml similarity index 100% rename from elements/components/frameworkintegration.yml rename to external/components/frameworkintegration.yml diff --git a/elements/components/freeglut.yml b/external/components/freeglut.yml similarity index 100% rename from elements/components/freeglut.yml rename to external/components/freeglut.yml diff --git a/elements/components/freerdp.yml b/external/components/freerdp.yml similarity index 100% rename from elements/components/freerdp.yml rename to external/components/freerdp.yml diff --git a/elements/components/freetype.yml b/external/components/freetype.yml similarity index 100% rename from elements/components/freetype.yml rename to external/components/freetype.yml diff --git a/elements/components/fribidi.yml b/external/components/fribidi.yml similarity index 100% rename from elements/components/fribidi.yml rename to external/components/fribidi.yml diff --git a/elements/components/fuse.yml b/external/components/fuse.yml similarity index 100% rename from elements/components/fuse.yml rename to external/components/fuse.yml diff --git a/elements/components/fuse2.yml b/external/components/fuse2.yml similarity index 100% rename from elements/components/fuse2.yml rename to external/components/fuse2.yml diff --git a/elements/components/gawk.yml b/external/components/gawk.yml similarity index 100% rename from elements/components/gawk.yml rename to external/components/gawk.yml diff --git a/elements/components/gc.yml b/external/components/gc.yml similarity index 100% rename from elements/components/gc.yml rename to external/components/gc.yml diff --git a/elements/components/gcc.yml b/external/components/gcc.yml similarity index 85% rename from elements/components/gcc.yml rename to external/components/gcc.yml index 92810b330..50dbc8f59 100644 --- a/elements/components/gcc.yml +++ b/external/components/gcc.yml @@ -1,6 +1,6 @@ id: gcc merge: - - elements/include/gcc.inc + - external/include/gcc.inc depends: - components/zlib.yml diff --git a/elements/components/gconf.yml b/external/components/gconf.yml similarity index 100% rename from elements/components/gconf.yml rename to external/components/gconf.yml diff --git a/elements/components/gcr-4.yml b/external/components/gcr-4.yml similarity index 100% rename from elements/components/gcr-4.yml rename to external/components/gcr-4.yml diff --git a/elements/components/gcr.yml b/external/components/gcr.yml similarity index 100% rename from elements/components/gcr.yml rename to external/components/gcr.yml diff --git a/elements/components/gd.yml b/external/components/gd.yml similarity index 100% rename from elements/components/gd.yml rename to external/components/gd.yml diff --git a/elements/components/gdb.yml b/external/components/gdb.yml similarity index 100% rename from elements/components/gdb.yml rename to external/components/gdb.yml diff --git a/elements/components/gdbm.yml b/external/components/gdbm.yml similarity index 100% rename from elements/components/gdbm.yml rename to external/components/gdbm.yml diff --git a/elements/components/gdk-pixbuf.yml b/external/components/gdk-pixbuf.yml similarity index 100% rename from elements/components/gdk-pixbuf.yml rename to external/components/gdk-pixbuf.yml diff --git a/elements/components/gdl.yml b/external/components/gdl.yml similarity index 100% rename from elements/components/gdl.yml rename to external/components/gdl.yml diff --git a/elements/components/gegl.yml b/external/components/gegl.yml similarity index 100% rename from elements/components/gegl.yml rename to external/components/gegl.yml diff --git a/elements/components/genimage.yml b/external/components/genimage.yml similarity index 100% rename from elements/components/genimage.yml rename to external/components/genimage.yml diff --git a/elements/components/geoclue.yml b/external/components/geoclue.yml similarity index 100% rename from elements/components/geoclue.yml rename to external/components/geoclue.yml diff --git a/elements/components/geocode-glib.yml b/external/components/geocode-glib.yml similarity index 100% rename from elements/components/geocode-glib.yml rename to external/components/geocode-glib.yml diff --git a/elements/components/geoip-database.yml b/external/components/geoip-database.yml similarity index 100% rename from elements/components/geoip-database.yml rename to external/components/geoip-database.yml diff --git a/elements/components/geoip.yml b/external/components/geoip.yml similarity index 100% rename from elements/components/geoip.yml rename to external/components/geoip.yml diff --git a/elements/components/gettext.yml b/external/components/gettext.yml similarity index 100% rename from elements/components/gettext.yml rename to external/components/gettext.yml diff --git a/elements/components/gexiv2.yml b/external/components/gexiv2.yml similarity index 100% rename from elements/components/gexiv2.yml rename to external/components/gexiv2.yml diff --git a/elements/components/gfbgraph.yml b/external/components/gfbgraph.yml similarity index 100% rename from elements/components/gfbgraph.yml rename to external/components/gfbgraph.yml diff --git a/elements/components/ghostscript.yml b/external/components/ghostscript.yml similarity index 100% rename from elements/components/ghostscript.yml rename to external/components/ghostscript.yml diff --git a/elements/components/giflib.yml b/external/components/giflib.yml similarity index 100% rename from elements/components/giflib.yml rename to external/components/giflib.yml diff --git a/elements/components/gimp.yml b/external/components/gimp.yml similarity index 100% rename from elements/components/gimp.yml rename to external/components/gimp.yml diff --git a/elements/components/git.yml b/external/components/git.yml similarity index 100% rename from elements/components/git.yml rename to external/components/git.yml diff --git a/elements/components/gjs.yml b/external/components/gjs.yml similarity index 100% rename from elements/components/gjs.yml rename to external/components/gjs.yml diff --git a/external/components/glade.yml b/external/components/glade.yml new file mode 100644 index 000000000..c7178f3e0 --- /dev/null +++ b/external/components/glade.yml @@ -0,0 +1,2 @@ +merge: +- external/include/glade.inc \ No newline at end of file diff --git a/elements/components/glew.yml b/external/components/glew.yml similarity index 100% rename from elements/components/glew.yml rename to external/components/glew.yml diff --git a/elements/components/glfw.yml b/external/components/glfw.yml similarity index 100% rename from elements/components/glfw.yml rename to external/components/glfw.yml diff --git a/elements/components/glib-networking.yml b/external/components/glib-networking.yml similarity index 100% rename from elements/components/glib-networking.yml rename to external/components/glib-networking.yml diff --git a/elements/components/glib.yml b/external/components/glib.yml similarity index 100% rename from elements/components/glib.yml rename to external/components/glib.yml diff --git a/elements/components/glibc-dbg.yml b/external/components/glibc-dbg.yml similarity index 100% rename from elements/components/glibc-dbg.yml rename to external/components/glibc-dbg.yml diff --git a/elements/components/glibc.yml b/external/components/glibc.yml similarity index 81% rename from elements/components/glibc.yml rename to external/components/glibc.yml index d757eddcf..e8ec9b0d1 100644 --- a/elements/components/glibc.yml +++ b/external/components/glibc.yml @@ -1,6 +1,6 @@ id: glibc merge: - - elements/include/glibc.inc + - external/include/glibc.inc depends: - components/filesystem.yml diff --git a/elements/components/glibmm.yml b/external/components/glibmm.yml similarity index 100% rename from elements/components/glibmm.yml rename to external/components/glibmm.yml diff --git a/elements/components/glibmm2.66.yml b/external/components/glibmm2.66.yml similarity index 100% rename from elements/components/glibmm2.66.yml rename to external/components/glibmm2.66.yml diff --git a/elements/components/glm.yml b/external/components/glm.yml similarity index 100% rename from elements/components/glm.yml rename to external/components/glm.yml diff --git a/elements/components/gloox.yml b/external/components/gloox.yml similarity index 100% rename from elements/components/gloox.yml rename to external/components/gloox.yml diff --git a/elements/components/glslang.yml b/external/components/glslang.yml similarity index 100% rename from elements/components/glslang.yml rename to external/components/glslang.yml diff --git a/elements/components/glu.yml b/external/components/glu.yml similarity index 100% rename from elements/components/glu.yml rename to external/components/glu.yml diff --git a/elements/components/gmime.yml b/external/components/gmime.yml similarity index 100% rename from elements/components/gmime.yml rename to external/components/gmime.yml diff --git a/elements/components/gmp.yml b/external/components/gmp.yml similarity index 100% rename from elements/components/gmp.yml rename to external/components/gmp.yml diff --git a/elements/components/gnome-control-center.yml b/external/components/gnome-control-center.yml similarity index 100% rename from elements/components/gnome-control-center.yml rename to external/components/gnome-control-center.yml diff --git a/elements/components/gnome-keyring.yml b/external/components/gnome-keyring.yml similarity index 100% rename from elements/components/gnome-keyring.yml rename to external/components/gnome-keyring.yml diff --git a/elements/components/gnome/evince.yml b/external/components/gnome/evince.yml similarity index 100% rename from elements/components/gnome/evince.yml rename to external/components/gnome/evince.yml diff --git a/elements/components/gnome/gdm.yml b/external/components/gnome/gdm.yml similarity index 100% rename from elements/components/gnome/gdm.yml rename to external/components/gnome/gdm.yml diff --git a/elements/components/gnome/gnome-autoar.yml b/external/components/gnome/gnome-autoar.yml similarity index 100% rename from elements/components/gnome/gnome-autoar.yml rename to external/components/gnome/gnome-autoar.yml diff --git a/elements/components/gnome/gnome-backgrounds.yml b/external/components/gnome/gnome-backgrounds.yml similarity index 100% rename from elements/components/gnome/gnome-backgrounds.yml rename to external/components/gnome/gnome-backgrounds.yml diff --git a/elements/components/gnome/gnome-bluetooth.yml b/external/components/gnome/gnome-bluetooth.yml similarity index 100% rename from elements/components/gnome/gnome-bluetooth.yml rename to external/components/gnome/gnome-bluetooth.yml diff --git a/elements/components/gnome/gnome-control-center.yml b/external/components/gnome/gnome-control-center.yml similarity index 100% rename from elements/components/gnome/gnome-control-center.yml rename to external/components/gnome/gnome-control-center.yml diff --git a/elements/components/gnome/gnome-desktop.yml b/external/components/gnome/gnome-desktop.yml similarity index 100% rename from elements/components/gnome/gnome-desktop.yml rename to external/components/gnome/gnome-desktop.yml diff --git a/elements/components/gnome/gnome-epub-thumbnailer.yml b/external/components/gnome/gnome-epub-thumbnailer.yml similarity index 100% rename from elements/components/gnome/gnome-epub-thumbnailer.yml rename to external/components/gnome/gnome-epub-thumbnailer.yml diff --git a/elements/components/gnome/gnome-initial-setup.yml b/external/components/gnome/gnome-initial-setup.yml similarity index 100% rename from elements/components/gnome/gnome-initial-setup.yml rename to external/components/gnome/gnome-initial-setup.yml diff --git a/elements/components/gnome/gnome-menus.yml b/external/components/gnome/gnome-menus.yml similarity index 100% rename from elements/components/gnome/gnome-menus.yml rename to external/components/gnome/gnome-menus.yml diff --git a/elements/components/gnome/gnome-online-accounts.yml b/external/components/gnome/gnome-online-accounts.yml similarity index 100% rename from elements/components/gnome/gnome-online-accounts.yml rename to external/components/gnome/gnome-online-accounts.yml diff --git a/elements/components/gnome/gnome-power-manager.yml b/external/components/gnome/gnome-power-manager.yml similarity index 100% rename from elements/components/gnome/gnome-power-manager.yml rename to external/components/gnome/gnome-power-manager.yml diff --git a/elements/components/gnome/gnome-session.yml b/external/components/gnome/gnome-session.yml similarity index 100% rename from elements/components/gnome/gnome-session.yml rename to external/components/gnome/gnome-session.yml diff --git a/elements/components/gnome/gnome-settings-daemon.yml b/external/components/gnome/gnome-settings-daemon.yml similarity index 100% rename from elements/components/gnome/gnome-settings-daemon.yml rename to external/components/gnome/gnome-settings-daemon.yml diff --git a/elements/components/gnome/gnome-shell-extension-arc-menu.yml b/external/components/gnome/gnome-shell-extension-arc-menu.yml similarity index 100% rename from elements/components/gnome/gnome-shell-extension-arc-menu.yml rename to external/components/gnome/gnome-shell-extension-arc-menu.yml diff --git a/elements/components/gnome/gnome-shell-extension-blur-me.yml b/external/components/gnome/gnome-shell-extension-blur-me.yml similarity index 100% rename from elements/components/gnome/gnome-shell-extension-blur-me.yml rename to external/components/gnome/gnome-shell-extension-blur-me.yml diff --git a/elements/components/gnome/gnome-shell-extension-dash-to-panel.yml b/external/components/gnome/gnome-shell-extension-dash-to-panel.yml similarity index 100% rename from elements/components/gnome/gnome-shell-extension-dash-to-panel.yml rename to external/components/gnome/gnome-shell-extension-dash-to-panel.yml diff --git a/elements/components/gnome/gnome-shell-extension-desktop-icons-ng.yml b/external/components/gnome/gnome-shell-extension-desktop-icons-ng.yml similarity index 100% rename from elements/components/gnome/gnome-shell-extension-desktop-icons-ng.yml rename to external/components/gnome/gnome-shell-extension-desktop-icons-ng.yml diff --git a/elements/components/gnome/gnome-shell-extension-nightmode.yml b/external/components/gnome/gnome-shell-extension-nightmode.yml similarity index 100% rename from elements/components/gnome/gnome-shell-extension-nightmode.yml rename to external/components/gnome/gnome-shell-extension-nightmode.yml diff --git a/elements/components/gnome/gnome-shell-extension-x11gestures.yml b/external/components/gnome/gnome-shell-extension-x11gestures.yml similarity index 100% rename from elements/components/gnome/gnome-shell-extension-x11gestures.yml rename to external/components/gnome/gnome-shell-extension-x11gestures.yml diff --git a/elements/components/gnome/gnome-shell-extensions.yml b/external/components/gnome/gnome-shell-extensions.yml similarity index 100% rename from elements/components/gnome/gnome-shell-extensions.yml rename to external/components/gnome/gnome-shell-extensions.yml diff --git a/elements/components/gnome/gnome-shell.yml b/external/components/gnome/gnome-shell.yml similarity index 100% rename from elements/components/gnome/gnome-shell.yml rename to external/components/gnome/gnome-shell.yml diff --git a/elements/components/gnome/gnome-software.yml b/external/components/gnome/gnome-software.yml similarity index 100% rename from elements/components/gnome/gnome-software.yml rename to external/components/gnome/gnome-software.yml diff --git a/elements/components/gnome/gnome-terminal.yml b/external/components/gnome/gnome-terminal.yml similarity index 100% rename from elements/components/gnome/gnome-terminal.yml rename to external/components/gnome/gnome-terminal.yml diff --git a/elements/components/gnome/gnome-video-effects.yml b/external/components/gnome/gnome-video-effects.yml similarity index 100% rename from elements/components/gnome/gnome-video-effects.yml rename to external/components/gnome/gnome-video-effects.yml diff --git a/elements/components/gnome/nautilus.yml b/external/components/gnome/nautilus.yml similarity index 100% rename from elements/components/gnome/nautilus.yml rename to external/components/gnome/nautilus.yml diff --git a/elements/components/gnu-efi.yml b/external/components/gnu-efi.yml similarity index 100% rename from elements/components/gnu-efi.yml rename to external/components/gnu-efi.yml diff --git a/elements/components/gnupg.yml b/external/components/gnupg.yml similarity index 100% rename from elements/components/gnupg.yml rename to external/components/gnupg.yml diff --git a/elements/components/gnutls.yml b/external/components/gnutls.yml similarity index 100% rename from elements/components/gnutls.yml rename to external/components/gnutls.yml diff --git a/elements/components/go.yml b/external/components/go.yml similarity index 100% rename from elements/components/go.yml rename to external/components/go.yml diff --git a/elements/components/go/gotk4.yml b/external/components/go/gotk4.yml similarity index 75% rename from elements/components/go/gotk4.yml rename to external/components/go/gotk4.yml index 9ac50bd83..496243ec4 100644 --- a/elements/components/go/gotk4.yml +++ b/external/components/go/gotk4.yml @@ -5,4 +5,4 @@ about: Autogenerated GTK4 bindings for Go gourl: github.com/diamondburned/gotk4/pkg/gtk/v4 -merge: [ elements/include/go-pkg.inc ] \ No newline at end of file +merge: [ external/include/go-pkg.inc ] \ No newline at end of file diff --git a/elements/components/gobject-introspection.yml b/external/components/gobject-introspection.yml similarity index 100% rename from elements/components/gobject-introspection.yml rename to external/components/gobject-introspection.yml diff --git a/elements/components/gom.yml b/external/components/gom.yml similarity index 100% rename from elements/components/gom.yml rename to external/components/gom.yml diff --git a/elements/components/gparted.yml b/external/components/gparted.yml similarity index 100% rename from elements/components/gparted.yml rename to external/components/gparted.yml diff --git a/elements/components/gperf.yml b/external/components/gperf.yml similarity index 100% rename from elements/components/gperf.yml rename to external/components/gperf.yml diff --git a/elements/components/gpgme.yml b/external/components/gpgme.yml similarity index 100% rename from elements/components/gpgme.yml rename to external/components/gpgme.yml diff --git a/elements/components/gptfdisk.yml b/external/components/gptfdisk.yml similarity index 100% rename from elements/components/gptfdisk.yml rename to external/components/gptfdisk.yml diff --git a/elements/components/grafana.yml b/external/components/grafana.yml similarity index 100% rename from elements/components/grafana.yml rename to external/components/grafana.yml diff --git a/elements/components/granite.yml b/external/components/granite.yml similarity index 100% rename from elements/components/granite.yml rename to external/components/granite.yml diff --git a/elements/components/graphene.yml b/external/components/graphene.yml similarity index 100% rename from elements/components/graphene.yml rename to external/components/graphene.yml diff --git a/elements/components/graphite2.yml b/external/components/graphite2.yml similarity index 100% rename from elements/components/graphite2.yml rename to external/components/graphite2.yml diff --git a/elements/components/graphviz.yml b/external/components/graphviz.yml similarity index 100% rename from elements/components/graphviz.yml rename to external/components/graphviz.yml diff --git a/elements/components/greetd.yml b/external/components/greetd.yml similarity index 100% rename from elements/components/greetd.yml rename to external/components/greetd.yml diff --git a/elements/components/grep.yml b/external/components/grep.yml similarity index 100% rename from elements/components/grep.yml rename to external/components/grep.yml diff --git a/elements/components/grilo-plugins.yml b/external/components/grilo-plugins.yml similarity index 100% rename from elements/components/grilo-plugins.yml rename to external/components/grilo-plugins.yml diff --git a/elements/components/grilo.yml b/external/components/grilo.yml similarity index 100% rename from elements/components/grilo.yml rename to external/components/grilo.yml diff --git a/elements/components/grim.yml b/external/components/grim.yml similarity index 100% rename from elements/components/grim.yml rename to external/components/grim.yml diff --git a/elements/components/grimshot.yml b/external/components/grimshot.yml similarity index 100% rename from elements/components/grimshot.yml rename to external/components/grimshot.yml diff --git a/elements/components/groff.yml b/external/components/groff.yml similarity index 100% rename from elements/components/groff.yml rename to external/components/groff.yml diff --git a/elements/components/grub-i386.yml b/external/components/grub-i386.yml similarity index 100% rename from elements/components/grub-i386.yml rename to external/components/grub-i386.yml diff --git a/elements/components/grub.yml b/external/components/grub.yml similarity index 93% rename from elements/components/grub.yml rename to external/components/grub.yml index 5aac893d1..89a8555ca 100644 --- a/elements/components/grub.yml +++ b/external/components/grub.yml @@ -50,7 +50,7 @@ build-depends: sources: - http://ftp.gnu.org/gnu/grub/grub-%{version}.tar.xz - - files/grub/update-grub.sh - - files/grub/unicode.pf2 - - files/grub/grub.default + - assets/grub/update-grub.sh + - assets/grub/unicode.pf2 + - assets/grub/grub.default - patches/grub/grub-2.06-upstream_fixes-1.patch \ No newline at end of file diff --git a/elements/components/gsettings-desktop-schemas.yml b/external/components/gsettings-desktop-schemas.yml similarity index 100% rename from elements/components/gsettings-desktop-schemas.yml rename to external/components/gsettings-desktop-schemas.yml diff --git a/elements/components/gsl.yml b/external/components/gsl.yml similarity index 100% rename from elements/components/gsl.yml rename to external/components/gsl.yml diff --git a/elements/components/gsound.yml b/external/components/gsound.yml similarity index 100% rename from elements/components/gsound.yml rename to external/components/gsound.yml diff --git a/elements/components/gspell.yml b/external/components/gspell.yml similarity index 100% rename from elements/components/gspell.yml rename to external/components/gspell.yml diff --git a/elements/components/gstreamer.yml b/external/components/gstreamer.yml similarity index 100% rename from elements/components/gstreamer.yml rename to external/components/gstreamer.yml diff --git a/elements/components/gtest.yml b/external/components/gtest.yml similarity index 100% rename from elements/components/gtest.yml rename to external/components/gtest.yml diff --git a/elements/components/gtk-doc.yml b/external/components/gtk-doc.yml similarity index 100% rename from elements/components/gtk-doc.yml rename to external/components/gtk-doc.yml diff --git a/elements/components/gtk-layer-shell.yml b/external/components/gtk-layer-shell.yml similarity index 100% rename from elements/components/gtk-layer-shell.yml rename to external/components/gtk-layer-shell.yml diff --git a/elements/components/gtk-vnc.yml b/external/components/gtk-vnc.yml similarity index 100% rename from elements/components/gtk-vnc.yml rename to external/components/gtk-vnc.yml diff --git a/elements/components/gtk.yml b/external/components/gtk.yml similarity index 100% rename from elements/components/gtk.yml rename to external/components/gtk.yml diff --git a/elements/components/gtk4.yml b/external/components/gtk4.yml similarity index 100% rename from elements/components/gtk4.yml rename to external/components/gtk4.yml diff --git a/elements/components/gtkgreet.yml b/external/components/gtkgreet.yml similarity index 100% rename from elements/components/gtkgreet.yml rename to external/components/gtkgreet.yml diff --git a/elements/components/gtkmm.yml b/external/components/gtkmm.yml similarity index 100% rename from elements/components/gtkmm.yml rename to external/components/gtkmm.yml diff --git a/elements/components/gtkmm4.yml b/external/components/gtkmm4.yml similarity index 100% rename from elements/components/gtkmm4.yml rename to external/components/gtkmm4.yml diff --git a/elements/components/gtksourceview4.yml b/external/components/gtksourceview4.yml similarity index 100% rename from elements/components/gtksourceview4.yml rename to external/components/gtksourceview4.yml diff --git a/elements/components/gtksourceview5.yml b/external/components/gtksourceview5.yml similarity index 100% rename from elements/components/gtksourceview5.yml rename to external/components/gtksourceview5.yml diff --git a/elements/components/gufw.yml b/external/components/gufw.yml similarity index 100% rename from elements/components/gufw.yml rename to external/components/gufw.yml diff --git a/elements/components/guile.yml b/external/components/guile.yml similarity index 100% rename from elements/components/guile.yml rename to external/components/guile.yml diff --git a/elements/components/gvfs.yml b/external/components/gvfs.yml similarity index 100% rename from elements/components/gvfs.yml rename to external/components/gvfs.yml diff --git a/elements/components/gzip.yml b/external/components/gzip.yml similarity index 100% rename from elements/components/gzip.yml rename to external/components/gzip.yml diff --git a/elements/components/harfbuzz.yml b/external/components/harfbuzz.yml similarity index 100% rename from elements/components/harfbuzz.yml rename to external/components/harfbuzz.yml diff --git a/elements/components/help2man.yml b/external/components/help2man.yml similarity index 100% rename from elements/components/help2man.yml rename to external/components/help2man.yml diff --git a/elements/components/hicolor-icon-theme.yml b/external/components/hicolor-icon-theme.yml similarity index 100% rename from elements/components/hicolor-icon-theme.yml rename to external/components/hicolor-icon-theme.yml diff --git a/elements/components/highlight.yml b/external/components/highlight.yml similarity index 100% rename from elements/components/highlight.yml rename to external/components/highlight.yml diff --git a/elements/components/htop.yml b/external/components/htop.yml similarity index 100% rename from elements/components/htop.yml rename to external/components/htop.yml diff --git a/elements/components/http-parser.yml b/external/components/http-parser.yml similarity index 100% rename from elements/components/http-parser.yml rename to external/components/http-parser.yml diff --git a/elements/components/hunspell.yml b/external/components/hunspell.yml similarity index 100% rename from elements/components/hunspell.yml rename to external/components/hunspell.yml diff --git a/elements/components/hwdata.yml b/external/components/hwdata.yml similarity index 100% rename from elements/components/hwdata.yml rename to external/components/hwdata.yml diff --git a/elements/components/hwloc.yml b/external/components/hwloc.yml similarity index 100% rename from elements/components/hwloc.yml rename to external/components/hwloc.yml diff --git a/elements/components/i3.yml b/external/components/i3.yml similarity index 100% rename from elements/components/i3.yml rename to external/components/i3.yml diff --git a/elements/components/i3blocks.yml b/external/components/i3blocks.yml similarity index 100% rename from elements/components/i3blocks.yml rename to external/components/i3blocks.yml diff --git a/elements/components/i3lock.yml b/external/components/i3lock.yml similarity index 100% rename from elements/components/i3lock.yml rename to external/components/i3lock.yml diff --git a/elements/components/i3status.yml b/external/components/i3status.yml similarity index 100% rename from elements/components/i3status.yml rename to external/components/i3status.yml diff --git a/elements/components/iana-etc.yml b/external/components/iana-etc.yml similarity index 100% rename from elements/components/iana-etc.yml rename to external/components/iana-etc.yml diff --git a/elements/components/ibus.yml b/external/components/ibus.yml similarity index 100% rename from elements/components/ibus.yml rename to external/components/ibus.yml diff --git a/elements/components/icmake.yml b/external/components/icmake.yml similarity index 100% rename from elements/components/icmake.yml rename to external/components/icmake.yml diff --git a/elements/components/icon-naming-utils.yml b/external/components/icon-naming-utils.yml similarity index 100% rename from elements/components/icon-naming-utils.yml rename to external/components/icon-naming-utils.yml diff --git a/elements/components/icu.yml b/external/components/icu.yml similarity index 100% rename from elements/components/icu.yml rename to external/components/icu.yml diff --git a/elements/components/iio-sensor-proxy.yml b/external/components/iio-sensor-proxy.yml similarity index 100% rename from elements/components/iio-sensor-proxy.yml rename to external/components/iio-sensor-proxy.yml diff --git a/elements/components/iio-sway.yml b/external/components/iio-sway.yml similarity index 100% rename from elements/components/iio-sway.yml rename to external/components/iio-sway.yml diff --git a/elements/components/imagemagick.yml b/external/components/imagemagick.yml similarity index 100% rename from elements/components/imagemagick.yml rename to external/components/imagemagick.yml diff --git a/elements/components/imlib2.yml b/external/components/imlib2.yml similarity index 100% rename from elements/components/imlib2.yml rename to external/components/imlib2.yml diff --git a/elements/components/inetutils.yml b/external/components/inetutils.yml similarity index 100% rename from elements/components/inetutils.yml rename to external/components/inetutils.yml diff --git a/elements/components/inih.yml b/external/components/inih.yml similarity index 100% rename from elements/components/inih.yml rename to external/components/inih.yml diff --git a/elements/components/initial-setup.yml b/external/components/initial-setup.yml similarity index 99% rename from elements/components/initial-setup.yml rename to external/components/initial-setup.yml index 3aaa9bda2..cde877543 100644 --- a/elements/components/initial-setup.yml +++ b/external/components/initial-setup.yml @@ -1,7 +1,7 @@ id: initial-setup version: 2.0.12 about: System Initial Setup -merge: [ ostree-branch.yml, elements/include/rlxos.inc ] +merge: [ ostree-branch.yml, external/include/rlxos.inc ] post-script: |- for script in first-boot installer ; do diff --git a/elements/components/initramfs.yml b/external/components/initramfs.yml similarity index 100% rename from elements/components/initramfs.yml rename to external/components/initramfs.yml diff --git a/elements/components/intel-ucode.yml b/external/components/intel-ucode.yml similarity index 100% rename from elements/components/intel-ucode.yml rename to external/components/intel-ucode.yml diff --git a/elements/components/intltool.yml b/external/components/intltool.yml similarity index 100% rename from elements/components/intltool.yml rename to external/components/intltool.yml diff --git a/elements/components/inxi.yml b/external/components/inxi.yml similarity index 100% rename from elements/components/inxi.yml rename to external/components/inxi.yml diff --git a/elements/components/iproute2.yml b/external/components/iproute2.yml similarity index 100% rename from elements/components/iproute2.yml rename to external/components/iproute2.yml diff --git a/elements/components/iptables.yml b/external/components/iptables.yml similarity index 100% rename from elements/components/iptables.yml rename to external/components/iptables.yml diff --git a/elements/components/iso-codes.yml b/external/components/iso-codes.yml similarity index 100% rename from elements/components/iso-codes.yml rename to external/components/iso-codes.yml diff --git a/elements/components/itstool.yml b/external/components/itstool.yml similarity index 100% rename from elements/components/itstool.yml rename to external/components/itstool.yml diff --git a/elements/components/iucode-tool.yml b/external/components/iucode-tool.yml similarity index 100% rename from elements/components/iucode-tool.yml rename to external/components/iucode-tool.yml diff --git a/elements/components/jack.yml b/external/components/jack.yml similarity index 100% rename from elements/components/jack.yml rename to external/components/jack.yml diff --git a/elements/components/jansson.yml b/external/components/jansson.yml similarity index 100% rename from elements/components/jansson.yml rename to external/components/jansson.yml diff --git a/elements/components/jasper.yml b/external/components/jasper.yml similarity index 100% rename from elements/components/jasper.yml rename to external/components/jasper.yml diff --git a/elements/components/jetring.yml b/external/components/jetring.yml similarity index 100% rename from elements/components/jetring.yml rename to external/components/jetring.yml diff --git a/elements/components/jfsutils.yml b/external/components/jfsutils.yml similarity index 100% rename from elements/components/jfsutils.yml rename to external/components/jfsutils.yml diff --git a/elements/components/jq.yml b/external/components/jq.yml similarity index 100% rename from elements/components/jq.yml rename to external/components/jq.yml diff --git a/elements/components/json-c.yml b/external/components/json-c.yml similarity index 100% rename from elements/components/json-c.yml rename to external/components/json-c.yml diff --git a/elements/components/json-glib.yml b/external/components/json-glib.yml similarity index 100% rename from elements/components/json-glib.yml rename to external/components/json-glib.yml diff --git a/elements/components/jsonrpc-glib.yml b/external/components/jsonrpc-glib.yml similarity index 100% rename from elements/components/jsonrpc-glib.yml rename to external/components/jsonrpc-glib.yml diff --git a/elements/components/kactivities-stats.yml b/external/components/kactivities-stats.yml similarity index 81% rename from elements/components/kactivities-stats.yml rename to external/components/kactivities-stats.yml index d1d4e1734..ccf227dfa 100644 --- a/elements/components/kactivities-stats.yml +++ b/external/components/kactivities-stats.yml @@ -5,4 +5,4 @@ depends: - components/kactivities.yml build-depends: - components/extra-cmake-modules.yml -merge: [elements/include/kf5.inc] \ No newline at end of file +merge: [external/include/kf5.inc] \ No newline at end of file diff --git a/elements/components/kactivities.yml b/external/components/kactivities.yml similarity index 86% rename from elements/components/kactivities.yml rename to external/components/kactivities.yml index 154500db4..318dc4432 100644 --- a/elements/components/kactivities.yml +++ b/external/components/kactivities.yml @@ -9,4 +9,4 @@ build-depends: - components/boost.yml - components/extra-cmake-modules.yml -merge: [elements/include/kf5.inc] +merge: [external/include/kf5.inc] diff --git a/elements/components/kapidox.yml b/external/components/kapidox.yml similarity index 90% rename from elements/components/kapidox.yml rename to external/components/kapidox.yml index f5968b37e..b8888a961 100644 --- a/elements/components/kapidox.yml +++ b/external/components/kapidox.yml @@ -1,7 +1,7 @@ id: kapidox about: KF5 kapidox -merge: [elements/include/kf5.inc] +merge: [external/include/kf5.inc] script: |- pip install build installer wheel diff --git a/elements/components/karchive.yml b/external/components/karchive.yml similarity index 77% rename from elements/components/karchive.yml rename to external/components/karchive.yml index 828070219..610f692db 100644 --- a/elements/components/karchive.yml +++ b/external/components/karchive.yml @@ -5,4 +5,4 @@ depends: - components/qt.yml build-depends: - components/extra-cmake-modules.yml -merge: [elements/include/kf5.inc] +merge: [external/include/kf5.inc] diff --git a/elements/components/kauth.yml b/external/components/kauth.yml similarity index 85% rename from elements/components/kauth.yml rename to external/components/kauth.yml index b35495368..bfa4d10b0 100644 --- a/elements/components/kauth.yml +++ b/external/components/kauth.yml @@ -8,4 +8,4 @@ depends: - components/kwindowsystem.yml build-depends: - components/extra-cmake-modules.yml -merge: [elements/include/kf5.inc] +merge: [external/include/kf5.inc] diff --git a/elements/components/kbd.yml b/external/components/kbd.yml similarity index 100% rename from elements/components/kbd.yml rename to external/components/kbd.yml diff --git a/elements/components/kbookmarks.yml b/external/components/kbookmarks.yml similarity index 79% rename from elements/components/kbookmarks.yml rename to external/components/kbookmarks.yml index b7d0fcaea..8fbe76831 100644 --- a/elements/components/kbookmarks.yml +++ b/external/components/kbookmarks.yml @@ -5,4 +5,4 @@ depends: - components/kxmlgui.yml build-depends: - components/extra-cmake-modules.yml -merge: [elements/include/kf5.inc] \ No newline at end of file +merge: [external/include/kf5.inc] \ No newline at end of file diff --git a/elements/components/kcalendarcore.yml b/external/components/kcalendarcore.yml similarity index 82% rename from elements/components/kcalendarcore.yml rename to external/components/kcalendarcore.yml index ce1348ce4..edad5b146 100644 --- a/elements/components/kcalendarcore.yml +++ b/external/components/kcalendarcore.yml @@ -6,4 +6,4 @@ depends: - components/qt.yml build-depends: - components/extra-cmake-modules.yml -merge: [elements/include/kf5.inc] \ No newline at end of file +merge: [external/include/kf5.inc] \ No newline at end of file diff --git a/elements/components/kcmutils.yml b/external/components/kcmutils.yml similarity index 79% rename from elements/components/kcmutils.yml rename to external/components/kcmutils.yml index a5dcb87dc..883d024fe 100644 --- a/elements/components/kcmutils.yml +++ b/external/components/kcmutils.yml @@ -6,4 +6,4 @@ depends: build-depends: - components/extra-cmake-modules.yml -merge: [elements/include/kf5.inc] +merge: [external/include/kf5.inc] diff --git a/elements/components/kcodecs.yml b/external/components/kcodecs.yml similarity index 78% rename from elements/components/kcodecs.yml rename to external/components/kcodecs.yml index 7fece4995..8a47eb755 100644 --- a/elements/components/kcodecs.yml +++ b/external/components/kcodecs.yml @@ -5,4 +5,4 @@ depends: build-depends: - components/gperf.yml - components/extra-cmake-modules.yml -merge: [elements/include/kf5.inc] \ No newline at end of file +merge: [external/include/kf5.inc] \ No newline at end of file diff --git a/elements/components/kcolorscheme.yml b/external/components/kcolorscheme.yml similarity index 87% rename from elements/components/kcolorscheme.yml rename to external/components/kcolorscheme.yml index 8d154ab41..d8c68afd2 100644 --- a/elements/components/kcolorscheme.yml +++ b/external/components/kcolorscheme.yml @@ -1,5 +1,5 @@ id: kcolorscheme -merge: [elements/include/kf5.inc] +merge: [external/include/kf5.inc] about: Classes to read and interact with KColorScheme depends: diff --git a/elements/components/kcompletion.yml b/external/components/kcompletion.yml similarity index 86% rename from elements/components/kcompletion.yml rename to external/components/kcompletion.yml index c366771cb..ba0b62cf1 100644 --- a/elements/components/kcompletion.yml +++ b/external/components/kcompletion.yml @@ -1,6 +1,6 @@ id: kcompletion about: KF5 kcompletion -merge: [elements/include/kf5.inc] +merge: [external/include/kf5.inc] depends: - components/qt.yml - components/kcodecs.yml diff --git a/elements/components/kconfig.yml b/external/components/kconfig.yml similarity index 77% rename from elements/components/kconfig.yml rename to external/components/kconfig.yml index 655768b8e..b5f9f5e92 100644 --- a/elements/components/kconfig.yml +++ b/external/components/kconfig.yml @@ -1,6 +1,6 @@ id: kconfig about: KF5 kconfig -merge: [elements/include/kf5.inc] +merge: [external/include/kf5.inc] depends: - components/qt.yml build-depends: diff --git a/elements/components/kconfigwidgets.yml b/external/components/kconfigwidgets.yml similarity index 92% rename from elements/components/kconfigwidgets.yml rename to external/components/kconfigwidgets.yml index d6a8d5743..75421903e 100644 --- a/elements/components/kconfigwidgets.yml +++ b/external/components/kconfigwidgets.yml @@ -1,6 +1,6 @@ id: kconfigwidgets about: KF5 kconfigwidgets -merge: [elements/include/kf5.inc] +merge: [external/include/kf5.inc] depends: - components/kauth.yml - components/kcodecs.yml diff --git a/elements/components/kcontacts.yml b/external/components/kcontacts.yml similarity index 85% rename from elements/components/kcontacts.yml rename to external/components/kcontacts.yml index 0631a7936..216519dc6 100644 --- a/elements/components/kcontacts.yml +++ b/external/components/kcontacts.yml @@ -1,6 +1,6 @@ id: kcontacts about: KF5 kcontacts -merge: [elements/include/kf5.inc] +merge: [external/include/kf5.inc] depends: - components/kcodecs.yml - components/kconfig.yml diff --git a/elements/components/kcoreaddons.yml b/external/components/kcoreaddons.yml similarity index 78% rename from elements/components/kcoreaddons.yml rename to external/components/kcoreaddons.yml index c4d8444e3..d61092ef6 100644 --- a/elements/components/kcoreaddons.yml +++ b/external/components/kcoreaddons.yml @@ -1,5 +1,5 @@ id: kcoreaddons -merge: [elements/include/kf5.inc] +merge: [external/include/kf5.inc] about: KF5 kcoreaddons depends: - components/qt.yml diff --git a/elements/components/kcrash.yml b/external/components/kcrash.yml similarity index 83% rename from elements/components/kcrash.yml rename to external/components/kcrash.yml index 0caf4052f..dc19999d8 100644 --- a/elements/components/kcrash.yml +++ b/external/components/kcrash.yml @@ -1,5 +1,5 @@ id: kcrash -merge: [elements/include/kf5.inc] +merge: [external/include/kf5.inc] about: KF5 kcrash depends: - components/qt.yml diff --git a/elements/components/kdav.yml b/external/components/kdav.yml similarity index 76% rename from elements/components/kdav.yml rename to external/components/kdav.yml index 0354f6587..0bf9632a0 100644 --- a/elements/components/kdav.yml +++ b/external/components/kdav.yml @@ -1,5 +1,5 @@ id: kdav -merge: [elements/include/kf5.inc] +merge: [external/include/kf5.inc] about: KF5 kdav depends: - components/kio.yml diff --git a/elements/components/kdbusaddons.yml b/external/components/kdbusaddons.yml similarity index 78% rename from elements/components/kdbusaddons.yml rename to external/components/kdbusaddons.yml index a55418a8b..30df7d53c 100644 --- a/elements/components/kdbusaddons.yml +++ b/external/components/kdbusaddons.yml @@ -1,5 +1,5 @@ id: kdbusaddons -merge: [elements/include/kf5.inc] +merge: [external/include/kf5.inc] about: KF5 kdbusaddons depends: - components/qt.yml diff --git a/elements/components/kdeclarative.yml b/external/components/kdeclarative.yml similarity index 84% rename from elements/components/kdeclarative.yml rename to external/components/kdeclarative.yml index 8405a6cdb..8329ad6e2 100644 --- a/elements/components/kdeclarative.yml +++ b/external/components/kdeclarative.yml @@ -1,5 +1,5 @@ id: kdeclarative -merge: [elements/include/kf5.inc] +merge: [external/include/kf5.inc] about: KF5 kdeclarative depends: diff --git a/elements/components/kded.yml b/external/components/kded.yml similarity index 83% rename from elements/components/kded.yml rename to external/components/kded.yml index 23eeb3baa..610d1ee22 100644 --- a/elements/components/kded.yml +++ b/external/components/kded.yml @@ -1,5 +1,5 @@ id: kded -merge: [elements/include/kf5.inc] +merge: [external/include/kf5.inc] about: KF5 kded depends: diff --git a/elements/components/kdelibs4support.yml b/external/components/kdelibs4support.yml similarity index 93% rename from elements/components/kdelibs4support.yml rename to external/components/kdelibs4support.yml index 44fe94e2d..e7d64a394 100644 --- a/elements/components/kdelibs4support.yml +++ b/external/components/kdelibs4support.yml @@ -1,5 +1,5 @@ id: kdelibs4support -merge: [elements/include/kf5.inc] +merge: [external/include/kf5.inc] about: KF5 kdelibs4support depends: - components/kemoticons.yml diff --git a/elements/components/kdesignerplugin.yml b/external/components/kdesignerplugin.yml similarity index 89% rename from elements/components/kdesignerplugin.yml rename to external/components/kdesignerplugin.yml index bb0868c8b..cc13d2b13 100644 --- a/elements/components/kdesignerplugin.yml +++ b/external/components/kdesignerplugin.yml @@ -1,5 +1,5 @@ id: kdesignerplugin -merge: [elements/include/kf5.inc] +merge: [external/include/kf5.inc] about: KF5 kdesignerplugin depends: diff --git a/elements/components/kdesu.yml b/external/components/kdesu.yml similarity index 80% rename from elements/components/kdesu.yml rename to external/components/kdesu.yml index 8e05c7b12..a99632be1 100644 --- a/elements/components/kdesu.yml +++ b/external/components/kdesu.yml @@ -1,5 +1,5 @@ id: kdesu -merge: [elements/include/kf5.inc] +merge: [external/include/kf5.inc] about: KF5 kdesu depends: diff --git a/elements/components/kdewebkit.yml b/external/components/kdewebkit.yml similarity index 88% rename from elements/components/kdewebkit.yml rename to external/components/kdewebkit.yml index ccbb9913a..d0ac9160a 100644 --- a/elements/components/kdewebkit.yml +++ b/external/components/kdewebkit.yml @@ -1,5 +1,5 @@ id: kdewebkit -merge: [elements/include/kf5.inc] +merge: [external/include/kf5.inc] about: KF5 kdewebkit depends: diff --git a/elements/components/kdnssd.yml b/external/components/kdnssd.yml similarity index 77% rename from elements/components/kdnssd.yml rename to external/components/kdnssd.yml index 69c012d46..65b5ffc95 100644 --- a/elements/components/kdnssd.yml +++ b/external/components/kdnssd.yml @@ -1,5 +1,5 @@ id: kdnssd -merge: [elements/include/kf5.inc] +merge: [external/include/kf5.inc] about: KF5 kdnssd depends: - components/qt.yml diff --git a/elements/components/kdoctools.yml b/external/components/kdoctools.yml similarity index 87% rename from elements/components/kdoctools.yml rename to external/components/kdoctools.yml index 3f0a9c2ec..75fe8cadd 100644 --- a/elements/components/kdoctools.yml +++ b/external/components/kdoctools.yml @@ -1,5 +1,5 @@ id: kdoctools -merge: [elements/include/kf5.inc] +merge: [external/include/kf5.inc] about: KF5 kdoctools depends: - components/qt.yml diff --git a/elements/components/kdsoap.yml b/external/components/kdsoap.yml similarity index 100% rename from elements/components/kdsoap.yml rename to external/components/kdsoap.yml diff --git a/elements/components/kemoticons.yml b/external/components/kemoticons.yml similarity index 82% rename from elements/components/kemoticons.yml rename to external/components/kemoticons.yml index 61f8224b6..eedc75616 100644 --- a/elements/components/kemoticons.yml +++ b/external/components/kemoticons.yml @@ -1,5 +1,5 @@ id: kemoticons -merge: [elements/include/kf5.inc] +merge: [external/include/kf5.inc] about: KF5 kemoticons depends: - components/karchive.yml diff --git a/elements/components/kernel-headers.yml b/external/components/kernel-headers.yml similarity index 91% rename from elements/components/kernel-headers.yml rename to external/components/kernel-headers.yml index 2efd3fc6d..e4aab1cc2 100644 --- a/elements/components/kernel-headers.yml +++ b/external/components/kernel-headers.yml @@ -1,5 +1,5 @@ id: kernel-headers -merge: [elements/include/linux.inc] +merge: [external/include/linux.inc] about: Linux kernel, modules and headers strip: false diff --git a/elements/components/keybinder.yml b/external/components/keybinder.yml similarity index 100% rename from elements/components/keybinder.yml rename to external/components/keybinder.yml diff --git a/elements/components/keyutils.yml b/external/components/keyutils.yml similarity index 100% rename from elements/components/keyutils.yml rename to external/components/keyutils.yml diff --git a/elements/components/kfilemetadata.yml b/external/components/kfilemetadata.yml similarity index 88% rename from elements/components/kfilemetadata.yml rename to external/components/kfilemetadata.yml index 2bd67a724..24fdd04f6 100644 --- a/elements/components/kfilemetadata.yml +++ b/external/components/kfilemetadata.yml @@ -1,5 +1,5 @@ id: kfilemetadata -merge: [elements/include/kf5.inc] +merge: [external/include/kf5.inc] about: KF5 kfilemetadata depends: - components/exiv2.yml diff --git a/elements/components/kglobalaccel.yml b/external/components/kglobalaccel.yml similarity index 84% rename from elements/components/kglobalaccel.yml rename to external/components/kglobalaccel.yml index 6747f780e..a87020c5c 100644 --- a/elements/components/kglobalaccel.yml +++ b/external/components/kglobalaccel.yml @@ -1,5 +1,5 @@ id: kglobalaccel -merge: [elements/include/kf5.inc] +merge: [external/include/kf5.inc] about: KF5 kglobalaccel depends: diff --git a/elements/components/kguiaddons.yml b/external/components/kguiaddons.yml similarity index 83% rename from elements/components/kguiaddons.yml rename to external/components/kguiaddons.yml index aee566862..eb66b9b6e 100644 --- a/elements/components/kguiaddons.yml +++ b/external/components/kguiaddons.yml @@ -1,5 +1,5 @@ id: kguiaddons -merge: [elements/include/kf5.inc] +merge: [external/include/kf5.inc] about: KF5 kguiaddons depends: diff --git a/elements/components/khelpcenter.yml b/external/components/khelpcenter.yml similarity index 100% rename from elements/components/khelpcenter.yml rename to external/components/khelpcenter.yml diff --git a/elements/components/kholidays.yml b/external/components/kholidays.yml similarity index 78% rename from elements/components/kholidays.yml rename to external/components/kholidays.yml index 2685ec696..35ca16c81 100644 --- a/elements/components/kholidays.yml +++ b/external/components/kholidays.yml @@ -1,5 +1,5 @@ id: kholidays -merge: [elements/include/kf5.inc] +merge: [external/include/kf5.inc] about: KF5 kholidays depends: diff --git a/elements/components/khtml.yml b/external/components/khtml.yml similarity index 90% rename from elements/components/khtml.yml rename to external/components/khtml.yml index e070a78d6..8811d59cf 100644 --- a/elements/components/khtml.yml +++ b/external/components/khtml.yml @@ -1,5 +1,5 @@ id: khtml -merge: [elements/include/kf5.inc] +merge: [external/include/kf5.inc] about: KF5 khtml depends: - components/giflib.yml diff --git a/elements/components/ki18n.yml b/external/components/ki18n.yml similarity index 80% rename from elements/components/ki18n.yml rename to external/components/ki18n.yml index 6e0c10bf8..7772a8e59 100644 --- a/elements/components/ki18n.yml +++ b/external/components/ki18n.yml @@ -1,5 +1,5 @@ id: ki18n -merge: [elements/include/kf5.inc] +merge: [external/include/kf5.inc] about: KF5 ki18n depends: diff --git a/elements/components/kiconthemes.yml b/external/components/kiconthemes.yml similarity index 85% rename from elements/components/kiconthemes.yml rename to external/components/kiconthemes.yml index 79321ead8..0fca46dbe 100644 --- a/elements/components/kiconthemes.yml +++ b/external/components/kiconthemes.yml @@ -1,5 +1,5 @@ id: kiconthemes -merge: [elements/include/kf5.inc] +merge: [external/include/kf5.inc] about: KF5 kiconthemes depends: diff --git a/elements/components/kidletime.yml b/external/components/kidletime.yml similarity index 81% rename from elements/components/kidletime.yml rename to external/components/kidletime.yml index 1369d5aae..d325e3a4a 100644 --- a/elements/components/kidletime.yml +++ b/external/components/kidletime.yml @@ -1,5 +1,5 @@ id: kidletime -merge: [elements/include/kf5.inc] +merge: [external/include/kf5.inc] about: KF5 kidletime depends: diff --git a/elements/components/kimageformats.yml b/external/components/kimageformats.yml similarity index 82% rename from elements/components/kimageformats.yml rename to external/components/kimageformats.yml index 506da8c2d..151f38b56 100644 --- a/elements/components/kimageformats.yml +++ b/external/components/kimageformats.yml @@ -1,5 +1,5 @@ id: kimageformats -merge: [elements/include/kf5.inc] +merge: [external/include/kf5.inc] about: KF5 kimageformats depends: - components/qt.yml diff --git a/elements/components/kinfocenter.yml b/external/components/kinfocenter.yml similarity index 100% rename from elements/components/kinfocenter.yml rename to external/components/kinfocenter.yml diff --git a/elements/components/kinit.yml b/external/components/kinit.yml similarity index 80% rename from elements/components/kinit.yml rename to external/components/kinit.yml index 0b463f781..f14f5c43a 100644 --- a/elements/components/kinit.yml +++ b/external/components/kinit.yml @@ -1,5 +1,5 @@ id: kinit -merge: [elements/include/kf5.inc] +merge: [external/include/kf5.inc] about: KF5 kinit depends: diff --git a/elements/components/kio-extras.yml b/external/components/kio-extras.yml similarity index 100% rename from elements/components/kio-extras.yml rename to external/components/kio-extras.yml diff --git a/elements/components/kio.yml b/external/components/kio.yml similarity index 90% rename from elements/components/kio.yml rename to external/components/kio.yml index fdbd9b205..3773871f6 100644 --- a/elements/components/kio.yml +++ b/external/components/kio.yml @@ -1,5 +1,5 @@ id: kio -merge: [elements/include/kf5.inc] +merge: [external/include/kf5.inc] about: KF5 kio depends: diff --git a/elements/components/kirigami2.yml b/external/components/kirigami2.yml similarity index 81% rename from elements/components/kirigami2.yml rename to external/components/kirigami2.yml index 4b488b85d..5df9372b9 100644 --- a/elements/components/kirigami2.yml +++ b/external/components/kirigami2.yml @@ -1,5 +1,5 @@ id: kirigami2 -merge: [elements/include/kf5.inc] +merge: [external/include/kf5.inc] about: KF5 kirigami2 depends: - components/qt.yml diff --git a/elements/components/kitemmodels.yml b/external/components/kitemmodels.yml similarity index 78% rename from elements/components/kitemmodels.yml rename to external/components/kitemmodels.yml index cd46ddc40..a4c29595f 100644 --- a/elements/components/kitemmodels.yml +++ b/external/components/kitemmodels.yml @@ -1,5 +1,5 @@ id: kitemmodels -merge: [elements/include/kf5.inc] +merge: [external/include/kf5.inc] about: KF5 kitemmodels depends: diff --git a/elements/components/kitemviews.yml b/external/components/kitemviews.yml similarity index 78% rename from elements/components/kitemviews.yml rename to external/components/kitemviews.yml index 559745ac3..6432495f1 100644 --- a/elements/components/kitemviews.yml +++ b/external/components/kitemviews.yml @@ -1,5 +1,5 @@ id: kitemviews -merge: [elements/include/kf5.inc] +merge: [external/include/kf5.inc] about: KF5 kitemviews depends: diff --git a/elements/components/kjobwidgets.yml b/external/components/kjobwidgets.yml similarity index 85% rename from elements/components/kjobwidgets.yml rename to external/components/kjobwidgets.yml index da2c29960..d8c4f6fa7 100644 --- a/elements/components/kjobwidgets.yml +++ b/external/components/kjobwidgets.yml @@ -1,5 +1,5 @@ id: kjobwidgets -merge: [elements/include/kf5.inc] +merge: [external/include/kf5.inc] about: KF5 kjobwidgets depends: diff --git a/elements/components/kjs.yml b/external/components/kjs.yml similarity index 88% rename from elements/components/kjs.yml rename to external/components/kjs.yml index bbf0eaf61..f03f8f6ac 100644 --- a/elements/components/kjs.yml +++ b/external/components/kjs.yml @@ -1,5 +1,5 @@ id: kjs -merge: [elements/include/kf5.inc] +merge: [external/include/kf5.inc] about: KF5 kjs depends: diff --git a/elements/components/kjsembed.yml b/external/components/kjsembed.yml similarity index 89% rename from elements/components/kjsembed.yml rename to external/components/kjsembed.yml index b3f457b7c..46b28bfbc 100644 --- a/elements/components/kjsembed.yml +++ b/external/components/kjsembed.yml @@ -1,5 +1,5 @@ id: kjsembed -merge: [elements/include/kf5.inc] +merge: [external/include/kf5.inc] about: KF5 kjsembed depends: diff --git a/elements/components/kmediaplayer.yml b/external/components/kmediaplayer.yml similarity index 87% rename from elements/components/kmediaplayer.yml rename to external/components/kmediaplayer.yml index 6fd2f3747..a973fa5df 100644 --- a/elements/components/kmediaplayer.yml +++ b/external/components/kmediaplayer.yml @@ -1,5 +1,5 @@ id: kmediaplayer -merge: [elements/include/kf5.inc] +merge: [external/include/kf5.inc] about: KF5 kmediaplayer depends: diff --git a/elements/components/kmix.yml b/external/components/kmix.yml similarity index 100% rename from elements/components/kmix.yml rename to external/components/kmix.yml diff --git a/elements/components/kmod.yml b/external/components/kmod.yml similarity index 100% rename from elements/components/kmod.yml rename to external/components/kmod.yml diff --git a/elements/components/knewstuff.yml b/external/components/knewstuff.yml similarity index 87% rename from elements/components/knewstuff.yml rename to external/components/knewstuff.yml index b44d6325c..b72f77ce9 100644 --- a/elements/components/knewstuff.yml +++ b/external/components/knewstuff.yml @@ -1,5 +1,5 @@ id: knewstuff -merge: [elements/include/kf5.inc] +merge: [external/include/kf5.inc] about: KF5 knewstuff depends: diff --git a/elements/components/knotifications.yml b/external/components/knotifications.yml similarity index 88% rename from elements/components/knotifications.yml rename to external/components/knotifications.yml index a56bd59ff..cc864e91b 100644 --- a/elements/components/knotifications.yml +++ b/external/components/knotifications.yml @@ -1,5 +1,5 @@ id: knotifications -merge: [elements/include/kf5.inc] +merge: [external/include/kf5.inc] about: KF5 knotifications depends: diff --git a/elements/components/knotifyconfig.yml b/external/components/knotifyconfig.yml similarity index 79% rename from elements/components/knotifyconfig.yml rename to external/components/knotifyconfig.yml index 37295ef75..5aa2d4a6b 100644 --- a/elements/components/knotifyconfig.yml +++ b/external/components/knotifyconfig.yml @@ -1,5 +1,5 @@ id: knotifyconfig -merge: [elements/include/kf5.inc] +merge: [external/include/kf5.inc] about: KF5 knotifyconfig depends: diff --git a/elements/components/kpackage.yml b/external/components/kpackage.yml similarity index 86% rename from elements/components/kpackage.yml rename to external/components/kpackage.yml index 8020a7a4a..8c0ebc018 100644 --- a/elements/components/kpackage.yml +++ b/external/components/kpackage.yml @@ -1,5 +1,5 @@ id: kpackage -merge: [elements/include/kf5.inc] +merge: [external/include/kf5.inc] about: KF5 kpackage depends: diff --git a/elements/components/kparts.yml b/external/components/kparts.yml similarity index 77% rename from elements/components/kparts.yml rename to external/components/kparts.yml index a362fd4d2..70329376a 100644 --- a/elements/components/kparts.yml +++ b/external/components/kparts.yml @@ -1,5 +1,5 @@ id: kparts -merge: [elements/include/kf5.inc] +merge: [external/include/kf5.inc] about: KF5 kparts depends: diff --git a/elements/components/kpeople.yml b/external/components/kpeople.yml similarity index 86% rename from elements/components/kpeople.yml rename to external/components/kpeople.yml index 1e7225c9b..886a3f24f 100644 --- a/elements/components/kpeople.yml +++ b/external/components/kpeople.yml @@ -1,5 +1,5 @@ id: kpeople -merge: [elements/include/kf5.inc] +merge: [external/include/kf5.inc] about: KF5 kpeople depends: diff --git a/elements/components/kplotting.yml b/external/components/kplotting.yml similarity index 78% rename from elements/components/kplotting.yml rename to external/components/kplotting.yml index 46f17de09..584857c48 100644 --- a/elements/components/kplotting.yml +++ b/external/components/kplotting.yml @@ -1,5 +1,5 @@ id: kplotting -merge: [elements/include/kf5.inc] +merge: [external/include/kf5.inc] about: KF5 kplotting depends: diff --git a/elements/components/kpmcore.yml b/external/components/kpmcore.yml similarity index 100% rename from elements/components/kpmcore.yml rename to external/components/kpmcore.yml diff --git a/elements/components/kpty.yml b/external/components/kpty.yml similarity index 83% rename from elements/components/kpty.yml rename to external/components/kpty.yml index 955ef2f3d..7f4b866ce 100644 --- a/elements/components/kpty.yml +++ b/external/components/kpty.yml @@ -1,5 +1,5 @@ id: kpty -merge: [elements/include/kf5.inc] +merge: [external/include/kf5.inc] about: KF5 kpty depends: diff --git a/elements/components/kquickcharts.yml b/external/components/kquickcharts.yml similarity index 78% rename from elements/components/kquickcharts.yml rename to external/components/kquickcharts.yml index 119a92204..e8c9b7120 100644 --- a/elements/components/kquickcharts.yml +++ b/external/components/kquickcharts.yml @@ -1,5 +1,5 @@ id: kquickcharts -merge: [elements/include/kf5.inc] +merge: [external/include/kf5.inc] about: KF5 kquickcharts depends: diff --git a/elements/components/krb5.yml b/external/components/krb5.yml similarity index 100% rename from elements/components/krb5.yml rename to external/components/krb5.yml diff --git a/elements/components/kross.yml b/external/components/kross.yml similarity index 88% rename from elements/components/kross.yml rename to external/components/kross.yml index 2f3fcd2b2..9cb9b23b4 100644 --- a/elements/components/kross.yml +++ b/external/components/kross.yml @@ -1,5 +1,5 @@ id: kross -merge: [elements/include/kf5.inc] +merge: [external/include/kf5.inc] about: KF5 kross depends: diff --git a/elements/components/krunner.yml b/external/components/krunner.yml similarity index 85% rename from elements/components/krunner.yml rename to external/components/krunner.yml index 111b08433..b72ef8d23 100644 --- a/elements/components/krunner.yml +++ b/external/components/krunner.yml @@ -1,5 +1,5 @@ id: krunner -merge: [elements/include/kf5.inc] +merge: [external/include/kf5.inc] about: KF5 krunner depends: diff --git a/elements/components/kservice.yml b/external/components/kservice.yml similarity index 87% rename from elements/components/kservice.yml rename to external/components/kservice.yml index 38ccb3912..4485d5d38 100644 --- a/elements/components/kservice.yml +++ b/external/components/kservice.yml @@ -1,5 +1,5 @@ id: kservice -merge: [elements/include/kf5.inc] +merge: [external/include/kf5.inc] about: KF5 kservice depends: diff --git a/elements/components/ktexteditor.yml b/external/components/ktexteditor.yml similarity index 83% rename from elements/components/ktexteditor.yml rename to external/components/ktexteditor.yml index 793fddfea..b84de6f52 100644 --- a/elements/components/ktexteditor.yml +++ b/external/components/ktexteditor.yml @@ -1,5 +1,5 @@ id: ktexteditor -merge: [elements/include/kf5.inc] +merge: [external/include/kf5.inc] about: KF5 ktexteditor depends: diff --git a/elements/components/ktextwidgets.yml b/external/components/ktextwidgets.yml similarity index 85% rename from elements/components/ktextwidgets.yml rename to external/components/ktextwidgets.yml index 434206058..d55956b92 100644 --- a/elements/components/ktextwidgets.yml +++ b/external/components/ktextwidgets.yml @@ -1,5 +1,5 @@ id: ktextwidgets -merge: [elements/include/kf5.inc] +merge: [external/include/kf5.inc] about: KF5 ktextwidgets depends: diff --git a/elements/components/kunitconversion.yml b/external/components/kunitconversion.yml similarity index 82% rename from elements/components/kunitconversion.yml rename to external/components/kunitconversion.yml index 58409446d..90da6b711 100644 --- a/elements/components/kunitconversion.yml +++ b/external/components/kunitconversion.yml @@ -1,5 +1,5 @@ id: kunitconversion -merge: [elements/include/kf5.inc] +merge: [external/include/kf5.inc] about: KF5 kunitconversion depends: diff --git a/elements/components/kuserfeedback.yml b/external/components/kuserfeedback.yml similarity index 100% rename from elements/components/kuserfeedback.yml rename to external/components/kuserfeedback.yml diff --git a/elements/components/kwallet.yml b/external/components/kwallet.yml similarity index 90% rename from elements/components/kwallet.yml rename to external/components/kwallet.yml index 544a15a13..a6fb35762 100644 --- a/elements/components/kwallet.yml +++ b/external/components/kwallet.yml @@ -1,5 +1,5 @@ id: kwallet -merge: [elements/include/kf5.inc] +merge: [external/include/kf5.inc] about: KF5 kwallet depends: diff --git a/elements/components/kwayland.yml b/external/components/kwayland.yml similarity index 85% rename from elements/components/kwayland.yml rename to external/components/kwayland.yml index d70d0cdab..907f1b837 100644 --- a/elements/components/kwayland.yml +++ b/external/components/kwayland.yml @@ -1,5 +1,5 @@ id: kwayland -merge: [elements/include/kf5.inc] +merge: [external/include/kf5.inc] about: KF5 kwayland depends: diff --git a/elements/components/kwidgetsaddons.yml b/external/components/kwidgetsaddons.yml similarity index 79% rename from elements/components/kwidgetsaddons.yml rename to external/components/kwidgetsaddons.yml index e1f452149..5e3be6bcc 100644 --- a/elements/components/kwidgetsaddons.yml +++ b/external/components/kwidgetsaddons.yml @@ -1,5 +1,5 @@ id: kwidgetsaddons -merge: [elements/include/kf5.inc] +merge: [external/include/kf5.inc] about: KF5 kwidgetsaddons depends: diff --git a/elements/components/kwindowsystem.yml b/external/components/kwindowsystem.yml similarity index 83% rename from elements/components/kwindowsystem.yml rename to external/components/kwindowsystem.yml index 59ad749fa..0f500b839 100644 --- a/elements/components/kwindowsystem.yml +++ b/external/components/kwindowsystem.yml @@ -1,5 +1,5 @@ id: kwindowsystem -merge: [elements/include/kf5.inc] +merge: [external/include/kf5.inc] about: Access to windowing system depends: diff --git a/elements/components/kxmlgui.yml b/external/components/kxmlgui.yml similarity index 82% rename from elements/components/kxmlgui.yml rename to external/components/kxmlgui.yml index a86f5c86a..581cda7b1 100644 --- a/elements/components/kxmlgui.yml +++ b/external/components/kxmlgui.yml @@ -1,5 +1,5 @@ id: kxmlgui -merge: [elements/include/kf5.inc] +merge: [external/include/kf5.inc] about: KF5 kxmlgui depends: diff --git a/elements/components/kxmlrpcclient.yml b/external/components/kxmlrpcclient.yml similarity index 87% rename from elements/components/kxmlrpcclient.yml rename to external/components/kxmlrpcclient.yml index 27b9321a9..3e33affe7 100644 --- a/elements/components/kxmlrpcclient.yml +++ b/external/components/kxmlrpcclient.yml @@ -1,5 +1,5 @@ id: kxmlrpcclient -merge: [elements/include/kf5.inc] +merge: [external/include/kf5.inc] about: KF5 kxmlrpcclient depends: - components/kio.yml diff --git a/elements/components/l-smash.yml b/external/components/l-smash.yml similarity index 100% rename from elements/components/l-smash.yml rename to external/components/l-smash.yml diff --git a/elements/components/labwc.yml b/external/components/labwc.yml similarity index 100% rename from elements/components/labwc.yml rename to external/components/labwc.yml diff --git a/elements/components/lame.yml b/external/components/lame.yml similarity index 100% rename from elements/components/lame.yml rename to external/components/lame.yml diff --git a/elements/components/lavalauncher.yml b/external/components/lavalauncher.yml similarity index 100% rename from elements/components/lavalauncher.yml rename to external/components/lavalauncher.yml diff --git a/elements/components/lcms.yml b/external/components/lcms.yml similarity index 100% rename from elements/components/lcms.yml rename to external/components/lcms.yml diff --git a/elements/components/less.yml b/external/components/less.yml similarity index 100% rename from elements/components/less.yml rename to external/components/less.yml diff --git a/elements/components/lftp.yml b/external/components/lftp.yml similarity index 100% rename from elements/components/lftp.yml rename to external/components/lftp.yml diff --git a/elements/components/libadwaita.yml b/external/components/libadwaita.yml similarity index 100% rename from elements/components/libadwaita.yml rename to external/components/libadwaita.yml diff --git a/elements/components/libaio.yml b/external/components/libaio.yml similarity index 100% rename from elements/components/libaio.yml rename to external/components/libaio.yml diff --git a/elements/components/libaom.yml b/external/components/libaom.yml similarity index 100% rename from elements/components/libaom.yml rename to external/components/libaom.yml diff --git a/elements/components/libappimage.yml b/external/components/libappimage.yml similarity index 100% rename from elements/components/libappimage.yml rename to external/components/libappimage.yml diff --git a/elements/components/libarchive.yml b/external/components/libarchive.yml similarity index 100% rename from elements/components/libarchive.yml rename to external/components/libarchive.yml diff --git a/elements/components/libass.yml b/external/components/libass.yml similarity index 100% rename from elements/components/libass.yml rename to external/components/libass.yml diff --git a/elements/components/libassuan.yml b/external/components/libassuan.yml similarity index 100% rename from elements/components/libassuan.yml rename to external/components/libassuan.yml diff --git a/elements/components/libatasmart.yml b/external/components/libatasmart.yml similarity index 100% rename from elements/components/libatasmart.yml rename to external/components/libatasmart.yml diff --git a/elements/components/libatomic_ops.yml b/external/components/libatomic_ops.yml similarity index 100% rename from elements/components/libatomic_ops.yml rename to external/components/libatomic_ops.yml diff --git a/elements/components/libavc1394.yml b/external/components/libavc1394.yml similarity index 100% rename from elements/components/libavc1394.yml rename to external/components/libavc1394.yml diff --git a/elements/components/libavif.yml b/external/components/libavif.yml similarity index 100% rename from elements/components/libavif.yml rename to external/components/libavif.yml diff --git a/elements/components/libblockdev.yml b/external/components/libblockdev.yml similarity index 100% rename from elements/components/libblockdev.yml rename to external/components/libblockdev.yml diff --git a/elements/components/libboost.yml b/external/components/libboost.yml similarity index 100% rename from elements/components/libboost.yml rename to external/components/libboost.yml diff --git a/elements/components/libbsd.yml b/external/components/libbsd.yml similarity index 100% rename from elements/components/libbsd.yml rename to external/components/libbsd.yml diff --git a/elements/components/libburn.yml b/external/components/libburn.yml similarity index 100% rename from elements/components/libburn.yml rename to external/components/libburn.yml diff --git a/elements/components/libbytesize.yml b/external/components/libbytesize.yml similarity index 100% rename from elements/components/libbytesize.yml rename to external/components/libbytesize.yml diff --git a/elements/components/libcacard.yml b/external/components/libcacard.yml similarity index 100% rename from elements/components/libcacard.yml rename to external/components/libcacard.yml diff --git a/elements/components/libcanberra.yml b/external/components/libcanberra.yml similarity index 100% rename from elements/components/libcanberra.yml rename to external/components/libcanberra.yml diff --git a/elements/components/libcap-ng.yml b/external/components/libcap-ng.yml similarity index 100% rename from elements/components/libcap-ng.yml rename to external/components/libcap-ng.yml diff --git a/elements/components/libcap.yml b/external/components/libcap.yml similarity index 100% rename from elements/components/libcap.yml rename to external/components/libcap.yml diff --git a/elements/components/libcdio-paranoia.yml b/external/components/libcdio-paranoia.yml similarity index 100% rename from elements/components/libcdio-paranoia.yml rename to external/components/libcdio-paranoia.yml diff --git a/elements/components/libcdio.yml b/external/components/libcdio.yml similarity index 100% rename from elements/components/libcdio.yml rename to external/components/libcdio.yml diff --git a/elements/components/libchamplain.yml b/external/components/libchamplain.yml similarity index 100% rename from elements/components/libchamplain.yml rename to external/components/libchamplain.yml diff --git a/elements/components/libclc.yml b/external/components/libclc.yml similarity index 100% rename from elements/components/libclc.yml rename to external/components/libclc.yml diff --git a/elements/components/libcloudproviders.yml b/external/components/libcloudproviders.yml similarity index 100% rename from elements/components/libcloudproviders.yml rename to external/components/libcloudproviders.yml diff --git a/elements/components/libconfig.yml b/external/components/libconfig.yml similarity index 100% rename from elements/components/libconfig.yml rename to external/components/libconfig.yml diff --git a/elements/components/libconfuse.yml b/external/components/libconfuse.yml similarity index 100% rename from elements/components/libconfuse.yml rename to external/components/libconfuse.yml diff --git a/elements/components/libdaemon.yml b/external/components/libdaemon.yml similarity index 100% rename from elements/components/libdaemon.yml rename to external/components/libdaemon.yml diff --git a/elements/components/libdatrie.yml b/external/components/libdatrie.yml similarity index 100% rename from elements/components/libdatrie.yml rename to external/components/libdatrie.yml diff --git a/elements/components/libdazzle.yml b/external/components/libdazzle.yml similarity index 100% rename from elements/components/libdazzle.yml rename to external/components/libdazzle.yml diff --git a/elements/components/libdbusmenu-qt.yml b/external/components/libdbusmenu-qt.yml similarity index 100% rename from elements/components/libdbusmenu-qt.yml rename to external/components/libdbusmenu-qt.yml diff --git a/elements/components/libdisplay-info.yml b/external/components/libdisplay-info.yml similarity index 100% rename from elements/components/libdisplay-info.yml rename to external/components/libdisplay-info.yml diff --git a/elements/components/libdmapsharing.yml b/external/components/libdmapsharing.yml similarity index 100% rename from elements/components/libdmapsharing.yml rename to external/components/libdmapsharing.yml diff --git a/elements/components/libdrm.yml b/external/components/libdrm.yml similarity index 100% rename from elements/components/libdrm.yml rename to external/components/libdrm.yml diff --git a/elements/components/libdvdread.yml b/external/components/libdvdread.yml similarity index 100% rename from elements/components/libdvdread.yml rename to external/components/libdvdread.yml diff --git a/elements/components/libelf.yml b/external/components/libelf.yml similarity index 100% rename from elements/components/libelf.yml rename to external/components/libelf.yml diff --git a/elements/components/libepoxy.yml b/external/components/libepoxy.yml similarity index 100% rename from elements/components/libepoxy.yml rename to external/components/libepoxy.yml diff --git a/elements/components/libev.yml b/external/components/libev.yml similarity index 100% rename from elements/components/libev.yml rename to external/components/libev.yml diff --git a/elements/components/libevdev.yml b/external/components/libevdev.yml similarity index 100% rename from elements/components/libevdev.yml rename to external/components/libevdev.yml diff --git a/elements/components/libevent.yml b/external/components/libevent.yml similarity index 100% rename from elements/components/libevent.yml rename to external/components/libevent.yml diff --git a/elements/components/libexif.yml b/external/components/libexif.yml similarity index 100% rename from elements/components/libexif.yml rename to external/components/libexif.yml diff --git a/elements/components/libexplain.yml b/external/components/libexplain.yml similarity index 100% rename from elements/components/libexplain.yml rename to external/components/libexplain.yml diff --git a/elements/components/libffi.yml b/external/components/libffi.yml similarity index 100% rename from elements/components/libffi.yml rename to external/components/libffi.yml diff --git a/elements/components/libfprint.yml b/external/components/libfprint.yml similarity index 100% rename from elements/components/libfprint.yml rename to external/components/libfprint.yml diff --git a/elements/components/libgcc.yml b/external/components/libgcc.yml similarity index 96% rename from elements/components/libgcc.yml rename to external/components/libgcc.yml index 2ec532e37..f338b54b4 100644 --- a/elements/components/libgcc.yml +++ b/external/components/libgcc.yml @@ -1,5 +1,5 @@ id: libgcc -merge: [elements/include/gcc.inc] +merge: [external/include/gcc.inc] about: gcc runtime libraries include: diff --git a/elements/components/libgcrypt.yml b/external/components/libgcrypt.yml similarity index 100% rename from elements/components/libgcrypt.yml rename to external/components/libgcrypt.yml diff --git a/elements/components/libgdata.yml b/external/components/libgdata.yml similarity index 100% rename from elements/components/libgdata.yml rename to external/components/libgdata.yml diff --git a/elements/components/libgdiplus.yml b/external/components/libgdiplus.yml similarity index 100% rename from elements/components/libgdiplus.yml rename to external/components/libgdiplus.yml diff --git a/elements/components/libgee.yml b/external/components/libgee.yml similarity index 100% rename from elements/components/libgee.yml rename to external/components/libgee.yml diff --git a/elements/components/libgepub.yml b/external/components/libgepub.yml similarity index 100% rename from elements/components/libgepub.yml rename to external/components/libgepub.yml diff --git a/elements/components/libgit2.yml b/external/components/libgit2.yml similarity index 100% rename from elements/components/libgit2.yml rename to external/components/libgit2.yml diff --git a/elements/components/libglvnd.yml b/external/components/libglvnd.yml similarity index 100% rename from elements/components/libglvnd.yml rename to external/components/libglvnd.yml diff --git a/elements/components/libgmp.yml b/external/components/libgmp.yml similarity index 100% rename from elements/components/libgmp.yml rename to external/components/libgmp.yml diff --git a/elements/components/libgnomekbd.yml b/external/components/libgnomekbd.yml similarity index 100% rename from elements/components/libgnomekbd.yml rename to external/components/libgnomekbd.yml diff --git a/elements/components/libgpg-error.yml b/external/components/libgpg-error.yml similarity index 100% rename from elements/components/libgpg-error.yml rename to external/components/libgpg-error.yml diff --git a/elements/components/libgrss.yml b/external/components/libgrss.yml similarity index 100% rename from elements/components/libgrss.yml rename to external/components/libgrss.yml diff --git a/elements/components/libgsf.yml b/external/components/libgsf.yml similarity index 100% rename from elements/components/libgsf.yml rename to external/components/libgsf.yml diff --git a/elements/components/libgssglue.yml b/external/components/libgssglue.yml similarity index 100% rename from elements/components/libgssglue.yml rename to external/components/libgssglue.yml diff --git a/elements/components/libgtop.yml b/external/components/libgtop.yml similarity index 100% rename from elements/components/libgtop.yml rename to external/components/libgtop.yml diff --git a/elements/components/libgudev.yml b/external/components/libgudev.yml similarity index 100% rename from elements/components/libgudev.yml rename to external/components/libgudev.yml diff --git a/elements/components/libgusb.yml b/external/components/libgusb.yml similarity index 100% rename from elements/components/libgusb.yml rename to external/components/libgusb.yml diff --git a/elements/components/libgweather.yml b/external/components/libgweather.yml similarity index 100% rename from elements/components/libgweather.yml rename to external/components/libgweather.yml diff --git a/elements/components/libgxps.yml b/external/components/libgxps.yml similarity index 100% rename from elements/components/libgxps.yml rename to external/components/libgxps.yml diff --git a/elements/components/libhandy.yml b/external/components/libhandy.yml similarity index 100% rename from elements/components/libhandy.yml rename to external/components/libhandy.yml diff --git a/elements/components/libical.yml b/external/components/libical.yml similarity index 100% rename from elements/components/libical.yml rename to external/components/libical.yml diff --git a/elements/components/libidn2.yml b/external/components/libidn2.yml similarity index 100% rename from elements/components/libidn2.yml rename to external/components/libidn2.yml diff --git a/elements/components/libiec61883.yml b/external/components/libiec61883.yml similarity index 100% rename from elements/components/libiec61883.yml rename to external/components/libiec61883.yml diff --git a/elements/components/libinput.yml b/external/components/libinput.yml similarity index 100% rename from elements/components/libinput.yml rename to external/components/libinput.yml diff --git a/elements/components/libinstpatch.yml b/external/components/libinstpatch.yml similarity index 100% rename from elements/components/libinstpatch.yml rename to external/components/libinstpatch.yml diff --git a/elements/components/libisoburn.yml b/external/components/libisoburn.yml similarity index 100% rename from elements/components/libisoburn.yml rename to external/components/libisoburn.yml diff --git a/elements/components/libisofs.yml b/external/components/libisofs.yml similarity index 100% rename from elements/components/libisofs.yml rename to external/components/libisofs.yml diff --git a/elements/components/libjit.yml b/external/components/libjit.yml similarity index 100% rename from elements/components/libjit.yml rename to external/components/libjit.yml diff --git a/elements/components/libjpeg-turbo.yml b/external/components/libjpeg-turbo.yml similarity index 100% rename from elements/components/libjpeg-turbo.yml rename to external/components/libjpeg-turbo.yml diff --git a/elements/components/libkcddb.yml b/external/components/libkcddb.yml similarity index 100% rename from elements/components/libkcddb.yml rename to external/components/libkcddb.yml diff --git a/elements/components/libkdcraw.yml b/external/components/libkdcraw.yml similarity index 100% rename from elements/components/libkdcraw.yml rename to external/components/libkdcraw.yml diff --git a/elements/components/libkexiv2.yml b/external/components/libkexiv2.yml similarity index 100% rename from elements/components/libkexiv2.yml rename to external/components/libkexiv2.yml diff --git a/elements/components/libksba.yml b/external/components/libksba.yml similarity index 100% rename from elements/components/libksba.yml rename to external/components/libksba.yml diff --git a/elements/components/libldap.yml b/external/components/libldap.yml similarity index 100% rename from elements/components/libldap.yml rename to external/components/libldap.yml diff --git a/elements/components/libllvm.yml b/external/components/libllvm.yml similarity index 100% rename from elements/components/libllvm.yml rename to external/components/libllvm.yml diff --git a/elements/components/libmd.yml b/external/components/libmd.yml similarity index 100% rename from elements/components/libmd.yml rename to external/components/libmd.yml diff --git a/elements/components/libmediaart.yml b/external/components/libmediaart.yml similarity index 100% rename from elements/components/libmediaart.yml rename to external/components/libmediaart.yml diff --git a/elements/components/libmng.yml b/external/components/libmng.yml similarity index 100% rename from elements/components/libmng.yml rename to external/components/libmng.yml diff --git a/elements/components/libmnl.yml b/external/components/libmnl.yml similarity index 100% rename from elements/components/libmnl.yml rename to external/components/libmnl.yml diff --git a/elements/components/libmpc.yml b/external/components/libmpc.yml similarity index 100% rename from elements/components/libmpc.yml rename to external/components/libmpc.yml diff --git a/elements/components/libmpd.yml b/external/components/libmpd.yml similarity index 100% rename from elements/components/libmpd.yml rename to external/components/libmpd.yml diff --git a/elements/components/libmpfr.yml b/external/components/libmpfr.yml similarity index 100% rename from elements/components/libmpfr.yml rename to external/components/libmpfr.yml diff --git a/elements/components/libmtp.yml b/external/components/libmtp.yml similarity index 100% rename from elements/components/libmtp.yml rename to external/components/libmtp.yml diff --git a/elements/components/libmypaint.yml b/external/components/libmypaint.yml similarity index 100% rename from elements/components/libmypaint.yml rename to external/components/libmypaint.yml diff --git a/elements/components/libndp.yml b/external/components/libndp.yml similarity index 100% rename from elements/components/libndp.yml rename to external/components/libndp.yml diff --git a/elements/components/libnetfilter_conntrack.yml b/external/components/libnetfilter_conntrack.yml similarity index 100% rename from elements/components/libnetfilter_conntrack.yml rename to external/components/libnetfilter_conntrack.yml diff --git a/elements/components/libnfnetlink.yml b/external/components/libnfnetlink.yml similarity index 100% rename from elements/components/libnfnetlink.yml rename to external/components/libnfnetlink.yml diff --git a/elements/components/libnih.yml b/external/components/libnih.yml similarity index 100% rename from elements/components/libnih.yml rename to external/components/libnih.yml diff --git a/elements/components/libnl.yml b/external/components/libnl.yml similarity index 100% rename from elements/components/libnl.yml rename to external/components/libnl.yml diff --git a/elements/components/libnma.yml b/external/components/libnma.yml similarity index 100% rename from elements/components/libnma.yml rename to external/components/libnma.yml diff --git a/elements/components/libnotify.yml b/external/components/libnotify.yml similarity index 100% rename from elements/components/libnotify.yml rename to external/components/libnotify.yml diff --git a/elements/components/libnvme.yml b/external/components/libnvme.yml similarity index 100% rename from elements/components/libnvme.yml rename to external/components/libnvme.yml diff --git a/elements/components/libogg.yml b/external/components/libogg.yml similarity index 100% rename from elements/components/libogg.yml rename to external/components/libogg.yml diff --git a/elements/components/libosinfo.yml b/external/components/libosinfo.yml similarity index 100% rename from elements/components/libosinfo.yml rename to external/components/libosinfo.yml diff --git a/elements/components/libpeas.yml b/external/components/libpeas.yml similarity index 100% rename from elements/components/libpeas.yml rename to external/components/libpeas.yml diff --git a/elements/components/libpipeline.yml b/external/components/libpipeline.yml similarity index 100% rename from elements/components/libpipeline.yml rename to external/components/libpipeline.yml diff --git a/elements/components/libpng.yml b/external/components/libpng.yml similarity index 100% rename from elements/components/libpng.yml rename to external/components/libpng.yml diff --git a/elements/components/libportal.yml b/external/components/libportal.yml similarity index 100% rename from elements/components/libportal.yml rename to external/components/libportal.yml diff --git a/elements/components/libpsl.yml b/external/components/libpsl.yml similarity index 100% rename from elements/components/libpsl.yml rename to external/components/libpsl.yml diff --git a/elements/components/libpwquality.yml b/external/components/libpwquality.yml similarity index 100% rename from elements/components/libpwquality.yml rename to external/components/libpwquality.yml diff --git a/elements/components/libqalculate.yml b/external/components/libqalculate.yml similarity index 100% rename from elements/components/libqalculate.yml rename to external/components/libqalculate.yml diff --git a/elements/components/libraw.yml b/external/components/libraw.yml similarity index 100% rename from elements/components/libraw.yml rename to external/components/libraw.yml diff --git a/elements/components/libraw1394.yml b/external/components/libraw1394.yml similarity index 100% rename from elements/components/libraw1394.yml rename to external/components/libraw1394.yml diff --git a/elements/components/libreoffice.yml b/external/components/libreoffice.yml similarity index 100% rename from elements/components/libreoffice.yml rename to external/components/libreoffice.yml diff --git a/elements/components/librsvg.yml b/external/components/librsvg.yml similarity index 100% rename from elements/components/librsvg.yml rename to external/components/librsvg.yml diff --git a/elements/components/libsamplerate.yml b/external/components/libsamplerate.yml similarity index 100% rename from elements/components/libsamplerate.yml rename to external/components/libsamplerate.yml diff --git a/elements/components/libsass.yml b/external/components/libsass.yml similarity index 100% rename from elements/components/libsass.yml rename to external/components/libsass.yml diff --git a/elements/components/libseccomp.yml b/external/components/libseccomp.yml similarity index 100% rename from elements/components/libseccomp.yml rename to external/components/libseccomp.yml diff --git a/elements/components/libsecret.yml b/external/components/libsecret.yml similarity index 100% rename from elements/components/libsecret.yml rename to external/components/libsecret.yml diff --git a/elements/components/libsigc++.yml b/external/components/libsigc++.yml similarity index 100% rename from elements/components/libsigc++.yml rename to external/components/libsigc++.yml diff --git a/elements/components/libsigc++2.12.yml b/external/components/libsigc++2.12.yml similarity index 100% rename from elements/components/libsigc++2.12.yml rename to external/components/libsigc++2.12.yml diff --git a/elements/components/libslirp.yml b/external/components/libslirp.yml similarity index 100% rename from elements/components/libslirp.yml rename to external/components/libslirp.yml diff --git a/elements/components/libsmbios.yml b/external/components/libsmbios.yml similarity index 100% rename from elements/components/libsmbios.yml rename to external/components/libsmbios.yml diff --git a/elements/components/libsndfile.yml b/external/components/libsndfile.yml similarity index 100% rename from elements/components/libsndfile.yml rename to external/components/libsndfile.yml diff --git a/elements/components/libsodium.yml b/external/components/libsodium.yml similarity index 100% rename from elements/components/libsodium.yml rename to external/components/libsodium.yml diff --git a/elements/components/libsoup.yml b/external/components/libsoup.yml similarity index 100% rename from elements/components/libsoup.yml rename to external/components/libsoup.yml diff --git a/elements/components/libsoup3.yml b/external/components/libsoup3.yml similarity index 100% rename from elements/components/libsoup3.yml rename to external/components/libsoup3.yml diff --git a/elements/components/libspectre.yml b/external/components/libspectre.yml similarity index 100% rename from elements/components/libspectre.yml rename to external/components/libspectre.yml diff --git a/elements/components/libsquash.yml b/external/components/libsquash.yml similarity index 100% rename from elements/components/libsquash.yml rename to external/components/libsquash.yml diff --git a/elements/components/libssh.yml b/external/components/libssh.yml similarity index 100% rename from elements/components/libssh.yml rename to external/components/libssh.yml diff --git a/elements/components/libtasn1.yml b/external/components/libtasn1.yml similarity index 100% rename from elements/components/libtasn1.yml rename to external/components/libtasn1.yml diff --git a/elements/components/libthai.yml b/external/components/libthai.yml similarity index 100% rename from elements/components/libthai.yml rename to external/components/libthai.yml diff --git a/elements/components/libtheora.yml b/external/components/libtheora.yml similarity index 100% rename from elements/components/libtheora.yml rename to external/components/libtheora.yml diff --git a/elements/components/libtiff.yml b/external/components/libtiff.yml similarity index 100% rename from elements/components/libtiff.yml rename to external/components/libtiff.yml diff --git a/elements/components/libtirpc.yml b/external/components/libtirpc.yml similarity index 100% rename from elements/components/libtirpc.yml rename to external/components/libtirpc.yml diff --git a/elements/components/libtool.yml b/external/components/libtool.yml similarity index 100% rename from elements/components/libtool.yml rename to external/components/libtool.yml diff --git a/elements/components/libtorrent-rasterbar.yml b/external/components/libtorrent-rasterbar.yml similarity index 100% rename from elements/components/libtorrent-rasterbar.yml rename to external/components/libtorrent-rasterbar.yml diff --git a/elements/components/libunistring.yml b/external/components/libunistring.yml similarity index 100% rename from elements/components/libunistring.yml rename to external/components/libunistring.yml diff --git a/elements/components/libunwind.yml b/external/components/libunwind.yml similarity index 100% rename from elements/components/libunwind.yml rename to external/components/libunwind.yml diff --git a/elements/components/libusb.yml b/external/components/libusb.yml similarity index 100% rename from elements/components/libusb.yml rename to external/components/libusb.yml diff --git a/elements/components/libutf8proc.yml b/external/components/libutf8proc.yml similarity index 100% rename from elements/components/libutf8proc.yml rename to external/components/libutf8proc.yml diff --git a/elements/components/libuv.yml b/external/components/libuv.yml similarity index 100% rename from elements/components/libuv.yml rename to external/components/libuv.yml diff --git a/elements/components/libva-nomesa.yml b/external/components/libva-nomesa.yml similarity index 100% rename from elements/components/libva-nomesa.yml rename to external/components/libva-nomesa.yml diff --git a/elements/components/libva-utils.yml b/external/components/libva-utils.yml similarity index 100% rename from elements/components/libva-utils.yml rename to external/components/libva-utils.yml diff --git a/elements/components/libva.yml b/external/components/libva.yml similarity index 100% rename from elements/components/libva.yml rename to external/components/libva.yml diff --git a/elements/components/libvdpau.yml b/external/components/libvdpau.yml similarity index 100% rename from elements/components/libvdpau.yml rename to external/components/libvdpau.yml diff --git a/elements/components/libvirt-glib.yml b/external/components/libvirt-glib.yml similarity index 100% rename from elements/components/libvirt-glib.yml rename to external/components/libvirt-glib.yml diff --git a/elements/components/libvirt.yml b/external/components/libvirt.yml similarity index 100% rename from elements/components/libvirt.yml rename to external/components/libvirt.yml diff --git a/elements/components/libvncserver.yml b/external/components/libvncserver.yml similarity index 100% rename from elements/components/libvncserver.yml rename to external/components/libvncserver.yml diff --git a/elements/components/libvorbis.yml b/external/components/libvorbis.yml similarity index 100% rename from elements/components/libvorbis.yml rename to external/components/libvorbis.yml diff --git a/elements/components/libvpx.yml b/external/components/libvpx.yml similarity index 100% rename from elements/components/libvpx.yml rename to external/components/libvpx.yml diff --git a/elements/components/libwacom.yml b/external/components/libwacom.yml similarity index 100% rename from elements/components/libwacom.yml rename to external/components/libwacom.yml diff --git a/elements/components/libwebp.yml b/external/components/libwebp.yml similarity index 100% rename from elements/components/libwebp.yml rename to external/components/libwebp.yml diff --git a/elements/components/libwnck.yml b/external/components/libwnck.yml similarity index 100% rename from elements/components/libwnck.yml rename to external/components/libwnck.yml diff --git a/elements/components/libwpe.yml b/external/components/libwpe.yml similarity index 100% rename from elements/components/libwpe.yml rename to external/components/libwpe.yml diff --git a/elements/components/libxcrypt.yml b/external/components/libxcrypt.yml similarity index 100% rename from elements/components/libxcrypt.yml rename to external/components/libxcrypt.yml diff --git a/elements/components/libxdg-basedir.yml b/external/components/libxdg-basedir.yml similarity index 100% rename from elements/components/libxdg-basedir.yml rename to external/components/libxdg-basedir.yml diff --git a/elements/components/libxml2.yml b/external/components/libxml2.yml similarity index 100% rename from elements/components/libxml2.yml rename to external/components/libxml2.yml diff --git a/elements/components/libxmlb.yml b/external/components/libxmlb.yml similarity index 100% rename from elements/components/libxmlb.yml rename to external/components/libxmlb.yml diff --git a/elements/components/libxslt.yml b/external/components/libxslt.yml similarity index 100% rename from elements/components/libxslt.yml rename to external/components/libxslt.yml diff --git a/elements/components/libyaml-cpp.yml b/external/components/libyaml-cpp.yml similarity index 100% rename from elements/components/libyaml-cpp.yml rename to external/components/libyaml-cpp.yml diff --git a/elements/components/libyaml.yml b/external/components/libyaml.yml similarity index 100% rename from elements/components/libyaml.yml rename to external/components/libyaml.yml diff --git a/elements/components/lightdm-gtk-greeter-settings.yml b/external/components/lightdm-gtk-greeter-settings.yml similarity index 100% rename from elements/components/lightdm-gtk-greeter-settings.yml rename to external/components/lightdm-gtk-greeter-settings.yml diff --git a/elements/components/lightdm.yml b/external/components/lightdm.yml similarity index 100% rename from elements/components/lightdm.yml rename to external/components/lightdm.yml diff --git a/elements/components/lld.yml b/external/components/lld.yml similarity index 100% rename from elements/components/lld.yml rename to external/components/lld.yml diff --git a/elements/components/llvm.yml b/external/components/llvm.yml similarity index 100% rename from elements/components/llvm.yml rename to external/components/llvm.yml diff --git a/elements/components/lm-sensors.yml b/external/components/lm-sensors.yml similarity index 100% rename from elements/components/lm-sensors.yml rename to external/components/lm-sensors.yml diff --git a/elements/components/lmdb.yml b/external/components/lmdb.yml similarity index 100% rename from elements/components/lmdb.yml rename to external/components/lmdb.yml diff --git a/elements/components/locales.yml b/external/components/locales.yml similarity index 100% rename from elements/components/locales.yml rename to external/components/locales.yml diff --git a/elements/components/lsb-release.yml b/external/components/lsb-release.yml similarity index 100% rename from elements/components/lsb-release.yml rename to external/components/lsb-release.yml diff --git a/elements/components/lsof.yml b/external/components/lsof.yml similarity index 100% rename from elements/components/lsof.yml rename to external/components/lsof.yml diff --git a/elements/components/lua.yml b/external/components/lua.yml similarity index 100% rename from elements/components/lua.yml rename to external/components/lua.yml diff --git a/elements/components/lua/lgi.yml b/external/components/lua/lgi.yml similarity index 100% rename from elements/components/lua/lgi.yml rename to external/components/lua/lgi.yml diff --git a/elements/components/lua/lgi53.yml b/external/components/lua/lgi53.yml similarity index 100% rename from elements/components/lua/lgi53.yml rename to external/components/lua/lgi53.yml diff --git a/elements/components/lua52.yml b/external/components/lua52.yml similarity index 100% rename from elements/components/lua52.yml rename to external/components/lua52.yml diff --git a/elements/components/lua53.yml b/external/components/lua53.yml similarity index 100% rename from elements/components/lua53.yml rename to external/components/lua53.yml diff --git a/elements/components/lvm2.yml b/external/components/lvm2.yml similarity index 100% rename from elements/components/lvm2.yml rename to external/components/lvm2.yml diff --git a/elements/components/lxappearance.yml b/external/components/lxappearance.yml similarity index 100% rename from elements/components/lxappearance.yml rename to external/components/lxappearance.yml diff --git a/elements/components/lxc.yml b/external/components/lxc.yml similarity index 100% rename from elements/components/lxc.yml rename to external/components/lxc.yml diff --git a/elements/components/lxcfs.yml b/external/components/lxcfs.yml similarity index 100% rename from elements/components/lxcfs.yml rename to external/components/lxcfs.yml diff --git a/elements/components/lxd.yml b/external/components/lxd.yml similarity index 100% rename from elements/components/lxd.yml rename to external/components/lxd.yml diff --git a/elements/components/lynis.yml b/external/components/lynis.yml similarity index 100% rename from elements/components/lynis.yml rename to external/components/lynis.yml diff --git a/elements/components/lynx.yml b/external/components/lynx.yml similarity index 100% rename from elements/components/lynx.yml rename to external/components/lynx.yml diff --git a/elements/components/lz4.yml b/external/components/lz4.yml similarity index 100% rename from elements/components/lz4.yml rename to external/components/lz4.yml diff --git a/elements/components/lzip.yml b/external/components/lzip.yml similarity index 100% rename from elements/components/lzip.yml rename to external/components/lzip.yml diff --git a/elements/components/lzo.yml b/external/components/lzo.yml similarity index 100% rename from elements/components/lzo.yml rename to external/components/lzo.yml diff --git a/elements/components/m4.yml b/external/components/m4.yml similarity index 100% rename from elements/components/m4.yml rename to external/components/m4.yml diff --git a/elements/components/mailcap.yml b/external/components/mailcap.yml similarity index 100% rename from elements/components/mailcap.yml rename to external/components/mailcap.yml diff --git a/elements/components/make.yml b/external/components/make.yml similarity index 100% rename from elements/components/make.yml rename to external/components/make.yml diff --git a/elements/components/mako.yml b/external/components/mako.yml similarity index 100% rename from elements/components/mako.yml rename to external/components/mako.yml diff --git a/elements/components/man-db.yml b/external/components/man-db.yml similarity index 100% rename from elements/components/man-db.yml rename to external/components/man-db.yml diff --git a/elements/components/man-pages.yml b/external/components/man-pages.yml similarity index 100% rename from elements/components/man-pages.yml rename to external/components/man-pages.yml diff --git a/elements/components/mandoc.yml b/external/components/mandoc.yml similarity index 100% rename from elements/components/mandoc.yml rename to external/components/mandoc.yml diff --git a/elements/components/mariadb-runtime.yml b/external/components/mariadb-runtime.yml similarity index 100% rename from elements/components/mariadb-runtime.yml rename to external/components/mariadb-runtime.yml diff --git a/elements/components/mariadb.yml b/external/components/mariadb.yml similarity index 100% rename from elements/components/mariadb.yml rename to external/components/mariadb.yml diff --git a/elements/components/mercurial.yml b/external/components/mercurial.yml similarity index 100% rename from elements/components/mercurial.yml rename to external/components/mercurial.yml diff --git a/elements/components/mesa.yml b/external/components/mesa.yml similarity index 100% rename from elements/components/mesa.yml rename to external/components/mesa.yml diff --git a/elements/components/meson.yml b/external/components/meson.yml similarity index 100% rename from elements/components/meson.yml rename to external/components/meson.yml diff --git a/elements/components/meta-enlightenment.yml b/external/components/meta-enlightenment.yml similarity index 82% rename from elements/components/meta-enlightenment.yml rename to external/components/meta-enlightenment.yml index b26132a57..2b0ed7032 100644 --- a/elements/components/meta-enlightenment.yml +++ b/external/components/meta-enlightenment.yml @@ -6,4 +6,4 @@ depends: - components/enlightenment/enlightenment.yml - components/enlightenment/terminology.yml -merge: [elements/include/meta.inc] +merge: [external/include/meta.inc] diff --git a/elements/components/meta-gnome.yml b/external/components/meta-gnome.yml similarity index 96% rename from elements/components/meta-gnome.yml rename to external/components/meta-gnome.yml index 18442a195..00ac646d2 100644 --- a/elements/components/meta-gnome.yml +++ b/external/components/meta-gnome.yml @@ -1,7 +1,7 @@ id: meta-gnome version: 44 about: Gnome Desktop Environment -merge: [elements/include/meta.inc] +merge: [external/include/meta.inc] depends: # Core Gnome Components - components/gnome/gdm.yml diff --git a/elements/components/meta-kf5.yml b/external/components/meta-kf5.yml similarity index 100% rename from elements/components/meta-kf5.yml rename to external/components/meta-kf5.yml diff --git a/elements/components/meta-plasma.yml b/external/components/meta-plasma.yml similarity index 97% rename from elements/components/meta-plasma.yml rename to external/components/meta-plasma.yml index e8b7615de..231594d6c 100644 --- a/elements/components/meta-plasma.yml +++ b/external/components/meta-plasma.yml @@ -1,5 +1,5 @@ id: plasma -merge: [elements/include/plasma.inc] +merge: [external/include/plasma.inc] about: Plasma desktop depends: diff --git a/elements/components/meta-x11.yml b/external/components/meta-x11.yml similarity index 98% rename from elements/components/meta-x11.yml rename to external/components/meta-x11.yml index 4f80c4802..9136710a3 100644 --- a/elements/components/meta-x11.yml +++ b/external/components/meta-x11.yml @@ -1,7 +1,7 @@ id: meta-x11 version: 7 about: X11 package group -merge: [elements/include/meta.inc] +merge: [external/include/meta.inc] depends: - components/x11/setxkbmap.yml - components/x11/xtrans.yml diff --git a/elements/components/meta-xfce4.yml b/external/components/meta-xfce4.yml similarity index 98% rename from elements/components/meta-xfce4.yml rename to external/components/meta-xfce4.yml index a215efcd4..950c82e64 100644 --- a/elements/components/meta-xfce4.yml +++ b/external/components/meta-xfce4.yml @@ -67,4 +67,4 @@ depends: - components/lightdm.yml -merge: [ elements/include/meta.inc] +merge: [ external/include/meta.inc] diff --git a/elements/components/metacity.yml b/external/components/metacity.yml similarity index 100% rename from elements/components/metacity.yml rename to external/components/metacity.yml diff --git a/elements/components/miniupnpc.yml b/external/components/miniupnpc.yml similarity index 100% rename from elements/components/miniupnpc.yml rename to external/components/miniupnpc.yml diff --git a/elements/components/mkinitramfs.yml b/external/components/mkinitramfs.yml similarity index 100% rename from elements/components/mkinitramfs.yml rename to external/components/mkinitramfs.yml diff --git a/elements/components/mod_wsgi.yml b/external/components/mod_wsgi.yml similarity index 100% rename from elements/components/mod_wsgi.yml rename to external/components/mod_wsgi.yml diff --git a/elements/components/modemmanager.yml b/external/components/modemmanager.yml similarity index 100% rename from elements/components/modemmanager.yml rename to external/components/modemmanager.yml diff --git a/elements/components/mono.yml b/external/components/mono.yml similarity index 100% rename from elements/components/mono.yml rename to external/components/mono.yml diff --git a/elements/components/mpg123.yml b/external/components/mpg123.yml similarity index 100% rename from elements/components/mpg123.yml rename to external/components/mpg123.yml diff --git a/elements/components/mtdev.yml b/external/components/mtdev.yml similarity index 100% rename from elements/components/mtdev.yml rename to external/components/mtdev.yml diff --git a/elements/components/mtools.yml b/external/components/mtools.yml similarity index 100% rename from elements/components/mtools.yml rename to external/components/mtools.yml diff --git a/elements/components/mutter.yml b/external/components/mutter.yml similarity index 100% rename from elements/components/mutter.yml rename to external/components/mutter.yml diff --git a/elements/components/mypaint-brushes.yml b/external/components/mypaint-brushes.yml similarity index 100% rename from elements/components/mypaint-brushes.yml rename to external/components/mypaint-brushes.yml diff --git a/elements/components/nano.yml b/external/components/nano.yml similarity index 100% rename from elements/components/nano.yml rename to external/components/nano.yml diff --git a/elements/components/nasm.yml b/external/components/nasm.yml similarity index 100% rename from elements/components/nasm.yml rename to external/components/nasm.yml diff --git a/elements/components/ncompress.yml b/external/components/ncompress.yml similarity index 100% rename from elements/components/ncompress.yml rename to external/components/ncompress.yml diff --git a/elements/components/ncurses.yml b/external/components/ncurses.yml similarity index 100% rename from elements/components/ncurses.yml rename to external/components/ncurses.yml diff --git a/elements/components/neofetch.yml b/external/components/neofetch.yml similarity index 100% rename from elements/components/neofetch.yml rename to external/components/neofetch.yml diff --git a/elements/components/nettle.yml b/external/components/nettle.yml similarity index 100% rename from elements/components/nettle.yml rename to external/components/nettle.yml diff --git a/elements/components/network-manager-applet.yml b/external/components/network-manager-applet.yml similarity index 100% rename from elements/components/network-manager-applet.yml rename to external/components/network-manager-applet.yml diff --git a/elements/components/networkmanager-openvpn.yml b/external/components/networkmanager-openvpn.yml similarity index 100% rename from elements/components/networkmanager-openvpn.yml rename to external/components/networkmanager-openvpn.yml diff --git a/elements/components/networkmanager-qt.yml b/external/components/networkmanager-qt.yml similarity index 83% rename from elements/components/networkmanager-qt.yml rename to external/components/networkmanager-qt.yml index 996331893..b3a399f26 100644 --- a/elements/components/networkmanager-qt.yml +++ b/external/components/networkmanager-qt.yml @@ -1,5 +1,5 @@ id: networkmanager-qt -merge: [elements/include/kf5.inc] +merge: [external/include/kf5.inc] about: KF5 networkmanager-qt depends: diff --git a/elements/components/networkmanager.yml b/external/components/networkmanager.yml similarity index 100% rename from elements/components/networkmanager.yml rename to external/components/networkmanager.yml diff --git a/elements/components/newt.yml b/external/components/newt.yml similarity index 100% rename from elements/components/newt.yml rename to external/components/newt.yml diff --git a/elements/components/nghttp2.yml b/external/components/nghttp2.yml similarity index 100% rename from elements/components/nghttp2.yml rename to external/components/nghttp2.yml diff --git a/elements/components/nginx.yml b/external/components/nginx.yml similarity index 100% rename from elements/components/nginx.yml rename to external/components/nginx.yml diff --git a/elements/components/ninja.yml b/external/components/ninja.yml similarity index 100% rename from elements/components/ninja.yml rename to external/components/ninja.yml diff --git a/elements/components/nodejs.yml b/external/components/nodejs.yml similarity index 100% rename from elements/components/nodejs.yml rename to external/components/nodejs.yml diff --git a/elements/components/npth.yml b/external/components/npth.yml similarity index 100% rename from elements/components/npth.yml rename to external/components/npth.yml diff --git a/elements/components/nspr.yml b/external/components/nspr.yml similarity index 100% rename from elements/components/nspr.yml rename to external/components/nspr.yml diff --git a/elements/components/nss.yml b/external/components/nss.yml similarity index 100% rename from elements/components/nss.yml rename to external/components/nss.yml diff --git a/elements/components/ntfs-3g.yml b/external/components/ntfs-3g.yml similarity index 100% rename from elements/components/ntfs-3g.yml rename to external/components/ntfs-3g.yml diff --git a/elements/components/numactl.yml b/external/components/numactl.yml similarity index 100% rename from elements/components/numactl.yml rename to external/components/numactl.yml diff --git a/elements/components/nvidia-settings.yml b/external/components/nvidia-settings.yml similarity index 97% rename from elements/components/nvidia-settings.yml rename to external/components/nvidia-settings.yml index c9975efb3..2429c5dad 100644 --- a/elements/components/nvidia-settings.yml +++ b/external/components/nvidia-settings.yml @@ -1,5 +1,5 @@ id: nvidia-settings -merge: [elements/include/nvidia.inc] +merge: [external/include/nvidia.inc] about: Tool for configuring the NVIDIA graphics driver depends: diff --git a/elements/components/nvidia.yml b/external/components/nvidia.yml similarity index 98% rename from elements/components/nvidia.yml rename to external/components/nvidia.yml index b211af14b..53c2a19e2 100644 --- a/elements/components/nvidia.yml +++ b/external/components/nvidia.yml @@ -1,5 +1,5 @@ id: nvidia -merge: [elements/include/nvidia.inc] +merge: [external/include/nvidia.inc] about: NVIDIA drivers and utilities strip: false depends: @@ -17,8 +17,8 @@ build-dir: "." sources: - https://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}.run - - files/sign-keys/modules/linux-module-cert.crt - - files/sign-keys/linux-module-cert.key + - assets/sign-keys/modules/linux-module-cert.crt + - assets/sign-keys/linux-module-cert.key script: |- sh NVIDIA-Linux-x86_64-%{version}.run -x diff --git a/elements/components/odbc.yml b/external/components/odbc.yml similarity index 100% rename from elements/components/odbc.yml rename to external/components/odbc.yml diff --git a/elements/components/ohmyzsh.yml b/external/components/ohmyzsh.yml similarity index 100% rename from elements/components/ohmyzsh.yml rename to external/components/ohmyzsh.yml diff --git a/elements/components/onboard.yml b/external/components/onboard.yml similarity index 100% rename from elements/components/onboard.yml rename to external/components/onboard.yml diff --git a/elements/components/oniguruma.yml b/external/components/oniguruma.yml similarity index 100% rename from elements/components/oniguruma.yml rename to external/components/oniguruma.yml diff --git a/elements/components/openal.yml b/external/components/openal.yml similarity index 100% rename from elements/components/openal.yml rename to external/components/openal.yml diff --git a/elements/components/openblas-lapack.yml b/external/components/openblas-lapack.yml similarity index 100% rename from elements/components/openblas-lapack.yml rename to external/components/openblas-lapack.yml diff --git a/elements/components/opencv.yml b/external/components/opencv.yml similarity index 100% rename from elements/components/opencv.yml rename to external/components/opencv.yml diff --git a/elements/components/opencv3.yml b/external/components/opencv3.yml similarity index 100% rename from elements/components/opencv3.yml rename to external/components/opencv3.yml diff --git a/elements/components/openfst.yml b/external/components/openfst.yml similarity index 100% rename from elements/components/openfst.yml rename to external/components/openfst.yml diff --git a/elements/components/openjdk-bin.yml b/external/components/openjdk-bin.yml similarity index 94% rename from elements/components/openjdk-bin.yml rename to external/components/openjdk-bin.yml index 6e48b7fcc..4887447bf 100644 --- a/elements/components/openjdk-bin.yml +++ b/external/components/openjdk-bin.yml @@ -1,5 +1,5 @@ id: openjdk-bin -merge: [elements/include/java.inc] +merge: [external/include/java.inc] about: Java programming language [Binary] depends: diff --git a/elements/components/openjdk-jre.yml b/external/components/openjdk-jre.yml similarity index 97% rename from elements/components/openjdk-jre.yml rename to external/components/openjdk-jre.yml index 50f1aed57..fd6b46a6a 100644 --- a/elements/components/openjdk-jre.yml +++ b/external/components/openjdk-jre.yml @@ -1,5 +1,5 @@ id: openjdk-jre -merge: [elements/include/java.inc] +merge: [external/include/java.inc] about: open-source implementation of Oracle's Java Standard Edition platform [RUNTIME] depends: diff --git a/elements/components/openjdk.yml b/external/components/openjdk.yml similarity index 98% rename from elements/components/openjdk.yml rename to external/components/openjdk.yml index bec7a2944..d15a6f85d 100644 --- a/elements/components/openjdk.yml +++ b/external/components/openjdk.yml @@ -1,5 +1,5 @@ id: openjdk -merge: [elements/include/java.inc] +merge: [external/include/java.inc] about: Open-source implementation of Oracle's Java Standard Edition platform depends: diff --git a/elements/components/openjpeg.yml b/external/components/openjpeg.yml similarity index 100% rename from elements/components/openjpeg.yml rename to external/components/openjpeg.yml diff --git a/elements/components/openldap.yml b/external/components/openldap.yml similarity index 100% rename from elements/components/openldap.yml rename to external/components/openldap.yml diff --git a/elements/components/openmpi.yml b/external/components/openmpi.yml similarity index 100% rename from elements/components/openmpi.yml rename to external/components/openmpi.yml diff --git a/elements/components/openpmix.yml b/external/components/openpmix.yml similarity index 100% rename from elements/components/openpmix.yml rename to external/components/openpmix.yml diff --git a/elements/components/openssh.yml b/external/components/openssh.yml similarity index 100% rename from elements/components/openssh.yml rename to external/components/openssh.yml diff --git a/elements/components/openssl.yml b/external/components/openssl.yml similarity index 100% rename from elements/components/openssl.yml rename to external/components/openssl.yml diff --git a/elements/components/openvpn.yml b/external/components/openvpn.yml similarity index 100% rename from elements/components/openvpn.yml rename to external/components/openvpn.yml diff --git a/elements/components/optipng.yml b/external/components/optipng.yml similarity index 100% rename from elements/components/optipng.yml rename to external/components/optipng.yml diff --git a/elements/components/opus.yml b/external/components/opus.yml similarity index 100% rename from elements/components/opus.yml rename to external/components/opus.yml diff --git a/elements/components/os-prober.yml b/external/components/os-prober.yml similarity index 100% rename from elements/components/os-prober.yml rename to external/components/os-prober.yml diff --git a/elements/components/osinfo-db-tools.yml b/external/components/osinfo-db-tools.yml similarity index 100% rename from elements/components/osinfo-db-tools.yml rename to external/components/osinfo-db-tools.yml diff --git a/elements/components/osinfo-db.yml b/external/components/osinfo-db.yml similarity index 100% rename from elements/components/osinfo-db.yml rename to external/components/osinfo-db.yml diff --git a/elements/components/ostree.yml b/external/components/ostree.yml similarity index 100% rename from elements/components/ostree.yml rename to external/components/ostree.yml diff --git a/elements/components/p11-kit.yml b/external/components/p11-kit.yml similarity index 100% rename from elements/components/p11-kit.yml rename to external/components/p11-kit.yml diff --git a/elements/components/p7zip.yml b/external/components/p7zip.yml similarity index 100% rename from elements/components/p7zip.yml rename to external/components/p7zip.yml diff --git a/elements/components/pam-config.yml b/external/components/pam-config.yml similarity index 100% rename from elements/components/pam-config.yml rename to external/components/pam-config.yml diff --git a/elements/components/pam.yml b/external/components/pam.yml similarity index 100% rename from elements/components/pam.yml rename to external/components/pam.yml diff --git a/elements/components/pam_wrapper.yml b/external/components/pam_wrapper.yml similarity index 100% rename from elements/components/pam_wrapper.yml rename to external/components/pam_wrapper.yml diff --git a/elements/components/pamixer.yml b/external/components/pamixer.yml similarity index 100% rename from elements/components/pamixer.yml rename to external/components/pamixer.yml diff --git a/elements/components/pango.yml b/external/components/pango.yml similarity index 100% rename from elements/components/pango.yml rename to external/components/pango.yml diff --git a/elements/components/pangomm.yml b/external/components/pangomm.yml similarity index 100% rename from elements/components/pangomm.yml rename to external/components/pangomm.yml diff --git a/elements/components/pangomm2.46.yml b/external/components/pangomm2.46.yml similarity index 100% rename from elements/components/pangomm2.46.yml rename to external/components/pangomm2.46.yml diff --git a/elements/components/parted.yml b/external/components/parted.yml similarity index 100% rename from elements/components/parted.yml rename to external/components/parted.yml diff --git a/elements/components/patch.yml b/external/components/patch.yml similarity index 100% rename from elements/components/patch.yml rename to external/components/patch.yml diff --git a/elements/components/pavucontrol.yml b/external/components/pavucontrol.yml similarity index 100% rename from elements/components/pavucontrol.yml rename to external/components/pavucontrol.yml diff --git a/elements/components/pcaudiolib.yml b/external/components/pcaudiolib.yml similarity index 100% rename from elements/components/pcaudiolib.yml rename to external/components/pcaudiolib.yml diff --git a/elements/components/pciutils.yml b/external/components/pciutils.yml similarity index 100% rename from elements/components/pciutils.yml rename to external/components/pciutils.yml diff --git a/elements/components/pcre.yml b/external/components/pcre.yml similarity index 100% rename from elements/components/pcre.yml rename to external/components/pcre.yml diff --git a/elements/components/pcre2.yml b/external/components/pcre2.yml similarity index 100% rename from elements/components/pcre2.yml rename to external/components/pcre2.yml diff --git a/elements/components/pcsclite.yml b/external/components/pcsclite.yml similarity index 100% rename from elements/components/pcsclite.yml rename to external/components/pcsclite.yml diff --git a/elements/components/perl.yml b/external/components/perl.yml similarity index 100% rename from elements/components/perl.yml rename to external/components/perl.yml diff --git a/elements/components/perl/perl-io-string.yml b/external/components/perl/perl-io-string.yml similarity index 100% rename from elements/components/perl/perl-io-string.yml rename to external/components/perl/perl-io-string.yml diff --git a/elements/components/perl/perl-json.yml b/external/components/perl/perl-json.yml similarity index 100% rename from elements/components/perl/perl-json.yml rename to external/components/perl/perl-json.yml diff --git a/elements/components/perl/perl-locale-gettext.yml b/external/components/perl/perl-locale-gettext.yml similarity index 100% rename from elements/components/perl/perl-locale-gettext.yml rename to external/components/perl/perl-locale-gettext.yml diff --git a/elements/components/perl/perl-mime-charset.yml b/external/components/perl/perl-mime-charset.yml similarity index 100% rename from elements/components/perl/perl-mime-charset.yml rename to external/components/perl/perl-mime-charset.yml diff --git a/elements/components/perl/perl-module-build.yml b/external/components/perl/perl-module-build.yml similarity index 100% rename from elements/components/perl/perl-module-build.yml rename to external/components/perl/perl-module-build.yml diff --git a/elements/components/perl/perl-parse-yapp.yml b/external/components/perl/perl-parse-yapp.yml similarity index 100% rename from elements/components/perl/perl-parse-yapp.yml rename to external/components/perl/perl-parse-yapp.yml diff --git a/elements/components/perl/perl-pod-parser.yml b/external/components/perl/perl-pod-parser.yml similarity index 100% rename from elements/components/perl/perl-pod-parser.yml rename to external/components/perl/perl-pod-parser.yml diff --git a/elements/components/perl/perl-sgmls.yml b/external/components/perl/perl-sgmls.yml similarity index 100% rename from elements/components/perl/perl-sgmls.yml rename to external/components/perl/perl-sgmls.yml diff --git a/elements/components/perl/perl-term-readkey.yml b/external/components/perl/perl-term-readkey.yml similarity index 100% rename from elements/components/perl/perl-term-readkey.yml rename to external/components/perl/perl-term-readkey.yml diff --git a/elements/components/perl/perl-text-charwidth.yml b/external/components/perl/perl-text-charwidth.yml similarity index 100% rename from elements/components/perl/perl-text-charwidth.yml rename to external/components/perl/perl-text-charwidth.yml diff --git a/elements/components/perl/perl-text-wrapi18n.yml b/external/components/perl/perl-text-wrapi18n.yml similarity index 100% rename from elements/components/perl/perl-text-wrapi18n.yml rename to external/components/perl/perl-text-wrapi18n.yml diff --git a/elements/components/perl/perl-timedate.yml b/external/components/perl/perl-timedate.yml similarity index 100% rename from elements/components/perl/perl-timedate.yml rename to external/components/perl/perl-timedate.yml diff --git a/elements/components/perl/perl-unicode-linebreak.yml b/external/components/perl/perl-unicode-linebreak.yml similarity index 100% rename from elements/components/perl/perl-unicode-linebreak.yml rename to external/components/perl/perl-unicode-linebreak.yml diff --git a/elements/components/perl/perl-uri.yml b/external/components/perl/perl-uri.yml similarity index 100% rename from elements/components/perl/perl-uri.yml rename to external/components/perl/perl-uri.yml diff --git a/elements/components/perl/perl-xml-parser.yml b/external/components/perl/perl-xml-parser.yml similarity index 100% rename from elements/components/perl/perl-xml-parser.yml rename to external/components/perl/perl-xml-parser.yml diff --git a/elements/components/perl/perl-xml-simple.yml b/external/components/perl/perl-xml-simple.yml similarity index 100% rename from elements/components/perl/perl-xml-simple.yml rename to external/components/perl/perl-xml-simple.yml diff --git a/elements/components/perl/perl-yaml-tiny.yml b/external/components/perl/perl-yaml-tiny.yml similarity index 100% rename from elements/components/perl/perl-yaml-tiny.yml rename to external/components/perl/perl-yaml-tiny.yml diff --git a/elements/components/phodav.yml b/external/components/phodav.yml similarity index 100% rename from elements/components/phodav.yml rename to external/components/phodav.yml diff --git a/elements/components/phonon-backend-gstreamer.yml b/external/components/phonon-backend-gstreamer.yml similarity index 100% rename from elements/components/phonon-backend-gstreamer.yml rename to external/components/phonon-backend-gstreamer.yml diff --git a/elements/components/phonon.yml b/external/components/phonon.yml similarity index 100% rename from elements/components/phonon.yml rename to external/components/phonon.yml diff --git a/elements/components/physfs.yml b/external/components/physfs.yml similarity index 100% rename from elements/components/physfs.yml rename to external/components/physfs.yml diff --git a/elements/components/picom.yml b/external/components/picom.yml similarity index 100% rename from elements/components/picom.yml rename to external/components/picom.yml diff --git a/elements/components/picotts.yml b/external/components/picotts.yml similarity index 100% rename from elements/components/picotts.yml rename to external/components/picotts.yml diff --git a/elements/components/pinentry.yml b/external/components/pinentry.yml similarity index 100% rename from elements/components/pinentry.yml rename to external/components/pinentry.yml diff --git a/elements/components/pipewire.yml b/external/components/pipewire.yml similarity index 100% rename from elements/components/pipewire.yml rename to external/components/pipewire.yml diff --git a/elements/components/pixman.yml b/external/components/pixman.yml similarity index 100% rename from elements/components/pixman.yml rename to external/components/pixman.yml diff --git a/elements/components/pkg-config.yml b/external/components/pkg-config.yml similarity index 100% rename from elements/components/pkg-config.yml rename to external/components/pkg-config.yml diff --git a/elements/components/plasma/ark.yml b/external/components/plasma/ark.yml similarity index 100% rename from elements/components/plasma/ark.yml rename to external/components/plasma/ark.yml diff --git a/elements/components/plasma/bluedevil.yml b/external/components/plasma/bluedevil.yml similarity index 86% rename from elements/components/plasma/bluedevil.yml rename to external/components/plasma/bluedevil.yml index 8e1961dcf..8f45411e5 100644 --- a/elements/components/plasma/bluedevil.yml +++ b/external/components/plasma/bluedevil.yml @@ -8,4 +8,4 @@ depends: build-depends: - components/extra-cmake-modules.yml - components/plasma/plasma-framework.yml -merge: [elements/include/plasma.inc] +merge: [external/include/plasma.inc] diff --git a/elements/components/plasma/breeze-grub.yml b/external/components/plasma/breeze-grub.yml similarity index 67% rename from elements/components/plasma/breeze-grub.yml rename to external/components/plasma/breeze-grub.yml index 99dfdea7c..b6b424389 100644 --- a/elements/components/plasma/breeze-grub.yml +++ b/external/components/plasma/breeze-grub.yml @@ -3,4 +3,4 @@ about: Plasma breeze-grub depends: - components/grub.yml -merge: [elements/include/plasma.inc] \ No newline at end of file +merge: [external/include/plasma.inc] \ No newline at end of file diff --git a/elements/components/plasma/breeze-gtk.yml b/external/components/plasma/breeze-gtk.yml similarity index 84% rename from elements/components/plasma/breeze-gtk.yml rename to external/components/plasma/breeze-gtk.yml index e73a711ba..4548409d7 100644 --- a/elements/components/plasma/breeze-gtk.yml +++ b/external/components/plasma/breeze-gtk.yml @@ -8,4 +8,4 @@ build-depends: - components/extra-cmake-modules.yml - components/py/py-cairo.yml - components/sassc.yml -merge: [elements/include/plasma.inc] \ No newline at end of file +merge: [external/include/plasma.inc] \ No newline at end of file diff --git a/elements/components/plasma/breeze-icons.yml b/external/components/plasma/breeze-icons.yml similarity index 77% rename from elements/components/plasma/breeze-icons.yml rename to external/components/plasma/breeze-icons.yml index 82627110c..27df59539 100644 --- a/elements/components/plasma/breeze-icons.yml +++ b/external/components/plasma/breeze-icons.yml @@ -5,4 +5,4 @@ depends: - components/qt.yml build-depends: - components/extra-cmake-modules.yml -merge: [elements/include/plasma.inc] \ No newline at end of file +merge: [external/include/plasma.inc] \ No newline at end of file diff --git a/elements/components/plasma/breeze.yml b/external/components/plasma/breeze.yml similarity index 87% rename from elements/components/plasma/breeze.yml rename to external/components/plasma/breeze.yml index e93ea0c05..7792f21f7 100644 --- a/elements/components/plasma/breeze.yml +++ b/external/components/plasma/breeze.yml @@ -9,4 +9,4 @@ depends: build-depends: - components/extra-cmake-modules.yml - components/kcmutils.yml -merge: [elements/include/plasma.inc] +merge: [external/include/plasma.inc] diff --git a/elements/components/plasma/discover.yml b/external/components/plasma/discover.yml similarity index 90% rename from elements/components/plasma/discover.yml rename to external/components/plasma/discover.yml index f5d8d9a4c..8d072df75 100644 --- a/elements/components/plasma/discover.yml +++ b/external/components/plasma/discover.yml @@ -1,5 +1,5 @@ id: discover -merge: [elements/include/plasma.inc] +merge: [external/include/plasma.inc] about: Plasma discover depends: diff --git a/elements/components/plasma/drkonqi.yml b/external/components/plasma/drkonqi.yml similarity index 100% rename from elements/components/plasma/drkonqi.yml rename to external/components/plasma/drkonqi.yml diff --git a/elements/components/plasma/kactivitymanagerd.yml b/external/components/plasma/kactivitymanagerd.yml similarity index 82% rename from elements/components/plasma/kactivitymanagerd.yml rename to external/components/plasma/kactivitymanagerd.yml index 3f772c958..d3e00a5b2 100644 --- a/elements/components/plasma/kactivitymanagerd.yml +++ b/external/components/plasma/kactivitymanagerd.yml @@ -7,4 +7,4 @@ depends: build-depends: - components/extra-cmake-modules.yml - components/boost.yml -merge: [elements/include/plasma.inc] \ No newline at end of file +merge: [external/include/plasma.inc] \ No newline at end of file diff --git a/elements/components/plasma/kde-cli-tools.yml b/external/components/plasma/kde-cli-tools.yml similarity index 100% rename from elements/components/plasma/kde-cli-tools.yml rename to external/components/plasma/kde-cli-tools.yml diff --git a/elements/components/plasma/kde-gtk-config.yml b/external/components/plasma/kde-gtk-config.yml similarity index 100% rename from elements/components/plasma/kde-gtk-config.yml rename to external/components/plasma/kde-gtk-config.yml diff --git a/elements/components/plasma/kdecoration.yml b/external/components/plasma/kdecoration.yml similarity index 81% rename from elements/components/plasma/kdecoration.yml rename to external/components/plasma/kdecoration.yml index 9edfb83a3..1a5bb922a 100644 --- a/elements/components/plasma/kdecoration.yml +++ b/external/components/plasma/kdecoration.yml @@ -7,4 +7,4 @@ depends: build-depends: - components/extra-cmake-modules.yml -merge: [elements/include/plasma.inc] +merge: [external/include/plasma.inc] diff --git a/elements/components/plasma/kdeplasma-addons.yml b/external/components/plasma/kdeplasma-addons.yml similarity index 100% rename from elements/components/plasma/kdeplasma-addons.yml rename to external/components/plasma/kdeplasma-addons.yml diff --git a/elements/components/plasma/kgamma5.yml b/external/components/plasma/kgamma5.yml similarity index 100% rename from elements/components/plasma/kgamma5.yml rename to external/components/plasma/kgamma5.yml diff --git a/elements/components/plasma/khotkeys.yml b/external/components/plasma/khotkeys.yml similarity index 100% rename from elements/components/plasma/khotkeys.yml rename to external/components/plasma/khotkeys.yml diff --git a/elements/components/plasma/kmenuedit.yml b/external/components/plasma/kmenuedit.yml similarity index 100% rename from elements/components/plasma/kmenuedit.yml rename to external/components/plasma/kmenuedit.yml diff --git a/elements/components/plasma/kpipewire.yml b/external/components/plasma/kpipewire.yml similarity index 90% rename from elements/components/plasma/kpipewire.yml rename to external/components/plasma/kpipewire.yml index 09e08d307..bd69c5fd0 100644 --- a/elements/components/plasma/kpipewire.yml +++ b/external/components/plasma/kpipewire.yml @@ -1,6 +1,6 @@ id: kpipewire about: Components relating to pipewire use in Plasma -merge: [elements/include/plasma.inc] +merge: [external/include/plasma.inc] depends: - components/ffmpeg.yml diff --git a/elements/components/plasma/kscreen.yml b/external/components/plasma/kscreen.yml similarity index 84% rename from elements/components/plasma/kscreen.yml rename to external/components/plasma/kscreen.yml index 4bf37fce8..1e3deff10 100644 --- a/elements/components/plasma/kscreen.yml +++ b/external/components/plasma/kscreen.yml @@ -8,4 +8,4 @@ build-depends: - components/extra-cmake-modules.yml - components/kcmutils.yml -merge: [elements/include/plasma.inc] +merge: [external/include/plasma.inc] diff --git a/elements/components/plasma/kscreenlocker.yml b/external/components/plasma/kscreenlocker.yml similarity index 91% rename from elements/components/plasma/kscreenlocker.yml rename to external/components/plasma/kscreenlocker.yml index ac1c33567..8bbb9613f 100644 --- a/elements/components/plasma/kscreenlocker.yml +++ b/external/components/plasma/kscreenlocker.yml @@ -1,5 +1,5 @@ id: kscreenlocker -merge: [elements/include/plasma.inc] +merge: [external/include/plasma.inc] about: Plasma kscreenlocker depends: diff --git a/elements/components/plasma/ksshaskpass.yml b/external/components/plasma/ksshaskpass.yml similarity index 81% rename from elements/components/plasma/ksshaskpass.yml rename to external/components/plasma/ksshaskpass.yml index 76d46204e..785dc5e27 100644 --- a/elements/components/plasma/ksshaskpass.yml +++ b/external/components/plasma/ksshaskpass.yml @@ -1,5 +1,5 @@ id: ksshaskpass -merge: [elements/include/plasma.inc] +merge: [external/include/plasma.inc] about: Plasma ksshaskpass depends: diff --git a/elements/components/plasma/ksystemstats.yml b/external/components/plasma/ksystemstats.yml similarity index 83% rename from elements/components/plasma/ksystemstats.yml rename to external/components/plasma/ksystemstats.yml index 6bb3b4e0a..95e3069c9 100644 --- a/elements/components/plasma/ksystemstats.yml +++ b/external/components/plasma/ksystemstats.yml @@ -1,5 +1,5 @@ id: ksystemstats -merge: [elements/include/plasma.inc] +merge: [external/include/plasma.inc] about: Plasma ksystemstats depends: diff --git a/elements/components/plasma/kwallet-pam.yml b/external/components/plasma/kwallet-pam.yml similarity index 78% rename from elements/components/plasma/kwallet-pam.yml rename to external/components/plasma/kwallet-pam.yml index 4c3d5e4c0..40ed57291 100644 --- a/elements/components/plasma/kwallet-pam.yml +++ b/external/components/plasma/kwallet-pam.yml @@ -1,5 +1,5 @@ id: kwallet-pam -merge: [elements/include/plasma.inc] +merge: [external/include/plasma.inc] about: Plasma kwallet-pam depends: diff --git a/elements/components/plasma/kwayland-integration.yml b/external/components/plasma/kwayland-integration.yml similarity index 88% rename from elements/components/plasma/kwayland-integration.yml rename to external/components/plasma/kwayland-integration.yml index 2eedce011..03421b6ca 100644 --- a/elements/components/plasma/kwayland-integration.yml +++ b/external/components/plasma/kwayland-integration.yml @@ -1,5 +1,5 @@ id: kwayland-integration -merge: [elements/include/plasma.inc] +merge: [external/include/plasma.inc] about: Plasma kwayland-integration depends: diff --git a/elements/components/plasma/kwin.yml b/external/components/plasma/kwin.yml similarity index 92% rename from elements/components/plasma/kwin.yml rename to external/components/plasma/kwin.yml index 48b5472ff..41be411f5 100644 --- a/elements/components/plasma/kwin.yml +++ b/external/components/plasma/kwin.yml @@ -1,5 +1,5 @@ id: kwin -merge: [elements/include/plasma.inc] +merge: [external/include/plasma.inc] about: Plasma kwin depends: diff --git a/elements/components/plasma/kwrited.yml b/external/components/plasma/kwrited.yml similarity index 85% rename from elements/components/plasma/kwrited.yml rename to external/components/plasma/kwrited.yml index 635ff47f1..c3101c9c7 100644 --- a/elements/components/plasma/kwrited.yml +++ b/external/components/plasma/kwrited.yml @@ -1,5 +1,5 @@ id: kwrited -merge: [elements/include/plasma.inc] +merge: [external/include/plasma.inc] about: Plasma kwrited depends: diff --git a/elements/components/plasma/layer-shell-qt.yml b/external/components/plasma/layer-shell-qt.yml similarity index 87% rename from elements/components/plasma/layer-shell-qt.yml rename to external/components/plasma/layer-shell-qt.yml index b994ef111..86a421b9d 100644 --- a/elements/components/plasma/layer-shell-qt.yml +++ b/external/components/plasma/layer-shell-qt.yml @@ -1,5 +1,5 @@ id: layer-shell-qt -merge: [elements/include/plasma.inc] +merge: [external/include/plasma.inc] about: Plasma layer-shell-qt sources: diff --git a/elements/components/plasma/libkscreen.yml b/external/components/plasma/libkscreen.yml similarity index 88% rename from elements/components/plasma/libkscreen.yml rename to external/components/plasma/libkscreen.yml index 8eece567e..9b762d240 100644 --- a/elements/components/plasma/libkscreen.yml +++ b/external/components/plasma/libkscreen.yml @@ -1,5 +1,5 @@ id: libkscreen -merge: [elements/include/plasma.inc] +merge: [external/include/plasma.inc] about: Plasma libkscreen depends: diff --git a/elements/components/plasma/libksysguard.yml b/external/components/plasma/libksysguard.yml similarity index 88% rename from elements/components/plasma/libksysguard.yml rename to external/components/plasma/libksysguard.yml index 2917165ff..0d0642c4b 100644 --- a/elements/components/plasma/libksysguard.yml +++ b/external/components/plasma/libksysguard.yml @@ -1,5 +1,5 @@ id: libksysguard -merge: [elements/include/plasma.inc] +merge: [external/include/plasma.inc] about: Plasma libksysguard depends: diff --git a/elements/components/plasma/milou.yml b/external/components/plasma/milou.yml similarity index 82% rename from elements/components/plasma/milou.yml rename to external/components/plasma/milou.yml index 708f6103b..4b23afeef 100644 --- a/elements/components/plasma/milou.yml +++ b/external/components/plasma/milou.yml @@ -1,5 +1,5 @@ id: milou -merge: [elements/include/plasma.inc] +merge: [external/include/plasma.inc] about: Plasma milou depends: - components/krunner.yml diff --git a/elements/components/plasma/oxygen-icons5.yml b/external/components/plasma/oxygen-icons5.yml similarity index 77% rename from elements/components/plasma/oxygen-icons5.yml rename to external/components/plasma/oxygen-icons5.yml index 2f04080a8..595405073 100644 --- a/elements/components/plasma/oxygen-icons5.yml +++ b/external/components/plasma/oxygen-icons5.yml @@ -1,5 +1,5 @@ id: oxygen-icons5 -merge: [elements/include/plasma.inc] +merge: [external/include/plasma.inc] about: KF5 oxygen-icons5 depends: diff --git a/elements/components/plasma/oxygen.yml b/external/components/plasma/oxygen.yml similarity index 87% rename from elements/components/plasma/oxygen.yml rename to external/components/plasma/oxygen.yml index d10ee784f..2561739e9 100644 --- a/elements/components/plasma/oxygen.yml +++ b/external/components/plasma/oxygen.yml @@ -1,5 +1,5 @@ id: oxygen -merge: [elements/include/plasma.inc] +merge: [external/include/plasma.inc] about: Plasma oxygen depends: diff --git a/elements/components/plasma/plasma-browser-integration.yml b/external/components/plasma/plasma-browser-integration.yml similarity index 86% rename from elements/components/plasma/plasma-browser-integration.yml rename to external/components/plasma/plasma-browser-integration.yml index bd5acebf2..5cea5c6a4 100644 --- a/elements/components/plasma/plasma-browser-integration.yml +++ b/external/components/plasma/plasma-browser-integration.yml @@ -1,5 +1,5 @@ id: plasma-browser-integration -merge: [elements/include/plasma.inc] +merge: [external/include/plasma.inc] about: Plasma plasma-browser-integration depends: diff --git a/elements/components/plasma/plasma-desktop.yml b/external/components/plasma/plasma-desktop.yml similarity index 94% rename from elements/components/plasma/plasma-desktop.yml rename to external/components/plasma/plasma-desktop.yml index a3dc4e39b..2afc50195 100644 --- a/elements/components/plasma/plasma-desktop.yml +++ b/external/components/plasma/plasma-desktop.yml @@ -1,5 +1,5 @@ id: plasma-desktop -merge: [elements/include/plasma.inc] +merge: [external/include/plasma.inc] about: Plasma plasma-desktop depends: diff --git a/elements/components/plasma/plasma-disks.yml b/external/components/plasma/plasma-disks.yml similarity index 92% rename from elements/components/plasma/plasma-disks.yml rename to external/components/plasma/plasma-disks.yml index e63a7cd9c..3d8f14106 100644 --- a/elements/components/plasma/plasma-disks.yml +++ b/external/components/plasma/plasma-disks.yml @@ -1,5 +1,5 @@ id: plasma-disks -merge: [elements/include/plasma.inc] +merge: [external/include/plasma.inc] about: Plasma plasma-disks depends: diff --git a/elements/components/plasma/plasma-firewall.yml b/external/components/plasma/plasma-firewall.yml similarity index 80% rename from elements/components/plasma/plasma-firewall.yml rename to external/components/plasma/plasma-firewall.yml index 11bfdba35..ce81bded7 100644 --- a/elements/components/plasma/plasma-firewall.yml +++ b/external/components/plasma/plasma-firewall.yml @@ -1,5 +1,5 @@ id: plasma-firewall -merge: [elements/include/plasma.inc] +merge: [external/include/plasma.inc] about: Plasma plasma-firewall depends: diff --git a/elements/components/plasma/plasma-framework.yml b/external/components/plasma/plasma-framework.yml similarity index 87% rename from elements/components/plasma/plasma-framework.yml rename to external/components/plasma/plasma-framework.yml index e958fbe76..4c4ddb6a0 100644 --- a/elements/components/plasma/plasma-framework.yml +++ b/external/components/plasma/plasma-framework.yml @@ -1,5 +1,5 @@ id: plasma-framework -merge: [elements/include/kf5.inc] +merge: [external/include/kf5.inc] about: KF5 plasma-framework depends: diff --git a/elements/components/plasma/plasma-integration.yml b/external/components/plasma/plasma-integration.yml similarity index 88% rename from elements/components/plasma/plasma-integration.yml rename to external/components/plasma/plasma-integration.yml index c417cb02c..78bcc4ade 100644 --- a/elements/components/plasma/plasma-integration.yml +++ b/external/components/plasma/plasma-integration.yml @@ -1,5 +1,5 @@ id: plasma-integration -merge: [elements/include/plasma.inc] +merge: [external/include/plasma.inc] about: Plasma plasma-integration depends: diff --git a/elements/components/plasma/plasma-nm.yml b/external/components/plasma/plasma-nm.yml similarity index 84% rename from elements/components/plasma/plasma-nm.yml rename to external/components/plasma/plasma-nm.yml index b0e1b8a06..38cc4fcee 100644 --- a/elements/components/plasma/plasma-nm.yml +++ b/external/components/plasma/plasma-nm.yml @@ -1,5 +1,5 @@ id: plasma-nm -merge: [elements/include/plasma.inc] +merge: [external/include/plasma.inc] about: Plasma plasma-nm depends: diff --git a/elements/components/plasma/plasma-pa.yml b/external/components/plasma/plasma-pa.yml similarity index 86% rename from elements/components/plasma/plasma-pa.yml rename to external/components/plasma/plasma-pa.yml index f7addab55..1b66bc4d8 100644 --- a/elements/components/plasma/plasma-pa.yml +++ b/external/components/plasma/plasma-pa.yml @@ -1,5 +1,5 @@ id: plasma-pa -merge: [elements/include/plasma.inc] +merge: [external/include/plasma.inc] about: Plasma plasma-pa depends: diff --git a/elements/components/plasma/plasma-pam.yml b/external/components/plasma/plasma-pam.yml similarity index 85% rename from elements/components/plasma/plasma-pam.yml rename to external/components/plasma/plasma-pam.yml index 75964a4c5..46b042200 100644 --- a/elements/components/plasma/plasma-pam.yml +++ b/external/components/plasma/plasma-pam.yml @@ -1,5 +1,5 @@ id: plasma-pam -merge: [elements/include/plasma.inc] +merge: [external/include/plasma.inc] about: Plasma pam permissions script: |- mkdir -p %{install-root}%{sysconfdir}/pam.d/ diff --git a/elements/components/plasma/plasma-sdk.yml b/external/components/plasma/plasma-sdk.yml similarity index 86% rename from elements/components/plasma/plasma-sdk.yml rename to external/components/plasma/plasma-sdk.yml index 1ae6d04ea..fd054ed92 100644 --- a/elements/components/plasma/plasma-sdk.yml +++ b/external/components/plasma/plasma-sdk.yml @@ -1,5 +1,5 @@ id: plasma-sdk -merge: [elements/include/plasma.inc] +merge: [external/include/plasma.inc] about: Plasma plasma-sdk depends: diff --git a/elements/components/plasma/plasma-systemmonitor.yml b/external/components/plasma/plasma-systemmonitor.yml similarity index 92% rename from elements/components/plasma/plasma-systemmonitor.yml rename to external/components/plasma/plasma-systemmonitor.yml index 6df9b15b2..ab42ebe37 100644 --- a/elements/components/plasma/plasma-systemmonitor.yml +++ b/external/components/plasma/plasma-systemmonitor.yml @@ -1,5 +1,5 @@ id: plasma-systemmonitor -merge: [elements/include/plasma.inc] +merge: [external/include/plasma.inc] about: Plasma plasma-systemmonitor depends: diff --git a/elements/components/plasma/plasma-thunderbolt.yml b/external/components/plasma/plasma-thunderbolt.yml similarity index 81% rename from elements/components/plasma/plasma-thunderbolt.yml rename to external/components/plasma/plasma-thunderbolt.yml index c1e1aa644..9e73c9310 100644 --- a/elements/components/plasma/plasma-thunderbolt.yml +++ b/external/components/plasma/plasma-thunderbolt.yml @@ -1,5 +1,5 @@ id: plasma-thunderbolt -merge: [elements/include/plasma.inc] +merge: [external/include/plasma.inc] about: Plasma plasma-thunderbolt depends: diff --git a/elements/components/plasma/plasma-vault.yml b/external/components/plasma/plasma-vault.yml similarity index 83% rename from elements/components/plasma/plasma-vault.yml rename to external/components/plasma/plasma-vault.yml index ad550c4fc..59cb158ac 100644 --- a/elements/components/plasma/plasma-vault.yml +++ b/external/components/plasma/plasma-vault.yml @@ -1,5 +1,5 @@ id: plasma-vault -merge: [elements/include/plasma.inc] +merge: [external/include/plasma.inc] about: Plasma plasma-vault depends: diff --git a/elements/components/plasma/plasma-wayland-protocols.yml b/external/components/plasma/plasma-wayland-protocols.yml similarity index 100% rename from elements/components/plasma/plasma-wayland-protocols.yml rename to external/components/plasma/plasma-wayland-protocols.yml diff --git a/elements/components/plasma/plasma-workspace-wallpapers.yml b/external/components/plasma/plasma-workspace-wallpapers.yml similarity index 81% rename from elements/components/plasma/plasma-workspace-wallpapers.yml rename to external/components/plasma/plasma-workspace-wallpapers.yml index fc88ddb03..95469a582 100644 --- a/elements/components/plasma/plasma-workspace-wallpapers.yml +++ b/external/components/plasma/plasma-workspace-wallpapers.yml @@ -1,5 +1,5 @@ id: plasma-workspace-wallpapers -merge: [elements/include/plasma.inc] +merge: [external/include/plasma.inc] about: Plasma plasma-workspace-wallpapers depends: diff --git a/elements/components/plasma/plasma-workspace.yml b/external/components/plasma/plasma-workspace.yml similarity index 96% rename from elements/components/plasma/plasma-workspace.yml rename to external/components/plasma/plasma-workspace.yml index 4b31febfe..27225e46c 100644 --- a/elements/components/plasma/plasma-workspace.yml +++ b/external/components/plasma/plasma-workspace.yml @@ -1,5 +1,5 @@ id: plasma-workspace -merge: [elements/include/plasma.inc] +merge: [external/include/plasma.inc] about: Plasma plasma-workspace depends: diff --git a/elements/components/plasma/polkit-kde-agent-1.yml b/external/components/plasma/polkit-kde-agent-1.yml similarity index 86% rename from elements/components/plasma/polkit-kde-agent-1.yml rename to external/components/plasma/polkit-kde-agent-1.yml index 9f8a0dfd1..bce484831 100644 --- a/elements/components/plasma/polkit-kde-agent-1.yml +++ b/external/components/plasma/polkit-kde-agent-1.yml @@ -1,5 +1,5 @@ id: polkit-kde-agent-1 -merge: [elements/include/plasma.inc] +merge: [external/include/plasma.inc] about: Plasma polkit-kde-agent-1 depends: diff --git a/elements/components/plasma/powerdevil.yml b/external/components/plasma/powerdevil.yml similarity index 87% rename from elements/components/plasma/powerdevil.yml rename to external/components/plasma/powerdevil.yml index 2ecc90e92..7fba55501 100644 --- a/elements/components/plasma/powerdevil.yml +++ b/external/components/plasma/powerdevil.yml @@ -1,5 +1,5 @@ id: powerdevil -merge: [elements/include/plasma.inc] +merge: [external/include/plasma.inc] about: Plasma powerdevil depends: diff --git a/elements/components/plasma/qqc2-breeze-style.yml b/external/components/plasma/qqc2-breeze-style.yml similarity index 84% rename from elements/components/plasma/qqc2-breeze-style.yml rename to external/components/plasma/qqc2-breeze-style.yml index a1520176c..55078f6fb 100644 --- a/elements/components/plasma/qqc2-breeze-style.yml +++ b/external/components/plasma/qqc2-breeze-style.yml @@ -1,5 +1,5 @@ id: qqc2-breeze-style -merge: [elements/include/plasma.inc] +merge: [external/include/plasma.inc] about: Plasma qqc2-breeze-style depends: diff --git a/elements/components/plasma/sddm-kcm.yml b/external/components/plasma/sddm-kcm.yml similarity index 85% rename from elements/components/plasma/sddm-kcm.yml rename to external/components/plasma/sddm-kcm.yml index f95dddf90..80ec619ef 100644 --- a/elements/components/plasma/sddm-kcm.yml +++ b/external/components/plasma/sddm-kcm.yml @@ -1,5 +1,5 @@ id: sddm-kcm -merge: [elements/include/plasma.inc] +merge: [external/include/plasma.inc] about: Plasma sddm-kcm depends: diff --git a/elements/components/plasma/systemsettings.yml b/external/components/plasma/systemsettings.yml similarity index 83% rename from elements/components/plasma/systemsettings.yml rename to external/components/plasma/systemsettings.yml index fa1f37433..61cd17d61 100644 --- a/elements/components/plasma/systemsettings.yml +++ b/external/components/plasma/systemsettings.yml @@ -1,5 +1,5 @@ id: systemsettings -merge: [elements/include/plasma.inc] +merge: [external/include/plasma.inc] about: Plasma systemsettings depends: diff --git a/elements/components/plasma/xdg-desktop-portal-kde.yml b/external/components/plasma/xdg-desktop-portal-kde.yml similarity index 89% rename from elements/components/plasma/xdg-desktop-portal-kde.yml rename to external/components/plasma/xdg-desktop-portal-kde.yml index 468253fae..6eb7f95c2 100644 --- a/elements/components/plasma/xdg-desktop-portal-kde.yml +++ b/external/components/plasma/xdg-desktop-portal-kde.yml @@ -1,5 +1,5 @@ id: xdg-desktop-portal-kde -merge: [elements/include/plasma.inc] +merge: [external/include/plasma.inc] about: Plasma xdg-desktop-portal-kde depends: diff --git a/elements/components/playerctl.yml b/external/components/playerctl.yml similarity index 100% rename from elements/components/playerctl.yml rename to external/components/playerctl.yml diff --git a/elements/components/plymouth.yml b/external/components/plymouth.yml similarity index 100% rename from elements/components/plymouth.yml rename to external/components/plymouth.yml diff --git a/elements/components/po4a.yml b/external/components/po4a.yml similarity index 100% rename from elements/components/po4a.yml rename to external/components/po4a.yml diff --git a/elements/components/pocketsphinx.yml b/external/components/pocketsphinx.yml similarity index 100% rename from elements/components/pocketsphinx.yml rename to external/components/pocketsphinx.yml diff --git a/elements/components/polkit-gnome.yml b/external/components/polkit-gnome.yml similarity index 100% rename from elements/components/polkit-gnome.yml rename to external/components/polkit-gnome.yml diff --git a/elements/components/polkit-qt.yml b/external/components/polkit-qt.yml similarity index 100% rename from elements/components/polkit-qt.yml rename to external/components/polkit-qt.yml diff --git a/elements/components/polkit.yml b/external/components/polkit.yml similarity index 100% rename from elements/components/polkit.yml rename to external/components/polkit.yml diff --git a/elements/components/poppler-data.yml b/external/components/poppler-data.yml similarity index 100% rename from elements/components/poppler-data.yml rename to external/components/poppler-data.yml diff --git a/elements/components/poppler.yml b/external/components/poppler.yml similarity index 100% rename from elements/components/poppler.yml rename to external/components/poppler.yml diff --git a/elements/components/popt.yml b/external/components/popt.yml similarity index 100% rename from elements/components/popt.yml rename to external/components/popt.yml diff --git a/elements/components/postfix.yml b/external/components/postfix.yml similarity index 100% rename from elements/components/postfix.yml rename to external/components/postfix.yml diff --git a/elements/components/postgresql-runtime.yml b/external/components/postgresql-runtime.yml similarity index 100% rename from elements/components/postgresql-runtime.yml rename to external/components/postgresql-runtime.yml diff --git a/elements/components/postgresql.yml b/external/components/postgresql.yml similarity index 100% rename from elements/components/postgresql.yml rename to external/components/postgresql.yml diff --git a/elements/components/potrace.yml b/external/components/potrace.yml similarity index 100% rename from elements/components/potrace.yml rename to external/components/potrace.yml diff --git a/elements/components/power-profiles-daemon.yml b/external/components/power-profiles-daemon.yml similarity index 100% rename from elements/components/power-profiles-daemon.yml rename to external/components/power-profiles-daemon.yml diff --git a/elements/components/prison.yml b/external/components/prison.yml similarity index 80% rename from elements/components/prison.yml rename to external/components/prison.yml index fc82149dd..607a2c04a 100644 --- a/elements/components/prison.yml +++ b/external/components/prison.yml @@ -1,5 +1,5 @@ id: prison -merge: [elements/include/kf5.inc] +merge: [external/include/kf5.inc] about: KF5 prison depends: diff --git a/elements/components/procps-ng.yml b/external/components/procps-ng.yml similarity index 100% rename from elements/components/procps-ng.yml rename to external/components/procps-ng.yml diff --git a/elements/components/proot.yml b/external/components/proot.yml similarity index 100% rename from elements/components/proot.yml rename to external/components/proot.yml diff --git a/elements/components/protobuf.yml b/external/components/protobuf.yml similarity index 100% rename from elements/components/protobuf.yml rename to external/components/protobuf.yml diff --git a/elements/components/psmisc.yml b/external/components/psmisc.yml similarity index 100% rename from elements/components/psmisc.yml rename to external/components/psmisc.yml diff --git a/elements/components/pugixml.yml b/external/components/pugixml.yml similarity index 100% rename from elements/components/pugixml.yml rename to external/components/pugixml.yml diff --git a/elements/components/pulseaudio.yml b/external/components/pulseaudio.yml similarity index 100% rename from elements/components/pulseaudio.yml rename to external/components/pulseaudio.yml diff --git a/elements/components/purpose.yml b/external/components/purpose.yml similarity index 88% rename from elements/components/purpose.yml rename to external/components/purpose.yml index 86bace2f9..fd7b3132e 100644 --- a/elements/components/purpose.yml +++ b/external/components/purpose.yml @@ -1,5 +1,5 @@ id: purpose -merge: [elements/include/kf5.inc] +merge: [external/include/kf5.inc] about: KF5 purpose depends: diff --git a/elements/components/py/py-cairo.yml b/external/components/py/py-cairo.yml similarity index 100% rename from elements/components/py/py-cairo.yml rename to external/components/py/py-cairo.yml diff --git a/elements/components/py/py-chardet.yml b/external/components/py/py-chardet.yml similarity index 100% rename from elements/components/py/py-chardet.yml rename to external/components/py/py-chardet.yml diff --git a/elements/components/py/py-cups.yml b/external/components/py/py-cups.yml similarity index 100% rename from elements/components/py/py-cups.yml rename to external/components/py/py-cups.yml diff --git a/elements/components/py/py-curl.yml b/external/components/py/py-curl.yml similarity index 100% rename from elements/components/py/py-curl.yml rename to external/components/py/py-curl.yml diff --git a/elements/components/py/py-cython.yml b/external/components/py/py-cython.yml similarity index 100% rename from elements/components/py/py-cython.yml rename to external/components/py/py-cython.yml diff --git a/elements/components/py/py-dbus.yml b/external/components/py/py-dbus.yml similarity index 100% rename from elements/components/py/py-dbus.yml rename to external/components/py/py-dbus.yml diff --git a/elements/components/py/py-dbusmock.yml b/external/components/py/py-dbusmock.yml similarity index 100% rename from elements/components/py/py-dbusmock.yml rename to external/components/py/py-dbusmock.yml diff --git a/elements/components/py/py-distutils-extra.yml b/external/components/py/py-distutils-extra.yml similarity index 100% rename from elements/components/py/py-distutils-extra.yml rename to external/components/py/py-distutils-extra.yml diff --git a/elements/components/py/py-gobject.yml b/external/components/py/py-gobject.yml similarity index 100% rename from elements/components/py/py-gobject.yml rename to external/components/py/py-gobject.yml diff --git a/elements/components/py/py-idna.yml b/external/components/py/py-idna.yml similarity index 100% rename from elements/components/py/py-idna.yml rename to external/components/py/py-idna.yml diff --git a/elements/components/py/py-jinja2.yml b/external/components/py/py-jinja2.yml similarity index 100% rename from elements/components/py/py-jinja2.yml rename to external/components/py/py-jinja2.yml diff --git a/elements/components/py/py-libvirt.yml b/external/components/py/py-libvirt.yml similarity index 100% rename from elements/components/py/py-libvirt.yml rename to external/components/py/py-libvirt.yml diff --git a/elements/components/py/py-mako.yml b/external/components/py/py-mako.yml similarity index 100% rename from elements/components/py/py-mako.yml rename to external/components/py/py-mako.yml diff --git a/elements/components/py/py-markdown.yml b/external/components/py/py-markdown.yml similarity index 100% rename from elements/components/py/py-markdown.yml rename to external/components/py/py-markdown.yml diff --git a/elements/components/py/py-markupsafe.yml b/external/components/py/py-markupsafe.yml similarity index 100% rename from elements/components/py/py-markupsafe.yml rename to external/components/py/py-markupsafe.yml diff --git a/elements/components/py/py-notify2.yml b/external/components/py/py-notify2.yml similarity index 100% rename from elements/components/py/py-notify2.yml rename to external/components/py/py-notify2.yml diff --git a/elements/components/py/py-packaging.yml b/external/components/py/py-packaging.yml similarity index 100% rename from elements/components/py/py-packaging.yml rename to external/components/py/py-packaging.yml diff --git a/elements/components/py/py-parsing.yml b/external/components/py/py-parsing.yml similarity index 100% rename from elements/components/py/py-parsing.yml rename to external/components/py/py-parsing.yml diff --git a/elements/components/py/py-pip.yml b/external/components/py/py-pip.yml similarity index 100% rename from elements/components/py/py-pip.yml rename to external/components/py/py-pip.yml diff --git a/elements/components/py/py-psutil.yml b/external/components/py/py-psutil.yml similarity index 100% rename from elements/components/py/py-psutil.yml rename to external/components/py/py-psutil.yml diff --git a/elements/components/py/py-pygments.yml b/external/components/py/py-pygments.yml similarity index 100% rename from elements/components/py/py-pygments.yml rename to external/components/py/py-pygments.yml diff --git a/elements/components/py/py-requests.yml b/external/components/py/py-requests.yml similarity index 100% rename from elements/components/py/py-requests.yml rename to external/components/py/py-requests.yml diff --git a/elements/components/py/py-setuptools.yml b/external/components/py/py-setuptools.yml similarity index 100% rename from elements/components/py/py-setuptools.yml rename to external/components/py/py-setuptools.yml diff --git a/elements/components/py/py-six.yml b/external/components/py/py-six.yml similarity index 100% rename from elements/components/py/py-six.yml rename to external/components/py/py-six.yml diff --git a/elements/components/py/py-socks.yml b/external/components/py/py-socks.yml similarity index 100% rename from elements/components/py/py-socks.yml rename to external/components/py/py-socks.yml diff --git a/elements/components/py/py-urllib3.yml b/external/components/py/py-urllib3.yml similarity index 100% rename from elements/components/py/py-urllib3.yml rename to external/components/py/py-urllib3.yml diff --git a/elements/components/py/py-xdg.yml b/external/components/py/py-xdg.yml similarity index 100% rename from elements/components/py/py-xdg.yml rename to external/components/py/py-xdg.yml diff --git a/elements/components/py/py-yaml.yml b/external/components/py/py-yaml.yml similarity index 100% rename from elements/components/py/py-yaml.yml rename to external/components/py/py-yaml.yml diff --git a/elements/components/python.yml b/external/components/python.yml similarity index 100% rename from elements/components/python.yml rename to external/components/python.yml diff --git a/elements/components/python2.yml b/external/components/python2.yml similarity index 100% rename from elements/components/python2.yml rename to external/components/python2.yml diff --git a/elements/components/qbe.yml b/external/components/qbe.yml similarity index 100% rename from elements/components/qbe.yml rename to external/components/qbe.yml diff --git a/elements/components/qca.yml b/external/components/qca.yml similarity index 100% rename from elements/components/qca.yml rename to external/components/qca.yml diff --git a/elements/components/qemu.yml b/external/components/qemu.yml similarity index 100% rename from elements/components/qemu.yml rename to external/components/qemu.yml diff --git a/elements/components/qqc2-desktop-style.yml b/external/components/qqc2-desktop-style.yml similarity index 85% rename from elements/components/qqc2-desktop-style.yml rename to external/components/qqc2-desktop-style.yml index 5a8409cba..c97be6f3f 100644 --- a/elements/components/qqc2-desktop-style.yml +++ b/external/components/qqc2-desktop-style.yml @@ -1,5 +1,5 @@ id: qqc2-desktop-style -merge: [elements/include/kf5.inc] +merge: [external/include/kf5.inc] about: KF5 qqc2-desktop-style depends: diff --git a/elements/components/qrencode.yml b/external/components/qrencode.yml similarity index 100% rename from elements/components/qrencode.yml rename to external/components/qrencode.yml diff --git a/elements/components/qt.yml b/external/components/qt.yml similarity index 100% rename from elements/components/qt.yml rename to external/components/qt.yml diff --git a/elements/components/quickjs.yml b/external/components/quickjs.yml similarity index 100% rename from elements/components/quickjs.yml rename to external/components/quickjs.yml diff --git a/elements/components/quilt.yml b/external/components/quilt.yml similarity index 100% rename from elements/components/quilt.yml rename to external/components/quilt.yml diff --git a/elements/components/qwlroots.yml b/external/components/qwlroots.yml similarity index 100% rename from elements/components/qwlroots.yml rename to external/components/qwlroots.yml diff --git a/elements/components/raft.yml b/external/components/raft.yml similarity index 100% rename from elements/components/raft.yml rename to external/components/raft.yml diff --git a/elements/components/raptor.yml b/external/components/raptor.yml similarity index 100% rename from elements/components/raptor.yml rename to external/components/raptor.yml diff --git a/elements/components/rasqal.yml b/external/components/rasqal.yml similarity index 100% rename from elements/components/rasqal.yml rename to external/components/rasqal.yml diff --git a/elements/components/rdfind.yml b/external/components/rdfind.yml similarity index 100% rename from elements/components/rdfind.yml rename to external/components/rdfind.yml diff --git a/elements/components/readline.yml b/external/components/readline.yml similarity index 100% rename from elements/components/readline.yml rename to external/components/readline.yml diff --git a/elements/components/redflat.yml b/external/components/redflat.yml similarity index 100% rename from elements/components/redflat.yml rename to external/components/redflat.yml diff --git a/elements/components/redland.yml b/external/components/redland.yml similarity index 100% rename from elements/components/redland.yml rename to external/components/redland.yml diff --git a/elements/components/release-info.yml b/external/components/release-info.yml similarity index 100% rename from elements/components/release-info.yml rename to external/components/release-info.yml diff --git a/elements/components/rest.yml b/external/components/rest.yml similarity index 100% rename from elements/components/rest.yml rename to external/components/rest.yml diff --git a/elements/components/rofi.yml b/external/components/rofi.yml similarity index 100% rename from elements/components/rofi.yml rename to external/components/rofi.yml diff --git a/elements/components/rpcsvc-proto.yml b/external/components/rpcsvc-proto.yml similarity index 100% rename from elements/components/rpcsvc-proto.yml rename to external/components/rpcsvc-proto.yml diff --git a/elements/components/rrdtool.yml b/external/components/rrdtool.yml similarity index 100% rename from elements/components/rrdtool.yml rename to external/components/rrdtool.yml diff --git a/elements/components/rsync.yml b/external/components/rsync.yml similarity index 100% rename from elements/components/rsync.yml rename to external/components/rsync.yml diff --git a/elements/components/rtkit.yml b/external/components/rtkit.yml similarity index 100% rename from elements/components/rtkit.yml rename to external/components/rtkit.yml diff --git a/elements/components/ruby.yml b/external/components/ruby.yml similarity index 100% rename from elements/components/ruby.yml rename to external/components/ruby.yml diff --git a/elements/components/runc.yml b/external/components/runc.yml similarity index 100% rename from elements/components/runc.yml rename to external/components/runc.yml diff --git a/elements/components/rust-bindgen.yml b/external/components/rust-bindgen.yml similarity index 100% rename from elements/components/rust-bindgen.yml rename to external/components/rust-bindgen.yml diff --git a/elements/components/rust-stage1.yml b/external/components/rust-stage1.yml similarity index 89% rename from elements/components/rust-stage1.yml rename to external/components/rust-stage1.yml index 368e420b4..1bdc8d304 100644 --- a/elements/components/rust-stage1.yml +++ b/external/components/rust-stage1.yml @@ -1,5 +1,5 @@ id: rust-stage1 -merge: [elements/include/rust.inc] +merge: [external/include/rust.inc] about: Rust stage 1 compiler sources: diff --git a/elements/components/rustc.yml b/external/components/rustc.yml similarity index 97% rename from elements/components/rustc.yml rename to external/components/rustc.yml index 877c10b50..d3457574f 100644 --- a/elements/components/rustc.yml +++ b/external/components/rustc.yml @@ -1,5 +1,5 @@ id: rustc -merge: [elements/include/rust.inc] +merge: [external/include/rust.inc] about: Rust programming language is designed to be a safe, concurrent, practical language variables: diff --git a/elements/components/samba.yml b/external/components/samba.yml similarity index 100% rename from elements/components/samba.yml rename to external/components/samba.yml diff --git a/elements/components/sassc.yml b/external/components/sassc.yml similarity index 100% rename from elements/components/sassc.yml rename to external/components/sassc.yml diff --git a/elements/components/sbc.yml b/external/components/sbc.yml similarity index 100% rename from elements/components/sbc.yml rename to external/components/sbc.yml diff --git a/elements/components/sbsigntools.yml b/external/components/sbsigntools.yml similarity index 100% rename from elements/components/sbsigntools.yml rename to external/components/sbsigntools.yml diff --git a/elements/components/scdoc.yml b/external/components/scdoc.yml similarity index 100% rename from elements/components/scdoc.yml rename to external/components/scdoc.yml diff --git a/elements/components/scenefx.yml b/external/components/scenefx.yml similarity index 100% rename from elements/components/scenefx.yml rename to external/components/scenefx.yml diff --git a/elements/components/schroot.yml b/external/components/schroot.yml similarity index 100% rename from elements/components/schroot.yml rename to external/components/schroot.yml diff --git a/elements/components/scim.yml b/external/components/scim.yml similarity index 100% rename from elements/components/scim.yml rename to external/components/scim.yml diff --git a/elements/components/screenrotator.yml b/external/components/screenrotator.yml similarity index 100% rename from elements/components/screenrotator.yml rename to external/components/screenrotator.yml diff --git a/elements/components/scrot.yml b/external/components/scrot.yml similarity index 100% rename from elements/components/scrot.yml rename to external/components/scrot.yml diff --git a/elements/components/sddm.yml b/external/components/sddm.yml similarity index 100% rename from elements/components/sddm.yml rename to external/components/sddm.yml diff --git a/elements/components/sdl.yml b/external/components/sdl.yml similarity index 100% rename from elements/components/sdl.yml rename to external/components/sdl.yml diff --git a/elements/components/sdl2.yml b/external/components/sdl2.yml similarity index 100% rename from elements/components/sdl2.yml rename to external/components/sdl2.yml diff --git a/elements/components/sdl2_image.yml b/external/components/sdl2_image.yml similarity index 100% rename from elements/components/sdl2_image.yml rename to external/components/sdl2_image.yml diff --git a/elements/components/seatd.yml b/external/components/seatd.yml similarity index 100% rename from elements/components/seatd.yml rename to external/components/seatd.yml diff --git a/elements/components/sed.yml b/external/components/sed.yml similarity index 100% rename from elements/components/sed.yml rename to external/components/sed.yml diff --git a/elements/components/selftest.yml b/external/components/selftest.yml similarity index 100% rename from elements/components/selftest.yml rename to external/components/selftest.yml diff --git a/elements/components/setconf.yml b/external/components/setconf.yml similarity index 100% rename from elements/components/setconf.yml rename to external/components/setconf.yml diff --git a/elements/components/sfwbar.yml b/external/components/sfwbar.yml similarity index 100% rename from elements/components/sfwbar.yml rename to external/components/sfwbar.yml diff --git a/elements/components/sgml-common.yml b/external/components/sgml-common.yml similarity index 100% rename from elements/components/sgml-common.yml rename to external/components/sgml-common.yml diff --git a/elements/components/shaderc.yml b/external/components/shaderc.yml similarity index 100% rename from elements/components/shaderc.yml rename to external/components/shaderc.yml diff --git a/elements/components/shadow.yml b/external/components/shadow.yml similarity index 100% rename from elements/components/shadow.yml rename to external/components/shadow.yml diff --git a/elements/components/shared-mime-info.yml b/external/components/shared-mime-info.yml similarity index 100% rename from elements/components/shared-mime-info.yml rename to external/components/shared-mime-info.yml diff --git a/elements/components/shim.yml b/external/components/shim.yml similarity index 100% rename from elements/components/shim.yml rename to external/components/shim.yml diff --git a/elements/components/slang.yml b/external/components/slang.yml similarity index 100% rename from elements/components/slang.yml rename to external/components/slang.yml diff --git a/elements/components/slurp.yml b/external/components/slurp.yml similarity index 100% rename from elements/components/slurp.yml rename to external/components/slurp.yml diff --git a/elements/components/snowball.yml b/external/components/snowball.yml similarity index 100% rename from elements/components/snowball.yml rename to external/components/snowball.yml diff --git a/elements/components/sof-firmware.yml b/external/components/sof-firmware.yml similarity index 100% rename from elements/components/sof-firmware.yml rename to external/components/sof-firmware.yml diff --git a/elements/components/solid.yml b/external/components/solid.yml similarity index 82% rename from elements/components/solid.yml rename to external/components/solid.yml index a596006ef..c9deb753d 100644 --- a/elements/components/solid.yml +++ b/external/components/solid.yml @@ -1,5 +1,5 @@ id: solid -merge: [elements/include/kf5.inc] +merge: [external/include/kf5.inc] about: KF5 solid depends: diff --git a/elements/components/sonnet.yml b/external/components/sonnet.yml similarity index 80% rename from elements/components/sonnet.yml rename to external/components/sonnet.yml index 75cf30aa6..231b244de 100644 --- a/elements/components/sonnet.yml +++ b/external/components/sonnet.yml @@ -1,5 +1,5 @@ id: sonnet -merge: [elements/include/kf5.inc] +merge: [external/include/kf5.inc] about: KF5 sonnet depends: diff --git a/elements/components/sound-theme-freedesktop.yml b/external/components/sound-theme-freedesktop.yml similarity index 100% rename from elements/components/sound-theme-freedesktop.yml rename to external/components/sound-theme-freedesktop.yml diff --git a/elements/components/sphinxbase.yml b/external/components/sphinxbase.yml similarity index 100% rename from elements/components/sphinxbase.yml rename to external/components/sphinxbase.yml diff --git a/elements/components/spice-gtk.yml b/external/components/spice-gtk.yml similarity index 100% rename from elements/components/spice-gtk.yml rename to external/components/spice-gtk.yml diff --git a/elements/components/spice-protocol.yml b/external/components/spice-protocol.yml similarity index 100% rename from elements/components/spice-protocol.yml rename to external/components/spice-protocol.yml diff --git a/elements/components/spice-vdagent.yml b/external/components/spice-vdagent.yml similarity index 100% rename from elements/components/spice-vdagent.yml rename to external/components/spice-vdagent.yml diff --git a/elements/components/spice.yml b/external/components/spice.yml similarity index 100% rename from elements/components/spice.yml rename to external/components/spice.yml diff --git a/elements/components/spidermonkey.yml b/external/components/spidermonkey.yml similarity index 100% rename from elements/components/spidermonkey.yml rename to external/components/spidermonkey.yml diff --git a/elements/components/spirv-headers.yml b/external/components/spirv-headers.yml similarity index 100% rename from elements/components/spirv-headers.yml rename to external/components/spirv-headers.yml diff --git a/elements/components/spirv-llvm-translator.yml b/external/components/spirv-llvm-translator.yml similarity index 100% rename from elements/components/spirv-llvm-translator.yml rename to external/components/spirv-llvm-translator.yml diff --git a/elements/components/spirv-tools.yml b/external/components/spirv-tools.yml similarity index 100% rename from elements/components/spirv-tools.yml rename to external/components/spirv-tools.yml diff --git a/elements/components/sqlite.yml b/external/components/sqlite.yml similarity index 100% rename from elements/components/sqlite.yml rename to external/components/sqlite.yml diff --git a/elements/components/squashfs-tools.yml b/external/components/squashfs-tools.yml similarity index 100% rename from elements/components/squashfs-tools.yml rename to external/components/squashfs-tools.yml diff --git a/elements/components/squashfuse.yml b/external/components/squashfuse.yml similarity index 100% rename from elements/components/squashfuse.yml rename to external/components/squashfuse.yml diff --git a/elements/components/sshfs.yml b/external/components/sshfs.yml similarity index 100% rename from elements/components/sshfs.yml rename to external/components/sshfs.yml diff --git a/elements/components/startup-notification.yml b/external/components/startup-notification.yml similarity index 100% rename from elements/components/startup-notification.yml rename to external/components/startup-notification.yml diff --git a/elements/components/strace.yml b/external/components/strace.yml similarity index 100% rename from elements/components/strace.yml rename to external/components/strace.yml diff --git a/elements/components/sudo.yml b/external/components/sudo.yml similarity index 100% rename from elements/components/sudo.yml rename to external/components/sudo.yml diff --git a/elements/components/sway.yml b/external/components/sway.yml similarity index 100% rename from elements/components/sway.yml rename to external/components/sway.yml diff --git a/elements/components/swaybg.yml b/external/components/swaybg.yml similarity index 100% rename from elements/components/swaybg.yml rename to external/components/swaybg.yml diff --git a/elements/components/swayfx.yml b/external/components/swayfx.yml similarity index 100% rename from elements/components/swayfx.yml rename to external/components/swayfx.yml diff --git a/elements/components/swayidle.yml b/external/components/swayidle.yml similarity index 100% rename from elements/components/swayidle.yml rename to external/components/swayidle.yml diff --git a/elements/components/swaylock.yml b/external/components/swaylock.yml similarity index 100% rename from elements/components/swaylock.yml rename to external/components/swaylock.yml diff --git a/elements/components/swig.yml b/external/components/swig.yml similarity index 100% rename from elements/components/swig.yml rename to external/components/swig.yml diff --git a/elements/components/syndication.yml b/external/components/syndication.yml similarity index 79% rename from elements/components/syndication.yml rename to external/components/syndication.yml index 560d7bebb..ad25a3481 100644 --- a/elements/components/syndication.yml +++ b/external/components/syndication.yml @@ -1,5 +1,5 @@ id: syndication -merge: [elements/include/kf5.inc] +merge: [external/include/kf5.inc] about: KF5 syndication depends: diff --git a/elements/components/syntax-highlighting.yml b/external/components/syntax-highlighting.yml similarity index 80% rename from elements/components/syntax-highlighting.yml rename to external/components/syntax-highlighting.yml index 57b825318..ac48f8d01 100644 --- a/elements/components/syntax-highlighting.yml +++ b/external/components/syntax-highlighting.yml @@ -1,5 +1,5 @@ id: syntax-highlighting -merge: [elements/include/kf5.inc] +merge: [external/include/kf5.inc] about: KF5 syntax-highlighting depends: diff --git a/elements/components/syslinux.yml b/external/components/syslinux.yml similarity index 100% rename from elements/components/syslinux.yml rename to external/components/syslinux.yml diff --git a/elements/components/sysprof.yml b/external/components/sysprof.yml similarity index 100% rename from elements/components/sysprof.yml rename to external/components/sysprof.yml diff --git a/elements/components/sysroot.yml b/external/components/sysroot.yml similarity index 85% rename from elements/components/sysroot.yml rename to external/components/sysroot.yml index d52b34be0..3fb487e99 100644 --- a/elements/components/sysroot.yml +++ b/external/components/sysroot.yml @@ -1,7 +1,7 @@ id: sysroot version: 2.0.9 about: Package Management and Updater Daemon -merge: [ elements/include/rlxos.inc ] +merge: [ external/include/rlxos.inc ] depends: - components/glibc.yml diff --git a/elements/components/system-config-printer.yml b/external/components/system-config-printer.yml similarity index 100% rename from elements/components/system-config-printer.yml rename to external/components/system-config-printer.yml diff --git a/elements/components/systemd.yml b/external/components/systemd.yml similarity index 100% rename from elements/components/systemd.yml rename to external/components/systemd.yml diff --git a/elements/components/taglib.yml b/external/components/taglib.yml similarity index 100% rename from elements/components/taglib.yml rename to external/components/taglib.yml diff --git a/elements/components/talloc.yml b/external/components/talloc.yml similarity index 100% rename from elements/components/talloc.yml rename to external/components/talloc.yml diff --git a/elements/components/tar.yml b/external/components/tar.yml similarity index 100% rename from elements/components/tar.yml rename to external/components/tar.yml diff --git a/elements/components/tcc.yml b/external/components/tcc.yml similarity index 100% rename from elements/components/tcc.yml rename to external/components/tcc.yml diff --git a/elements/components/tcl.yml b/external/components/tcl.yml similarity index 100% rename from elements/components/tcl.yml rename to external/components/tcl.yml diff --git a/elements/components/template-glib.yml b/external/components/template-glib.yml similarity index 100% rename from elements/components/template-glib.yml rename to external/components/template-glib.yml diff --git a/elements/components/tepl.yml b/external/components/tepl.yml similarity index 100% rename from elements/components/tepl.yml rename to external/components/tepl.yml diff --git a/elements/components/texinfo.yml b/external/components/texinfo.yml similarity index 100% rename from elements/components/texinfo.yml rename to external/components/texinfo.yml diff --git a/elements/components/themes/adwaita-icon-theme.yml b/external/components/themes/adwaita-icon-theme.yml similarity index 100% rename from elements/components/themes/adwaita-icon-theme.yml rename to external/components/themes/adwaita-icon-theme.yml diff --git a/elements/components/themes/dracula-gtk-theme.yml b/external/components/themes/dracula-gtk-theme.yml similarity index 100% rename from elements/components/themes/dracula-gtk-theme.yml rename to external/components/themes/dracula-gtk-theme.yml diff --git a/elements/components/themes/elementary-xfce-icon.yml b/external/components/themes/elementary-xfce-icon.yml similarity index 92% rename from elements/components/themes/elementary-xfce-icon.yml rename to external/components/themes/elementary-xfce-icon.yml index cb81b2250..82a0961ee 100644 --- a/elements/components/themes/elementary-xfce-icon.yml +++ b/external/components/themes/elementary-xfce-icon.yml @@ -1,7 +1,7 @@ id: elementary-xfce-icon version: 0.19 about: Elementary icons forked from upstream, extended and maintained for Xfce -merge: [elements/include/update-icon-cache.inc] +merge: [external/include/update-icon-cache.inc] seperate-build-dir: false strip: false diff --git a/elements/components/themes/elementary-xfce.yml b/external/components/themes/elementary-xfce.yml similarity index 96% rename from elements/components/themes/elementary-xfce.yml rename to external/components/themes/elementary-xfce.yml index 606c0cb17..eac41930e 100644 --- a/elements/components/themes/elementary-xfce.yml +++ b/external/components/themes/elementary-xfce.yml @@ -1,7 +1,7 @@ id: elementary-xfce version: 06042024 about: Elementary Xfce theme -merge: [elements/include/gtk-theme.inc] +merge: [external/include/gtk-theme.inc] commit: 0b1b2b7477a28c774343aeecbf5b152ea2703e3e script: |- diff --git a/elements/components/themes/fluent-gtk-theme.yml b/external/components/themes/fluent-gtk-theme.yml similarity index 100% rename from elements/components/themes/fluent-gtk-theme.yml rename to external/components/themes/fluent-gtk-theme.yml diff --git a/elements/components/themes/fluent-icon-theme.yml b/external/components/themes/fluent-icon-theme.yml similarity index 89% rename from elements/components/themes/fluent-icon-theme.yml rename to external/components/themes/fluent-icon-theme.yml index 1ad786155..34a9eaf8b 100644 --- a/elements/components/themes/fluent-icon-theme.yml +++ b/external/components/themes/fluent-icon-theme.yml @@ -1,7 +1,7 @@ id: fluent-icon-theme version: 2024-02-25 about: A Fluent design icon theme -merge: [elements/include/update-icon-cache.inc] +merge: [external/include/update-icon-cache.inc] script: |- install -d %{install-root}%{datadir}/icons diff --git a/elements/components/themes/fluent-wallpaper.yml b/external/components/themes/fluent-wallpaper.yml similarity index 100% rename from elements/components/themes/fluent-wallpaper.yml rename to external/components/themes/fluent-wallpaper.yml diff --git a/elements/components/themes/gnome-icon-theme-extras.yml b/external/components/themes/gnome-icon-theme-extras.yml similarity index 100% rename from elements/components/themes/gnome-icon-theme-extras.yml rename to external/components/themes/gnome-icon-theme-extras.yml diff --git a/elements/components/themes/gnome-icon-theme-symbolic.yml b/external/components/themes/gnome-icon-theme-symbolic.yml similarity index 100% rename from elements/components/themes/gnome-icon-theme-symbolic.yml rename to external/components/themes/gnome-icon-theme-symbolic.yml diff --git a/elements/components/themes/gnome-icon-theme.yml b/external/components/themes/gnome-icon-theme.yml similarity index 100% rename from elements/components/themes/gnome-icon-theme.yml rename to external/components/themes/gnome-icon-theme.yml diff --git a/elements/components/themes/grey-bird-gtk-theme.yml b/external/components/themes/grey-bird-gtk-theme.yml similarity index 100% rename from elements/components/themes/grey-bird-gtk-theme.yml rename to external/components/themes/grey-bird-gtk-theme.yml diff --git a/elements/components/themes/orchis-gtk-theme.yml b/external/components/themes/orchis-gtk-theme.yml similarity index 93% rename from elements/components/themes/orchis-gtk-theme.yml rename to external/components/themes/orchis-gtk-theme.yml index c55e01bd6..8067cf495 100644 --- a/elements/components/themes/orchis-gtk-theme.yml +++ b/external/components/themes/orchis-gtk-theme.yml @@ -1,6 +1,6 @@ id: orchis-gtk-theme version: 2024-05-05 -merge: [elements/include/gtk-theme.inc] +merge: [external/include/gtk-theme.inc] about: Orchis is a [Material Design](https://material.io) theme for GNOME/GTK based desktop environments. commit: da9be241a977301b76037bd1efb8855b9020cc0b diff --git a/elements/components/themes/qogir-gtk-theme.yml b/external/components/themes/qogir-gtk-theme.yml similarity index 99% rename from elements/components/themes/qogir-gtk-theme.yml rename to external/components/themes/qogir-gtk-theme.yml index ddb1e247a..89a32dc49 100644 --- a/elements/components/themes/qogir-gtk-theme.yml +++ b/external/components/themes/qogir-gtk-theme.yml @@ -1,7 +1,7 @@ id: qogir-gtk-theme version: 2024-05-22 about: A flat design theme for GTK -merge: [ elements/include/theme.inc ] +merge: [ external/include/theme.inc ] variables: strip: false diff --git a/elements/components/themes/qogir-icon-theme.yml b/external/components/themes/qogir-icon-theme.yml similarity index 91% rename from elements/components/themes/qogir-icon-theme.yml rename to external/components/themes/qogir-icon-theme.yml index f8820b3fa..ee100d247 100644 --- a/elements/components/themes/qogir-icon-theme.yml +++ b/external/components/themes/qogir-icon-theme.yml @@ -1,7 +1,7 @@ id: qogir-icon-theme version: 2023-06-05 about: A colorful design icon theme for linux desktops -merge: [elements/include/update-icon-cache.inc] +merge: [external/include/update-icon-cache.inc] depends: - components/hicolor-icon-theme.yml build-depends: diff --git a/elements/components/themes/tela-icon-theme.yml b/external/components/themes/tela-icon-theme.yml similarity index 100% rename from elements/components/themes/tela-icon-theme.yml rename to external/components/themes/tela-icon-theme.yml diff --git a/elements/components/thermald.yml b/external/components/thermald.yml similarity index 100% rename from elements/components/thermald.yml rename to external/components/thermald.yml diff --git a/elements/components/threadweaver.yml b/external/components/threadweaver.yml similarity index 78% rename from elements/components/threadweaver.yml rename to external/components/threadweaver.yml index 67bdc5bd5..cf72fb4ca 100644 --- a/elements/components/threadweaver.yml +++ b/external/components/threadweaver.yml @@ -1,5 +1,5 @@ id: threadweaver -merge: [elements/include/kf5.inc] +merge: [external/include/kf5.inc] about: KF5 threadweaver depends: diff --git a/elements/components/tint2.yml b/external/components/tint2.yml similarity index 100% rename from elements/components/tint2.yml rename to external/components/tint2.yml diff --git a/elements/components/tllist.yml b/external/components/tllist.yml similarity index 100% rename from elements/components/tllist.yml rename to external/components/tllist.yml diff --git a/elements/components/tlp.yml b/external/components/tlp.yml similarity index 100% rename from elements/components/tlp.yml rename to external/components/tlp.yml diff --git a/elements/components/totem-pl-parser.yml b/external/components/totem-pl-parser.yml similarity index 100% rename from elements/components/totem-pl-parser.yml rename to external/components/totem-pl-parser.yml diff --git a/elements/components/touchegg.yml b/external/components/touchegg.yml similarity index 100% rename from elements/components/touchegg.yml rename to external/components/touchegg.yml diff --git a/elements/components/traceroute.yml b/external/components/traceroute.yml similarity index 100% rename from elements/components/traceroute.yml rename to external/components/traceroute.yml diff --git a/elements/components/tracker-miners.yml b/external/components/tracker-miners.yml similarity index 100% rename from elements/components/tracker-miners.yml rename to external/components/tracker-miners.yml diff --git a/elements/components/tracker.yml b/external/components/tracker.yml similarity index 100% rename from elements/components/tracker.yml rename to external/components/tracker.yml diff --git a/elements/components/triehash.yml b/external/components/triehash.yml similarity index 100% rename from elements/components/triehash.yml rename to external/components/triehash.yml diff --git a/elements/components/typescript.yml b/external/components/typescript.yml similarity index 100% rename from elements/components/typescript.yml rename to external/components/typescript.yml diff --git a/elements/components/tzdata.yml b/external/components/tzdata.yml similarity index 100% rename from elements/components/tzdata.yml rename to external/components/tzdata.yml diff --git a/elements/components/uchardet.yml b/external/components/uchardet.yml similarity index 100% rename from elements/components/uchardet.yml rename to external/components/uchardet.yml diff --git a/elements/components/udisks.yml b/external/components/udisks.yml similarity index 100% rename from elements/components/udisks.yml rename to external/components/udisks.yml diff --git a/elements/components/ufw.yml b/external/components/ufw.yml similarity index 100% rename from elements/components/ufw.yml rename to external/components/ufw.yml diff --git a/elements/components/uncrustify.yml b/external/components/uncrustify.yml similarity index 100% rename from elements/components/uncrustify.yml rename to external/components/uncrustify.yml diff --git a/elements/components/unidef.yml b/external/components/unidef.yml similarity index 100% rename from elements/components/unidef.yml rename to external/components/unidef.yml diff --git a/elements/components/unrar.yml b/external/components/unrar.yml similarity index 100% rename from elements/components/unrar.yml rename to external/components/unrar.yml diff --git a/elements/components/unzip.yml b/external/components/unzip.yml similarity index 100% rename from elements/components/unzip.yml rename to external/components/unzip.yml diff --git a/elements/components/upower.yml b/external/components/upower.yml similarity index 100% rename from elements/components/upower.yml rename to external/components/upower.yml diff --git a/elements/components/usbredir.yml b/external/components/usbredir.yml similarity index 100% rename from elements/components/usbredir.yml rename to external/components/usbredir.yml diff --git a/elements/components/usbutils.yml b/external/components/usbutils.yml similarity index 100% rename from elements/components/usbutils.yml rename to external/components/usbutils.yml diff --git a/elements/components/utf8cpp.yml b/external/components/utf8cpp.yml similarity index 100% rename from elements/components/utf8cpp.yml rename to external/components/utf8cpp.yml diff --git a/elements/components/uthash.yml b/external/components/uthash.yml similarity index 100% rename from elements/components/uthash.yml rename to external/components/uthash.yml diff --git a/elements/components/util-linux.yml b/external/components/util-linux.yml similarity index 100% rename from elements/components/util-linux.yml rename to external/components/util-linux.yml diff --git a/elements/components/v4l-utils.yml b/external/components/v4l-utils.yml similarity index 100% rename from elements/components/v4l-utils.yml rename to external/components/v4l-utils.yml diff --git a/elements/components/vaapi-driver.yml b/external/components/vaapi-driver.yml similarity index 100% rename from elements/components/vaapi-driver.yml rename to external/components/vaapi-driver.yml diff --git a/elements/components/vala-language-server.yml b/external/components/vala-language-server.yml similarity index 100% rename from elements/components/vala-language-server.yml rename to external/components/vala-language-server.yml diff --git a/elements/components/vala.yml b/external/components/vala.yml similarity index 100% rename from elements/components/vala.yml rename to external/components/vala.yml diff --git a/elements/components/valgrind.yml b/external/components/valgrind.yml similarity index 100% rename from elements/components/valgrind.yml rename to external/components/valgrind.yml diff --git a/elements/components/vim.yml b/external/components/vim.yml similarity index 100% rename from elements/components/vim.yml rename to external/components/vim.yml diff --git a/elements/components/virt-manager.yml b/external/components/virt-manager.yml similarity index 100% rename from elements/components/virt-manager.yml rename to external/components/virt-manager.yml diff --git a/elements/components/volume_key.yml b/external/components/volume_key.yml similarity index 100% rename from elements/components/volume_key.yml rename to external/components/volume_key.yml diff --git a/elements/components/vte.yml b/external/components/vte.yml similarity index 100% rename from elements/components/vte.yml rename to external/components/vte.yml diff --git a/elements/components/vulkan-headers.yml b/external/components/vulkan-headers.yml similarity index 100% rename from elements/components/vulkan-headers.yml rename to external/components/vulkan-headers.yml diff --git a/elements/components/vulkan-loader.yml b/external/components/vulkan-loader.yml similarity index 100% rename from elements/components/vulkan-loader.yml rename to external/components/vulkan-loader.yml diff --git a/elements/components/waf.yml b/external/components/waf.yml similarity index 100% rename from elements/components/waf.yml rename to external/components/waf.yml diff --git a/elements/components/wayland-protocols.yml b/external/components/wayland-protocols.yml similarity index 100% rename from elements/components/wayland-protocols.yml rename to external/components/wayland-protocols.yml diff --git a/elements/components/wayland.yml b/external/components/wayland.yml similarity index 100% rename from elements/components/wayland.yml rename to external/components/wayland.yml diff --git a/elements/components/webkitgtk-6.0.yml b/external/components/webkitgtk-6.0.yml similarity index 100% rename from elements/components/webkitgtk-6.0.yml rename to external/components/webkitgtk-6.0.yml diff --git a/elements/components/webkitgtk.yml b/external/components/webkitgtk.yml similarity index 100% rename from elements/components/webkitgtk.yml rename to external/components/webkitgtk.yml diff --git a/elements/components/webp-pixbuf-loader.yml b/external/components/webp-pixbuf-loader.yml similarity index 100% rename from elements/components/webp-pixbuf-loader.yml rename to external/components/webp-pixbuf-loader.yml diff --git a/elements/components/welcome.yml b/external/components/welcome.yml similarity index 83% rename from elements/components/welcome.yml rename to external/components/welcome.yml index a184c06bb..34c0a31f3 100644 --- a/elements/components/welcome.yml +++ b/external/components/welcome.yml @@ -1,7 +1,7 @@ id: welcome version: 2.2 about: RLXOS welcome tour -merge: [ elements/include/app.inc ] +merge: [ external/include/app.inc ] extra-commands: |- install -v -D -m 0755 -t %{install-root}/%{sysconfdir}/xdg/autostart/ /rlxos/apps/welcome/assets/welcome.desktop \ No newline at end of file diff --git a/elements/components/weston.yml b/external/components/weston.yml similarity index 100% rename from elements/components/weston.yml rename to external/components/weston.yml diff --git a/elements/components/wget.yml b/external/components/wget.yml similarity index 100% rename from elements/components/wget.yml rename to external/components/wget.yml diff --git a/elements/components/which.yml b/external/components/which.yml similarity index 100% rename from elements/components/which.yml rename to external/components/which.yml diff --git a/elements/components/wimlib.yml b/external/components/wimlib.yml similarity index 100% rename from elements/components/wimlib.yml rename to external/components/wimlib.yml diff --git a/elements/components/wine.yml b/external/components/wine.yml similarity index 100% rename from elements/components/wine.yml rename to external/components/wine.yml diff --git a/elements/components/wireplumber.yml b/external/components/wireplumber.yml similarity index 100% rename from elements/components/wireplumber.yml rename to external/components/wireplumber.yml diff --git a/elements/components/wl-clipboard.yml b/external/components/wl-clipboard.yml similarity index 100% rename from elements/components/wl-clipboard.yml rename to external/components/wl-clipboard.yml diff --git a/elements/components/wlgreet.yml b/external/components/wlgreet.yml similarity index 100% rename from elements/components/wlgreet.yml rename to external/components/wlgreet.yml diff --git a/elements/components/wlroots.yml b/external/components/wlroots.yml similarity index 100% rename from elements/components/wlroots.yml rename to external/components/wlroots.yml diff --git a/elements/components/wlroots0.16.yml b/external/components/wlroots0.16.yml similarity index 100% rename from elements/components/wlroots0.16.yml rename to external/components/wlroots0.16.yml diff --git a/elements/components/wmenu.yml b/external/components/wmenu.yml similarity index 100% rename from elements/components/wmenu.yml rename to external/components/wmenu.yml diff --git a/elements/components/wob.yml b/external/components/wob.yml similarity index 100% rename from elements/components/wob.yml rename to external/components/wob.yml diff --git a/elements/components/woff2.yml b/external/components/woff2.yml similarity index 100% rename from elements/components/woff2.yml rename to external/components/woff2.yml diff --git a/elements/components/wpa_supplicant.yml b/external/components/wpa_supplicant.yml similarity index 100% rename from elements/components/wpa_supplicant.yml rename to external/components/wpa_supplicant.yml diff --git a/elements/components/wpebackend-fdo.yml b/external/components/wpebackend-fdo.yml similarity index 100% rename from elements/components/wpebackend-fdo.yml rename to external/components/wpebackend-fdo.yml diff --git a/elements/components/wpewebkit.yml b/external/components/wpewebkit.yml similarity index 100% rename from elements/components/wpewebkit.yml rename to external/components/wpewebkit.yml diff --git a/elements/components/wvkbd.yml b/external/components/wvkbd.yml similarity index 100% rename from elements/components/wvkbd.yml rename to external/components/wvkbd.yml diff --git a/elements/components/wxgtk.yml b/external/components/wxgtk.yml similarity index 100% rename from elements/components/wxgtk.yml rename to external/components/wxgtk.yml diff --git a/elements/components/x11/font-util.yml b/external/components/x11/font-util.yml similarity index 100% rename from elements/components/x11/font-util.yml rename to external/components/x11/font-util.yml diff --git a/elements/components/x11/fonts-encodings.yml b/external/components/x11/fonts-encodings.yml similarity index 100% rename from elements/components/x11/fonts-encodings.yml rename to external/components/x11/fonts-encodings.yml diff --git a/elements/components/x11/iceauth.yml b/external/components/x11/iceauth.yml similarity index 100% rename from elements/components/x11/iceauth.yml rename to external/components/x11/iceauth.yml diff --git a/elements/components/x11/libfontenc.yml b/external/components/x11/libfontenc.yml similarity index 100% rename from elements/components/x11/libfontenc.yml rename to external/components/x11/libfontenc.yml diff --git a/elements/components/x11/libice.yml b/external/components/x11/libice.yml similarity index 100% rename from elements/components/x11/libice.yml rename to external/components/x11/libice.yml diff --git a/elements/components/x11/libpciaccess.yml b/external/components/x11/libpciaccess.yml similarity index 100% rename from elements/components/x11/libpciaccess.yml rename to external/components/x11/libpciaccess.yml diff --git a/elements/components/x11/libsm.yml b/external/components/x11/libsm.yml similarity index 100% rename from elements/components/x11/libsm.yml rename to external/components/x11/libsm.yml diff --git a/elements/components/x11/libx11.yml b/external/components/x11/libx11.yml similarity index 100% rename from elements/components/x11/libx11.yml rename to external/components/x11/libx11.yml diff --git a/elements/components/x11/libxau.yml b/external/components/x11/libxau.yml similarity index 100% rename from elements/components/x11/libxau.yml rename to external/components/x11/libxau.yml diff --git a/elements/components/x11/libxaw.yml b/external/components/x11/libxaw.yml similarity index 100% rename from elements/components/x11/libxaw.yml rename to external/components/x11/libxaw.yml diff --git a/elements/components/x11/libxcb.yml b/external/components/x11/libxcb.yml similarity index 100% rename from elements/components/x11/libxcb.yml rename to external/components/x11/libxcb.yml diff --git a/elements/components/x11/libxcomposite.yml b/external/components/x11/libxcomposite.yml similarity index 100% rename from elements/components/x11/libxcomposite.yml rename to external/components/x11/libxcomposite.yml diff --git a/elements/components/x11/libxcursor.yml b/external/components/x11/libxcursor.yml similarity index 100% rename from elements/components/x11/libxcursor.yml rename to external/components/x11/libxcursor.yml diff --git a/elements/components/x11/libxcvt.yml b/external/components/x11/libxcvt.yml similarity index 100% rename from elements/components/x11/libxcvt.yml rename to external/components/x11/libxcvt.yml diff --git a/elements/components/x11/libxdamage.yml b/external/components/x11/libxdamage.yml similarity index 100% rename from elements/components/x11/libxdamage.yml rename to external/components/x11/libxdamage.yml diff --git a/elements/components/x11/libxdmcp.yml b/external/components/x11/libxdmcp.yml similarity index 100% rename from elements/components/x11/libxdmcp.yml rename to external/components/x11/libxdmcp.yml diff --git a/elements/components/x11/libxext.yml b/external/components/x11/libxext.yml similarity index 100% rename from elements/components/x11/libxext.yml rename to external/components/x11/libxext.yml diff --git a/elements/components/x11/libxfixes.yml b/external/components/x11/libxfixes.yml similarity index 100% rename from elements/components/x11/libxfixes.yml rename to external/components/x11/libxfixes.yml diff --git a/elements/components/x11/libxfont2.yml b/external/components/x11/libxfont2.yml similarity index 100% rename from elements/components/x11/libxfont2.yml rename to external/components/x11/libxfont2.yml diff --git a/elements/components/x11/libxft.yml b/external/components/x11/libxft.yml similarity index 100% rename from elements/components/x11/libxft.yml rename to external/components/x11/libxft.yml diff --git a/elements/components/x11/libxi.yml b/external/components/x11/libxi.yml similarity index 100% rename from elements/components/x11/libxi.yml rename to external/components/x11/libxi.yml diff --git a/elements/components/x11/libxinerama.yml b/external/components/x11/libxinerama.yml similarity index 100% rename from elements/components/x11/libxinerama.yml rename to external/components/x11/libxinerama.yml diff --git a/elements/components/x11/libxkbcommon.yml b/external/components/x11/libxkbcommon.yml similarity index 100% rename from elements/components/x11/libxkbcommon.yml rename to external/components/x11/libxkbcommon.yml diff --git a/elements/components/x11/libxkbfile.yml b/external/components/x11/libxkbfile.yml similarity index 100% rename from elements/components/x11/libxkbfile.yml rename to external/components/x11/libxkbfile.yml diff --git a/elements/components/x11/libxklavier.yml b/external/components/x11/libxklavier.yml similarity index 100% rename from elements/components/x11/libxklavier.yml rename to external/components/x11/libxklavier.yml diff --git a/elements/components/x11/libxmu.yml b/external/components/x11/libxmu.yml similarity index 100% rename from elements/components/x11/libxmu.yml rename to external/components/x11/libxmu.yml diff --git a/elements/components/x11/libxpm.yml b/external/components/x11/libxpm.yml similarity index 100% rename from elements/components/x11/libxpm.yml rename to external/components/x11/libxpm.yml diff --git a/elements/components/x11/libxpresent.yml b/external/components/x11/libxpresent.yml similarity index 100% rename from elements/components/x11/libxpresent.yml rename to external/components/x11/libxpresent.yml diff --git a/elements/components/x11/libxrandr.yml b/external/components/x11/libxrandr.yml similarity index 100% rename from elements/components/x11/libxrandr.yml rename to external/components/x11/libxrandr.yml diff --git a/elements/components/x11/libxrender.yml b/external/components/x11/libxrender.yml similarity index 100% rename from elements/components/x11/libxrender.yml rename to external/components/x11/libxrender.yml diff --git a/elements/components/x11/libxres.yml b/external/components/x11/libxres.yml similarity index 100% rename from elements/components/x11/libxres.yml rename to external/components/x11/libxres.yml diff --git a/elements/components/x11/libxscrnsaver.yml b/external/components/x11/libxscrnsaver.yml similarity index 100% rename from elements/components/x11/libxscrnsaver.yml rename to external/components/x11/libxscrnsaver.yml diff --git a/elements/components/x11/libxshmfence.yml b/external/components/x11/libxshmfence.yml similarity index 100% rename from elements/components/x11/libxshmfence.yml rename to external/components/x11/libxshmfence.yml diff --git a/elements/components/x11/libxt.yml b/external/components/x11/libxt.yml similarity index 100% rename from elements/components/x11/libxt.yml rename to external/components/x11/libxt.yml diff --git a/elements/components/x11/libxtst.yml b/external/components/x11/libxtst.yml similarity index 100% rename from elements/components/x11/libxtst.yml rename to external/components/x11/libxtst.yml diff --git a/elements/components/x11/libxv.yml b/external/components/x11/libxv.yml similarity index 100% rename from elements/components/x11/libxv.yml rename to external/components/x11/libxv.yml diff --git a/elements/components/x11/libxvmc.yml b/external/components/x11/libxvmc.yml similarity index 100% rename from elements/components/x11/libxvmc.yml rename to external/components/x11/libxvmc.yml diff --git a/elements/components/x11/libxxf86vm.yml b/external/components/x11/libxxf86vm.yml similarity index 100% rename from elements/components/x11/libxxf86vm.yml rename to external/components/x11/libxxf86vm.yml diff --git a/elements/components/x11/mkfontscale.yml b/external/components/x11/mkfontscale.yml similarity index 100% rename from elements/components/x11/mkfontscale.yml rename to external/components/x11/mkfontscale.yml diff --git a/elements/components/x11/sessreg.yml b/external/components/x11/sessreg.yml similarity index 100% rename from elements/components/x11/sessreg.yml rename to external/components/x11/sessreg.yml diff --git a/elements/components/x11/setxkbmap.yml b/external/components/x11/setxkbmap.yml similarity index 100% rename from elements/components/x11/setxkbmap.yml rename to external/components/x11/setxkbmap.yml diff --git a/elements/components/x11/smproxy.yml b/external/components/x11/smproxy.yml similarity index 100% rename from elements/components/x11/smproxy.yml rename to external/components/x11/smproxy.yml diff --git a/elements/components/x11/util-macros.yml b/external/components/x11/util-macros.yml similarity index 100% rename from elements/components/x11/util-macros.yml rename to external/components/x11/util-macros.yml diff --git a/elements/components/x11/xauth.yml b/external/components/x11/xauth.yml similarity index 100% rename from elements/components/x11/xauth.yml rename to external/components/x11/xauth.yml diff --git a/elements/components/x11/xbacklight.yml b/external/components/x11/xbacklight.yml similarity index 100% rename from elements/components/x11/xbacklight.yml rename to external/components/x11/xbacklight.yml diff --git a/elements/components/x11/xbitmaps.yml b/external/components/x11/xbitmaps.yml similarity index 100% rename from elements/components/x11/xbitmaps.yml rename to external/components/x11/xbitmaps.yml diff --git a/elements/components/x11/xcb-proto.yml b/external/components/x11/xcb-proto.yml similarity index 100% rename from elements/components/x11/xcb-proto.yml rename to external/components/x11/xcb-proto.yml diff --git a/elements/components/x11/xcb-util-cursor.yml b/external/components/x11/xcb-util-cursor.yml similarity index 100% rename from elements/components/x11/xcb-util-cursor.yml rename to external/components/x11/xcb-util-cursor.yml diff --git a/elements/components/x11/xcb-util-errors.yml b/external/components/x11/xcb-util-errors.yml similarity index 100% rename from elements/components/x11/xcb-util-errors.yml rename to external/components/x11/xcb-util-errors.yml diff --git a/elements/components/x11/xcb-util-image.yml b/external/components/x11/xcb-util-image.yml similarity index 100% rename from elements/components/x11/xcb-util-image.yml rename to external/components/x11/xcb-util-image.yml diff --git a/elements/components/x11/xcb-util-keysyms.yml b/external/components/x11/xcb-util-keysyms.yml similarity index 100% rename from elements/components/x11/xcb-util-keysyms.yml rename to external/components/x11/xcb-util-keysyms.yml diff --git a/elements/components/x11/xcb-util-renderutil.yml b/external/components/x11/xcb-util-renderutil.yml similarity index 100% rename from elements/components/x11/xcb-util-renderutil.yml rename to external/components/x11/xcb-util-renderutil.yml diff --git a/elements/components/x11/xcb-util-wm.yml b/external/components/x11/xcb-util-wm.yml similarity index 100% rename from elements/components/x11/xcb-util-wm.yml rename to external/components/x11/xcb-util-wm.yml diff --git a/elements/components/x11/xcb-util-xrm.yml b/external/components/x11/xcb-util-xrm.yml similarity index 100% rename from elements/components/x11/xcb-util-xrm.yml rename to external/components/x11/xcb-util-xrm.yml diff --git a/elements/components/x11/xcb-util.yml b/external/components/x11/xcb-util.yml similarity index 100% rename from elements/components/x11/xcb-util.yml rename to external/components/x11/xcb-util.yml diff --git a/elements/components/x11/xcmsdb.yml b/external/components/x11/xcmsdb.yml similarity index 100% rename from elements/components/x11/xcmsdb.yml rename to external/components/x11/xcmsdb.yml diff --git a/elements/components/x11/xdpyinfo.yml b/external/components/x11/xdpyinfo.yml similarity index 100% rename from elements/components/x11/xdpyinfo.yml rename to external/components/x11/xdpyinfo.yml diff --git a/elements/components/x11/xev.yml b/external/components/x11/xev.yml similarity index 100% rename from elements/components/x11/xev.yml rename to external/components/x11/xev.yml diff --git a/elements/components/x11/xf86-input-evdev.yml b/external/components/x11/xf86-input-evdev.yml similarity index 100% rename from elements/components/x11/xf86-input-evdev.yml rename to external/components/x11/xf86-input-evdev.yml diff --git a/elements/components/x11/xf86-input-libinput.yml b/external/components/x11/xf86-input-libinput.yml similarity index 100% rename from elements/components/x11/xf86-input-libinput.yml rename to external/components/x11/xf86-input-libinput.yml diff --git a/elements/components/x11/xf86-input-synaptics.yml b/external/components/x11/xf86-input-synaptics.yml similarity index 100% rename from elements/components/x11/xf86-input-synaptics.yml rename to external/components/x11/xf86-input-synaptics.yml diff --git a/elements/components/x11/xf86-input-wacom.yml b/external/components/x11/xf86-input-wacom.yml similarity index 100% rename from elements/components/x11/xf86-input-wacom.yml rename to external/components/x11/xf86-input-wacom.yml diff --git a/elements/components/x11/xf86-video-amdgpu.yml b/external/components/x11/xf86-video-amdgpu.yml similarity index 100% rename from elements/components/x11/xf86-video-amdgpu.yml rename to external/components/x11/xf86-video-amdgpu.yml diff --git a/elements/components/x11/xf86-video-ati.yml b/external/components/x11/xf86-video-ati.yml similarity index 100% rename from elements/components/x11/xf86-video-ati.yml rename to external/components/x11/xf86-video-ati.yml diff --git a/elements/components/x11/xf86-video-fbdev.yml b/external/components/x11/xf86-video-fbdev.yml similarity index 100% rename from elements/components/x11/xf86-video-fbdev.yml rename to external/components/x11/xf86-video-fbdev.yml diff --git a/elements/components/x11/xf86-video-intel.yml b/external/components/x11/xf86-video-intel.yml similarity index 100% rename from elements/components/x11/xf86-video-intel.yml rename to external/components/x11/xf86-video-intel.yml diff --git a/elements/components/x11/xf86-video-nouveau.yml b/external/components/x11/xf86-video-nouveau.yml similarity index 100% rename from elements/components/x11/xf86-video-nouveau.yml rename to external/components/x11/xf86-video-nouveau.yml diff --git a/elements/components/x11/xf86-video-qxl.yml b/external/components/x11/xf86-video-qxl.yml similarity index 100% rename from elements/components/x11/xf86-video-qxl.yml rename to external/components/x11/xf86-video-qxl.yml diff --git a/elements/components/x11/xf86-video-vmware.yml b/external/components/x11/xf86-video-vmware.yml similarity index 100% rename from elements/components/x11/xf86-video-vmware.yml rename to external/components/x11/xf86-video-vmware.yml diff --git a/elements/components/x11/xgamma.yml b/external/components/x11/xgamma.yml similarity index 100% rename from elements/components/x11/xgamma.yml rename to external/components/x11/xgamma.yml diff --git a/elements/components/x11/xhost.yml b/external/components/x11/xhost.yml similarity index 100% rename from elements/components/x11/xhost.yml rename to external/components/x11/xhost.yml diff --git a/elements/components/x11/xinit.yml b/external/components/x11/xinit.yml similarity index 100% rename from elements/components/x11/xinit.yml rename to external/components/x11/xinit.yml diff --git a/elements/components/x11/xinput.yml b/external/components/x11/xinput.yml similarity index 100% rename from elements/components/x11/xinput.yml rename to external/components/x11/xinput.yml diff --git a/elements/components/x11/xkbcomp.yml b/external/components/x11/xkbcomp.yml similarity index 100% rename from elements/components/x11/xkbcomp.yml rename to external/components/x11/xkbcomp.yml diff --git a/elements/components/x11/xkeyboard-config.yml b/external/components/x11/xkeyboard-config.yml similarity index 100% rename from elements/components/x11/xkeyboard-config.yml rename to external/components/x11/xkeyboard-config.yml diff --git a/elements/components/x11/xmessage.yml b/external/components/x11/xmessage.yml similarity index 100% rename from elements/components/x11/xmessage.yml rename to external/components/x11/xmessage.yml diff --git a/elements/components/x11/xmodmap.yml b/external/components/x11/xmodmap.yml similarity index 100% rename from elements/components/x11/xmodmap.yml rename to external/components/x11/xmodmap.yml diff --git a/elements/components/x11/xorgproto.yml b/external/components/x11/xorgproto.yml similarity index 100% rename from elements/components/x11/xorgproto.yml rename to external/components/x11/xorgproto.yml diff --git a/elements/components/x11/xprop.yml b/external/components/x11/xprop.yml similarity index 100% rename from elements/components/x11/xprop.yml rename to external/components/x11/xprop.yml diff --git a/elements/components/x11/xrandr.yml b/external/components/x11/xrandr.yml similarity index 100% rename from elements/components/x11/xrandr.yml rename to external/components/x11/xrandr.yml diff --git a/elements/components/x11/xrdb.yml b/external/components/x11/xrdb.yml similarity index 100% rename from elements/components/x11/xrdb.yml rename to external/components/x11/xrdb.yml diff --git a/elements/components/x11/xserver.yml b/external/components/x11/xserver.yml similarity index 100% rename from elements/components/x11/xserver.yml rename to external/components/x11/xserver.yml diff --git a/elements/components/x11/xsetroot.yml b/external/components/x11/xsetroot.yml similarity index 100% rename from elements/components/x11/xsetroot.yml rename to external/components/x11/xsetroot.yml diff --git a/elements/components/x11/xtrans.yml b/external/components/x11/xtrans.yml similarity index 100% rename from elements/components/x11/xtrans.yml rename to external/components/x11/xtrans.yml diff --git a/elements/components/x11/xwayland.yml b/external/components/x11/xwayland.yml similarity index 100% rename from elements/components/x11/xwayland.yml rename to external/components/x11/xwayland.yml diff --git a/elements/components/x264.yml b/external/components/x264.yml similarity index 100% rename from elements/components/x264.yml rename to external/components/x264.yml diff --git a/elements/components/x265.yml b/external/components/x265.yml similarity index 100% rename from elements/components/x265.yml rename to external/components/x265.yml diff --git a/elements/components/xapp.yml b/external/components/xapp.yml similarity index 100% rename from elements/components/xapp.yml rename to external/components/xapp.yml diff --git a/elements/components/xarchiver.yml b/external/components/xarchiver.yml similarity index 100% rename from elements/components/xarchiver.yml rename to external/components/xarchiver.yml diff --git a/elements/components/xdelta3.yml b/external/components/xdelta3.yml similarity index 100% rename from elements/components/xdelta3.yml rename to external/components/xdelta3.yml diff --git a/elements/components/xdg-dbus-proxy.yml b/external/components/xdg-dbus-proxy.yml similarity index 100% rename from elements/components/xdg-dbus-proxy.yml rename to external/components/xdg-dbus-proxy.yml diff --git a/elements/components/xdg-desktop-portal-gnome.yml b/external/components/xdg-desktop-portal-gnome.yml similarity index 100% rename from elements/components/xdg-desktop-portal-gnome.yml rename to external/components/xdg-desktop-portal-gnome.yml diff --git a/elements/components/xdg-desktop-portal-gtk.yml b/external/components/xdg-desktop-portal-gtk.yml similarity index 100% rename from elements/components/xdg-desktop-portal-gtk.yml rename to external/components/xdg-desktop-portal-gtk.yml diff --git a/elements/components/xdg-desktop-portal-wlr.yml b/external/components/xdg-desktop-portal-wlr.yml similarity index 100% rename from elements/components/xdg-desktop-portal-wlr.yml rename to external/components/xdg-desktop-portal-wlr.yml diff --git a/elements/components/xdg-desktop-portal-xapp.yml b/external/components/xdg-desktop-portal-xapp.yml similarity index 100% rename from elements/components/xdg-desktop-portal-xapp.yml rename to external/components/xdg-desktop-portal-xapp.yml diff --git a/elements/components/xdg-desktop-portal.yml b/external/components/xdg-desktop-portal.yml similarity index 100% rename from elements/components/xdg-desktop-portal.yml rename to external/components/xdg-desktop-portal.yml diff --git a/elements/components/xdg-user-dirs-gtk.yml b/external/components/xdg-user-dirs-gtk.yml similarity index 100% rename from elements/components/xdg-user-dirs-gtk.yml rename to external/components/xdg-user-dirs-gtk.yml diff --git a/elements/components/xdg-user-dirs.yml b/external/components/xdg-user-dirs.yml similarity index 100% rename from elements/components/xdg-user-dirs.yml rename to external/components/xdg-user-dirs.yml diff --git a/elements/components/xdg-utils.yml b/external/components/xdg-utils.yml similarity index 100% rename from elements/components/xdg-utils.yml rename to external/components/xdg-utils.yml diff --git a/elements/components/xfce4/exo.yml b/external/components/xfce4/exo.yml similarity index 100% rename from elements/components/xfce4/exo.yml rename to external/components/xfce4/exo.yml diff --git a/elements/components/xfce4/garcon.yml b/external/components/xfce4/garcon.yml similarity index 100% rename from elements/components/xfce4/garcon.yml rename to external/components/xfce4/garcon.yml diff --git a/elements/components/xfce4/libxfce4ui.yml b/external/components/xfce4/libxfce4ui.yml similarity index 100% rename from elements/components/xfce4/libxfce4ui.yml rename to external/components/xfce4/libxfce4ui.yml diff --git a/elements/components/xfce4/libxfce4util.yml b/external/components/xfce4/libxfce4util.yml similarity index 100% rename from elements/components/xfce4/libxfce4util.yml rename to external/components/xfce4/libxfce4util.yml diff --git a/elements/components/xfce4/mousepad.yml b/external/components/xfce4/mousepad.yml similarity index 100% rename from elements/components/xfce4/mousepad.yml rename to external/components/xfce4/mousepad.yml diff --git a/elements/components/xfce4/panel-plugins/xfce4-clipman-plugin.yml b/external/components/xfce4/panel-plugins/xfce4-clipman-plugin.yml similarity index 76% rename from elements/components/xfce4/panel-plugins/xfce4-clipman-plugin.yml rename to external/components/xfce4/panel-plugins/xfce4-clipman-plugin.yml index 489c11cb0..be0c9cd9a 100644 --- a/elements/components/xfce4/panel-plugins/xfce4-clipman-plugin.yml +++ b/external/components/xfce4/panel-plugins/xfce4-clipman-plugin.yml @@ -5,4 +5,4 @@ depends: - components/x11/libxtst.yml - components/qrencode.yml -merge: [elements/include/xfce4-panel-plugin.inc] \ No newline at end of file +merge: [external/include/xfce4-panel-plugin.inc] \ No newline at end of file diff --git a/elements/components/xfce4/panel-plugins/xfce4-cpufreq-plugin.yml b/external/components/xfce4/panel-plugins/xfce4-cpufreq-plugin.yml similarity index 67% rename from elements/components/xfce4/panel-plugins/xfce4-cpufreq-plugin.yml rename to external/components/xfce4/panel-plugins/xfce4-cpufreq-plugin.yml index 8a599d7ff..2be2b157b 100644 --- a/elements/components/xfce4/panel-plugins/xfce4-cpufreq-plugin.yml +++ b/external/components/xfce4/panel-plugins/xfce4-cpufreq-plugin.yml @@ -2,4 +2,4 @@ id: xfce4-cpufreq-plugin version: 1.2.8 about: CPU frequency and governor plugin for the Xfce4 panel -merge: [elements/include/xfce4-panel-plugin.inc] +merge: [external/include/xfce4-panel-plugin.inc] diff --git a/elements/components/xfce4/panel-plugins/xfce4-cpugraph-plugin.yml b/external/components/xfce4/panel-plugins/xfce4-cpugraph-plugin.yml similarity index 64% rename from elements/components/xfce4/panel-plugins/xfce4-cpugraph-plugin.yml rename to external/components/xfce4/panel-plugins/xfce4-cpugraph-plugin.yml index a3b3826da..d4c15bb41 100644 --- a/elements/components/xfce4/panel-plugins/xfce4-cpugraph-plugin.yml +++ b/external/components/xfce4/panel-plugins/xfce4-cpugraph-plugin.yml @@ -2,4 +2,4 @@ id: xfce4-cpugraph-plugin version: 1.2.8 about: Graphical representation of the CPU load -merge: [elements/include/xfce4-panel-plugin.inc] +merge: [external/include/xfce4-panel-plugin.inc] diff --git a/elements/components/xfce4/panel-plugins/xfce4-diskperf-plugin.yml b/external/components/xfce4/panel-plugins/xfce4-diskperf-plugin.yml similarity index 69% rename from elements/components/xfce4/panel-plugins/xfce4-diskperf-plugin.yml rename to external/components/xfce4/panel-plugins/xfce4-diskperf-plugin.yml index 3811a5320..16825ac4c 100644 --- a/elements/components/xfce4/panel-plugins/xfce4-diskperf-plugin.yml +++ b/external/components/xfce4/panel-plugins/xfce4-diskperf-plugin.yml @@ -2,4 +2,4 @@ id: xfce4-diskperf-plugin version: 2.7.0 about: Displays instant disk/partition performance in the Xfce4 panel -merge: [elements/include/xfce4-panel-plugin.inc] +merge: [external/include/xfce4-panel-plugin.inc] diff --git a/elements/components/xfce4/panel-plugins/xfce4-docklike-plugin.yml b/external/components/xfce4/panel-plugins/xfce4-docklike-plugin.yml similarity index 100% rename from elements/components/xfce4/panel-plugins/xfce4-docklike-plugin.yml rename to external/components/xfce4/panel-plugins/xfce4-docklike-plugin.yml diff --git a/elements/components/xfce4/panel-plugins/xfce4-eyes-plugin.yml b/external/components/xfce4/panel-plugins/xfce4-eyes-plugin.yml similarity index 69% rename from elements/components/xfce4/panel-plugins/xfce4-eyes-plugin.yml rename to external/components/xfce4/panel-plugins/xfce4-eyes-plugin.yml index 23e0693ec..048ddd444 100644 --- a/elements/components/xfce4/panel-plugins/xfce4-eyes-plugin.yml +++ b/external/components/xfce4/panel-plugins/xfce4-eyes-plugin.yml @@ -2,4 +2,4 @@ id: xfce4-eyes-plugin version: 4.6.0 about: A rolling eyes (following mouse pointer) plugin for the Xfce panel -merge: [elements/include/xfce4-panel-plugin.inc] +merge: [external/include/xfce4-panel-plugin.inc] diff --git a/elements/components/xfce4/panel-plugins/xfce4-fsguard-plugin.yml b/external/components/xfce4/panel-plugins/xfce4-fsguard-plugin.yml similarity index 67% rename from elements/components/xfce4/panel-plugins/xfce4-fsguard-plugin.yml rename to external/components/xfce4/panel-plugins/xfce4-fsguard-plugin.yml index b17878ceb..36b1e7bfc 100644 --- a/elements/components/xfce4/panel-plugins/xfce4-fsguard-plugin.yml +++ b/external/components/xfce4/panel-plugins/xfce4-fsguard-plugin.yml @@ -2,4 +2,4 @@ id: xfce4-fsguard-plugin version: 1.1.3 about: File system usage monitor plugin for the Xfce4 panel -merge: [elements/include/xfce4-panel-plugin.inc] +merge: [external/include/xfce4-panel-plugin.inc] diff --git a/elements/components/xfce4/panel-plugins/xfce4-genmon-plugin.yml b/external/components/xfce4/panel-plugins/xfce4-genmon-plugin.yml similarity index 70% rename from elements/components/xfce4/panel-plugins/xfce4-genmon-plugin.yml rename to external/components/xfce4/panel-plugins/xfce4-genmon-plugin.yml index 95aded24e..1f0d2db3b 100644 --- a/elements/components/xfce4/panel-plugins/xfce4-genmon-plugin.yml +++ b/external/components/xfce4/panel-plugins/xfce4-genmon-plugin.yml @@ -2,4 +2,4 @@ id: xfce4-genmon-plugin version: 4.2.0 about: Plugin that monitors customizable programs stdout for the Xfce4 panel -merge: [elements/include/xfce4-panel-plugin.inc] +merge: [external/include/xfce4-panel-plugin.inc] diff --git a/elements/components/xfce4/panel-plugins/xfce4-mailwatch-plugin.yml b/external/components/xfce4/panel-plugins/xfce4-mailwatch-plugin.yml similarity index 75% rename from elements/components/xfce4/panel-plugins/xfce4-mailwatch-plugin.yml rename to external/components/xfce4/panel-plugins/xfce4-mailwatch-plugin.yml index e9bec278f..c326c80ba 100644 --- a/elements/components/xfce4/panel-plugins/xfce4-mailwatch-plugin.yml +++ b/external/components/xfce4/panel-plugins/xfce4-mailwatch-plugin.yml @@ -5,4 +5,4 @@ about: Multi-protocol, multi-mailbox mail watcher for the Xfce4 panel depends: - components/gnutls.yml -merge: [elements/include/xfce4-panel-plugin.inc] +merge: [external/include/xfce4-panel-plugin.inc] diff --git a/elements/components/xfce4/panel-plugins/xfce4-mount-plugin.yml b/external/components/xfce4/panel-plugins/xfce4-mount-plugin.yml similarity index 63% rename from elements/components/xfce4/panel-plugins/xfce4-mount-plugin.yml rename to external/components/xfce4/panel-plugins/xfce4-mount-plugin.yml index c7622e37c..55f8dbef3 100644 --- a/elements/components/xfce4/panel-plugins/xfce4-mount-plugin.yml +++ b/external/components/xfce4/panel-plugins/xfce4-mount-plugin.yml @@ -2,4 +2,4 @@ id: xfce4-mount-plugin version: 1.1.6 about: Mount/umount utility for the Xfce4 panel -merge: [elements/include/xfce4-panel-plugin.inc] +merge: [external/include/xfce4-panel-plugin.inc] diff --git a/elements/components/xfce4/panel-plugins/xfce4-mpc-plugin.yml b/external/components/xfce4/panel-plugins/xfce4-mpc-plugin.yml similarity index 73% rename from elements/components/xfce4/panel-plugins/xfce4-mpc-plugin.yml rename to external/components/xfce4/panel-plugins/xfce4-mpc-plugin.yml index 805f0615d..6323accc2 100644 --- a/elements/components/xfce4/panel-plugins/xfce4-mpc-plugin.yml +++ b/external/components/xfce4/panel-plugins/xfce4-mpc-plugin.yml @@ -5,4 +5,4 @@ about: Control the Music Player Daemon from the Xfce4 panel depends: - components/libmpd.yml -merge: [elements/include/xfce4-panel-plugin.inc] +merge: [external/include/xfce4-panel-plugin.inc] diff --git a/elements/components/xfce4/panel-plugins/xfce4-netload-plugin.yml b/external/components/xfce4/panel-plugins/xfce4-netload-plugin.yml similarity index 63% rename from elements/components/xfce4/panel-plugins/xfce4-netload-plugin.yml rename to external/components/xfce4/panel-plugins/xfce4-netload-plugin.yml index 07e1a04bb..e232ae28f 100644 --- a/elements/components/xfce4/panel-plugins/xfce4-netload-plugin.yml +++ b/external/components/xfce4/panel-plugins/xfce4-netload-plugin.yml @@ -2,4 +2,4 @@ id: xfce4-netload-plugin version: 1.4.1 about: A netload plugin for the Xfce panel -merge: [elements/include/xfce4-panel-plugin.inc] +merge: [external/include/xfce4-panel-plugin.inc] diff --git a/elements/components/xfce4/panel-plugins/xfce4-notes-plugin.yml b/external/components/xfce4/panel-plugins/xfce4-notes-plugin.yml similarity index 76% rename from elements/components/xfce4/panel-plugins/xfce4-notes-plugin.yml rename to external/components/xfce4/panel-plugins/xfce4-notes-plugin.yml index 8ceaf1639..a344e3c15 100644 --- a/elements/components/xfce4/panel-plugins/xfce4-notes-plugin.yml +++ b/external/components/xfce4/panel-plugins/xfce4-notes-plugin.yml @@ -6,4 +6,4 @@ configure: >- CFLAGS="$CFLAGS -Wno-incompatible-pointer-types" --disable-debug -merge: [elements/include/xfce4-panel-plugin.inc] +merge: [external/include/xfce4-panel-plugin.inc] diff --git a/elements/components/xfce4/panel-plugins/xfce4-pulseaudio-plugin.yml b/external/components/xfce4/panel-plugins/xfce4-pulseaudio-plugin.yml similarity index 100% rename from elements/components/xfce4/panel-plugins/xfce4-pulseaudio-plugin.yml rename to external/components/xfce4/panel-plugins/xfce4-pulseaudio-plugin.yml diff --git a/elements/components/xfce4/panel-plugins/xfce4-sensors-plugin.yml b/external/components/xfce4/panel-plugins/xfce4-sensors-plugin.yml similarity index 75% rename from elements/components/xfce4/panel-plugins/xfce4-sensors-plugin.yml rename to external/components/xfce4/panel-plugins/xfce4-sensors-plugin.yml index e010bb603..e7510dcf8 100644 --- a/elements/components/xfce4/panel-plugins/xfce4-sensors-plugin.yml +++ b/external/components/xfce4/panel-plugins/xfce4-sensors-plugin.yml @@ -6,4 +6,4 @@ depends: - components/libnotify.yml - components/lm-sensors.yml -merge: [elements/include/xfce4-panel-plugin.inc] +merge: [external/include/xfce4-panel-plugin.inc] diff --git a/elements/components/xfce4/panel-plugins/xfce4-smartbookmark-plugin.yml b/external/components/xfce4/panel-plugins/xfce4-smartbookmark-plugin.yml similarity index 78% rename from elements/components/xfce4/panel-plugins/xfce4-smartbookmark-plugin.yml rename to external/components/xfce4/panel-plugins/xfce4-smartbookmark-plugin.yml index 7846e63d6..bc88397f4 100644 --- a/elements/components/xfce4/panel-plugins/xfce4-smartbookmark-plugin.yml +++ b/external/components/xfce4/panel-plugins/xfce4-smartbookmark-plugin.yml @@ -5,4 +5,4 @@ about: Allows you to send requests directly to your browser and perform a custom build-depends: - components/x11/libxt.yml -merge: [elements/include/xfce4-panel-plugin.inc] +merge: [external/include/xfce4-panel-plugin.inc] diff --git a/elements/components/xfce4/panel-plugins/xfce4-systemload-plugin.yml b/external/components/xfce4/panel-plugins/xfce4-systemload-plugin.yml similarity index 72% rename from elements/components/xfce4/panel-plugins/xfce4-systemload-plugin.yml rename to external/components/xfce4/panel-plugins/xfce4-systemload-plugin.yml index 8bf5d7208..18e104c5f 100644 --- a/elements/components/xfce4/panel-plugins/xfce4-systemload-plugin.yml +++ b/external/components/xfce4/panel-plugins/xfce4-systemload-plugin.yml @@ -5,4 +5,4 @@ about: System load plugin for the Xfce panel build-depends: - components/libgtop.yml -merge: [elements/include/xfce4-panel-plugin.inc] +merge: [external/include/xfce4-panel-plugin.inc] diff --git a/elements/components/xfce4/panel-plugins/xfce4-time-out-plugin.yml b/external/components/xfce4/panel-plugins/xfce4-time-out-plugin.yml similarity index 68% rename from elements/components/xfce4/panel-plugins/xfce4-time-out-plugin.yml rename to external/components/xfce4/panel-plugins/xfce4-time-out-plugin.yml index bd7a091e3..8e239a58f 100644 --- a/elements/components/xfce4/panel-plugins/xfce4-time-out-plugin.yml +++ b/external/components/xfce4/panel-plugins/xfce4-time-out-plugin.yml @@ -2,4 +2,4 @@ id: xfce4-time-out-plugin version: 1.1.3 about: Take a break from your computer with this plugin for Xfce4 -merge: [elements/include/xfce4-panel-plugin.inc] +merge: [external/include/xfce4-panel-plugin.inc] diff --git a/elements/components/xfce4/panel-plugins/xfce4-timer-plugin.yml b/external/components/xfce4/panel-plugins/xfce4-timer-plugin.yml similarity index 63% rename from elements/components/xfce4/panel-plugins/xfce4-timer-plugin.yml rename to external/components/xfce4/panel-plugins/xfce4-timer-plugin.yml index 7a1d992ac..6f50b66f5 100644 --- a/elements/components/xfce4/panel-plugins/xfce4-timer-plugin.yml +++ b/external/components/xfce4/panel-plugins/xfce4-timer-plugin.yml @@ -2,4 +2,4 @@ id: xfce4-timer-plugin version: 1.7.2 about: Plugin to track time for the Xfce4 panel -merge: [elements/include/xfce4-panel-plugin.inc] +merge: [external/include/xfce4-panel-plugin.inc] diff --git a/elements/components/xfce4/panel-plugins/xfce4-verve-plugin.yml b/external/components/xfce4/panel-plugins/xfce4-verve-plugin.yml similarity index 63% rename from elements/components/xfce4/panel-plugins/xfce4-verve-plugin.yml rename to external/components/xfce4/panel-plugins/xfce4-verve-plugin.yml index 6c53ad40c..c4389abd1 100644 --- a/elements/components/xfce4/panel-plugins/xfce4-verve-plugin.yml +++ b/external/components/xfce4/panel-plugins/xfce4-verve-plugin.yml @@ -2,4 +2,4 @@ id: xfce4-verve-plugin version: 2.0.3 about: Command line plugin for the Xfce panel -merge: [elements/include/xfce4-panel-plugin.inc] +merge: [external/include/xfce4-panel-plugin.inc] diff --git a/elements/components/xfce4/panel-plugins/xfce4-wavelan-plugin.yml b/external/components/xfce4/panel-plugins/xfce4-wavelan-plugin.yml similarity index 67% rename from elements/components/xfce4/panel-plugins/xfce4-wavelan-plugin.yml rename to external/components/xfce4/panel-plugins/xfce4-wavelan-plugin.yml index e81dc9599..d1eb0d043 100644 --- a/elements/components/xfce4/panel-plugins/xfce4-wavelan-plugin.yml +++ b/external/components/xfce4/panel-plugins/xfce4-wavelan-plugin.yml @@ -2,4 +2,4 @@ id: xfce4-wavelan-plugin version: 0.6.3 about: Plugin to monitor wifi connectivity for the Xfce4 panel -merge: [elements/include/xfce4-panel-plugin.inc] +merge: [external/include/xfce4-panel-plugin.inc] diff --git a/elements/components/xfce4/panel-plugins/xfce4-weather-plugin.yml b/external/components/xfce4/panel-plugins/xfce4-weather-plugin.yml similarity index 75% rename from elements/components/xfce4/panel-plugins/xfce4-weather-plugin.yml rename to external/components/xfce4/panel-plugins/xfce4-weather-plugin.yml index 8c52cefc7..88d06d548 100644 --- a/elements/components/xfce4/panel-plugins/xfce4-weather-plugin.yml +++ b/external/components/xfce4/panel-plugins/xfce4-weather-plugin.yml @@ -6,4 +6,4 @@ depends: - components/libsoup.yml - components/libxml2.yml -merge: [elements/include/xfce4-panel-plugin.inc] +merge: [external/include/xfce4-panel-plugin.inc] diff --git a/elements/components/xfce4/panel-plugins/xfce4-whiskermenu-plugin.yml b/external/components/xfce4/panel-plugins/xfce4-whiskermenu-plugin.yml similarity index 100% rename from elements/components/xfce4/panel-plugins/xfce4-whiskermenu-plugin.yml rename to external/components/xfce4/panel-plugins/xfce4-whiskermenu-plugin.yml diff --git a/elements/components/xfce4/panel-plugins/xfce4-xkb-plugin.yml b/external/components/xfce4/panel-plugins/xfce4-xkb-plugin.yml similarity index 100% rename from elements/components/xfce4/panel-plugins/xfce4-xkb-plugin.yml rename to external/components/xfce4/panel-plugins/xfce4-xkb-plugin.yml diff --git a/elements/components/xfce4/parole.yml b/external/components/xfce4/parole.yml similarity index 100% rename from elements/components/xfce4/parole.yml rename to external/components/xfce4/parole.yml diff --git a/elements/components/xfce4/ristretto.yml b/external/components/xfce4/ristretto.yml similarity index 100% rename from elements/components/xfce4/ristretto.yml rename to external/components/xfce4/ristretto.yml diff --git a/elements/components/xfce4/thunar-volman.yml b/external/components/xfce4/thunar-volman.yml similarity index 100% rename from elements/components/xfce4/thunar-volman.yml rename to external/components/xfce4/thunar-volman.yml diff --git a/elements/components/xfce4/thunar.yml b/external/components/xfce4/thunar.yml similarity index 100% rename from elements/components/xfce4/thunar.yml rename to external/components/xfce4/thunar.yml diff --git a/elements/components/xfce4/tumbler.yml b/external/components/xfce4/tumbler.yml similarity index 100% rename from elements/components/xfce4/tumbler.yml rename to external/components/xfce4/tumbler.yml diff --git a/elements/components/xfce4/xfce4-appfinder.yml b/external/components/xfce4/xfce4-appfinder.yml similarity index 100% rename from elements/components/xfce4/xfce4-appfinder.yml rename to external/components/xfce4/xfce4-appfinder.yml diff --git a/elements/components/xfce4/xfce4-dev-tools.yml b/external/components/xfce4/xfce4-dev-tools.yml similarity index 100% rename from elements/components/xfce4/xfce4-dev-tools.yml rename to external/components/xfce4/xfce4-dev-tools.yml diff --git a/elements/components/xfce4/xfce4-notifyd.yml b/external/components/xfce4/xfce4-notifyd.yml similarity index 100% rename from elements/components/xfce4/xfce4-notifyd.yml rename to external/components/xfce4/xfce4-notifyd.yml diff --git a/elements/components/xfce4/xfce4-panel-profiles.yml b/external/components/xfce4/xfce4-panel-profiles.yml similarity index 100% rename from elements/components/xfce4/xfce4-panel-profiles.yml rename to external/components/xfce4/xfce4-panel-profiles.yml diff --git a/elements/components/xfce4/xfce4-panel.yml b/external/components/xfce4/xfce4-panel.yml similarity index 100% rename from elements/components/xfce4/xfce4-panel.yml rename to external/components/xfce4/xfce4-panel.yml diff --git a/elements/components/xfce4/xfce4-power-manager.yml b/external/components/xfce4/xfce4-power-manager.yml similarity index 100% rename from elements/components/xfce4/xfce4-power-manager.yml rename to external/components/xfce4/xfce4-power-manager.yml diff --git a/elements/components/xfce4/xfce4-screensaver.yml b/external/components/xfce4/xfce4-screensaver.yml similarity index 100% rename from elements/components/xfce4/xfce4-screensaver.yml rename to external/components/xfce4/xfce4-screensaver.yml diff --git a/elements/components/xfce4/xfce4-screenshooter.yml b/external/components/xfce4/xfce4-screenshooter.yml similarity index 100% rename from elements/components/xfce4/xfce4-screenshooter.yml rename to external/components/xfce4/xfce4-screenshooter.yml diff --git a/elements/components/xfce4/xfce4-session.yml b/external/components/xfce4/xfce4-session.yml similarity index 100% rename from elements/components/xfce4/xfce4-session.yml rename to external/components/xfce4/xfce4-session.yml diff --git a/elements/components/xfce4/xfce4-settings.yml b/external/components/xfce4/xfce4-settings.yml similarity index 100% rename from elements/components/xfce4/xfce4-settings.yml rename to external/components/xfce4/xfce4-settings.yml diff --git a/elements/components/xfce4/xfce4-taskmanager.yml b/external/components/xfce4/xfce4-taskmanager.yml similarity index 100% rename from elements/components/xfce4/xfce4-taskmanager.yml rename to external/components/xfce4/xfce4-taskmanager.yml diff --git a/elements/components/xfce4/xfce4-terminal.yml b/external/components/xfce4/xfce4-terminal.yml similarity index 100% rename from elements/components/xfce4/xfce4-terminal.yml rename to external/components/xfce4/xfce4-terminal.yml diff --git a/elements/components/xfce4/xfconf.yml b/external/components/xfce4/xfconf.yml similarity index 100% rename from elements/components/xfce4/xfconf.yml rename to external/components/xfce4/xfconf.yml diff --git a/elements/components/xfce4/xfdesktop.yml b/external/components/xfce4/xfdesktop.yml similarity index 100% rename from elements/components/xfce4/xfdesktop.yml rename to external/components/xfce4/xfdesktop.yml diff --git a/elements/components/xfce4/xfwm4.yml b/external/components/xfce4/xfwm4.yml similarity index 100% rename from elements/components/xfce4/xfwm4.yml rename to external/components/xfce4/xfwm4.yml diff --git a/elements/components/xiccd.yml b/external/components/xiccd.yml similarity index 100% rename from elements/components/xiccd.yml rename to external/components/xiccd.yml diff --git a/elements/components/xine-lib.yml b/external/components/xine-lib.yml similarity index 100% rename from elements/components/xine-lib.yml rename to external/components/xine-lib.yml diff --git a/elements/components/xmlto.yml b/external/components/xmlto.yml similarity index 100% rename from elements/components/xmlto.yml rename to external/components/xmlto.yml diff --git a/elements/components/xxhash.yml b/external/components/xxhash.yml similarity index 100% rename from elements/components/xxhash.yml rename to external/components/xxhash.yml diff --git a/elements/components/xz.yml b/external/components/xz.yml similarity index 100% rename from elements/components/xz.yml rename to external/components/xz.yml diff --git a/elements/components/yajl.yml b/external/components/yajl.yml similarity index 100% rename from elements/components/yajl.yml rename to external/components/yajl.yml diff --git a/elements/components/yarn.yml b/external/components/yarn.yml similarity index 100% rename from elements/components/yarn.yml rename to external/components/yarn.yml diff --git a/elements/components/yasm.yml b/external/components/yasm.yml similarity index 100% rename from elements/components/yasm.yml rename to external/components/yasm.yml diff --git a/elements/components/yelp-xsl.yml b/external/components/yelp-xsl.yml similarity index 100% rename from elements/components/yelp-xsl.yml rename to external/components/yelp-xsl.yml diff --git a/elements/components/yodl.yml b/external/components/yodl.yml similarity index 100% rename from elements/components/yodl.yml rename to external/components/yodl.yml diff --git a/elements/components/zenity.yml b/external/components/zenity.yml similarity index 100% rename from elements/components/zenity.yml rename to external/components/zenity.yml diff --git a/elements/components/zip.yml b/external/components/zip.yml similarity index 100% rename from elements/components/zip.yml rename to external/components/zip.yml diff --git a/elements/components/zlib.yml b/external/components/zlib.yml similarity index 100% rename from elements/components/zlib.yml rename to external/components/zlib.yml diff --git a/elements/components/zram-generator.yml b/external/components/zram-generator.yml similarity index 100% rename from elements/components/zram-generator.yml rename to external/components/zram-generator.yml diff --git a/elements/components/zsh-autosuggestions.yml b/external/components/zsh-autosuggestions.yml similarity index 100% rename from elements/components/zsh-autosuggestions.yml rename to external/components/zsh-autosuggestions.yml diff --git a/elements/components/zsh.yml b/external/components/zsh.yml similarity index 100% rename from elements/components/zsh.yml rename to external/components/zsh.yml diff --git a/elements/components/zstd.yml b/external/components/zstd.yml similarity index 100% rename from elements/components/zstd.yml rename to external/components/zstd.yml diff --git a/elements/components/zsync.yml b/external/components/zsync.yml similarity index 100% rename from elements/components/zsync.yml rename to external/components/zsync.yml diff --git a/elements/container/image.yml b/external/container/image.yml similarity index 94% rename from elements/container/image.yml rename to external/container/image.yml index 9485bb0ac..0e10db4c0 100644 --- a/elements/container/image.yml +++ b/external/container/image.yml @@ -1,5 +1,5 @@ id: rlxos-container-devel -merge: [version.yml, elements/include/container.inc] +merge: [version.yml, external/include/container.inc] about: rlxos container developers image capabilities: diff --git a/elements/extensions/awesome.yml b/external/extensions/awesome.yml similarity index 69% rename from elements/extensions/awesome.yml rename to external/extensions/awesome.yml index defb75d05..1da8c4d4b 100644 --- a/elements/extensions/awesome.yml +++ b/external/extensions/awesome.yml @@ -4,4 +4,4 @@ about: Awesome window manager include: - components/awesome.yml -merge: [elements/include/extension.inc] +merge: [external/include/extension.inc] diff --git a/elements/extensions/bspwm.yml b/external/extensions/bspwm.yml similarity index 68% rename from elements/extensions/bspwm.yml rename to external/extensions/bspwm.yml index d0268d1e9..69ef5ed9f 100644 --- a/elements/extensions/bspwm.yml +++ b/external/extensions/bspwm.yml @@ -4,4 +4,4 @@ about: bspwm window manager include: - components/bspwm.yml -merge: [elements/include/extension.inc] +merge: [external/include/extension.inc] diff --git a/elements/extensions/dotnet.yml b/external/extensions/dotnet.yml similarity index 70% rename from elements/extensions/dotnet.yml rename to external/extensions/dotnet.yml index 8ce159b6b..1d4240d87 100644 --- a/elements/extensions/dotnet.yml +++ b/external/extensions/dotnet.yml @@ -4,4 +4,4 @@ about: Binary release of .NET include: - components/dotnet.yml -merge: [elements/include/extension.inc] +merge: [external/include/extension.inc] diff --git a/elements/extensions/enlightenment.yml b/external/extensions/enlightenment.yml similarity index 75% rename from elements/extensions/enlightenment.yml rename to external/extensions/enlightenment.yml index 57429b686..0c6836ebf 100644 --- a/elements/extensions/enlightenment.yml +++ b/external/extensions/enlightenment.yml @@ -4,4 +4,4 @@ about: Enlightenment desktop environment include: - components/meta-enlightenment.yml -merge: [elements/include/extension.inc] +merge: [external/include/extension.inc] diff --git a/elements/extensions/i3.yml b/external/extensions/i3.yml similarity index 76% rename from elements/extensions/i3.yml rename to external/extensions/i3.yml index 0a9dbe651..768d86752 100644 --- a/elements/extensions/i3.yml +++ b/external/extensions/i3.yml @@ -6,4 +6,4 @@ include: - components/i3lock.yml - components/i3status.yml -merge: [elements/include/extension.inc] +merge: [external/include/extension.inc] diff --git a/elements/extensions/nvidia.yml b/external/extensions/nvidia.yml similarity index 72% rename from elements/extensions/nvidia.yml rename to external/extensions/nvidia.yml index 8b8e4d11e..5a53f2880 100644 --- a/elements/extensions/nvidia.yml +++ b/external/extensions/nvidia.yml @@ -4,4 +4,4 @@ about: Nvidia userland utilities include: - components/nvidia-settings.yml -merge: [elements/include/extension.inc] +merge: [external/include/extension.inc] diff --git a/elements/extensions/openjdk.yml b/external/extensions/openjdk.yml similarity index 67% rename from elements/extensions/openjdk.yml rename to external/extensions/openjdk.yml index 77e5b7e5c..c5616d8df 100644 --- a/elements/extensions/openjdk.yml +++ b/external/extensions/openjdk.yml @@ -1,5 +1,5 @@ id: openjdk -merge: [elements/include/java.inc, elements/include/extension.inc] +merge: [external/include/java.inc, external/include/extension.inc] about: Open-source implementation of Oracle's Java Standard Edition platform include: diff --git a/elements/extensions/qemu.yml b/external/extensions/qemu.yml similarity index 82% rename from elements/extensions/qemu.yml rename to external/extensions/qemu.yml index d4efa3e7d..aaca3d69e 100644 --- a/elements/extensions/qemu.yml +++ b/external/extensions/qemu.yml @@ -7,4 +7,4 @@ include: - components/libvirt.yml - components/virt-manager.yml -merge: [elements/include/extension.inc] +merge: [external/include/extension.inc] diff --git a/elements/extensions/qt.yml b/external/extensions/qt.yml similarity index 72% rename from elements/extensions/qt.yml rename to external/extensions/qt.yml index d70c99668..4cfade26b 100644 --- a/elements/extensions/qt.yml +++ b/external/extensions/qt.yml @@ -4,7 +4,7 @@ about: Qt ui toolkit include: - components/qt.yml -merge: [elements/include/extension.inc] +merge: [external/include/extension.inc] include-parts: - devel - doc diff --git a/elements/extensions/sdk.yml b/external/extensions/sdk.yml similarity index 96% rename from elements/extensions/sdk.yml rename to external/extensions/sdk.yml index 6c1237743..127ad8b3d 100644 --- a/elements/extensions/sdk.yml +++ b/external/extensions/sdk.yml @@ -47,4 +47,4 @@ include-parts: extra-commands: |- mkdir -p %{include-root}/%{prefix}/local/include -merge: [elements/include/extension.inc] \ No newline at end of file +merge: [external/include/extension.inc] \ No newline at end of file diff --git a/elements/extensions/sway.yml b/external/extensions/sway.yml similarity index 81% rename from elements/extensions/sway.yml rename to external/extensions/sway.yml index d6af573e5..46da5165b 100644 --- a/elements/extensions/sway.yml +++ b/external/extensions/sway.yml @@ -8,4 +8,4 @@ include: - components/swayidle.yml - components/swaylock.yml -merge: [elements/include/extension.inc] +merge: [external/include/extension.inc] diff --git a/elements/extensions/wine.yml b/external/extensions/wine.yml similarity index 72% rename from elements/extensions/wine.yml rename to external/extensions/wine.yml index c9e746284..c1df3ea3b 100644 --- a/elements/extensions/wine.yml +++ b/external/extensions/wine.yml @@ -4,4 +4,4 @@ about: Window Compatibility layer (64bit only) include: - components/wine.yml -merge: [elements/include/extension.inc] +merge: [external/include/extension.inc] diff --git a/elements/extensions/wm-kit-x11.yml b/external/extensions/wm-kit-x11.yml similarity index 83% rename from elements/extensions/wm-kit-x11.yml rename to external/extensions/wm-kit-x11.yml index 60e0ba19b..e921304b5 100644 --- a/elements/extensions/wm-kit-x11.yml +++ b/external/extensions/wm-kit-x11.yml @@ -8,4 +8,4 @@ include: - components/picom.yml - components/rofi.yml -merge: [elements/include/extension.inc] +merge: [external/include/extension.inc] diff --git a/elements/extensions/wm-kit.yml b/external/extensions/wm-kit.yml similarity index 85% rename from elements/extensions/wm-kit.yml rename to external/extensions/wm-kit.yml index a2fec78c1..56b082155 100644 --- a/elements/extensions/wm-kit.yml +++ b/external/extensions/wm-kit.yml @@ -9,4 +9,4 @@ include: - components/i3blocks.yml - components/rofi.yml -merge: [elements/include/extension.inc] +merge: [external/include/extension.inc] diff --git a/elements/image-builder/debian.yml b/external/image-builder/debian.yml similarity index 100% rename from elements/image-builder/debian.yml rename to external/image-builder/debian.yml diff --git a/elements/include/app.inc b/external/include/app.inc similarity index 100% rename from elements/include/app.inc rename to external/include/app.inc diff --git a/elements/include/appimage.inc b/external/include/appimage.inc similarity index 100% rename from elements/include/appimage.inc rename to external/include/appimage.inc diff --git a/elements/include/binutils.inc b/external/include/binutils.inc similarity index 100% rename from elements/include/binutils.inc rename to external/include/binutils.inc diff --git a/elements/include/container.inc b/external/include/container.inc similarity index 100% rename from elements/include/container.inc rename to external/include/container.inc diff --git a/elements/include/extension.inc b/external/include/extension.inc similarity index 86% rename from elements/include/extension.inc rename to external/include/extension.inc index 8888de440..356b52f1e 100644 --- a/elements/include/extension.inc +++ b/external/include/extension.inc @@ -10,4 +10,4 @@ initial-commands: |- ostree-branch: x86_64/extension/%{id}/%{channel} -merge: [channel.yml, elements/include/ostree.inc] +merge: [channel.yml, external/include/ostree.inc] diff --git a/elements/include/gcc.inc b/external/include/gcc.inc similarity index 100% rename from elements/include/gcc.inc rename to external/include/gcc.inc diff --git a/elements/include/glade.inc b/external/include/glade.inc similarity index 100% rename from elements/include/glade.inc rename to external/include/glade.inc diff --git a/elements/include/glibc.inc b/external/include/glibc.inc similarity index 97% rename from elements/include/glibc.inc rename to external/include/glibc.inc index 825cd3028..9eb2491d1 100644 --- a/elements/include/glibc.inc +++ b/external/include/glibc.inc @@ -47,6 +47,6 @@ post-script: | sources: - https://ftp.gnu.org/gnu/glibc/glibc-%{version}.tar.xz - - files/sdt.h - - files/sdt-config.h + - assets/sdt.h + - assets/sdt-config.h diff --git a/elements/include/go-pkg.inc b/external/include/go-pkg.inc similarity index 100% rename from elements/include/go-pkg.inc rename to external/include/go-pkg.inc diff --git a/elements/include/gtk-theme.inc b/external/include/gtk-theme.inc similarity index 100% rename from elements/include/gtk-theme.inc rename to external/include/gtk-theme.inc diff --git a/elements/include/installer.inc b/external/include/installer.inc similarity index 100% rename from elements/include/installer.inc rename to external/include/installer.inc diff --git a/elements/include/integrate-apps.inc b/external/include/integrate-apps.inc similarity index 100% rename from elements/include/integrate-apps.inc rename to external/include/integrate-apps.inc diff --git a/elements/include/java.inc b/external/include/java.inc similarity index 100% rename from elements/include/java.inc rename to external/include/java.inc diff --git a/elements/include/kf5.inc b/external/include/kf5.inc similarity index 100% rename from elements/include/kf5.inc rename to external/include/kf5.inc diff --git a/elements/include/linux.inc b/external/include/linux.inc similarity index 100% rename from elements/include/linux.inc rename to external/include/linux.inc diff --git a/elements/include/liveconfig.inc b/external/include/liveconfig.inc similarity index 100% rename from elements/include/liveconfig.inc rename to external/include/liveconfig.inc diff --git a/elements/include/meta.inc b/external/include/meta.inc similarity index 100% rename from elements/include/meta.inc rename to external/include/meta.inc diff --git a/elements/include/nvidia.inc b/external/include/nvidia.inc similarity index 100% rename from elements/include/nvidia.inc rename to external/include/nvidia.inc diff --git a/elements/include/ostree.inc b/external/include/ostree.inc similarity index 100% rename from elements/include/ostree.inc rename to external/include/ostree.inc diff --git a/elements/include/plasma.inc b/external/include/plasma.inc similarity index 100% rename from elements/include/plasma.inc rename to external/include/plasma.inc diff --git a/elements/include/rlxos.inc b/external/include/rlxos.inc similarity index 100% rename from elements/include/rlxos.inc rename to external/include/rlxos.inc diff --git a/elements/include/rust.inc b/external/include/rust.inc similarity index 100% rename from elements/include/rust.inc rename to external/include/rust.inc diff --git a/elements/include/theme.inc b/external/include/theme.inc similarity index 100% rename from elements/include/theme.inc rename to external/include/theme.inc diff --git a/elements/include/thunar-plugin.inc b/external/include/thunar-plugin.inc similarity index 100% rename from elements/include/thunar-plugin.inc rename to external/include/thunar-plugin.inc diff --git a/elements/include/update-icon-cache.inc b/external/include/update-icon-cache.inc similarity index 100% rename from elements/include/update-icon-cache.inc rename to external/include/update-icon-cache.inc diff --git a/elements/include/usr.inc b/external/include/usr.inc similarity index 100% rename from elements/include/usr.inc rename to external/include/usr.inc diff --git a/elements/include/xfce4-panel-plugin.inc b/external/include/xfce4-panel-plugin.inc similarity index 100% rename from elements/include/xfce4-panel-plugin.inc rename to external/include/xfce4-panel-plugin.inc diff --git a/elements/installer/image.yml b/external/installer/image.yml similarity index 95% rename from elements/installer/image.yml rename to external/installer/image.yml index 381bde736..e1f7baed7 100644 --- a/elements/installer/image.yml +++ b/external/installer/image.yml @@ -1,5 +1,5 @@ id: ostree-installer -merge: [version.yml, ostree-branch.yml, elements/include/installer.inc] +merge: [version.yml, ostree-branch.yml, external/include/installer.inc] about: OSTree Installer ISO include: diff --git a/elements/integrity/build-tools-skip-autogen.yml b/external/integrity/build-tools-skip-autogen.yml similarity index 100% rename from elements/integrity/build-tools-skip-autogen.yml rename to external/integrity/build-tools-skip-autogen.yml diff --git a/elements/integrity/container-requirements.yml b/external/integrity/container-requirements.yml similarity index 100% rename from elements/integrity/container-requirements.yml rename to external/integrity/container-requirements.yml diff --git a/elements/integrity/golang-source-pkg.yml b/external/integrity/golang-source-pkg.yml similarity index 100% rename from elements/integrity/golang-source-pkg.yml rename to external/integrity/golang-source-pkg.yml diff --git a/elements/integrity/ostree.yml b/external/integrity/ostree.yml similarity index 100% rename from elements/integrity/ostree.yml rename to external/integrity/ostree.yml diff --git a/elements/integrity/strip.yml b/external/integrity/strip.yml similarity index 100% rename from elements/integrity/strip.yml rename to external/integrity/strip.yml diff --git a/elements/kernel/linux.yml b/external/kernel/linux.yml similarity index 99% rename from elements/kernel/linux.yml rename to external/kernel/linux.yml index 95e5442b5..d05bd09c3 100644 --- a/elements/kernel/linux.yml +++ b/external/kernel/linux.yml @@ -1,12 +1,12 @@ id: linux -merge: [elements/include/linux.inc] +merge: [external/include/linux.inc] release: 2 about: | Linux kernel, modules and headers sources: - https://www.kernel.org/pub/linux/kernel/v%{version:1}.x/linux-%{version}.tar.xz - - files/sign-keys/modules/linux-module-cert.crt - - files/sign-keys/linux-module-cert.key + - assets/sign-keys/modules/linux-module-cert.crt + - assets/sign-keys/linux-module-cert.key environ: - KBUILD_BUILD_TIMESTAMP=Fri Nov 12 12:00:00 UTC 2011 diff --git a/elements/platform.yml b/external/platform.yml similarity index 98% rename from elements/platform.yml rename to external/platform.yml index 7aca9a47e..19f90d7a6 100644 --- a/elements/platform.yml +++ b/external/platform.yml @@ -1,6 +1,6 @@ id: platform version: 2.0 -merge: [elements/include/meta.inc] +merge: [external/include/meta.inc] about: RLXOS platform components depends: diff --git a/elements/system/default-background.yml b/external/system/default-background.yml similarity index 77% rename from elements/system/default-background.yml rename to external/system/default-background.yml index d9b0ae1f3..e6ad99b3b 100644 --- a/elements/system/default-background.yml +++ b/external/system/default-background.yml @@ -6,4 +6,4 @@ build-type: import target: "usr/share/backgrounds/" sources: - - files/backgrounds/default.jpeg + - assets/backgrounds/default.jpeg diff --git a/elements/system/etc-default-useradd.yml b/external/system/etc-default-useradd.yml similarity index 100% rename from elements/system/etc-default-useradd.yml rename to external/system/etc-default-useradd.yml diff --git a/elements/system/etc-shells.yml b/external/system/etc-shells.yml similarity index 100% rename from elements/system/etc-shells.yml rename to external/system/etc-shells.yml diff --git a/elements/system/etc-skel.yml b/external/system/etc-skel.yml similarity index 100% rename from elements/system/etc-skel.yml rename to external/system/etc-skel.yml diff --git a/elements/system/etc-sysctl.yml b/external/system/etc-sysctl.yml similarity index 100% rename from elements/system/etc-sysctl.yml rename to external/system/etc-sysctl.yml diff --git a/elements/system/ostree-config.yml b/external/system/ostree-config.yml similarity index 100% rename from elements/system/ostree-config.yml rename to external/system/ostree-config.yml diff --git a/elements/system/repo.yml b/external/system/repo.yml similarity index 95% rename from elements/system/repo.yml rename to external/system/repo.yml index 223313776..d76a83e3d 100644 --- a/elements/system/repo.yml +++ b/external/system/repo.yml @@ -1,6 +1,6 @@ id: system-repo about: System Repository -merge: [version.yml, ostree-branch.yml, elements/include/ostree.inc] +merge: [version.yml, ostree-branch.yml, external/include/ostree.inc] capabilities: - CAP_SYS_CHROOT diff --git a/elements/system/systemd-preset.yml b/external/system/systemd-preset.yml similarity index 100% rename from elements/system/systemd-preset.yml rename to external/system/systemd-preset.yml diff --git a/elements/system/x11-config.yml b/external/system/x11-config.yml similarity index 100% rename from elements/system/x11-config.yml rename to external/system/x11-config.yml diff --git a/include/environ.yml b/include/environ.yml deleted file mode 100644 index b4bbcdd9a..000000000 --- a/include/environ.yml +++ /dev/null @@ -1,10 +0,0 @@ -environ: - - CFLAGS=-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong -D_FORTIFY_SOURCE=2 --param=ssp-buffer-size=4 - - CXXFLAGS=-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong -D_FORTIFY_SOURCE=2 --param=ssp-buffer-size=4 - - LDFLAGS=-Wl,-O1,--sort-common,--as-needed,-z,relro,--hash-style=gnu - - MAKEFLAGS=-j8 - - ARCH=x86_64 - - PATH=/usr/bin - - TERM=linux - - PS1='(rlxos) \\W \\$' - - LC_ALL=POSIX diff --git a/ostree-branch.yml b/ostree-branch.yml new file mode 100644 index 000000000..1c6c6f157 --- /dev/null +++ b/ostree-branch.yml @@ -0,0 +1,2 @@ +variables: + ostree-branch: x86_64/os/unstable diff --git a/pkg/localize/localization.go b/pkg/localize/localization.go deleted file mode 100644 index e4394cc0a..000000000 --- a/pkg/localize/localization.go +++ /dev/null @@ -1,85 +0,0 @@ -package localize - -import ( - "gopkg.in/yaml.v3" - "log" - "os" - "strings" -) - -type Translation struct { - String string `yaml:"string"` - Translation string `yaml:"translation"` -} - -var translations = map[string]map[string]string{} - -func Open(s string) (map[string]string, error) { - if _, err := os.Stat(s); os.IsNotExist(err) { - return map[string]string{}, nil - } - data, err := os.ReadFile(s) - if err != nil { - return nil, err - } - var ts []Translation - if err := yaml.Unmarshal(data, &ts); err != nil { - log.Fatal(err) - } - m := map[string]string{} - for _, t := range ts { - m[t.String] = t.Translation - } - return m, nil -} - -func Save(s string, m map[string]string) error { - var ts []Translation - for k, v := range m { - ts = append(ts, Translation{ - String: k, - Translation: v, - }) - } - data, err := yaml.Marshal(&ts) - if err != nil { - return err - } - return os.WriteFile(s, data, 0644) -} - -func Add(id string, data []byte) { - var ts []Translation - if err := yaml.Unmarshal(data, &ts); err != nil { - log.Fatal(err) - } - if _, ok := translations[id]; !ok { - translations[id] = map[string]string{} - } - for _, t := range ts { - translations[id][t.String] = t.Translation - } -} - -func TranslateIn(id, str string) string { - ts, ok := translations[id] - if !ok { - return str - } - - s, ok := ts[str] - if !ok { - return str - } - return s -} - -func Translate(str string) string { - id := os.Getenv("LANG") - if id == "" { - return str - } - - s := strings.Split(id, "_") - return TranslateIn(s[0], str) -} diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt deleted file mode 100644 index b2b30d904..000000000 --- a/src/CMakeLists.txt +++ /dev/null @@ -1,6 +0,0 @@ -include_directories(common) -include_directories(external) -add_subdirectory(pkgupd) -add_subdirectory(sysroot) -add_subdirectory(capsule) -add_subdirectory(initial-setup) \ No newline at end of file diff --git a/src/capsule b/src/capsule deleted file mode 160000 index a69e63680..000000000 --- a/src/capsule +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a69e636804a8cbc0a32cf2ed43a38250c482d804 diff --git a/src/common/Application.h b/src/common/Application.h deleted file mode 100644 index c67516dfe..000000000 --- a/src/common/Application.h +++ /dev/null @@ -1,131 +0,0 @@ -/* - * Copyright (c) 2024 Manjeet Singh . - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - */ - -#ifndef PKGUPD_APP_H -#define PKGUPD_APP_H - -#include "Colors.h" -#include -#include -#include -#include - -struct Application { - struct Context { - std::vector args; - std::map values; - - std::optional operator[](const std::string &id) { - auto iter = values.find(id); - if (values.end() == iter) return std::nullopt; - return iter->second; - } - }; - -#define REGISTER_COMMAND(App, id, help, count) \ - REGISTER_COMMAND_WITH_NAME(App, #id, id, help, count) - -#define REGISTER_COMMAND_WITH_NAME(App, id, fun, help, count) \ - handlers[id] = {reinterpret_cast(&App::fun), help, count} - -#define REGISTER_MAIN(App, id, count) REGISTER_COMMAND(App, id, description, count) - - Application(std::string name, std::string description, std::string usage = ": ") : name( - std::move(name)), description(std::move(description)), usage(std::move(usage)) {} - - virtual void init() {} - - void help() { - std::cout << name << " " << usage << '\n' << description << '\n'; - if (!handlers.empty()) { - std::cout << "TASKS:" << '\n'; - for (auto const &[id, info]: handlers) { - if (id == "main") continue; - std::cout << " - " << id << std::string(10 - id.length(), ' ') << std::get<1>(info) << '\n'; - } - } - } - - std::string prompt(const std::string &message, const std::vector &available = {"Y", "n"}) { - if (auto default_prompt = ctxt["skip-prompt"]; default_prompt) { - return *default_prompt; - } - - std::cout << message << " "; - std::string sep; - for (auto const &c: available) { - std::cout << sep << c; - sep = "|"; - } - std::cout << " "; - std::getline(std::cin, sep); - return sep; - } - - bool prompt_ask(const std::string &message) { - auto res = prompt(message, {"y", "n"}); - return res == "y"; - } - - int run(int argc, char **argv) { - handler h = nullptr; - int count = -1; - for (int i = 1; i < argc; i++) { - if (auto arg = std::string(argv[i]); arg.find('=') != std::string::npos) { - auto idx = arg.find('='); - ctxt.values[arg.substr(0, idx)] = arg.substr(idx + 1); - } else if (h == nullptr && handlers.contains(argv[i])) { - h = std::get<0>(handlers[argv[i]]); - count = std::get<2>(handlers[argv[i]]); - } else { - ctxt.args.emplace_back(argv[i]); - } - } - - try { - if (h == nullptr && !handlers.contains("main")) { - help(); - return 0; - } - if (count != -1 && count != ctxt.args.size()) { - throw std::runtime_error( - "expected " + std::to_string(count) + " but " + std::to_string(ctxt.args.size()) + " provided"); - } - - this->init(); - if (h == nullptr) h = std::get<0>(handlers["main"]); - (this->*(h))(); - } catch (const std::exception &exception) { - ERROR("Error: " << exception.what()); - return 1; - } - return 0; - } - -protected: - typedef void (Application::*handler)(); - - std::map> handlers; - - const std::string name; - const std::string usage; - const std::string description; - Context ctxt; -}; - -#define APPLICATION_MAIN(id) int main(int argc, char** argv) { return id().run(argc, argv); } -#endif // PKGUPD_APP_H diff --git a/src/common/Colors.h b/src/common/Colors.h deleted file mode 100644 index 5970d7014..000000000 --- a/src/common/Colors.h +++ /dev/null @@ -1,26 +0,0 @@ -#ifndef _PKGUPD_COLOR_HH_ -#define _PKGUPD_COLOR_HH_ - -#include - -#define RESET "\033[0m" -#define COLOR(code, mesg) "\033[" #code ";1m" << mesg << RESET -#define RED(mesg) COLOR(31, mesg) -#define GREEN(mesg) COLOR(32, mesg) -#define YELLOW(mesg) COLOR(33, mesg) -#define BLUE(mesg) COLOR(34, mesg) -#define BOLD(mesg) COLOR(49, mesg) - -#define MESSAGE(header, mesg) \ - if (getenv("PKGUPD_NO_MESSAGE") == nullptr) \ - std::cout << header << BOLD(" ") << BOLD(mesg) << std::endl; - -#define ERROR(mesg) MESSAGE(RED("ERROR"), mesg) -#define PROCESS(mesg) MESSAGE(GREEN("::"), mesg << "...") -#define INFO(mesg) MESSAGE(BLUE("::"), mesg) - -#define DEBUG(mesg) \ - if (getenv("PKGUPD_NO_MESSAGE") == nullptr) \ - std::cout << "\033[2m " << mesg << RESET << std::endl; - -#endif \ No newline at end of file diff --git a/src/common/Config.h b/src/common/Config.h deleted file mode 100644 index b8c916d71..000000000 --- a/src/common/Config.h +++ /dev/null @@ -1,151 +0,0 @@ -#ifndef LIBPKGUPD_CONFIGURATION_HH -#define LIBPKGUPD_CONFIGURATION_HH - -#include -#include -#include -#include -#include - -struct Config { - YAML::Node node; - - Config() = default; - - std::vector search_path; - - void update_from_args( - int argc, char** argv, std::vector& args) { - for (int i = 1; i < argc; i++) { - std::string arg = argv[i]; - auto idx = arg.find_first_of('='); - if (idx != std::string::npos) { - auto var = arg.substr(0, idx); - auto val = arg.substr(idx + 1); - if (val.find(',') != std::string::npos) { - std::stringstream ss(val); - for (std::string s; std::getline(ss, s, ',');) { - push(var, s); - } - } else if (is_number(val)) { - set(val, std::stod(val)); - } else if (is_bool(val)) { - set(val, val == "true"); - } else { - set(var, val); - } - } else { - args.emplace_back(arg); - } - } - } - - void update_from_file(const std::string& filepath) { - std::ifstream reader(filepath); - if (!reader.good()) { - throw std::runtime_error("failed to read file '" + filepath + "'"); - } - std::string content((std::istreambuf_iterator(reader)), - (std::istreambuf_iterator())); - update_from(content, filepath); - } - - void update_from( - const std::string& data, const std::string& filepath = {}) { - auto new_node = YAML::Load(data); - node = Merge(node, new_node); - if (new_node["merge"]) { - for (auto const& i : new_node["merge"]) { - try { - auto path = std::filesystem::path(filepath).parent_path() / - i.as(); - if (std::filesystem::exists(path)) { - update_from_file( - std::filesystem::path(filepath).parent_path() / - i.as()); - } else { - bool found = false; - for (auto const& p : search_path) { - if (std::filesystem::exists( - p / i.as())) { - update_from_file(p / i.as()); - found = true; - break; - } - } - if (!found) { - throw std::runtime_error( - "missing required file to merge '" + - i.as() + "'"); - } - } - - } catch (const std::exception& exception) { - throw std::runtime_error("failed to load " + filepath + - " because " + exception.what() + - " to merge"); - } - } - } - } - - template T get(const std::string& key, T fallback) const { - if (node[key]) { return node[key].as(); } - return fallback; - } - - template T get(const std::string& key) const { - if (node[key]) { return node[key].as(); } - throw std::runtime_error("missing required key '" + key + "'"); - } - - template void set(const std::string& key, T value) { - node[key] = value; - } - - template void push(const std::string& key, T value) { - if (!node[key]) { node[key] = {}; } - node[key].push_back(value); - } - -private: - static bool is_number(const std::string& s) { - for (auto c : s) { - if (!(isdigit(c) || c == '.')) { return false; } - } - return true; - } - - static bool is_bool(const std::string& s) { - return s == "true" || s == "false"; - } - - static YAML::Node Merge(const YAML::Node& a, const YAML::Node& b) { - if (a.IsNull()) - return b; - else if (a.IsMap() && b.IsMap()) { - YAML::Node merged = a; - for (auto const& i : b) { - auto key = i.first.as(); - if (a[key]) { - merged[key] = Merge(a[key], i.second); - } else { - merged[key] = i.second; - } - } - return merged; - } else if (a.IsSequence() && b.IsSequence()) { - YAML::Node merged = a; - for (const auto& elem : b) { merged.push_back(elem); } - return merged; - } else if (a.IsScalar() && b.IsScalar()) { - return a; - } else { - std::stringstream ss; - ss << a; - throw std::runtime_error("Can't handle other type: " + ss.str()); - } - } -}; - -#endif diff --git a/src/external/Curl.h b/src/external/Curl.h deleted file mode 100644 index 3fbba027e..000000000 --- a/src/external/Curl.h +++ /dev/null @@ -1,80 +0,0 @@ -#ifndef _DOWNLOADER_HH_ -#define _DOWNLOADER_HH_ - -#include "json.h" -#include -#include -#include - -struct Curl { - CURL *backend{nullptr}; - - Curl() { - backend = curl_easy_init(); - if (!backend) throw std::runtime_error("failed to init curl"); - curl_easy_setopt(backend, CURLOPT_FOLLOWLOCATION, 1L); - } - - ~Curl() { - if (backend) curl_easy_cleanup(backend); - } - - Curl &url(const std::string &u) { - curl_easy_setopt(backend, CURLOPT_URL, u.c_str()); - return *this; - } - - nlohmann::json get() { - std::stringstream ss; - perform(&ss); - - return nlohmann::json::parse(ss.str()); - } - - void download(const std::filesystem::path &filepath) { - if (filepath.has_parent_path() && !std::filesystem::exists(filepath.parent_path())) { - std::filesystem::create_directories(filepath.parent_path()); - } - - auto tempfile = filepath.string() + ".tmp"; - std::ofstream writer(tempfile, std::ios_base::binary); - - curl_easy_setopt(backend, CURLOPT_NOPROGRESS, 0L); - curl_easy_setopt(backend, CURLOPT_XFERINFOFUNCTION, progress_func); - perform(&writer); - std::filesystem::rename(tempfile, filepath); - } - -private: - - static int progress_func(void *client, curl_off_t dltotal, curl_off_t dlnow, curl_off_t ultotal, curl_off_t ulnow) { - if (dltotal <= 0) return 0; - if (getenv("NO_PROGRESS")) return 0; - printf("\rPROGRESS: %f%%", ((float) dlnow / (float) dltotal) * 100.0f); - fflush(stdout); - return 0; - } - - void perform(std::ostream *os) { - curl_easy_setopt(backend, CURLOPT_WRITEDATA, reinterpret_cast(os)); - curl_easy_setopt(backend, CURLOPT_WRITEFUNCTION, - +[](void *data, size_t size, size_t nmemb, void *user_data) -> size_t { - auto os = reinterpret_cast(user_data); - os->write(reinterpret_cast(data), size * nmemb); - return size * nmemb; - }); - - auto res = curl_easy_perform(backend); - printf("\rSUCCESS\n"); - if (res != CURLE_OK) { - throw std::runtime_error("curl::perform() failed: CURLE_OK != " + std::to_string(res)); - } - long http_code = 0; - curl_easy_getinfo(backend, CURLINFO_RESPONSE_CODE, &http_code); - if (http_code != 200) { - throw std::runtime_error("curl::perform() failed: 200 != " + std::to_string(http_code)); - } - } -}; - -#endif diff --git a/src/external/json.h b/src/external/json.h deleted file mode 100644 index 25c918359..000000000 --- a/src/external/json.h +++ /dev/null @@ -1,24765 +0,0 @@ -// __ _____ _____ _____ -// __| | __| | | | JSON for Modern C++ -// | | |__ | | | | | | version 3.11.3 -// |_____|_____|_____|_|___| https://github.com/nlohmann/json -// -// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann -// SPDX-License-Identifier: MIT - -/****************************************************************************\ - * Note on documentation: The source files contain links to the online * - * documentation of the public API at https://json.nlohmann.me. This URL * - * contains the most recent documentation and should also be applicable to * - * previous versions; documentation for deprecated functions is not * - * removed, but marked deprecated. See "Generate documentation" section in * - * file docs/README.md. * -\****************************************************************************/ - -#ifndef INCLUDE_NLOHMANN_JSON_HPP_ -#define INCLUDE_NLOHMANN_JSON_HPP_ - -#include // all_of, find, for_each -#include // nullptr_t, ptrdiff_t, size_t -#include // hash, less -#include // initializer_list -#ifndef JSON_NO_IO - #include // istream, ostream -#endif // JSON_NO_IO -#include // random_access_iterator_tag -#include // unique_ptr -#include // string, stoi, to_string -#include // declval, forward, move, pair, swap -#include // vector - -// #include -// __ _____ _____ _____ -// __| | __| | | | JSON for Modern C++ -// | | |__ | | | | | | version 3.11.3 -// |_____|_____|_____|_|___| https://github.com/nlohmann/json -// -// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann -// SPDX-License-Identifier: MIT - - - -#include - -// #include -// __ _____ _____ _____ -// __| | __| | | | JSON for Modern C++ -// | | |__ | | | | | | version 3.11.3 -// |_____|_____|_____|_|___| https://github.com/nlohmann/json -// -// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann -// SPDX-License-Identifier: MIT - - - -// This file contains all macro definitions affecting or depending on the ABI - -#ifndef JSON_SKIP_LIBRARY_VERSION_CHECK - #if defined(NLOHMANN_JSON_VERSION_MAJOR) && defined(NLOHMANN_JSON_VERSION_MINOR) && defined(NLOHMANN_JSON_VERSION_PATCH) - #if NLOHMANN_JSON_VERSION_MAJOR != 3 || NLOHMANN_JSON_VERSION_MINOR != 11 || NLOHMANN_JSON_VERSION_PATCH != 3 - #warning "Already included a different version of the library!" - #endif - #endif -#endif - -#define NLOHMANN_JSON_VERSION_MAJOR 3 // NOLINT(modernize-macro-to-enum) -#define NLOHMANN_JSON_VERSION_MINOR 11 // NOLINT(modernize-macro-to-enum) -#define NLOHMANN_JSON_VERSION_PATCH 3 // NOLINT(modernize-macro-to-enum) - -#ifndef JSON_DIAGNOSTICS - #define JSON_DIAGNOSTICS 0 -#endif - -#ifndef JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON - #define JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON 0 -#endif - -#if JSON_DIAGNOSTICS - #define NLOHMANN_JSON_ABI_TAG_DIAGNOSTICS _diag -#else - #define NLOHMANN_JSON_ABI_TAG_DIAGNOSTICS -#endif - -#if JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON - #define NLOHMANN_JSON_ABI_TAG_LEGACY_DISCARDED_VALUE_COMPARISON _ldvcmp -#else - #define NLOHMANN_JSON_ABI_TAG_LEGACY_DISCARDED_VALUE_COMPARISON -#endif - -#ifndef NLOHMANN_JSON_NAMESPACE_NO_VERSION - #define NLOHMANN_JSON_NAMESPACE_NO_VERSION 0 -#endif - -// Construct the namespace ABI tags component -#define NLOHMANN_JSON_ABI_TAGS_CONCAT_EX(a, b) json_abi ## a ## b -#define NLOHMANN_JSON_ABI_TAGS_CONCAT(a, b) \ - NLOHMANN_JSON_ABI_TAGS_CONCAT_EX(a, b) - -#define NLOHMANN_JSON_ABI_TAGS \ - NLOHMANN_JSON_ABI_TAGS_CONCAT( \ - NLOHMANN_JSON_ABI_TAG_DIAGNOSTICS, \ - NLOHMANN_JSON_ABI_TAG_LEGACY_DISCARDED_VALUE_COMPARISON) - -// Construct the namespace version component -#define NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT_EX(major, minor, patch) \ - _v ## major ## _ ## minor ## _ ## patch -#define NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT(major, minor, patch) \ - NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT_EX(major, minor, patch) - -#if NLOHMANN_JSON_NAMESPACE_NO_VERSION -#define NLOHMANN_JSON_NAMESPACE_VERSION -#else -#define NLOHMANN_JSON_NAMESPACE_VERSION \ - NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT(NLOHMANN_JSON_VERSION_MAJOR, \ - NLOHMANN_JSON_VERSION_MINOR, \ - NLOHMANN_JSON_VERSION_PATCH) -#endif - -// Combine namespace components -#define NLOHMANN_JSON_NAMESPACE_CONCAT_EX(a, b) a ## b -#define NLOHMANN_JSON_NAMESPACE_CONCAT(a, b) \ - NLOHMANN_JSON_NAMESPACE_CONCAT_EX(a, b) - -#ifndef NLOHMANN_JSON_NAMESPACE -#define NLOHMANN_JSON_NAMESPACE \ - nlohmann::NLOHMANN_JSON_NAMESPACE_CONCAT( \ - NLOHMANN_JSON_ABI_TAGS, \ - NLOHMANN_JSON_NAMESPACE_VERSION) -#endif - -#ifndef NLOHMANN_JSON_NAMESPACE_BEGIN -#define NLOHMANN_JSON_NAMESPACE_BEGIN \ - namespace nlohmann \ - { \ - inline namespace NLOHMANN_JSON_NAMESPACE_CONCAT( \ - NLOHMANN_JSON_ABI_TAGS, \ - NLOHMANN_JSON_NAMESPACE_VERSION) \ - { -#endif - -#ifndef NLOHMANN_JSON_NAMESPACE_END -#define NLOHMANN_JSON_NAMESPACE_END \ - } /* namespace (inline namespace) NOLINT(readability/namespace) */ \ - } // namespace nlohmann -#endif - -// #include -// __ _____ _____ _____ -// __| | __| | | | JSON for Modern C++ -// | | |__ | | | | | | version 3.11.3 -// |_____|_____|_____|_|___| https://github.com/nlohmann/json -// -// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann -// SPDX-License-Identifier: MIT - - - -#include // transform -#include // array -#include // forward_list -#include // inserter, front_inserter, end -#include // map -#include // string -#include // tuple, make_tuple -#include // is_arithmetic, is_same, is_enum, underlying_type, is_convertible -#include // unordered_map -#include // pair, declval -#include // valarray - -// #include -// __ _____ _____ _____ -// __| | __| | | | JSON for Modern C++ -// | | |__ | | | | | | version 3.11.3 -// |_____|_____|_____|_|___| https://github.com/nlohmann/json -// -// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann -// SPDX-License-Identifier: MIT - - - -#include // nullptr_t -#include // exception -#if JSON_DIAGNOSTICS - #include // accumulate -#endif -#include // runtime_error -#include // to_string -#include // vector - -// #include -// __ _____ _____ _____ -// __| | __| | | | JSON for Modern C++ -// | | |__ | | | | | | version 3.11.3 -// |_____|_____|_____|_|___| https://github.com/nlohmann/json -// -// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann -// SPDX-License-Identifier: MIT - - - -#include // array -#include // size_t -#include // uint8_t -#include // string - -// #include -// __ _____ _____ _____ -// __| | __| | | | JSON for Modern C++ -// | | |__ | | | | | | version 3.11.3 -// |_____|_____|_____|_|___| https://github.com/nlohmann/json -// -// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann -// SPDX-License-Identifier: MIT - - - -#include // declval, pair -// #include -// __ _____ _____ _____ -// __| | __| | | | JSON for Modern C++ -// | | |__ | | | | | | version 3.11.3 -// |_____|_____|_____|_|___| https://github.com/nlohmann/json -// -// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann -// SPDX-License-Identifier: MIT - - - -#include - -// #include -// __ _____ _____ _____ -// __| | __| | | | JSON for Modern C++ -// | | |__ | | | | | | version 3.11.3 -// |_____|_____|_____|_|___| https://github.com/nlohmann/json -// -// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann -// SPDX-License-Identifier: MIT - - - -// #include - - -NLOHMANN_JSON_NAMESPACE_BEGIN -namespace detail -{ - -template struct make_void -{ - using type = void; -}; -template using void_t = typename make_void::type; - -} // namespace detail -NLOHMANN_JSON_NAMESPACE_END - - -NLOHMANN_JSON_NAMESPACE_BEGIN -namespace detail -{ - -// https://en.cppreference.com/w/cpp/experimental/is_detected -struct nonesuch -{ - nonesuch() = delete; - ~nonesuch() = delete; - nonesuch(nonesuch const&) = delete; - nonesuch(nonesuch const&&) = delete; - void operator=(nonesuch const&) = delete; - void operator=(nonesuch&&) = delete; -}; - -template class Op, - class... Args> -struct detector -{ - using value_t = std::false_type; - using type = Default; -}; - -template class Op, class... Args> -struct detector>, Op, Args...> -{ - using value_t = std::true_type; - using type = Op; -}; - -template class Op, class... Args> -using is_detected = typename detector::value_t; - -template class Op, class... Args> -struct is_detected_lazy : is_detected { }; - -template class Op, class... Args> -using detected_t = typename detector::type; - -template class Op, class... Args> -using detected_or = detector; - -template class Op, class... Args> -using detected_or_t = typename detected_or::type; - -template class Op, class... Args> -using is_detected_exact = std::is_same>; - -template class Op, class... Args> -using is_detected_convertible = - std::is_convertible, To>; - -} // namespace detail -NLOHMANN_JSON_NAMESPACE_END - -// #include - - -// __ _____ _____ _____ -// __| | __| | | | JSON for Modern C++ -// | | |__ | | | | | | version 3.11.3 -// |_____|_____|_____|_|___| https://github.com/nlohmann/json -// -// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann -// SPDX-FileCopyrightText: 2016-2021 Evan Nemerson -// SPDX-License-Identifier: MIT - -/* Hedley - https://nemequ.github.io/hedley - * Created by Evan Nemerson - */ - -#if !defined(JSON_HEDLEY_VERSION) || (JSON_HEDLEY_VERSION < 15) -#if defined(JSON_HEDLEY_VERSION) - #undef JSON_HEDLEY_VERSION -#endif -#define JSON_HEDLEY_VERSION 15 - -#if defined(JSON_HEDLEY_STRINGIFY_EX) - #undef JSON_HEDLEY_STRINGIFY_EX -#endif -#define JSON_HEDLEY_STRINGIFY_EX(x) #x - -#if defined(JSON_HEDLEY_STRINGIFY) - #undef JSON_HEDLEY_STRINGIFY -#endif -#define JSON_HEDLEY_STRINGIFY(x) JSON_HEDLEY_STRINGIFY_EX(x) - -#if defined(JSON_HEDLEY_CONCAT_EX) - #undef JSON_HEDLEY_CONCAT_EX -#endif -#define JSON_HEDLEY_CONCAT_EX(a,b) a##b - -#if defined(JSON_HEDLEY_CONCAT) - #undef JSON_HEDLEY_CONCAT -#endif -#define JSON_HEDLEY_CONCAT(a,b) JSON_HEDLEY_CONCAT_EX(a,b) - -#if defined(JSON_HEDLEY_CONCAT3_EX) - #undef JSON_HEDLEY_CONCAT3_EX -#endif -#define JSON_HEDLEY_CONCAT3_EX(a,b,c) a##b##c - -#if defined(JSON_HEDLEY_CONCAT3) - #undef JSON_HEDLEY_CONCAT3 -#endif -#define JSON_HEDLEY_CONCAT3(a,b,c) JSON_HEDLEY_CONCAT3_EX(a,b,c) - -#if defined(JSON_HEDLEY_VERSION_ENCODE) - #undef JSON_HEDLEY_VERSION_ENCODE -#endif -#define JSON_HEDLEY_VERSION_ENCODE(major,minor,revision) (((major) * 1000000) + ((minor) * 1000) + (revision)) - -#if defined(JSON_HEDLEY_VERSION_DECODE_MAJOR) - #undef JSON_HEDLEY_VERSION_DECODE_MAJOR -#endif -#define JSON_HEDLEY_VERSION_DECODE_MAJOR(version) ((version) / 1000000) - -#if defined(JSON_HEDLEY_VERSION_DECODE_MINOR) - #undef JSON_HEDLEY_VERSION_DECODE_MINOR -#endif -#define JSON_HEDLEY_VERSION_DECODE_MINOR(version) (((version) % 1000000) / 1000) - -#if defined(JSON_HEDLEY_VERSION_DECODE_REVISION) - #undef JSON_HEDLEY_VERSION_DECODE_REVISION -#endif -#define JSON_HEDLEY_VERSION_DECODE_REVISION(version) ((version) % 1000) - -#if defined(JSON_HEDLEY_GNUC_VERSION) - #undef JSON_HEDLEY_GNUC_VERSION -#endif -#if defined(__GNUC__) && defined(__GNUC_PATCHLEVEL__) - #define JSON_HEDLEY_GNUC_VERSION JSON_HEDLEY_VERSION_ENCODE(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__) -#elif defined(__GNUC__) - #define JSON_HEDLEY_GNUC_VERSION JSON_HEDLEY_VERSION_ENCODE(__GNUC__, __GNUC_MINOR__, 0) -#endif - -#if defined(JSON_HEDLEY_GNUC_VERSION_CHECK) - #undef JSON_HEDLEY_GNUC_VERSION_CHECK -#endif -#if defined(JSON_HEDLEY_GNUC_VERSION) - #define JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_GNUC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) -#else - #define JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch) (0) -#endif - -#if defined(JSON_HEDLEY_MSVC_VERSION) - #undef JSON_HEDLEY_MSVC_VERSION -#endif -#if defined(_MSC_FULL_VER) && (_MSC_FULL_VER >= 140000000) && !defined(__ICL) - #define JSON_HEDLEY_MSVC_VERSION JSON_HEDLEY_VERSION_ENCODE(_MSC_FULL_VER / 10000000, (_MSC_FULL_VER % 10000000) / 100000, (_MSC_FULL_VER % 100000) / 100) -#elif defined(_MSC_FULL_VER) && !defined(__ICL) - #define JSON_HEDLEY_MSVC_VERSION JSON_HEDLEY_VERSION_ENCODE(_MSC_FULL_VER / 1000000, (_MSC_FULL_VER % 1000000) / 10000, (_MSC_FULL_VER % 10000) / 10) -#elif defined(_MSC_VER) && !defined(__ICL) - #define JSON_HEDLEY_MSVC_VERSION JSON_HEDLEY_VERSION_ENCODE(_MSC_VER / 100, _MSC_VER % 100, 0) -#endif - -#if defined(JSON_HEDLEY_MSVC_VERSION_CHECK) - #undef JSON_HEDLEY_MSVC_VERSION_CHECK -#endif -#if !defined(JSON_HEDLEY_MSVC_VERSION) - #define JSON_HEDLEY_MSVC_VERSION_CHECK(major,minor,patch) (0) -#elif defined(_MSC_VER) && (_MSC_VER >= 1400) - #define JSON_HEDLEY_MSVC_VERSION_CHECK(major,minor,patch) (_MSC_FULL_VER >= ((major * 10000000) + (minor * 100000) + (patch))) -#elif defined(_MSC_VER) && (_MSC_VER >= 1200) - #define JSON_HEDLEY_MSVC_VERSION_CHECK(major,minor,patch) (_MSC_FULL_VER >= ((major * 1000000) + (minor * 10000) + (patch))) -#else - #define JSON_HEDLEY_MSVC_VERSION_CHECK(major,minor,patch) (_MSC_VER >= ((major * 100) + (minor))) -#endif - -#if defined(JSON_HEDLEY_INTEL_VERSION) - #undef JSON_HEDLEY_INTEL_VERSION -#endif -#if defined(__INTEL_COMPILER) && defined(__INTEL_COMPILER_UPDATE) && !defined(__ICL) - #define JSON_HEDLEY_INTEL_VERSION JSON_HEDLEY_VERSION_ENCODE(__INTEL_COMPILER / 100, __INTEL_COMPILER % 100, __INTEL_COMPILER_UPDATE) -#elif defined(__INTEL_COMPILER) && !defined(__ICL) - #define JSON_HEDLEY_INTEL_VERSION JSON_HEDLEY_VERSION_ENCODE(__INTEL_COMPILER / 100, __INTEL_COMPILER % 100, 0) -#endif - -#if defined(JSON_HEDLEY_INTEL_VERSION_CHECK) - #undef JSON_HEDLEY_INTEL_VERSION_CHECK -#endif -#if defined(JSON_HEDLEY_INTEL_VERSION) - #define JSON_HEDLEY_INTEL_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_INTEL_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) -#else - #define JSON_HEDLEY_INTEL_VERSION_CHECK(major,minor,patch) (0) -#endif - -#if defined(JSON_HEDLEY_INTEL_CL_VERSION) - #undef JSON_HEDLEY_INTEL_CL_VERSION -#endif -#if defined(__INTEL_COMPILER) && defined(__INTEL_COMPILER_UPDATE) && defined(__ICL) - #define JSON_HEDLEY_INTEL_CL_VERSION JSON_HEDLEY_VERSION_ENCODE(__INTEL_COMPILER, __INTEL_COMPILER_UPDATE, 0) -#endif - -#if defined(JSON_HEDLEY_INTEL_CL_VERSION_CHECK) - #undef JSON_HEDLEY_INTEL_CL_VERSION_CHECK -#endif -#if defined(JSON_HEDLEY_INTEL_CL_VERSION) - #define JSON_HEDLEY_INTEL_CL_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_INTEL_CL_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) -#else - #define JSON_HEDLEY_INTEL_CL_VERSION_CHECK(major,minor,patch) (0) -#endif - -#if defined(JSON_HEDLEY_PGI_VERSION) - #undef JSON_HEDLEY_PGI_VERSION -#endif -#if defined(__PGI) && defined(__PGIC__) && defined(__PGIC_MINOR__) && defined(__PGIC_PATCHLEVEL__) - #define JSON_HEDLEY_PGI_VERSION JSON_HEDLEY_VERSION_ENCODE(__PGIC__, __PGIC_MINOR__, __PGIC_PATCHLEVEL__) -#endif - -#if defined(JSON_HEDLEY_PGI_VERSION_CHECK) - #undef JSON_HEDLEY_PGI_VERSION_CHECK -#endif -#if defined(JSON_HEDLEY_PGI_VERSION) - #define JSON_HEDLEY_PGI_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_PGI_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) -#else - #define JSON_HEDLEY_PGI_VERSION_CHECK(major,minor,patch) (0) -#endif - -#if defined(JSON_HEDLEY_SUNPRO_VERSION) - #undef JSON_HEDLEY_SUNPRO_VERSION -#endif -#if defined(__SUNPRO_C) && (__SUNPRO_C > 0x1000) - #define JSON_HEDLEY_SUNPRO_VERSION JSON_HEDLEY_VERSION_ENCODE((((__SUNPRO_C >> 16) & 0xf) * 10) + ((__SUNPRO_C >> 12) & 0xf), (((__SUNPRO_C >> 8) & 0xf) * 10) + ((__SUNPRO_C >> 4) & 0xf), (__SUNPRO_C & 0xf) * 10) -#elif defined(__SUNPRO_C) - #define JSON_HEDLEY_SUNPRO_VERSION JSON_HEDLEY_VERSION_ENCODE((__SUNPRO_C >> 8) & 0xf, (__SUNPRO_C >> 4) & 0xf, (__SUNPRO_C) & 0xf) -#elif defined(__SUNPRO_CC) && (__SUNPRO_CC > 0x1000) - #define JSON_HEDLEY_SUNPRO_VERSION JSON_HEDLEY_VERSION_ENCODE((((__SUNPRO_CC >> 16) & 0xf) * 10) + ((__SUNPRO_CC >> 12) & 0xf), (((__SUNPRO_CC >> 8) & 0xf) * 10) + ((__SUNPRO_CC >> 4) & 0xf), (__SUNPRO_CC & 0xf) * 10) -#elif defined(__SUNPRO_CC) - #define JSON_HEDLEY_SUNPRO_VERSION JSON_HEDLEY_VERSION_ENCODE((__SUNPRO_CC >> 8) & 0xf, (__SUNPRO_CC >> 4) & 0xf, (__SUNPRO_CC) & 0xf) -#endif - -#if defined(JSON_HEDLEY_SUNPRO_VERSION_CHECK) - #undef JSON_HEDLEY_SUNPRO_VERSION_CHECK -#endif -#if defined(JSON_HEDLEY_SUNPRO_VERSION) - #define JSON_HEDLEY_SUNPRO_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_SUNPRO_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) -#else - #define JSON_HEDLEY_SUNPRO_VERSION_CHECK(major,minor,patch) (0) -#endif - -#if defined(JSON_HEDLEY_EMSCRIPTEN_VERSION) - #undef JSON_HEDLEY_EMSCRIPTEN_VERSION -#endif -#if defined(__EMSCRIPTEN__) - #define JSON_HEDLEY_EMSCRIPTEN_VERSION JSON_HEDLEY_VERSION_ENCODE(__EMSCRIPTEN_major__, __EMSCRIPTEN_minor__, __EMSCRIPTEN_tiny__) -#endif - -#if defined(JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK) - #undef JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK -#endif -#if defined(JSON_HEDLEY_EMSCRIPTEN_VERSION) - #define JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_EMSCRIPTEN_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) -#else - #define JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK(major,minor,patch) (0) -#endif - -#if defined(JSON_HEDLEY_ARM_VERSION) - #undef JSON_HEDLEY_ARM_VERSION -#endif -#if defined(__CC_ARM) && defined(__ARMCOMPILER_VERSION) - #define JSON_HEDLEY_ARM_VERSION JSON_HEDLEY_VERSION_ENCODE(__ARMCOMPILER_VERSION / 1000000, (__ARMCOMPILER_VERSION % 1000000) / 10000, (__ARMCOMPILER_VERSION % 10000) / 100) -#elif defined(__CC_ARM) && defined(__ARMCC_VERSION) - #define JSON_HEDLEY_ARM_VERSION JSON_HEDLEY_VERSION_ENCODE(__ARMCC_VERSION / 1000000, (__ARMCC_VERSION % 1000000) / 10000, (__ARMCC_VERSION % 10000) / 100) -#endif - -#if defined(JSON_HEDLEY_ARM_VERSION_CHECK) - #undef JSON_HEDLEY_ARM_VERSION_CHECK -#endif -#if defined(JSON_HEDLEY_ARM_VERSION) - #define JSON_HEDLEY_ARM_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_ARM_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) -#else - #define JSON_HEDLEY_ARM_VERSION_CHECK(major,minor,patch) (0) -#endif - -#if defined(JSON_HEDLEY_IBM_VERSION) - #undef JSON_HEDLEY_IBM_VERSION -#endif -#if defined(__ibmxl__) - #define JSON_HEDLEY_IBM_VERSION JSON_HEDLEY_VERSION_ENCODE(__ibmxl_version__, __ibmxl_release__, __ibmxl_modification__) -#elif defined(__xlC__) && defined(__xlC_ver__) - #define JSON_HEDLEY_IBM_VERSION JSON_HEDLEY_VERSION_ENCODE(__xlC__ >> 8, __xlC__ & 0xff, (__xlC_ver__ >> 8) & 0xff) -#elif defined(__xlC__) - #define JSON_HEDLEY_IBM_VERSION JSON_HEDLEY_VERSION_ENCODE(__xlC__ >> 8, __xlC__ & 0xff, 0) -#endif - -#if defined(JSON_HEDLEY_IBM_VERSION_CHECK) - #undef JSON_HEDLEY_IBM_VERSION_CHECK -#endif -#if defined(JSON_HEDLEY_IBM_VERSION) - #define JSON_HEDLEY_IBM_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_IBM_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) -#else - #define JSON_HEDLEY_IBM_VERSION_CHECK(major,minor,patch) (0) -#endif - -#if defined(JSON_HEDLEY_TI_VERSION) - #undef JSON_HEDLEY_TI_VERSION -#endif -#if \ - defined(__TI_COMPILER_VERSION__) && \ - ( \ - defined(__TMS470__) || defined(__TI_ARM__) || \ - defined(__MSP430__) || \ - defined(__TMS320C2000__) \ - ) -#if (__TI_COMPILER_VERSION__ >= 16000000) - #define JSON_HEDLEY_TI_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000)) -#endif -#endif - -#if defined(JSON_HEDLEY_TI_VERSION_CHECK) - #undef JSON_HEDLEY_TI_VERSION_CHECK -#endif -#if defined(JSON_HEDLEY_TI_VERSION) - #define JSON_HEDLEY_TI_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) -#else - #define JSON_HEDLEY_TI_VERSION_CHECK(major,minor,patch) (0) -#endif - -#if defined(JSON_HEDLEY_TI_CL2000_VERSION) - #undef JSON_HEDLEY_TI_CL2000_VERSION -#endif -#if defined(__TI_COMPILER_VERSION__) && defined(__TMS320C2000__) - #define JSON_HEDLEY_TI_CL2000_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000)) -#endif - -#if defined(JSON_HEDLEY_TI_CL2000_VERSION_CHECK) - #undef JSON_HEDLEY_TI_CL2000_VERSION_CHECK -#endif -#if defined(JSON_HEDLEY_TI_CL2000_VERSION) - #define JSON_HEDLEY_TI_CL2000_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_CL2000_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) -#else - #define JSON_HEDLEY_TI_CL2000_VERSION_CHECK(major,minor,patch) (0) -#endif - -#if defined(JSON_HEDLEY_TI_CL430_VERSION) - #undef JSON_HEDLEY_TI_CL430_VERSION -#endif -#if defined(__TI_COMPILER_VERSION__) && defined(__MSP430__) - #define JSON_HEDLEY_TI_CL430_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000)) -#endif - -#if defined(JSON_HEDLEY_TI_CL430_VERSION_CHECK) - #undef JSON_HEDLEY_TI_CL430_VERSION_CHECK -#endif -#if defined(JSON_HEDLEY_TI_CL430_VERSION) - #define JSON_HEDLEY_TI_CL430_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_CL430_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) -#else - #define JSON_HEDLEY_TI_CL430_VERSION_CHECK(major,minor,patch) (0) -#endif - -#if defined(JSON_HEDLEY_TI_ARMCL_VERSION) - #undef JSON_HEDLEY_TI_ARMCL_VERSION -#endif -#if defined(__TI_COMPILER_VERSION__) && (defined(__TMS470__) || defined(__TI_ARM__)) - #define JSON_HEDLEY_TI_ARMCL_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000)) -#endif - -#if defined(JSON_HEDLEY_TI_ARMCL_VERSION_CHECK) - #undef JSON_HEDLEY_TI_ARMCL_VERSION_CHECK -#endif -#if defined(JSON_HEDLEY_TI_ARMCL_VERSION) - #define JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_ARMCL_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) -#else - #define JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(major,minor,patch) (0) -#endif - -#if defined(JSON_HEDLEY_TI_CL6X_VERSION) - #undef JSON_HEDLEY_TI_CL6X_VERSION -#endif -#if defined(__TI_COMPILER_VERSION__) && defined(__TMS320C6X__) - #define JSON_HEDLEY_TI_CL6X_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000)) -#endif - -#if defined(JSON_HEDLEY_TI_CL6X_VERSION_CHECK) - #undef JSON_HEDLEY_TI_CL6X_VERSION_CHECK -#endif -#if defined(JSON_HEDLEY_TI_CL6X_VERSION) - #define JSON_HEDLEY_TI_CL6X_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_CL6X_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) -#else - #define JSON_HEDLEY_TI_CL6X_VERSION_CHECK(major,minor,patch) (0) -#endif - -#if defined(JSON_HEDLEY_TI_CL7X_VERSION) - #undef JSON_HEDLEY_TI_CL7X_VERSION -#endif -#if defined(__TI_COMPILER_VERSION__) && defined(__C7000__) - #define JSON_HEDLEY_TI_CL7X_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000)) -#endif - -#if defined(JSON_HEDLEY_TI_CL7X_VERSION_CHECK) - #undef JSON_HEDLEY_TI_CL7X_VERSION_CHECK -#endif -#if defined(JSON_HEDLEY_TI_CL7X_VERSION) - #define JSON_HEDLEY_TI_CL7X_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_CL7X_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) -#else - #define JSON_HEDLEY_TI_CL7X_VERSION_CHECK(major,minor,patch) (0) -#endif - -#if defined(JSON_HEDLEY_TI_CLPRU_VERSION) - #undef JSON_HEDLEY_TI_CLPRU_VERSION -#endif -#if defined(__TI_COMPILER_VERSION__) && defined(__PRU__) - #define JSON_HEDLEY_TI_CLPRU_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000)) -#endif - -#if defined(JSON_HEDLEY_TI_CLPRU_VERSION_CHECK) - #undef JSON_HEDLEY_TI_CLPRU_VERSION_CHECK -#endif -#if defined(JSON_HEDLEY_TI_CLPRU_VERSION) - #define JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_CLPRU_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) -#else - #define JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(major,minor,patch) (0) -#endif - -#if defined(JSON_HEDLEY_CRAY_VERSION) - #undef JSON_HEDLEY_CRAY_VERSION -#endif -#if defined(_CRAYC) - #if defined(_RELEASE_PATCHLEVEL) - #define JSON_HEDLEY_CRAY_VERSION JSON_HEDLEY_VERSION_ENCODE(_RELEASE_MAJOR, _RELEASE_MINOR, _RELEASE_PATCHLEVEL) - #else - #define JSON_HEDLEY_CRAY_VERSION JSON_HEDLEY_VERSION_ENCODE(_RELEASE_MAJOR, _RELEASE_MINOR, 0) - #endif -#endif - -#if defined(JSON_HEDLEY_CRAY_VERSION_CHECK) - #undef JSON_HEDLEY_CRAY_VERSION_CHECK -#endif -#if defined(JSON_HEDLEY_CRAY_VERSION) - #define JSON_HEDLEY_CRAY_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_CRAY_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) -#else - #define JSON_HEDLEY_CRAY_VERSION_CHECK(major,minor,patch) (0) -#endif - -#if defined(JSON_HEDLEY_IAR_VERSION) - #undef JSON_HEDLEY_IAR_VERSION -#endif -#if defined(__IAR_SYSTEMS_ICC__) - #if __VER__ > 1000 - #define JSON_HEDLEY_IAR_VERSION JSON_HEDLEY_VERSION_ENCODE((__VER__ / 1000000), ((__VER__ / 1000) % 1000), (__VER__ % 1000)) - #else - #define JSON_HEDLEY_IAR_VERSION JSON_HEDLEY_VERSION_ENCODE(__VER__ / 100, __VER__ % 100, 0) - #endif -#endif - -#if defined(JSON_HEDLEY_IAR_VERSION_CHECK) - #undef JSON_HEDLEY_IAR_VERSION_CHECK -#endif -#if defined(JSON_HEDLEY_IAR_VERSION) - #define JSON_HEDLEY_IAR_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_IAR_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) -#else - #define JSON_HEDLEY_IAR_VERSION_CHECK(major,minor,patch) (0) -#endif - -#if defined(JSON_HEDLEY_TINYC_VERSION) - #undef JSON_HEDLEY_TINYC_VERSION -#endif -#if defined(__TINYC__) - #define JSON_HEDLEY_TINYC_VERSION JSON_HEDLEY_VERSION_ENCODE(__TINYC__ / 1000, (__TINYC__ / 100) % 10, __TINYC__ % 100) -#endif - -#if defined(JSON_HEDLEY_TINYC_VERSION_CHECK) - #undef JSON_HEDLEY_TINYC_VERSION_CHECK -#endif -#if defined(JSON_HEDLEY_TINYC_VERSION) - #define JSON_HEDLEY_TINYC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TINYC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) -#else - #define JSON_HEDLEY_TINYC_VERSION_CHECK(major,minor,patch) (0) -#endif - -#if defined(JSON_HEDLEY_DMC_VERSION) - #undef JSON_HEDLEY_DMC_VERSION -#endif -#if defined(__DMC__) - #define JSON_HEDLEY_DMC_VERSION JSON_HEDLEY_VERSION_ENCODE(__DMC__ >> 8, (__DMC__ >> 4) & 0xf, __DMC__ & 0xf) -#endif - -#if defined(JSON_HEDLEY_DMC_VERSION_CHECK) - #undef JSON_HEDLEY_DMC_VERSION_CHECK -#endif -#if defined(JSON_HEDLEY_DMC_VERSION) - #define JSON_HEDLEY_DMC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_DMC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) -#else - #define JSON_HEDLEY_DMC_VERSION_CHECK(major,minor,patch) (0) -#endif - -#if defined(JSON_HEDLEY_COMPCERT_VERSION) - #undef JSON_HEDLEY_COMPCERT_VERSION -#endif -#if defined(__COMPCERT_VERSION__) - #define JSON_HEDLEY_COMPCERT_VERSION JSON_HEDLEY_VERSION_ENCODE(__COMPCERT_VERSION__ / 10000, (__COMPCERT_VERSION__ / 100) % 100, __COMPCERT_VERSION__ % 100) -#endif - -#if defined(JSON_HEDLEY_COMPCERT_VERSION_CHECK) - #undef JSON_HEDLEY_COMPCERT_VERSION_CHECK -#endif -#if defined(JSON_HEDLEY_COMPCERT_VERSION) - #define JSON_HEDLEY_COMPCERT_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_COMPCERT_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) -#else - #define JSON_HEDLEY_COMPCERT_VERSION_CHECK(major,minor,patch) (0) -#endif - -#if defined(JSON_HEDLEY_PELLES_VERSION) - #undef JSON_HEDLEY_PELLES_VERSION -#endif -#if defined(__POCC__) - #define JSON_HEDLEY_PELLES_VERSION JSON_HEDLEY_VERSION_ENCODE(__POCC__ / 100, __POCC__ % 100, 0) -#endif - -#if defined(JSON_HEDLEY_PELLES_VERSION_CHECK) - #undef JSON_HEDLEY_PELLES_VERSION_CHECK -#endif -#if defined(JSON_HEDLEY_PELLES_VERSION) - #define JSON_HEDLEY_PELLES_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_PELLES_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) -#else - #define JSON_HEDLEY_PELLES_VERSION_CHECK(major,minor,patch) (0) -#endif - -#if defined(JSON_HEDLEY_MCST_LCC_VERSION) - #undef JSON_HEDLEY_MCST_LCC_VERSION -#endif -#if defined(__LCC__) && defined(__LCC_MINOR__) - #define JSON_HEDLEY_MCST_LCC_VERSION JSON_HEDLEY_VERSION_ENCODE(__LCC__ / 100, __LCC__ % 100, __LCC_MINOR__) -#endif - -#if defined(JSON_HEDLEY_MCST_LCC_VERSION_CHECK) - #undef JSON_HEDLEY_MCST_LCC_VERSION_CHECK -#endif -#if defined(JSON_HEDLEY_MCST_LCC_VERSION) - #define JSON_HEDLEY_MCST_LCC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_MCST_LCC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) -#else - #define JSON_HEDLEY_MCST_LCC_VERSION_CHECK(major,minor,patch) (0) -#endif - -#if defined(JSON_HEDLEY_GCC_VERSION) - #undef JSON_HEDLEY_GCC_VERSION -#endif -#if \ - defined(JSON_HEDLEY_GNUC_VERSION) && \ - !defined(__clang__) && \ - !defined(JSON_HEDLEY_INTEL_VERSION) && \ - !defined(JSON_HEDLEY_PGI_VERSION) && \ - !defined(JSON_HEDLEY_ARM_VERSION) && \ - !defined(JSON_HEDLEY_CRAY_VERSION) && \ - !defined(JSON_HEDLEY_TI_VERSION) && \ - !defined(JSON_HEDLEY_TI_ARMCL_VERSION) && \ - !defined(JSON_HEDLEY_TI_CL430_VERSION) && \ - !defined(JSON_HEDLEY_TI_CL2000_VERSION) && \ - !defined(JSON_HEDLEY_TI_CL6X_VERSION) && \ - !defined(JSON_HEDLEY_TI_CL7X_VERSION) && \ - !defined(JSON_HEDLEY_TI_CLPRU_VERSION) && \ - !defined(__COMPCERT__) && \ - !defined(JSON_HEDLEY_MCST_LCC_VERSION) - #define JSON_HEDLEY_GCC_VERSION JSON_HEDLEY_GNUC_VERSION -#endif - -#if defined(JSON_HEDLEY_GCC_VERSION_CHECK) - #undef JSON_HEDLEY_GCC_VERSION_CHECK -#endif -#if defined(JSON_HEDLEY_GCC_VERSION) - #define JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_GCC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) -#else - #define JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch) (0) -#endif - -#if defined(JSON_HEDLEY_HAS_ATTRIBUTE) - #undef JSON_HEDLEY_HAS_ATTRIBUTE -#endif -#if \ - defined(__has_attribute) && \ - ( \ - (!defined(JSON_HEDLEY_IAR_VERSION) || JSON_HEDLEY_IAR_VERSION_CHECK(8,5,9)) \ - ) -# define JSON_HEDLEY_HAS_ATTRIBUTE(attribute) __has_attribute(attribute) -#else -# define JSON_HEDLEY_HAS_ATTRIBUTE(attribute) (0) -#endif - -#if defined(JSON_HEDLEY_GNUC_HAS_ATTRIBUTE) - #undef JSON_HEDLEY_GNUC_HAS_ATTRIBUTE -#endif -#if defined(__has_attribute) - #define JSON_HEDLEY_GNUC_HAS_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_HAS_ATTRIBUTE(attribute) -#else - #define JSON_HEDLEY_GNUC_HAS_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch) -#endif - -#if defined(JSON_HEDLEY_GCC_HAS_ATTRIBUTE) - #undef JSON_HEDLEY_GCC_HAS_ATTRIBUTE -#endif -#if defined(__has_attribute) - #define JSON_HEDLEY_GCC_HAS_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_HAS_ATTRIBUTE(attribute) -#else - #define JSON_HEDLEY_GCC_HAS_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch) -#endif - -#if defined(JSON_HEDLEY_HAS_CPP_ATTRIBUTE) - #undef JSON_HEDLEY_HAS_CPP_ATTRIBUTE -#endif -#if \ - defined(__has_cpp_attribute) && \ - defined(__cplusplus) && \ - (!defined(JSON_HEDLEY_SUNPRO_VERSION) || JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,15,0)) - #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE(attribute) __has_cpp_attribute(attribute) -#else - #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE(attribute) (0) -#endif - -#if defined(JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS) - #undef JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS -#endif -#if !defined(__cplusplus) || !defined(__has_cpp_attribute) - #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS(ns,attribute) (0) -#elif \ - !defined(JSON_HEDLEY_PGI_VERSION) && \ - !defined(JSON_HEDLEY_IAR_VERSION) && \ - (!defined(JSON_HEDLEY_SUNPRO_VERSION) || JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,15,0)) && \ - (!defined(JSON_HEDLEY_MSVC_VERSION) || JSON_HEDLEY_MSVC_VERSION_CHECK(19,20,0)) - #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS(ns,attribute) JSON_HEDLEY_HAS_CPP_ATTRIBUTE(ns::attribute) -#else - #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS(ns,attribute) (0) -#endif - -#if defined(JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE) - #undef JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE -#endif -#if defined(__has_cpp_attribute) && defined(__cplusplus) - #define JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE(attribute,major,minor,patch) __has_cpp_attribute(attribute) -#else - #define JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch) -#endif - -#if defined(JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE) - #undef JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE -#endif -#if defined(__has_cpp_attribute) && defined(__cplusplus) - #define JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE(attribute,major,minor,patch) __has_cpp_attribute(attribute) -#else - #define JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch) -#endif - -#if defined(JSON_HEDLEY_HAS_BUILTIN) - #undef JSON_HEDLEY_HAS_BUILTIN -#endif -#if defined(__has_builtin) - #define JSON_HEDLEY_HAS_BUILTIN(builtin) __has_builtin(builtin) -#else - #define JSON_HEDLEY_HAS_BUILTIN(builtin) (0) -#endif - -#if defined(JSON_HEDLEY_GNUC_HAS_BUILTIN) - #undef JSON_HEDLEY_GNUC_HAS_BUILTIN -#endif -#if defined(__has_builtin) - #define JSON_HEDLEY_GNUC_HAS_BUILTIN(builtin,major,minor,patch) __has_builtin(builtin) -#else - #define JSON_HEDLEY_GNUC_HAS_BUILTIN(builtin,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch) -#endif - -#if defined(JSON_HEDLEY_GCC_HAS_BUILTIN) - #undef JSON_HEDLEY_GCC_HAS_BUILTIN -#endif -#if defined(__has_builtin) - #define JSON_HEDLEY_GCC_HAS_BUILTIN(builtin,major,minor,patch) __has_builtin(builtin) -#else - #define JSON_HEDLEY_GCC_HAS_BUILTIN(builtin,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch) -#endif - -#if defined(JSON_HEDLEY_HAS_FEATURE) - #undef JSON_HEDLEY_HAS_FEATURE -#endif -#if defined(__has_feature) - #define JSON_HEDLEY_HAS_FEATURE(feature) __has_feature(feature) -#else - #define JSON_HEDLEY_HAS_FEATURE(feature) (0) -#endif - -#if defined(JSON_HEDLEY_GNUC_HAS_FEATURE) - #undef JSON_HEDLEY_GNUC_HAS_FEATURE -#endif -#if defined(__has_feature) - #define JSON_HEDLEY_GNUC_HAS_FEATURE(feature,major,minor,patch) __has_feature(feature) -#else - #define JSON_HEDLEY_GNUC_HAS_FEATURE(feature,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch) -#endif - -#if defined(JSON_HEDLEY_GCC_HAS_FEATURE) - #undef JSON_HEDLEY_GCC_HAS_FEATURE -#endif -#if defined(__has_feature) - #define JSON_HEDLEY_GCC_HAS_FEATURE(feature,major,minor,patch) __has_feature(feature) -#else - #define JSON_HEDLEY_GCC_HAS_FEATURE(feature,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch) -#endif - -#if defined(JSON_HEDLEY_HAS_EXTENSION) - #undef JSON_HEDLEY_HAS_EXTENSION -#endif -#if defined(__has_extension) - #define JSON_HEDLEY_HAS_EXTENSION(extension) __has_extension(extension) -#else - #define JSON_HEDLEY_HAS_EXTENSION(extension) (0) -#endif - -#if defined(JSON_HEDLEY_GNUC_HAS_EXTENSION) - #undef JSON_HEDLEY_GNUC_HAS_EXTENSION -#endif -#if defined(__has_extension) - #define JSON_HEDLEY_GNUC_HAS_EXTENSION(extension,major,minor,patch) __has_extension(extension) -#else - #define JSON_HEDLEY_GNUC_HAS_EXTENSION(extension,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch) -#endif - -#if defined(JSON_HEDLEY_GCC_HAS_EXTENSION) - #undef JSON_HEDLEY_GCC_HAS_EXTENSION -#endif -#if defined(__has_extension) - #define JSON_HEDLEY_GCC_HAS_EXTENSION(extension,major,minor,patch) __has_extension(extension) -#else - #define JSON_HEDLEY_GCC_HAS_EXTENSION(extension,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch) -#endif - -#if defined(JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE) - #undef JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE -#endif -#if defined(__has_declspec_attribute) - #define JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE(attribute) __has_declspec_attribute(attribute) -#else - #define JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE(attribute) (0) -#endif - -#if defined(JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE) - #undef JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE -#endif -#if defined(__has_declspec_attribute) - #define JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE(attribute,major,minor,patch) __has_declspec_attribute(attribute) -#else - #define JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch) -#endif - -#if defined(JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE) - #undef JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE -#endif -#if defined(__has_declspec_attribute) - #define JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE(attribute,major,minor,patch) __has_declspec_attribute(attribute) -#else - #define JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch) -#endif - -#if defined(JSON_HEDLEY_HAS_WARNING) - #undef JSON_HEDLEY_HAS_WARNING -#endif -#if defined(__has_warning) - #define JSON_HEDLEY_HAS_WARNING(warning) __has_warning(warning) -#else - #define JSON_HEDLEY_HAS_WARNING(warning) (0) -#endif - -#if defined(JSON_HEDLEY_GNUC_HAS_WARNING) - #undef JSON_HEDLEY_GNUC_HAS_WARNING -#endif -#if defined(__has_warning) - #define JSON_HEDLEY_GNUC_HAS_WARNING(warning,major,minor,patch) __has_warning(warning) -#else - #define JSON_HEDLEY_GNUC_HAS_WARNING(warning,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch) -#endif - -#if defined(JSON_HEDLEY_GCC_HAS_WARNING) - #undef JSON_HEDLEY_GCC_HAS_WARNING -#endif -#if defined(__has_warning) - #define JSON_HEDLEY_GCC_HAS_WARNING(warning,major,minor,patch) __has_warning(warning) -#else - #define JSON_HEDLEY_GCC_HAS_WARNING(warning,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch) -#endif - -#if \ - (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)) || \ - defined(__clang__) || \ - JSON_HEDLEY_GCC_VERSION_CHECK(3,0,0) || \ - JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ - JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) || \ - JSON_HEDLEY_PGI_VERSION_CHECK(18,4,0) || \ - JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \ - JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \ - JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,7,0) || \ - JSON_HEDLEY_TI_CL430_VERSION_CHECK(2,0,1) || \ - JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,1,0) || \ - JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,0,0) || \ - JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ - JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \ - JSON_HEDLEY_CRAY_VERSION_CHECK(5,0,0) || \ - JSON_HEDLEY_TINYC_VERSION_CHECK(0,9,17) || \ - JSON_HEDLEY_SUNPRO_VERSION_CHECK(8,0,0) || \ - (JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) && defined(__C99_PRAGMA_OPERATOR)) - #define JSON_HEDLEY_PRAGMA(value) _Pragma(#value) -#elif JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0) - #define JSON_HEDLEY_PRAGMA(value) __pragma(value) -#else - #define JSON_HEDLEY_PRAGMA(value) -#endif - -#if defined(JSON_HEDLEY_DIAGNOSTIC_PUSH) - #undef JSON_HEDLEY_DIAGNOSTIC_PUSH -#endif -#if defined(JSON_HEDLEY_DIAGNOSTIC_POP) - #undef JSON_HEDLEY_DIAGNOSTIC_POP -#endif -#if defined(__clang__) - #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("clang diagnostic push") - #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("clang diagnostic pop") -#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) - #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("warning(push)") - #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("warning(pop)") -#elif JSON_HEDLEY_GCC_VERSION_CHECK(4,6,0) - #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("GCC diagnostic push") - #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("GCC diagnostic pop") -#elif \ - JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0) || \ - JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) - #define JSON_HEDLEY_DIAGNOSTIC_PUSH __pragma(warning(push)) - #define JSON_HEDLEY_DIAGNOSTIC_POP __pragma(warning(pop)) -#elif JSON_HEDLEY_ARM_VERSION_CHECK(5,6,0) - #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("push") - #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("pop") -#elif \ - JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \ - JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \ - JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,4,0) || \ - JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,1,0) || \ - JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ - JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) - #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("diag_push") - #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("diag_pop") -#elif JSON_HEDLEY_PELLES_VERSION_CHECK(2,90,0) - #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("warning(push)") - #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("warning(pop)") -#else - #define JSON_HEDLEY_DIAGNOSTIC_PUSH - #define JSON_HEDLEY_DIAGNOSTIC_POP -#endif - -/* JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_ is for - HEDLEY INTERNAL USE ONLY. API subject to change without notice. */ -#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_) - #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_ -#endif -#if defined(__cplusplus) -# if JSON_HEDLEY_HAS_WARNING("-Wc++98-compat") -# if JSON_HEDLEY_HAS_WARNING("-Wc++17-extensions") -# if JSON_HEDLEY_HAS_WARNING("-Wc++1z-extensions") -# define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(xpr) \ - JSON_HEDLEY_DIAGNOSTIC_PUSH \ - _Pragma("clang diagnostic ignored \"-Wc++98-compat\"") \ - _Pragma("clang diagnostic ignored \"-Wc++17-extensions\"") \ - _Pragma("clang diagnostic ignored \"-Wc++1z-extensions\"") \ - xpr \ - JSON_HEDLEY_DIAGNOSTIC_POP -# else -# define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(xpr) \ - JSON_HEDLEY_DIAGNOSTIC_PUSH \ - _Pragma("clang diagnostic ignored \"-Wc++98-compat\"") \ - _Pragma("clang diagnostic ignored \"-Wc++17-extensions\"") \ - xpr \ - JSON_HEDLEY_DIAGNOSTIC_POP -# endif -# else -# define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(xpr) \ - JSON_HEDLEY_DIAGNOSTIC_PUSH \ - _Pragma("clang diagnostic ignored \"-Wc++98-compat\"") \ - xpr \ - JSON_HEDLEY_DIAGNOSTIC_POP -# endif -# endif -#endif -#if !defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_) - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(x) x -#endif - -#if defined(JSON_HEDLEY_CONST_CAST) - #undef JSON_HEDLEY_CONST_CAST -#endif -#if defined(__cplusplus) -# define JSON_HEDLEY_CONST_CAST(T, expr) (const_cast(expr)) -#elif \ - JSON_HEDLEY_HAS_WARNING("-Wcast-qual") || \ - JSON_HEDLEY_GCC_VERSION_CHECK(4,6,0) || \ - JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) -# define JSON_HEDLEY_CONST_CAST(T, expr) (__extension__ ({ \ - JSON_HEDLEY_DIAGNOSTIC_PUSH \ - JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL \ - ((T) (expr)); \ - JSON_HEDLEY_DIAGNOSTIC_POP \ - })) -#else -# define JSON_HEDLEY_CONST_CAST(T, expr) ((T) (expr)) -#endif - -#if defined(JSON_HEDLEY_REINTERPRET_CAST) - #undef JSON_HEDLEY_REINTERPRET_CAST -#endif -#if defined(__cplusplus) - #define JSON_HEDLEY_REINTERPRET_CAST(T, expr) (reinterpret_cast(expr)) -#else - #define JSON_HEDLEY_REINTERPRET_CAST(T, expr) ((T) (expr)) -#endif - -#if defined(JSON_HEDLEY_STATIC_CAST) - #undef JSON_HEDLEY_STATIC_CAST -#endif -#if defined(__cplusplus) - #define JSON_HEDLEY_STATIC_CAST(T, expr) (static_cast(expr)) -#else - #define JSON_HEDLEY_STATIC_CAST(T, expr) ((T) (expr)) -#endif - -#if defined(JSON_HEDLEY_CPP_CAST) - #undef JSON_HEDLEY_CPP_CAST -#endif -#if defined(__cplusplus) -# if JSON_HEDLEY_HAS_WARNING("-Wold-style-cast") -# define JSON_HEDLEY_CPP_CAST(T, expr) \ - JSON_HEDLEY_DIAGNOSTIC_PUSH \ - _Pragma("clang diagnostic ignored \"-Wold-style-cast\"") \ - ((T) (expr)) \ - JSON_HEDLEY_DIAGNOSTIC_POP -# elif JSON_HEDLEY_IAR_VERSION_CHECK(8,3,0) -# define JSON_HEDLEY_CPP_CAST(T, expr) \ - JSON_HEDLEY_DIAGNOSTIC_PUSH \ - _Pragma("diag_suppress=Pe137") \ - JSON_HEDLEY_DIAGNOSTIC_POP -# else -# define JSON_HEDLEY_CPP_CAST(T, expr) ((T) (expr)) -# endif -#else -# define JSON_HEDLEY_CPP_CAST(T, expr) (expr) -#endif - -#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED) - #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED -#endif -#if JSON_HEDLEY_HAS_WARNING("-Wdeprecated-declarations") - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("clang diagnostic ignored \"-Wdeprecated-declarations\"") -#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("warning(disable:1478 1786)") -#elif JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED __pragma(warning(disable:1478 1786)) -#elif JSON_HEDLEY_PGI_VERSION_CHECK(20,7,0) - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress 1215,1216,1444,1445") -#elif JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress 1215,1444") -#elif JSON_HEDLEY_GCC_VERSION_CHECK(4,3,0) - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"") -#elif JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0) - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED __pragma(warning(disable:4996)) -#elif JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress 1215,1444") -#elif \ - JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \ - (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \ - (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \ - (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \ - (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \ - JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ - JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress 1291,1718") -#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,13,0) && !defined(__cplusplus) - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("error_messages(off,E_DEPRECATED_ATT,E_DEPRECATED_ATT_MESS)") -#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,13,0) && defined(__cplusplus) - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("error_messages(off,symdeprecated,symdeprecated2)") -#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress=Pe1444,Pe1215") -#elif JSON_HEDLEY_PELLES_VERSION_CHECK(2,90,0) - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("warn(disable:2241)") -#else - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED -#endif - -#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS) - #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS -#endif -#if JSON_HEDLEY_HAS_WARNING("-Wunknown-pragmas") - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("clang diagnostic ignored \"-Wunknown-pragmas\"") -#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("warning(disable:161)") -#elif JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS __pragma(warning(disable:161)) -#elif JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress 1675") -#elif JSON_HEDLEY_GCC_VERSION_CHECK(4,3,0) - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("GCC diagnostic ignored \"-Wunknown-pragmas\"") -#elif JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0) - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS __pragma(warning(disable:4068)) -#elif \ - JSON_HEDLEY_TI_VERSION_CHECK(16,9,0) || \ - JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,0,0) || \ - JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ - JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,3,0) - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress 163") -#elif JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,0,0) - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress 163") -#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress=Pe161") -#elif JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress 161") -#else - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS -#endif - -#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES) - #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES -#endif -#if JSON_HEDLEY_HAS_WARNING("-Wunknown-attributes") - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("clang diagnostic ignored \"-Wunknown-attributes\"") -#elif JSON_HEDLEY_GCC_VERSION_CHECK(4,6,0) - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"") -#elif JSON_HEDLEY_INTEL_VERSION_CHECK(17,0,0) - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("warning(disable:1292)") -#elif JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES __pragma(warning(disable:1292)) -#elif JSON_HEDLEY_MSVC_VERSION_CHECK(19,0,0) - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES __pragma(warning(disable:5030)) -#elif JSON_HEDLEY_PGI_VERSION_CHECK(20,7,0) - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress 1097,1098") -#elif JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress 1097") -#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,14,0) && defined(__cplusplus) - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("error_messages(off,attrskipunsup)") -#elif \ - JSON_HEDLEY_TI_VERSION_CHECK(18,1,0) || \ - JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,3,0) || \ - JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress 1173") -#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress=Pe1097") -#elif JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress 1097") -#else - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES -#endif - -#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL) - #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL -#endif -#if JSON_HEDLEY_HAS_WARNING("-Wcast-qual") - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL _Pragma("clang diagnostic ignored \"-Wcast-qual\"") -#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL _Pragma("warning(disable:2203 2331)") -#elif JSON_HEDLEY_GCC_VERSION_CHECK(3,0,0) - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL _Pragma("GCC diagnostic ignored \"-Wcast-qual\"") -#else - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL -#endif - -#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION) - #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION -#endif -#if JSON_HEDLEY_HAS_WARNING("-Wunused-function") - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION _Pragma("clang diagnostic ignored \"-Wunused-function\"") -#elif JSON_HEDLEY_GCC_VERSION_CHECK(3,4,0) - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION _Pragma("GCC diagnostic ignored \"-Wunused-function\"") -#elif JSON_HEDLEY_MSVC_VERSION_CHECK(1,0,0) - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION __pragma(warning(disable:4505)) -#elif JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION _Pragma("diag_suppress 3142") -#else - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION -#endif - -#if defined(JSON_HEDLEY_DEPRECATED) - #undef JSON_HEDLEY_DEPRECATED -#endif -#if defined(JSON_HEDLEY_DEPRECATED_FOR) - #undef JSON_HEDLEY_DEPRECATED_FOR -#endif -#if \ - JSON_HEDLEY_MSVC_VERSION_CHECK(14,0,0) || \ - JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) - #define JSON_HEDLEY_DEPRECATED(since) __declspec(deprecated("Since " # since)) - #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) __declspec(deprecated("Since " #since "; use " #replacement)) -#elif \ - (JSON_HEDLEY_HAS_EXTENSION(attribute_deprecated_with_message) && !defined(JSON_HEDLEY_IAR_VERSION)) || \ - JSON_HEDLEY_GCC_VERSION_CHECK(4,5,0) || \ - JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ - JSON_HEDLEY_ARM_VERSION_CHECK(5,6,0) || \ - JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,13,0) || \ - JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) || \ - JSON_HEDLEY_TI_VERSION_CHECK(18,1,0) || \ - JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(18,1,0) || \ - JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,3,0) || \ - JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ - JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,3,0) || \ - JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) - #define JSON_HEDLEY_DEPRECATED(since) __attribute__((__deprecated__("Since " #since))) - #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) __attribute__((__deprecated__("Since " #since "; use " #replacement))) -#elif defined(__cplusplus) && (__cplusplus >= 201402L) - #define JSON_HEDLEY_DEPRECATED(since) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[deprecated("Since " #since)]]) - #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[deprecated("Since " #since "; use " #replacement)]]) -#elif \ - JSON_HEDLEY_HAS_ATTRIBUTE(deprecated) || \ - JSON_HEDLEY_GCC_VERSION_CHECK(3,1,0) || \ - JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \ - JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \ - (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \ - (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \ - (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \ - (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \ - JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ - JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \ - JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) || \ - JSON_HEDLEY_IAR_VERSION_CHECK(8,10,0) - #define JSON_HEDLEY_DEPRECATED(since) __attribute__((__deprecated__)) - #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) __attribute__((__deprecated__)) -#elif \ - JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0) || \ - JSON_HEDLEY_PELLES_VERSION_CHECK(6,50,0) || \ - JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) - #define JSON_HEDLEY_DEPRECATED(since) __declspec(deprecated) - #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) __declspec(deprecated) -#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) - #define JSON_HEDLEY_DEPRECATED(since) _Pragma("deprecated") - #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) _Pragma("deprecated") -#else - #define JSON_HEDLEY_DEPRECATED(since) - #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) -#endif - -#if defined(JSON_HEDLEY_UNAVAILABLE) - #undef JSON_HEDLEY_UNAVAILABLE -#endif -#if \ - JSON_HEDLEY_HAS_ATTRIBUTE(warning) || \ - JSON_HEDLEY_GCC_VERSION_CHECK(4,3,0) || \ - JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ - JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) - #define JSON_HEDLEY_UNAVAILABLE(available_since) __attribute__((__warning__("Not available until " #available_since))) -#else - #define JSON_HEDLEY_UNAVAILABLE(available_since) -#endif - -#if defined(JSON_HEDLEY_WARN_UNUSED_RESULT) - #undef JSON_HEDLEY_WARN_UNUSED_RESULT -#endif -#if defined(JSON_HEDLEY_WARN_UNUSED_RESULT_MSG) - #undef JSON_HEDLEY_WARN_UNUSED_RESULT_MSG -#endif -#if \ - JSON_HEDLEY_HAS_ATTRIBUTE(warn_unused_result) || \ - JSON_HEDLEY_GCC_VERSION_CHECK(3,4,0) || \ - JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ - JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \ - (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \ - (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \ - (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \ - (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \ - JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ - JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \ - (JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,15,0) && defined(__cplusplus)) || \ - JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) || \ - JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) - #define JSON_HEDLEY_WARN_UNUSED_RESULT __attribute__((__warn_unused_result__)) - #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg) __attribute__((__warn_unused_result__)) -#elif (JSON_HEDLEY_HAS_CPP_ATTRIBUTE(nodiscard) >= 201907L) - #define JSON_HEDLEY_WARN_UNUSED_RESULT JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard]]) - #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard(msg)]]) -#elif JSON_HEDLEY_HAS_CPP_ATTRIBUTE(nodiscard) - #define JSON_HEDLEY_WARN_UNUSED_RESULT JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard]]) - #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard]]) -#elif defined(_Check_return_) /* SAL */ - #define JSON_HEDLEY_WARN_UNUSED_RESULT _Check_return_ - #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg) _Check_return_ -#else - #define JSON_HEDLEY_WARN_UNUSED_RESULT - #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg) -#endif - -#if defined(JSON_HEDLEY_SENTINEL) - #undef JSON_HEDLEY_SENTINEL -#endif -#if \ - JSON_HEDLEY_HAS_ATTRIBUTE(sentinel) || \ - JSON_HEDLEY_GCC_VERSION_CHECK(4,0,0) || \ - JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ - JSON_HEDLEY_ARM_VERSION_CHECK(5,4,0) || \ - JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) - #define JSON_HEDLEY_SENTINEL(position) __attribute__((__sentinel__(position))) -#else - #define JSON_HEDLEY_SENTINEL(position) -#endif - -#if defined(JSON_HEDLEY_NO_RETURN) - #undef JSON_HEDLEY_NO_RETURN -#endif -#if JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) - #define JSON_HEDLEY_NO_RETURN __noreturn -#elif \ - JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ - JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) - #define JSON_HEDLEY_NO_RETURN __attribute__((__noreturn__)) -#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L - #define JSON_HEDLEY_NO_RETURN _Noreturn -#elif defined(__cplusplus) && (__cplusplus >= 201103L) - #define JSON_HEDLEY_NO_RETURN JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[noreturn]]) -#elif \ - JSON_HEDLEY_HAS_ATTRIBUTE(noreturn) || \ - JSON_HEDLEY_GCC_VERSION_CHECK(3,2,0) || \ - JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \ - JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \ - JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \ - JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \ - (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \ - (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \ - (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \ - (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \ - JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ - JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \ - JSON_HEDLEY_IAR_VERSION_CHECK(8,10,0) - #define JSON_HEDLEY_NO_RETURN __attribute__((__noreturn__)) -#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0) - #define JSON_HEDLEY_NO_RETURN _Pragma("does_not_return") -#elif \ - JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0) || \ - JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) - #define JSON_HEDLEY_NO_RETURN __declspec(noreturn) -#elif JSON_HEDLEY_TI_CL6X_VERSION_CHECK(6,0,0) && defined(__cplusplus) - #define JSON_HEDLEY_NO_RETURN _Pragma("FUNC_NEVER_RETURNS;") -#elif JSON_HEDLEY_COMPCERT_VERSION_CHECK(3,2,0) - #define JSON_HEDLEY_NO_RETURN __attribute((noreturn)) -#elif JSON_HEDLEY_PELLES_VERSION_CHECK(9,0,0) - #define JSON_HEDLEY_NO_RETURN __declspec(noreturn) -#else - #define JSON_HEDLEY_NO_RETURN -#endif - -#if defined(JSON_HEDLEY_NO_ESCAPE) - #undef JSON_HEDLEY_NO_ESCAPE -#endif -#if JSON_HEDLEY_HAS_ATTRIBUTE(noescape) - #define JSON_HEDLEY_NO_ESCAPE __attribute__((__noescape__)) -#else - #define JSON_HEDLEY_NO_ESCAPE -#endif - -#if defined(JSON_HEDLEY_UNREACHABLE) - #undef JSON_HEDLEY_UNREACHABLE -#endif -#if defined(JSON_HEDLEY_UNREACHABLE_RETURN) - #undef JSON_HEDLEY_UNREACHABLE_RETURN -#endif -#if defined(JSON_HEDLEY_ASSUME) - #undef JSON_HEDLEY_ASSUME -#endif -#if \ - JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0) || \ - JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ - JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) - #define JSON_HEDLEY_ASSUME(expr) __assume(expr) -#elif JSON_HEDLEY_HAS_BUILTIN(__builtin_assume) - #define JSON_HEDLEY_ASSUME(expr) __builtin_assume(expr) -#elif \ - JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,2,0) || \ - JSON_HEDLEY_TI_CL6X_VERSION_CHECK(4,0,0) - #if defined(__cplusplus) - #define JSON_HEDLEY_ASSUME(expr) std::_nassert(expr) - #else - #define JSON_HEDLEY_ASSUME(expr) _nassert(expr) - #endif -#endif -#if \ - (JSON_HEDLEY_HAS_BUILTIN(__builtin_unreachable) && (!defined(JSON_HEDLEY_ARM_VERSION))) || \ - JSON_HEDLEY_GCC_VERSION_CHECK(4,5,0) || \ - JSON_HEDLEY_PGI_VERSION_CHECK(18,10,0) || \ - JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ - JSON_HEDLEY_IBM_VERSION_CHECK(13,1,5) || \ - JSON_HEDLEY_CRAY_VERSION_CHECK(10,0,0) || \ - JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) - #define JSON_HEDLEY_UNREACHABLE() __builtin_unreachable() -#elif defined(JSON_HEDLEY_ASSUME) - #define JSON_HEDLEY_UNREACHABLE() JSON_HEDLEY_ASSUME(0) -#endif -#if !defined(JSON_HEDLEY_ASSUME) - #if defined(JSON_HEDLEY_UNREACHABLE) - #define JSON_HEDLEY_ASSUME(expr) JSON_HEDLEY_STATIC_CAST(void, ((expr) ? 1 : (JSON_HEDLEY_UNREACHABLE(), 1))) - #else - #define JSON_HEDLEY_ASSUME(expr) JSON_HEDLEY_STATIC_CAST(void, expr) - #endif -#endif -#if defined(JSON_HEDLEY_UNREACHABLE) - #if \ - JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,2,0) || \ - JSON_HEDLEY_TI_CL6X_VERSION_CHECK(4,0,0) - #define JSON_HEDLEY_UNREACHABLE_RETURN(value) return (JSON_HEDLEY_STATIC_CAST(void, JSON_HEDLEY_ASSUME(0)), (value)) - #else - #define JSON_HEDLEY_UNREACHABLE_RETURN(value) JSON_HEDLEY_UNREACHABLE() - #endif -#else - #define JSON_HEDLEY_UNREACHABLE_RETURN(value) return (value) -#endif -#if !defined(JSON_HEDLEY_UNREACHABLE) - #define JSON_HEDLEY_UNREACHABLE() JSON_HEDLEY_ASSUME(0) -#endif - -JSON_HEDLEY_DIAGNOSTIC_PUSH -#if JSON_HEDLEY_HAS_WARNING("-Wpedantic") - #pragma clang diagnostic ignored "-Wpedantic" -#endif -#if JSON_HEDLEY_HAS_WARNING("-Wc++98-compat-pedantic") && defined(__cplusplus) - #pragma clang diagnostic ignored "-Wc++98-compat-pedantic" -#endif -#if JSON_HEDLEY_GCC_HAS_WARNING("-Wvariadic-macros",4,0,0) - #if defined(__clang__) - #pragma clang diagnostic ignored "-Wvariadic-macros" - #elif defined(JSON_HEDLEY_GCC_VERSION) - #pragma GCC diagnostic ignored "-Wvariadic-macros" - #endif -#endif -#if defined(JSON_HEDLEY_NON_NULL) - #undef JSON_HEDLEY_NON_NULL -#endif -#if \ - JSON_HEDLEY_HAS_ATTRIBUTE(nonnull) || \ - JSON_HEDLEY_GCC_VERSION_CHECK(3,3,0) || \ - JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ - JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) - #define JSON_HEDLEY_NON_NULL(...) __attribute__((__nonnull__(__VA_ARGS__))) -#else - #define JSON_HEDLEY_NON_NULL(...) -#endif -JSON_HEDLEY_DIAGNOSTIC_POP - -#if defined(JSON_HEDLEY_PRINTF_FORMAT) - #undef JSON_HEDLEY_PRINTF_FORMAT -#endif -#if defined(__MINGW32__) && JSON_HEDLEY_GCC_HAS_ATTRIBUTE(format,4,4,0) && !defined(__USE_MINGW_ANSI_STDIO) - #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check) __attribute__((__format__(ms_printf, string_idx, first_to_check))) -#elif defined(__MINGW32__) && JSON_HEDLEY_GCC_HAS_ATTRIBUTE(format,4,4,0) && defined(__USE_MINGW_ANSI_STDIO) - #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check) __attribute__((__format__(gnu_printf, string_idx, first_to_check))) -#elif \ - JSON_HEDLEY_HAS_ATTRIBUTE(format) || \ - JSON_HEDLEY_GCC_VERSION_CHECK(3,1,0) || \ - JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ - JSON_HEDLEY_ARM_VERSION_CHECK(5,6,0) || \ - JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \ - JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \ - (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \ - (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \ - (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \ - (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \ - JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ - JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \ - JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) - #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check) __attribute__((__format__(__printf__, string_idx, first_to_check))) -#elif JSON_HEDLEY_PELLES_VERSION_CHECK(6,0,0) - #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check) __declspec(vaformat(printf,string_idx,first_to_check)) -#else - #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check) -#endif - -#if defined(JSON_HEDLEY_CONSTEXPR) - #undef JSON_HEDLEY_CONSTEXPR -#endif -#if defined(__cplusplus) - #if __cplusplus >= 201103L - #define JSON_HEDLEY_CONSTEXPR JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(constexpr) - #endif -#endif -#if !defined(JSON_HEDLEY_CONSTEXPR) - #define JSON_HEDLEY_CONSTEXPR -#endif - -#if defined(JSON_HEDLEY_PREDICT) - #undef JSON_HEDLEY_PREDICT -#endif -#if defined(JSON_HEDLEY_LIKELY) - #undef JSON_HEDLEY_LIKELY -#endif -#if defined(JSON_HEDLEY_UNLIKELY) - #undef JSON_HEDLEY_UNLIKELY -#endif -#if defined(JSON_HEDLEY_UNPREDICTABLE) - #undef JSON_HEDLEY_UNPREDICTABLE -#endif -#if JSON_HEDLEY_HAS_BUILTIN(__builtin_unpredictable) - #define JSON_HEDLEY_UNPREDICTABLE(expr) __builtin_unpredictable((expr)) -#endif -#if \ - (JSON_HEDLEY_HAS_BUILTIN(__builtin_expect_with_probability) && !defined(JSON_HEDLEY_PGI_VERSION)) || \ - JSON_HEDLEY_GCC_VERSION_CHECK(9,0,0) || \ - JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) -# define JSON_HEDLEY_PREDICT(expr, value, probability) __builtin_expect_with_probability( (expr), (value), (probability)) -# define JSON_HEDLEY_PREDICT_TRUE(expr, probability) __builtin_expect_with_probability(!!(expr), 1 , (probability)) -# define JSON_HEDLEY_PREDICT_FALSE(expr, probability) __builtin_expect_with_probability(!!(expr), 0 , (probability)) -# define JSON_HEDLEY_LIKELY(expr) __builtin_expect (!!(expr), 1 ) -# define JSON_HEDLEY_UNLIKELY(expr) __builtin_expect (!!(expr), 0 ) -#elif \ - (JSON_HEDLEY_HAS_BUILTIN(__builtin_expect) && !defined(JSON_HEDLEY_INTEL_CL_VERSION)) || \ - JSON_HEDLEY_GCC_VERSION_CHECK(3,0,0) || \ - JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ - (JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,15,0) && defined(__cplusplus)) || \ - JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \ - JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \ - JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \ - JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,7,0) || \ - JSON_HEDLEY_TI_CL430_VERSION_CHECK(3,1,0) || \ - JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,1,0) || \ - JSON_HEDLEY_TI_CL6X_VERSION_CHECK(6,1,0) || \ - JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ - JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \ - JSON_HEDLEY_TINYC_VERSION_CHECK(0,9,27) || \ - JSON_HEDLEY_CRAY_VERSION_CHECK(8,1,0) || \ - JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) -# define JSON_HEDLEY_PREDICT(expr, expected, probability) \ - (((probability) >= 0.9) ? __builtin_expect((expr), (expected)) : (JSON_HEDLEY_STATIC_CAST(void, expected), (expr))) -# define JSON_HEDLEY_PREDICT_TRUE(expr, probability) \ - (__extension__ ({ \ - double hedley_probability_ = (probability); \ - ((hedley_probability_ >= 0.9) ? __builtin_expect(!!(expr), 1) : ((hedley_probability_ <= 0.1) ? __builtin_expect(!!(expr), 0) : !!(expr))); \ - })) -# define JSON_HEDLEY_PREDICT_FALSE(expr, probability) \ - (__extension__ ({ \ - double hedley_probability_ = (probability); \ - ((hedley_probability_ >= 0.9) ? __builtin_expect(!!(expr), 0) : ((hedley_probability_ <= 0.1) ? __builtin_expect(!!(expr), 1) : !!(expr))); \ - })) -# define JSON_HEDLEY_LIKELY(expr) __builtin_expect(!!(expr), 1) -# define JSON_HEDLEY_UNLIKELY(expr) __builtin_expect(!!(expr), 0) -#else -# define JSON_HEDLEY_PREDICT(expr, expected, probability) (JSON_HEDLEY_STATIC_CAST(void, expected), (expr)) -# define JSON_HEDLEY_PREDICT_TRUE(expr, probability) (!!(expr)) -# define JSON_HEDLEY_PREDICT_FALSE(expr, probability) (!!(expr)) -# define JSON_HEDLEY_LIKELY(expr) (!!(expr)) -# define JSON_HEDLEY_UNLIKELY(expr) (!!(expr)) -#endif -#if !defined(JSON_HEDLEY_UNPREDICTABLE) - #define JSON_HEDLEY_UNPREDICTABLE(expr) JSON_HEDLEY_PREDICT(expr, 1, 0.5) -#endif - -#if defined(JSON_HEDLEY_MALLOC) - #undef JSON_HEDLEY_MALLOC -#endif -#if \ - JSON_HEDLEY_HAS_ATTRIBUTE(malloc) || \ - JSON_HEDLEY_GCC_VERSION_CHECK(3,1,0) || \ - JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ - JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \ - JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \ - JSON_HEDLEY_IBM_VERSION_CHECK(12,1,0) || \ - JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \ - (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \ - (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \ - (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \ - (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \ - JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ - JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \ - JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) - #define JSON_HEDLEY_MALLOC __attribute__((__malloc__)) -#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0) - #define JSON_HEDLEY_MALLOC _Pragma("returns_new_memory") -#elif \ - JSON_HEDLEY_MSVC_VERSION_CHECK(14,0,0) || \ - JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) - #define JSON_HEDLEY_MALLOC __declspec(restrict) -#else - #define JSON_HEDLEY_MALLOC -#endif - -#if defined(JSON_HEDLEY_PURE) - #undef JSON_HEDLEY_PURE -#endif -#if \ - JSON_HEDLEY_HAS_ATTRIBUTE(pure) || \ - JSON_HEDLEY_GCC_VERSION_CHECK(2,96,0) || \ - JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ - JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \ - JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \ - JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \ - JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \ - (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \ - (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \ - (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \ - (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \ - JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ - JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \ - JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) || \ - JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) -# define JSON_HEDLEY_PURE __attribute__((__pure__)) -#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0) -# define JSON_HEDLEY_PURE _Pragma("does_not_write_global_data") -#elif defined(__cplusplus) && \ - ( \ - JSON_HEDLEY_TI_CL430_VERSION_CHECK(2,0,1) || \ - JSON_HEDLEY_TI_CL6X_VERSION_CHECK(4,0,0) || \ - JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) \ - ) -# define JSON_HEDLEY_PURE _Pragma("FUNC_IS_PURE;") -#else -# define JSON_HEDLEY_PURE -#endif - -#if defined(JSON_HEDLEY_CONST) - #undef JSON_HEDLEY_CONST -#endif -#if \ - JSON_HEDLEY_HAS_ATTRIBUTE(const) || \ - JSON_HEDLEY_GCC_VERSION_CHECK(2,5,0) || \ - JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ - JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \ - JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \ - JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \ - JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \ - (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \ - (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \ - (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \ - (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \ - JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ - JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \ - JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) || \ - JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) - #define JSON_HEDLEY_CONST __attribute__((__const__)) -#elif \ - JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0) - #define JSON_HEDLEY_CONST _Pragma("no_side_effect") -#else - #define JSON_HEDLEY_CONST JSON_HEDLEY_PURE -#endif - -#if defined(JSON_HEDLEY_RESTRICT) - #undef JSON_HEDLEY_RESTRICT -#endif -#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) && !defined(__cplusplus) - #define JSON_HEDLEY_RESTRICT restrict -#elif \ - JSON_HEDLEY_GCC_VERSION_CHECK(3,1,0) || \ - JSON_HEDLEY_MSVC_VERSION_CHECK(14,0,0) || \ - JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ - JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) || \ - JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \ - JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \ - JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) || \ - JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \ - JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,2,4) || \ - JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,1,0) || \ - JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ - (JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,14,0) && defined(__cplusplus)) || \ - JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) || \ - defined(__clang__) || \ - JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) - #define JSON_HEDLEY_RESTRICT __restrict -#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,3,0) && !defined(__cplusplus) - #define JSON_HEDLEY_RESTRICT _Restrict -#else - #define JSON_HEDLEY_RESTRICT -#endif - -#if defined(JSON_HEDLEY_INLINE) - #undef JSON_HEDLEY_INLINE -#endif -#if \ - (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)) || \ - (defined(__cplusplus) && (__cplusplus >= 199711L)) - #define JSON_HEDLEY_INLINE inline -#elif \ - defined(JSON_HEDLEY_GCC_VERSION) || \ - JSON_HEDLEY_ARM_VERSION_CHECK(6,2,0) - #define JSON_HEDLEY_INLINE __inline__ -#elif \ - JSON_HEDLEY_MSVC_VERSION_CHECK(12,0,0) || \ - JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) || \ - JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \ - JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,1,0) || \ - JSON_HEDLEY_TI_CL430_VERSION_CHECK(3,1,0) || \ - JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,2,0) || \ - JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,0,0) || \ - JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ - JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \ - JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) - #define JSON_HEDLEY_INLINE __inline -#else - #define JSON_HEDLEY_INLINE -#endif - -#if defined(JSON_HEDLEY_ALWAYS_INLINE) - #undef JSON_HEDLEY_ALWAYS_INLINE -#endif -#if \ - JSON_HEDLEY_HAS_ATTRIBUTE(always_inline) || \ - JSON_HEDLEY_GCC_VERSION_CHECK(4,0,0) || \ - JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ - JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \ - JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \ - JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \ - JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \ - (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \ - (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \ - (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \ - (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \ - JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ - JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \ - JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) || \ - JSON_HEDLEY_IAR_VERSION_CHECK(8,10,0) -# define JSON_HEDLEY_ALWAYS_INLINE __attribute__((__always_inline__)) JSON_HEDLEY_INLINE -#elif \ - JSON_HEDLEY_MSVC_VERSION_CHECK(12,0,0) || \ - JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) -# define JSON_HEDLEY_ALWAYS_INLINE __forceinline -#elif defined(__cplusplus) && \ - ( \ - JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \ - JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \ - JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \ - JSON_HEDLEY_TI_CL6X_VERSION_CHECK(6,1,0) || \ - JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ - JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) \ - ) -# define JSON_HEDLEY_ALWAYS_INLINE _Pragma("FUNC_ALWAYS_INLINE;") -#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) -# define JSON_HEDLEY_ALWAYS_INLINE _Pragma("inline=forced") -#else -# define JSON_HEDLEY_ALWAYS_INLINE JSON_HEDLEY_INLINE -#endif - -#if defined(JSON_HEDLEY_NEVER_INLINE) - #undef JSON_HEDLEY_NEVER_INLINE -#endif -#if \ - JSON_HEDLEY_HAS_ATTRIBUTE(noinline) || \ - JSON_HEDLEY_GCC_VERSION_CHECK(4,0,0) || \ - JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ - JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \ - JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \ - JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \ - JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \ - (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \ - (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \ - (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \ - (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \ - JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ - JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \ - JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) || \ - JSON_HEDLEY_IAR_VERSION_CHECK(8,10,0) - #define JSON_HEDLEY_NEVER_INLINE __attribute__((__noinline__)) -#elif \ - JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0) || \ - JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) - #define JSON_HEDLEY_NEVER_INLINE __declspec(noinline) -#elif JSON_HEDLEY_PGI_VERSION_CHECK(10,2,0) - #define JSON_HEDLEY_NEVER_INLINE _Pragma("noinline") -#elif JSON_HEDLEY_TI_CL6X_VERSION_CHECK(6,0,0) && defined(__cplusplus) - #define JSON_HEDLEY_NEVER_INLINE _Pragma("FUNC_CANNOT_INLINE;") -#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) - #define JSON_HEDLEY_NEVER_INLINE _Pragma("inline=never") -#elif JSON_HEDLEY_COMPCERT_VERSION_CHECK(3,2,0) - #define JSON_HEDLEY_NEVER_INLINE __attribute((noinline)) -#elif JSON_HEDLEY_PELLES_VERSION_CHECK(9,0,0) - #define JSON_HEDLEY_NEVER_INLINE __declspec(noinline) -#else - #define JSON_HEDLEY_NEVER_INLINE -#endif - -#if defined(JSON_HEDLEY_PRIVATE) - #undef JSON_HEDLEY_PRIVATE -#endif -#if defined(JSON_HEDLEY_PUBLIC) - #undef JSON_HEDLEY_PUBLIC -#endif -#if defined(JSON_HEDLEY_IMPORT) - #undef JSON_HEDLEY_IMPORT -#endif -#if defined(_WIN32) || defined(__CYGWIN__) -# define JSON_HEDLEY_PRIVATE -# define JSON_HEDLEY_PUBLIC __declspec(dllexport) -# define JSON_HEDLEY_IMPORT __declspec(dllimport) -#else -# if \ - JSON_HEDLEY_HAS_ATTRIBUTE(visibility) || \ - JSON_HEDLEY_GCC_VERSION_CHECK(3,3,0) || \ - JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \ - JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ - JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \ - JSON_HEDLEY_IBM_VERSION_CHECK(13,1,0) || \ - ( \ - defined(__TI_EABI__) && \ - ( \ - (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) \ - ) \ - ) || \ - JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) -# define JSON_HEDLEY_PRIVATE __attribute__((__visibility__("hidden"))) -# define JSON_HEDLEY_PUBLIC __attribute__((__visibility__("default"))) -# else -# define JSON_HEDLEY_PRIVATE -# define JSON_HEDLEY_PUBLIC -# endif -# define JSON_HEDLEY_IMPORT extern -#endif - -#if defined(JSON_HEDLEY_NO_THROW) - #undef JSON_HEDLEY_NO_THROW -#endif -#if \ - JSON_HEDLEY_HAS_ATTRIBUTE(nothrow) || \ - JSON_HEDLEY_GCC_VERSION_CHECK(3,3,0) || \ - JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ - JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) - #define JSON_HEDLEY_NO_THROW __attribute__((__nothrow__)) -#elif \ - JSON_HEDLEY_MSVC_VERSION_CHECK(13,1,0) || \ - JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) || \ - JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) - #define JSON_HEDLEY_NO_THROW __declspec(nothrow) -#else - #define JSON_HEDLEY_NO_THROW -#endif - -#if defined(JSON_HEDLEY_FALL_THROUGH) - #undef JSON_HEDLEY_FALL_THROUGH -#endif -#if \ - JSON_HEDLEY_HAS_ATTRIBUTE(fallthrough) || \ - JSON_HEDLEY_GCC_VERSION_CHECK(7,0,0) || \ - JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) - #define JSON_HEDLEY_FALL_THROUGH __attribute__((__fallthrough__)) -#elif JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS(clang,fallthrough) - #define JSON_HEDLEY_FALL_THROUGH JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[clang::fallthrough]]) -#elif JSON_HEDLEY_HAS_CPP_ATTRIBUTE(fallthrough) - #define JSON_HEDLEY_FALL_THROUGH JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[fallthrough]]) -#elif defined(__fallthrough) /* SAL */ - #define JSON_HEDLEY_FALL_THROUGH __fallthrough -#else - #define JSON_HEDLEY_FALL_THROUGH -#endif - -#if defined(JSON_HEDLEY_RETURNS_NON_NULL) - #undef JSON_HEDLEY_RETURNS_NON_NULL -#endif -#if \ - JSON_HEDLEY_HAS_ATTRIBUTE(returns_nonnull) || \ - JSON_HEDLEY_GCC_VERSION_CHECK(4,9,0) || \ - JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) - #define JSON_HEDLEY_RETURNS_NON_NULL __attribute__((__returns_nonnull__)) -#elif defined(_Ret_notnull_) /* SAL */ - #define JSON_HEDLEY_RETURNS_NON_NULL _Ret_notnull_ -#else - #define JSON_HEDLEY_RETURNS_NON_NULL -#endif - -#if defined(JSON_HEDLEY_ARRAY_PARAM) - #undef JSON_HEDLEY_ARRAY_PARAM -#endif -#if \ - defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) && \ - !defined(__STDC_NO_VLA__) && \ - !defined(__cplusplus) && \ - !defined(JSON_HEDLEY_PGI_VERSION) && \ - !defined(JSON_HEDLEY_TINYC_VERSION) - #define JSON_HEDLEY_ARRAY_PARAM(name) (name) -#else - #define JSON_HEDLEY_ARRAY_PARAM(name) -#endif - -#if defined(JSON_HEDLEY_IS_CONSTANT) - #undef JSON_HEDLEY_IS_CONSTANT -#endif -#if defined(JSON_HEDLEY_REQUIRE_CONSTEXPR) - #undef JSON_HEDLEY_REQUIRE_CONSTEXPR -#endif -/* JSON_HEDLEY_IS_CONSTEXPR_ is for - HEDLEY INTERNAL USE ONLY. API subject to change without notice. */ -#if defined(JSON_HEDLEY_IS_CONSTEXPR_) - #undef JSON_HEDLEY_IS_CONSTEXPR_ -#endif -#if \ - JSON_HEDLEY_HAS_BUILTIN(__builtin_constant_p) || \ - JSON_HEDLEY_GCC_VERSION_CHECK(3,4,0) || \ - JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ - JSON_HEDLEY_TINYC_VERSION_CHECK(0,9,19) || \ - JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \ - JSON_HEDLEY_IBM_VERSION_CHECK(13,1,0) || \ - JSON_HEDLEY_TI_CL6X_VERSION_CHECK(6,1,0) || \ - (JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0) && !defined(__cplusplus)) || \ - JSON_HEDLEY_CRAY_VERSION_CHECK(8,1,0) || \ - JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) - #define JSON_HEDLEY_IS_CONSTANT(expr) __builtin_constant_p(expr) -#endif -#if !defined(__cplusplus) -# if \ - JSON_HEDLEY_HAS_BUILTIN(__builtin_types_compatible_p) || \ - JSON_HEDLEY_GCC_VERSION_CHECK(3,4,0) || \ - JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ - JSON_HEDLEY_IBM_VERSION_CHECK(13,1,0) || \ - JSON_HEDLEY_CRAY_VERSION_CHECK(8,1,0) || \ - JSON_HEDLEY_ARM_VERSION_CHECK(5,4,0) || \ - JSON_HEDLEY_TINYC_VERSION_CHECK(0,9,24) -#if defined(__INTPTR_TYPE__) - #define JSON_HEDLEY_IS_CONSTEXPR_(expr) __builtin_types_compatible_p(__typeof__((1 ? (void*) ((__INTPTR_TYPE__) ((expr) * 0)) : (int*) 0)), int*) -#else - #include - #define JSON_HEDLEY_IS_CONSTEXPR_(expr) __builtin_types_compatible_p(__typeof__((1 ? (void*) ((intptr_t) ((expr) * 0)) : (int*) 0)), int*) -#endif -# elif \ - ( \ - defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L) && \ - !defined(JSON_HEDLEY_SUNPRO_VERSION) && \ - !defined(JSON_HEDLEY_PGI_VERSION) && \ - !defined(JSON_HEDLEY_IAR_VERSION)) || \ - (JSON_HEDLEY_HAS_EXTENSION(c_generic_selections) && !defined(JSON_HEDLEY_IAR_VERSION)) || \ - JSON_HEDLEY_GCC_VERSION_CHECK(4,9,0) || \ - JSON_HEDLEY_INTEL_VERSION_CHECK(17,0,0) || \ - JSON_HEDLEY_IBM_VERSION_CHECK(12,1,0) || \ - JSON_HEDLEY_ARM_VERSION_CHECK(5,3,0) -#if defined(__INTPTR_TYPE__) - #define JSON_HEDLEY_IS_CONSTEXPR_(expr) _Generic((1 ? (void*) ((__INTPTR_TYPE__) ((expr) * 0)) : (int*) 0), int*: 1, void*: 0) -#else - #include - #define JSON_HEDLEY_IS_CONSTEXPR_(expr) _Generic((1 ? (void*) ((intptr_t) * 0) : (int*) 0), int*: 1, void*: 0) -#endif -# elif \ - defined(JSON_HEDLEY_GCC_VERSION) || \ - defined(JSON_HEDLEY_INTEL_VERSION) || \ - defined(JSON_HEDLEY_TINYC_VERSION) || \ - defined(JSON_HEDLEY_TI_ARMCL_VERSION) || \ - JSON_HEDLEY_TI_CL430_VERSION_CHECK(18,12,0) || \ - defined(JSON_HEDLEY_TI_CL2000_VERSION) || \ - defined(JSON_HEDLEY_TI_CL6X_VERSION) || \ - defined(JSON_HEDLEY_TI_CL7X_VERSION) || \ - defined(JSON_HEDLEY_TI_CLPRU_VERSION) || \ - defined(__clang__) -# define JSON_HEDLEY_IS_CONSTEXPR_(expr) ( \ - sizeof(void) != \ - sizeof(*( \ - 1 ? \ - ((void*) ((expr) * 0L) ) : \ -((struct { char v[sizeof(void) * 2]; } *) 1) \ - ) \ - ) \ - ) -# endif -#endif -#if defined(JSON_HEDLEY_IS_CONSTEXPR_) - #if !defined(JSON_HEDLEY_IS_CONSTANT) - #define JSON_HEDLEY_IS_CONSTANT(expr) JSON_HEDLEY_IS_CONSTEXPR_(expr) - #endif - #define JSON_HEDLEY_REQUIRE_CONSTEXPR(expr) (JSON_HEDLEY_IS_CONSTEXPR_(expr) ? (expr) : (-1)) -#else - #if !defined(JSON_HEDLEY_IS_CONSTANT) - #define JSON_HEDLEY_IS_CONSTANT(expr) (0) - #endif - #define JSON_HEDLEY_REQUIRE_CONSTEXPR(expr) (expr) -#endif - -#if defined(JSON_HEDLEY_BEGIN_C_DECLS) - #undef JSON_HEDLEY_BEGIN_C_DECLS -#endif -#if defined(JSON_HEDLEY_END_C_DECLS) - #undef JSON_HEDLEY_END_C_DECLS -#endif -#if defined(JSON_HEDLEY_C_DECL) - #undef JSON_HEDLEY_C_DECL -#endif -#if defined(__cplusplus) - #define JSON_HEDLEY_BEGIN_C_DECLS extern "C" { - #define JSON_HEDLEY_END_C_DECLS } - #define JSON_HEDLEY_C_DECL extern "C" -#else - #define JSON_HEDLEY_BEGIN_C_DECLS - #define JSON_HEDLEY_END_C_DECLS - #define JSON_HEDLEY_C_DECL -#endif - -#if defined(JSON_HEDLEY_STATIC_ASSERT) - #undef JSON_HEDLEY_STATIC_ASSERT -#endif -#if \ - !defined(__cplusplus) && ( \ - (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L)) || \ - (JSON_HEDLEY_HAS_FEATURE(c_static_assert) && !defined(JSON_HEDLEY_INTEL_CL_VERSION)) || \ - JSON_HEDLEY_GCC_VERSION_CHECK(6,0,0) || \ - JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ - defined(_Static_assert) \ - ) -# define JSON_HEDLEY_STATIC_ASSERT(expr, message) _Static_assert(expr, message) -#elif \ - (defined(__cplusplus) && (__cplusplus >= 201103L)) || \ - JSON_HEDLEY_MSVC_VERSION_CHECK(16,0,0) || \ - JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) -# define JSON_HEDLEY_STATIC_ASSERT(expr, message) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(static_assert(expr, message)) -#else -# define JSON_HEDLEY_STATIC_ASSERT(expr, message) -#endif - -#if defined(JSON_HEDLEY_NULL) - #undef JSON_HEDLEY_NULL -#endif -#if defined(__cplusplus) - #if __cplusplus >= 201103L - #define JSON_HEDLEY_NULL JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(nullptr) - #elif defined(NULL) - #define JSON_HEDLEY_NULL NULL - #else - #define JSON_HEDLEY_NULL JSON_HEDLEY_STATIC_CAST(void*, 0) - #endif -#elif defined(NULL) - #define JSON_HEDLEY_NULL NULL -#else - #define JSON_HEDLEY_NULL ((void*) 0) -#endif - -#if defined(JSON_HEDLEY_MESSAGE) - #undef JSON_HEDLEY_MESSAGE -#endif -#if JSON_HEDLEY_HAS_WARNING("-Wunknown-pragmas") -# define JSON_HEDLEY_MESSAGE(msg) \ - JSON_HEDLEY_DIAGNOSTIC_PUSH \ - JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS \ - JSON_HEDLEY_PRAGMA(message msg) \ - JSON_HEDLEY_DIAGNOSTIC_POP -#elif \ - JSON_HEDLEY_GCC_VERSION_CHECK(4,4,0) || \ - JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) -# define JSON_HEDLEY_MESSAGE(msg) JSON_HEDLEY_PRAGMA(message msg) -#elif JSON_HEDLEY_CRAY_VERSION_CHECK(5,0,0) -# define JSON_HEDLEY_MESSAGE(msg) JSON_HEDLEY_PRAGMA(_CRI message msg) -#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) -# define JSON_HEDLEY_MESSAGE(msg) JSON_HEDLEY_PRAGMA(message(msg)) -#elif JSON_HEDLEY_PELLES_VERSION_CHECK(2,0,0) -# define JSON_HEDLEY_MESSAGE(msg) JSON_HEDLEY_PRAGMA(message(msg)) -#else -# define JSON_HEDLEY_MESSAGE(msg) -#endif - -#if defined(JSON_HEDLEY_WARNING) - #undef JSON_HEDLEY_WARNING -#endif -#if JSON_HEDLEY_HAS_WARNING("-Wunknown-pragmas") -# define JSON_HEDLEY_WARNING(msg) \ - JSON_HEDLEY_DIAGNOSTIC_PUSH \ - JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS \ - JSON_HEDLEY_PRAGMA(clang warning msg) \ - JSON_HEDLEY_DIAGNOSTIC_POP -#elif \ - JSON_HEDLEY_GCC_VERSION_CHECK(4,8,0) || \ - JSON_HEDLEY_PGI_VERSION_CHECK(18,4,0) || \ - JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) -# define JSON_HEDLEY_WARNING(msg) JSON_HEDLEY_PRAGMA(GCC warning msg) -#elif \ - JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0) || \ - JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) -# define JSON_HEDLEY_WARNING(msg) JSON_HEDLEY_PRAGMA(message(msg)) -#else -# define JSON_HEDLEY_WARNING(msg) JSON_HEDLEY_MESSAGE(msg) -#endif - -#if defined(JSON_HEDLEY_REQUIRE) - #undef JSON_HEDLEY_REQUIRE -#endif -#if defined(JSON_HEDLEY_REQUIRE_MSG) - #undef JSON_HEDLEY_REQUIRE_MSG -#endif -#if JSON_HEDLEY_HAS_ATTRIBUTE(diagnose_if) -# if JSON_HEDLEY_HAS_WARNING("-Wgcc-compat") -# define JSON_HEDLEY_REQUIRE(expr) \ - JSON_HEDLEY_DIAGNOSTIC_PUSH \ - _Pragma("clang diagnostic ignored \"-Wgcc-compat\"") \ - __attribute__((diagnose_if(!(expr), #expr, "error"))) \ - JSON_HEDLEY_DIAGNOSTIC_POP -# define JSON_HEDLEY_REQUIRE_MSG(expr,msg) \ - JSON_HEDLEY_DIAGNOSTIC_PUSH \ - _Pragma("clang diagnostic ignored \"-Wgcc-compat\"") \ - __attribute__((diagnose_if(!(expr), msg, "error"))) \ - JSON_HEDLEY_DIAGNOSTIC_POP -# else -# define JSON_HEDLEY_REQUIRE(expr) __attribute__((diagnose_if(!(expr), #expr, "error"))) -# define JSON_HEDLEY_REQUIRE_MSG(expr,msg) __attribute__((diagnose_if(!(expr), msg, "error"))) -# endif -#else -# define JSON_HEDLEY_REQUIRE(expr) -# define JSON_HEDLEY_REQUIRE_MSG(expr,msg) -#endif - -#if defined(JSON_HEDLEY_FLAGS) - #undef JSON_HEDLEY_FLAGS -#endif -#if JSON_HEDLEY_HAS_ATTRIBUTE(flag_enum) && (!defined(__cplusplus) || JSON_HEDLEY_HAS_WARNING("-Wbitfield-enum-conversion")) - #define JSON_HEDLEY_FLAGS __attribute__((__flag_enum__)) -#else - #define JSON_HEDLEY_FLAGS -#endif - -#if defined(JSON_HEDLEY_FLAGS_CAST) - #undef JSON_HEDLEY_FLAGS_CAST -#endif -#if JSON_HEDLEY_INTEL_VERSION_CHECK(19,0,0) -# define JSON_HEDLEY_FLAGS_CAST(T, expr) (__extension__ ({ \ - JSON_HEDLEY_DIAGNOSTIC_PUSH \ - _Pragma("warning(disable:188)") \ - ((T) (expr)); \ - JSON_HEDLEY_DIAGNOSTIC_POP \ - })) -#else -# define JSON_HEDLEY_FLAGS_CAST(T, expr) JSON_HEDLEY_STATIC_CAST(T, expr) -#endif - -#if defined(JSON_HEDLEY_EMPTY_BASES) - #undef JSON_HEDLEY_EMPTY_BASES -#endif -#if \ - (JSON_HEDLEY_MSVC_VERSION_CHECK(19,0,23918) && !JSON_HEDLEY_MSVC_VERSION_CHECK(20,0,0)) || \ - JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) - #define JSON_HEDLEY_EMPTY_BASES __declspec(empty_bases) -#else - #define JSON_HEDLEY_EMPTY_BASES -#endif - -/* Remaining macros are deprecated. */ - -#if defined(JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK) - #undef JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK -#endif -#if defined(__clang__) - #define JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK(major,minor,patch) (0) -#else - #define JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK(major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch) -#endif - -#if defined(JSON_HEDLEY_CLANG_HAS_ATTRIBUTE) - #undef JSON_HEDLEY_CLANG_HAS_ATTRIBUTE -#endif -#define JSON_HEDLEY_CLANG_HAS_ATTRIBUTE(attribute) JSON_HEDLEY_HAS_ATTRIBUTE(attribute) - -#if defined(JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE) - #undef JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE -#endif -#define JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE(attribute) JSON_HEDLEY_HAS_CPP_ATTRIBUTE(attribute) - -#if defined(JSON_HEDLEY_CLANG_HAS_BUILTIN) - #undef JSON_HEDLEY_CLANG_HAS_BUILTIN -#endif -#define JSON_HEDLEY_CLANG_HAS_BUILTIN(builtin) JSON_HEDLEY_HAS_BUILTIN(builtin) - -#if defined(JSON_HEDLEY_CLANG_HAS_FEATURE) - #undef JSON_HEDLEY_CLANG_HAS_FEATURE -#endif -#define JSON_HEDLEY_CLANG_HAS_FEATURE(feature) JSON_HEDLEY_HAS_FEATURE(feature) - -#if defined(JSON_HEDLEY_CLANG_HAS_EXTENSION) - #undef JSON_HEDLEY_CLANG_HAS_EXTENSION -#endif -#define JSON_HEDLEY_CLANG_HAS_EXTENSION(extension) JSON_HEDLEY_HAS_EXTENSION(extension) - -#if defined(JSON_HEDLEY_CLANG_HAS_DECLSPEC_DECLSPEC_ATTRIBUTE) - #undef JSON_HEDLEY_CLANG_HAS_DECLSPEC_DECLSPEC_ATTRIBUTE -#endif -#define JSON_HEDLEY_CLANG_HAS_DECLSPEC_ATTRIBUTE(attribute) JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE(attribute) - -#if defined(JSON_HEDLEY_CLANG_HAS_WARNING) - #undef JSON_HEDLEY_CLANG_HAS_WARNING -#endif -#define JSON_HEDLEY_CLANG_HAS_WARNING(warning) JSON_HEDLEY_HAS_WARNING(warning) - -#endif /* !defined(JSON_HEDLEY_VERSION) || (JSON_HEDLEY_VERSION < X) */ - - -// This file contains all internal macro definitions (except those affecting ABI) -// You MUST include macro_unscope.hpp at the end of json.hpp to undef all of them - -// #include - - -// exclude unsupported compilers -#if !defined(JSON_SKIP_UNSUPPORTED_COMPILER_CHECK) - #if defined(__clang__) - #if (__clang_major__ * 10000 + __clang_minor__ * 100 + __clang_patchlevel__) < 30400 - #error "unsupported Clang version - see https://github.com/nlohmann/json#supported-compilers" - #endif - #elif defined(__GNUC__) && !(defined(__ICC) || defined(__INTEL_COMPILER)) - #if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) < 40800 - #error "unsupported GCC version - see https://github.com/nlohmann/json#supported-compilers" - #endif - #endif -#endif - -// C++ language standard detection -// if the user manually specified the used c++ version this is skipped -#if !defined(JSON_HAS_CPP_20) && !defined(JSON_HAS_CPP_17) && !defined(JSON_HAS_CPP_14) && !defined(JSON_HAS_CPP_11) - #if (defined(__cplusplus) && __cplusplus >= 202002L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 202002L) - #define JSON_HAS_CPP_20 - #define JSON_HAS_CPP_17 - #define JSON_HAS_CPP_14 - #elif (defined(__cplusplus) && __cplusplus >= 201703L) || (defined(_HAS_CXX17) && _HAS_CXX17 == 1) // fix for issue #464 - #define JSON_HAS_CPP_17 - #define JSON_HAS_CPP_14 - #elif (defined(__cplusplus) && __cplusplus >= 201402L) || (defined(_HAS_CXX14) && _HAS_CXX14 == 1) - #define JSON_HAS_CPP_14 - #endif - // the cpp 11 flag is always specified because it is the minimal required version - #define JSON_HAS_CPP_11 -#endif - -#ifdef __has_include - #if __has_include() - #include - #endif -#endif - -#if !defined(JSON_HAS_FILESYSTEM) && !defined(JSON_HAS_EXPERIMENTAL_FILESYSTEM) - #ifdef JSON_HAS_CPP_17 - #if defined(__cpp_lib_filesystem) - #define JSON_HAS_FILESYSTEM 1 - #elif defined(__cpp_lib_experimental_filesystem) - #define JSON_HAS_EXPERIMENTAL_FILESYSTEM 1 - #elif !defined(__has_include) - #define JSON_HAS_EXPERIMENTAL_FILESYSTEM 1 - #elif __has_include() - #define JSON_HAS_FILESYSTEM 1 - #elif __has_include() - #define JSON_HAS_EXPERIMENTAL_FILESYSTEM 1 - #endif - - // std::filesystem does not work on MinGW GCC 8: https://sourceforge.net/p/mingw-w64/bugs/737/ - #if defined(__MINGW32__) && defined(__GNUC__) && __GNUC__ == 8 - #undef JSON_HAS_FILESYSTEM - #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM - #endif - - // no filesystem support before GCC 8: https://en.cppreference.com/w/cpp/compiler_support - #if defined(__GNUC__) && !defined(__clang__) && __GNUC__ < 8 - #undef JSON_HAS_FILESYSTEM - #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM - #endif - - // no filesystem support before Clang 7: https://en.cppreference.com/w/cpp/compiler_support - #if defined(__clang_major__) && __clang_major__ < 7 - #undef JSON_HAS_FILESYSTEM - #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM - #endif - - // no filesystem support before MSVC 19.14: https://en.cppreference.com/w/cpp/compiler_support - #if defined(_MSC_VER) && _MSC_VER < 1914 - #undef JSON_HAS_FILESYSTEM - #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM - #endif - - // no filesystem support before iOS 13 - #if defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED < 130000 - #undef JSON_HAS_FILESYSTEM - #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM - #endif - - // no filesystem support before macOS Catalina - #if defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101500 - #undef JSON_HAS_FILESYSTEM - #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM - #endif - #endif -#endif - -#ifndef JSON_HAS_EXPERIMENTAL_FILESYSTEM - #define JSON_HAS_EXPERIMENTAL_FILESYSTEM 0 -#endif - -#ifndef JSON_HAS_FILESYSTEM - #define JSON_HAS_FILESYSTEM 0 -#endif - -#ifndef JSON_HAS_THREE_WAY_COMPARISON - #if defined(__cpp_impl_three_way_comparison) && __cpp_impl_three_way_comparison >= 201907L \ - && defined(__cpp_lib_three_way_comparison) && __cpp_lib_three_way_comparison >= 201907L - #define JSON_HAS_THREE_WAY_COMPARISON 1 - #else - #define JSON_HAS_THREE_WAY_COMPARISON 0 - #endif -#endif - -#ifndef JSON_HAS_RANGES - // ranges header shipping in GCC 11.1.0 (released 2021-04-27) has syntax error - #if defined(__GLIBCXX__) && __GLIBCXX__ == 20210427 - #define JSON_HAS_RANGES 0 - #elif defined(__cpp_lib_ranges) - #define JSON_HAS_RANGES 1 - #else - #define JSON_HAS_RANGES 0 - #endif -#endif - -#ifndef JSON_HAS_STATIC_RTTI - #if !defined(_HAS_STATIC_RTTI) || _HAS_STATIC_RTTI != 0 - #define JSON_HAS_STATIC_RTTI 1 - #else - #define JSON_HAS_STATIC_RTTI 0 - #endif -#endif - -#ifdef JSON_HAS_CPP_17 - #define JSON_INLINE_VARIABLE inline -#else - #define JSON_INLINE_VARIABLE -#endif - -#if JSON_HEDLEY_HAS_ATTRIBUTE(no_unique_address) - #define JSON_NO_UNIQUE_ADDRESS [[no_unique_address]] -#else - #define JSON_NO_UNIQUE_ADDRESS -#endif - -// disable documentation warnings on clang -#if defined(__clang__) - #pragma clang diagnostic push - #pragma clang diagnostic ignored "-Wdocumentation" - #pragma clang diagnostic ignored "-Wdocumentation-unknown-command" -#endif - -// allow disabling exceptions -#if (defined(__cpp_exceptions) || defined(__EXCEPTIONS) || defined(_CPPUNWIND)) && !defined(JSON_NOEXCEPTION) - #define JSON_THROW(exception) throw exception - #define JSON_TRY try - #define JSON_CATCH(exception) catch(exception) - #define JSON_INTERNAL_CATCH(exception) catch(exception) -#else - #include - #define JSON_THROW(exception) std::abort() - #define JSON_TRY if(true) - #define JSON_CATCH(exception) if(false) - #define JSON_INTERNAL_CATCH(exception) if(false) -#endif - -// override exception macros -#if defined(JSON_THROW_USER) - #undef JSON_THROW - #define JSON_THROW JSON_THROW_USER -#endif -#if defined(JSON_TRY_USER) - #undef JSON_TRY - #define JSON_TRY JSON_TRY_USER -#endif -#if defined(JSON_CATCH_USER) - #undef JSON_CATCH - #define JSON_CATCH JSON_CATCH_USER - #undef JSON_INTERNAL_CATCH - #define JSON_INTERNAL_CATCH JSON_CATCH_USER -#endif -#if defined(JSON_INTERNAL_CATCH_USER) - #undef JSON_INTERNAL_CATCH - #define JSON_INTERNAL_CATCH JSON_INTERNAL_CATCH_USER -#endif - -// allow overriding assert -#if !defined(JSON_ASSERT) - #include // assert - #define JSON_ASSERT(x) assert(x) -#endif - -// allow to access some private functions (needed by the test suite) -#if defined(JSON_TESTS_PRIVATE) - #define JSON_PRIVATE_UNLESS_TESTED public -#else - #define JSON_PRIVATE_UNLESS_TESTED private -#endif - -/*! -@brief macro to briefly define a mapping between an enum and JSON -@def NLOHMANN_JSON_SERIALIZE_ENUM -@since version 3.4.0 -*/ -#define NLOHMANN_JSON_SERIALIZE_ENUM(ENUM_TYPE, ...) \ - template \ - inline void to_json(BasicJsonType& j, const ENUM_TYPE& e) \ - { \ - static_assert(std::is_enum::value, #ENUM_TYPE " must be an enum!"); \ - static const std::pair m[] = __VA_ARGS__; \ - auto it = std::find_if(std::begin(m), std::end(m), \ - [e](const std::pair& ej_pair) -> bool \ - { \ - return ej_pair.first == e; \ - }); \ - j = ((it != std::end(m)) ? it : std::begin(m))->second; \ - } \ - template \ - inline void from_json(const BasicJsonType& j, ENUM_TYPE& e) \ - { \ - static_assert(std::is_enum::value, #ENUM_TYPE " must be an enum!"); \ - static const std::pair m[] = __VA_ARGS__; \ - auto it = std::find_if(std::begin(m), std::end(m), \ - [&j](const std::pair& ej_pair) -> bool \ - { \ - return ej_pair.second == j; \ - }); \ - e = ((it != std::end(m)) ? it : std::begin(m))->first; \ - } - -// Ugly macros to avoid uglier copy-paste when specializing basic_json. They -// may be removed in the future once the class is split. - -#define NLOHMANN_BASIC_JSON_TPL_DECLARATION \ - template class ObjectType, \ - template class ArrayType, \ - class StringType, class BooleanType, class NumberIntegerType, \ - class NumberUnsignedType, class NumberFloatType, \ - template class AllocatorType, \ - template class JSONSerializer, \ - class BinaryType, \ - class CustomBaseClass> - -#define NLOHMANN_BASIC_JSON_TPL \ - basic_json - -// Macros to simplify conversion from/to types - -#define NLOHMANN_JSON_EXPAND( x ) x -#define NLOHMANN_JSON_GET_MACRO(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52, _53, _54, _55, _56, _57, _58, _59, _60, _61, _62, _63, _64, NAME,...) NAME -#define NLOHMANN_JSON_PASTE(...) NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_GET_MACRO(__VA_ARGS__, \ - NLOHMANN_JSON_PASTE64, \ - NLOHMANN_JSON_PASTE63, \ - NLOHMANN_JSON_PASTE62, \ - NLOHMANN_JSON_PASTE61, \ - NLOHMANN_JSON_PASTE60, \ - NLOHMANN_JSON_PASTE59, \ - NLOHMANN_JSON_PASTE58, \ - NLOHMANN_JSON_PASTE57, \ - NLOHMANN_JSON_PASTE56, \ - NLOHMANN_JSON_PASTE55, \ - NLOHMANN_JSON_PASTE54, \ - NLOHMANN_JSON_PASTE53, \ - NLOHMANN_JSON_PASTE52, \ - NLOHMANN_JSON_PASTE51, \ - NLOHMANN_JSON_PASTE50, \ - NLOHMANN_JSON_PASTE49, \ - NLOHMANN_JSON_PASTE48, \ - NLOHMANN_JSON_PASTE47, \ - NLOHMANN_JSON_PASTE46, \ - NLOHMANN_JSON_PASTE45, \ - NLOHMANN_JSON_PASTE44, \ - NLOHMANN_JSON_PASTE43, \ - NLOHMANN_JSON_PASTE42, \ - NLOHMANN_JSON_PASTE41, \ - NLOHMANN_JSON_PASTE40, \ - NLOHMANN_JSON_PASTE39, \ - NLOHMANN_JSON_PASTE38, \ - NLOHMANN_JSON_PASTE37, \ - NLOHMANN_JSON_PASTE36, \ - NLOHMANN_JSON_PASTE35, \ - NLOHMANN_JSON_PASTE34, \ - NLOHMANN_JSON_PASTE33, \ - NLOHMANN_JSON_PASTE32, \ - NLOHMANN_JSON_PASTE31, \ - NLOHMANN_JSON_PASTE30, \ - NLOHMANN_JSON_PASTE29, \ - NLOHMANN_JSON_PASTE28, \ - NLOHMANN_JSON_PASTE27, \ - NLOHMANN_JSON_PASTE26, \ - NLOHMANN_JSON_PASTE25, \ - NLOHMANN_JSON_PASTE24, \ - NLOHMANN_JSON_PASTE23, \ - NLOHMANN_JSON_PASTE22, \ - NLOHMANN_JSON_PASTE21, \ - NLOHMANN_JSON_PASTE20, \ - NLOHMANN_JSON_PASTE19, \ - NLOHMANN_JSON_PASTE18, \ - NLOHMANN_JSON_PASTE17, \ - NLOHMANN_JSON_PASTE16, \ - NLOHMANN_JSON_PASTE15, \ - NLOHMANN_JSON_PASTE14, \ - NLOHMANN_JSON_PASTE13, \ - NLOHMANN_JSON_PASTE12, \ - NLOHMANN_JSON_PASTE11, \ - NLOHMANN_JSON_PASTE10, \ - NLOHMANN_JSON_PASTE9, \ - NLOHMANN_JSON_PASTE8, \ - NLOHMANN_JSON_PASTE7, \ - NLOHMANN_JSON_PASTE6, \ - NLOHMANN_JSON_PASTE5, \ - NLOHMANN_JSON_PASTE4, \ - NLOHMANN_JSON_PASTE3, \ - NLOHMANN_JSON_PASTE2, \ - NLOHMANN_JSON_PASTE1)(__VA_ARGS__)) -#define NLOHMANN_JSON_PASTE2(func, v1) func(v1) -#define NLOHMANN_JSON_PASTE3(func, v1, v2) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE2(func, v2) -#define NLOHMANN_JSON_PASTE4(func, v1, v2, v3) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE3(func, v2, v3) -#define NLOHMANN_JSON_PASTE5(func, v1, v2, v3, v4) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE4(func, v2, v3, v4) -#define NLOHMANN_JSON_PASTE6(func, v1, v2, v3, v4, v5) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE5(func, v2, v3, v4, v5) -#define NLOHMANN_JSON_PASTE7(func, v1, v2, v3, v4, v5, v6) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE6(func, v2, v3, v4, v5, v6) -#define NLOHMANN_JSON_PASTE8(func, v1, v2, v3, v4, v5, v6, v7) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE7(func, v2, v3, v4, v5, v6, v7) -#define NLOHMANN_JSON_PASTE9(func, v1, v2, v3, v4, v5, v6, v7, v8) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE8(func, v2, v3, v4, v5, v6, v7, v8) -#define NLOHMANN_JSON_PASTE10(func, v1, v2, v3, v4, v5, v6, v7, v8, v9) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE9(func, v2, v3, v4, v5, v6, v7, v8, v9) -#define NLOHMANN_JSON_PASTE11(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE10(func, v2, v3, v4, v5, v6, v7, v8, v9, v10) -#define NLOHMANN_JSON_PASTE12(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE11(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11) -#define NLOHMANN_JSON_PASTE13(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE12(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12) -#define NLOHMANN_JSON_PASTE14(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE13(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13) -#define NLOHMANN_JSON_PASTE15(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE14(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14) -#define NLOHMANN_JSON_PASTE16(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE15(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15) -#define NLOHMANN_JSON_PASTE17(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE16(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16) -#define NLOHMANN_JSON_PASTE18(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE17(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17) -#define NLOHMANN_JSON_PASTE19(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE18(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18) -#define NLOHMANN_JSON_PASTE20(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE19(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19) -#define NLOHMANN_JSON_PASTE21(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE20(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20) -#define NLOHMANN_JSON_PASTE22(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE21(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21) -#define NLOHMANN_JSON_PASTE23(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE22(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22) -#define NLOHMANN_JSON_PASTE24(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE23(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23) -#define NLOHMANN_JSON_PASTE25(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE24(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24) -#define NLOHMANN_JSON_PASTE26(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE25(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25) -#define NLOHMANN_JSON_PASTE27(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE26(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26) -#define NLOHMANN_JSON_PASTE28(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE27(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27) -#define NLOHMANN_JSON_PASTE29(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE28(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28) -#define NLOHMANN_JSON_PASTE30(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE29(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29) -#define NLOHMANN_JSON_PASTE31(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE30(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30) -#define NLOHMANN_JSON_PASTE32(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE31(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31) -#define NLOHMANN_JSON_PASTE33(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE32(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32) -#define NLOHMANN_JSON_PASTE34(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE33(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33) -#define NLOHMANN_JSON_PASTE35(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE34(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34) -#define NLOHMANN_JSON_PASTE36(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE35(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35) -#define NLOHMANN_JSON_PASTE37(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE36(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36) -#define NLOHMANN_JSON_PASTE38(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE37(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37) -#define NLOHMANN_JSON_PASTE39(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE38(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38) -#define NLOHMANN_JSON_PASTE40(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE39(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39) -#define NLOHMANN_JSON_PASTE41(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE40(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40) -#define NLOHMANN_JSON_PASTE42(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE41(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41) -#define NLOHMANN_JSON_PASTE43(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE42(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42) -#define NLOHMANN_JSON_PASTE44(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE43(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43) -#define NLOHMANN_JSON_PASTE45(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE44(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44) -#define NLOHMANN_JSON_PASTE46(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE45(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45) -#define NLOHMANN_JSON_PASTE47(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE46(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46) -#define NLOHMANN_JSON_PASTE48(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE47(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47) -#define NLOHMANN_JSON_PASTE49(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE48(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48) -#define NLOHMANN_JSON_PASTE50(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE49(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49) -#define NLOHMANN_JSON_PASTE51(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE50(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50) -#define NLOHMANN_JSON_PASTE52(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE51(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51) -#define NLOHMANN_JSON_PASTE53(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE52(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52) -#define NLOHMANN_JSON_PASTE54(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE53(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53) -#define NLOHMANN_JSON_PASTE55(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE54(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54) -#define NLOHMANN_JSON_PASTE56(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE55(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55) -#define NLOHMANN_JSON_PASTE57(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE56(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56) -#define NLOHMANN_JSON_PASTE58(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE57(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57) -#define NLOHMANN_JSON_PASTE59(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE58(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58) -#define NLOHMANN_JSON_PASTE60(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE59(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59) -#define NLOHMANN_JSON_PASTE61(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE60(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60) -#define NLOHMANN_JSON_PASTE62(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE61(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61) -#define NLOHMANN_JSON_PASTE63(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61, v62) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE62(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61, v62) -#define NLOHMANN_JSON_PASTE64(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61, v62, v63) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE63(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61, v62, v63) - -#define NLOHMANN_JSON_TO(v1) nlohmann_json_j[#v1] = nlohmann_json_t.v1; -#define NLOHMANN_JSON_FROM(v1) nlohmann_json_j.at(#v1).get_to(nlohmann_json_t.v1); -#define NLOHMANN_JSON_FROM_WITH_DEFAULT(v1) nlohmann_json_t.v1 = nlohmann_json_j.value(#v1, nlohmann_json_default_obj.v1); - -/*! -@brief macro -@def NLOHMANN_DEFINE_TYPE_INTRUSIVE -@since version 3.9.0 -*/ -#define NLOHMANN_DEFINE_TYPE_INTRUSIVE(Type, ...) \ - friend void to_json(nlohmann::json& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } \ - friend void from_json(const nlohmann::json& nlohmann_json_j, Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM, __VA_ARGS__)) } - -#define NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT(Type, ...) \ - friend void to_json(nlohmann::json& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } \ - friend void from_json(const nlohmann::json& nlohmann_json_j, Type& nlohmann_json_t) { const Type nlohmann_json_default_obj{}; NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM_WITH_DEFAULT, __VA_ARGS__)) } - -#define NLOHMANN_DEFINE_TYPE_INTRUSIVE_ONLY_SERIALIZE(Type, ...) \ - friend void to_json(nlohmann::json& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } - -/*! -@brief macro -@def NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE -@since version 3.9.0 -*/ -#define NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(Type, ...) \ - inline void to_json(nlohmann::json& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } \ - inline void from_json(const nlohmann::json& nlohmann_json_j, Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM, __VA_ARGS__)) } - -#define NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_ONLY_SERIALIZE(Type, ...) \ - inline void to_json(nlohmann::json& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } - -#define NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT(Type, ...) \ - inline void to_json(nlohmann::json& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } \ - inline void from_json(const nlohmann::json& nlohmann_json_j, Type& nlohmann_json_t) { const Type nlohmann_json_default_obj{}; NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM_WITH_DEFAULT, __VA_ARGS__)) } - -// inspired from https://stackoverflow.com/a/26745591 -// allows to call any std function as if (e.g. with begin): -// using std::begin; begin(x); -// -// it allows using the detected idiom to retrieve the return type -// of such an expression -#define NLOHMANN_CAN_CALL_STD_FUNC_IMPL(std_name) \ - namespace detail { \ - using std::std_name; \ - \ - template \ - using result_of_##std_name = decltype(std_name(std::declval()...)); \ - } \ - \ - namespace detail2 { \ - struct std_name##_tag \ - { \ - }; \ - \ - template \ - std_name##_tag std_name(T&&...); \ - \ - template \ - using result_of_##std_name = decltype(std_name(std::declval()...)); \ - \ - template \ - struct would_call_std_##std_name \ - { \ - static constexpr auto const value = ::nlohmann::detail:: \ - is_detected_exact::value; \ - }; \ - } /* namespace detail2 */ \ - \ - template \ - struct would_call_std_##std_name : detail2::would_call_std_##std_name \ - { \ - } - -#ifndef JSON_USE_IMPLICIT_CONVERSIONS - #define JSON_USE_IMPLICIT_CONVERSIONS 1 -#endif - -#if JSON_USE_IMPLICIT_CONVERSIONS - #define JSON_EXPLICIT -#else - #define JSON_EXPLICIT explicit -#endif - -#ifndef JSON_DISABLE_ENUM_SERIALIZATION - #define JSON_DISABLE_ENUM_SERIALIZATION 0 -#endif - -#ifndef JSON_USE_GLOBAL_UDLS - #define JSON_USE_GLOBAL_UDLS 1 -#endif - -#if JSON_HAS_THREE_WAY_COMPARISON - #include // partial_ordering -#endif - -NLOHMANN_JSON_NAMESPACE_BEGIN -namespace detail -{ - -/////////////////////////// -// JSON type enumeration // -/////////////////////////// - -/*! -@brief the JSON type enumeration - -This enumeration collects the different JSON types. It is internally used to -distinguish the stored values, and the functions @ref basic_json::is_null(), -@ref basic_json::is_object(), @ref basic_json::is_array(), -@ref basic_json::is_string(), @ref basic_json::is_boolean(), -@ref basic_json::is_number() (with @ref basic_json::is_number_integer(), -@ref basic_json::is_number_unsigned(), and @ref basic_json::is_number_float()), -@ref basic_json::is_discarded(), @ref basic_json::is_primitive(), and -@ref basic_json::is_structured() rely on it. - -@note There are three enumeration entries (number_integer, number_unsigned, and -number_float), because the library distinguishes these three types for numbers: -@ref basic_json::number_unsigned_t is used for unsigned integers, -@ref basic_json::number_integer_t is used for signed integers, and -@ref basic_json::number_float_t is used for floating-point numbers or to -approximate integers which do not fit in the limits of their respective type. - -@sa see @ref basic_json::basic_json(const value_t value_type) -- create a JSON -value with the default value for a given type - -@since version 1.0.0 -*/ -enum class value_t : std::uint8_t -{ - null, ///< null value - object, ///< object (unordered set of name/value pairs) - array, ///< array (ordered collection of values) - string, ///< string value - boolean, ///< boolean value - number_integer, ///< number value (signed integer) - number_unsigned, ///< number value (unsigned integer) - number_float, ///< number value (floating-point) - binary, ///< binary array (ordered collection of bytes) - discarded ///< discarded by the parser callback function -}; - -/*! -@brief comparison operator for JSON types - -Returns an ordering that is similar to Python: -- order: null < boolean < number < object < array < string < binary -- furthermore, each type is not smaller than itself -- discarded values are not comparable -- binary is represented as a b"" string in python and directly comparable to a - string; however, making a binary array directly comparable with a string would - be surprising behavior in a JSON file. - -@since version 1.0.0 -*/ -#if JSON_HAS_THREE_WAY_COMPARISON - inline std::partial_ordering operator<=>(const value_t lhs, const value_t rhs) noexcept // *NOPAD* -#else - inline bool operator<(const value_t lhs, const value_t rhs) noexcept -#endif -{ - static constexpr std::array order = {{ - 0 /* null */, 3 /* object */, 4 /* array */, 5 /* string */, - 1 /* boolean */, 2 /* integer */, 2 /* unsigned */, 2 /* float */, - 6 /* binary */ - } - }; - - const auto l_index = static_cast(lhs); - const auto r_index = static_cast(rhs); -#if JSON_HAS_THREE_WAY_COMPARISON - if (l_index < order.size() && r_index < order.size()) - { - return order[l_index] <=> order[r_index]; // *NOPAD* - } - return std::partial_ordering::unordered; -#else - return l_index < order.size() && r_index < order.size() && order[l_index] < order[r_index]; -#endif -} - -// GCC selects the built-in operator< over an operator rewritten from -// a user-defined spaceship operator -// Clang, MSVC, and ICC select the rewritten candidate -// (see GCC bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105200) -#if JSON_HAS_THREE_WAY_COMPARISON && defined(__GNUC__) -inline bool operator<(const value_t lhs, const value_t rhs) noexcept -{ - return std::is_lt(lhs <=> rhs); // *NOPAD* -} -#endif - -} // namespace detail -NLOHMANN_JSON_NAMESPACE_END - -// #include -// __ _____ _____ _____ -// __| | __| | | | JSON for Modern C++ -// | | |__ | | | | | | version 3.11.3 -// |_____|_____|_____|_|___| https://github.com/nlohmann/json -// -// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann -// SPDX-License-Identifier: MIT - - - -// #include - - -NLOHMANN_JSON_NAMESPACE_BEGIN -namespace detail -{ - -/*! -@brief replace all occurrences of a substring by another string - -@param[in,out] s the string to manipulate; changed so that all - occurrences of @a f are replaced with @a t -@param[in] f the substring to replace with @a t -@param[in] t the string to replace @a f - -@pre The search string @a f must not be empty. **This precondition is -enforced with an assertion.** - -@since version 2.0.0 -*/ -template -inline void replace_substring(StringType& s, const StringType& f, - const StringType& t) -{ - JSON_ASSERT(!f.empty()); - for (auto pos = s.find(f); // find first occurrence of f - pos != StringType::npos; // make sure f was found - s.replace(pos, f.size(), t), // replace with t, and - pos = s.find(f, pos + t.size())) // find next occurrence of f - {} -} - -/*! - * @brief string escaping as described in RFC 6901 (Sect. 4) - * @param[in] s string to escape - * @return escaped string - * - * Note the order of escaping "~" to "~0" and "/" to "~1" is important. - */ -template -inline StringType escape(StringType s) -{ - replace_substring(s, StringType{"~"}, StringType{"~0"}); - replace_substring(s, StringType{"/"}, StringType{"~1"}); - return s; -} - -/*! - * @brief string unescaping as described in RFC 6901 (Sect. 4) - * @param[in] s string to unescape - * @return unescaped string - * - * Note the order of escaping "~1" to "/" and "~0" to "~" is important. - */ -template -static void unescape(StringType& s) -{ - replace_substring(s, StringType{"~1"}, StringType{"/"}); - replace_substring(s, StringType{"~0"}, StringType{"~"}); -} - -} // namespace detail -NLOHMANN_JSON_NAMESPACE_END - -// #include -// __ _____ _____ _____ -// __| | __| | | | JSON for Modern C++ -// | | |__ | | | | | | version 3.11.3 -// |_____|_____|_____|_|___| https://github.com/nlohmann/json -// -// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann -// SPDX-License-Identifier: MIT - - - -#include // size_t - -// #include - - -NLOHMANN_JSON_NAMESPACE_BEGIN -namespace detail -{ - -/// struct to capture the start position of the current token -struct position_t -{ - /// the total number of characters read - std::size_t chars_read_total = 0; - /// the number of characters read in the current line - std::size_t chars_read_current_line = 0; - /// the number of lines read - std::size_t lines_read = 0; - - /// conversion to size_t to preserve SAX interface - constexpr operator size_t() const - { - return chars_read_total; - } -}; - -} // namespace detail -NLOHMANN_JSON_NAMESPACE_END - -// #include - -// #include -// __ _____ _____ _____ -// __| | __| | | | JSON for Modern C++ -// | | |__ | | | | | | version 3.11.3 -// |_____|_____|_____|_|___| https://github.com/nlohmann/json -// -// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann -// SPDX-FileCopyrightText: 2018 The Abseil Authors -// SPDX-License-Identifier: MIT - - - -#include // array -#include // size_t -#include // conditional, enable_if, false_type, integral_constant, is_constructible, is_integral, is_same, remove_cv, remove_reference, true_type -#include // index_sequence, make_index_sequence, index_sequence_for - -// #include - - -NLOHMANN_JSON_NAMESPACE_BEGIN -namespace detail -{ - -template -using uncvref_t = typename std::remove_cv::type>::type; - -#ifdef JSON_HAS_CPP_14 - -// the following utilities are natively available in C++14 -using std::enable_if_t; -using std::index_sequence; -using std::make_index_sequence; -using std::index_sequence_for; - -#else - -// alias templates to reduce boilerplate -template -using enable_if_t = typename std::enable_if::type; - -// The following code is taken from https://github.com/abseil/abseil-cpp/blob/10cb35e459f5ecca5b2ff107635da0bfa41011b4/absl/utility/utility.h -// which is part of Google Abseil (https://github.com/abseil/abseil-cpp), licensed under the Apache License 2.0. - -//// START OF CODE FROM GOOGLE ABSEIL - -// integer_sequence -// -// Class template representing a compile-time integer sequence. An instantiation -// of `integer_sequence` has a sequence of integers encoded in its -// type through its template arguments (which is a common need when -// working with C++11 variadic templates). `absl::integer_sequence` is designed -// to be a drop-in replacement for C++14's `std::integer_sequence`. -// -// Example: -// -// template< class T, T... Ints > -// void user_function(integer_sequence); -// -// int main() -// { -// // user_function's `T` will be deduced to `int` and `Ints...` -// // will be deduced to `0, 1, 2, 3, 4`. -// user_function(make_integer_sequence()); -// } -template -struct integer_sequence -{ - using value_type = T; - static constexpr std::size_t size() noexcept - { - return sizeof...(Ints); - } -}; - -// index_sequence -// -// A helper template for an `integer_sequence` of `size_t`, -// `absl::index_sequence` is designed to be a drop-in replacement for C++14's -// `std::index_sequence`. -template -using index_sequence = integer_sequence; - -namespace utility_internal -{ - -template -struct Extend; - -// Note that SeqSize == sizeof...(Ints). It's passed explicitly for efficiency. -template -struct Extend, SeqSize, 0> -{ - using type = integer_sequence < T, Ints..., (Ints + SeqSize)... >; -}; - -template -struct Extend, SeqSize, 1> -{ - using type = integer_sequence < T, Ints..., (Ints + SeqSize)..., 2 * SeqSize >; -}; - -// Recursion helper for 'make_integer_sequence'. -// 'Gen::type' is an alias for 'integer_sequence'. -template -struct Gen -{ - using type = - typename Extend < typename Gen < T, N / 2 >::type, N / 2, N % 2 >::type; -}; - -template -struct Gen -{ - using type = integer_sequence; -}; - -} // namespace utility_internal - -// Compile-time sequences of integers - -// make_integer_sequence -// -// This template alias is equivalent to -// `integer_sequence`, and is designed to be a drop-in -// replacement for C++14's `std::make_integer_sequence`. -template -using make_integer_sequence = typename utility_internal::Gen::type; - -// make_index_sequence -// -// This template alias is equivalent to `index_sequence<0, 1, ..., N-1>`, -// and is designed to be a drop-in replacement for C++14's -// `std::make_index_sequence`. -template -using make_index_sequence = make_integer_sequence; - -// index_sequence_for -// -// Converts a typename pack into an index sequence of the same length, and -// is designed to be a drop-in replacement for C++14's -// `std::index_sequence_for()` -template -using index_sequence_for = make_index_sequence; - -//// END OF CODE FROM GOOGLE ABSEIL - -#endif - -// dispatch utility (taken from ranges-v3) -template struct priority_tag : priority_tag < N - 1 > {}; -template<> struct priority_tag<0> {}; - -// taken from ranges-v3 -template -struct static_const -{ - static JSON_INLINE_VARIABLE constexpr T value{}; -}; - -#ifndef JSON_HAS_CPP_17 - template - constexpr T static_const::value; -#endif - -template -inline constexpr std::array make_array(Args&& ... args) -{ - return std::array {{static_cast(std::forward(args))...}}; -} - -} // namespace detail -NLOHMANN_JSON_NAMESPACE_END - -// #include -// __ _____ _____ _____ -// __| | __| | | | JSON for Modern C++ -// | | |__ | | | | | | version 3.11.3 -// |_____|_____|_____|_|___| https://github.com/nlohmann/json -// -// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann -// SPDX-License-Identifier: MIT - - - -#include // numeric_limits -#include // false_type, is_constructible, is_integral, is_same, true_type -#include // declval -#include // tuple -#include // char_traits - -// #include -// __ _____ _____ _____ -// __| | __| | | | JSON for Modern C++ -// | | |__ | | | | | | version 3.11.3 -// |_____|_____|_____|_|___| https://github.com/nlohmann/json -// -// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann -// SPDX-License-Identifier: MIT - - - -#include // random_access_iterator_tag - -// #include - -// #include - -// #include - - -NLOHMANN_JSON_NAMESPACE_BEGIN -namespace detail -{ - -template -struct iterator_types {}; - -template -struct iterator_types < - It, - void_t> -{ - using difference_type = typename It::difference_type; - using value_type = typename It::value_type; - using pointer = typename It::pointer; - using reference = typename It::reference; - using iterator_category = typename It::iterator_category; -}; - -// This is required as some compilers implement std::iterator_traits in a way that -// doesn't work with SFINAE. See https://github.com/nlohmann/json/issues/1341. -template -struct iterator_traits -{ -}; - -template -struct iterator_traits < T, enable_if_t < !std::is_pointer::value >> - : iterator_types -{ -}; - -template -struct iterator_traits::value>> -{ - using iterator_category = std::random_access_iterator_tag; - using value_type = T; - using difference_type = ptrdiff_t; - using pointer = T*; - using reference = T&; -}; - -} // namespace detail -NLOHMANN_JSON_NAMESPACE_END - -// #include - -// #include -// __ _____ _____ _____ -// __| | __| | | | JSON for Modern C++ -// | | |__ | | | | | | version 3.11.3 -// |_____|_____|_____|_|___| https://github.com/nlohmann/json -// -// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann -// SPDX-License-Identifier: MIT - - - -// #include - - -NLOHMANN_JSON_NAMESPACE_BEGIN - -NLOHMANN_CAN_CALL_STD_FUNC_IMPL(begin); - -NLOHMANN_JSON_NAMESPACE_END - -// #include -// __ _____ _____ _____ -// __| | __| | | | JSON for Modern C++ -// | | |__ | | | | | | version 3.11.3 -// |_____|_____|_____|_|___| https://github.com/nlohmann/json -// -// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann -// SPDX-License-Identifier: MIT - - - -// #include - - -NLOHMANN_JSON_NAMESPACE_BEGIN - -NLOHMANN_CAN_CALL_STD_FUNC_IMPL(end); - -NLOHMANN_JSON_NAMESPACE_END - -// #include - -// #include - -// #include -// __ _____ _____ _____ -// __| | __| | | | JSON for Modern C++ -// | | |__ | | | | | | version 3.11.3 -// |_____|_____|_____|_|___| https://github.com/nlohmann/json -// -// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann -// SPDX-License-Identifier: MIT - -#ifndef INCLUDE_NLOHMANN_JSON_FWD_HPP_ - #define INCLUDE_NLOHMANN_JSON_FWD_HPP_ - - #include // int64_t, uint64_t - #include // map - #include // allocator - #include // string - #include // vector - - // #include - - - /*! - @brief namespace for Niels Lohmann - @see https://github.com/nlohmann - @since version 1.0.0 - */ - NLOHMANN_JSON_NAMESPACE_BEGIN - - /*! - @brief default JSONSerializer template argument - - This serializer ignores the template arguments and uses ADL - ([argument-dependent lookup](https://en.cppreference.com/w/cpp/language/adl)) - for serialization. - */ - template - struct adl_serializer; - - /// a class to store JSON values - /// @sa https://json.nlohmann.me/api/basic_json/ - template class ObjectType = - std::map, - template class ArrayType = std::vector, - class StringType = std::string, class BooleanType = bool, - class NumberIntegerType = std::int64_t, - class NumberUnsignedType = std::uint64_t, - class NumberFloatType = double, - template class AllocatorType = std::allocator, - template class JSONSerializer = - adl_serializer, - class BinaryType = std::vector, // cppcheck-suppress syntaxError - class CustomBaseClass = void> - class basic_json; - - /// @brief JSON Pointer defines a string syntax for identifying a specific value within a JSON document - /// @sa https://json.nlohmann.me/api/json_pointer/ - template - class json_pointer; - - /*! - @brief default specialization - @sa https://json.nlohmann.me/api/json/ - */ - using json = basic_json<>; - - /// @brief a minimal map-like container that preserves insertion order - /// @sa https://json.nlohmann.me/api/ordered_map/ - template - struct ordered_map; - - /// @brief specialization that maintains the insertion order of object keys - /// @sa https://json.nlohmann.me/api/ordered_json/ - using ordered_json = basic_json; - - NLOHMANN_JSON_NAMESPACE_END - -#endif // INCLUDE_NLOHMANN_JSON_FWD_HPP_ - - -NLOHMANN_JSON_NAMESPACE_BEGIN -/*! -@brief detail namespace with internal helper functions - -This namespace collects functions that should not be exposed, -implementations of some @ref basic_json methods, and meta-programming helpers. - -@since version 2.1.0 -*/ -namespace detail -{ - -///////////// -// helpers // -///////////// - -// Note to maintainers: -// -// Every trait in this file expects a non CV-qualified type. -// The only exceptions are in the 'aliases for detected' section -// (i.e. those of the form: decltype(T::member_function(std::declval()))) -// -// In this case, T has to be properly CV-qualified to constraint the function arguments -// (e.g. to_json(BasicJsonType&, const T&)) - -template struct is_basic_json : std::false_type {}; - -NLOHMANN_BASIC_JSON_TPL_DECLARATION -struct is_basic_json : std::true_type {}; - -// used by exceptions create() member functions -// true_type for pointer to possibly cv-qualified basic_json or std::nullptr_t -// false_type otherwise -template -struct is_basic_json_context : - std::integral_constant < bool, - is_basic_json::type>::type>::value - || std::is_same::value > -{}; - -////////////////////// -// json_ref helpers // -////////////////////// - -template -class json_ref; - -template -struct is_json_ref : std::false_type {}; - -template -struct is_json_ref> : std::true_type {}; - -////////////////////////// -// aliases for detected // -////////////////////////// - -template -using mapped_type_t = typename T::mapped_type; - -template -using key_type_t = typename T::key_type; - -template -using value_type_t = typename T::value_type; - -template -using difference_type_t = typename T::difference_type; - -template -using pointer_t = typename T::pointer; - -template -using reference_t = typename T::reference; - -template -using iterator_category_t = typename T::iterator_category; - -template -using to_json_function = decltype(T::to_json(std::declval()...)); - -template -using from_json_function = decltype(T::from_json(std::declval()...)); - -template -using get_template_function = decltype(std::declval().template get()); - -// trait checking if JSONSerializer::from_json(json const&, udt&) exists -template -struct has_from_json : std::false_type {}; - -// trait checking if j.get_available is valid -// use this trait instead of std::is_constructible or std::is_convertible, -// both rely on, or make use of implicit conversions, and thus fail when T -// has several constructors/operator= (see https://github.com/nlohmann/json/issues/958) -template -struct is_getable -{ - static constexpr bool value = is_detected::value; -}; - -template -struct has_from_json < BasicJsonType, T, enable_if_t < !is_basic_json::value >> -{ - using serializer = typename BasicJsonType::template json_serializer; - - static constexpr bool value = - is_detected_exact::value; -}; - -// This trait checks if JSONSerializer::from_json(json const&) exists -// this overload is used for non-default-constructible user-defined-types -template -struct has_non_default_from_json : std::false_type {}; - -template -struct has_non_default_from_json < BasicJsonType, T, enable_if_t < !is_basic_json::value >> -{ - using serializer = typename BasicJsonType::template json_serializer; - - static constexpr bool value = - is_detected_exact::value; -}; - -// This trait checks if BasicJsonType::json_serializer::to_json exists -// Do not evaluate the trait when T is a basic_json type, to avoid template instantiation infinite recursion. -template -struct has_to_json : std::false_type {}; - -template -struct has_to_json < BasicJsonType, T, enable_if_t < !is_basic_json::value >> -{ - using serializer = typename BasicJsonType::template json_serializer; - - static constexpr bool value = - is_detected_exact::value; -}; - -template -using detect_key_compare = typename T::key_compare; - -template -struct has_key_compare : std::integral_constant::value> {}; - -// obtains the actual object key comparator -template -struct actual_object_comparator -{ - using object_t = typename BasicJsonType::object_t; - using object_comparator_t = typename BasicJsonType::default_object_comparator_t; - using type = typename std::conditional < has_key_compare::value, - typename object_t::key_compare, object_comparator_t>::type; -}; - -template -using actual_object_comparator_t = typename actual_object_comparator::type; - -///////////////// -// char_traits // -///////////////// - -// Primary template of char_traits calls std char_traits -template -struct char_traits : std::char_traits -{}; - -// Explicitly define char traits for unsigned char since it is not standard -template<> -struct char_traits : std::char_traits -{ - using char_type = unsigned char; - using int_type = uint64_t; - - // Redefine to_int_type function - static int_type to_int_type(char_type c) noexcept - { - return static_cast(c); - } - - static char_type to_char_type(int_type i) noexcept - { - return static_cast(i); - } - - static constexpr int_type eof() noexcept - { - return static_cast(EOF); - } -}; - -// Explicitly define char traits for signed char since it is not standard -template<> -struct char_traits : std::char_traits -{ - using char_type = signed char; - using int_type = uint64_t; - - // Redefine to_int_type function - static int_type to_int_type(char_type c) noexcept - { - return static_cast(c); - } - - static char_type to_char_type(int_type i) noexcept - { - return static_cast(i); - } - - static constexpr int_type eof() noexcept - { - return static_cast(EOF); - } -}; - -/////////////////// -// is_ functions // -/////////////////// - -// https://en.cppreference.com/w/cpp/types/conjunction -template struct conjunction : std::true_type { }; -template struct conjunction : B { }; -template -struct conjunction -: std::conditional(B::value), conjunction, B>::type {}; - -// https://en.cppreference.com/w/cpp/types/negation -template struct negation : std::integral_constant < bool, !B::value > { }; - -// Reimplementation of is_constructible and is_default_constructible, due to them being broken for -// std::pair and std::tuple until LWG 2367 fix (see https://cplusplus.github.io/LWG/lwg-defects.html#2367). -// This causes compile errors in e.g. clang 3.5 or gcc 4.9. -template -struct is_default_constructible : std::is_default_constructible {}; - -template -struct is_default_constructible> - : conjunction, is_default_constructible> {}; - -template -struct is_default_constructible> - : conjunction, is_default_constructible> {}; - -template -struct is_default_constructible> - : conjunction...> {}; - -template -struct is_default_constructible> - : conjunction...> {}; - -template -struct is_constructible : std::is_constructible {}; - -template -struct is_constructible> : is_default_constructible> {}; - -template -struct is_constructible> : is_default_constructible> {}; - -template -struct is_constructible> : is_default_constructible> {}; - -template -struct is_constructible> : is_default_constructible> {}; - -template -struct is_iterator_traits : std::false_type {}; - -template -struct is_iterator_traits> -{ - private: - using traits = iterator_traits; - - public: - static constexpr auto value = - is_detected::value && - is_detected::value && - is_detected::value && - is_detected::value && - is_detected::value; -}; - -template -struct is_range -{ - private: - using t_ref = typename std::add_lvalue_reference::type; - - using iterator = detected_t; - using sentinel = detected_t; - - // to be 100% correct, it should use https://en.cppreference.com/w/cpp/iterator/input_or_output_iterator - // and https://en.cppreference.com/w/cpp/iterator/sentinel_for - // but reimplementing these would be too much work, as a lot of other concepts are used underneath - static constexpr auto is_iterator_begin = - is_iterator_traits>::value; - - public: - static constexpr bool value = !std::is_same::value && !std::is_same::value && is_iterator_begin; -}; - -template -using iterator_t = enable_if_t::value, result_of_begin())>>; - -template -using range_value_t = value_type_t>>; - -// The following implementation of is_complete_type is taken from -// https://blogs.msdn.microsoft.com/vcblog/2015/12/02/partial-support-for-expression-sfinae-in-vs-2015-update-1/ -// and is written by Xiang Fan who agreed to using it in this library. - -template -struct is_complete_type : std::false_type {}; - -template -struct is_complete_type : std::true_type {}; - -template -struct is_compatible_object_type_impl : std::false_type {}; - -template -struct is_compatible_object_type_impl < - BasicJsonType, CompatibleObjectType, - enable_if_t < is_detected::value&& - is_detected::value >> -{ - using object_t = typename BasicJsonType::object_t; - - // macOS's is_constructible does not play well with nonesuch... - static constexpr bool value = - is_constructible::value && - is_constructible::value; -}; - -template -struct is_compatible_object_type - : is_compatible_object_type_impl {}; - -template -struct is_constructible_object_type_impl : std::false_type {}; - -template -struct is_constructible_object_type_impl < - BasicJsonType, ConstructibleObjectType, - enable_if_t < is_detected::value&& - is_detected::value >> -{ - using object_t = typename BasicJsonType::object_t; - - static constexpr bool value = - (is_default_constructible::value && - (std::is_move_assignable::value || - std::is_copy_assignable::value) && - (is_constructible::value && - std::is_same < - typename object_t::mapped_type, - typename ConstructibleObjectType::mapped_type >::value)) || - (has_from_json::value || - has_non_default_from_json < - BasicJsonType, - typename ConstructibleObjectType::mapped_type >::value); -}; - -template -struct is_constructible_object_type - : is_constructible_object_type_impl {}; - -template -struct is_compatible_string_type -{ - static constexpr auto value = - is_constructible::value; -}; - -template -struct is_constructible_string_type -{ - // launder type through decltype() to fix compilation failure on ICPC -#ifdef __INTEL_COMPILER - using laundered_type = decltype(std::declval()); -#else - using laundered_type = ConstructibleStringType; -#endif - - static constexpr auto value = - conjunction < - is_constructible, - is_detected_exact>::value; -}; - -template -struct is_compatible_array_type_impl : std::false_type {}; - -template -struct is_compatible_array_type_impl < - BasicJsonType, CompatibleArrayType, - enable_if_t < - is_detected::value&& - is_iterator_traits>>::value&& -// special case for types like std::filesystem::path whose iterator's value_type are themselves -// c.f. https://github.com/nlohmann/json/pull/3073 - !std::is_same>::value >> -{ - static constexpr bool value = - is_constructible>::value; -}; - -template -struct is_compatible_array_type - : is_compatible_array_type_impl {}; - -template -struct is_constructible_array_type_impl : std::false_type {}; - -template -struct is_constructible_array_type_impl < - BasicJsonType, ConstructibleArrayType, - enable_if_t::value >> - : std::true_type {}; - -template -struct is_constructible_array_type_impl < - BasicJsonType, ConstructibleArrayType, - enable_if_t < !std::is_same::value&& - !is_compatible_string_type::value&& - is_default_constructible::value&& -(std::is_move_assignable::value || - std::is_copy_assignable::value)&& -is_detected::value&& -is_iterator_traits>>::value&& -is_detected::value&& -// special case for types like std::filesystem::path whose iterator's value_type are themselves -// c.f. https://github.com/nlohmann/json/pull/3073 -!std::is_same>::value&& - is_complete_type < - detected_t>::value >> -{ - using value_type = range_value_t; - - static constexpr bool value = - std::is_same::value || - has_from_json::value || - has_non_default_from_json < - BasicJsonType, - value_type >::value; -}; - -template -struct is_constructible_array_type - : is_constructible_array_type_impl {}; - -template -struct is_compatible_integer_type_impl : std::false_type {}; - -template -struct is_compatible_integer_type_impl < - RealIntegerType, CompatibleNumberIntegerType, - enable_if_t < std::is_integral::value&& - std::is_integral::value&& - !std::is_same::value >> -{ - // is there an assert somewhere on overflows? - using RealLimits = std::numeric_limits; - using CompatibleLimits = std::numeric_limits; - - static constexpr auto value = - is_constructible::value && - CompatibleLimits::is_integer && - RealLimits::is_signed == CompatibleLimits::is_signed; -}; - -template -struct is_compatible_integer_type - : is_compatible_integer_type_impl {}; - -template -struct is_compatible_type_impl: std::false_type {}; - -template -struct is_compatible_type_impl < - BasicJsonType, CompatibleType, - enable_if_t::value >> -{ - static constexpr bool value = - has_to_json::value; -}; - -template -struct is_compatible_type - : is_compatible_type_impl {}; - -template -struct is_constructible_tuple : std::false_type {}; - -template -struct is_constructible_tuple> : conjunction...> {}; - -template -struct is_json_iterator_of : std::false_type {}; - -template -struct is_json_iterator_of : std::true_type {}; - -template -struct is_json_iterator_of : std::true_type -{}; - -// checks if a given type T is a template specialization of Primary -template