Skip to content

Commit 8712f10

Browse files
authored
Remove QtTools from KDE libraries' build scripts (#13625)
QtTools is no longer a required dependency for building KDE libraries (https://invent.kde.org/frameworks/extra-cmake-modules/-/merge_requests/534) and it's not needed for fuzzing builds.
1 parent 3683a86 commit 8712f10

File tree

6 files changed

+0
-20
lines changed

6 files changed

+0
-20
lines changed

projects/karchive/Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ RUN git clone --depth 1 https://github.com/openssl/openssl.git
2222
RUN wget https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz
2323
RUN git clone https://github.com/tukaani-project/xz.git
2424
RUN git clone --depth 1 --branch=dev git://code.qt.io/qt/qtbase.git
25-
RUN git clone --depth 1 --branch=dev git://code.qt.io/qt/qttools.git
2625
RUN git clone --depth 1 -b master https://invent.kde.org/frameworks/extra-cmake-modules.git
2726
RUN git clone --depth 1 -b master https://invent.kde.org/frameworks/karchive.git
2827
COPY build.sh karchive_fuzzer.cc karchive_fuzzer_common.h kcompressiondevice_fuzzer.cc dict $SRC/

projects/karchive/build.sh

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,6 @@ cd $SRC/qtbase
7676
cmake --build . --parallel $(nproc)
7777
cmake --install .
7878

79-
# Build qttools
80-
cd $SRC/qttools
81-
cmake . -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX=/usr
82-
cmake --build . --parallel $(nproc)
83-
cmake --install .
84-
8579
# Build karchive
8680
cd $SRC/karchive
8781
rm -rf poqm

projects/kcodecs/Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ FROM gcr.io/oss-fuzz-base/base-builder
1818
RUN apt-get update && apt-get install --yes cmake ninja-build
1919
RUN curl -L http://ftp.gnu.org/pub/gnu/gperf/gperf-3.1.tar.gz -O
2020
RUN git clone --depth 1 --branch=dev git://code.qt.io/qt/qtbase.git
21-
RUN git clone --depth 1 --branch=dev git://code.qt.io/qt/qttools.git
2221
RUN git clone --depth 1 -b master https://invent.kde.org/frameworks/extra-cmake-modules.git
2322
RUN git clone --depth 1 -b master https://invent.kde.org/frameworks/kcodecs.git
2423
RUN git clone --depth 1 https://gitlab.freedesktop.org/uchardet/uchardet.git

projects/kcodecs/build.sh

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,6 @@ cd $SRC/qtbase
3838
cmake --build . --parallel $(nproc)
3939
cmake --install .
4040

41-
cd $SRC/qttools
42-
cmake . -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX=/usr
43-
cmake --build . --parallel $(nproc)
44-
cmake --install .
45-
4641
cd $SRC/kcodecs
4742
rm -rf poqm
4843
cmake . -DBUILD_SHARED_LIBS=OFF -DBUILD_TESTING=OFF -DCMAKE_BUILD_TYPE=Debug

projects/kimageformats/Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ RUN git clone https://github.com/tukaani-project/xz.git
2323
RUN git clone --depth 1 --branch=RB-3.3 https://github.com/AcademySoftwareFoundation/openexr.git
2424
RUN git clone --depth 1 -b master https://invent.kde.org/frameworks/extra-cmake-modules.git
2525
RUN git clone --depth 1 --branch=dev git://code.qt.io/qt/qtbase.git
26-
RUN git clone --depth 1 --branch=dev git://code.qt.io/qt/qttools.git
2726
RUN git clone --depth 1 -b master https://invent.kde.org/frameworks/karchive.git
2827
RUN git clone --depth 1 -b master https://invent.kde.org/frameworks/kimageformats.git
2928
RUN git clone --depth 1 -b v3.12.1 https://aomedia.googlesource.com/aom

projects/kimageformats/build.sh

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,6 @@ cd $SRC/qtbase
5959
cmake --build . --parallel $(nproc)
6060
cmake --install .
6161

62-
# Build qttools
63-
cd $SRC/qttools
64-
cmake . -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX=/usr
65-
cmake --build . --parallel $(nproc)
66-
cmake --install .
67-
6862
# Build extra-cmake-modules
6963
cd $SRC/extra-cmake-modules
7064
cmake . -DBUILD_TESTING=OFF

0 commit comments

Comments
 (0)