commit 9e18b0ebe44191a5d87174f6eb27fa3a286fb47b Author: Richard M. Shaw <hobbes1069(a)gmail.com&gt; Date: Mon Jul 25 09:51:34 2016 -0500 Add patch to fix qt gui issues, fixes BZ#4035. avidemux-2.6.12-qt.patch | 74 ++++++++++++++++++++++++++++++++++++++++++++++++ avidemux.spec | 11 +++++-- 2 files changed, 82 insertions(+), 3 deletions(-) --- diff --git a/avidemux-2.6.12-qt.patch b/avidemux-2.6.12-qt.patch new file mode 100644 index 0000000..51709cb --- /dev/null +++ b/avidemux-2.6.12-qt.patch @@ -0,0 +1,74 @@ +From 4cb0b19d7b78620d43d0a2ece821111246b81939 Mon Sep 17 00:00:00 2001 +From: mean <fixounet(a)free.fr&gt; +Date: Thu, 31 Mar 2016 21:50:09 +0200 +Subject: [PATCH] [UI] Cosmetic, use a define rather than hardcoded value + +--- + avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2.cpp | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +diff --git a/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2.cpp b/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2.cpp +index 70d8227..1b4d770 100644 +--- a/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2.cpp ++++ b/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2.cpp +@@ -43,7 +43,8 @@ + using namespace std; + + #define ADM_SLIDER_REFRESH_PERIOD 500 +- ++#define ADM_LARGE_SCALE 1000000000LL ++#define ADM_SCALE_INCREMENT (ADM_LARGE_SCALE/100LL) + + #if defined(USE_SDL) && ( !defined(_WIN32) && !defined(__APPLE__)) + #define SDL_ON_LINUX +@@ -328,9 +329,9 @@ MainWindow::MainWindow(const vector<IScriptEngine*>& scriptEngines) : _scriptEng + // Slider + slider=ui.horizontalSlider; + slider->setMinimum(0); +- slider->setMaximum(1000000000); ++ slider->setMaximum(ADM_LARGE_SCALE); + #if 1 +- slider->setTickInterval(10000000); ++ slider->setTickInterval(ADM_SCALE_INCREMENT); + slider->setTickPosition(QSlider::TicksBothSides); + #endif + connect( slider,SIGNAL(valueChanged(int)),this,SLOT(sliderValueChanged(int))); +@@ -1053,14 +1054,14 @@ double UI_readScale( void ) + double v; + if(!slider) v=0; + v= (double)(slider->value()); +- v/=10000000; ++ v/=ADM_SCALE_INCREMENT; + return v; + } + void UI_setScale( double val ) + { + if(_upd_in_progres) return; + _upd_in_progres++; +- slider->setValue( (int)(val * 10000000)); ++ slider->setValue( (int)(val * ADM_SCALE_INCREMENT)); + _upd_in_progres--; + } + +From 620b36c80a7a8baf2c08feee41ebfb0cdccefb0f Mon Sep 17 00:00:00 2001 +From: mean <fixounet(a)free.fr&gt; +Date: Fri, 1 Apr 2016 06:31:24 +0200 +Subject: [PATCH] [Qt] Reduce granularity of seek bar, it causes problems + +--- + avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2.cpp b/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2.cpp +index 1b4d770..7a2f574 100644 +--- a/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2.cpp ++++ b/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2.cpp +@@ -43,7 +43,7 @@ + using namespace std; + + #define ADM_SLIDER_REFRESH_PERIOD 500 +-#define ADM_LARGE_SCALE 1000000000LL ++#define ADM_LARGE_SCALE (10LL*1000LL) + #define ADM_SCALE_INCREMENT (ADM_LARGE_SCALE/100LL) + + #if defined(USE_SDL) && ( !defined(_WIN32) && !defined(__APPLE__)) diff --git a/avidemux.spec b/avidemux.spec index 6ee6869..7d48fa9 100644 --- a/avidemux.spec +++ b/avidemux.spec @@ -2,7 +2,7 @@ Name: avidemux Version: 2.6.12 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Graphical video editing and transcoding tool License: GPLv2+ @@ -15,6 +15,7 @@ Patch0: avidemux-2.6.10-bundled_libs.patch Patch1: avidemux-2.6.10-qt5_lrelease.patch Patch2: avidemux-2.6.12-narrowing.patch Patch3: avidemux-2.6.12-gcc6.patch +Patch4: avidemux-2.6.12-qt.patch # Don't try to build on arm ExcludeArch: %{arm} @@ -142,6 +143,7 @@ This package contains translation files for %{name}. %patch1 -p1 -b .bund_libs %patch2 -p1 %patch3 -p1 +%patch4 -p1 # Remove sources of bundled libraries. rm -rf avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_liba52 \ @@ -299,7 +301,7 @@ find %{buildroot}%{_libdir} -type f -name "*.so.*" -exec chmod 0755 {} \; /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : /usr/bin/update-desktop-database &> /dev/null || : -#%postun gtk +#postun gtk #if [ $1 -eq 0 ] ; then # /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null # /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : @@ -313,7 +315,7 @@ if [ $1 -eq 0 ] ; then fi /usr/bin/update-desktop-database &> /dev/null || : -#%posttrans gtk +#posttrans gtk #/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %posttrans qt @@ -370,6 +372,9 @@ fi %changelog +* Mon Jul 25 2016 Richard Shaw <hobbes1069(a)gmail.com&gt; - 2.6.12-4 +- Add patch to fix qt gui issues, fixes BZ#4035. + * Mon Jul 11 2016 Hans de Goede <j.w.r.degoede(a)gmail.com&gt; - 2.6.12-3 - Really fix building with GCC6, patch provided by Dan Horák <dan(a)danny.cz&gt;