From f9d2f1b79cf2b6dfb0c2d985824bd6b2ccd5fa6e Mon Sep 17 00:00:00 2001 From: Cyano Hao Date: Tue, 11 Jun 2024 07:55:19 +0800 Subject: [PATCH 1/2] update appimage build environment (#453) --- BUILD.md | 2 +- BUILD_cn.md | 2 +- packages/debian-static/builddeb.sh | 2 +- packages/debian-static/control.in | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/BUILD.md b/BUILD.md index 0a636b01..7f3b155b 100644 --- a/BUILD.md +++ b/BUILD.md @@ -195,7 +195,7 @@ The package will be placed in `dist/`. ## Linux AppImage ```bash -podman run --rm -v $PWD:/mnt -w /mnt quay.io/redpanda-cpp/appimage-builder-x86_64:20240304.0 ./packages/appimage/01-in-docker.sh +podman run --rm -v $PWD:/mnt -w /mnt quay.io/redpanda-cpp/appimage-builder-x86_64:20240610.0 ./packages/appimage/01-in-docker.sh ``` Dockerfiles are available in [redpanda-cpp/appimage-builder](https://github.com/redpanda-cpp/appimage-builder). Available architectures: `x86_64`, `aarch64`, `riscv64`. diff --git a/BUILD_cn.md b/BUILD_cn.md index 8897bb01..7f74e53e 100644 --- a/BUILD_cn.md +++ b/BUILD_cn.md @@ -195,7 +195,7 @@ podman run --rm -v $PWD:/mnt -w /mnt docker.io/archlinux:latest ./packages/archl ## Linux AppImage ```bash -podman run --rm -v $PWD:/mnt -w /mnt quay.io/redpanda-cpp/appimage-builder-x86_64:20240304.0 ./packages/appimage/01-in-docker.sh +podman run --rm -v $PWD:/mnt -w /mnt quay.io/redpanda-cpp/appimage-builder-x86_64:20240610.0 ./packages/appimage/01-in-docker.sh ``` Dockerfile 位于 [redpanda-cpp/appimage-builder](https://github.com/redpanda-cpp/appimage-builder)。可用架构：`x86_64`、`aarch64`、`riscv64`。 diff --git a/packages/debian-static/builddeb.sh b/packages/debian-static/builddeb.sh index 280df3e7..6b011c46 100755 --- a/packages/debian-static/builddeb.sh +++ b/packages/debian-static/builddeb.sh @@ -13,7 +13,7 @@ DEB_FILE="redpanda-cpp-bin_${VERSION}_amd64.deb" TMP_FOLDER="$(mktemp -d)" -podman run -it --rm -v "$PWD:/mnt" -w /mnt -v "$TMP_FOLDER:/out" quay.io/redpanda-cpp/appimage-builder-x86_64:20240304.0 packages/debian-static/01-in-docker.sh +podman run -it --rm -v "$PWD:/mnt" -w /mnt -v "$TMP_FOLDER:/out" quay.io/redpanda-cpp/appimage-builder-x86_64:20240610.0 packages/debian-static/01-in-docker.sh mkdir -p dist mkdir -m 755 -p "$TMP_FOLDER/DEBIAN" diff --git a/packages/debian-static/control.in b/packages/debian-static/control.in index a6734acf..e5ce5781 100644 --- a/packages/debian-static/control.in +++ b/packages/debian-static/control.in @@ -8,7 +8,7 @@ Version: __VERSION__ Architecture: amd64 Depends: gcc, g++, make, gdb, gdbserver, astyle, libc6 (>= 2.17), libstdc++6 (>= 4.8), - libdbus-1-3, libfontconfig1, libfreetype6, libwayland-client0, libwayland-cursor0, libwayland-server0, libx11-6, libx11-xcb1, libxcb1, libxcb-icccm4, libxcb-image0, libxcb-keysyms1, libxcb-randr0, libxcb-render-util0, libxcb-render0, libxcb-shape0, libxcb-shm0, libxcb-sync1, libxcb-xfixes0, libxcb-xinerama0, libxcb-xkb1, libxcb1, libxext6, libxkbcommon-x11-0, libxkbcommon0, libzstd1 + libdbus-1-3, libfontconfig1, libfreetype6, libwayland-client0, libwayland-cursor0, libx11-6, libx11-xcb1, libxcb1, libxcb-icccm4, libxcb-image0, libxcb-keysyms1, libxcb-randr0, libxcb-render-util0, libxcb-render0, libxcb-shape0, libxcb-shm0, libxcb-sync1, libxcb-xfixes0, libxcb-xinerama0, libxcb-xkb1, libxcb1, libxext6, libxkbcommon-x11-0, libxkbcommon0 Recommends: qterminal | konsole | gnome-terminal | terminator | lxterminal | mate-terminal | terminology | xfce4-terminal | alacritty | cool-retro-term | kitty | sakura | termit | tilix Suggests: clang Description: A lightweight but powerful C/C++ IDE, built upon static Qt 5.15 From 1afde50b1957fb6951590d98aab54eef352c4e21 Mon Sep 17 00:00:00 2001 From: Ltabsyy <111294086+Ltabsyy@users.noreply.github.com> Date: Tue, 11 Jun 2024 07:55:49 +0800 Subject: [PATCH 2/2] Update MoLo series color schemes (#454) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MoLo CBLight 尝试低饱和特殊数和活动断点内元素区分 MoLo Mia 优化空白字符在断点内的显示 MoLo CodeBlack 统一使用新的空白字符、断点、活动断点 --- .../resources/colorschemes/MoLo_CBLight.scheme | 13 ++++++------- .../resources/colorschemes/MoLo_CodeBlack.scheme | 7 +++---- RedPandaIDE/resources/colorschemes/MoLo_Mia.scheme | 4 ++-- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/RedPandaIDE/resources/colorschemes/MoLo_CBLight.scheme b/RedPandaIDE/resources/colorschemes/MoLo_CBLight.scheme index 0b6c2a85..2927d1d2 100644 --- a/RedPandaIDE/resources/colorschemes/MoLo_CBLight.scheme +++ b/RedPandaIDE/resources/colorschemes/MoLo_CBLight.scheme @@ -1,8 +1,7 @@ { "Active Breakpoint": { - "background": "#ff00376f", + "background": "#500055ff", "bold": false, - "foreground": "#ffffffce", "italic": false, "strikeout": false, "underlined": false @@ -22,7 +21,7 @@ "underlined": false }, "Breakpoint": { - "background": "#ff002535", + "background": "#2200aaff", "bold": false, "italic": false, "strikeout": false, @@ -80,7 +79,7 @@ }, "Float": { "bold": false, - "foreground": "#ffffaa00", + "foreground": "#ffffc655", "italic": false, "strikeout": false, "underlined": false @@ -123,7 +122,7 @@ }, "Hexadecimal": { "bold": false, - "foreground": "#ffffaa00", + "foreground": "#ffffc655", "italic": false, "strikeout": false, "underlined": false @@ -165,7 +164,7 @@ }, "Octal": { "bold": false, - "foreground": "#ffffaa00", + "foreground": "#ffffc655", "italic": false, "strikeout": false, "underlined": false @@ -201,7 +200,7 @@ }, "Space": { "bold": false, - "foreground": "#ff505050", + "foreground": "#8e838383", "italic": false, "strikeout": false, "underlined": false diff --git a/RedPandaIDE/resources/colorschemes/MoLo_CodeBlack.scheme b/RedPandaIDE/resources/colorschemes/MoLo_CodeBlack.scheme index 3882bab3..dc0a20f7 100644 --- a/RedPandaIDE/resources/colorschemes/MoLo_CodeBlack.scheme +++ b/RedPandaIDE/resources/colorschemes/MoLo_CodeBlack.scheme @@ -1,8 +1,7 @@ { "Active Breakpoint": { - "background": "#ff00376f", + "background": "#500055ff", "bold": false, - "foreground": "#ffffffce", "italic": false, "strikeout": false, "underlined": false @@ -22,7 +21,7 @@ "underlined": false }, "Breakpoint": { - "background": "#ff002535", + "background": "#2200aaff", "bold": false, "italic": false, "strikeout": false, @@ -201,7 +200,7 @@ }, "Space": { "bold": false, - "foreground": "#ff505050", + "foreground": "#8e838383", "italic": false, "strikeout": false, "underlined": false diff --git a/RedPandaIDE/resources/colorschemes/MoLo_Mia.scheme b/RedPandaIDE/resources/colorschemes/MoLo_Mia.scheme index 2001d491..36f7360f 100644 --- a/RedPandaIDE/resources/colorschemes/MoLo_Mia.scheme +++ b/RedPandaIDE/resources/colorschemes/MoLo_Mia.scheme @@ -107,7 +107,7 @@ "underlined": false }, "Gutter": { - "background": "#20404040", + "background": "#1c404040", "bold": false, "foreground": "#ff969696", "italic": false, @@ -201,7 +201,7 @@ }, "Space": { "bold": false, - "foreground": "#ffbababa", + "foreground": "#8e838383", "italic": false, "strikeout": false, "underlined": false