Request 291 (accepted)

Overview

Request 291 (accepted)

- 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

Created by saschpe over 10 years ago
In state accepted

Submit last.fm

Submit package home:saschpe / last.fm to package Essentials / last.fm

last.fm.changes Changed

last.fm.spec Changed

last.fm-1.4.2.58240-fix-data-path.patch Changed

@@ -1,6 +1,6 @@
-diff -ru a/src/libMoose/MooseCommon.cpp b/src/libMoose/MooseCommon.cpp
---- a/src/libMoose/MooseCommon.cpp	2007-12-18 15:18:19.000000000 +0100
-+++ b/src/libMoose/MooseCommon.cpp	2012-03-29 14:41:07.083624505 +0200
+diff -ruN a/src/libMoose/MooseCommon.cpp b/src/libMoose/MooseCommon.cpp
+--- a/src/libMoose/MooseCommon.cpp	2012-10-09 12:19:56.205286807 +0200
++++ b/src/libMoose/MooseCommon.cpp	2012-10-09 12:37:22.541892108 +0200
 @@ -43,7 +43,7 @@
  QString
  dataPath( QString file )
@@ -16,23 +16,23 @@
      #else
 -        dirPath = qApp->applicationDirPath() + "/services";
 +        // Check if 32bit arch:
-+        #if UINTPTR_MAX == 0xffffffff
++        if (sizeof (void *) == 4) {
 +            dirPath = "/usr/lib/last.fm/services";
-+        #else
++        } else {
 +            dirPath = "/usr/lib64/last.fm/services";
-+        #endif
++        }
      #endif
  
      #ifndef QT_NO_DEBUG
-diff -ru a/src/settingsdialog.ui b/src/settingsdialog.ui
---- a/src/settingsdialog.ui	2007-12-18 15:18:19.000000000 +0100
-+++ b/src/settingsdialog.ui	2012-03-29 13:28:22.169520492 +0200
+diff -ruN a/src/settingsdialog.ui b/src/settingsdialog.ui
+--- a/src/settingsdialog.ui	2012-10-09 12:19:56.162286762 +0200
++++ b/src/settingsdialog.ui	2012-10-09 12:36:37.448870111 +0200
 @@ -109,7 +109,7 @@
           <string>Account</string>
          </property>
          <property name="icon" >
 -         <iconset>../data/icon.png</iconset>
-+          <iconset>/usr/share/last.fm/icon.png</iconset>
++         <iconset>/usr/share/last.fm/icon.png</iconset>
          </property>
         </item>
         <item>
@@ -41,7 +41,7 @@
          </property>
          <property name="icon" >
 -         <iconset>../data/icon.png</iconset>
-+          <iconset>/usr/share/last.fm/icon.png</iconset>
++         <iconset>/usr/share/last.fm/icon.png</iconset>
          </property>
         </item>
         <item>

last.fm-1.4.2.58240-fix-includes.patch Changed

@@ -31,3 +31,40 @@
  
  #include "MP3_Source_Qt.h"
  #undef max // was definded in mad
+diff -ruN a/src/libUnicorn/Settings.h b/src/libUnicorn/Settings.h
+--- a/src/libUnicorn/Settings.h	2012-10-09 12:19:56.279286877 +0200
++++ b/src/libUnicorn/Settings.h	2012-10-09 12:42:17.996070306 +0200
+@@ -105,7 +105,7 @@
+     public:
+         MyQSettings( const UserSettings* const s )
+         {
+-            beginGroup( s->username() );
++            this->beginGroup( s->username() );
+         }
+     };
+ 
+diff -ruN a/src/playerlistener.cpp b/src/playerlistener.cpp
+--- a/src/playerlistener.cpp	2012-10-09 12:19:56.162286762 +0200
++++ b/src/playerlistener.cpp	2012-10-09 12:46:25.156232833 +0200
+@@ -33,6 +33,10 @@
+ #include <iostream>
+ #include <algorithm>
+ 
++#ifndef WIN32
++    #include <unistd.h> // for close()
++#endif
++
+ using namespace std;
+ 
+ 
+--- a/src/lastfmapplication.cpp 2012-10-09 12:19:56.162286762 +0200
++++ b/src/lastfmapplication.cpp 2012-10-09 12:50:11.288393276 +0200
+@@ -53,6 +53,8 @@
+ 
+ #ifdef WIN32
+     #include <windows.h>
++#else
++    #include <unistd.h> // for usleep
+ #endif
+ 
+ #ifdef Q_WS_MAC

last.fm-1.4.2.58240-gcc47.patch Deleted

@@ -1,49 +0,0 @@
-Index: b/src/libUnicorn/Settings.h
-===================================================================
---- a/src/libUnicorn/Settings.h
-+++ b/src/libUnicorn/Settings.h
-@@ -103,11 +103,11 @@ protected:
-     class MyQSettings : public UsersSettings<T>
-     {
-     public:
-         MyQSettings( const UserSettings* const s )
-         {
--            beginGroup( s->username() );
-+            this->beginGroup( s->username() );
-         }
-     };
- 
- private:
-     QString m_username;
-Index: b/src/playerlistener.cpp
-===================================================================
---- a/src/playerlistener.cpp
-+++ b/src/playerlistener.cpp
-@@ -30,10 +30,11 @@
- #include "LastMessageBox.h"
- 
- #include <sstream>
- #include <iostream>
- #include <algorithm>
-+#include <unistd.h>
- 
- using namespace std;
- 
- 
- /******************************************************************************
-Index: b/src/lastfmapplication.cpp
-===================================================================
---- a/src/lastfmapplication.cpp
-+++ b/src/lastfmapplication.cpp
-@@ -48,10 +48,11 @@
- #include "mbid_mp3.h"
- 
- #include <QTcpServer>
- #include <QTcpSocket>
- #include <QTimer>
-+#include <unistd.h>
- 
- #ifdef WIN32
-     #include <windows.h>
- #endif
-

last.fm-1.4.2.58240-old-gcc.patch Deleted

Build Results
RPM Lint

Refresh

Mentioned Issues (1)

boo#761991

Comments for request 291 0

Request History

saschpe created request over 10 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 11 years ago