Revert misdirected attempts to fix #145 #149 #150 #151 #152 #161 #166

The actual issue must and will be fixed in linuxdeploy-plugin-qt.
AppImageCommunity · May 21, 2022 · d514dbf · d514dbf
1 parent e175a31
commit d514dbf
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 23 deletions.
diff --git a/ci/Dockerfile.i386 b/ci/Dockerfile.i386
@@ -10,14 +10,10 @@ RUN apt-get update && \
     apt-get install -y --no-install-recommends software-properties-common && \
     add-apt-repository -y ppa:beineri/opt-qt-5.15.2-"${DIST}" && \
     apt-get update && \
-    apt-get install -y sudo qt515base libgl1 libdrm-dev mesa-common-dev \
+    apt-get install -y qt515base qt515wayland libgl1 libdrm-dev mesa-common-dev \
         build-essential libssl-dev autoconf automake libtool \
         wget vim-common desktop-file-utils pkgconf \
         libglib2.0-dev libcairo2-dev librsvg2-dev libfuse-dev git libcurl4-openssl-dev argagg-dev libgcrypt20-dev && \
-    find / -name 'libqgtk*.so' -delete  ; \
-    find / -name 'Qt5Gui_QGtk3ThemePlugin.cmake' -delete  ; \
-    find / -name 'libqxdgdesktopportal.so' -delete ; \
-    find / -name 'Qt5Gui_QXdgDesktopPortalThemePlugin.cmake' -delete  ; \
     wget -qO- https://artifacts.assassinate-you.net/prebuilt-cmake/cmake-v3.22.1-ubuntu_xenial-$ARCH.tar.gz | tar xzv -C/usr --strip-components=1
 
 COPY libgcrypt.pc /usr/lib/i386-linux-gnu/pkgconfig/libgcrypt.pc

diff --git a/ci/Dockerfile.x86_64 b/ci/Dockerfile.x86_64
@@ -10,14 +10,10 @@ RUN apt-get update && \
     apt-get install -y --no-install-recommends software-properties-common && \
     add-apt-repository -y ppa:beineri/opt-qt-5.15.2-"${DIST}" && \
     apt-get update && \
-    apt-get install -y sudo qt515base libgl1 libdrm-dev mesa-common-dev \
+    apt-get install -y qt515base qt515wayland libgl1 libdrm-dev mesa-common-dev \
         build-essential libssl-dev autoconf automake libtool \
         wget vim-common desktop-file-utils pkgconf \
         libglib2.0-dev libcairo2-dev librsvg2-dev libfuse-dev git libcurl4-openssl-dev argagg-dev libgcrypt20-dev && \
-    find / -name 'libqgtk*.so' -delete  ; \
-    find / -name 'Qt5Gui_QGtk3ThemePlugin.cmake' -delete  ; \
-    find / -name 'libqxdgdesktopportal.so' -delete ; \
-    find / -name 'Qt5Gui_QXdgDesktopPortalThemePlugin.cmake' -delete  ; \
     wget -qO- https://artifacts.assassinate-you.net/prebuilt-cmake/cmake-v3.22.1-ubuntu_xenial-$ARCH.tar.gz | tar xzv -C/usr --strip-components=1
 
 COPY libgcrypt.pc /usr/lib/x86_64-linux-gnu/pkgconfig/libgcrypt.pc

diff --git a/ci/build-appimages.sh b/ci/build-appimages.sh
@@ -95,19 +95,6 @@ for app in appimageupdatetool AppImageUpdate; do
     # overwrite AppImage filename to get static filenames
     # see https://github.com/AppImage/AppImageUpdate/issues/89
     export OUTPUT="$app"-"$ARCH".AppImage
-
-    # Make absolutely sure there are no Gtk plugins,
-    # they created a LOT of hassle: #145 #149 #150 #151 #152 #161 #166
-    # https://github.com/AppImage/AppImageUpdate/issues/150#issuecomment-674013820
-    # https://github.com/AppImage/AppImageUpdate/pull/152/files
-    # Apparently linuxdeploy puts them in and there is no apparent way to disable this
-    # https://github.com/linuxdeploy/linuxdeploy-plugin-qt/issues/109
-    # All of the following fail because... Docker?
-    sudo apt-get remove qt5-gtk-platformtheme || true
-    sudo apt-get remove qt5-xdgdesktopportal-platformtheme || true
-    # Really desperate attempt now
-    sudo find / -name 'libqgtk*.so' -delete || true
-    sudo find / -name 'libqxdgdesktopportal.so' -delete || true
 
     # bundle application
     ./linuxdeploy-"$ARCH".AppImage -v0 --appdir "$app".AppDir --output appimage "${EXTRA_FLAGS[@]}" -d "$REPO_ROOT"/resources/"$app".desktop -i "$REPO_ROOT"/resources/appimage.png