[packages/clementine/dev-1.3: 1/7] up to 1.3.0rc1
glen
glen at pld-linux.org
Wed Jan 20 23:15:58 CET 2016
commit ce2dc7f31b9fc1408fe3b6413d7d3ccd7c89aaaf
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Wed Jan 20 23:38:44 2016 +0200
up to 1.3.0rc1
clementine-dt_categories.patch | 12 ------------
clementine.spec | 29 ++++++++++++++---------------
desktop-install.patch | 24 ------------------------
unbundle-po.patch | 35 ++++++++++++++++++-----------------
4 files changed, 32 insertions(+), 68 deletions(-)
---
diff --git a/clementine.spec b/clementine.spec
index cad2dae..4af5e95 100644
--- a/clementine.spec
+++ b/clementine.spec
@@ -1,7 +1,7 @@
# TODO:
# - Gstreamer error: "A text/uri-list decoder plugin is required to play this stream, but not installed."
# - apply patches to libprojectM.spec and use
-# - package for kde4 stuff (or nuke them):
+# - sub-package for kde4 stuff (or nuke them):
# /usr/share/kde4/services/clementine-feed.protocol
# /usr/share/kde4/services/clementine-itms.protocol
# /usr/share/kde4/services/clementine-itpc.protocol
@@ -13,19 +13,19 @@
%bcond_with libspotify # build with system libspotify instead of downloading blob
%bcond_without tests # build without tests
+%define rel 0.1
+%define subver rc1
%define qtver %(pkg-config --silence-errors --modversion QtCore 2>/dev/null || echo ERROR)
Summary: A music player and library organiser
Summary(hu.UTF-8): Egy zenelejátszó és gyűjtemény-kezelő
Name: clementine
-Version: 1.2.3
-Release: 2
+Version: 1.3.0
+Release: 0.%{subver}.%{rel}
License: GPL v3 and GPL v2+
Group: Applications/Multimedia
-Source0: https://github.com/clementine-player/Clementine/archive/%{version}.tar.gz?/%{name}-%{version}.tar.gz
-# Source0-md5: 725b92ad4699de1b2ffdf48fe01ed092
-Patch0: desktop-install.patch
+Source0: https://github.com/clementine-player/Clementine/releases/download/1.3rc1/%{name}-%{version}%{subver}.tar.xz
+# Source0-md5: c709615f6c5061e5ff1f43bbb1f9255a
Patch1: unbundle-po.patch
-Patch3: %{name}-dt_categories.patch
Patch4: %{name}-mygpo.patch
Patch5: %{name}-desktop.patch
Patch6: %{name}-udisks-headers.patch
@@ -79,6 +79,8 @@ BuildRequires: sed >= 4.0
BuildRequires: sparsehash-devel
%{!?with_static_sqlite:BuildRequires: sqlite3-devel}
BuildRequires: taglib-devel >= 1.6
+BuildRequires: tar >= 1:1.22
+BuildRequires: xz
Requires(post,postun): desktop-file-utils
Requires(post,postun): gtk-update-icon-cache
Requires(post,postun): hicolor-icon-theme
@@ -105,13 +107,11 @@ az Amarok 1.4 port-ja, néhány funkciója újraírva, hogy kihasználhassa
a Qt4 előnyeit.
%prep
-%setup -q -n Clementine-%{version}
-%patch0 -p1
+%setup -q -n %{name}-%{version}%{subver}
%patch1 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
+#%patch4 -p1
+#%patch5 -p1
+#%patch6 -p1
# Remove all 3rdparty libraries except:
# - universalchardet - not available as a separate library.
@@ -138,8 +138,6 @@ vendor sha2 qocoa
sed -i -e '/add_subdirectory(tests)/d' CMakeLists.txt
# remove -Wall
sed -i -e 's/-Wall//' src/CMakeLists.txt
-# ...and -Werror
-sed -i -e 's/-Werror//' src/CMakeLists.txt
%build
install -d build
@@ -148,6 +146,7 @@ cd build
# as our buildtype is not Release, need to pass these manually. see CMakeLists.txt ~125
CXXFLAGS="%{rpmcxxflags} -DNDEBUG -DQT_NO_DEBUG_OUTPUT"
%cmake \
+ -DBUILD_WERROR:BOOL=OFF \
-DCMAKE_INCLUDE_PATH=%{_includedir}/qt4 \
-DBUNDLE_PROJECTM_PRESETS=OFF \
-DUSE_SYSTEM_QTSINGLEAPPLICATION=ON \
diff --git a/clementine-dt_categories.patch b/clementine-dt_categories.patch
deleted file mode 100644
index 9cfc4b5..0000000
--- a/clementine-dt_categories.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up clementine-1.1.1/dist/clementine.desktop.dt_categories clementine-1.1.1/dist/clementine.desktop
---- clementine-1.1.1/dist/clementine.desktop.dt_categories 2013-09-04 09:22:46.473387810 -0500
-+++ clementine-1.1.1/dist/clementine.desktop 2013-09-04 09:36:29.172687094 -0500
-@@ -10,7 +10,7 @@ Exec=clementine %U
- TryExec=clementine
- Icon=application-x-clementine
- Terminal=false
--Categories=AudioVideo;Player;Qt;
-+Categories=AudioVideo;Audio;Player;Qt;
- StartupNotify=false
- 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;
diff --git a/desktop-install.patch b/desktop-install.patch
deleted file mode 100644
index 1452675..0000000
--- a/desktop-install.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- clementine-0.2/dist/clementine.desktop~ 2010-01-18 00:12:17.000000000 +0200
-+++ clementine-0.2/dist/clementine.desktop 2010-04-24 14:09:59.250159909 +0300
-@@ -6,7 +6,7 @@
- Comment=Plays music and last.fm streams
- Exec=clementine
- TryExec=clementine
--Icon=application-x-clementine
-+Icon=clementine
- Terminal=false
- Categories=AudioVideo;Player;Qt;
- StartupNotify=false
---- clementine-0.5.90/dist/CMakeLists.txt~ 2010-10-24 16:16:44.000000000 +0300
-+++ clementine-0.5.90/dist/CMakeLists.txt 2010-12-09 00:20:22.298618631 +0200
-@@ -14,8 +14,8 @@
-
- if (NOT APPLE)
- install(FILES clementine_64.png
-- DESTINATION share/icons/hicolor/64x64/apps/
-- RENAME application-x-clementine.png
-+ DESTINATION share/pixmaps
-+ RENAME clementine.png
- )
-
- install(FILES ../data/icon.svg
diff --git a/unbundle-po.patch b/unbundle-po.patch
index aa8b930..7cb3704 100644
--- a/unbundle-po.patch
+++ b/unbundle-po.patch
@@ -12,8 +12,8 @@ TODO: make it configurable via cmake params.
Author: Elan Ruusamäe <glen at pld-linux.org>
---- clementine-0.5.3/src/main.cpp~ 2010-10-18 23:59:12.000000000 +0300
-+++ clementine-0.5.3/src/main.cpp 2010-10-18 23:59:15.876170584 +0300
+--- clementine-1.3.0rc1/src/main.cpp~ 2016-01-20 17:03:12.000000000 +0200
++++ clementine-1.3.0rc1/src/main.cpp 2016-01-20 17:04:21.767206898 +0200
@@ -176,7 +176,7 @@
// Resources
@@ -23,12 +23,14 @@ Author: Elan Ruusamäe <glen at pld-linux.org>
// Has the user forced a different language?
QString language = options.language();
-@@ -187,9 +187,15 @@
- }
+@@ -417,10 +417,15 @@
+ : override_language;
// Translations
+- LoadTranslation("qt", QLibraryInfo::location(QLibraryInfo::TranslationsPath),
+- language);
+ // Qt: system path
- LoadTranslation("qt", QLibraryInfo::location(QLibraryInfo::TranslationsPath), language);
++ LoadTranslation("qt", QLibraryInfo::location(QLibraryInfo::TranslationsPath), language);
+ // Clementine: system path
+ LoadTranslation("clementine", QLibraryInfo::location(QLibraryInfo::TranslationsPath), language);
+ // Clementine: QRC
@@ -38,9 +40,9 @@ Author: Elan Ruusamäe <glen at pld-linux.org>
+ // Clementine: current dir
LoadTranslation("clementine", QDir::currentPath(), language);
- // Icons
---- 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
+ #ifdef Q_OS_WIN32
+--- clementine-1.3.0rc1/src/ui/behavioursettingspage.cpp~ 2016-01-20 17:03:12.000000000 +0200
++++ clementine-1.3.0rc1/src/ui/behavioursettingspage.cpp 2016-01-20 17:06:51.358232182 +0200
@@ -21,6 +21,7 @@
#include "playlist/playlist.h"
@@ -49,19 +51,18 @@ Author: Elan Ruusamäe <glen at pld-linux.org>
BehaviourSettingsPage::BehaviourSettingsPage(SettingsDialog* dialog)
-@@ -51,17 +51,15 @@
- ui_->menu_playmode->setItemData(1, MainWindow::PlayBehaviour_IfStopped);
- ui_->menu_playmode->setItemData(2, MainWindow::PlayBehaviour_Always);
+@@ -60,16 +60,15 @@
+ ui_->menu_previousmode->setItemData(0, Player::PreviousBehaviour_DontRestart);
+ ui_->menu_previousmode->setItemData(1, Player::PreviousBehaviour_Restart);
- // 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) {
+- for (const QString& filename : codes) {
- // The regex captures the "ru" from "clementine_ru.qm"
-- if (!lang_re.exactMatch(filename))
-- continue;
+- if (!lang_re.exactMatch(filename)) continue;
+ // Populate the language combo box
+ // We do this by looking at all the compiled in translations.
+ QDir localeDir(QLibraryInfo::location(QLibraryInfo::TranslationsPath));
@@ -72,9 +73,9 @@ Author: Elan Ruusamäe <glen at pld-linux.org>
+ }
- QString code = lang_re.cap(1);
- QString language_name = QLocale::languageToString(QLocale(code).language());
- #if QT_VERSION >= 0x040800
- QString native_name = QLocale(code).nativeLanguageName();
+ QString lookup_code = QString(code)
+ .replace("@latin", "_Latn")
+ .replace("_CN", "_Hans_CN")
--- 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/257df20428a4828045ba04fea380cf14870577b0
More information about the pld-cvs-commit
mailing list