Hello community,

here is the log from the commit of package kdemultimedia4 for openSUSE:Factory 
checked in at 2012-01-27 15:19:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kdemultimedia4 (Old)
 and      /work/SRC/openSUSE:Factory/.kdemultimedia4.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "kdemultimedia4", Maintainer is "[email protected]"

Changes:
--------
--- /work/SRC/openSUSE:Factory/kdemultimedia4/kdemultimedia4.changes    
2012-01-09 11:15:30.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.kdemultimedia4.new/kdemultimedia4.changes       
2012-01-27 15:20:45.000000000 +0100
@@ -1,0 +2,16 @@
+Wed Jan 18 21:04:23 CET 2012 - [email protected]
+
+- update to 4.8.0
+  * first stable release of KDE 4.8 (only critical fixes over 4.7.98)
+  * see http://kde.org/announcements/4.8/ for details
+  
+
+-------------------------------------------------------------------
+Tue Jan 10 18:44:52 CET 2012 - [email protected]
+
+- update to 4.7.98
+  * RC2+ milestone release of KDE 4.8
+  *  see http://kde.org/announcements/4.8/ for details
+- remove upstreamed patch
+
+-------------------------------------------------------------------

Old:
----
  kde-265733.patch
  kdemultimedia-4.7.4.tar.bz2

New:
----
  kdemultimedia-4.8.0.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kdemultimedia4.spec ++++++
--- /var/tmp/diff_new_pack.MfzCKD/_old  2012-01-27 15:20:47.000000000 +0100
+++ /var/tmp/diff_new_pack.MfzCKD/_new  2012-01-27 15:20:47.000000000 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package kdemultimedia4
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# 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
@@ -39,7 +39,7 @@
 BuildRequires:  taglib-devel
 BuildRequires:  xine-devel
 BuildRequires:  xine-lib
-Version:        4.7.4
+Version:        4.8.0
 Release:        0
 Summary:        Base package for KDE multimedia applications
 License:        GPL-2.0+
@@ -47,7 +47,6 @@
 Url:            http://www.kde.org
 Source:         kdemultimedia-%{version}.tar.bz2
 Patch1:         kmix-autostart.diff
-Patch2:         kde-265733.patch
 Suggests:       juk
 Suggests:       kio_audiocd
 Suggests:       kmix
@@ -66,7 +65,6 @@
 %prep
 %setup -q -n kdemultimedia-%{version}
 %patch1
-%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

++++++ kdemultimedia-4.7.4.tar.bz2 -> kdemultimedia-4.8.0.tar.bz2 ++++++
++++ 10150 lines of diff (skipped)

++++++ kmix-autostart.diff ++++++
--- /var/tmp/diff_new_pack.MfzCKD/_old  2012-01-27 15:20:47.000000000 +0100
+++ /var/tmp/diff_new_pack.MfzCKD/_new  2012-01-27 15:20:47.000000000 +0100
@@ -1,5 +1,5 @@
---- kmix/apps/KMixApp.cpp      2010-09-01 23:37:58.000000000 +0200
-+++ kmix/apps/KMixApp.cpp      2010-09-13 13:37:46.467783417 +0200
+--- kmix/apps/KMixApp.cpp      2011-01-02 16:53:28.000000000 +0100
++++ kmix/apps/KMixApp.cpp      2011-08-01 14:27:20.864178849 +0200
 @@ -22,9 +22,11 @@
  #include "KMixApp.h"
  #include "apps/kmix.h"
@@ -30,7 +30,7 @@
        static bool first = true;
        if ( !first )
        {       // There already exists an instance/window
-@@ -117,6 +130,11 @@
+@@ -118,6 +131,11 @@
     _keepVisibility = val_keepVisibility;
  }
  
@@ -43,7 +43,7 @@
  void
  KMixApp::quitExtended()
 --- kmix/apps/KMixApp.h        2010-09-01 23:37:58.000000000 +0200
-+++ kmix/apps/KMixApp.h        2010-09-13 13:37:46.445783373 +0200
++++ kmix/apps/KMixApp.h        2011-08-01 14:27:20.865178847 +0200
 @@ -36,6 +36,7 @@
      public slots:
      //void quitExtended();  // For a hack on visibility()
@@ -60,8 +60,8 @@
  };
  
  #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
