[packages/clementine] up to 1.2.1

glen glen at pld-linux.org
Sun Jan 12 18:30:05 CET 2014


commit 1aea93ea289f3b1d8b7d695a4aac426ef0cbd0e2
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sun Jan 12 19:29:23 2014 +0200

    up to 1.2.1

 clementine-1.1.1-libimobiledevice-fix.patch | 12 -----
 clementine-desktop.patch                    | 18 +++++--
 clementine-mygpo.patch                      | 76 +++++++++++++++++++++++------
 clementine.spec                             | 24 ++++-----
 unbundle-po.patch                           | 32 ++++++------
 5 files changed, 103 insertions(+), 59 deletions(-)
---
diff --git a/clementine.spec b/clementine.spec
index d3bdd0a..0870a26 100644
--- a/clementine.spec
+++ b/clementine.spec
@@ -17,19 +17,18 @@
 Summary:	A music player and library organiser
 Summary(hu.UTF-8):	Egy zenelejátszó és gyűjtemény-kezelő
 Name:		clementine
-Version:	1.1.1
-Release:	7
+Version:	1.2.1
+Release:	1
 License:	GPL v3 and GPL v2+
 Group:		Applications/Multimedia
-URL:		http://www.clementine-player.org/
 Source0:	http://clementine-player.googlecode.com/files/%{name}-%{version}.tar.gz
-# Source0-md5:	28e4afb822388bd337a761db8f86febf
+# Source0-md5:	5d079e12f5925845cc7e38ce2f4a1e20
 Patch0:		desktop-install.patch
 Patch1:		unbundle-po.patch
-Patch2:		%{name}-1.1.1-libimobiledevice-fix.patch
 Patch3:		%{name}-dt_categories.patch
 Patch4:		%{name}-mygpo.patch
 Patch5:		%{name}-desktop.patch
+URL:		http://www.clementine-player.org/
 BuildRequires:	QtCore-devel >= %{qtver}
 BuildRequires:	QtDBus-devel >= %{qtver}
 BuildRequires:	QtGui-devel >= %{qtver}
@@ -58,7 +57,7 @@ BuildRequires:	libimobiledevice-devel >= 1.1.5
 BuildRequires:	libindicate-qt-devel
 BuildRequires:	liblastfm-devel >= 0.3.3
 BuildRequires:	libmtp-devel
-BuildRequires:	libmygpo-qt-devel
+BuildRequires:	libmygpo-qt-devel >= 1.0.7
 BuildRequires:	libplist-devel
 %{!?with_static_projectm:BuildRequires:	libprojectM-devel >= 1:2.0.1-4}
 BuildRequires:	libqxt-devel
@@ -87,7 +86,6 @@ Requires:	QtSingleApplication >= 2.6-4
 Requires:	gstreamer0.10-audio-effects-base
 Requires:	gstreamer0.10-mad
 Suggests:	gstreamer0.10-flac
-
 # while we do not link (yet), we use datafiles
 Requires:	libprojectM
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -109,16 +107,20 @@ a Qt4 előnyeit.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
 
-# Remove all 3rdparty libraries exceph universalchardet
-# as it is not available as a separate library.
+# Remove all 3rdparty libraries except:
+# - universalchardet - not available as a separate library.
+# - libprojectM - ?
+# - sah2 - ?
+# - libechonest - ?
+# - qocoa - ?
+# - qsqlite - ?
 mv 3rdparty 3rdparty.keep
 install -d 3rdparty
-mv 3rdparty.keep/{universalchardet,sha2,libechonest,qocoa%{?with_static_sqlite:,qsqlite}%{?with_static_projectm:,libprojectM}} 3rdparty
+mv 3rdparty.keep/{sha2,libechonest,qocoa%{?with_static_sqlite:,qsqlite}%{?with_static_projectm:,libprojectM}} 3rdparty
 
 # Don't build tests. They require gmock
 sed -i -e '/add_subdirectory(tests)/d' CMakeLists.txt
