Projects
home:Aloysius:branches:Multimedia
avidemux
Sign Up
Log In
Username
Password
We truncated the diff of some files because they were too big. If you want to see the full diff for every file,
click here
.
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 3
View file
avidemux.spec
Changed
@@ -34,6 +34,9 @@ Patch2: avidemux-cpp.patch Patch3: avidemux-stdlib.patch Patch4: avidemux-glibc-2.27.patch +# +Patch5: qt5.patch +# License: GPL-2.0 Group: Productivity/Multimedia/Video/Editors and Convertors ExclusiveArch: x86_64 armv7l @@ -149,6 +152,9 @@ %if 0%{?suse_version} > 1500 %patch4 -p0 %endif +# +%patch5 -p1 +# %build %if 0%{?sles_version}
View file
qt5.patch
Added
@@ -0,0 +1,870 @@ +diff -udpr avidemux_2.5.6.orig/avidemux/ADM_coreImage/include/DIA_flyDialog.h avidemux_2.5.6/avidemux/ADM_coreImage/include/DIA_flyDialog.h +--- avidemux_2.5.6.orig/avidemux/ADM_coreImage/include/DIA_flyDialog.h 2008-09-14 03:19:29.000000000 +0200 ++++ avidemux_2.5.6/avidemux/ADM_coreImage/include/DIA_flyDialog.h 2021-06-10 08:00:38.360001575 +0200 +@@ -31,8 +31,8 @@ + #include "DIA_uiTypes.h" + + #if ADM_UI_TYPE_BUILD == ADM_UI_QT4 +- #include <QtGui/QWidget> +- #include <QtGui/QDialog> ++ #include <QtWidgets/QWidget> ++ #include <QtWidgets/QDialog> + #endif + + #include "ADM_default.h" +diff -udpr avidemux_2.5.6.orig/avidemux/ADM_UIs/ADM_QT4/include/ADM_toolkitQt.h avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/include/ADM_toolkitQt.h +--- avidemux_2.5.6.orig/avidemux/ADM_UIs/ADM_QT4/include/ADM_toolkitQt.h 2010-01-24 21:07:35.000000000 +0100 ++++ avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/include/ADM_toolkitQt.h 2021-06-10 08:00:38.243986764 +0200 +@@ -1,6 +1,6 @@ + #ifndef QT_TOOLKIT_H + #define QT_TOOLKIT_H +-#include <QtGui/QWidget> ++#include <QtWidgets/QWidget> + + void UI_purge(void); + +diff -udpr avidemux_2.5.6.orig/avidemux/ADM_UIs/ADM_QT4/include/Q_mswin.h avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/include/Q_mswin.h +--- avidemux_2.5.6.orig/avidemux/ADM_UIs/ADM_QT4/include/Q_mswin.h 2011-10-11 23:52:22.000000000 +0200 ++++ avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/include/Q_mswin.h 2021-06-10 08:00:38.243986764 +0200 +@@ -1,7 +1,7 @@ + #ifndef Q_MSWIN_H + #define Q_MSWIN_H + +-#include <QtGui/QWidget> ++#include <QtWidgets/QWidget> + #include <shobjidl.h> + + class Q_mswin +diff -udpr avidemux_2.5.6.orig/avidemux/ADM_UIs/ADM_QT4/src/DIA_color.cpp avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/src/DIA_color.cpp +--- avidemux_2.5.6.orig/avidemux/ADM_UIs/ADM_QT4/src/DIA_color.cpp 2009-07-28 23:35:56.000000000 +0200 ++++ avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/src/DIA_color.cpp 2021-06-10 08:00:42.940586341 +0200 +@@ -1,4 +1,4 @@ +-#include <QtGui/QColorDialog> ++#include <QtWidgets/QColorDialog> + + #include "ADM_toolkitQt.h" + #include "ADM_default.h" +diff -udpr avidemux_2.5.6.orig/avidemux/ADM_UIs/ADM_QT4/src/FAC_aspectRatio.cpp avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/src/FAC_aspectRatio.cpp +--- avidemux_2.5.6.orig/avidemux/ADM_UIs/ADM_QT4/src/FAC_aspectRatio.cpp 2009-07-24 20:32:40.000000000 +0200 ++++ avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/src/FAC_aspectRatio.cpp 2021-06-10 08:00:42.928584808 +0200 +@@ -13,10 +13,10 @@ + * * + ***************************************************************************/ + +-#include <QtGui/QDialog> +-#include <QtGui/QSpinBox> +-#include <QtGui/QGridLayout> +-#include <QtGui/QLabel> ++#include <QtWidgets/QDialog> ++#include <QtWidgets/QSpinBox> ++#include <QtWidgets/QGridLayout> ++#include <QtWidgets/QLabel> + + #include "ADM_default.h" + #include "DIA_factory.h" +diff -udpr avidemux_2.5.6.orig/avidemux/ADM_UIs/ADM_QT4/src/FAC_bar.cpp avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/src/FAC_bar.cpp +--- avidemux_2.5.6.orig/avidemux/ADM_UIs/ADM_QT4/src/FAC_bar.cpp 2009-07-24 20:32:40.000000000 +0200 ++++ avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/src/FAC_bar.cpp 2021-06-10 08:00:42.928584808 +0200 +@@ -14,9 +14,9 @@ + ***************************************************************************/ + + +-#include <QtGui/QGridLayout> +-#include <QtGui/QLabel> +-#include <QtGui/QProgressBar> ++#include <QtWidgets/QGridLayout> ++#include <QtWidgets/QLabel> ++#include <QtWidgets/QProgressBar> + + #include "ADM_default.h" + #include "DIA_factory.h" +diff -udpr avidemux_2.5.6.orig/avidemux/ADM_UIs/ADM_QT4/src/FAC_float.cpp avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/src/FAC_float.cpp +--- avidemux_2.5.6.orig/avidemux/ADM_UIs/ADM_QT4/src/FAC_float.cpp 2009-07-24 20:32:40.000000000 +0200 ++++ avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/src/FAC_float.cpp 2021-06-10 08:00:42.956588383 +0200 +@@ -14,9 +14,9 @@ + ***************************************************************************/ + + +-#include <QtGui/QGridLayout> +-#include <QtGui/QLabel> +-#include <QtGui/QSpinBox> ++#include <QtWidgets/QGridLayout> ++#include <QtWidgets/QLabel> ++#include <QtWidgets/QSpinBox> + + #include "ADM_default.h" + #include "DIA_factory.h" +diff -udpr avidemux_2.5.6.orig/avidemux/ADM_UIs/ADM_QT4/src/FAC_frame.cpp avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/src/FAC_frame.cpp +--- avidemux_2.5.6.orig/avidemux/ADM_UIs/ADM_QT4/src/FAC_frame.cpp 2009-07-24 20:32:40.000000000 +0200 ++++ avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/src/FAC_frame.cpp 2021-06-10 08:00:42.928584808 +0200 +@@ -14,9 +14,9 @@ + ***************************************************************************/ + + +-#include <QtGui/QGridLayout> +-#include <QtGui/QLabel> +-#include <QtGui/QGroupBox> ++#include <QtWidgets/QGridLayout> ++#include <QtWidgets/QLabel> ++#include <QtWidgets/QGroupBox> + + #include "ADM_default.h" + #include "DIA_factory.h" +diff -udpr avidemux_2.5.6.orig/avidemux/ADM_UIs/ADM_QT4/src/FAC_integer.cpp avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/src/FAC_integer.cpp +--- avidemux_2.5.6.orig/avidemux/ADM_UIs/ADM_QT4/src/FAC_integer.cpp 2009-07-24 20:32:40.000000000 +0200 ++++ avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/src/FAC_integer.cpp 2021-06-10 08:00:42.960588894 +0200 +@@ -14,9 +14,9 @@ + ***************************************************************************/ + + +-#include <QtGui/QSpinBox> +-#include <QtGui/QGridLayout> +-#include <QtGui/QLabel> ++#include <QtWidgets/QSpinBox> ++#include <QtWidgets/QGridLayout> ++#include <QtWidgets/QLabel> + + #include "ADM_default.h" + #include "DIA_factory.h" +diff -udpr avidemux_2.5.6.orig/avidemux/ADM_UIs/ADM_QT4/src/FAC_matrix.cpp avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/src/FAC_matrix.cpp +--- avidemux_2.5.6.orig/avidemux/ADM_UIs/ADM_QT4/src/FAC_matrix.cpp 2009-07-24 20:32:40.000000000 +0200 ++++ avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/src/FAC_matrix.cpp 2021-06-10 08:00:42.948587361 +0200 +@@ -14,9 +14,9 @@ + ***************************************************************************/ + + +-#include <QtGui/QSpinBox> +-#include <QtGui/QGridLayout> +-#include <QtGui/QLabel> ++#include <QtWidgets/QSpinBox> ++#include <QtWidgets/QGridLayout> ++#include <QtWidgets/QLabel> + + #include "ADM_default.h" + #include "DIA_factory.h" +diff -udpr avidemux_2.5.6.orig/avidemux/ADM_UIs/ADM_QT4/src/FAC_readOnlyText.cpp avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/src/FAC_readOnlyText.cpp +--- avidemux_2.5.6.orig/avidemux/ADM_UIs/ADM_QT4/src/FAC_readOnlyText.cpp 2009-07-24 20:32:40.000000000 +0200 ++++ avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/src/FAC_readOnlyText.cpp 2021-06-10 08:00:42.928584808 +0200 +@@ -14,9 +14,9 @@ + ***************************************************************************/ + + +-#include <QtGui/QGridLayout> +-#include <QtGui/QLabel> +-#include <QtGui/QLineEdit> ++#include <QtWidgets/QGridLayout> ++#include <QtWidgets/QLabel> ++#include <QtWidgets/QLineEdit> + + #include "ADM_default.h" + #include "DIA_factory.h" +diff -udpr avidemux_2.5.6.orig/avidemux/ADM_UIs/ADM_QT4/src/T_bitrate.h avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/src/T_bitrate.h +--- avidemux_2.5.6.orig/avidemux/ADM_UIs/ADM_QT4/src/T_bitrate.h 2009-07-24 20:32:40.000000000 +0200 ++++ avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/src/T_bitrate.h 2021-06-10 08:00:38.243986764 +0200 +@@ -1,10 +1,10 @@ + #ifndef T_bitrate_h + #define T_bitrate_h + +-#include <QtGui/QComboBox> +-#include <QtGui/QGridLayout> +-#include <QtGui/QLabel> +-#include <QtGui/QSpinBox> ++#include <QtWidgets/QComboBox> ++#include <QtWidgets/QGridLayout> ++#include <QtWidgets/QLabel> ++#include <QtWidgets/QSpinBox> + + #include "ADM_inttype.h" + #include "ADM_encoder/ADM_vidEncode.hxx" +diff -udpr avidemux_2.5.6.orig/avidemux/ADM_UIs/ADM_QT4/src/T_button.h avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/src/T_button.h +--- avidemux_2.5.6.orig/avidemux/ADM_UIs/ADM_QT4/src/T_button.h 2008-05-24 21:16:19.000000000 +0200 ++++ avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/src/T_button.h 2021-06-10 08:00:38.243986764 +0200 +@@ -1,9 +1,9 @@ + #ifndef T_button_h + #define T_button_h + +-#include <QtGui/QGridLayout> +-#include <QtGui/QPushButton> +-#include <QtGui/QWidget> ++#include <QtWidgets/QGridLayout> ++#include <QtWidgets/QPushButton> ++#include <QtWidgets/QWidget> + + #include "ADM_inttype.h" + #include "DIA_factory.h" +diff -udpr avidemux_2.5.6.orig/avidemux/ADM_UIs/ADM_QT4/src/T_configMenu.cpp avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/src/T_configMenu.cpp +--- avidemux_2.5.6.orig/avidemux/ADM_UIs/ADM_QT4/src/T_configMenu.cpp 2011-04-23 21:56:47.000000000 +0200 ++++ avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/src/T_configMenu.cpp 2021-06-10 08:00:42.932585319 +0200 +@@ -13,8 +13,8 @@ Handle dialog factory element : Config M + * *
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.