Request 1030 (accepted)

This request supersedes: request 1029 (Show diff)

Overview

Request 1030 (accepted)

- Added smplayer-4.13.0-mousewheel_seeking.patch vs. bnc#879726.
- Fixed up license headers of spec files.
- Synced spec file with KDE:Extra.
PS Sorry for the previous one.

Created by dap almost 10 years ago
In state accepted
Supersedes 1029

Submit smplayer

Submit package home:dap / smplayer to package Essentials / smplayer

smplayer.changes Changed

smplayer.spec Changed

@@ -1,6 +1,8 @@
-# vim: set sw=4 ts=4 et:
-
+#
+# spec file for package smplayer
+#
 # Copyright (c) 2012 Pascal Bleser <pascal.bleser@opensuse.org>
+# Copyright (c) 2014 Packman team: http://packman.links2linux.org/
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,6 +14,8 @@
 # published by the Open Source Initiative.
 
 # Please submit bugfixes or comments via https://bugs.links2linux.org
+#
+
 
 Name:           smplayer
 Version:        14.3.0
@@ -20,7 +24,6 @@
 Summary:        Complete Frontend for MPlayer
 Url:            http://smplayer.sourceforge.net/
 Group:          Productivity/Multimedia/Video/Players
-
 Source:         http://prdownloads.sourceforge.net/smplayer/smplayer-%{version}.tar.bz2
 Patch1:         smplayer-makeflags.patch
 Patch2:         smplayer-disable-debug.patch
@@ -28,11 +31,18 @@
 Patch8:         smplayer-simple-resize.patch
 # FIX-UPSTREAM to play network shared video correctly: #PM-48
 Patch9:         smplayer-add_kde_protocols_to_desktop_file.patch
+# TODO: Please remove Patch10 if version changes.
+# https://bugzilla.novell.com/show_bug.cgi?id=879726
+# https://www.assembla.com/code/smplayer/subversion/commit/6208
+# https://www.assembla.com/code/smplayer/subversion/commit/6209
+# https://www.assembla.com/code/smplayer/subversion/commit/6212
+# FIX-UPSTREAM to prevent mouse seeking issue:
+Patch10:        smplayer-4.13.0-mousewheel_seeking.patch
 
 BuildRequires:  gcc-c++
 BuildRequires:  hicolor-icon-theme
 BuildRequires:  libkde4-devel
-BuildRequires:  libqt4-devel >= 4.7
+BuildRequires:  libqt4-devel >= 4.2.0
 BuildRequires:  libstdc++-devel
 BuildRequires:  make
 BuildRequires:  update-desktop-files
@@ -59,6 +69,7 @@
 %patch2
 %patch4
 %patch9
+%patch10
 %__perl -n -e 'print $1,"\n" if /^\+{3}\s+(.+?)\s+/' < "%{PATCH4}" | while read f; do
 %if 0%{?suse_version} >= 1210
     %__sed -i 's/@@DEFAULT@@/pulse/g' "$f"
@@ -66,12 +77,8 @@
     %__sed -i 's/@@DEFAULT@@/alsa/g' "$f"
 %endif
 done
-#'
 
 pushd src
-#% patch5
-#% patch6
-#% patch7
 %patch8
 popd
 
@@ -149,9 +156,9 @@
 %{_bindir}/smplayer
 %{_datadir}/applications/smplayer.desktop
 %{_datadir}/applications/smplayer_enqueue.desktop
+%dir %{_datadir}/icons/*/*
+%dir %{_datadir}/icons/*/*/apps
 %{_datadir}/icons/*/*/apps/smplayer.*
-%dir %{_datadir}/icons/hicolor/512x512
-%dir %{_datadir}/icons/hicolor/512x512/apps
 %dir %{_datadir}/smplayer
 %config %{_datadir}/smplayer/input.conf
 %dir %{_datadir}/smplayer/shortcuts

smplayer-4.13.0-mousewheel_seeking.patch Added