diff --git a/clementine-1.1.1-libimobiledevice-fix.patch b/clementine-1.1.1-libimobiledevice-fix.patch
deleted file mode 100644
index da7722f..0000000
--- a/clementine-1.1.1-libimobiledevice-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up clementine-1.1.1/src/devices/imobiledeviceconnection.h.fix clementine-1.1.1/src/devices/imobiledeviceconnection.h
---- clementine-1.1.1/src/devices/imobiledeviceconnection.h.fix	2013-04-23 14:44:56.932661018 -0400
-+++ clementine-1.1.1/src/devices/imobiledeviceconnection.h	2013-04-23 14:46:44.033657190 -0400
-@@ -51,7 +51,7 @@ private:
-   idevice_t device_;
-   afc_client_t afc_;
- 
--  uint16_t afc_port_;
-+  lockdownd_service_descriptor_t afc_port_;
- };
- 
- #endif // IMOBILEDEVICECONNECTION_H
diff --git a/clementine-desktop.patch b/clementine-desktop.patch
index 434ef4e..40636f1 100644
--- a/clementine-desktop.patch
+++ b/clementine-desktop.patch
@@ -1,6 +1,6 @@
---- clementine-1.1.1/dist/clementine.desktop.orig	2012-10-11 05:16:39.000000000 -0600
-+++ clementine-1.1.1/dist/clementine.desktop	2013-02-24 10:20:27.771542899 -0700
-@@ -15,27 +15,27 @@
+--- clementine-1.2.1/dist/clementine.desktop~	2014-01-12 14:47:14.000000000 +0200
++++ clementine-1.2.1/dist/clementine.desktop	2014-01-12 14:47:55.658182678 +0200
+@@ -17,7 +17,7 @@
  MimeType=application/ogg;application/x-ogg;application/x-ogm-audio;audio/aac;audio/mp4;audio/mpeg;audio/mpegurl;audio/ogg;audio/vnd.rn-realaudio;audio/vorbis;audio/x-flac;audio/x-mp3;audio/x-mpeg;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-vorbis+ogg;audio/x-wav;video/x-ms-asf;x-content/audio-player;x-scheme-handler/zune;x-scheme-handler/itpc;x-scheme-handler/itms;x-scheme-handler/feed;
  X-Ayatana-Desktop-Shortcuts=Play;Pause;Stop;Previous;Next;
  
@@ -9,24 +9,36 @@
  Name=Play
  Exec=clementine --play
  TargetEnvironment=Unity
+@@ -66,7 +66,7 @@
+ Name[zh_CN]=播放
+ Name[zh_TW]=播放
  
 -[Pause Shortcut Group]
 +[X-Pause Shortcut Group]
  Name=Pause
  Exec=clementine --pause
  TargetEnvironment=Unity
+@@ -110,7 +110,7 @@
+ Name[zh_CN]=暂停
+ Name[zh_TW]=暫停
  
 -[Stop Shortcut Group]
 +[X-Stop Shortcut Group]
  Name=Stop
  Exec=clementine --stop
  TargetEnvironment=Unity
+@@ -157,7 +157,7 @@
+ Name[zh_CN]=停止
+ Name[zh_TW]=停止
  
 -[Previous Shortcut Group]
 +[X-Previous Shortcut Group]
  Name=Previous
  Exec=clementine --previous
  TargetEnvironment=Unity
+@@ -203,7 +203,7 @@
+ Name[zh_CN]=上一首
+ Name[zh_TW]=往前
  
 -[Next Shortcut Group]
 +[X-Next Shortcut Group]
