Группа :: Графические оболочки/KDE
Пакет: kdemultimedia
Главная Изменения Спек Патчи Загрузить Bugs and FR
Патч: kdemultimedia-3.1-kscd_var_lib_cddb.patch
diff -pruN kdemultimedia-3.1.0.old/kscd/kscd.cpp kdemultimedia-3.1.0/kscd/kscd.cpp
--- kdemultimedia-3.1.0.old/kscd/kscd.cpp 2002-10-14 15:24:24 +0400
+++ kdemultimedia-3.1.0/kscd/kscd.cpp 2002-10-14 16:54:31 +0400
@@ -1721,11 +1721,7 @@ KSCD::readSettings()
cddb.setTimeout(config->readNumEntry("CDDBTimeout",60));
cddb_auto_enabled = config->readBoolEntry("CDDBLocalAutoSaveEnabled",true);
- cddbbasedir = config->readEntry("LocalBaseDir");
-
- // Changed global KDE apps dir by local KDE apps dir
- if (cddbbasedir.isEmpty())
- cddbbasedir = KGlobal::dirs()->resourceDirs("cddb").first();
+ cddbbasedir = "/var/lib/cddb/";
KGlobal::dirs()->addResourceDir("cddb", cddbbasedir);
// Set this to false by default. Look at the settings dialog source code
@@ -3170,9 +3166,7 @@ main( int argc, char *argv[] )
kapp->dcopClient()->setDefaultObject("CDPlayer");
- KGlobal::dirs()->addResourceType("cddb",
- KStandardDirs::kde_default("data") +
- "kscd/cddb/");
+ KGlobal::dirs()->addResourceType("cddb", "/var/lib/cddb/");
KSCD *k = new KSCD();
cur_track = 1;
diff -pruN kdemultimedia-3.1.0.old/kscd/Makefile.am kdemultimedia-3.1.0/kscd/Makefile.am
--- kdemultimedia-3.1.0.old/kscd/Makefile.am 2002-10-11 19:14:04 +0400
+++ kdemultimedia-3.1.0/kscd/Makefile.am 2002-10-14 16:49:25 +0400
@@ -3,7 +3,7 @@
mimedir = $(kde_mimedir)/text/
picsdir = $(kde_datadir)/kscd/pics/
appsdir = $(kde_appsdir)/Multimedia
-CDDBDIR = $(kde_datadir)/kscd/cddb/
+CDDBDIR = /var/lib/cddb/
LDFLAGS = $(LIB_KIO) $(all_libraries) $(KDE_RPATH)
kscd_LDADD = libwm/libworkman.la $(LIBCDROM) $(LIBCDAUDIO) $(LIBFPE) $(LIB_KIO) $(LIB_KDEUI)