From 4397746519db4c5232f1c982f424040a3347ba44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Fauconnier?= Date: Mon, 21 Jan 2019 09:31:15 +0100 Subject: [PATCH] fixes for Ubuntu 18.04 compilation --- release_scripts/linux/package.sh | 2 +- src/core/UBApplication.cpp | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/release_scripts/linux/package.sh b/release_scripts/linux/package.sh index 2143fe57..2455aa4c 100755 --- a/release_scripts/linux/package.sh +++ b/release_scripts/linux/package.sh @@ -348,7 +348,7 @@ for ((i=0;i<${#tab[@]};i++)); do echo -n ", " >> "$CONTROL_FILE" fi # conditional dependency when libavcodec-ffmpeg56 or libavcodec-ffmpeg-extra56 is found - depdVer=$(apt-cache show ${tab[$i]} | grep "Version: " | head -1 | awk '{ print $2 }' | sed -e 's/\([:. 0-9?]*\).*/\1/g' | sed -e 's/\.$//') + depdVer=$(apt-cache show ${tab[$i]} | grep "Version: " | head -1 | awk '{ print $2 }' | sed -e 's/\([~:. 0-9?]*\).*/\1/g' | sed -e 's/\.$//') if [ "${tab[$i]}" == "libavcodec-ffmpeg56" ] || [ "${tab[$i]}" == "libavcodec-ffmpeg-extra56" ]; then echo -n "libavcodec-ffmpeg56 (>= ${depdVer}) | libavcodec-ffmpeg-extra56 (>= ${depdVer})" >> "$CONTROL_FILE" else diff --git a/src/core/UBApplication.cpp b/src/core/UBApplication.cpp index 5b7fac51..194ea6e4 100644 --- a/src/core/UBApplication.cpp +++ b/src/core/UBApplication.cpp @@ -356,6 +356,8 @@ int UBApplication::exec(const QString& pFileToImport) else applicationController->showBoard(); + emit UBDrawingController::drawingController()->colorPaletteChanged(); + onScreenCountChanged(1); connect(desktop(), SIGNAL(screenCountChanged(int)), this, SLOT(onScreenCountChanged(int))); return QApplication::exec();