Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 145915 Details for
Bug 206792
media-sound/mumble: 1.1.4 Version bump
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch to remove dbus deps
mumble-1.1.3-disableDBus.patch (text/plain), 2.50 KB, created by
Thomas Sachau
on 2008-03-12 18:57:29 UTC
(
hide
)
Description:
Patch to remove dbus deps
Filename:
MIME Type:
Creator:
Thomas Sachau
Created:
2008-03-12 18:57:29 UTC
Size:
2.50 KB
patch
obsolete
>diff -u -r src/mumble/main.cpp src/mumble.new/main.cpp >--- src/mumble/main.cpp 2008-02-23 19:50:00.000000000 +0100 >+++ src/mumble.new/main.cpp 2008-03-12 19:29:54.000000000 +0100 >@@ -39,7 +39,6 @@ > #include "Plugins.h" > #include "Global.h" > #ifndef Q_OS_MAC >-#include "DBus.h" > #endif > #include "VersionCheck.h" > #include "NetworkConfig.h" >@@ -73,23 +72,6 @@ > > Global::g_global_struct = new Global(); > >-#ifndef Q_OS_MAC >-#ifdef Q_OS_WIN >- // By default, windbus expects the path to dbus-daemon to be in PATH, and the path >- // should contain bin\\, and the path to the config is hardcoded as ..\etc >- _putenv(qPrintable(QString::fromLatin1("PATH=%1\\bin;%1;%2").arg(QDir::toNativeSeparators(a.applicationDirPath())).arg(QLatin1String(getenv("PATH"))))); >-#endif >- >- QDBusInterface qdbi(QLatin1String("net.sourceforge.mumble.mumble"), QLatin1String("/")); >- QDBusMessage reply=qdbi.call(QLatin1String("focus")); >- if (reply.type() == QDBusMessage::ReplyMessage) { >- if (a.arguments().count() > 1) { >- qdbi.call(QLatin1String("openUrl"), a.arguments().last()); >- } >- return 0; >- } >-#endif >- > QFile inifile(QString::fromLatin1("%1/mumble.ini").arg(a.applicationDirPath())); > if (inifile.exists() && inifile.permissions().testFlag(QFile::WriteUser)) > g.qs = new QSettings(inifile.fileName(), QSettings::IniFormat); >@@ -166,12 +148,6 @@ > g.mw=new MainWindow(NULL); > g.mw->show(); > >-#ifndef Q_OS_MAC >- new MumbleDBus(g.mw); >- QDBusConnection::sessionBus().registerObject("/", g.mw); >- QDBusConnection::sessionBus().registerService("net.sourceforge.mumble.mumble"); >-#endif >- > g.l->log(Log::Information, MainWindow::tr("Welcome to Mumble.")); > > // Plugins >diff -u -r src/mumble/mumble.pro src/mumble.new/mumble.pro >--- src/mumble/mumble.pro 2008-03-12 19:30:09.000000000 +0100 >+++ src/mumble.new/mumble.pro 2008-03-12 19:29:54.000000000 +0100 >@@ -18,12 +18,6 @@ > > QMAKE_CXXFLAGS += -Wall -Wextra > >-!macx { >- CONFIG += qdbus >- HEADERS += DBus.h >- SOURCES += DBus.cpp >-} >- > win32 { > RC_FILE = mumble.rc > HEADERS += DXAudioInput.h DXAudioOutput.h DXConfigDialog.h GlobalShortcut_win.h >diff -u -r src/mumble/mumble_pch.hpp src/mumble.new/mumble_pch.hpp >--- src/mumble/mumble_pch.hpp 2008-02-23 19:50:02.000000000 +0100 >+++ src/mumble.new/mumble_pch.hpp 2008-03-12 19:29:54.000000000 +0100 >@@ -4,7 +4,6 @@ > #define QT_ASCII_CAST_WARNINGS > #define QT_NO_CAST_TO_ASCII > #include <QtCore/QtCore> >-#include <QtDBus/QtDBus> > #include <QtGui/QtGui> > #include <QtNetwork/QtNetwork> > #include <QtOpenGL/QtOpenGL>
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 206792
:
145356
|
145358
|
145359
|
145361
|
145363
| 145915 |
145916
|
145945
|
146652
|
153277
|
153657
|
153705
|
153737
|
156409
|
156447
|
158515
|
158981
|
162167
|
162181
|
168150