@@ -0,0 +1,209 @@
+Index: src/timeslider.cpp
+===================================================================
+--- src/timeslider.cpp	(revision 6207)
++++ src/timeslider.cpp	(revision 6209)
+@@ -138,10 +138,20 @@
+ 	return position;
+ }
+ 
+-/*
+-void TimeSlider::wheelEvent( QWheelEvent * e ) {
+-	e->ignore();
++void TimeSlider::wheelEvent(QWheelEvent * e) {
++	//e->ignore();
++
++	qDebug("TimeSlider::wheelEvent: delta: %d", e->delta());
++	e->accept();
++
++	if (e->orientation() == Qt::Vertical) {
++	    if (e->delta() >= 0)
++	        emit wheelUp();
++	    else
++	        emit wheelDown();
++	} else {
++		qDebug("Timeslider::wheelEvent: horizontal event received, doing nothing");
++	}
+ }
+-*/
+ 
+ #include "moc_timeslider.cpp"
+Index: src/skingui/panelseeker.cpp
+===================================================================
+--- src/skingui/panelseeker.cpp	(revision 6207)
++++ src/skingui/panelseeker.cpp	(revision 6209)
+@@ -353,4 +353,18 @@
+ 
+ }
+ 
++void PanelTimeSeeker::wheelEvent(QWheelEvent *e) {
++	qDebug("PanelTimeSeeker::wheelEvent: delta: %d", e->delta());
++	e->accept();
++
++	if (e->orientation() == Qt::Vertical) {
++		if (e->delta() >= 0)
++			emit wheelUp();
++		else
++			emit wheelDown();
++	} else {
++		qDebug("PanelTimeSeeker::wheelEvent: horizontal event received, doing nothing");
++	}
++}
++
+ #include "moc_panelseeker.cpp"
+Index: src/skingui/panelseeker.h
+===================================================================
+--- src/skingui/panelseeker.h	(revision 6207)
++++ src/skingui/panelseeker.h	(revision 6209)
+@@ -128,4 +128,16 @@
+ };
+ Q_DECLARE_OPERATORS_FOR_FLAGS(PanelSeeker::States)
+ 
++
++class PanelTimeSeeker : public PanelSeeker {
++	Q_OBJECT
++
++signals:
++	void wheelUp();
++	void wheelDown();
++
++protected:
++    void wheelEvent(QWheelEvent *e);
++};
++
+ #endif // PANELSEEKER_H
+Index: src/skingui/mediapanel.h
+===================================================================
+--- src/skingui/mediapanel.h	(revision 6207)
++++ src/skingui/mediapanel.h	(revision 6209)
+@@ -103,7 +103,7 @@
+     QPixmap rightBackground;
+     ScrollingLabel* mediaLabel;
+     QLabel *resolutionLabel;
+-    PanelSeeker* seeker;
++    PanelTimeSeeker* seeker;
+     MyButton* repeatButton;
+     MyButton* shuffleButton;
+     QLabel* elapsedLabel;
+@@ -123,6 +123,8 @@
+ 
+ signals:
+ 	void seekerChanged(int);
++	void seekerWheelUp();
++	void seekerWheelDown();
+ 
+ public:
+     friend class IconSetter;
+Index: src/skingui/mediabarpanel.cpp
+===================================================================
+--- src/skingui/mediabarpanel.cpp	(revision 6207)
++++ src/skingui/mediabarpanel.cpp	(revision 6209)
+@@ -101,6 +101,8 @@
+     connect(core, SIGNAL(showTime(double)), this, SLOT(gotCurrentTime(double)));
+     connect(core, SIGNAL(mediaInfoChanged()), this, SLOT(updateMediaInfo()));
+     connect(core, SIGNAL(buffering()), this, SLOT(setBuffering()));
++	connect(mediaPanel, SIGNAL(seekerWheelUp()), core, SLOT(wheelUp()));
++	connect(mediaPanel, SIGNAL(seekerWheelDown()), core, SLOT(wheelDown()));
+ }
+ 
+ void MediaBarPanel::setDuration()
+Index: src/timeslider.h
+===================================================================
+--- src/timeslider.h	(revision 6207)
++++ src/timeslider.h	(revision 6209)
+@@ -45,6 +45,8 @@
+ 	//! Emitted with a few ms of delay
+ 	void delayedDraggingPos(int);
+ #endif
++	void wheelUp();
++	void wheelDown();
+ 
+ protected slots:
+ 	void stopUpdate();
+@@ -56,7 +58,7 @@
+ 	void sendDelayedPos();
+ #endif
+ 
+-	/* virtual void wheelEvent( QWheelEvent * e ); */
++	virtual void wheelEvent(QWheelEvent * e);
+ 
+ private:
+ 	bool dont_update;
+Index: src/widgetactions.h
+===================================================================
+--- src/widgetactions.h	(revision 6207)
++++ src/widgetactions.h	(revision 6209)
+@@ -78,6 +78,8 @@
+ #if ENABLE_DELAYED_DRAGGING
+ 	void delayedDraggingPos(int);
+ #endif
++	void wheelUp();
++	void wheelDown();
+ 
+ protected:
+ 	virtual QWidget * createWidget ( QWidget * parent );
+Index: src/widgetactions.cpp
+===================================================================
+--- src/widgetactions.cpp	(revision 6207)
++++ src/widgetactions.cpp	(revision 6209)
+@@ -117,6 +117,9 @@
+ 	         this, SIGNAL(delayedDraggingPos(int)) );
+ #endif
+ 
++	connect(t, SIGNAL(wheelUp()), this, SIGNAL(wheelUp()));
++	connect(t, SIGNAL(wheelDown()), this, SIGNAL(wheelDown()));
++
+ 	return t;
+ }
+ 
+Index: src/baseguiplus.cpp
+===================================================================
+--- src/baseguiplus.cpp	(revision 6207)
++++ src/baseguiplus.cpp	(revision 6209)
+@@ -606,6 +606,10 @@
+ 	connect( timeslider_action, SIGNAL( draggingPos(int) ), 
+              this, SLOT(goToPosOnDragging(int)) );
+ #endif
++
++	connect(timeslider_action, SIGNAL(wheelUp()), core, SLOT(wheelUp()));
++	connect(timeslider_action, SIGNAL(wheelDown()), core, SLOT(wheelDown()));
++
+ 	return timeslider_action;
+ }
+ 
+Index: src/skingui/mediapanel.cpp
+===================================================================
+--- src/skingui/mediapanel.cpp	(revision 6207)
++++ src/skingui/mediapanel.cpp	(revision 6209)
+@@ -54,7 +54,7 @@
+ 	resolutionLabel->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred);
+ 	repeatButton = new MyButton(this);
+ 	shuffleButton = new MyButton(this);
+-	seeker = new PanelSeeker;
++	seeker = new PanelTimeSeeker;
+ 	seeker->setObjectName("panel-seeker");
+ 	seeker->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Ignored);
+ #ifdef SEEKBAR_RESOLUTION
+@@ -96,7 +96,9 @@
+ 	timer->setSingleShot(true);
+ 	timer->setInterval(2000);
+ 	connect(timer, SIGNAL(timeout()), this, SLOT(reverseStatus()));
+-	connect(seeker, SIGNAL(valueChanged(int)), this, SIGNAL(seekerChanged(int)));
++	/* connect(seeker, SIGNAL(valueChanged(int)), this, SIGNAL(seekerChanged(int))); */
++	connect(seeker, SIGNAL(wheelUp()), this, SIGNAL(seekerWheelUp()));
++	connect(seeker, SIGNAL(wheelDown()), this, SIGNAL(seekerWheelDown()));
+ }
+ 
+ MediaPanel::~MediaPanel() {
+Index: src/skingui/mediapanel.cpp
+===================================================================
+--- src/skingui/mediapanel.cpp	(revision 6211)
++++ src/skingui/mediapanel.cpp	(revision 6212)
+@@ -96,7 +96,7 @@
+ 	timer->setSingleShot(true);
+ 	timer->setInterval(2000);
+ 	connect(timer, SIGNAL(timeout()), this, SLOT(reverseStatus()));
+-	/* connect(seeker, SIGNAL(valueChanged(int)), this, SIGNAL(seekerChanged(int))); */
++	connect(seeker, SIGNAL(valueChanged(int)), this, SIGNAL(seekerChanged(int)));
+ 	connect(seeker, SIGNAL(wheelUp()), this, SIGNAL(seekerWheelUp()));
+ 	connect(seeker, SIGNAL(wheelDown()), this, SIGNAL(seekerWheelDown()));
+ }

Build Results
RPM Lint

Refresh

Mentioned Issues (1)

boo#879726

Comments for request 1030 0

Request History

dap created request almost 10 years ago

- Added smplayer-4.13.0-mousewheel_seeking.patch vs. bnc#879726.
- Fixed up license headers of spec files.
- Synced spec file with KDE:Extra.
PS Sorry for the previous one.

jsjhb accepted request almost 10 years ago