From 75b982aad596783e265c2953a965785c5be711b6 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@lavabit.com>
Date: Fri, 6 Jul 2012 21:18:36 -0300
Subject: clementine-libre-1.0.1-6: revert to previous commit as the patch for
 global menu does not work properly

---
 libre/clementine-libre/PKGBUILD                         |  6 +-----
 .../clementine-libre/clementine-1.0.1-global-menu.patch | 17 -----------------
 2 files changed, 1 insertion(+), 22 deletions(-)
 delete mode 100644 libre/clementine-libre/clementine-1.0.1-global-menu.patch

diff --git a/libre/clementine-libre/PKGBUILD b/libre/clementine-libre/PKGBUILD
index 4e3d4e536..310781153 100644
--- a/libre/clementine-libre/PKGBUILD
+++ b/libre/clementine-libre/PKGBUILD
@@ -8,7 +8,7 @@
 _pkgname=clementine
 pkgname=clementine-libre
 pkgver=1.0.1
-pkgrel=5
+pkgrel=6
 pkgdesc="A music player and library organizer, without spotify support"
 url="http://www.clementine-player.org/"
 license=('GPL')
@@ -27,7 +27,6 @@ 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'
@@ -47,9 +46,6 @@ 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
deleted file mode 100644
index 91f93e058..000000000
--- a/libre/clementine-libre/clementine-1.0.1-global-menu.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-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());
-- 
cgit v1.2.3