+--- kmix/apps/kmix.cpp 2011-07-31 18:38:33.000000000 +0200
++++ kmix/apps/kmix.cpp 2011-08-01 14:29:03.519183816 +0200
 @@ -29,9 +29,11 @@
  #include <qradiobutton.h>
  #include <QCursor>
@@ -74,18 +74,17 @@
  #include <kcombobox.h>
  #include <kiconloader.h>
  #include <kmessagebox.h>
-@@ -99,6 +101,10 @@
+@@ -106,6 +108,9 @@
+     fixConfigAfterRead();
      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&) ) );
-+
+     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
- 
-@@ -285,6 +291,7 @@
+@@ -316,6 +321,7 @@
      config.writeEntry( "Tickmarks", m_showTicks );
      config.writeEntry( "Labels", m_showLabels );
      config.writeEntry( "startkdeRestore", m_onLogin );
@@ -93,7 +92,7 @@
      config.writeEntry( "DefaultCardOnStart", m_defaultCardOnStart );
      config.writeEntry( "ConfigVersion", KMIX_CONFIG_VERSION );
      config.writeEntry( "AutoUseMultimediaKeys", m_autouseMultimediaKeys );
-@@ -386,6 +393,7 @@
+@@ -420,6 +426,7 @@
      m_showLabels = config.readEntry("Labels", true);
      m_onLogin = config.readEntry("startkdeRestore", true );
      m_startVisible = config.readEntry("Visible", false);
@@ -101,7 +100,7 @@
      m_multiDriverMode = config.readEntry("MultiDriver", false);
      const QString& orientationString = config.readEntry("Orientation", 
"Vertical");
      m_defaultCardOnStart = config.readEntry( "DefaultCardOnStart", "" );
-@@ -990,6 +998,7 @@
+@@ -1030,6 +1037,7 @@
          m_prefDlg->m_volumeChk->setChecked(m_volumeWidget);
          m_prefDlg->m_volumeChk->setEnabled( m_showDockWidget );
          m_prefDlg->m_onLogin->setChecked( m_onLogin );
@@ -109,7 +108,7 @@
  
          m_prefDlg->m_showTicks->setChecked( m_showTicks );
          m_prefDlg->m_showLabels->setChecked( m_showLabels );
-@@ -1031,6 +1040,7 @@
+@@ -1071,6 +1079,7 @@
      m_showDockWidget = prefDlg->m_dockingChk->isChecked();
      m_volumeWidget = prefDlg->m_volumeChk->isChecked();
      m_onLogin = prefDlg->m_onLogin->isChecked();
@@ -117,8 +116,8 @@
      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
+--- kmix/apps/kmix.h   2011-07-22 01:15:32.000000000 +0200
++++ kmix/apps/kmix.h   2011-08-01 14:27:20.867178846 +0200
 @@ -106,6 +106,7 @@
  
     bool m_showDockWidget;
@@ -128,7 +127,7 @@
     bool m_showLabels;
     bool m_onLogin;
 --- kmix/apps/main.cpp 2010-09-07 00:50:02.000000000 +0200
-+++ kmix/apps/main.cpp 2010-09-13 13:37:46.468783419 +0200
++++ kmix/apps/main.cpp 2011-08-01 14:27:20.867178846 +0200
 @@ -58,6 +58,7 @@
  
     KCmdLineOptions options;
@@ -147,7 +146,7 @@
     if (!KMixApp::start())
         return 0;
 --- kmix/gui/kmixprefdlg.cpp   2010-09-01 23:37:58.000000000 +0200
-+++ kmix/gui/kmixprefdlg.cpp   2010-09-13 13:37:46.469783421 +0200
++++ kmix/gui/kmixprefdlg.cpp   2011-08-01 14:27:20.868178847 +0200
 @@ -78,6 +78,12 @@
        m_onLogin = new QCheckBox( i18n("Restore volumes on login"), 
m_generalTab );
        l->addWidget( m_onLogin );
@@ -162,7 +161,7 @@
  
     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
++++ kmix/gui/kmixprefdlg.h     2011-08-01 14:27:20.868178847 +0200
 @@ -55,6 +55,7 @@
     QCheckBox *m_showTicks;
     QCheckBox *m_showLabels;

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to