Hello community,
here is the log from the commit of package kdemultimedia4 for openSUSE:Factory
checked in at Mon Nov 22 23:49:03 CET 2010.
--------
--- KDE/kdemultimedia4/kdemultimedia4.changes 2010-10-28 22:12:49.000000000 +0200
+++ kdemultimedia4/kdemultimedia4.changes 2010-11-21 19:05:59.000000000 +0100
@@ -1,0 +2,13 @@
+Sun Nov 21 18:05:43 UTC 2010 - coolo@novell.com
+
+- remove patch not adapted since 4.1
+
+-------------------------------------------------------------------
+Fri Nov 19 17:18:48 CET 2010 - dmueller@suse.de
+
+- update to 4.5.80
+ * KDE 4.6 Beta1
+ * no upstream changelog available.
+
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
4_5_BRANCH.diff
kdemultimedia-4.5.3.tar.bz2
kmix-global-shortcuts.diff
New:
----
4_6_BRANCH.diff
kdemultimedia-4.5.80.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdemultimedia4.spec ++++++
--- /var/tmp/diff_new_pack.ShHoLq/_old 2010-11-22 23:48:16.000000000 +0100
+++ /var/tmp/diff_new_pack.ShHoLq/_new 2010-11-22 23:48:16.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kdemultimedia4 (Version 4.5.3)
+# spec file for package kdemultimedia4 (Version 4.5.80)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -23,7 +23,7 @@
%else
BuildRequires: cdparanoia
%endif
-BuildRequires: flac-devel libao-devel libkde4-devel libmusicbrainz-devel libsamplerate-devel
+BuildRequires: flac-devel libao-devel libkde4-devel libmusicbrainz-devel libmusicbrainz3-devel libsamplerate-devel
BuildRequires: libtheora-devel libtunepimp-devel libvorbis-devel speex-devel taglib-devel xine-devel xine-lib
BuildRequires: alsa-devel gstreamer010-devel gstreamer010-plugins-base-devel libogg-devel
BuildRequires: libknotificationitem-devel
@@ -34,12 +34,11 @@
Group: System/GUI/KDE
Summary: kdemultimedia base package
Url: http://www.kde.org
-Version: 4.5.3
+Version: 4.5.80
Release: 1
Source0: kdemultimedia-%version.tar.bz2
-Patch0: 4_5_BRANCH.diff
+Patch0: 4_6_BRANCH.diff
Patch1: kmix-autostart.diff
-Patch2: kmix-global-shortcuts.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%kde4_runtime_requires
Suggests: juk
@@ -61,8 +60,6 @@
%setup -q -n kdemultimedia-%version
%patch0
%patch1
-#TODO: port to KDE 4.2
-#%patch2
FAKE_BUILDDATE=$(LC_ALL=C date -r %{_sourcedir}/%{name}.changes '+%b %e %Y')
sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" libkcompactdisc/wmlib/wm_helpers.c
++++++ 4_5_BRANCH.diff -> 4_6_BRANCH.diff ++++++
++++++ kdemultimedia-4.5.3.tar.bz2 -> kdemultimedia-4.5.80.tar.bz2 ++++++
++++ 44883 lines of diff (skipped)
++++++ kmix-autostart.diff ++++++
--- /var/tmp/diff_new_pack.ShHoLq/_old 2010-11-22 23:48:17.000000000 +0100
+++ /var/tmp/diff_new_pack.ShHoLq/_new 2010-11-22 23:48:17.000000000 +0100
@@ -1,100 +1,8 @@
-Index: kmix/KMixApp.h
-===================================================================
---- kmix/KMixApp.h (revision 946324)
-+++ kmix/KMixApp.h (working copy)
-@@ -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
-Index: kmix/kmixprefdlg.h
-===================================================================
---- kmix/kmixprefdlg.h (revision 946324)
-+++ kmix/kmixprefdlg.h (working copy)
-@@ -57,6 +57,7 @@
- QCheckBox *m_showTicks;
- QCheckBox *m_showLabels;
- QCheckBox *m_onLogin;
-+ QCheckBox *m_disableAutoStart;
- QRadioButton *_rbVertical;
- QRadioButton *_rbHorizontal;
- };
-Index: kmix/kmix.cpp
-===================================================================
---- kmix/kmix.cpp (revision 946324)
-+++ kmix/kmix.cpp (working copy)
-@@ -29,8 +29,10 @@
- #include
- #include <QCursor>
- #include <KTabWidget>
-+#include <QTimer>
-
- // include files for KDE
-+#include
- #include
- #include
- #include
-@@ -94,6 +96,10 @@
- theKMixDeviceManager->initHotplug();
- connect(theKMixDeviceManager, SIGNAL( plugged( const char*, const QString&, QString&)), SLOT (plugged( const char*, const QString&, QString&) ) );
- connect(theKMixDeviceManager, SIGNAL( unplugged( const QString&)), SLOT (unplugged( const QString&) ) );
-+
-+ if (KCmdLineArgs::parsedArgs()->isSet("autostart") && ! Mixer::mixers().first())
-+ QTimer::singleShot(0, kapp, SLOT(quit()));
-+
- if ( m_startVisible && ! invisible)
- show(); // Started visible: We don't do "m_isVisible = true;", as the showEvent() already does it
-
-@@ -262,6 +268,7 @@
- config.writeEntry( "Tickmarks", m_showTicks );
- config.writeEntry( "Labels", m_showLabels );
- config.writeEntry( "startkdeRestore", m_onLogin );
-+ config.writeEntry( "AutoStart", m_autoStart );
- config.writeEntry( "DefaultCardOnStart", m_defaultCardOnStart );
- config.writeEntry( "ConfigVersion", KMIX_CONFIG_VERSION );
- config.writeEntry( "AutoUseMultimediaKeys", m_autouseMultimediaKeys );
-@@ -335,6 +342,7 @@
- m_showLabels = config.readEntry("Labels", true);
- m_onLogin = config.readEntry("startkdeRestore", true );
- 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", "" );
-@@ -691,6 +699,7 @@
- m_prefDlg->m_volumeChk->setChecked(m_volumeWidget);
- m_prefDlg->m_volumeChk->setEnabled( m_showDockWidget );
- m_prefDlg->m_onLogin->setChecked( m_onLogin );
-+ m_prefDlg->m_disableAutoStart->setChecked( !m_autoStart );
-
- m_prefDlg->m_showTicks->setChecked( m_showTicks );
- m_prefDlg->m_showLabels->setChecked( m_showLabels );
-@@ -732,6 +741,7 @@
- m_showDockWidget = prefDlg->m_dockingChk->isChecked();
- m_volumeWidget = prefDlg->m_volumeChk->isChecked();
- m_onLogin = prefDlg->m_onLogin->isChecked();
-+ m_autoStart = !prefDlg->m_disableAutoStart->isChecked();
- if ( prefDlg->_rbVertical->isChecked() ) {
- m_toplevelOrientation = Qt::Vertical;
- }
-Index: kmix/KMixApp.cpp
-===================================================================
---- kmix/KMixApp.cpp 2010-04-07 17:19:06.000000000 +0200
-+++ kmix/KMixApp.cpp 2010-04-08 16:43:21.479921617 +0200
+--- kmix/apps/KMixApp.cpp 2010-09-01 23:37:58.000000000 +0200
++++ kmix/apps/KMixApp.cpp 2010-09-13 13:37:46.467783417 +0200
@@ -22,9 +22,11 @@
#include "KMixApp.h"
- #include "kmix.h"
+ #include "apps/kmix.h"
#include
+#include
@@ -134,11 +42,84 @@
/*
void
KMixApp::quitExtended()
-Index: kmix/kmix.h
-===================================================================
---- kmix/kmix.h (revision 946324)
-+++ kmix/kmix.h (working copy)
-@@ -97,6 +97,7 @@
+--- kmix/apps/KMixApp.h 2010-09-01 23:37:58.000000000 +0200
++++ kmix/apps/KMixApp.h 2010-09-13 13:37:46.445783373 +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
+--- kmix/apps/kmix.cpp 2010-09-02 09:47:55.000000000 +0200
++++ kmix/apps/kmix.cpp 2010-09-13 13:42:12.729441400 +0200
+@@ -29,9 +29,11 @@
+ #include
+ #include <QCursor>
+ #include <QString>
++#include <QTimer>
+
+
+ // include files for KDE
++#include
+ #include
+ #include
+ #include
+@@ -99,6 +101,10 @@
+ theKMixDeviceManager->initHotplug();
+ connect(theKMixDeviceManager, SIGNAL( plugged( const char*, const QString&, QString&)), SLOT (plugged( const char*, const QString&, QString&) ) );
+ connect(theKMixDeviceManager, SIGNAL( unplugged( const QString&)), SLOT (unplugged( const QString&) ) );
++
++ if (KCmdLineArgs::parsedArgs()->isSet("autostart") && ! Mixer::mixers().first())
++ QTimer::singleShot(0, kapp, SLOT(quit()));
++
+ if ( m_startVisible && ! invisible)
+ show(); // Started visible
+
+@@ -285,6 +291,7 @@
+ config.writeEntry( "Tickmarks", m_showTicks );
+ config.writeEntry( "Labels", m_showLabels );
+ config.writeEntry( "startkdeRestore", m_onLogin );
++ config.writeEntry( "AutoStart", m_autoStart );
+ config.writeEntry( "DefaultCardOnStart", m_defaultCardOnStart );
+ config.writeEntry( "ConfigVersion", KMIX_CONFIG_VERSION );
+ config.writeEntry( "AutoUseMultimediaKeys", m_autouseMultimediaKeys );
+@@ -386,6 +393,7 @@
+ m_showLabels = config.readEntry("Labels", true);
+ m_onLogin = config.readEntry("startkdeRestore", true );
+ 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", "" );
+@@ -990,6 +998,7 @@
+ m_prefDlg->m_volumeChk->setChecked(m_volumeWidget);
+ m_prefDlg->m_volumeChk->setEnabled( m_showDockWidget );
+ m_prefDlg->m_onLogin->setChecked( m_onLogin );
++ m_prefDlg->m_disableAutoStart->setChecked( !m_autoStart );
+
+ m_prefDlg->m_showTicks->setChecked( m_showTicks );
+ m_prefDlg->m_showLabels->setChecked( m_showLabels );
+@@ -1031,6 +1040,7 @@
+ m_showDockWidget = prefDlg->m_dockingChk->isChecked();
+ m_volumeWidget = prefDlg->m_volumeChk->isChecked();
+ m_onLogin = prefDlg->m_onLogin->isChecked();
++ m_autoStart = !prefDlg->m_disableAutoStart->isChecked();
+ if ( prefDlg->_rbVertical->isChecked() ) {
+ m_toplevelOrientation = Qt::Vertical;
+ }
+--- kmix/apps/kmix.h 2010-09-02 09:47:55.000000000 +0200
++++ kmix/apps/kmix.h 2010-09-13 13:37:46.467783417 +0200
+@@ -106,6 +106,7 @@
bool m_showDockWidget;
bool m_volumeWidget;
@@ -146,11 +127,9 @@
bool m_showTicks;
bool m_showLabels;
bool m_onLogin;
-Index: kmix/main.cpp
-===================================================================
---- kmix/main.cpp (revision 946324)
-+++ kmix/main.cpp (working copy)
-@@ -56,6 +56,7 @@
+--- kmix/apps/main.cpp 2010-09-07 00:50:02.000000000 +0200
++++ kmix/apps/main.cpp 2010-09-13 13:37:46.468783419 +0200
+@@ -58,6 +58,7 @@
KCmdLineOptions options;
options.add("keepvisibility", ki18n("Inhibits the unhiding of the KMix main window, if KMix is already running."));
@@ -158,7 +137,7 @@
KCmdLineArgs::addCmdLineOptions( options ); // Add our own options.
KUniqueApplication::addCmdLineOptions();
-@@ -63,6 +64,8 @@
+@@ -65,6 +66,8 @@
bool hasArgKeepvisibility = args->isSet("keepvisibility");
//kDebug(67100) << "hasArgKeepvisibility=" << hasArgKeepvisibility;
KMixApp::keepVisibility(hasArgKeepvisibility);
@@ -167,10 +146,8 @@
if (!KMixApp::start())
return 0;
-Index: kmix/kmixprefdlg.cpp
-===================================================================
---- kmix/kmixprefdlg.cpp (revision 946324)
-+++ kmix/kmixprefdlg.cpp (working copy)
+--- kmix/gui/kmixprefdlg.cpp 2010-09-01 23:37:58.000000000 +0200
++++ kmix/gui/kmixprefdlg.cpp 2010-09-13 13:37:46.469783421 +0200
@@ -78,6 +78,12 @@
m_onLogin = new QCheckBox( i18n("Restore volumes on login"), m_generalTab );
l->addWidget( m_onLogin );
@@ -184,3 +161,13 @@
// -----------------------------------------------------------
label = new QLabel( i18n("Visual"), m_generalTab );
+--- kmix/gui/kmixprefdlg.h 2010-09-01 23:37:58.000000000 +0200
++++ kmix/gui/kmixprefdlg.h 2010-09-13 13:37:46.446783375 +0200
+@@ -55,6 +55,7 @@
+ QCheckBox *m_showTicks;
+ QCheckBox *m_showLabels;
+ QCheckBox *m_onLogin;
++ QCheckBox *m_disableAutoStart;
+ QRadioButton *_rbVertical;
+ QRadioButton *_rbHorizontal;
+ };
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org