diff --git a/clementine-mygpo.patch b/clementine-mygpo.patch
index 7a4cdf3..cb99156 100644
--- a/clementine-mygpo.patch
+++ b/clementine-mygpo.patch
@@ -1,15 +1,61 @@
-diff -up clementine-1.1.1/CMakeLists.txt.mygpo clementine-1.1.1/CMakeLists.txt
---- clementine-1.1.1/CMakeLists.txt.mygpo	2012-11-18 01:51:26.000000000 -0700
-+++ clementine-1.1.1/CMakeLists.txt	2013-02-24 10:49:15.852174934 -0700
-@@ -394,9 +394,9 @@ if(NOT CHROMAPRINT_FOUND)
- endif(NOT CHROMAPRINT_FOUND)
- 
- # We have to use our own libmygpo-qt for now
--add_subdirectory(3rdparty/libmygpo-qt)
-+#add_subdirectory(3rdparty/libmygpo-qt)
- set(MYGPOQT_LIBRARIES mygpo-qt)
--set(MYGPOQT_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/3rdparty/libmygpo-qt/)
-+set(MYGPOQT_INCLUDE_DIRS /usr/include/mygpo-qt/)
- 
- # Qocoa
- add_subdirectory(3rdparty/qocoa)
+diff -up clementine-1.2.1/src/podcasts/gpoddersearchpage.h.mygpo-qt clementine-1.2.1/src/podcasts/gpoddersearchpage.h
+--- clementine-1.2.1/src/podcasts/gpoddersearchpage.h.mygpo-qt	2012-07-17 12:27:37.000000000 -0500
++++ clementine-1.2.1/src/podcasts/gpoddersearchpage.h	2014-01-03 10:40:37.672459609 -0600
+@@ -20,7 +20,7 @@
+ 
+ #include "addpodcastpage.h"
+ 
+-#include <ApiRequest.h>
++#include <mygpo-qt/ApiRequest.h>
+ 
+ class QNetworkAccessManager;
+ 
+diff -up clementine-1.2.1/src/podcasts/gpoddersync.cpp.mygpo-qt clementine-1.2.1/src/podcasts/gpoddersync.cpp
+diff -up clementine-1.2.1/src/podcasts/gpoddersync.h.mygpo-qt clementine-1.2.1/src/podcasts/gpoddersync.h
+--- clementine-1.2.1/src/podcasts/gpoddersync.h.mygpo-qt	2012-07-17 12:27:37.000000000 -0500
++++ clementine-1.2.1/src/podcasts/gpoddersync.h	2014-01-03 10:40:43.813394301 -0600
+@@ -27,7 +27,7 @@
+ #include <QSharedPointer>
+ #include <QUrl>
+ 
+-#include <ApiRequest.h>
++#include <mygpo-qt/ApiRequest.h>
+ 
+ class Application;
+ class Podcast;
+diff -up clementine-1.2.1/src/podcasts/gpoddertoptagsmodel.cpp.mygpo-qt clementine-1.2.1/src/podcasts/gpoddertoptagsmodel.cpp
+--- clementine-1.2.1/src/podcasts/gpoddertoptagsmodel.cpp.mygpo-qt	2012-07-17 12:27:37.000000000 -0500
++++ clementine-1.2.1/src/podcasts/gpoddertoptagsmodel.cpp	2014-01-03 10:40:13.074721207 -0600
+@@ -20,7 +20,7 @@
+ #include "podcast.h"
+ #include "core/closure.h"
+ 
+-#include <ApiRequest.h>
++#include <mygpo-qt/ApiRequest.h>
+ 
+ #include <QMessageBox>
+ 
+diff -up clementine-1.2.1/src/podcasts/gpoddertoptagspage.h.mygpo-qt clementine-1.2.1/src/podcasts/gpoddertoptagspage.h
+--- clementine-1.2.1/src/podcasts/gpoddertoptagspage.h.mygpo-qt	2012-07-17 12:27:37.000000000 -0500
++++ clementine-1.2.1/src/podcasts/gpoddertoptagspage.h	2014-01-03 10:40:48.849340744 -0600
+@@ -20,7 +20,7 @@
+ 
+ #include <QScopedPointer>
+ 
+-#include <ApiRequest.h>
++#include <mygpo-qt/ApiRequest.h>
+ 
+ #include "addpodcastpage.h"
+ 
+diff -up clementine-1.2.1/src/podcasts/podcast.cpp.mygpo-qt clementine-1.2.1/src/podcasts/podcast.cpp
+--- clementine-1.2.1/src/podcasts/podcast.cpp.mygpo-qt	2012-07-17 12:27:37.000000000 -0500
++++ clementine-1.2.1/src/podcasts/podcast.cpp	2014-01-03 10:44:12.865171582 -0600
+@@ -21,7 +21,7 @@
+ #include <QDataStream>
+ #include <QDateTime>
+ 
+-#include <Podcast.h>
++#include <mygpo-qt/Podcast.h>
+ 
+ const QStringList Podcast::kColumns = QStringList()
+     << "url" << "title" << "description" << "copyright" << "link"
diff --git a/unbundle-po.patch b/unbundle-po.patch
index 7bba8cd..aa8b930 100644
--- a/unbundle-po.patch
+++ b/unbundle-po.patch
@@ -39,8 +39,8 @@ Author: Elan Ruusamäe <glen at pld-linux.org>
    LoadTranslation("clementine", QDir::currentPath(), language);
  
    // Icons
