Author: shadzik Date: Sun May 11 16:47:36 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated
- by Daniel Horecki <shinden at linux dot pl>
---- Files affected:
SOURCES:
lastfm-radio-fhs.patch (1.2 -> 1.3)
---- Diffs:
================================================================
Index: SOURCES/lastfm-radio-fhs.patch
diff -u SOURCES/lastfm-radio-fhs.patch:1.2 SOURCES/lastfm-radio-fhs.patch:1.3
--- SOURCES/lastfm-radio-fhs.patch:1.2 Sat Jul 21 20:55:47 2007
+++ SOURCES/lastfm-radio-fhs.patch Sun May 11 18:47:31 2008
@@ -1,52 +1,31 @@
-diff -ur last.fm-1.3.0.58-o/src/container.cpp
last.fm-1.3.0.58/src/container.cpp
---- last.fm-1.3.0.58-o/src/container.cpp 2007-06-22 12:21:53.000000000
-0600
-+++ last.fm-1.3.0.58/src/container.cpp 2007-07-21 12:17:37.000000000 -0600
-@@ -977,7 +977,7 @@
+--- last.fm-1.4.2.58240/src/container.cpp.old 2008-05-11 00:13:16.000000000
+0200
++++ last.fm-1.4.2.58240/src/container.cpp 2008-05-11 00:13:50.000000000
+0200
+@@ -519,7 +519,7 @@
// Hack to get it working with VS2005
- dirPath = qApp->applicationDirPath();
+ QString path = qApp->applicationDirPath();
#else
-- dirPath = qApp->applicationDirPath() + "/extensions";
-+ dirPath = "/usr/lib/lastfm-radio/extensions";
+- QString path = qApp->applicationDirPath() + "/extensions";
++ QString path = "@LIB@/lastfm-radio/extensions";
#endif
#ifndef QT_NO_DEBUG
-diff -ur last.fm-1.3.0.58-o/src/libLastFmTools/containerutils.cpp
last.fm-1.3.0.58/src/libLastFmTools/containerutils.cpp
---- last.fm-1.3.0.58-o/src/libLastFmTools/containerutils.cpp 2007-06-22
12:21:53.000000000 -0600
-+++ last.fm-1.3.0.58/src/libLastFmTools/containerutils.cpp 2007-07-21
12:18:48.000000000 -0600
-@@ -67,7 +67,7 @@
-
- QString dataPath( QString file )
+--- last.fm-1.4.2.58240/src/libMoose/MooseCommon.cpp.old 2008-05-11
00:14:12.000000000 +0200
++++ last.fm-1.4.2.58240/src/libMoose/MooseCommon.cpp 2008-05-11
00:16:03.000000000 +0200
+@@ -43,7 +43,7 @@
+ QString
+ dataPath( QString file )
{
- return QApplication::applicationDirPath() + "/data/" + file;
-+ return QString("/usr/share/lastfm-radio/data/") + file;
++ return "@LIB@/lastfm-radio/data/" + file;
}
-@@ -76,7 +76,7 @@
- QString prefix;
- QString midfix;
-
-- prefix = QApplication::applicationDirPath();
-+ prefix = QString("/usr/share/lastfm-radio");
- #ifdef WIN32
- if ( ( QSysInfo::WindowsVersion & QSysInfo::WV_DOS_based ) == 0 )
- {
-@@ -102,7 +102,7 @@
- prefix = QDir::home().filePath( ".local/share/Last.fm" );
-
- #else
-- prefix = QApplication::applicationDirPath();
-+ prefix = QString("/usr/share/lastfm-radio");
- #endif
-
- QDir d( prefix );
-@@ -119,7 +119,7 @@
+@@ -108,7 +108,7 @@
// Hack to get it working with VS2005
dirPath = qApp->applicationDirPath();
#else
- dirPath = qApp->applicationDirPath() + "/services";
-+ dirPath = QString("/usr/lib/lastfm-radio/services");
++ dirPath = "@LIB@/lastfm-radio/services";
#endif
#ifndef QT_NO_DEBUG
-Only in last.fm-1.3.0.58/src/libLastFmTools: containerutils.cpp~
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/lastfm-radio-fhs.patch?r1=1.2&r2=1.3&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
