Skip to content

DesignCraft: An open-source page and layout design editor written by scratch in pure Rust

Merge upstream main and preserve Linux GNOME decorations

Danielc2b2d260a5a4
diff --cc NOTICE
index 0a875190e,71abff776..327c6e0cc
--- a/NOTICE
+++ b/NOTICE
@@@ -91,33 -90,27 +90,58 @@@ licensed (MIT/Apache-2.0/BSD/ISC/Zlib)
No Adobe icons, images or artwork are included.
+ PDF backend source
+
+ The patched hayro 0.7.1, hayro-interpret 0.7.0, hayro-syntax 0.7.2, hayro-jbig2 0.3.0 and
+ hayro-cmap 0.1.0 are fetched from https://github.com/storytold/craft-libs at revision
+ 9f75d3dc19b4b514c4f3d4847ed1ec1b0e86b4ef. The first four source snapshots were transferred
+ from https://github.com/storytold/pdfcraft at revision
+ 7437bde378f43856eada40af25b983812e615e8a and hayro-cmap at revision
+ a2ec27b4775f53c40cad3456936d9406611e3a8d, then patched in craft-libs. Their upstream project is
+ https://github.com/LaurenzV/hayro, licensed MIT OR Apache-2.0. The snapshot retains each
+ crate's upstream licence files. The patch ledger is at
+ https://github.com/storytold/craft-libs/blob/9f75d3dc19b4b514c4f3d4847ed1ec1b0e86b4ef/vendor/README.craft-reader.md.
+ Per-crate vendor/SOURCE.json files record transferred and local source hashes; asset
+ origins and unchanged per-file hashes are recorded separately in ASSETS.md.
+
+ Assets already bundled through Hayro's default features retain their licences:
+ - Foxit standard-14 substitutes: Copyright 2014 PDFium Authors. All rights reserved.
+ Original code copyright 2014 Foxit Software Inc. BSD-3-Clause; see
+ licenses/pdf-backend/hayro-interpret/assets/LICENSE_FOXIT.
+ - CGATS001Compat-v2-micro.icc: CC0-1.0, Clinton Ingram; see
+ licenses/pdf-backend/hayro-interpret/assets/CGATS_LICENSE.txt.
+ - Predefined CMaps: Copyright 1990-2023 Adobe. All rights reserved. BSD-3-Clause,
+ non-visual character-mapping data; see licenses/pdf-backend/hayro-cmap/LICENSE.txt.
+ Adobe and contributor names do not endorse or promote this product.
+ Per-file hashes and sources are recorded in ASSETS.md.
++
+Linux Wayland window decorations
+-------------------------------
+sctk-adwaita 0.10.1 (https://github.com/PolyMeilex/sctk-adwaita,
+commit d5f343c45c04d4a026db57f76760819b7325db00) is used by winit on Linux
+for vector window controls. Its title-font features are disabled: no Cantarell
+font is embedded by this dependency and no font file is added to this repo.
+
+sctk-adwaita's MIT licence:
+
+MIT License
+
+Copyright (c) 2022 Bartłomiej Maryńczak
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --cc packaging/env.sh
index 60ae3b0cb,55ff3943c..833d69480
--- a/packaging/env.sh
+++ b/packaging/env.sh
@@@ -47,10 -49,11 +49,11 @@@ warn()
# Copy licence and readme files that exist into a package directory.
copy_docs() {
local dest="$1" f
- for f in README.md LICENSE LICENSE-MIT LICENSE-APACHE COPYRIGHT; do
+ for f in README.md LICENSE LICENSE-MIT LICENSE-APACHE COPYRIGHT NOTICE; do
- if [ -f "$ROOT/$f" ]; then cp "$ROOT/$f" "$dest/"; fi
+ if [[ -f "$ROOT/$f" ]]; then cp "$ROOT/$f" "$dest/"; fi
done
copy_font_licences "$dest"
+ return
}
# Builds made with craft-fonts (CRAFT_FONTS_DIR, set by the release workflow) embed its fonts, so
diff --cc packaging/linux/package.sh
index 43cf7dae3,c4d843eca..f8d33e8d8
mode 100755,100755..100644
--- a/packaging/linux/package.sh
+++ b/packaging/linux/package.sh