Overview
last.fm.changes
Changed
x
1
2
-------------------------------------------------------------------
3
-Tue May 15 19:04:21 UTC 2012 - seife+obs@b1-systems.com
4
+Tue Oct 9 10:37:52 UTC 2012 - saschpe@suse.de
5
6
-- fix build with new (gcc4.7, > 12.1) and old (SLES11) compilers
7
+- Adjust last.fm-1.4.2.58240-fix-data-path.patch: Determine word size
8
+ at runtime (bnc#761991)
9
+- Adjust last.fm-1.4.2.58240-fix-includes.patch: GCC47 compatibility
10
11
-------------------------------------------------------------------
12
Fri Mar 30 14:13:32 UTC 2012 - saschpe@gmx.de
13
last.fm.spec
Changed
19
1
2
Patch1: %{name}-%{version}-link-z-and-X11.patch
3
Patch2: %{name}-%{version}-fix-data-path.patch
4
Patch3: %{name}-%{version}-disable-ipod-support.patch
5
-Patch4: last.fm-1.4.2.58240-gcc47.patch
6
-Patch5: last.fm-1.4.2.58240-old-gcc.patch
7
BuildRequires: alsa-devel
8
BuildRequires: fftw3-devel
9
BuildRequires: libmad-devel
10
11
%patch1 -p1
12
%patch2 -p1
13
%patch3 -p1
14
-%patch4 -p1
15
-%patch5 -p1
16
# Adjust installation destination directories:
17
sed -i -e "s|\$\$BIN_DIR/services|%{buildroot}%{_libdir}/%{name}/services|" \
18
-e "s|\$\$BIN_DIR/extensions|%{buildroot}%{_libdir}/%{name}/extensions|" definitions.pro.inc
19
last.fm-1.4.2.58240-fix-data-path.patch
Changed
51
1
2
-diff -ru a/src/libMoose/MooseCommon.cpp b/src/libMoose/MooseCommon.cpp
3
---- a/src/libMoose/MooseCommon.cpp 2007-12-18 15:18:19.000000000 +0100
4
-+++ b/src/libMoose/MooseCommon.cpp 2012-03-29 14:41:07.083624505 +0200
5
+diff -ruN a/src/libMoose/MooseCommon.cpp b/src/libMoose/MooseCommon.cpp
6
+--- a/src/libMoose/MooseCommon.cpp 2012-10-09 12:19:56.205286807 +0200
7
++++ b/src/libMoose/MooseCommon.cpp 2012-10-09 12:37:22.541892108 +0200
8
@@ -43,7 +43,7 @@
9
QString
10
dataPath( QString file )
11
12
#else
13
- dirPath = qApp->applicationDirPath() + "/services";
14
+ // Check if 32bit arch:
15
-+ #if UINTPTR_MAX == 0xffffffff
16
++ if (sizeof (void *) == 4) {
17
+ dirPath = "/usr/lib/last.fm/services";
18
-+ #else
19
++ } else {
20
+ dirPath = "/usr/lib64/last.fm/services";
21
-+ #endif
22
++ }
23
#endif
24
25
#ifndef QT_NO_DEBUG
26
-diff -ru a/src/settingsdialog.ui b/src/settingsdialog.ui
27
---- a/src/settingsdialog.ui 2007-12-18 15:18:19.000000000 +0100
28
-+++ b/src/settingsdialog.ui 2012-03-29 13:28:22.169520492 +0200
29
+diff -ruN a/src/settingsdialog.ui b/src/settingsdialog.ui
30
+--- a/src/settingsdialog.ui 2012-10-09 12:19:56.162286762 +0200
31
++++ b/src/settingsdialog.ui 2012-10-09 12:36:37.448870111 +0200
32
@@ -109,7 +109,7 @@
33
<string>Account</string>
34
</property>
35
<property name="icon" >
36
- <iconset>../data/icon.png</iconset>
37
-+ <iconset>/usr/share/last.fm/icon.png</iconset>
38
++ <iconset>/usr/share/last.fm/icon.png</iconset>
39
</property>
40
</item>
41
<item>
42
43
</property>
44
<property name="icon" >
45
- <iconset>../data/icon.png</iconset>
46
-+ <iconset>/usr/share/last.fm/icon.png</iconset>
47
++ <iconset>/usr/share/last.fm/icon.png</iconset>
48
</property>
49
</item>
50
<item>
51
last.fm-1.4.2.58240-fix-includes.patch
Changed
42
1
2
3
#include "MP3_Source_Qt.h"
4
#undef max // was definded in mad
5
+diff -ruN a/src/libUnicorn/Settings.h b/src/libUnicorn/Settings.h
6
+--- a/src/libUnicorn/Settings.h 2012-10-09 12:19:56.279286877 +0200
7
++++ b/src/libUnicorn/Settings.h 2012-10-09 12:42:17.996070306 +0200
8
+@@ -105,7 +105,7 @@
9
+ public:
10
+ MyQSettings( const UserSettings* const s )
11
+ {
12
+- beginGroup( s->username() );
13
++ this->beginGroup( s->username() );
14
+ }
15
+ };
16
+
17
+diff -ruN a/src/playerlistener.cpp b/src/playerlistener.cpp
18
+--- a/src/playerlistener.cpp 2012-10-09 12:19:56.162286762 +0200
19
++++ b/src/playerlistener.cpp 2012-10-09 12:46:25.156232833 +0200
20
+@@ -33,6 +33,10 @@
21
+ #include <iostream>
22
+ #include <algorithm>
23
+
24
++#ifndef WIN32
25
++ #include <unistd.h> // for close()
26
++#endif
27
++
28
+ using namespace std;
29
+
30
+
31
+--- a/src/lastfmapplication.cpp 2012-10-09 12:19:56.162286762 +0200
32
++++ b/src/lastfmapplication.cpp 2012-10-09 12:50:11.288393276 +0200
33
+@@ -53,6 +53,8 @@
34
+
35
+ #ifdef WIN32
36
+ #include <windows.h>
37
++#else
38
++ #include <unistd.h> // for usleep
39
+ #endif
40
+
41
+ #ifdef Q_WS_MAC
42
last.fm-1.4.2.58240-gcc47.patch
Deleted
51
1
2
-Index: b/src/libUnicorn/Settings.h
3
-===================================================================
4
---- a/src/libUnicorn/Settings.h
5
-+++ b/src/libUnicorn/Settings.h
6
-@@ -103,11 +103,11 @@ protected:
7
- class MyQSettings : public UsersSettings<T>
8
- {
9
- public:
10
- MyQSettings( const UserSettings* const s )
11
- {
12
-- beginGroup( s->username() );
13
-+ this->beginGroup( s->username() );
14
- }
15
- };
16
-
17
- private:
18
- QString m_username;
19
-Index: b/src/playerlistener.cpp
20
-===================================================================
21
---- a/src/playerlistener.cpp
22
-+++ b/src/playerlistener.cpp
23
-@@ -30,10 +30,11 @@
24
- #include "LastMessageBox.h"
25
-
26
- #include <sstream>
27
- #include <iostream>
28
- #include <algorithm>
29
-+#include <unistd.h>
30
-
31
- using namespace std;
32
-
33
-
34
- /******************************************************************************
35
-Index: b/src/lastfmapplication.cpp
36
-===================================================================
37
---- a/src/lastfmapplication.cpp
38
-+++ b/src/lastfmapplication.cpp
39
-@@ -48,10 +48,11 @@
40
- #include "mbid_mp3.h"
41
-
42
- #include <QTcpServer>
43
- #include <QTcpSocket>
44
- #include <QTimer>
45
-+#include <unistd.h>
46
-
47
- #ifdef WIN32
48
- #include <windows.h>
49
- #endif
50
-
51
last.fm-1.4.2.58240-old-gcc.patch
Deleted
18
1
2
-Index: b/src/libFingerprint/MP3_Source_Qt.cpp
3
-===================================================================
4
---- a/src/libFingerprint/MP3_Source_Qt.cpp
5
-+++ b/src/libFingerprint/MP3_Source_Qt.cpp
6
-@@ -23,10 +23,11 @@
7
- #include <limits>
8
- #include <sstream>
9
- #include <cassert>
10
- #include <stdexcept>
11
- #include <stdlib.h> // for abs()
12
-+#include <climits>
13
-
14
- #include "MP3_Source_Qt.h"
15
- #undef max // was definded in mad
16
-
17
- // -----------------------------------------------------------
18
Login required, please
login
or
signup
in order to comment
Request History
saschpe created request over 11 years ago
- Adjust last.fm-1.4.2.58240-fix-data-path.patch: Determine word size
at runtime (bnc#761991)
- Adjust last.fm-1.4.2.58240-fix-includes.patch: GCC47 compatibility
pbleser accepted request over 12 years ago
ok