fixes for Ubuntu 18.04 compilation

preferencesAboutTextFull
Clément Fauconnier 6 years ago
parent d932ae1a42
commit 4397746519
  1. 2
      release_scripts/linux/package.sh
  2. 2
      src/core/UBApplication.cpp

@ -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

@ -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();

Loading…
Cancel
Save