Hello community, here is the log from the commit of package kmix for openSUSE:Factory checked in at 2012-10-08 20:32:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kmix (Old) and /work/SRC/openSUSE:Factory/.kmix.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kmix", Maintainer is "[email protected]" Changes: -------- New Changes file: --- /dev/null 2012-08-23 02:41:28.555381587 +0200 +++ /work/SRC/openSUSE:Factory/.kmix.new/kmix.changes 2012-10-08 20:32:36.000000000 +0200 @@ -0,0 +1,1892 @@ +------------------------------------------------------------------- +Sat Sep 29 10:17:49 UTC 2012 - [email protected] + +- Update to 4.9.2 + * see http://kde.org/announcements/4.9.2/ for details + +------------------------------------------------------------------- +Tue Sep 4 11:02:15 UTC 2012 - [email protected] + +- Update to 4.9.1 + * see http://kde.org/announcements/4.9.1/ for details +- Rebase kmix_autostart patch + +------------------------------------------------------------------- +Tue Jul 31 11:02:37 UTC 2012 - [email protected] + +- Update to 4.9.0 + * see http://kde.org/announcements/4.9/ for details + +------------------------------------------------------------------- +Thu Jul 19 13:14:09 UTC 2012 - [email protected] + +- update to 4.8.97 + * RC2 milestone release of KDE 4.9 + * see http://kde.org/announcements/announce-4.9-rc2.php for details + +------------------------------------------------------------------- +Fri Jun 29 09:47:54 UTC 2012 - [email protected] + +- Update to 4.8.95_20120629 + +------------------------------------------------------------------- +Sun Jun 17 07:47:38 UTC 2012 - [email protected] + +- Update to 4.8.90_20120617 + +------------------------------------------------------------------- +Tue May 29 15:05:56 UTC 2012 - [email protected] + +- Update to 4.8.80_20120529 + +------------------------------------------------------------------- +Sun May 13 16:31:47 UTC 2012 - [email protected] + +- Update to 4.8.42_20120513 + +------------------------------------------------------------------- +Sun May 6 14:04:38 UTC 2012 - [email protected] + +- Update to 4.8.42_20120506 + +------------------------------------------------------------------- +Tue Nov 22 09:14:37 UTC 2011 - [email protected] + +- Update to 4.7.80_20111122 + +------------------------------------------------------------------- +Sun Nov 20 08:41:31 UTC 2011 - [email protected] + +- Update to 4.7.80_20111120 + +------------------------------------------------------------------- +Fri Nov 18 09:38:45 UTC 2011 - [email protected] + +- Update to 4.7.80_20111118 + +------------------------------------------------------------------- +Wed Nov 16 17:45:08 UTC 2011 - [email protected] + +- Update to 4.7.46_20111116 + +------------------------------------------------------------------- +Tue Nov 15 06:02:23 UTC 2011 - [email protected] + +- Update to 4.7.46_20111115 + +------------------------------------------------------------------- +Mon Nov 14 20:20:10 UTC 2011 - [email protected] + +- Update to 4.7.46_20111114 + +------------------------------------------------------------------- +Sun Nov 13 09:22:22 UTC 2011 - [email protected] + +- Update to 4.7.46_20111113 + +------------------------------------------------------------------- +Fri Nov 11 15:49:33 UTC 2011 - [email protected] + +- Update to 4.7.45_20111111 + +------------------------------------------------------------------- +Mon Nov 7 14:19:26 UTC 2011 - [email protected] + +- Update to 4.7.45_20111107 + +------------------------------------------------------------------- +Sun Nov 6 16:01:37 UTC 2011 - [email protected] + +- Update to 4.7.45_20111106 + +------------------------------------------------------------------- +Fri Nov 4 09:45:40 UTC 2011 - [email protected] + +- Update to 4.7.45_20111104 + +------------------------------------------------------------------- +Thu Nov 3 10:28:42 UTC 2011 - [email protected] + +- Update to 4.7.45_20111103 + +------------------------------------------------------------------- +Tue Nov 1 21:01:25 UTC 2011 - [email protected] + +- Update to 4.7.45_20111101 + +------------------------------------------------------------------- +Mon Oct 31 13:12:07 UTC 2011 - [email protected] + +- Update to 4.7.45_20111031 + +------------------------------------------------------------------- +Sat Oct 29 17:12:25 UTC 2011 - [email protected] + +- Update to 4.7.45_20111029 + +------------------------------------------------------------------- +Fri Oct 28 13:55:11 UTC 2011 - [email protected] + +- Update to 4.7.45_20111028 + +------------------------------------------------------------------- +Wed Oct 26 09:10:36 UTC 2011 - [email protected] + +- Update to 4.7.45_20111026 + +------------------------------------------------------------------- +Tue Oct 25 16:58:36 UTC 2011 - [email protected] + +- Update to 4.7.45_20111025 + +------------------------------------------------------------------- +Mon Oct 24 16:40:30 UTC 2011 - [email protected] + +- Update to 4.7.45_20111024 + +------------------------------------------------------------------- +Sun Oct 23 07:03:47 UTC 2011 - [email protected] + +- Update to 4.7.45_20111023 + +------------------------------------------------------------------- +Fri Oct 21 06:23:31 UTC 2011 - [email protected] + +- Update to 4.7.45_20111021 + +------------------------------------------------------------------- +Wed Oct 19 17:57:04 UTC 2011 - [email protected] + +- Update to 4.7.44_20111019 + +------------------------------------------------------------------- +Tue Oct 18 18:43:27 UTC 2011 - [email protected] + +- Update to 4.7.44_20111018 + +------------------------------------------------------------------- +Mon Oct 17 18:11:04 UTC 2011 - [email protected] + +- Update to 4.7.44_20111017 + +------------------------------------------------------------------- +Mon Oct 17 05:51:35 UTC 2011 - [email protected] + +- Update to 4.7.44_20111017 + +------------------------------------------------------------------- +Sun Oct 16 16:30:59 UTC 2011 - [email protected] + +- Update to 4.7.44_20111016 + +------------------------------------------------------------------- +Sat Oct 15 15:26:07 UTC 2011 - [email protected] + +- Update to 4.7.44_20111015 + +------------------------------------------------------------------- +Fri Oct 14 16:49:55 UTC 2011 - [email protected] + +- Update to 4.7.44_20111014 + +------------------------------------------------------------------- +Thu Oct 13 19:24:25 UTC 2011 - [email protected] + +- Update to 4.7.44_20111013 + +------------------------------------------------------------------- ++++ 1695 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:Factory/.kmix.new/kmix.changes New: ---- kmix-4.9.2.tar.xz kmix-autostart.diff kmix.changes kmix.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kmix.spec ++++++ # # spec file for package kmix # # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 4.8.95_20120629.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: kmix BuildRequires: alsa-devel BuildRequires: libcanberra-devel BuildRequires: libkde4-devel BuildRequires: libpulse-devel BuildRequires: glib2-devel BuildRequires: xz License: GPL-2.0+ Group: Productivity/Multimedia/Sound/Mixers Summary: Sound Mixer Url: http://www.kde.org Version: 4.9.2 Release: 1 Source0: %{name}-%{version}.tar.xz Patch1: kmix-autostart.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %kde4_runtime_requires %description KDE's full featured mini mixer %prep %setup -q %patch1 -p1 %build %cmake_kde4 -d build %make_jobs %install pushd build %makeinstall popd %suse_update_desktop_file kmix AudioVideo Mixer %kde_post_install %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %clean rm -rf %{buildroot} %files %defattr(-,root,root) %{_kde4_applicationsdir}/kmix.desktop %{_kde4_appsdir}/kmix/ %{_kde4_appsdir}/plasma/ %{_kde4_bindir}/kmix %{_kde4_bindir}/kmixctrl %{_kde4_datadir}/autostart/kmix_autostart.desktop %{_kde4_datadir}/autostart/restore_kmix_volumes.desktop %{_kde4_datadir}/dbus-1/interfaces/org.kde.kmix.* %{_kde4_htmldir}/en/kmix/ %{_kde4_iconsdir}/hicolor/*/apps/kmix.* %{_kde4_libdir}/libkdeinit4_kmix.so %{_kde4_libdir}/libkdeinit4_kmixctrl.so %{_kde4_modulesdir}/kded_kmixd.so %{_kde4_modulesdir}/plasma_engine_mixer.so %{_kde4_servicesdir}/kded/kmixd.desktop %{_kde4_servicesdir}/kmixctrl_restore.desktop %{_kde4_servicesdir}/plasma-engine-mixer.desktop %changelog ++++++ kmix-autostart.diff ++++++ diff -urNB kmix/apps/KMixApp.cpp new/apps/KMixApp.cpp --- kmix/apps/KMixApp.cpp 2012-05-06 15:05:05.318647177 +0200 +++ new/apps/KMixApp.cpp 2012-06-29 07:41:11.625298597 +0200 @@ -22,9 +22,11 @@ #include "KMixApp.h" #include "apps/kmix.h" #include <kdebug.h> +#include <kcmdlineargs.h> bool KMixApp::_keepVisibility = false; +bool KMixApp::_autoStart = false; KMixApp::KMixApp() : KUniqueApplication(), m_kmix( 0 ) @@ -51,6 +53,17 @@ // There are 3 cases for a new instance //kDebug(67100) << "KMixApp::newInstance() isRestored()=" << isRestored() << "_keepVisibility=" << _keepVisibility; + + KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + + if (args->isSet("autostart")) + { + kapp->disableSessionManagement(); + + if ( m_kmix ) + return 0; + } + static bool first = true; if ( !first ) { // There already exists an instance/window @@ -118,6 +131,11 @@ _keepVisibility = val_keepVisibility; } +void KMixApp::autoStart(bool val_autoStart) { + //kDebug(67100) << "KMixApp::autoStart()"; + _autoStart = val_autoStart; +} + /* void KMixApp::quitExtended() diff -urNB kmix/apps/KMixApp.h new/apps/KMixApp.h --- kmix/apps/KMixApp.h 2012-05-06 15:05:05.319647178 +0200 +++ new/apps/KMixApp.h 2012-06-29 07:41:11.648298584 +0200 @@ -36,6 +36,7 @@ public slots: //void quitExtended(); // For a hack on visibility() static void keepVisibility(bool); + static void autoStart(bool); /* signals: void stopUpdatesOnVisibility(); @@ -43,6 +44,7 @@ private: KMixWindow *m_kmix; static bool _keepVisibility; + static bool _autoStart; }; #endif diff -urNB kmix/apps/kmix.cpp new/apps/kmix.cpp --- kmix/apps/kmix.cpp 2012-06-28 10:51:13.281867033 +0200 +++ new/apps/kmix.cpp 2012-06-29 07:42:05.518300726 +0200 @@ -30,9 +30,11 @@ #include <qradiobutton.h> #include <QCursor> #include <QString> +#include <QTimer> // include files for KDE +#include <kcmdlineargs.h> #include <kcombobox.h> #include <kiconloader.h> #include <kmessagebox.h> @@ -106,6 +108,9 @@ fixConfigAfterRead(); theKMixDeviceManager->initHotplug(); connect(theKMixDeviceManager, SIGNAL(plugged(const char*,QString,QString&)), SLOT (plugged(const char*,QString,QString&)) ); + if (KCmdLineArgs::parsedArgs()->isSet("autostart") && ! Mixer::mixers().first()) + QTimer::singleShot(0, kapp, SLOT(quit())); + connect(theKMixDeviceManager, SIGNAL(unplugged(QString)), SLOT (unplugged(QString)) ); if ( m_startVisible && ! invisible) show(); // Started visible @@ -364,6 +369,7 @@ config.writeEntry( "Labels", m_showLabels ); config.writeEntry( "startkdeRestore", m_onLogin ); config.writeEntry( "VolumeFeedback", m_beepOnVolumeChange ); + config.writeEntry( "AutoStart", m_autoStart ); config.writeEntry( "DefaultCardOnStart", m_defaultCardOnStart ); config.writeEntry( "ConfigVersion", KMIX_CONFIG_VERSION ); config.writeEntry( "AutoUseMultimediaKeys", m_autouseMultimediaKeys ); @@ -486,6 +492,7 @@ m_onLogin = config.readEntry("startkdeRestore", true ); setBeepOnVolumeChange(config.readEntry("VolumeFeedback", false )); m_startVisible = config.readEntry("Visible", false); + m_autoStart = config.readEntry("AutoStart", true); m_multiDriverMode = config.readEntry("MultiDriver", false); const QString& orientationString = config.readEntry("Orientation", "Vertical"); m_defaultCardOnStart = config.readEntry( "DefaultCardOnStart", "" ); @@ -1116,6 +1123,7 @@ m_prefDlg->m_volumeChk->setEnabled( m_showDockWidget ); m_prefDlg->m_onLogin->setChecked( m_onLogin ); m_prefDlg->m_beepOnVolumeChange->setChecked( m_beepOnVolumeChange ); + m_prefDlg->m_disableAutoStart->setChecked( !m_autoStart ); m_prefDlg->m_showTicks->setChecked( m_showTicks ); m_prefDlg->m_showLabels->setChecked( m_showLabels ); @@ -1158,6 +1166,7 @@ m_volumeWidget = prefDlg->m_volumeChk->isChecked(); m_onLogin = prefDlg->m_onLogin->isChecked(); setBeepOnVolumeChange(prefDlg->m_beepOnVolumeChange->isChecked()); + m_autoStart = !prefDlg->m_disableAutoStart->isChecked(); if ( prefDlg->_rbVertical->isChecked() ) { m_toplevelOrientation = Qt::Vertical; diff -urNB kmix/apps/kmix.h new/apps/kmix.h --- kmix/apps/kmix.h 2012-06-28 10:51:13.281867033 +0200 +++ new/apps/kmix.h 2012-06-29 07:41:11.648298584 +0200 @@ -111,6 +111,7 @@ bool m_showDockWidget; bool m_volumeWidget; + bool m_autoStart; bool m_showTicks; bool m_showLabels; bool m_onLogin; diff -urNB kmix/apps/main.cpp new/apps/main.cpp --- kmix/apps/main.cpp 2012-05-13 18:15:50.358563713 +0200 +++ new/apps/main.cpp 2012-06-29 07:41:11.649298588 +0200 @@ -61,6 +61,7 @@ KCmdLineOptions options; options.add("keepvisibility", ki18n("Inhibits the unhiding of the KMix main window, if KMix is already running.")); + options.add("autostart", ki18n("Used by kmix_autostart.desktop")); KCmdLineArgs::addCmdLineOptions( options ); // Add our own options. KUniqueApplication::addCmdLineOptions(); @@ -68,6 +69,8 @@ bool hasArgKeepvisibility = args->isSet("keepvisibility"); //kDebug(67100) << "hasArgKeepvisibility=" << hasArgKeepvisibility; KMixApp::keepVisibility(hasArgKeepvisibility); + bool hasAutoStart = args->isSet("autostart"); + KMixApp::autoStart(hasAutoStart); if (!KMixApp::start()) return 0; diff -urNB kmix/gui/kmixprefdlg.cpp new/gui/kmixprefdlg.cpp --- kmix/gui/kmixprefdlg.cpp 2012-06-28 10:51:13.282867033 +0200 +++ new/gui/kmixprefdlg.cpp 2012-06-29 07:41:11.649298588 +0200 @@ -83,6 +83,12 @@ m_beepOnVolumeChange = new QCheckBox( i18n("Volume Feedback"), m_generalTab ); l->addWidget( m_beepOnVolumeChange ); + l = new QHBoxLayout(); + layout->addItem( l ); + l->addSpacing(10); + m_disableAutoStart = new QCheckBox( i18n("Disable automatic startup on login"), m_generalTab ); + l->addWidget( m_disableAutoStart ); + // ----------------------------------------------------------- diff -urNB kmix/gui/kmixprefdlg.h new/gui/kmixprefdlg.h --- kmix/gui/kmixprefdlg.h 2012-06-28 10:51:13.282867033 +0200 +++ new/gui/kmixprefdlg.h 2012-06-29 07:41:11.649298588 +0200 @@ -57,6 +57,7 @@ QCheckBox *m_showLabels; QCheckBox *m_onLogin; QCheckBox *m_beepOnVolumeChange; + QCheckBox *m_disableAutoStart; QRadioButton *_rbVertical; QRadioButton *_rbHorizontal; }; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
