diff --git a/resources/scripts/github-actions/build-linux-mac.sh b/resources/scripts/github-actions/build-linux-mac.sh index a852ce9ff..1d2b9a23d 100755 --- a/resources/scripts/github-actions/build-linux-mac.sh +++ b/resources/scripts/github-actions/build-linux-mac.sh @@ -73,6 +73,17 @@ if [ $is_linux = true ]; then chmod a+x linuxdeploy*.AppImage linuxdeploy*.sh + # Copy Gstreamer libs. + install -v -Dm755 "/usr/lib/x86_64-linux-gnu/gstreamer1.0/gstreamer-1.0/gst-plugin-scanner" "AppDir/usr/lib/gstreamer1.0/gstreamer-1.0/gst-plugin-scanner" + gst_executables="--executable=./AppDir/usr/lib/gstreamer1.0/gstreamer-1.0/gst-plugin-scanner" + gst_libs="" + + for plugin in /usr/lib/x86_64-linux-gnu/gstreamer-1.0/libgst*.so; do + basen=$(basename "$plugin") + install -v -Dm755 "$plugin" "./AppDir/usr/lib/gstreamer-1.0/$basen" + gst_libs="${gst_libs} --library=./AppDir/usr/lib/gstreamer-1.0/$basen" + done + if [[ "$webengine" == "ON" ]]; then # Copy some NSS3 files to prevent WebEngine crashes. cp /usr/lib/x86_64-linux-gnu/nss/* ./AppDir/usr/lib/ -v @@ -85,11 +96,8 @@ if [ $is_linux = true ]; then # Adjust library search paths. export LD_LIBRARY_PATH="$QTPATH/$QTVERSION/$QTOS/lib:$(pwd)/AppDir/usr/lib" - # GStreamer stuff. - export GSTREAMER_INCLUDE_BAD_PLUGINS="1" - # Create AppImage. - ./linuxdeploy-x86_64.AppImage --output "appimage" --plugin "qt" --plugin "gstreamer" --appdir "AppDir" + ./linuxdeploy-x86_64.AppImage --output "appimage" --plugin "qt" --plugin "gstreamer" --appdir "AppDir" $gst_executables $gst_libs # Rename AppImaage. set -- R*.AppImage diff --git a/src/librssguard/miscellaneous/application.cpp b/src/librssguard/miscellaneous/application.cpp index aabe61481..bd71d6d4d 100644 --- a/src/librssguard/miscellaneous/application.cpp +++ b/src/librssguard/miscellaneous/application.cpp @@ -129,7 +129,6 @@ Application::Application(const QString& id, int& argc, char** argv, const QStrin connect(m_nodejs, &NodeJs::packageError, this, &Application::onNodeJsPackageUpdateError); connect(m_nodejs, &NodeJs::packageInstalledUpdated, this, &Application::onNodeJsPackageInstalled); - /* #if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS) QString app_dir = QString::fromLocal8Bit(qgetenv("APPDIR")); @@ -146,7 +145,6 @@ Application::Application(const QString& id, int& argc, char** argv, const QStrin } } #endif - */ #if defined(USE_WEBENGINE) m_webFactory->urlIinterceptor()->load();