diff options
| author | Ivar Scholten <ivar.scholten@protonmail.com> | 2022-08-14 18:41:23 +0200 |
|---|---|---|
| committer | Ivar Scholten <ivar.scholten@protonmail.com> | 2022-08-18 22:13:44 +0200 |
| commit | 3435f469ecf0ce7126a15c487d0a2ff68714abe3 (patch) | |
| tree | bb2d4534a644941c7fc67c9833d4917c384a1657 | |
| parent | 6b6e2ee00feaf41dfcb6f62766b470a51674ffb2 (diff) | |
| download | nixpkgs-3435f469ecf0ce7126a15c487d0a2ff68714abe3.tar nixpkgs-3435f469ecf0ce7126a15c487d0a2ff68714abe3.tar.gz nixpkgs-3435f469ecf0ce7126a15c487d0a2ff68714abe3.tar.bz2 nixpkgs-3435f469ecf0ce7126a15c487d0a2ff68714abe3.tar.lz nixpkgs-3435f469ecf0ce7126a15c487d0a2ff68714abe3.tar.xz nixpkgs-3435f469ecf0ce7126a15c487d0a2ff68714abe3.tar.zst nixpkgs-3435f469ecf0ce7126a15c487d0a2ff68714abe3.zip | |
yuzu-{ea,mainline}: {2901,1131} -> {2907,1137}
This changes the update script to be compatible with the maintainer script in `./maintainers/scripts/update.nix`, which will hopefully make sure r-ryantm can update these packages automatically for us. The script now also automatically updates the compatibility list, as @Docteh pointed out a mirror is available on Github. The call in `all-packages.nix` is changed as well to avoid a double `callPackage`, which can make overriding quite a pain. `QT_QPA_PLATFORM` is automatically set to `xcb` to avoid a crash on wayland, thanks to @sbruder for the suggestion!
| -rw-r--r-- | pkgs/applications/emulators/yuzu/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/applications/emulators/yuzu/generic.nix | 25 | ||||
| -rwxr-xr-x | pkgs/applications/emulators/yuzu/update.sh | 139 | ||||
| -rw-r--r-- | pkgs/applications/emulators/yuzu/yuzu-free-icons.patch | 1177 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
5 files changed, 98 insertions, 1261 deletions
diff --git a/pkgs/applications/emulators/yuzu/default.nix b/pkgs/applications/emulators/yuzu/default.nix index 923dc542799..b4441cddfd8 100644 --- a/pkgs/applications/emulators/yuzu/default.nix +++ b/pkgs/applications/emulators/yuzu/default.nix @@ -5,23 +5,23 @@ }: let - # Fetched from https://api.yuzu-emu.org/gamedb, last updated 2022-07-14 + # Mirror of https://api.yuzu-emu.org/gamedb, last updated 2022-08-13 # Please make sure to update this when updating yuzu! compat-list = fetchurl { name = "yuzu-compat-list"; - url = "https://web.archive.org/web/20220714160745/https://api.yuzu-emu.org/gamedb"; + url = "https://raw.githubusercontent.com/flathub/org.yuzu_emu.yuzu/d83401d2ee3fd5e1922e31baed1f3bdb1c0f036c/compatibility_list.json"; sha256 = "sha256-anOmO7NscHDsQxT03+YbJEyBkXjhcSVGgKpDwt//GHw="; }; in { mainline = libsForQt5.callPackage ./generic.nix rec { pname = "yuzu-mainline"; - version = "1131"; + version = "1137"; src = fetchFromGitHub { owner = "yuzu-emu"; repo = "yuzu-mainline"; rev = "mainline-0-${version}"; - sha256 = "0lh8s59hrysfjz69yr0f44s3l4aaznmclq0xfnyblsk0cw9ripf6"; + sha256 = "sha256-DLU5hmjTnlpRQ6sbcU7as/KeI9dDJAFUzVLciql5niE="; fetchSubmodules = true; }; @@ -30,13 +30,13 @@ in { early-access = libsForQt5.callPackage ./generic.nix rec { pname = "yuzu-ea"; - version = "2901"; + version = "2907"; src = fetchFromGitHub { owner = "pineappleEA"; repo = "pineapple-src"; rev = "EA-${version}"; - sha256 = "0jymm9sdsnayjaffmcbpjck4k2yslx8zid2vsm4jfdaajr244q2z"; + sha256 = "sha256-spPW2/qeVyd1P1/Z2lcuA69igS3xV4KtcJ59yf9X4JI="; fetchSubmodules = true; }; diff --git a/pkgs/applications/emulators/yuzu/generic.nix b/pkgs/applications/emulators/yuzu/generic.nix index 9dac4409ce4..3b6b73f6f8f 100644 --- a/pkgs/applications/emulators/yuzu/generic.nix +++ b/pkgs/applications/emulators/yuzu/generic.nix @@ -45,15 +45,6 @@ stdenv.mkDerivation rec { inherit pname version src; - # Replace icons licensed under CC BY-ND 3.0 with free ones to allow - # for binary redistribution: https://github.com/yuzu-emu/yuzu/pull/8104 - # The patch hosted on GitHub has the binary information in git format, which - # can’t be applied with patch(1), so it has been regenerated with - # "git format-patch --text --full-index --binary". - # Because pineapple strips all files beginning with a dot, the patch needs to - # be edited manually afterwards to remove all changes to those. - patches = [ ./yuzu-free-icons.patch ]; - nativeBuildInputs = [ cmake doxygen @@ -111,6 +102,13 @@ stdenv.mkDerivation rec { "-DENABLE_COMPATIBILITY_LIST_DOWNLOAD=OFF" # We provide this deterministically ]; + qtWrapperArgs = [ + # Fixes vulkan detection + "--prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib" + # Without yuzu doesnt start on wayland. See https://github.com/yuzu-emu/yuzu/issues/6088 + "--set QT_QPA_PLATFORM xcb" + ]; + preConfigure = '' # This prevents a check for submodule directories. rm -f .gitmodules @@ -127,13 +125,6 @@ stdenv.mkDerivation rec { ln -sf ${compat-list} ./dist/compatibility_list/compatibility_list.json ''; - # Fix vulkan detection - postFixup = '' - for bin in $out/bin/yuzu $out/bin/yuzu-cmd; do - wrapProgram $bin --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib - done - ''; - passthru.updateScript = runCommandLocal "yuzu-${branch}-updateScript" { script = substituteAll { src = ./update.sh; @@ -154,7 +145,7 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" ]; license = with licenses; [ gpl3Plus - # Icons. Note that this would be cc0 and cc-by-nd-30 without the "yuzu-free-icons" patch + # Icons asl20 mit cc0 ]; maintainers = with maintainers; [ diff --git a/pkgs/applications/emulators/yuzu/update.sh b/pkgs/applications/emulators/yuzu/update.sh index 4972427627e..074d5b155fb 100755 --- a/pkgs/applications/emulators/yuzu/update.sh +++ b/pkgs/applications/emulators/yuzu/update.sh @@ -1,84 +1,105 @@ #! /usr/bin/env nix-shell -#! nix-shell -i bash -p nix nix-prefetch-git coreutils curl jq gnused +#! nix-shell -I nixpkgs=./. -i bash -p nix nix-prefetch-git coreutils curl jq gnused -set -e +set -euo pipefail # Will be replaced with the actual branch when running this from passthru.updateScript BRANCH="@branch@" +DEFAULT_NIX="$(dirname "${BASH_SOURCE[@]}")/default.nix" -if [[ ! "$(basename $PWD)" = "yuzu" ]]; then - echo "error: Script must be ran from yuzu's directory!" +if [[ "$(basename "$PWD")" = "yuzu" ]]; then + echo "error: Script must be ran from nixpkgs's root directory for compatibility with the maintainer script" exit 1 fi -getLocalVersion() { - pushd ../../../.. >/dev/null - nix eval --raw -f default.nix "$1".version - popd >/dev/null -} - -getLocalHash() { - pushd ../../../.. >/dev/null - nix eval --raw -f default.nix "$1".src.drvAttrs.outputHash - popd >/dev/null -} - -updateMainline() { - OLD_MAINLINE_VERSION="$(getLocalVersion "yuzu-mainline")" - OLD_MAINLINE_HASH="$(getLocalHash "yuzu-mainline")" - - NEW_MAINLINE_VERSION="$(curl -s ${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \ - "https://api.github.com/repos/yuzu-emu/yuzu-mainline/releases?per_page=1" | jq -r '.[0].name' | cut -d" " -f2)" - - if [[ "${OLD_MAINLINE_VERSION}" = "${NEW_MAINLINE_VERSION}" ]]; then - echo "yuzu-mainline is already up to date!" +updateBranch() { + local branch attribute oldVersion oldHash newVersion newHash + branch="$1" + attribute="yuzu-$branch" + [[ "$branch" = "early-access" ]] && attribute="yuzu-ea" # Attribute path doesnt match the branch name + oldVersion="$(nix eval --raw -f "./default.nix" "$attribute".version)" + oldHash="$(nix eval --raw -f "./default.nix" "$attribute".src.drvAttrs.outputHash)" + + if [[ "$branch" = "mainline" ]]; then + newVersion="$(curl -s ${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} "https://api.github.com/repos/yuzu-emu/yuzu-mainline/releases?per_page=1" \ + | jq -r '.[0].name' | cut -d" " -f2)" + elif [[ "$branch" = "early-access" ]]; then + newVersion="$(curl -s ${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} "https://api.github.com/repos/pineappleEA/pineapple-src/releases?per_page=2" \ + | jq -r '.[].tag_name' | grep '^EA-[0-9]*' | head -n1 | cut -d"-" -f2 | cut -d" " -f1)" + fi - [ "$KEEP_GOING" ] && return || exit + if [[ "${oldVersion}" = "${newVersion}" ]]; then + echo "$attribute is already up to date." + return else - echo "yuzu-mainline: ${OLD_MAINLINE_VERSION} -> ${NEW_MAINLINE_VERSION}" + echo "$attribute: ${oldVersion} -> ${newVersion}" fi - echo " Fetching source code..." - - NEW_MAINLINE_HASH="$(nix-prefetch-git --quiet --fetch-submodules --rev "mainline-0-${NEW_MAINLINE_VERSION}" "https://github.com/yuzu-emu/yuzu-mainline" | jq -r '.sha256')" - - echo " Succesfully fetched. hash: ${NEW_MAINLINE_HASH}" + echo " fetching source code to generate hash..." + if [[ "$branch" = "mainline" ]]; then + newHash="$(nix-prefetch-git --quiet --fetch-submodules --rev "mainline-0-${newVersion}" "https://github.com/yuzu-emu/yuzu-mainline" | jq -r '.sha256')" + elif [[ "$branch" = "early-access" ]]; then + newHash="$(nix-prefetch-git --quiet --fetch-submodules --rev "EA-${newVersion}" "https://github.com/pineappleEA/pineapple-src" | jq -r '.sha256')" + fi + newHash="$(nix hash to-sri --type sha256 "${newHash}")" - sed -i "s/${OLD_MAINLINE_VERSION}/${NEW_MAINLINE_VERSION}/" ./default.nix - sed -i "s/${OLD_MAINLINE_HASH}/${NEW_MAINLINE_HASH}/" ./default.nix + sed -i "s,${oldVersion},${newVersion}," "$DEFAULT_NIX" + sed -i "s,${oldHash},${newHash},g" "$DEFAULT_NIX" + echo " succesfully updated $attribute. new hash: $newHash" } -updateEarlyAccess() { - OLD_EA_VERSION="$(getLocalVersion "yuzu-ea")" - OLD_EA_HASH="$(getLocalHash "yuzu-ea")" +updateCompatibilityList() { + local latestRevision oldUrl newUrl oldHash newHash oldDate newDate + latestRevision="$(curl -s ${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} "https://api.github.com/repos/flathub/org.yuzu_emu.yuzu/commits/master" | jq -r '.sha')" - NEW_EA_VERSION="$(curl -s ${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \ - "https://api.github.com/repos/pineappleEA/pineapple-src/releases?per_page=2" | jq -r '.[].tag_name' | grep '^EA-[0-9]*' | head -n1 | cut -d"-" -f2 | cut -d" " -f1)" + oldUrl="$(sed -n '/yuzu-compat-list/,/url/p' "$DEFAULT_NIX" | tail -n1 | cut -d'"' -f2)" + newUrl="https://raw.githubusercontent.com/flathub/org.yuzu_emu.yuzu/${latestRevision}/compatibility_list.json" - if [[ "${OLD_EA_VERSION}" = "${NEW_EA_VERSION}" ]]; then - echo "yuzu-ea is already up to date!" + oldDate="$(sed -n '/last updated.*/p' "$DEFAULT_NIX" | rev | cut -d' ' -f1 | rev)" + newDate="$(curl -s ${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} "https://api.github.com/repos/flathub/org.yuzu_emu.yuzu/commits/${latestRevision}" \ + | jq -r '.commit.committer.date' | cut -d'T' -f1)" - [ "$KEEP_GOING" ] && return || exit + oldHash="$(sed -n '/yuzu-compat-list/,/sha256/p' "$DEFAULT_NIX" | tail -n1 | cut -d'"' -f2)" + newHash="$(nix hash to-sri --type sha256 "$(nix-prefetch-url --quiet "$newUrl")")" + + if [[ "$oldHash" = "$newHash" ]]; then + echo "compatibility_list is already up to date." + return else - echo "yuzu-ea: ${OLD_EA_VERSION} -> ${NEW_EA_VERSION}" + echo "compatibility_list: $oldDate -> $newDate" fi - echo " Fetching source code..." - - NEW_EA_HASH="$(nix-prefetch-git --quiet --fetch-submodules --rev "EA-${NEW_EA_VERSION}" "https://github.com/pineappleEA/pineapple-src" | jq -r '.sha256')" - - echo " Succesfully fetched. hash: ${NEW_EA_HASH}" - - sed -i "s/${OLD_EA_VERSION}/${NEW_EA_VERSION}/" ./default.nix - sed -i "s/${OLD_EA_HASH}/${NEW_EA_HASH}/" ./default.nix + sed -i "s,${oldUrl},${newUrl},g" "$DEFAULT_NIX" + sed -i "s,${oldHash},${newHash},g" "$DEFAULT_NIX" + sed -i "s,${oldDate},${newDate},g" "$DEFAULT_NIX" + echo " succesfully updated compatibility_list. new hash: $newHash" } -if [[ "$BRANCH" = "mainline" ]]; then - updateMainline -elif [[ "$BRANCH" = "early-access" ]]; then - updateEarlyAccess -else - KEEP_GOING=1 - updateMainline - updateEarlyAccess +if [[ "$BRANCH" = "mainline" ]] || [[ "$BRANCH" = "early-access" ]]; then + updateBranch "$BRANCH" + updateCompatibilityList +else # Script is not ran from passthru.updateScript + if (( $# == 0 )); then + updateBranch "mainline" + updateBranch "early-access" + fi + + while (( "$#" > 0 )); do + case "$1" in + mainline|yuzu-mainline) + updateBranch "mainline" + ;; + early-access|yuzu-early-access|ea|yuzu-ea) + updateBranch "early-access" + ;; + *) + echo "error: invalid branch: $1." + echo "usage: $(basename "$0") [mainline|early-access]" + exit 1 + ;; + esac + shift + done + + updateCompatibilityList fi diff --git a/pkgs/applications/emulators/yuzu/yuzu-free-icons.patch b/pkgs/applications/emulators/yuzu/yuzu-free-icons.patch deleted file mode 100644 index 4332d29e319..00000000000 --- a/pkgs/applications/emulators/yuzu/yuzu-free-icons.patch +++ /dev/null @@ -1,1177 +0,0 @@ -From 44edc19f8f1ac0046770d6f3587a17bdd0f82d32 Mon Sep 17 00:00:00 2001 -From: Kyle Kienapfel <Docteh@users.noreply.github.com> -Date: Tue, 19 Jul 2022 07:08:29 -0700 -Subject: [PATCH] Moving Icons away from CC BY-ND 3.0 for FOSS packaging - purposes - -I've seen some comments stating that sharing pre-compiled packages -of yuzu is problematic for linux distributions due to some contents -having license of CC BY-ND 3.0 - -Better licensed sources of icons have been found for most cases, -see the changes to the .reuse/dep5 file for details. - -Placeholders for connected/disconnected icons - -At the time of writing I consider these icons to be placeholders, -hence three copies. colorful is grey, default is black, qdarkstyle is white - -connected is gnome/16x16/network-idle.png with no changes -connected_notification is gnome/16x16/network-error.png with changes -disconnected is gnome/16x16/network-offline.png with changes - -Looking at licenses: GNOME icon theme is distributed under the terms of either -GNU LGPL v.3 or Creative Commons BY-SA 3.0 license. - -Debian appears to explicitly state they're licensing under -Creative Commons Attribution-Share Alike 3.0 - -From a tarball at the following link suggests we can just attribute GNOME Project -https://download.gnome.org/sources/gnome-icon-theme/ - -When attributing the artwork, using "GNOME Project" is enough. -Please link to http://www.gnome.org where available. ---- - LICENSES/CC-BY-ND-3.0.txt | 87 ------------------ - LICENSES/CC-BY-SA-3.0.txt | 60 ++++++++++++ - .../colorful/icons/16x16/connected.png | Bin 362 -> 575 bytes - .../icons/16x16/connected_notification.png | Bin 607 -> 760 bytes - .../colorful/icons/16x16/disconnected.png | Bin 784 -> 648 bytes - .../colorful/icons/48x48/list-add.png | Bin 496 -> 204 bytes - .../colorful/icons/48x48/sd_card.png | Bin 680 -> 981 bytes - dist/qt_themes/colorful/icons/48x48/star.png | Bin 1248 -> 1108 bytes - .../icons/16x16/lock.png | Bin 401 -> 0 bytes - .../icons/16x16/view-refresh.png | Bin 362 -> 0 bytes - .../colorful_midnight_blue/style.qrc | 4 +- - .../qt_themes/default/icons/16x16/checked.png | Bin 657 -> 414 bytes - .../default/icons/16x16/connected.png | Bin 269 -> 575 bytes - .../icons/16x16/connected_notification.png | Bin 517 -> 760 bytes - .../default/icons/16x16/disconnected.png | Bin 306 -> 648 bytes - dist/qt_themes/default/icons/16x16/failed.png | Bin 524 -> 431 bytes - dist/qt_themes/default/icons/16x16/lock.png | Bin 279 -> 318 bytes - .../default/icons/256x256/plus_folder.png | Bin 3135 -> 3521 bytes - .../default/icons/48x48/bad_folder.png | Bin 1088 -> 1007 bytes - dist/qt_themes/default/icons/48x48/chip.png | Bin 15070 -> 511 bytes - dist/qt_themes/default/icons/48x48/folder.png | Bin 410 -> 535 bytes - .../default/icons/48x48/list-add.png | Bin 316 -> 204 bytes - .../default/icons/48x48/no_avatar.png | Bin 588 -> 678 bytes - .../qt_themes/default/icons/48x48/sd_card.png | Bin 614 -> 561 bytes - dist/qt_themes/default/icons/48x48/star.png | Bin 686 -> 1029 bytes - .../qdarkstyle/icons/16x16/connected.png | Bin 397 -> 575 bytes - .../icons/16x16/connected_notification.png | Bin 526 -> 760 bytes - .../qdarkstyle/icons/16x16/disconnected.png | Bin 444 -> 648 bytes - .../qt_themes/qdarkstyle/icons/16x16/lock.png | Bin 304 -> 343 bytes - .../qdarkstyle/icons/256x256/plus_folder.png | Bin 3438 -> 3931 bytes - .../qdarkstyle/icons/48x48/bad_folder.png | Bin 1098 -> 1061 bytes - .../qt_themes/qdarkstyle/icons/48x48/chip.png | Bin 15120 -> 551 bytes - .../qdarkstyle/icons/48x48/folder.png | Bin 542 -> 594 bytes - .../qdarkstyle/icons/48x48/list-add.png | Bin 339 -> 204 bytes - .../qdarkstyle/icons/48x48/no_avatar.png | Bin 708 -> 763 bytes - .../qdarkstyle/icons/48x48/sd_card.png | Bin 676 -> 587 bytes - .../qt_themes/qdarkstyle/icons/48x48/star.png | Bin 725 -> 1055 bytes - 38 files changed, 103 insertions(+), 103 deletions(-) - delete mode 100644 LICENSES/CC-BY-ND-3.0.txt - create mode 100644 LICENSES/CC-BY-SA-3.0.txt - delete mode 100644 dist/qt_themes/colorful_midnight_blue/icons/16x16/lock.png - delete mode 100644 dist/qt_themes/colorful_midnight_blue/icons/16x16/view-refresh.png - -diff --git a/LICENSES/CC-BY-ND-3.0.txt b/LICENSES/CC-BY-ND-3.0.txt -deleted file mode 100644 -index d9265b9f19e250785f5fc953c73e5f8915fcdd21..0000000000000000000000000000000000000000 ---- a/LICENSES/CC-BY-ND-3.0.txt -+++ /dev/null -@@ -1,87 +0,0 @@ --Creative Commons Attribution-NoDerivs 3.0 Unported -- -- CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM ITS USE. -- --License -- --THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED. -- --BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS. -- --1. Definitions -- -- a. "Adaptation" means a work based upon the Work, or upon the Work and other pre-existing works, such as a translation, adaptation, derivative work, arrangement of music or other alterations of a literary or artistic work, or phonogram or performance and includes cinematographic adaptations or any other form in which the Work may be recast, transformed, or adapted including in any form recognizably derived from the original, except that a work that constitutes a Collection will not be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered an Adaptation for the purpose of this License. -- -- b. "Collection" means a collection of literary or artistic works, such as encyclopedias and anthologies, or performances, phonograms or broadcasts, or other works or subject matter other than works listed in Section 1(f) below, which, by reason of the selection and arrangement of their contents, constitute intellectual creations, in which the Work is included in its entirety in unmodified form along with one or more other contributions, each constituting separate and independent works in themselves, which together are assembled into a collective whole. A work that constitutes a Collection will not be considered an Adaptation (as defined above) for the purposes of this License. -- -- c. "Distribute" means to make available to the public the original and copies of the Work through sale or other transfer of ownership. -- -- d. "Licensor" means the individual, individuals, entity or entities that offer(s) the Work under the terms of this License. -- -- e. "Original Author" means, in the case of a literary or artistic work, the individual, individuals, entity or entities who created the Work or if no individual or entity can be identified, the publisher; and in addition (i) in the case of a performance the actors, singers, musicians, dancers, and other persons who act, sing, deliver, declaim, play in, interpret or otherwise perform literary or artistic works or expressions of folklore; (ii) in the case of a phonogram the producer being the person or legal entity who first fixes the sounds of a performance or other sounds; and, (iii) in the case of broadcasts, the organization that transmits the broadcast. -- -- f. "Work" means the literary and/or artistic work offered under the terms of this License including without limitation any production in the literary, scientific and artistic domain, whatever may be the mode or form of its expression including digital form, such as a book, pamphlet and other writing; a lecture, address, sermon or other work of the same nature; a dramatic or dramatico-musical work; a choreographic work or entertainment in dumb show; a musical composition with or without words; a cinematographic work to which are assimilated works expressed by a process analogous to cinematography; a work of drawing, painting, architecture, sculpture, engraving or lithography; a photographic work to which are assimilated works expressed by a process analogous to photography; a work of applied art; an illustration, map, plan, sketch or three-dimensional work relative to geography, topography, architecture or science; a performance; a broadcast; a phonogram; a compilation of data to the extent it is protected as a copyrightable work; or a work performed by a variety or circus performer to the extent it is not otherwise considered a literary or artistic work. -- -- g. "You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation. -- -- h. "Publicly Perform" means to perform public recitations of the Work and to communicate to the public those public recitations, by any means or process, including by wire or wireless means or public digital performances; to make available to the public Works in such a way that members of the public may access these Works from a place and at a place individually chosen by them; to perform the Work to the public by any means or process and the communication to the public of the performances of the Work, including by public digital performance; to broadcast and rebroadcast the Work by any means including signs, sounds or images. -- -- i. "Reproduce" means to make copies of the Work by any means including without limitation by sound or visual recordings and the right of fixation and reproducing fixations of the Work, including storage of a protected performance or phonogram in digital form or other electronic medium. -- --2. Fair Dealing Rights. Nothing in this License is intended to reduce, limit, or restrict any uses free from copyright or rights arising from limitations or exceptions that are provided for in connection with the copyright protection under copyright law or other applicable laws. -- --3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below: -- -- a. to Reproduce the Work, to incorporate the Work into one or more Collections, and to Reproduce the Work as incorporated in the Collections; and, -- -- b. to Distribute and Publicly Perform the Work including as incorporated in Collections. -- -- c. For the avoidance of doubt: -- -- i. Non-waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme cannot be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; -- -- ii. Waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme can be waived, the Licensor waives the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; and, -- -- iii. Voluntary License Schemes. The Licensor waives the right to collect royalties, whether individually or, in the event that the Licensor is a member of a collecting society that administers voluntary licensing schemes, via that society, from any exercise by You of the rights granted under this License. -- --The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats, but otherwise you have no rights to make Adaptations. Subject to Section 8(f), all rights not expressly granted by Licensor are hereby reserved. -- --4. Restrictions. The license granted in Section 3 above is expressly made subject to and limited by the following restrictions: -- -- a. You may Distribute or Publicly Perform the Work only under the terms of this License. You must include a copy of, or the Uniform Resource Identifier (URI) for, this License with every copy of the Work You Distribute or Publicly Perform. You may not offer or impose any terms on the Work that restrict the terms of this License or the ability of the recipient of the Work to exercise the rights granted to that recipient under the terms of the License. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties with every copy of the Work You Distribute or Publicly Perform. When You Distribute or Publicly Perform the Work, You may not impose any effective technological measures on the Work that restrict the ability of a recipient of the Work from You to exercise the rights granted to that recipient under the terms of the License. This Section 4(a) applies to the Work as incorporated in a Collection, but this does not require the Collection apart from the Work itself to be made subject to the terms of this License. If You create a Collection, upon notice from any Licensor You must, to the extent practicable, remove from the Collection any credit as required by Section 4(b), as requested. -- -- b. If You Distribute, or Publicly Perform the Work or Collections, You must, unless a request has been made pursuant to Section 4(a), keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or if the Original Author and/or Licensor designate another party or parties (e.g., a sponsor institute, publishing entity, journal) for attribution ("Attribution Parties") in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; (ii) the title of the Work if supplied; (iii) to the extent reasonably practicable, the URI, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work. The credit required by this Section 4(b) may be implemented in any reasonable manner; provided, however, that in the case of a Collection, at a minimum such credit will appear, if a credit for all contributing authors of the Collection appears, then as part of these credits and in a manner at least as prominent as the credits for the other contributing authors. For the avoidance of doubt, You may only use the credit required by this Section for the purpose of attribution in the manner set out above and, by exercising Your rights under this License, You may not implicitly or explicitly assert or imply any connection with, sponsorship or endorsement by the Original Author, Licensor and/or Attribution Parties, as appropriate, of You or Your use of the Work, without the separate, express prior written permission of the Original Author, Licensor and/or Attribution Parties. -- -- c. Except as otherwise agreed in writing by the Licensor or as may be otherwise permitted by applicable law, if You Reproduce, Distribute or Publicly Perform the Work either by itself or as part of any Collections, You must not distort, mutilate, modify or take other derogatory action in relation to the Work which would be prejudicial to the Original Author's honor or reputation. -- --5. Representations, Warranties and Disclaimer -- --UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU. -- --6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. -- --7. Termination -- -- a. This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Collections from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License. -- -- b. Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above. -- --8. Miscellaneous -- -- a. Each time You Distribute or Publicly Perform the Work or a Collection, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License. -- -- b. If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable. -- -- c. No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent. -- -- d. This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You. -- -- e. The rights granted under, and the subject matter referenced, in this License were drafted utilizing the terminology of the Berne Convention for the Protection of Literary and Artistic Works (as amended on September 28, 1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and the Universal Copyright Convention (as revised on July 24, 1971). These rights and subject matter take effect in the relevant jurisdiction in which the License terms are sought to be enforced according to the corresponding provisions of the implementation of those treaty provisions in the applicable national law. If the standard suite of rights granted under applicable copyright law includes additional rights not granted under this License, such additional rights are deemed to be included in the License; this License is not intended to restrict the license of any rights under applicable law. -- --Creative Commons Notice -- --Creative Commons is not a party to this License, and makes no warranty whatsoever in connection with the Work. Creative Commons will not be liable to You or any party on any legal theory for any damages whatsoever, including without limitation any general, special, incidental or consequential damages arising in connection to this license. Notwithstanding the foregoing two (2) sentences, if Creative Commons has expressly identified itself as the Licensor hereunder, it shall have all rights and obligations of Licensor. -- --Except for the limited purpose of indicating to the public that the Work is licensed under the CCPL, Creative Commons does not authorize the use by either party of the trademark "Creative Commons" or any related trademark or logo of Creative Commons without the prior written consent of Creative Commons. Any permitted use will be in compliance with Creative Commons' then-current trademark usage guidelines, as may be published on its website or otherwise made available upon request from time to time. For the avoidance of doubt, this trademark restriction does not form part of this License. -- --Creative Commons may be contacted at http://creativecommons.org/. -diff --git a/LICENSES/CC-BY-SA-3.0.txt b/LICENSES/CC-BY-SA-3.0.txt -new file mode 100644 -index 0000000000000000000000000000000000000000..a29ac86c302d49546b1f854ada7f0c1ca5d7f659 ---- /dev/null -+++ b/LICENSES/CC-BY-SA-3.0.txt -@@ -0,0 +1,60 @@ -+Creative Commons Attribution-ShareAlike 3.0 Unported -+ -+CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM ITS USE. -+ -+License -+ -+THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED. -+ -+BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS. -+ -+1. Definitions -+a. "Adaptation" means a work based upon the Work, or upon the Work and other pre-existing works, such as a translation, adaptation, derivative work, arrangement of music or other alterations of a literary or artistic work, or phonogram or performance and includes cinematographic adaptations or any other form in which the Work may be recast, transformed, or adapted including in any form recognizably derived from the original, except that a work that constitutes a Collection will not be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered an Adaptation for the purpose of this License. -+b. "Collection" means a collection of literary or artistic works, such as encyclopedias and anthologies, or performances, phonograms or broadcasts, or other works or subject matter other than works listed in Section 1(f) below, which, by reason of the selection and arrangement of their contents, constitute intellectual creations, in which the Work is included in its entirety in unmodified form along with one or more other contributions, each constituting separate and independent works in themselves, which together are assembled into a collective whole. A work that constitutes a Collection will not be considered an Adaptation (as defined below) for the purposes of this License. -+c. "Creative Commons Compatible License" means a license that is listed at http://creativecommons.org/compatiblelicenses that has been approved by Creative Commons as being essentially equivalent to this License, including, at a minimum, because that license: (i) contains terms that have the same purpose, meaning and effect as the License Elements of this License; and, (ii) explicitly permits the relicensing of adaptations of works made available under that license under this License or a Creative Commons jurisdiction license with the same License Elements as this License. -+d. "Distribute" means to make available to the public the original and copies of the Work or Adaptation, as appropriate, through sale or other transfer of ownership. -+e. "License Elements" means the following high-level license attributes as selected by Licensor and indicated in the title of this License: Attribution, ShareAlike. -+f. "Licensor" means the individual, individuals, entity or entities that offer(s) the Work under the terms of this License. -+g. "Original Author" means, in the case of a literary or artistic work, the individual, individuals, entity or entities who created the Work or if no individual or entity can be identified, the publisher; and in addition (i) in the case of a performance the actors, singers, musicians, dancers, and other persons who act, sing, deliver, declaim, play in, interpret or otherwise perform literary or artistic works or expressions of folklore; (ii) in the case of a phonogram the producer being the person or legal entity who first fixes the sounds of a performance or other sounds; and, (iii) in the case of broadcasts, the organization that transmits the broadcast. -+h. "Work" means the literary and/or artistic work offered under the terms of this License including without limitation any production in the literary, scientific and artistic domain, whatever may be the mode or form of its expression including digital form, such as a book, pamphlet and other writing; a lecture, address, sermon or other work of the same nature; a dramatic or dramatico-musical work; a choreographic work or entertainment in dumb show; a musical composition with or without words; a cinematographic work to which are assimilated works expressed by a process analogous to cinematography; a work of drawing, painting, architecture, sculpture, engraving or lithography; a photographic work to which are assimilated works expressed by a process analogous to photography; a work of applied art; an illustration, map, plan, sketch or three-dimensional work relative to geography, topography, architecture or science; a performance; a broadcast; a phonogram; a compilation of data to the extent it is protected as a copyrightable work; or a work performed by a variety or circus performer to the extent it is not otherwise considered a literary or artistic work. -+i. "You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation. -+j. "Publicly Perform" means to perform public recitations of the Work and to communicate to the public those public recitations, by any means or process, including by wire or wireless means or public digital performances; to make available to the public Works in such a way that members of the public may access these Works from a place and at a place individually chosen by them; to perform the Work to the public by any means or process and the communication to the public of the performances of the Work, including by public digital performance; to broadcast and rebroadcast the Work by any means including signs, sounds or images. -+k. "Reproduce" means to make copies of the Work by any means including without limitation by sound or visual recordings and the right of fixation and reproducing fixations of the Work, including storage of a protected performance or phonogram in digital form or other electronic medium. -+2. Fair Dealing Rights. Nothing in this License is intended to reduce, limit, or restrict any uses free from copyright or rights arising from limitations or exceptions that are provided for in connection with the copyright protection under copyright law or other applicable laws. -+3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below: -+a. to Reproduce the Work, to incorporate the Work into one or more Collections, and to Reproduce the Work as incorporated in the Collections; -+b. to create and Reproduce Adaptations provided that any such Adaptation, including any translation in any medium, takes reasonable steps to clearly label, demarcate or otherwise identify that changes were made to the original Work. For example, a translation could be marked "The original work was translated from English to Spanish," or a modification could indicate "The original work has been modified."; -+c. to Distribute and Publicly Perform the Work including as incorporated in Collections; and, -+d. to Distribute and Publicly Perform Adaptations. -+e. For the avoidance of doubt: -+i. Non-waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme cannot be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; -+ii. Waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme can be waived, the Licensor waives the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; and, -+iii. Voluntary License Schemes. The Licensor waives the right to collect royalties, whether individually or, in the event that the Licensor is a member of a collecting society that administers voluntary licensing schemes, via that society, from any exercise by You of the rights granted under this License. -+The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. Subject to Section 8(f), all rights not expressly granted by Licensor are hereby reserved. -+ -+4. Restrictions. The license granted in Section 3 above is expressly made subject to and limited by the following restrictions: -+a. You may Distribute or Publicly Perform the Work only under the terms of this License. You must include a copy of, or the Uniform Resource Identifier (URI) for, this License with every copy of the Work You Distribute or Publicly Perform. You may not offer or impose any terms on the Work that restrict the terms of this License or the ability of the recipient of the Work to exercise the rights granted to that recipient under the terms of the License. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties with every copy of the Work You Distribute or Publicly Perform. When You Distribute or Publicly Perform the Work, You may not impose any effective technological measures on the Work that restrict the ability of a recipient of the Work from You to exercise the rights granted to that recipient under the terms of the License. This Section 4(a) applies to the Work as incorporated in a Collection, but this does not require the Collection apart from the Work itself to be made subject to the terms of this License. If You create a Collection, upon notice from any Licensor You must, to the extent practicable, remove from the Collection any credit as required by Section 4(c), as requested. If You create an Adaptation, upon notice from any Licensor You must, to the extent practicable, remove from the Adaptation any credit as required by Section 4(c), as requested. -+b. You may Distribute or Publicly Perform an Adaptation only under the terms of: (i) this License; (ii) a later version of this License with the same License Elements as this License; (iii) a Creative Commons jurisdiction license (either this or a later license version) that contains the same License Elements as this License (e.g., Attribution-ShareAlike 3.0 US)); (iv) a Creative Commons Compatible License. If you license the Adaptation under one of the licenses mentioned in (iv), you must comply with the terms of that license. If you license the Adaptation under the terms of any of the licenses mentioned in (i), (ii) or (iii) (the "Applicable License"), you must comply with the terms of the Applicable License generally and the following provisions: (I) You must include a copy of, or the URI for, the Applicable License with every copy of each Adaptation You Distribute or Publicly Perform; (II) You may not offer or impose any terms on the Adaptation that restrict the terms of the Applicable License or the ability of the recipient of the Adaptation to exercise the rights granted to that recipient under the terms of the Applicable License; (III) You must keep intact all notices that refer to the Applicable License and to the disclaimer of warranties with every copy of the Work as included in the Adaptation You Distribute or Publicly Perform; (IV) when You Distribute or Publicly Perform the Adaptation, You may not impose any effective technological measures on the Adaptation that restrict the ability of a recipient of the Adaptation from You to exercise the rights granted to that recipient under the terms of the Applicable License. This Section 4(b) applies to the Adaptation as incorporated in a Collection, but this does not require the Collection apart from the Adaptation itself to be made subject to the terms of the Applicable License. -+c. If You Distribute, or Publicly Perform the Work or any Adaptations or Collections, You must, unless a request has been made pursuant to Section 4(a), keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or if the Original Author and/or Licensor designate another party or parties (e.g., a sponsor institute, publishing entity, journal) for attribution ("Attribution Parties") in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; (ii) the title of the Work if supplied; (iii) to the extent reasonably practicable, the URI, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and (iv), consistent with Section 3(b), in the case of an Adaptation, a credit identifying the use of the Work in the Adaptation (e.g., "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). The credit required by this Section 4(c) may be implemented in any reasonable manner; provided, however, that in the case of a Adaptation or Collection, at a minimum such credit will appear, if a credit for all contributing authors of the Adaptation or Collection appears, then as part of these credits and in a manner at least as prominent as the credits for the other contributing authors. For the avoidance of doubt, You may only use the credit required by this Section for the purpose of attribution in the manner set out above and, by exercising Your rights under this License, You may not implicitly or explicitly assert or imply any connection with, sponsorship or endorsement by the Original Author, Licensor and/or Attribution Parties, as appropriate, of You or Your use of the Work, without the separate, express prior written permission of the Original Author, Licensor and/or Attribution Parties. -+d. Except as otherwise agreed in writing by the Licensor or as may be otherwise permitted by applicable law, if You Reproduce, Distribute or Publicly Perform the Work either by itself or as part of any Adaptations or Collections, You must not distort, mutilate, modify or take other derogatory action in relation to the Work which would be prejudicial to the Original Author's honor or reputation. Licensor agrees that in those jurisdictions (e.g. Japan), in which any exercise of the right granted in Section 3(b) of this License (the right to make Adaptations) would be deemed to be a distortion, mutilation, modification or other derogatory action prejudicial to the Original Author's honor and reputation, the Licensor will waive or not assert, as appropriate, this Section, to the fullest extent permitted by the applicable national law, to enable You to reasonably exercise Your right under Section 3(b) of this License (right to make Adaptations) but not otherwise. -+5. Representations, Warranties and Disclaimer -+UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU. -+ -+6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. -+7. Termination -+a. This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Adaptations or Collections from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License. -+b. Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above. -+8. Miscellaneous -+a. Each time You Distribute or Publicly Perform the Work or a Collection, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License. -+b. Each time You Distribute or Publicly Perform an Adaptation, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License. -+c. If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable. -+d. No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent. -+e. This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You. -+f. The rights granted under, and the subject matter referenced, in this License were drafted utilizing the terminology of the Berne Convention for the Protection of Literary and Artistic Works (as amended on September 28, 1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and the Universal Copyright Convention (as revised on July 24, 1971). These rights and subject matter take effect in the relevant jurisdiction in which the License terms are sought to be enforced according to the corresponding provisions of the implementation of those treaty provisions in the applicable national law. If the standard suite of rights granted under applicable copyright law includes additional rights not granted under this License, such additional rights are deemed to be included in the License; this License is not intended to restrict the license of any rights under applicable law. -+Creative Commons Notice -+ -+Creative Commons is not a party to this License, and makes no warranty whatsoever in connection with the Work. Creative Commons will not be liable to You or any party on any legal theory for any damages whatsoever, including without limitation any general, special, incidental or consequential damages arising in connection to this license. Notwithstanding the foregoing two (2) sentences, if Creative Commons has expressly identified itself as the Licensor hereunder, it shall have all rights and obligations of Licensor. -+ -+Except for the limited purpose of indicating to the public that the Work is licensed under the CCPL, Creative Commons does not authorize the use by either party of the trademark "Creative Commons" or any related trademark or logo of Creative Commons without the prior written consent of Creative Commons. Any permitted use will be in compliance with Creative Commons' then-current trademark usage guidelines, as may be published on its website or otherwise made available upon request from time to time. For the avoidance of doubt, this trademark restriction does not form part of the License. -+ -+Creative Commons may be contacted at http://creativecommons.org/. -\ No newline at end of file -diff --git a/dist/qt_themes/colorful/icons/16x16/connected.png b/dist/qt_themes/colorful/icons/16x16/connected.png -index d6052f1a09a9a828bf8d43ad1827d4d9d9cbae0f..0afc18cb7a19028fd567a7ca7ced62cd164657de 100644 ---- a/dist/qt_themes/colorful/icons/16x16/connected.png -+++ b/dist/qt_themes/colorful/icons/16x16/connected.png -@@ -1,4 +1,5 @@ - PNG - -- --*RR`uuS ɫa; yRLзxuSG7&P -\ No newline at end of file -+ -+NIRE &" -+\ ;y@^);1T~ -\ No newline at end of file -diff --git a/dist/qt_themes/colorful/icons/16x16/connected_notification.png b/dist/qt_themes/colorful/icons/16x16/connected_notification.png -index 0dfe032d58160f1a24f54040964b5b5f2e97a724..72466e098e471ae5a97c49a56536dd4bf62b3a08 100644 ---- a/dist/qt_themes/colorful/icons/16x16/connected_notification.png -+++ b/dist/qt_themes/colorful/icons/16x16/connected_notification.png -@@ -1,6 +1,8 @@ - PNG - -- --"DJED AUS- 'm Hb)l --AYi Ʋmg |;UOыY_g 됢bdPsrbVXښEKA+0Yn+Gf --uVrg\d ujbo `I%Ȁg;O -tݡi+iEcC -\ No newline at end of file -+ -+BTjmkwwθIA^ν;9\8zt:ƹM=8s/#8zj:DCQs*(agi\\b1<d4,\2#lnH,{cZ`1.#m];~MAAP<yǫ' fʵK] _, x}w::@ h[Iݏl9nfdB~T l ζ8堹0RɄ LbB-$9 K!7zJt]/cWJj+^|[(t[AXn-v>C)PQ"ƺ:5?9mfp05mvN -+|f|jjɛJy 64trfx>: EQȊ(C tC), Ӑ&JyU7͎W)fgRB -+a Ub -+'iyiSM\6.IDߍcCm σB \!#'OX߿OӋLo9#P@d]͍F4漒44 2 -+3!@|Wl [>O"LmifX?PN\ -\ No newline at end of file -diff --git a/dist/qt_themes/colorful/icons/16x16/disconnected.png b/dist/qt_themes/colorful/icons/16x16/disconnected.png -index bacee3aebfe9f9058f7d49bde34d8d6e5963e2bb..7258a8cfe5ab54a3f53252c08520824ed91969a8 100644 ---- a/dist/qt_themes/colorful/icons/16x16/disconnected.png -+++ b/dist/qt_themes/colorful/icons/16x16/disconnected.png -@@ -1,3 +1,4 @@ - PNG - -- -\ No newline at end of file -+ -+N}ȡԖ&V"ȷӵR% ټ`ۨT9v<]_JMfEH a= -\ No newline at end of file -diff --git a/dist/qt_themes/colorful/icons/48x48/list-add.png b/dist/qt_themes/colorful/icons/48x48/list-add.png -index bc2c47c91a761228dc4ebdc8df8713119d5fec3a..74e4882aaedc98b57cce65ae5c0a2683bab31279 100644 ---- a/dist/qt_themes/colorful/icons/48x48/list-add.png -+++ b/dist/qt_themes/colorful/icons/48x48/list-add.png -@@ -1,3 +1,6 @@ - PNG - -- -\ No newline at end of file -+ -+ -+r*) -+D -\ No newline at end of file -diff --git a/dist/qt_themes/colorful/icons/48x48/sd_card.png b/dist/qt_themes/colorful/icons/48x48/sd_card.png -index 29be71a0d4307c9653e22a31e77e43e87a907beb..47e491d32c99fe208c59dae4d4a568e8e7dd6485 100644 ---- a/dist/qt_themes/colorful/icons/48x48/sd_card.png -+++ b/dist/qt_themes/colorful/icons/48x48/sd_card.png -@@ -1,6 +1,7 @@ - PNG - -- --y+J O;W 7៍ ߤT\@d 1 5Dz)A9y~ܑt=1ϞzsbU#PTTTTTTTTTTTTT ---y`bS.^7tbE'nsA_֥¯kU%6ת?x%k ,^w!Зl,q --( -\ No newline at end of file -+ -+ޭI/-hA'zV Zj'EzPTCيlfofgIl"}'Sv-tG8pjn6~ f M^%"h7S6SW`/&˓we%cI~6淧 {1׆y;lP r7W'krEU.j:A4S pn!Win<enq >QxK8%hVPC,6W ,fFY<p01-Q.[',{m؎ErJl x4KW< 8uM춿s ޤ%Or銧'SWM~p6W\MftɻyIr6 -+50p銧A q;brB6~o%ր -+ E4Y3Wpp/v<6n\EIJXc +r'4t㵚 E,RJ -+-&]ck$I46{PB3@S3XOlX]XNͥGXL%Ytk%?MC3@QѴ nT|G:bÀj <mַ9LpVA.[ym`6:ae*ù -\ No newline at end of file -diff --git a/dist/qt_themes/colorful/icons/48x48/star.png b/dist/qt_themes/colorful/icons/48x48/star.png -index 43b5d52ed7cca57aec41d75670cf29cfa98e849d..19d55a0a8065cf4168752568bc67d4ebc3b8ec9f 100644 ---- a/dist/qt_themes/colorful/icons/48x48/star.png -+++ b/dist/qt_themes/colorful/icons/48x48/star.png -@@ -1,8 +1,7 @@ - PNG - -- --* *, +]AsRXKEҴݝٹϿ33wڇ0;ss20a6a7%ս!g+zۧ4</đNj#( --WO#9|残zۧ6c --I1u⬟;$}i 0falffDn5CixL18U8;} g㫠ˮ`$*cZB;Q ˯|Dw*U:bxҙB%Ӿ --܇H7/_dʹŒw --R2Gh2RP_3:A X:L_&@( Cȵ(~C4U?lkZ CwZ[;mCePvdD8S[{ [mG̕DK%A1 . S=`(]`5:5EeOm| ZT⩀!snݶZ_D+klCTRBP@ y`|KJ ӡ ~Ͱ<|K >; L 2c̜uY ؤoz 4ĤQĞ ?ؿI Mu -\ No newline at end of file -+ -+֑ =_aYn/[& 8t@KD ђuBɀܯ_^;qY# 8t\I4x!ٶZ xrqha5m!v A,Ԯ`BܑT _]J^Z H )bAAd)wTbDAcԲ/XɀܫiHĠ~7k1jpΩ!j]~FI<g= {8y U4mt!_F0Ʃe"#(/>%ˏq% e+[MS a Gs(wV F;Zzi,}Dk>9ptbԦ-|[+~sieB\L: ~'w㶇*mD:9ku^Qp.A7BL -+=h";۵rR;'rS;m \yEQm]im -+s&" -+GS! զ086?`1> )$^׃b\Ck%03pDK``g4 B2X=++ka]h*yz\mw^QA #uZ̋d.a0av)8 ]AS 'U cV!yF7LJQ9+S_/fބǩs -\ No newline at end of file -diff --git a/dist/qt_themes/colorful_midnight_blue/icons/16x16/lock.png b/dist/qt_themes/colorful_midnight_blue/icons/16x16/lock.png -deleted file mode 100644 -index 32c505848ebc0ac4c84f8b544e94d077270297f4..0000000000000000000000000000000000000000 ---- a/dist/qt_themes/colorful_midnight_blue/icons/16x16/lock.png -+++ /dev/null -@@ -1,9 +0,0 @@ --PNG -- -- -- --:@@L {Yx-?f G"r `趭o- Xc"P^$*M57gʲ,p:<o Fu+ --e9s -- Ï:q`jׁ$(`sGˣ?PNxb'{䠹9-X%[*>/Az --L't n2 --m`+ ;w `;̉/O{ -\ No newline at end of file -diff --git a/dist/qt_themes/colorful_midnight_blue/icons/16x16/view-refresh.png b/dist/qt_themes/colorful_midnight_blue/icons/16x16/view-refresh.png -deleted file mode 100644 -index d4afd76f949ff5c65e039b69ff999325bff5d7b8..0000000000000000000000000000000000000000 ---- a/dist/qt_themes/colorful_midnight_blue/icons/16x16/view-refresh.png -+++ /dev/null -@@ -1,4 +0,0 @@ --PNG -- -- --@JDo +0v|iٝu#("("D2V)}%f(0Ťy\crٰ`J9^q7?ADlDĢ8 _7%e^|A C33ܵ< pٕ#1A 8=njaNRkq?L)v6|E no -\ No newline at end of file -diff --git a/dist/qt_themes/colorful_midnight_blue/style.qrc b/dist/qt_themes/colorful_midnight_blue/style.qrc -index 1081d281d8f873e160396a28eac7b470f61c4a9f..b9821c6722cbe91d6bbf185da0a2051f2aa32059 100644 ---- a/dist/qt_themes/colorful_midnight_blue/style.qrc -+++ b/dist/qt_themes/colorful_midnight_blue/style.qrc -@@ -6,8 +6,8 @@ SPDX-License-Identifier: GPL-2.0-or-later - <RCC> - <qresource prefix="icons/colorful_midnight_blue"> - <file alias="index.theme">icons/index.theme</file> -- <file alias="16x16/lock.png">icons/16x16/lock.png</file> -- <file alias="16x16/view-refresh.png">icons/16x16/view-refresh.png</file> -+ <file alias="16x16/lock.png">../colorful_dark/icons/16x16/lock.png</file> -+ <file alias="16x16/view-refresh.png">../qdarkstyle/icons/16x16/view-refresh.png</file> - <file alias="48x48/bad_folder.png">../colorful/icons/48x48/bad_folder.png</file> - <file alias="48x48/chip.png">../colorful/icons/48x48/chip.png</file> - <file alias="48x48/folder.png">../colorful/icons/48x48/folder.png</file> -diff --git a/dist/qt_themes/default/icons/16x16/checked.png b/dist/qt_themes/default/icons/16x16/checked.png -index 3e017b715802d120d3c93343e374ef3566c954d3..b9e64e9e083479d3ee98f767e7db0afa918733a4 100644 ---- a/dist/qt_themes/default/icons/16x16/checked.png -+++ b/dist/qt_themes/default/icons/16x16/checked.png -@@ -1,3 +1,4 @@ - PNG - -- -\ No newline at end of file -+ -+1{>a%>4Ž7_5/ a nl&s5}hRm,$ʗ.r&{ՌF&M$\Gi3D \2\z!4G i:)&VOA*{'h=T@.&u-9/V -\ No newline at end of file -diff --git a/dist/qt_themes/default/icons/16x16/connected.png b/dist/qt_themes/default/icons/16x16/connected.png -index afa7973948c2fd69a5b838ebc993a4a618e20e31..0afc18cb7a19028fd567a7ca7ced62cd164657de 100644 ---- a/dist/qt_themes/default/icons/16x16/connected.png -+++ b/dist/qt_themes/default/icons/16x16/connected.png -@@ -1,4 +1,5 @@ - PNG - -- --hme ``<~!sҁn꤮)a=wV+ -\ No newline at end of file -+ -+NIRE &" -+\ ;y@^);1T~ -\ No newline at end of file -diff --git a/dist/qt_themes/default/icons/16x16/connected_notification.png b/dist/qt_themes/default/icons/16x16/connected_notification.png -index e64901378b000db1871d03db88af5f06c454cb01..72466e098e471ae5a97c49a56536dd4bf62b3a08 100644 ---- a/dist/qt_themes/default/icons/16x16/connected_notification.png -+++ b/dist/qt_themes/default/icons/16x16/connected_notification.png -@@ -1,4 +1,8 @@ - PNG - -- --bgae"jgV$Bb'SܹsΜ? ^y`z?Fq@̠S"+_D,x^\+3n`?Hx [*BQW"pb csr=ƫ/VDe'O; &Kdx?bw@I)>tgfq$pn쉈LY :jȫx3zզ#CTq Kv|w}~bCHI ̻YR/1{>ҏ[)6 RdK? /t^';|ŬƑkcIhB1|P1 -\ No newline at end of file -+ -+BTjmkwwθIA^ν;9\8zt:ƹM=8s/#8zj:DCQs*(agi\\b1<d4,\2#lnH,{cZ`1.#m];~MAAP<yǫ' fʵK] _, x}w::@ h[Iݏl9nfdB~T l ζ8堹0RɄ LbB-$9 K!7zJt]/cWJj+^|[(t[AXn-v>C)PQ"ƺ:5?9mfp05mvN -+|f|jjɛJy 64trfx>: EQȊ(C tC), Ӑ&JyU7͎W)fgRB -+a Ub -+'iyiSM\6.IDߍcCm σB \!#'OX߿OӋLo9#P@d]͍F4漒44 2 -+3!@|Wl [>O"LmifX?PN\ -\ No newline at end of file -diff --git a/dist/qt_themes/default/icons/16x16/disconnected.png b/dist/qt_themes/default/icons/16x16/disconnected.png -index 835b1f0d6b5ceeb11e9a2b7d68c61521aef7bcb8..7258a8cfe5ab54a3f53252c08520824ed91969a8 100644 ---- a/dist/qt_themes/default/icons/16x16/disconnected.png -+++ b/dist/qt_themes/default/icons/16x16/disconnected.png -@@ -1,6 +1,4 @@ - PNG - -- --ЁN --P̚d&9eM5,]~ --ѡ8<IF:Bj -\ No newline at end of file -+ -+N}ȡԖ&V"ȷӵR% ټ`ۨT9v<]_JMfEH a= -\ No newline at end of file -diff --git a/dist/qt_themes/default/icons/16x16/failed.png b/dist/qt_themes/default/icons/16x16/failed.png -index 7c4047dd0842e321cb89bd20038772bafc6300cd..a1872835df734e35fc97e363b2ebdcb6b5e814e0 100644 ---- a/dist/qt_themes/default/icons/16x16/failed.png -+++ b/dist/qt_themes/default/icons/16x16/failed.png -@@ -1,8 +1,3 @@ - PNG - -- -->tkQ'xk[}U^0f ʾV @jPa%* --a+<+F%C\8G 3IONmHM`90?A6;[ QRf * --n"sʚ ~ --+w9%$_[>Dem`S9Kބ*b@مX H --2- -\ No newline at end of file -+ -\ No newline at end of file -diff --git a/dist/qt_themes/default/icons/16x16/lock.png b/dist/qt_themes/default/icons/16x16/lock.png -index 496b58078983bc3c4f7dc2808fd02b8deb8b7b67..69d399050804cfa45e00850d4330a5b7cfaa3a43 100644 ---- a/dist/qt_themes/default/icons/16x16/lock.png -+++ b/dist/qt_themes/default/icons/16x16/lock.png -@@ -1,7 +1,6 @@ - PNG - -- -- -- --[_㡽p8+ - 7xB\eqOi W`;b)3jq혂s/N1}$c2LUqOl>T&3 -- -\ No newline at end of file -+ -+1Ex[AkS sXyS۪ڨ$ 3f!0W6~/(&w%] -+qWiߘ7 -+qW!5-_!V]|备^Oþ<S9 `2"IALRd$') ʍINR-LrG$xr&*X靼8`9e -\ No newline at end of file -diff --git a/dist/qt_themes/default/icons/256x256/plus_folder.png b/dist/qt_themes/default/icons/256x256/plus_folder.png -index ae4afccc768e0a2163b23d5c457a821ef536dd73..3a49669a3ae3f0ea46ebd5ddd0e51f2b31b37d47 100644 ---- a/dist/qt_themes/default/icons/256x256/plus_folder.png -+++ b/dist/qt_themes/default/icons/256x256/plus_folder.png -@@ -1,12 +1,18 @@ - PNG - -- --[l --xX+͐rttYQB@{8~? SeEJ -- --aĿͻYNG#f --=D? j;a)l><FX h --ި!LtHkG;]A8|"I]?J[`oRT$k`]?NX.$;yMc4 --<pp/p"~I嵖ps_q!(JR~OX8tU-[ O8̐Ftd/=D8G --<6NJf<R<"IJ}'&-條}="-MniQV OX2\RskKw GA?Z -- 3HXٷ$I$I$I$I?tEZ -\ No newline at end of file -+ -+Љݕ+(/(i'(*@tk*˔Зt7(@g?D] }I4jG*%# -+E -+ -+ -+ -+ -+ -+@zlH9((! -+@zfYJp MYo1?SvQ -+@Z1 AHKϯH -+],*&s{Z# -+@=7USI z~[M WS P?Y PUYp\ -+@}* -+eDq+gѡÕ{Y 0st -+@3&XBL^ݮcD\,SP^P KS[ck4=x\㋥rU,V||%-hV~ZFRC {Rb`\}{ кo: -\ No newline at end of file -diff --git a/dist/qt_themes/default/icons/48x48/bad_folder.png b/dist/qt_themes/default/icons/48x48/bad_folder.png -index 2527c1318575236c92c8111413bcdf1caeacbd27..364ec646f6f1c6b5b632fb68efd2602aa2c87f25 100644 ---- a/dist/qt_themes/default/icons/48x48/bad_folder.png -+++ b/dist/qt_themes/default/icons/48x48/bad_folder.png -@@ -1,8 +1,7 @@ - PNG - -- --V)C5"*>f+VMNlQ? v= rBM4qq~h[ \ --MQ) j4Dx --b`˗e-NWgǁޠ[WPs١q+Ǎs`3w3lLնqx?F˦O&8v~ --(I' --"6 cA`MZZqhۊπ6 9 F Zā 5gm \5l2X*DFkՂiQ^,}- -\ No newline at end of file -+ -+\w2."/ 7삲d*4Om$ uvxԲ -+Qbx(M<WYЉ7)^%PCD h^C{;O6)dJ#p0b,_JFZy'qbŴN Lx"z<{L$QZ@xsCGI0 6VT)j@,֏W 1^ }b: yy'T"!j,*e/]юƆx%`Bf L 3gmhi;g_3õh{ q ]` ~R r/54b=c"MPikn -+ `])AȖE9s(ss[LR }DdP<O K1ptmRH 3DG'z vb N5]`vCᎦ}>Z\ -++k h7g/H_CmiYHmNo@s0 ]tA Qjk-La7wlh>VtA Az:&q:HV@ ;ȑ#[&<!\( -\ No newline at end of file -diff --git a/dist/qt_themes/default/icons/48x48/chip.png b/dist/qt_themes/default/icons/48x48/chip.png -index 3efdf301eb52a587f18b7d2f94d6ea64773a0231..1b573d51af66864f03a7e20179d3ea4d5f36a012 100644 ---- a/dist/qt_themes/default/icons/48x48/chip.png -+++ b/dist/qt_themes/default/icons/48x48/chip.png -@@ -1,163 +1,6 @@ - PNG - -- --<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="Adobe XMP Core 5.6-c138 79.159824, 2016/09/14-01:09:01 "> -- <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> -- <rdf:Description rdf:about="" -- xmlns:xmp="http://ns.adobe.com/xap/1.0/" -- xmlns:dc="http://purl.org/dc/elements/1.1/" -- xmlns:photoshop="http://ns.adobe.com/photoshop/1.0/" -- xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/" -- xmlns:stEvt="http://ns.adobe.com/xap/1.0/sType/ResourceEvent#" -- xmlns:tiff="http://ns.adobe.com/tiff/1.0/" -- xmlns:exif="http://ns.adobe.com/exif/1.0/"> -- <xmp:CreatorTool>Adobe Photoshop CC 2017 (Windows)</xmp:CreatorTool> -- <xmp:CreateDate>2018-07-25T20:26:27+08:00</xmp:CreateDate> -- <xmp:ModifyDate>2018-07-25T20:30:37+08:00</xmp:ModifyDate> -- <xmp:MetadataDate>2018-07-25T20:30:37+08:00</xmp:MetadataDate> -- <dc:format>image/png</dc:format> -- <photoshop:ColorMode>3</photoshop:ColorMode> -- <xmpMM:InstanceID>xmp.iid:a03a1ab2-4145-5444-bda5-17fcd23a669a</xmpMM:InstanceID> -- <xmpMM:DocumentID>xmp.did:a03a1ab2-4145-5444-bda5-17fcd23a669a</xmpMM:DocumentID> -- <xmpMM:OriginalDocumentID>xmp.did:a03a1ab2-4145-5444-bda5-17fcd23a669a</xmpMM:OriginalDocumentID> -- <xmpMM:History> -- <rdf:Seq> -- <rdf:li rdf:parseType="Resource"> -- <stEvt:action>created</stEvt:action> -- <stEvt:instanceID>xmp.iid:a03a1ab2-4145-5444-bda5-17fcd23a669a</stEvt:instanceID> -- <stEvt:when>2018-07-25T20:26:27+08:00</stEvt:when> -- <stEvt:softwareAgent>Adobe Photoshop CC 2017 (Windows)</stEvt:softwareAgent> -- </rdf:li> -- </rdf:Seq> -- </xmpMM:History> -- <tiff:Orientation>1</tiff:Orientation> -- <tiff:XResolution>960000/10000</tiff:XResolution> -- <tiff:YResolution>960000/10000</tiff:YResolution> -- <tiff:ResolutionUnit>2</tiff:ResolutionUnit> -- <exif:ColorSpace>65535</exif:ColorSpace> -- <exif:PixelXDimension>48</exif:PixelXDimension> -- <exif:PixelYDimension>48</exif:PixelYDimension> -- </rdf:Description> -- </rdf:RDF> --</x:xmpmeta> -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --<?xpacket end="w"?>6 -\ No newline at end of file -+ -+^f_Mck"$7EgdYjL+s`[<t6MVD41L,h -+(;` Td1p++= 9+4asar n- -+XE`(ZYމSJoAHmFy4Z5}GZ% )-hYN|-!:Cl!)RF9E. 5Ԍ -\ No newline at end of file -diff --git a/dist/qt_themes/default/icons/48x48/folder.png b/dist/qt_themes/default/icons/48x48/folder.png -index 2e67d8b38fe9219a9bee674472f6a1356cae3698..507337fae59964244795a3b0bc528e07de52df3e 100644 ---- a/dist/qt_themes/default/icons/48x48/folder.png -+++ b/dist/qt_themes/default/icons/48x48/folder.png -@@ -1,4 +1,6 @@ - PNG - -- ---U`i@6 |/|CN<眄p"e`KhTm`4a* -\ No newline at end of file -+ -+%>u -+:$|-RPz;FvfWIw7w)x<|S 44b'6b%>1W'،5aVHkb_V@V=!8Mͩ _Q*6zI|ka'ce09p RrK@}%EpO^,J1D7Wj& p( ]HG5}s=j(,? 4M,rf1JKX\p 5>k| -+O{p.ӭ -\ No newline at end of file -diff --git a/dist/qt_themes/default/icons/48x48/list-add.png b/dist/qt_themes/default/icons/48x48/list-add.png -index dbc74687b177ea85ffa48be3864db8a49bed76cb..fd8a06132ccd4e99b947cecffafa3a593b1cce25 100644 ---- a/dist/qt_themes/default/icons/48x48/list-add.png -+++ b/dist/qt_themes/default/icons/48x48/list-add.png -@@ -1,3 +1,6 @@ - PNG - -- -\ No newline at end of file -+ -+ -+r*) -+D -\ No newline at end of file -diff --git a/dist/qt_themes/default/icons/48x48/no_avatar.png b/dist/qt_themes/default/icons/48x48/no_avatar.png -index d4bf82026a63d3498c57615ed744ef6ad1a11db4..76f812349b462cd8b05465d12a7e1a4df6788ea9 100644 ---- a/dist/qt_themes/default/icons/48x48/no_avatar.png -+++ b/dist/qt_themes/default/icons/48x48/no_avatar.png -@@ -1,5 +1,5 @@ - PNG - -- --]:;_zf3:v[ &.Zo_P'g zA]ȋG5IK_ --gw(v -\ No newline at end of file -+ -+k.ɚ siabM |'kcXWnG9Rer6d,V"G4P}4/0 !b SJ i40P:0 VavJ:YƮp`ܫZz%8RtmS5blRVFjeO&ܐ-|.n&gۙDVq@KlOxDz pwSy`I >+a?0C}~ lb -\ћs,]ZZܩ@<̴ R-ܪA)O/(Xq,6E/+?$pa& hue~4@8w9K!lop0<D7< -+DbZEW= f^(Ęl -\ No newline at end of file -diff --git a/dist/qt_themes/default/icons/48x48/sd_card.png b/dist/qt_themes/default/icons/48x48/sd_card.png -index edacaeeb5629c5cf4a86d24eb35a4d37c45bfa77..60dfba2693ca39fe823f89fbcbeb25ea274698cd 100644 ---- a/dist/qt_themes/default/icons/48x48/sd_card.png -+++ b/dist/qt_themes/default/icons/48x48/sd_card.png -@@ -1,6 +1,7 @@ - PNG - -- --\1>\ƍ?UGF= Z#?+06g9=oR aZڤ4y L=UݮU|զU/_"8ݣt=~U߰Qg#=ҷi1ۑx;PY +*dwNoɨ}`RS8KBC^vp*BR&HM 59@jr --ްq)\ --a#Rq+R `(:N.c'P*3iS -\ No newline at end of file -+ -+T8~yrƴ6])uc<K+!g]E\hQ -+ ȓsӒ3xyxˣmѾ+ -+ $4l a? ̌Eh9h9ϳL 6i;b` -+`β!ov9J}-/͆ -\ No newline at end of file -diff --git a/dist/qt_themes/default/icons/48x48/star.png b/dist/qt_themes/default/icons/48x48/star.png -index 740f7f3e75da9160a8db6a1941b159509a7ab8ee..c2b78f0c3e543913b18d4f95956109c7d2646ba8 100644 ---- a/dist/qt_themes/default/icons/48x48/star.png -+++ b/dist/qt_themes/default/icons/48x48/star.png -@@ -1,8 +1,4 @@ - PNG - -- --Pj5"QI<4: --$]# wV|d̜sЦM %1/$zb 0VaF%SljBF;.('OXF9yjfϱL 0S>%ze /+0v\]-Ƶ --?4n` ~뻴-,V~wzl Αk}%L\̶ $k9ۏ{cx'lC --wu^ Ob/ V2#>pߕOa]kѬ)1_7|j<+Q~[ʧ,ǣ_aݿʧt ?fɧt fWs.-,)r9 EӕyEv̫ǎ5g",͞B --܁!ּIEysמ !ul 2q'1cΤ[jd,ʫ༰o(fwL>SHaA_`:F{MtT=gUl]LrR3U㒩()< I4 Vpv7,/Q6 -\ No newline at end of file -+ -+_z%4GMtP/|b z#N=%Z]bP)1}˸k8;p)*_ -\ No newline at end of file -diff --git a/dist/qt_themes/qdarkstyle/icons/16x16/connected.png b/dist/qt_themes/qdarkstyle/icons/16x16/connected.png -index 90feb372af3e4c1dd9782e075993946c26b1e5b0..0afc18cb7a19028fd567a7ca7ced62cd164657de 100644 ---- a/dist/qt_themes/qdarkstyle/icons/16x16/connected.png -+++ b/dist/qt_themes/qdarkstyle/icons/16x16/connected.png -@@ -1,4 +1,5 @@ - PNG - -- --uKc@],+0 A3eL؏0t%6Vn 2EBXy'e }Ҷ*qhg-d -P[ʙddb!,O0͋ 'o)}?Wr*aC_* YJ6 G_/(xFԒ$+9FI -\ No newline at end of file -+ -+NIRE &" -+\ ;y@^);1T~ -\ No newline at end of file -diff --git a/dist/qt_themes/qdarkstyle/icons/16x16/connected_notification.png b/dist/qt_themes/qdarkstyle/icons/16x16/connected_notification.png -index 7cd8b9d2930d99340778360c68bf28923a66609c..72466e098e471ae5a97c49a56536dd4bf62b3a08 100644 ---- a/dist/qt_themes/qdarkstyle/icons/16x16/connected_notification.png -+++ b/dist/qt_themes/qdarkstyle/icons/16x16/connected_notification.png -@@ -1,5 +1,8 @@ - PNG - -- --U!0 t& "<VNPoO --v[kn0``P1WҕNQ:v+, =߽7;rTk -\ No newline at end of file -+ -+BTjmkwwθIA^ν;9\8zt:ƹM=8s/#8zj:DCQs*(agi\\b1<d4,\2#lnH,{cZ`1.#m];~MAAP<yǫ' fʵK] _, x}w::@ h[Iݏl9nfdB~T l ζ8堹0RɄ LbB-$9 K!7zJt]/cWJj+^|[(t[AXn-v>C)PQ"ƺ:5?9mfp05mvN -+|f|jjɛJy 64trfx>: EQȊ(C tC), Ӑ&JyU7͎W)fgRB -+a Ub -+'iyiSM\6.IDߍcCm σB \!#'OX߿OӋLo9#P@d]͍F4漒44 2 -+3!@|Wl [>O"LmifX?PN\ -\ No newline at end of file -diff --git a/dist/qt_themes/qdarkstyle/icons/16x16/disconnected.png b/dist/qt_themes/qdarkstyle/icons/16x16/disconnected.png -index fc5f23894e4aedae7a49981f68ba017a177b065b..7258a8cfe5ab54a3f53252c08520824ed91969a8 100644 ---- a/dist/qt_themes/qdarkstyle/icons/16x16/disconnected.png -+++ b/dist/qt_themes/qdarkstyle/icons/16x16/disconnected.png -@@ -1,4 +1,4 @@ - PNG - -- -- Qw -\ No newline at end of file -+ -+N}ȡԖ&V"ȷӵR% ټ`ۨT9v<]_JMfEH a= -\ No newline at end of file -diff --git a/dist/qt_themes/qdarkstyle/icons/16x16/lock.png b/dist/qt_themes/qdarkstyle/icons/16x16/lock.png -index c750a39e855800fe4cde217a1bf28f841030e501..7e63927b2c047718f80ec29512472f1a2d9d357e 100644 ---- a/dist/qt_themes/qdarkstyle/icons/16x16/lock.png -+++ b/dist/qt_themes/qdarkstyle/icons/16x16/lock.png -@@ -1,3 +1,5 @@ - PNG - -- -\ No newline at end of file -+ -+0B٩B -+7U]KXL~^^ m K`j4&\IƬ%j\#XګOQ\@ [ƽ0 7ؓ阱Z9u![CzsQF;h@ߘ* |8'8H`_25`q -\ No newline at end of file -diff --git a/dist/qt_themes/qdarkstyle/icons/256x256/plus_folder.png b/dist/qt_themes/qdarkstyle/icons/256x256/plus_folder.png -index 303f9a321890fc4c2054e2cff498adf23f654b70..002101114d150e304765a3466be9bf267ae96382 100644 ---- a/dist/qt_themes/qdarkstyle/icons/256x256/plus_folder.png -+++ b/dist/qt_themes/qdarkstyle/icons/256x256/plus_folder.png -@@ -1,17 +1,47 @@ - PNG - -- --,b --lv -- 3. |q'_k"" ^a 3WWg41^= --ny@f ;@D `D+ DWd)uĩ G"AT 3 ,8pD\:2Td_z-ȭoFAT9tf~WxgD, Du --3@f -- cMf_:78A4ex%54p` -=2IYQ=!4JPChhe+57$?/5 T: =|`Rc"3}:d --x; / --Y --\gΡ!Y --?1,̷g --cX --E:ʜH7_GĖ9ƞ@qpO ? U*fH --EHP͓!X p/EٶgND̩,* @,2z?"<oBY --2̼@/"ZK6d%:%3g懁 -Ms;@ &< zK} fg7ɒ` mZ,`oV1W%U:"] -\ No newline at end of file -+ -+Ο/ $nG(E a >+ -+ Ca$F -+ #H G -+@fG Q!qzP qL +( -+% -+ -+X -+ -+@ԙj]M>\ v;8/=OgEH:rR|c;c QDn.ebA9z a -+@Zm AHK -@HK 'LBx2Q -+^"&m#}͏zx]=@hC|ZL(N^ О_(ts( -+@9 -+@9oآr[bP -+@hG e:>ktob1Ga:zҲ֫/V2QU)UySaR)˔G腹T, -+@B\U =iT. -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+@Zތmވ-@HK˱E( -+@ZU cw 4 Gn; -+@z.Q W* B{łc}MjE*( -+@}r2=gF<S0[ mL8.s=FʞTeC^PD{TV_j*q8EJ}@ $VC}r 5J]$ -+VVG o.ea@".^ۀiP -+@;U}vD' { `Uf"5Dž9 -\ No newline at end of file -diff --git a/dist/qt_themes/qdarkstyle/icons/48x48/bad_folder.png b/dist/qt_themes/qdarkstyle/icons/48x48/bad_folder.png -index 4a9709623476fcf4070c4e3da2bb17375222082e..245f96c7ba65c9a792abc01a1b76c39accd3ee5e 100644 ---- a/dist/qt_themes/qdarkstyle/icons/48x48/bad_folder.png -+++ b/dist/qt_themes/qdarkstyle/icons/48x48/bad_folder.png -@@ -1,8 +1,7 @@ - PNG - -- --%ͭ0G,ndfͬ1He5a --=X zMU+ŷUȯdvj --v\ےr@^4 --./Ϥ!@҇@0N |9!u"l~2 mT$0}MRH GWS --sH~Tq4N$]WJNx_1{^G -\ No newline at end of file -+ -+Q R$Fo%E^^QɢC=QiAn|Y:m?{Ι曋J4i6*0 7TeAfx]VUuH~'4ǻO. Q%"0F(@%чI.);] OI zA`<EC[xh?."]f rn #lMsz7ȃM -+ -+^=̵ 6i%FS! B-a m -i-a -+*un;3kFtŐ"}Cp,I&Mb(?R{"! -\ No newline at end of file -diff --git a/dist/qt_themes/qdarkstyle/icons/48x48/chip.png b/dist/qt_themes/qdarkstyle/icons/48x48/chip.png -index 973fabd052e389c28ef36c482cf44d764795a3b4..db0cadac1338a971b7b890c33f5920580c1013a5 100644 ---- a/dist/qt_themes/qdarkstyle/icons/48x48/chip.png -+++ b/dist/qt_themes/qdarkstyle/icons/48x48/chip.png -@@ -1,165 +1,5 @@ - PNG - -- --<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="Adobe XMP Core 5.6-c138 79.159824, 2016/09/14-01:09:01 "> -- <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> -- <rdf:Description rdf:about="" -- xmlns:xmp="http://ns.adobe.com/xap/1.0/" -- xmlns:dc="http://purl.org/dc/elements/1.1/" -- xmlns:photoshop="http://ns.adobe.com/photoshop/1.0/" -- xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/" -- xmlns:stEvt="http://ns.adobe.com/xap/1.0/sType/ResourceEvent#" -- xmlns:tiff="http://ns.adobe.com/tiff/1.0/" -- xmlns:exif="http://ns.adobe.com/exif/1.0/"> -- <xmp:CreatorTool>Adobe Photoshop CC 2017 (Windows)</xmp:CreatorTool> -- <xmp:CreateDate>2018-07-25T21:37:27+08:00</xmp:CreateDate> -- <xmp:ModifyDate>2018-07-25T21:38:09+08:00</xmp:ModifyDate> -- <xmp:MetadataDate>2018-07-25T21:38:09+08:00</xmp:MetadataDate> -- <dc:format>image/png</dc:format> -- <photoshop:ColorMode>3</photoshop:ColorMode> -- <xmpMM:InstanceID>xmp.iid:d24b6914-04d7-6e40-94e6-a3f5f4d24f35</xmpMM:InstanceID> -- <xmpMM:DocumentID>xmp.did:d24b6914-04d7-6e40-94e6-a3f5f4d24f35</xmpMM:DocumentID> -- <xmpMM:OriginalDocumentID>xmp.did:d24b6914-04d7-6e40-94e6-a3f5f4d24f35</xmpMM:OriginalDocumentID> -- <xmpMM:History> -- <rdf:Seq> -- <rdf:li rdf:parseType="Resource"> -- <stEvt:action>created</stEvt:action> -- <stEvt:instanceID>xmp.iid:d24b6914-04d7-6e40-94e6-a3f5f4d24f35</stEvt:instanceID> -- <stEvt:when>2018-07-25T21:37:27+08:00</stEvt:when> -- <stEvt:softwareAgent>Adobe Photoshop CC 2017 (Windows)</stEvt:softwareAgent> -- </rdf:li> -- </rdf:Seq> -- </xmpMM:History> -- <tiff:Orientation>1</tiff:Orientation> -- <tiff:XResolution>960000/10000</tiff:XResolution> -- <tiff:YResolution>960000/10000</tiff:YResolution> -- <tiff:ResolutionUnit>2</tiff:ResolutionUnit> -- <exif:ColorSpace>65535</exif:ColorSpace> -- <exif:PixelXDimension>48</exif:PixelXDimension> -- <exif:PixelYDimension>48</exif:PixelYDimension> -- </rdf:Description> -- </rdf:RDF> --</x:xmpmeta> -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --<?xpacket end="w"?>( --4p$v'! hwZ>;% B(c@+Ȇ5 nEb9.E@ #Žq.[ jVӎ I( --PFRqI)GJv{Y` fU{Y$լwr[p&} `NW `B>O'" -\ No newline at end of file -+ -+Rsy j7W*D7nO1Z$+":^XTm|Yj4._Dm f9 40D8 -+/M+ -\ No newline at end of file -diff --git a/dist/qt_themes/qdarkstyle/icons/48x48/folder.png b/dist/qt_themes/qdarkstyle/icons/48x48/folder.png -index 0f1e987d6aa24b1d2f26d40181ec05b62c5862da..11a76b5c1256ade016d4e22cf048656cb0788ad3 100644 ---- a/dist/qt_themes/qdarkstyle/icons/48x48/folder.png -+++ b/dist/qt_themes/qdarkstyle/icons/48x48/folder.png -@@ -1,3 +1,5 @@ - PNG - -- -\ No newline at end of file -+ -+ |ư´}Ȫ!}OY-" 2MvڇN WQ>-k(͆!Neqkׇ Lr`۰ 5\:%VC.xD ZJ&Bd$C=8?;);86|NaUy!Y H@?ryTltt|$#MW/]I -+46il -\ No newline at end of file -diff --git a/dist/qt_themes/qdarkstyle/icons/48x48/list-add.png b/dist/qt_themes/qdarkstyle/icons/48x48/list-add.png -index 16cc8b4f44d52009d4a3f4c9d46f5bb0e20babcf..8fbe78011661fb22d94921dfe4e4ac7a513c445b 100644 ---- a/dist/qt_themes/qdarkstyle/icons/48x48/list-add.png -+++ b/dist/qt_themes/qdarkstyle/icons/48x48/list-add.png -@@ -1,4 +1,6 @@ - PNG - -- --V+pm8oVy -\ No newline at end of file -+ -+ -+r*) -+D -\ No newline at end of file -diff --git a/dist/qt_themes/qdarkstyle/icons/48x48/no_avatar.png b/dist/qt_themes/qdarkstyle/icons/48x48/no_avatar.png -index 43e0dd267598453717004f7399e1713891663857..a7a48d33cabde1803124a13f321adc4bc317a0c6 100644 ---- a/dist/qt_themes/qdarkstyle/icons/48x48/no_avatar.png -+++ b/dist/qt_themes/qdarkstyle/icons/48x48/no_avatar.png -@@ -1,4 +1,6 @@ - PNG - -- --WMѢv {cG:US)Sn`K ux^i%f> RK3 %edd< rk7\\Y -\ No newline at end of file -+ -+BR"Hl' @D0L! 'Jr,^ldf63o3СĊ+cQ`'[z L -+IgZ=Q?.uxy˪G!_BClB3*O3V|_ uvz <(%VV%Y @xWl`J y$4!gEwu Y+v%!1-Bx ܋on|2` J ?R|- Yj -+.ig@ el ޥ[m3jj27*3bzB:sl}}N Jb!<*,l 5 -\ No newline at end of file -diff --git a/dist/qt_themes/qdarkstyle/icons/48x48/sd_card.png b/dist/qt_themes/qdarkstyle/icons/48x48/sd_card.png -index 0291c6542d05a40a350bb5bdbd99a15c01467161..87ae5186d95a9aaee49247dea04264aea58a2353 100644 ---- a/dist/qt_themes/qdarkstyle/icons/48x48/sd_card.png -+++ b/dist/qt_themes/qdarkstyle/icons/48x48/sd_card.png -@@ -1,7 +1,4 @@ - PNG - -- --xAM &quwv}ޝ]=6T J'X"[~(^Ě+ߖа˪I;ugly>634|<r, v@'[7!%=-8#m$Y~^˶yy9co63.r ZON#pT˿|.(댆k 8 6L$u֊*IFE3:z)' --17#d4SZ6! *&b%vx tYK --!WD*P*T 6@lRؤIb --&M*T 6@lj"WY5T%pE*m$na8efS0WUkb!}Ht_;5MIo$ݑt7'u -\ No newline at end of file -+ -+)_qCxiUcK(ԑs{^Pp(G@:QzA}& mRHm X=*F 0=r1x);:0QMB'q#ة v 6Ba Ӂ]8؇ kk 33XUmDPvM2`RNz氓4 @K}?x q*yw6M ;_ RU46il -\ No newline at end of file -diff --git a/dist/qt_themes/qdarkstyle/icons/48x48/star.png b/dist/qt_themes/qdarkstyle/icons/48x48/star.png -index 90d423a1d4c1e05ccec0a01fa34abca9fe99676d..546779e2a810e73169f65a79850aa07dffd70267 100644 ---- a/dist/qt_themes/qdarkstyle/icons/48x48/star.png -+++ b/dist/qt_themes/qdarkstyle/icons/48x48/star.png -@@ -1,4 +1,8 @@ - PNG - -- --pKeb*eLG+(5)xDpo?dFD㍫ǣg=N=Ҙ7kg\G| (JS0_c\|f%W! ^S +w@` -\ No newline at end of file -+ -+lKX!lx4?V<Ll -+~ -+H!,Ig]Ftj53'V v~9 r<mG7U&JTC ާp֨rS7ߣ&\[ૄz`}^)Ζ|+C`; -+nHq@F3 \S -+[N`'y&<r8jЇ>6 -\ No newline at end of file --- -2.36.0 - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6ac6af8eda6..d12c93b6013 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1609,12 +1609,14 @@ with pkgs; ### APPLICATIONS/EMULATORS/YUZU - yuzu-mainline = callPackage ../applications/emulators/yuzu { + yuzu-mainline = import ../applications/emulators/yuzu { branch = "mainline"; + inherit libsForQt5 fetchFromGitHub fetchurl; }; - yuzu-ea = callPackage ../applications/emulators/yuzu { + yuzu-ea = import ../applications/emulators/yuzu { branch = "early-access"; + inherit libsForQt5 fetchFromGitHub fetchurl; }; ### APPLICATIONS/EMULATORS/COMMANDERX16 |