Skip to content

Commit 4c44201

Browse files
committed
make compression on by default for rcc
1 parent da9b008 commit 4c44201

File tree

2 files changed

+14
-1
lines changed

2 files changed

+14
-1
lines changed

Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ ENV XCB_MINIMUM_PACKAGES=' \
3030
RUN apt-get update && apt-get install -y \
3131
autoconf \
3232
autopoint \
33+
ca-certificates \
3334
curl \
3435
gettext \
3536
git \
@@ -48,7 +49,7 @@ RUN apt-get update && apt-get install -y \
4849
xz-utils \
4950
zlib1g-dev \
5051
$XCB_MINIMUM_PACKAGES && \
51-
echo 'deb https://archive.debian.org/debian-archive/debian bullseye-backports main' > /etc/apt/sources.list.d/backports.list && \
52+
echo 'deb https://archive.debian.org/debian bullseye-backports main' > /etc/apt/sources.list.d/backports.list && \
5253
apt-get update && apt-get install -y cmake/bullseye-backports
5354
RUN rm /usr/lib/x86_64-linux-gnu/libxcb-*.so
5455

qtbase.patch

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,15 @@ diff -u -r qtbase.old/cmake/3rdparty/extra-cmake-modules/find-modules/FindXCB.cm
1010
set(XCB_RENDERUTIL_component_deps XCB RENDER)
1111
set(XCB_XFIXES_component_deps XCB RENDER SHAPE)
1212
set(XCB_XVMC_component_deps XCB XV)
13+
diff -u -r qtbase.old/src/tools/rcc/rcc.cpp qtbase.new/src/tools/rcc/rcc.cpp
14+
--- qtbase.old/src/tools/rcc/rcc.cpp 2025-02-13 11:45:28.000000000 -0600
15+
+++ qtbase.new/src/tools/rcc/rcc.cpp 2025-11-14 00:12:48.076214506 -0600
16+
@@ -32,7 +32,7 @@
17+
CONSTANT_COMPRESSLEVEL_DEFAULT = -1,
18+
CONSTANT_ZSTDCOMPRESSLEVEL_CHECK = 1, // Zstd level to check if compressing is a good idea
19+
CONSTANT_ZSTDCOMPRESSLEVEL_STORE = 14, // Zstd level to actually store the data
20+
- CONSTANT_COMPRESSTHRESHOLD_DEFAULT = 70
21+
+ CONSTANT_COMPRESSTHRESHOLD_DEFAULT = 1
22+
};
23+
24+
void RCCResourceLibrary::write(const char *str, int len)

0 commit comments

Comments
 (0)