summaryrefslogtreecommitdiff
path: root/libre/clementine-libre
diff options
context:
space:
mode:
Diffstat (limited to 'libre/clementine-libre')
-rw-r--r--libre/clementine-libre/PKGBUILD35
-rw-r--r--libre/clementine-libre/clementine-1.1.1-libimobiledevice-fix.patch12
-rw-r--r--libre/clementine-libre/moognu.pngbin0 -> 610 bytes
-rw-r--r--libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch (renamed from libre/clementine-libre/remove-and-disable-spotify.patch)63
4 files changed, 91 insertions, 19 deletions
diff --git a/libre/clementine-libre/PKGBUILD b/libre/clementine-libre/PKGBUILD
index 3a3037e1d..89591f416 100644
--- a/libre/clementine-libre/PKGBUILD
+++ b/libre/clementine-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: PKGBUILD 90335 2013-05-11 16:04:01Z tomegun $
#Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
#Contributor: BlackEagle <ike.devolder@gmail.com>
#Contributor: Dany Martineau <dany.luc.martineau@gmail.com>
@@ -9,15 +9,15 @@
_pkgname=clementine
pkgname=clementine-libre
pkgver=1.1.1
-pkgrel=7
-pkgdesc="A music player and library organizer, without spotify support"
+pkgrel=8
+pkgdesc="A music player and library organizer, without nonfree artwork and spotify support"
url="http://www.clementine-player.org/"
license=('GPL')
arch=('i686' 'x86_64' 'mips64el')
depends=('gstreamer0.10-base' 'taglib' 'glew' 'liblastfm' 'libgpod' 'projectm'
- 'libmtp' 'libplist' 'hicolor-icon-theme' 'qt4' 'libimobiledevice'
+ 'libmtp' 'libplist' 'hicolor-icon-theme' 'qt4' 'libimobiledevice' 'chromaprint'
'sparsehash' 'qjson' 'libcdio-paranoia' 'protobuf' 'qca' 'qca-ossl' 'gvfs')
-makedepends=('cmake' 'boost' 'mesa-libgl')
+makedepends=('cmake' 'boost' 'mesa')
optdepends=('gstreamer0.10-base-plugins: for more open formats'
'gstreamer0.10-good-plugins: for use with "Good" plugin libraries'
'gstreamer0.10-bad-libre-plugins: for use with "Bad" plugin libraries'
@@ -26,30 +26,39 @@ replaces=('clementine')
conflicts=('clementine')
provides=("clementine=$pkgver")
source=(http://clementine-player.googlecode.com/files/${_pkgname}-${pkgver}.tar.gz
- remove-and-disable-spotify.patch)
-sha1sums=('f8d3e9c8f54ac488323ab5a629c9accbe256378e'
- '4d336b6a42100a268e4d905b9596453f396fb649')
+ 'clementine-1.1.1-libimobiledevice-fix.patch'
+ 'remove-nonfree-artwork-and-spotify.patch'
+ 'moognu.png')
install=clementine.install
build() {
cd "${srcdir}/${_pkgname}-${pkgver}"
- # Remove nonfree spotify references on files
- patch -Np1 -i ../remove-and-disable-spotify.patch
+ patch -Np1 < "$srcdir"/clementine-1.1.1-libimobiledevice-fix.patch
+
+ # Remove nonfree nonfree artwork and spotify references on files
+ patch -Np1 -i ../remove-nonfree-artwork-and-spotify.patch
# Remove nonfree spotifyblob folders
rm -rv ext/{clementine-spotifyblob,libclementine-spotifyblob}
# Remove nonfree spotify files
rm -v cmake/SpotifyVersion.cmake
+ rm -v data/spotify-core-logo-128x128.png
rm -v data/icons/svg/spotify.svg
rm -v data/schema/schema-30.sql
rm -v src/{globalsearch/spotifysearchprovider.{cpp,h},internet/spotify{blobdownloader.{cpp,h},server.{cpp,h},service.{cpp,h},settingspage.{cpp,h,ui}}}
+ ## Remove nonfree nyancat.png
+ rm -v data/nyancat.png
+
+ ## Put moognu.png to the source code
+ cp -v ../moognu.png data
+
# Create a blank file due that is a dependency for clementine
touch data/schema/schema-30.sql
- cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DUSE_SYSTEM_PROJECTM=1
+ cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DUSE_SYSTEM_PROJECTM=1 -DBUILD_WERROR=0
make
}
@@ -57,3 +66,7 @@ package() {
cd "${srcdir}/${_pkgname}-${pkgver}"
make DESTDIR="${pkgdir}" install
}
+md5sums=('28e4afb822388bd337a761db8f86febf'
+ '736df6cd828a3172701f63c8dc978cb9'
+ '5cc8f800dd4df7bd5548196009ab68e0'
+ '59a8c0d7659898c457b95f877718cf1c')
diff --git a/libre/clementine-libre/clementine-1.1.1-libimobiledevice-fix.patch b/libre/clementine-libre/clementine-1.1.1-libimobiledevice-fix.patch
new file mode 100644
index 000000000..da7722fcb
--- /dev/null
+++ b/libre/clementine-libre/clementine-1.1.1-libimobiledevice-fix.patch
@@ -0,0 +1,12 @@
+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/libre/clementine-libre/moognu.png b/libre/clementine-libre/moognu.png
new file mode 100644
index 000000000..177041886
--- /dev/null
+++ b/libre/clementine-libre/moognu.png
Binary files differ
diff --git a/libre/clementine-libre/remove-and-disable-spotify.patch b/libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch
index a9352b275..6008b2d28 100644
--- a/libre/clementine-libre/remove-and-disable-spotify.patch
+++ b/libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch
@@ -86,9 +86,9 @@ diff -rauN clementine-1.1.0/CMakeLists.txt clementine-libre-1.1.0/CMakeLists.txt
if(HAVE_MOODBAR)
add_subdirectory(gst/moodbar)
endif()
-diff -rauN clementine-1.1.0/data/data.qrc clementine-libre-1.1.0/data/data.qrc
---- clementine-1.1.0/data/data.qrc 2012-10-22 04:24:28.000000000 -0200
-+++ clementine-libre-1.1.0/data/data.qrc 2012-10-26 01:59:52.333078474 -0200
+diff -rauN clementine-1.1.1/data/data.qrc clementine-libre-1.1.1/data/data.qrc
+--- clementine-1.1.1/data/data.qrc 2012-11-18 06:51:26.000000000 -0200
++++ clementine-libre-1.1.1/data/data.qrc 2013-05-13 02:55:19.579440533 -0300
@@ -1,7 +1,6 @@
<RCC>
<qresource prefix="/">
@@ -121,7 +121,19 @@ diff -rauN clementine-1.1.0/data/data.qrc clementine-libre-1.1.0/data/data.qrc
<file>icons/48x48/view-choose.png</file>
<file>icons/48x48/view-fullscreen.png</file>
<file>icons/48x48/view-media-equalizer.png</file>
-@@ -339,7 +334,6 @@
+@@ -261,10 +257,10 @@
+ <file>lumberjacksong.txt</file>
+ <file>lyrics/ultimate_providers.xml</file>
+ <file>mainwindow.css</file>
++ <file>moognu.png</file>
+ <file>nocover.png</file>
+ <file>nomusic.png</file>
+ <file>now_playing_tooltip.txt</file>
+- <file>nyancat.png</file>
+ <file>osd_background.png</file>
+ <file>osd_shadow_corner.png</file>
+ <file>osd_shadow_edge.png</file>
+@@ -339,7 +335,6 @@
<file>smartplaylistsearchterm.css</file>
<file>songinfo.css</file>
<file>spinner.gif</file>
@@ -526,10 +538,14 @@ diff -rauN clementine-1.1.0/src/internet/internetmodel.cpp clementine-libre-1.1.
}
void InternetModel::AddService(InternetService *service) {
-diff -rauN clementine-1.0.1/src/ui/about.cpp clementine-libre-1.0.1/src/ui/about.cpp
---- clementine-1.0.1/src/ui/about.cpp 2012-01-22 10:43:26.000000000 -0200
-+++ clementine-libre-1.0.1/src/ui/about.cpp 2012-05-28 19:44:38.760244927 -0300
-@@ -79,12 +79,6 @@
+diff -rauN clementine-1.1.1/src/ui/about.cpp clementine-libre-1.1.1/src/ui/about.cpp
+--- clementine-1.1.1/src/ui/about.cpp 2012-10-11 09:16:40.000000000 -0200
++++ clementine-libre-1.1.1/src/ui/about.cpp 2013-05-13 02:19:40.262472593 -0300
+@@ -75,16 +75,9 @@
+
+ ret += QString("<br />%1</p>").arg(tr("...and all the Amarok contributors"));
+ ret += QString("<p><b>%1</b>").arg(tr("And:"));
+- ret += QString("<br /><a href=\"http://rainymood.com\">Rainy Mood</a>");
ret += QString("<br /><a href=\"http://www.smitelli.com/?page=blog&p=54\">Scott Smitelli</a>");
ret += QString("<br /><a href=\"http://hyperboleandahalf.blogspot.com\">Allie Brosh</a></p>");
@@ -621,3 +637,34 @@ diff -rauN clementine-1.0.1/src/core/timeconstants.h clementine-libre-1.0.1/src/
#ifndef TIMECONSTANTS_H
#define TIMECONSTANTS_H
+diff -rauN clementine-1.1.1/src/core/backgroundstreams.cpp clementine-libre-1.1.1/src/core/backgroundstreams.cpp
+--- clementine-1.1.1/src/core/backgroundstreams.cpp 2012-10-11 09:16:39.000000000 -0200
++++ clementine-libre-1.1.1/src/core/backgroundstreams.cpp 2013-05-13 02:20:21.506864034 -0300
+@@ -9,7 +9,6 @@
+
+ const char* BackgroundStreams::kSettingsGroup = "BackgroundStreams";
+ const char* BackgroundStreams::kHypnotoadUrl = "hypnotoad:///";
+-const char* BackgroundStreams::kRainUrl = "http://data.clementine-player.org/rainymood";
+ const char* BackgroundStreams::kEnterpriseUrl = "enterprise:///";
+
+ BackgroundStreams::BackgroundStreams(EngineBase* engine, QObject* parent)
+@@ -28,7 +27,6 @@
+ int version = s.value("version", 0).toInt();
+ if (version < 1) {
+ AddStream(QT_TR_NOOP("Hypnotoad"), QUrl(kHypnotoadUrl));
+- AddStream(QT_TR_NOOP("Rain"), QUrl(kRainUrl));
+ }
+
+ if (version < kVersion) {
+diff -rauN clementine-1.1.1/src/analyzers/nyancatanalyzer.cpp clementine-libre-1.1.1/src/analyzers/nyancatanalyzer.cpp
+--- clementine-1.1.1/src/analyzers/nyancatanalyzer.cpp 2012-10-16 08:17:37.000000000 -0200
++++ clementine-libre-1.1.1/src/analyzers/nyancatanalyzer.cpp 2013-05-13 03:56:04.732771832 -0300
+@@ -29,7 +29,7 @@
+
+ NyanCatAnalyzer::NyanCatAnalyzer(QWidget* parent)
+ : Analyzer::Base(parent, 9),
+- cat_(":/nyancat.png"),
++ cat_(":/moognu.png"),
+ timer_id_(startTimer(kFrameIntervalMs)),
+ frame_(0),
+ current_buffer_(0),
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-04 17:28:18 +0000