[smplayer] Add patch to fix build in rawhide

Sérgio M. Basto sergiomb at rpmfusion.org
Tue Jul 19 02:41:54 CEST 2016


commit 790ecc63f695bcab32e8452a984cc536341c401a
Author: Sérgio M. Basto <sergio at serjux.com>
Date:   Tue Jul 19 01:41:21 2016 +0100

    Add patch to fix build in rawhide

 smplayer-16.7.0-removeqt43code.patch | 42 ++++++++++++++++++++++++++++++++++++
 smplayer.spec                        |  7 +++++-
 2 files changed, 48 insertions(+), 1 deletion(-)
---
diff --git a/smplayer-16.7.0-removeqt43code.patch b/smplayer-16.7.0-removeqt43code.patch
new file mode 100644
index 0000000..2a91115
--- /dev/null
+++ b/smplayer-16.7.0-removeqt43code.patch
@@ -0,0 +1,42 @@
+diff -rup smplayer-16.7.0.orig/src/playlistdock.cpp smplayer-16.7.0/src/playlistdock.cpp
+--- smplayer-16.7.0.orig/src/playlistdock.cpp	2016-01-04 23:34:33.000000000 +0000
++++ smplayer-16.7.0/src/playlistdock.cpp	2016-07-19 01:27:37.913731244 +0100
+@@ -35,18 +35,6 @@ void PlaylistDock::closeEvent( QCloseEve
+ 	e->accept();
+ }
+ 
+-#if QT_VERSION < 0x040300
+-void PlaylistDock::showEvent( QShowEvent * /* event */ ) {
+-	qDebug("PlaylistDock::showEvent");
+-	emit visibilityChanged(true);
+-}
+-
+-void PlaylistDock::hideEvent( QHideEvent * /* event */ ) {
+-	qDebug("PlaylistDock::hideEvent");
+-	emit visibilityChanged(false);
+-}
+-#endif
+-
+ 
+ #include "moc_playlistdock.cpp"
+ 
+diff -rup smplayer-16.7.0.orig/src/playlistdock.h smplayer-16.7.0/src/playlistdock.h
+--- smplayer-16.7.0.orig/src/playlistdock.h	2016-01-15 01:29:42.000000000 +0000
++++ smplayer-16.7.0/src/playlistdock.h	2016-07-19 01:27:14.719484221 +0100
+@@ -32,16 +32,9 @@ public:
+ 
+ signals:
+ 	void closed();
+-#if QT_VERSION < 0x040300
+-	void visibilityChanged(bool visible);
+-#endif
+ 
+ protected:
+ 	virtual void closeEvent( QCloseEvent * e );
+-#if QT_VERSION < 0x040300
+-	virtual void showEvent ( QShowEvent * event );
+-	virtual void hideEvent ( QHideEvent * event );
+-#endif
+ };
+ 
+ #endif
diff --git a/smplayer.spec b/smplayer.spec
index cabf332..21bc67c 100644
--- a/smplayer.spec
+++ b/smplayer.spec
@@ -3,7 +3,7 @@ Version:        16.7.0
 %global smtube_ver 16.7.2 
 %global smplayer_themes_ver 16.6.0
 %global smplayer_skins_ver 15.2.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A graphical frontend for mplayer
 
 Group:          Applications/Multimedia
@@ -18,6 +18,7 @@ Source4:        http://downloads.sourceforge.net/smplayer/smplayer-skins-%{smpla
 Patch0:         smplayer-0.8.3-desktop-files.patch
 Patch2:         smplayer-14.9.0.6966-system-qtsingleapplication.patch
 Patch3:         smtube-16.3.0-system-qtsingleapplication.patch
+Patch4:         smplayer-16.7.0-removeqt43code.patch
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  qt5-qtbase-devel
@@ -75,6 +76,7 @@ pushd smtube-%{smtube_ver}
 # correction for wrong-file-end-of-line-encoding on smtube
 %{__sed} -i 's/\r//' *.txt
 popd
+%patch4 -p1 -b .qt43
 
 # correction for wrong-file-end-of-line-encoding
 %{__sed} -i 's/\r//' *.txt
@@ -171,6 +173,9 @@ update-desktop-database &> /dev/null || :
 %{_datadir}/smplayer/themes/
 
 %changelog
+* Tue Jul 19 2016 Sérgio Basto <sergio at serjux.com> - 16.7.0-2
+- Add patch to fix build in rawhide
+
 * Sun Jul 17 2016 Sérgio Basto <sergio at serjux.com> - 16.7.0-1
 - Update smplayer to 16.7.0 and smtube to 16.7.2
 - Install smplayer-themes and smplayer-skins


More information about the rpmfusion-commits mailing list