|
[-]
[+]
|
Changed |
amarok.spec
|
|
|
|
[-]
[+]
|
Deleted |
errmsg-mysql51-embedded.diff
^
|
| @@ -1,17 +0,0 @@
---- src/core-impl/collections/db/sql/mysqlecollection/MySqlEmbeddedStorage.cpp
-+++ src/core-impl/collections/db/sql/mysqlecollection/MySqlEmbeddedStorage.cpp
-@@ -64,12 +64,12 @@ MySqlEmbeddedStorage::MySqlEmbeddedStorage( const QString &storageLocation )
- // CAUTION: if we ever change the table type we will need to fix a number of MYISAM specific
- // functions, such as FULLTEXT indexing.
- out << "default-storage-engine = MyISAM" << endl;
-- out << "loose-innodb = 0" << endl;
-+ out << "language=/usr/share/kde4/apps/amarok" << endl;
- out << "skip-grant-tables = 1" << endl;
- out << "myisam-recover = FORCE" << endl;
- out << "key_buffer_size = 16777216" << endl; // (16Mb)
- out << "character-set-server = utf8" << endl;
-- out << "collation-server = utf8_bin" << endl;
-+ out << "collation-server = utf8_unicode_ci" << endl;
- //If the file is world-writable MySQL won't even read it
- df.setPermissions( QFile::ReadOwner | QFile::WriteOwner | QFile::ReadGroup | QFile::ReadOther );
- df.close();
|
|
[-]
[+]
|
Changed |
flac_mimetype_bnc671581.diff
^
|
| @@ -1,6 +1,8 @@
---- src/amarok.desktop 2011-01-11 16:58:05.000000000 +0100
-+++ src/amarok.desktop_patched 2011-02-15 21:44:08.000000000 +0100
-@@ -176,7 +176,7 @@
+Index: src/amarok.desktop
+===================================================================
+--- src/amarok.desktop.orig
++++ src/amarok.desktop
+@@ -184,7 +184,7 @@ Comment[zh_TW]=Amarok - 重新探索您
Icon=amarok
# Add pure audio formats here, for other formats see amarok_*.desktop files
# See bug 242292
@@ -8,4 +10,4 @@
+MimeType=audio/aac;audio/mp4;audio/mpeg;audio/mpegurl;audio/vnd.rn-realaudio;audio/vorbis;audio/flac;audio/x-mp3;audio/x-mpegurl;audio/x-ms-wma;audio/x-musepack;audio/x-oggflac;audio/x-pn-realaudio;audio/x-scpls;audio/x-speex;audio/x-vorbis;audio/x-wav;application/x-ogm-audio;audio/x-vorbis+ogg;audio/ogg;
X-DocPath=amarok/index.html
X-KDE-Keywords=music,podcast
- X-KDE-Protocols=http
+ X-KDE-Keywords[ca]=música,podcast
|
|
[-]
[+]
|
Changed |
initial-preference.diff
^
|
| @@ -2,9 +2,9 @@
===================================================================
--- src/amarok.desktop.orig
+++ src/amarok.desktop
-@@ -180,5 +180,6 @@ MimeType=audio/aac;audio/mp4;audio/mpeg;
- X-DocPath=amarok/index.html
- X-KDE-Keywords=music,podcast
+@@ -196,5 +196,6 @@ X-KDE-Keywords[uk]=music,podcast,мÑзÐ
+ X-KDE-Keywords[x-test]=xxmusic,podcastxx
+ X-KDE-Keywords[zh_TW]=music,podcast
X-KDE-Protocols=http
+InitialPreference=5
Terminal=false
|
|
[-]
[+]
|
Deleted |
ksuseinstall.diff
^
|
| @@ -1,74 +0,0 @@
-diff -uNr amarok-2.4.3.orig/src/CMakeLists.txt amarok-2.4.3/src/CMakeLists.txt
---- amarok-2.4.3.orig/src/CMakeLists.txt 2011-07-28 16:04:45.000000000 +0300
-+++ amarok-2.4.3/src/CMakeLists.txt 2011-08-01 20:24:43.751000029 +0300
-@@ -918,6 +918,7 @@
- amarokcore
- amarokocsclient
- amarok-transcoding
-+ ksuseinstall
- )
-
- if( TAGLIB_FOUND )
-diff -uNr amarok-2.4.3.orig/src/EngineController.cpp amarok-2.4.3/src/EngineController.cpp
---- amarok-2.4.3.orig/src/EngineController.cpp 2011-07-28 16:04:45.000000000 +0300
-+++ amarok-2.4.3/src/EngineController.cpp 2011-08-01 20:28:18.760000029 +0300
-@@ -54,6 +54,8 @@
- #include <QTextDocument>
- #include <QtCore/qmath.h>
-
-+#include <ksuseinstall.h>
-+
- namespace The {
- EngineController* engineController() { return EngineController::instance(); }
- }
-@@ -280,6 +282,7 @@
- bool
- EngineController::installDistroCodec()
- {
-+#if 0
- KService::List services = KServiceTypeTrader::self()->query( "Amarok/CodecInstall"
- , QString( "[X-KDE-Amarok-codec] == 'mp3' and [X-KDE-Amarok-engine] == 'phonon-%1'").arg( "xine" ) );
- //todo - figure out how to query Phonon for the current backend loaded
-@@ -289,6 +292,12 @@
- QString installScript = service->exec();
- if( !installScript.isNull() ) //just a sanity check
- {
-+#else
-+ // amarok restart may be required, do not complain repeatedly in such case
-+ static bool alreadyDone = false;
-+ if( alreadyDone )
-+ return true;
-+#endif
- KGuiItem installButton( i18n( "Install MP3 Support" ) );
- if(KMessageBox::questionYesNo( The::mainWindow()
- , i18n("Amarok currently cannot play MP3 files. Do you want to install support for MP3?")
-@@ -297,11 +306,29 @@
- , KStandardGuiItem::no()
- , "codecInstallWarning" ) == KMessageBox::Yes )
- {
-+#if 0
- KRun::runCommand(installScript, 0);
- return true;
-+#else
-+ if( KSUSEInstall::installCapabilities( QStringList() << "libxine1-codecs",
-+ KSUSEInstall::FullInstallRequired, The::mainWindow()))
-+ { // TODO use the items
-+ KGuiItem restartNowGuiItem( KStandardGuiItem::yes());
-+ restartNowGuiItem.setText( i18nc( "@action:button", "Restart Now" ));
-+ KGuiItem restartLaterGuiItem( KStandardGuiItem::no());
-+ restartLaterGuiItem.setText( i18nc( "@action:button", "Restart Later" ));
-+ KMessageBox::information( The::mainWindow(),
-+ i18n( "The necessary support has been successfully installed."
-+ " It may be necessary to restart the application for the support to be activated." ));
-+ alreadyDone = true;
-+ return true;
-+ }
-+#endif
- }
-+#if 0
- }
- }
-+#endif
-
- return false;
- }
|
|
[-]
[+]
|
Added |
revert_solid_workaround.diff
^
|
| @@ -0,0 +1,83 @@
+diff --git a/src/MediaDeviceCache.cpp b/src/MediaDeviceCache.cpp
+index 15583b8..8682f4d 100644
+--- a/src/MediaDeviceCache.cpp
++++ b/src/MediaDeviceCache.cpp
+@@ -50,10 +50,10 @@
+ {
+ DEBUG_BLOCK
+ s_instance = this;
+- connect( Solid::DeviceNotifier::instance(), SIGNAL( deviceAdded( const QString & ) ),
+- this, SLOT( slotAddSolidDevice( const QString & ) ) );
+- connect( Solid::DeviceNotifier::instance(), SIGNAL( deviceRemoved( const QString & ) ),
+- this, SLOT( slotRemoveSolidDevice( const QString & ) ) );
++ connect( Solid::DeviceNotifier::instance(), SIGNAL( deviceAdded( QString & ) ),
++ this, SLOT( slotAddSolidDevice( QString & ) ) );
++ connect( Solid::DeviceNotifier::instance(), SIGNAL( deviceRemoved( QString & ) ),
++ this, SLOT( slotRemoveSolidDevice( QString & ) ) );
+ }
+
+ MediaDeviceCache::~MediaDeviceCache()
+@@ -92,19 +92,17 @@
+ {
+ if( !m_volumes.contains( device.udi() ) )
+ {
+- connect( ssa, SIGNAL( accessibilityChanged(bool, const QString&) ),
+- this, SLOT( slotAccessibilityChanged(bool, const QString&) ) );
++ connect( ssa, SIGNAL( accessibilityChanged(bool, QString&) ),
++ this, SLOT( slotAccessibilityChanged(bool, QString&) ) );
+ m_volumes.append( device.udi() );
+ }
+ if( ssa->isAccessible() )
+ {
+ m_type[device.udi()] = MediaDeviceCache::SolidVolumeType;
+ m_name[device.udi()] = ssa->filePath();
+- m_accessibility[ device.udi() ] = true;
+ }
+ else
+ {
+- m_accessibility[ device.udi() ] = false;
+ debug() << "Solid device is not accessible, will wait until it is to consider it added.";
+ }
+ }
+@@ -194,8 +192,8 @@
+ debug() << "volume is generic storage";
+ if( !m_volumes.contains( device.udi() ) )
+ {
+- connect( ssa, SIGNAL( accessibilityChanged(bool, const QString&) ),
+- this, SLOT( slotAccessibilityChanged(bool, const QString&) ) );
++ connect( ssa, SIGNAL( accessibilityChanged(bool, QString&) ),
++ this, SLOT( slotAccessibilityChanged(bool, QString&) ) );
+ m_volumes.append( device.udi() );
+ }
+ if( ssa->isAccessible() )
+@@ -267,8 +265,8 @@
+ Solid::Device device( udi );
+ if( m_volumes.contains( udi ) )
+ {
+- disconnect( device.as<Solid::StorageAccess>(), SIGNAL( accessibilityChanged(bool, const QString&) ),
+- this, SLOT( slotAccessibilityChanged(bool, const QString&) ) );
++ disconnect( device.as<Solid::StorageAccess>(), SIGNAL( accessibilityChanged(bool, QString&) ),
++ this, SLOT( slotAccessibilityChanged(bool, QString&) ) );
+ m_volumes.removeAll( udi );
+ emit deviceRemoved( udi );
+ }
+diff --git a/src/MediaDeviceCache.h b/src/MediaDeviceCache.h
+index a48d453..0e971cc 100644
+--- a/src/MediaDeviceCache.h
++++ b/src/MediaDeviceCache.h
+@@ -23,7 +23,6 @@
+ #include <QMap>
+ #include <QString>
+ #include <QStringList>
+-#include <QtCore/QTimer>
+
+ namespace Solid {
+ class Device;
+@@ -67,7 +66,6 @@
+ private:
+ QMap<QString, MediaDeviceCache::DeviceType> m_type;
+ QMap<QString, QString> m_name;
+- QMap<QString, bool> m_accessibility;
+ QStringList m_volumes;
+ static MediaDeviceCache* s_instance;
+ };
|
|
|
Changed |
amarok-2.6.0.tar.bz2
^
|
