Import of pkgsrc-2016Q3

This commit is contained in:
2016-10-14 07:49:11 +02:00
committed by Lionel Sambuc
parent 9d819b6d54
commit 1242aa1e36
35952 changed files with 949749 additions and 377083 deletions

View File

@@ -0,0 +1,23 @@
$NetBSD: patch-modules_gui_qt4_main__interface.cpp,v 1.1 2015/10/25 11:00:18 wiz Exp $
Qt's MOC doesn't handle int64_t, so introduce a meaningful type name
so that slot/signal/connection macros work properly.
--- modules/gui/qt4/main_interface.cpp.orig 2015-02-26 20:21:25.000000000 +0000
+++ modules/gui/qt4/main_interface.cpp
@@ -399,13 +399,13 @@ void MainInterface::createResumePanel( Q
CONNECT( resumeTimer, timeout(), this, hideResumePanel() );
CONNECT( cancel, clicked(), this, hideResumePanel() );
- CONNECT( THEMIM->getIM(), resumePlayback(int64_t), this, showResumePanel(int64_t) );
+ CONNECT( THEMIM->getIM(), resumePlayback(putime_t), this, showResumePanel(putime_t) );
BUTTONACT( ok, resumePlayback() );
w->layout()->addWidget( resumePanel );
}
-void MainInterface::showResumePanel( int64_t _time ) {
+void MainInterface::showResumePanel( putime_t _time ) {
int setting = var_InheritInteger( p_intf, "qt-continue" );
if( setting == 0 )