---- clementine-0.5.3/src/ui/behavioursettingspage.cpp~	2010-10-19 11:24:36.488320486 +0300
-+++ clementine-0.5.3/src/ui/behavioursettingspage.cpp	2010-10-19 11:24:40.594127569 +0300
+--- clementine-1.2.1/src/ui/behavioursettingspage.cpp~	2014-01-12 14:32:52.000000000 +0200
++++ clementine-1.2.1/src/ui/behavioursettingspage.cpp	2014-01-12 14:40:18.083783760 +0200
 @@ -21,6 +21,7 @@
  #include "playlist/playlist.h"
  
@@ -49,36 +49,32 @@ Author: Elan Ruusamäe <glen at pld-linux.org>
  
  
  BehaviourSettingsPage::BehaviourSettingsPage(SettingsDialog* dialog)
-@@ -93,15 +93,22 @@
+@@ -51,17 +51,15 @@
+   ui_->menu_playmode->setItemData(1, MainWindow::PlayBehaviour_IfStopped);
+   ui_->menu_playmode->setItemData(2, MainWindow::PlayBehaviour_Always);
  
-   // Populate the language combo box.  We do this by looking at all the
-   // compiled in translations.
+-  // Populate the language combo box.  We do this by looking at all the
+-  // compiled in translations.
 -  QDir dir(":/translations/");
 -  QStringList codes(dir.entryList(QStringList() << "*.qm"));
 -  QRegExp lang_re("^clementine_(.*).qm$");
 -  foreach (const QString& filename, codes) {
 -    // The regex captures the "ru" from "clementine_ru.qm"
 -    if (!lang_re.exactMatch(filename))
-+//  QDir dir(":/translations/");
+-      continue;
++  // Populate the language combo box
++  // We do this by looking at all the compiled in translations.
 +  QDir localeDir(QLibraryInfo::location(QLibraryInfo::TranslationsPath));
 +  QStringList dirList = localeDir.entryList(QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name);
 +  foreach (const QString& code, dirList) {
 +    if (!QFile::exists(QLibraryInfo::location(QLibraryInfo::TranslationsPath) + "/" + code + "/LC_MESSAGES/clementine.qm")) {
-       continue;
++       continue;
 +    }
  
 -    QString code = lang_re.cap(1);
-+//  QStringList codes(dir.entryList(QStringList() << "*.qm"));
-+//  QRegExp lang_re("^clementine_(.*).qm$");
-+//  foreach (const QString& filename, codes) {
-+//    // The regex captures the "ru" from "clementine_ru.qm"
-+//    if (!lang_re.exactMatch(filename))
-+//      continue;
-+
-+//    QString code = lang_re.cap(1);
-     QString name = QString("%1 (%2)").arg(
-         QLocale::languageToString(QLocale(code).language()), code);
- 
+     QString language_name = QLocale::languageToString(QLocale(code).language());
+ #if QT_VERSION >= 0x040800
+     QString native_name = QLocale(code).nativeLanguageName();
 --- clementine-0.5.3/cmake/Translations.cmake	2010-10-18 23:59:53.487509786 +0300
 +++ clementine-0.5.3/cmake/Translations.cmake	2010-10-19 01:42:52.112825900 +0300
 @@ -65,10 +65,22 @@
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/clementine.git/commitdiff/1aea93ea289f3b1d8b7d695a4aac426ef0cbd0e2



More information about the pld-cvs-commit mailing list