From 177d6a33b294f2df85ad472a565ef0096da9d6e6 Mon Sep 17 00:00:00 2001 From: Daniel Langbein Date: Mon, 31 Jan 2022 19:26:33 +0100 Subject: [PATCH] fix pacman.conf to build qt-installer-framework --- build-pkg/Dockerfile | 18 ++++++++++-------- pkg/qt-installer-framework | 2 +- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/build-pkg/Dockerfile b/build-pkg/Dockerfile index 837dc30..4586755 100644 --- a/build-pkg/Dockerfile +++ b/build-pkg/Dockerfile @@ -5,18 +5,20 @@ FROM archlinux:base-devel # 0. DisableDownloadTimeout -# 1. Enable parallel downloads +# 1. Fix [qt-installer-framework](https://aur.archlinux.org/pkgbase/qt-installer-framework/#comment-836177) +# 2. Enable parallel downloads # TODO: Wait until next baseimage update # && sed --in-place 's|^#ParallelDownloads\s*=.*$|ParallelDownloads = 4|' /etc/pacman.conf \ -# 2. Add de-p1st mirror -# 3. Add home_ungoogled_chromium_Arch (ungoogled-chromium) mirror; see also (4) -# 4. Add signing key of home_ungoogled_chromium_Arch mirror -# 5. Enable multilib repository; see also (8) +# 3. Add de-p1st mirror +# 4. Add home_ungoogled_chromium_Arch (ungoogled-chromium) mirror; see also (4) +# 5. Add signing key of home_ungoogled_chromium_Arch mirror +# 6. Enable multilib repository; see also (8) # -# 6. Update mirrors + packages -# 7. Install svn for makepkg to handle svn sources -# 8. Install 'multilib-devel' group, see https://wiki.archlinux.org/index.php/Makepkg#Build_32-bit_packages_on_a_64-bit_system +# 7. Update mirrors + packages +# 8. Install svn for makepkg to handle svn sources +# 9. Install 'multilib-devel' group, see https://wiki.archlinux.org/index.php/Makepkg#Build_32-bit_packages_on_a_64-bit_system RUN printf '\n[options]\nDisableDownloadTimeout\n' >> /etc/pacman.conf && \ + printf '\n[options]\nNoExtract = !usr/share/doc/qt/*\n' >> /etc/pacman.conf && \ printf '\n[de-p1st]\nSigLevel = Optional TrustAll\nServer = https://arch.p1st.de\n' >> /etc/pacman.conf && \ printf '\n[home_ungoogled_chromium_Arch]\nSigLevel = Required TrustAll\nServer = https://download.opensuse.org/repositories/home:/ungoogled_chromium/Arch/$arch\n' >> /etc/pacman.conf && \ curl -s 'https://download.opensuse.org/repositories/home:/ungoogled_chromium/Arch/x86_64/home_ungoogled_chromium_Arch.key' | pacman-key --add - && \ diff --git a/pkg/qt-installer-framework b/pkg/qt-installer-framework index ae194d6..7fdeec7 160000 --- a/pkg/qt-installer-framework +++ b/pkg/qt-installer-framework @@ -1 +1 @@ -Subproject commit ae194d65dc6c24f4808894c7759dbca226caff52 +Subproject commit 7fdeec78a8864222001fbb88c7764d0ced76220b