pool/vlc
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 424910 from multimedia:libs

Browse Source 
- Drop vlc-2.2.4-unambig-shortcuts.patch: it does not solve the
  problem it attempted to solve to start with. A better solution
  is to be found with upstream.

OBS-URL: https://build.opensuse.org/request/show/424910
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vlc?expand=0&rev=62
This commit is contained in:
Dominique Leuenberger 2016-09-09 08:17:21 +00:00 committed by Git OBS Bridge
parent 1ffb812fc3
commit 6ff312410d
3 changed files with 7 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
vlc-2.2.4-unambig-shortcuts.patch
View File

@ -1,44 +0,0 @@
commit 1e7aca9289f61c8875e91898ba131516d038bb4f
Author: Dominique Leuenberger <dimstar@opensuse.org>
Date: Sun Sep 4 11:00:38 2016 +0200
Qt: Change mnemonic for 'Play' (&Play => P&lay)
ALT-P is bound to 'play' inside the submenu already. Using it duplicated
can result in Qt showing popover, warning about "Ambiguous shortcut overload: Alt+P"
diff --git a/modules/gui/qt4/dialogs/open.cpp b/modules/gui/qt4/dialogs/open.cpp
index d85e976..83712b9 100644
--- a/modules/gui/qt4/dialogs/open.cpp
+++ b/modules/gui/qt4/dialogs/open.cpp
@@ -114,7 +114,7 @@ OpenDialog::OpenDialog( QWidget *parent,
QMenu * openButtonMenu = new QMenu( "Open", playButton );
openButtonMenu->addAction( qtr( "&Enqueue" ), this, SLOT( enqueue() ),
QKeySequence( "Alt+E" ) );
- openButtonMenu->addAction( qtr( "&Play" ), this, SLOT( play() ),
+ openButtonMenu->addAction( qtr( "P&lay" ), this, SLOT( play() ),
QKeySequence( "Alt+P" ) );
openButtonMenu->addAction( qtr( "&Stream" ), this, SLOT( stream() ) ,
QKeySequence( "Alt+S" ) );
commit 02f593441cf536f50071a4a8a088b56f30d53588
Author: Dominique Leuenberger <dimstar@opensuse.org>
Date: Fri Aug 5 09:29:01 2016 +0200
Qt: Change keyboard shortcut for 'Capture Device'
'D' is already used by 'Disc' in the same dialog.
diff --git a/modules/gui/qt4/dialogs/open.cpp b/modules/gui/qt4/dialogs/open.cpp
index 224cfa5..d85e976 100644
--- a/modules/gui/qt4/dialogs/open.cpp
+++ b/modules/gui/qt4/dialogs/open.cpp
@@ -93,7 +93,7 @@ OpenDialog::OpenDialog( QWidget *parent,
ui.Tab->insertTab( OPEN_NETWORK_TAB, netOpenPanel, QIcon( ":/type/network" ),
qtr( "&Network" ) );
ui.Tab->insertTab( OPEN_CAPTURE_TAB, captureOpenPanel,
- QIcon( ":/type/capture-card" ), qtr( "Capture &Device" ) );
+ QIcon( ":/type/capture-card" ), qtr( "Capture De&vice" ) );
/* Hide the Slave input widgets */
ui.slaveLabel->hide();

7
vlc.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Sep 5 07:56:44 UTC 2016 - dimstar@opensuse.org
- Drop vlc-2.2.4-unambig-shortcuts.patch: it does not solve the
problem it attempted to solve to start with. A better solution
is to be found with upstream.
-------------------------------------------------------------------
Sun Sep 4 09:23:25 UTC 2016 - dimstar@opensuse.org

3
vlc.spec
View File

@ -56,8 +56,6 @@ Patch4: vlc-2.2.0-fix_deinterlace_mmx.patch
Patch5: vlc-support-qt5.5.patch
# PATCH-FIX-UPSTREAM vlc-gcc6-buildfixes.patch dimstar@opensuse.org -- A collection of upstream commits to fix build with gcc6
Patch6: vlc-gcc6-buildfixes.patch
# PATCH-FIX-UPSTREAM vlc-2.2.4-unambig-shortcuts.patch dimstar@opensuse.org -- Make keyboard shortcuts on 'open dialog' unambiguous
Patch8: vlc-2.2.4-unambig-shortcuts.patch
BuildRequires: Mesa-devel
BuildRequires: SDL-devel >= 1.2.10
BuildRequires: aalib-devel
@ -336,7 +334,6 @@ date
if [ $(gcc -dumpversion) -ge 6 ]; then
%patch6 -p1
fi
%patch8 -p1
### Fix up sources for LUA 5.3
if pkg-config --atleast-version 5.3 lua; then