summaryrefslogtreecommitdiff
path: root/libre/clementine-libre
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2012-07-06 00:01:51 +0000
committerroot <root@rshg054.dnsready.net>2012-07-06 00:01:51 +0000
commit810a5a6e8edafe2550300c5030083669db6e3973 (patch)
tree67bce9a7079962a26b9f1d156941e8e4a3cda92c /libre/clementine-libre
parent7f6f69dc52c8601768ba48fa7b69507a80d532cb (diff)
Fri Jul 6 00:01:50 UTC 2012
Diffstat (limited to 'libre/clementine-libre')
-rw-r--r--libre/clementine-libre/PKGBUILD9
-rw-r--r--libre/clementine-libre/clementine-1.0.1-global-menu.patch17
2 files changed, 24 insertions, 2 deletions
diff --git a/libre/clementine-libre/PKGBUILD b/libre/clementine-libre/PKGBUILD
index 466810d2b..4e3d4e536 100644
--- a/libre/clementine-libre/PKGBUILD
+++ b/libre/clementine-libre/PKGBUILD
@@ -3,12 +3,12 @@
#Contributor: BlackEagle <ike.devolder@gmail.com>
#Contributor: Dany Martineau <dany.luc.martineau@gmail.com>
#Maintainer (Parabola): Kete <kete@ninthfloor.org>
-#Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
+#Contributor (Parabola): André Silva <emulatorman@lavabit.com>
_pkgname=clementine
pkgname=clementine-libre
pkgver=1.0.1
-pkgrel=4
+pkgrel=5
pkgdesc="A music player and library organizer, without spotify support"
url="http://www.clementine-player.org/"
license=('GPL')
@@ -27,11 +27,13 @@ provides=("clementine=$pkgver")
source=(http://clementine-player.googlecode.com/files/${_pkgname}-${pkgver}.tar.gz
clementine-fix-albumcoverfetch-crash.patch
clementine-fresh-start.patch
+ clementine-1.0.1-global-menu.patch
remove-and-disable-spotify.patch
remove-nonfree-references-on-translations.patch)
sha1sums=('e05320da689e2fad744fd3e68518bc4103ecf0fd'
'fddd2e784181ce1dcc7809e7122cbade0af7b01f'
'd8abab4b8fb2d5284a2f43107505325e62d4af5f'
+ 'b716e4d43101fad535f93fd59034d7bbbb98cdb8'
'2fef46eaffa7b5cd61afbf19b1dc909d11972a34'
'745bc4fd639d7ef3230592c6275fb43b8956f3d5')
install=clementine.install
@@ -45,6 +47,9 @@ build() {
# http://code.google.com/p/clementine-player/issues/detail?id=2752
patch -Np1 -i ../clementine-fix-albumcoverfetch-crash.patch
+ # FS#30549
+ patch -Np1 -i ../clementine-1.0.1-global-menu.patch
+
# https://labs.parabola.nu/issues/99
patch -Np1 -i ../remove-and-disable-spotify.patch
patch -Np1 -i ../remove-nonfree-references-on-translations.patch
diff --git a/libre/clementine-libre/clementine-1.0.1-global-menu.patch b/libre/clementine-libre/clementine-1.0.1-global-menu.patch
new file mode 100644
index 000000000..91f93e058
--- /dev/null
+++ b/libre/clementine-libre/clementine-1.0.1-global-menu.patch
@@ -0,0 +1,17 @@
+diff -Naur clementine-1.0.1.ori/src/main.cpp clementine-1.0.1/src/main.cpp
+--- clementine-1.0.1.ori/src/main.cpp 2012-01-22 07:43:26.000000000 -0500
++++ clementine-1.0.1/src/main.cpp 2012-07-05 13:58:49.040596906 -0400
+@@ -280,13 +280,6 @@
+ UniversalEncodingHandler handler;
+ TagLib::ID3v1::Tag::setStringHandler(&handler);
+
+-#ifdef Q_OS_LINUX
+- // Force Clementine's menu to be shown in the Clementine window and not in
+- // the Unity global menubar thing. See:
+- // https://bugs.launchpad.net/unity/+bug/775278
+- setenv("QT_X11_NO_NATIVE_MENUBAR", "1", true);
+-#endif
+-
+ // Initialise logging
+ logging::Init();
+ logging::SetLevels(options.log_levels());