Author: jghali Date: Thu Jun 9 14:57:34 2022 New Revision: 25103 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=25103 Log: #16802: Stop bundling gtk2 platform theme in AppImage, it causes problems with recent distros
There is still a potential bug left: linuxdeployqt may still include it if already installed: https://github.com/probonopd/linuxdeployqt/blob/master/tools/linuxdeployqt/shared.cpp#L1260 Modified: branches/Version15x/Scribus/AppImage-package/AppRun branches/Version15x/Scribus/AppImage-package/bundle.sh Modified: branches/Version15x/Scribus/AppImage-package/AppRun URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=25103&path=/branches/Version15x/Scribus/AppImage-package/AppRun ============================================================================== --- branches/Version15x/Scribus/AppImage-package/AppRun (original) +++ branches/Version15x/Scribus/AppImage-package/AppRun Thu Jun 9 14:57:34 2022 @@ -53,15 +53,6 @@ export TK_LIBRARY="${HERE}"/usr/share/tcltk/tk8.6:$TK_LIBRARY:$TCL_LIBRARY ############################################################################################ -# Make it look more native on Gtk+ based systems -############################################################################################ - -case "${XDG_CURRENT_DESKTOP}" in - *GNOME*|*gnome*) - export QT_QPA_PLATFORMTHEME=gtk2 -esac - -############################################################################################ # Run experimental bundle that bundles everything if a private ld-linux-x86-64.so.2 is there # This allows the bundle to run even on older systems than the one it was built on ############################################################################################ Modified: branches/Version15x/Scribus/AppImage-package/bundle.sh URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=25103&path=/branches/Version15x/Scribus/AppImage-package/bundle.sh ============================================================================== --- branches/Version15x/Scribus/AppImage-package/bundle.sh (original) +++ branches/Version15x/Scribus/AppImage-package/bundle.sh Thu Jun 9 14:57:34 2022 @@ -7,22 +7,6 @@ . /opt/qt*/bin/qt*-env.sh || true SCRIBUS_VERSION=nightly - -######################################################################## -# Build Platform Theme for Gtk+ -# https://askubuntu.com/a/910143 -# https://askubuntu.com/a/748186 -# Deploy with linuxdeployqt using -# -extra-plugins=platformthemes/libqgtk2.so,styles/libqgtk2style.so -# At runtime, export QT_QPA_PLATFORMTHEME=gtk2 (Xfce does this itself) -######################################################################## - -git clone http://code.qt.io/qt/qtstyleplugins.git -cd qtstyleplugins -qmake -make -j$(nproc) -make install -cd - ######################################################################## # Build Scribus and install to appdir/ @@ -124,5 +108,4 @@ ARCH=x86_64 VERSION=$SCRIBUS_VERSION ./linuxdeployqt-continuous-x86_64.AppImage --appimage-extract-and-run appdir/usr/share/applications/scribus.desktop \ -appimage -unsupported-bundle-everything \ -executable=appdir/usr/bin/python3.6 \ - -executable=appdir/usr/lib/python3.6/lib-dynload/_tkinter.cpython-36m-x86_64-linux-gnu.so \ - -extra-plugins=platformthemes/libqgtk2.so,styles/libqgtk2style.so + -executable=appdir/usr/lib/python3.6/lib-dynload/_tkinter.cpython-36m-x86_64-linux-gnu.so _______________________________________________ scribus-commit mailing list [email protected] http://lists.scribus.net/mailman/listinfo/scribus-commit
